X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=022435265cee77d38253b45aafa1e3b510a7025c;hb=63adcc7d3fa1e136685f44edb03887222ea74bd8;hp=46d2f5d818465621366cbed530e9dd83b18ac1a7;hpb=007948177581f3b3dad188221593d0e4bdca6ba0;p=openvswitch

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index 46d2f5d8..02243526 100644
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -23,7 +23,9 @@
 #include "openflow/nicira-ext.h"
 #include "openvswitch/types.h"
 
+struct nlattr;
 struct ofconn;
+struct ofopgroup;
 struct ofputil_flow_removed;
 struct ofputil_packet_in;
 struct sset;
@@ -54,15 +56,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 *);
@@ -87,10 +92,18 @@ int ofconn_get_miss_send_len(const struct ofconn *);
 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);
 
+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);