X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=31416a1f8b05fb225582a091cffef4dbdfe2eee4;hb=72ba2ed371ae593b6fda1d196c31d7dd408a6a1c;hp=9b2e9c56bb8dbe300a3f623effab738fde1e2025;hpb=63f2140a553dbbda9f19019a03abb088c7e7fa29;p=sliver-openvswitch.git

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index 9b2e9c56b..31416a1f8 100644
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -24,6 +24,7 @@
 #include "openvswitch/types.h"
 
 struct ofconn;
+struct ofopgroup;
 struct ofputil_flow_removed;
 struct ofputil_packet_in;
 struct sset;
@@ -54,15 +55,18 @@ struct connmgr *connmgr_create(struct ofproto *ofproto,
 void connmgr_destroy(struct connmgr *);
 
 void connmgr_run(struct connmgr *,
-                 void (*handle_openflow)(struct ofconn *,
+                 bool (*handle_openflow)(struct ofconn *,
                                          struct ofpbuf *ofp_msg));
-void connmgr_wait(struct connmgr *);
+void connmgr_wait(struct connmgr *, bool handling_openflow);
 
 struct ofproto *ofconn_get_ofproto(const struct ofconn *);
 
+void connmgr_retry(struct connmgr *);
+
 /* OpenFlow configuration. */
 bool connmgr_has_controllers(const struct connmgr *);
 void connmgr_get_controller_info(struct connmgr *, struct shash *);
+void connmgr_free_controller_info(struct shash *);
 void connmgr_set_controllers(struct connmgr *,
                              const struct ofproto_controller[], size_t n);
 void connmgr_reconnect(const struct connmgr *);
@@ -88,10 +92,18 @@ void ofconn_set_miss_send_len(struct ofconn *, int miss_send_len);
 
 void ofconn_send_reply(const struct ofconn *, struct ofpbuf *);
 void ofconn_send_replies(const struct ofconn *, struct list *);
+void ofconn_send_error(const struct ofconn *, const struct ofp_header *request,
+                       int error);
 
 int ofconn_pktbuf_retrieve(struct ofconn *, uint32_t id,
                            struct ofpbuf **bufferp, uint16_t *in_port);
 
+size_t ofconn_n_pending_opgroups(const struct ofconn *);
+bool ofconn_has_pending_opgroups(const struct ofconn *);
+void ofconn_add_opgroup(struct ofconn *, struct list *);
+void ofconn_remove_opgroup(struct ofconn *, struct list *,
+                           const struct ofp_header *request, int error);
+
 /* Sending asynchronous messages. */
 void connmgr_send_port_status(struct connmgr *, const struct ofp_phy_port *,
                               uint8_t reason);