Add --monitor flag to default init scripts for secchan.

[sliver-openvswitch.git] / switch / switch-flow.h

diff --git a/switch/switch-flow.h b/switch/switch-flow.h
index 0eb8c89..38cfa6e 100644 (file)
--- a/switch/switch-flow.h
+++ b/switch/switch-flow.h
@@ -35,7 +35,7 @@
 #define SWITCH_FLOW_H 1
 
 #include <time.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
 #include "flow.h"
 #include "list.h"
 
@@ -50,8 +50,8 @@ struct sw_flow_key {
 };
 
 struct sw_flow_actions {
-    unsigned int n_actions;
-    struct ofp_action actions[0];
+    size_t actions_len;
+    struct ofp_action_header actions[0];
 };
 
 struct sw_flow {
@@ -76,18 +76,19 @@ struct sw_flow {
 
 int flow_matches_1wild(const struct sw_flow_key *, const struct sw_flow_key *);
 int flow_matches_2wild(const struct sw_flow_key *, const struct sw_flow_key *);
-int flow_del_matches(const struct sw_flow_key *, const struct sw_flow_key *, 
+int flow_matches_desc(const struct sw_flow_key *, const struct sw_flow_key *, 
                      int);
-struct sw_flow *flow_alloc(int n_actions);
+struct sw_flow *flow_alloc(size_t);
 void flow_free(struct sw_flow *);
 void flow_deferred_free(struct sw_flow *);
 void flow_deferred_free_acts(struct sw_flow_actions *);
-void flow_replace_acts(struct sw_flow *, const struct ofp_action *, int);
+void flow_replace_acts(struct sw_flow *, const struct ofp_action_header *, 
+        size_t);
 void flow_extract_match(struct sw_flow_key* to, const struct ofp_match* from);
 void flow_fill_match(struct ofp_match* to, const struct sw_flow_key* from);
 
 void print_flow(const struct sw_flow_key *);
 bool flow_timeout(struct sw_flow *flow);
-void flow_used(struct sw_flow *flow, struct buffer *buffer);
+void flow_used(struct sw_flow *flow, struct ofpbuf *buffer);
 
 #endif /* switch-flow.h */