projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Fix OVS build failure on older kernel
[openvswitch]
/
ofproto
/
connmgr.h
diff --git
a/ofproto/connmgr.h
b/ofproto/connmgr.h
index 4ac564cc138aff4c984faf3fe4790af5ef6797a3..ea39b724edaa4db6823d7351cbfcd105e6046314 100644
(file)
--- a/
ofproto/connmgr.h
+++ b/
ofproto/connmgr.h
@@
-24,6
+24,7
@@
#include "openvswitch/types.h"
struct ofconn;
#include "openvswitch/types.h"
struct ofconn;
+struct ofopgroup;
struct ofputil_flow_removed;
struct ofputil_packet_in;
struct sset;
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 connmgr_destroy(struct connmgr *);
void connmgr_run(struct connmgr *,
-
void
(*handle_openflow)(struct ofconn *,
+
bool
(*handle_openflow)(struct ofconn *,
struct ofpbuf *ofp_msg));
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 *);
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 *);
/* 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 *);
void connmgr_set_controllers(struct connmgr *,
const struct ofproto_controller[], size_t n);
void connmgr_reconnect(const struct connmgr *);
@@
-94,6
+98,11
@@
void ofconn_send_error(const struct ofconn *, const struct ofp_header *request,
int ofconn_pktbuf_retrieve(struct ofconn *, uint32_t id,
struct ofpbuf **bufferp, uint16_t *in_port);
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);
/* Sending asynchronous messages. */
void connmgr_send_port_status(struct connmgr *, const struct ofp_phy_port *,
uint8_t reason);