Allow minimum and maximum versions to be passed rather than relying on hard-coded defaults.
Signed-off-by: Simon Horman <[email protected]> --- ofproto/connmgr.c | 20 ++++++++++++-------- ofproto/connmgr.h | 4 +++- ofproto/ofproto.c | 6 ++++-- ofproto/ofproto.h | 4 +++- vswitchd/bridge.c | 3 ++- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 43dad1a..36a76ff 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -298,8 +298,7 @@ connmgr_run(struct connmgr *mgr, enum ofp_version min_version, /* Passing default value for creation of the rconn */ rconn = rconn_create(ofservice->probe_interval, 0, - ofservice->dscp, OFP10_VERSION, - OFP10_VERSION); + ofservice->dscp, min_version, max_version); name = ofconn_make_name(mgr, vconn_get_name(vconn)); rconn_connect_unreliably(rconn, vconn, name); free(name); @@ -403,7 +402,9 @@ connmgr_retry(struct connmgr *mgr) /* OpenFlow configuration. */ -static void add_controller(struct connmgr *, const char *target, uint8_t dscp); +static void add_controller(struct connmgr *, const char *target, uint8_t dscp, + enum ofp_version min_version, + enum ofp_version max_version); static struct ofconn *find_controller_by_target(struct connmgr *, const char *target); static void update_fail_open(struct connmgr *); @@ -494,7 +495,8 @@ connmgr_free_controller_info(struct shash *info) void connmgr_set_controllers(struct connmgr *mgr, const struct ofproto_controller *controllers, - size_t n_controllers) + size_t n_controllers, enum ofp_version min_version, + enum ofp_version max_version) { bool had_controllers = connmgr_has_controllers(mgr); struct shash new_controllers; @@ -512,7 +514,8 @@ connmgr_set_controllers(struct connmgr *mgr, if (!find_controller_by_target(mgr, c->target)) { VLOG_INFO("%s: added primary controller \"%s\"", mgr->name, c->target); - add_controller(mgr, c->target, c->dscp); + add_controller(mgr, c->target, c->dscp, min_version, + max_version); } } else if (!pvconn_verify_name(c->target)) { if (!ofservice_lookup(mgr, c->target)) { @@ -613,13 +616,14 @@ connmgr_has_snoops(const struct connmgr *mgr) /* Creates a new controller for 'target' in 'mgr'. update_controller() needs * to be called later to finish the new ofconn's configuration. */ static void -add_controller(struct connmgr *mgr, const char *target, uint8_t dscp) +add_controller(struct connmgr *mgr, const char *target, uint8_t dscp, + enum ofp_version min_version, enum ofp_version max_version) { char *name = ofconn_make_name(mgr, target); struct ofconn *ofconn; - ofconn = ofconn_create(mgr, rconn_create(5, 8, dscp, OFP10_VERSION, - OFP10_VERSION), + ofconn = ofconn_create(mgr, + rconn_create(5, 8, dscp, min_version, max_version), OFCONN_PRIMARY, true); ofconn->pktbuf = pktbuf_create(); rconn_connect(ofconn->rconn, target, name); diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h index c4aff0e..814b95b 100644 --- a/ofproto/connmgr.h +++ b/ofproto/connmgr.h @@ -86,7 +86,9 @@ 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); + const struct ofproto_controller[], size_t n, + enum ofp_version min_version, + enum ofp_version max_version); void connmgr_reconnect(const struct connmgr *); int connmgr_set_snoops(struct connmgr *, const struct sset *snoops); diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 84c18e0..7217856 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -480,9 +480,11 @@ ofproto_set_datapath_id(struct ofproto *p, uint64_t datapath_id) void ofproto_set_controllers(struct ofproto *p, const struct ofproto_controller *controllers, - size_t n_controllers) + size_t n_controllers, enum ofp_version min_version, + enum ofp_version max_version) { - connmgr_set_controllers(p->connmgr, controllers, n_controllers); + connmgr_set_controllers(p->connmgr, controllers, n_controllers, + min_version, max_version); } void diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 1cdde3c..58d94b8 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -205,7 +205,9 @@ int ofproto_port_query_by_name(const struct ofproto *, const char *devname, uint64_t ofproto_get_datapath_id(const struct ofproto *); void ofproto_set_datapath_id(struct ofproto *, uint64_t datapath_id); void ofproto_set_controllers(struct ofproto *, - const struct ofproto_controller *, size_t n); + const struct ofproto_controller *, size_t n, + enum ofp_version min_version, + enum ofp_version max_version); void ofproto_set_fail_mode(struct ofproto *, enum ofproto_fail_mode fail_mode); void ofproto_reconnect_controllers(struct ofproto *); void ofproto_set_extra_in_band_remotes(struct ofproto *, diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 14e4b34..197ae85 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -2718,7 +2718,8 @@ bridge_configure_remotes(struct bridge *br, n_ocs++; } - ofproto_set_controllers(br->ofproto, ocs, n_ocs); + ofproto_set_controllers(br->ofproto, ocs, n_ocs, + OFP10_VERSION, OFP10_VERSION); free(ocs[0].target); /* From bridge_ofproto_controller_for_mgmt(). */ free(ocs); -- 1.7.10.4 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
