ofproto: Correct comment describing set_netflow().

[openvswitch] / ofproto / connmgr.h

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index 4710e6da7e2a2921dfc8b3656aa9711d73be13a0..46d2f5d818465621366cbed530e9dd83b18ac1a7 100644 (file)
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -23,9 +23,10 @@
 #include "openflow/nicira-ext.h"
 #include "openvswitch/types.h"
 
-struct dpif_upcall;
 struct ofconn;
 struct ofputil_flow_removed;
+struct ofputil_packet_in;
+struct sset;
 
 /* ofproto supports two kinds of OpenFlow connections:
  *
@@ -66,8 +67,9 @@ void connmgr_set_controllers(struct connmgr *,
                              const struct ofproto_controller[], size_t n);
 void connmgr_reconnect(const struct connmgr *);
 
-int connmgr_set_snoops(struct connmgr *, const struct svec *snoops);
-void connmgr_get_snoops(const struct connmgr *, struct svec *snoops);
+int connmgr_set_snoops(struct connmgr *, const struct sset *snoops);
+bool connmgr_has_snoops(const struct connmgr *);
+void connmgr_get_snoops(const struct connmgr *, struct sset *snoops);
 
 /* Individual connections to OpenFlow controllers. */
 enum ofconn_type ofconn_get_type(const struct ofconn *);
@@ -78,6 +80,9 @@ void ofconn_set_role(struct ofconn *, enum nx_role);
 enum nx_flow_format ofconn_get_flow_format(struct ofconn *);
 void ofconn_set_flow_format(struct ofconn *, enum nx_flow_format);
 
+bool ofconn_get_flow_mod_table_id(const struct ofconn *);
+void ofconn_set_flow_mod_table_id(struct ofconn *, bool enable);
+
 int ofconn_get_miss_send_len(const struct ofconn *);
 void ofconn_set_miss_send_len(struct ofconn *, int miss_send_len);
 
@@ -91,7 +96,7 @@ void connmgr_send_port_status(struct connmgr *, const struct ofp_phy_port *,
                               uint8_t reason);
 void connmgr_send_flow_removed(struct connmgr *,
                                const struct ofputil_flow_removed *);
-void connmgr_send_packet_in(struct connmgr *, const struct dpif_upcall *,
+void connmgr_send_packet_in(struct connmgr *, const struct ofputil_packet_in *,
                             const struct flow *, struct ofpbuf *rw_packet);
 
 /* Fail-open settings. */