Add minimum and maximum OpenFlow versions to struct rconn to allow
reconnect to use these parameters rather than hard-coded defaults.
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
lib/rconn.c | 11 +++++++++--
lib/rconn.h | 5 ++++-
ofproto/connmgr.c | 8 ++++++--
utilities/ovs-controller.c | 2 +-
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/lib/rconn.c b/lib/rconn.c
index 3db3c21..1d2ef78 100644
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -131,6 +131,9 @@ struct rconn {
#define MAX_MONITORS 8
struct vconn *monitors[8];
size_t n_monitors;
+
+ enum ofp_version min_version;
+ enum ofp_version max_version;
};
static unsigned int elapsed_in_this_state(const struct rconn *);
@@ -165,7 +168,8 @@ static bool rconn_logging_connection_attempts__(const
struct rconn *);
* The new rconn is initially unconnected. Use rconn_connect() or
* rconn_connect_unreliably() to connect it. */
struct rconn *
-rconn_create(int probe_interval, int max_backoff, uint8_t dscp)
+rconn_create(int probe_interval, int max_backoff, uint8_t dscp,
+ enum ofp_version min_version, enum ofp_version max_version)
{
struct rconn *rc = xzalloc(sizeof *rc);
@@ -204,6 +208,9 @@ rconn_create(int probe_interval, int max_backoff, uint8_t
dscp)
rc->n_monitors = 0;
+ rc->min_version = min_version;
+ rc->max_version = max_version;
+
return rc;
}
@@ -354,7 +361,7 @@ reconnect(struct rconn *rc)
VLOG_INFO("%s: connecting...", rc->name);
}
rc->n_attempted_connections++;
- retval = vconn_open(rc->target, OFP10_VERSION, OFP10_VERSION,
+ retval = vconn_open(rc->target, rc->min_version, rc->max_version,
&rc->vconn, rc->dscp);
if (!retval) {
rc->remote_ip = vconn_get_remote_ip(rc->vconn);
diff --git a/lib/rconn.h b/lib/rconn.h
index d10cef7..44964e8 100644
--- a/lib/rconn.h
+++ b/lib/rconn.h
@@ -21,6 +21,7 @@
#include <stdint.h>
#include <time.h>
#include "openvswitch/types.h"
+#include "openflow/openflow-common.h"
/* A wrapper around vconn that provides queuing and optionally reliability.
*
@@ -38,7 +39,9 @@ struct vconn;
struct rconn_packet_counter;
struct rconn *rconn_create(int inactivity_probe_interval,
- int max_backoff, uint8_t dscp);
+ int max_backoff, uint8_t dscp,
+ enum ofp_version min_version,
+ enum ofp_version max_version);
void rconn_set_dscp(struct rconn *rc, uint8_t dscp);
uint8_t rconn_get_dscp(const struct rconn *rc);
void rconn_set_max_backoff(struct rconn *, int max_backoff);
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
index e588bac..43dad1a 100644
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.c
@@ -297,7 +297,9 @@ connmgr_run(struct connmgr *mgr, enum ofp_version
min_version,
char *name;
/* Passing default value for creation of the rconn */
- rconn = rconn_create(ofservice->probe_interval, 0,
ofservice->dscp);
+ rconn = rconn_create(ofservice->probe_interval, 0,
+ ofservice->dscp, OFP10_VERSION,
+ OFP10_VERSION);
name = ofconn_make_name(mgr, vconn_get_name(vconn));
rconn_connect_unreliably(rconn, vconn, name);
free(name);
@@ -616,7 +618,9 @@ add_controller(struct connmgr *mgr, const char *target,
uint8_t dscp)
char *name = ofconn_make_name(mgr, target);
struct ofconn *ofconn;
- ofconn = ofconn_create(mgr, rconn_create(5, 8, dscp), OFCONN_PRIMARY,
true);
+ ofconn = ofconn_create(mgr, rconn_create(5, 8, dscp, OFP10_VERSION,
+ OFP10_VERSION),
+ OFCONN_PRIMARY, true);
ofconn->pktbuf = pktbuf_create();
rconn_connect(ofconn->rconn, target, name);
hmap_insert(&mgr->controllers, &ofconn->hmap_node, hash_string(target, 0));
diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index 9171445..3e7df41 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -204,7 +204,7 @@ new_switch(struct switch_ *sw, struct vconn *vconn)
struct lswitch_config cfg;
struct rconn *rconn;
- rconn = rconn_create(60, 0, DSCP_DEFAULT);
+ rconn = rconn_create(60, 0, DSCP_DEFAULT, OFP10_VERSION, OFP10_VERSION);
rconn_connect_unreliably(rconn, vconn, NULL);
cfg.mode = (action_normal ? LSW_NORMAL
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
