projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Include OVS_KEY_ATTR_IPV4_TUNNEL in upstream range.
[openvswitch]
/
ofproto
/
connmgr.c
diff --git
a/ofproto/connmgr.c
b/ofproto/connmgr.c
index 05e69c7f9df90d4df02462f60a678143861aac22..7897bb7fea6843b24fd14b1a0a8784440ad19aa3 100644
(file)
--- a/
ofproto/connmgr.c
+++ b/
ofproto/connmgr.c
@@
-137,7
+137,8
@@
struct ofservice {
static void ofservice_reconfigure(struct ofservice *,
const struct ofproto_controller *);
static void ofservice_reconfigure(struct ofservice *,
const struct ofproto_controller *);
-static int ofservice_create(struct connmgr *, const char *target, uint8_t dscp);
+static int ofservice_create(struct connmgr *mgr, const char *target,
+ uint32_t allowed_versions, uint8_t dscp);
static void ofservice_destroy(struct connmgr *, struct ofservice *);
static struct ofservice *ofservice_lookup(struct connmgr *,
const char *target);
static void ofservice_destroy(struct connmgr *, struct ofservice *);
static struct ofservice *ofservice_lookup(struct connmgr *,
const char *target);
@@
-289,7
+290,7
@@
connmgr_run(struct connmgr *mgr,
struct vconn *vconn;
int retval;
struct vconn *vconn;
int retval;
- retval = pvconn_accept(ofservice->pvconn,
OFP10_VERSION,
&vconn);
+ retval = pvconn_accept(ofservice->pvconn, &vconn);
if (!retval) {
struct rconn *rconn;
char *name;
if (!retval) {
struct rconn *rconn;
char *name;
@@
-313,7
+314,7
@@
connmgr_run(struct connmgr *mgr,
struct vconn *vconn;
int retval;
struct vconn *vconn;
int retval;
- retval = pvconn_accept(mgr->snoops[i],
OFP10_VERSION,
&vconn);
+ retval = pvconn_accept(mgr->snoops[i], &vconn);
if (!retval) {
add_snooper(mgr, vconn);
} else if (retval != EAGAIN) {
if (!retval) {
add_snooper(mgr, vconn);
} else if (retval != EAGAIN) {
@@
-513,7
+514,7
@@
connmgr_set_controllers(struct connmgr *mgr,
if (!ofservice_lookup(mgr, c->target)) {
VLOG_INFO("%s: added service controller \"%s\"",
mgr->name, c->target);
if (!ofservice_lookup(mgr, c->target)) {
VLOG_INFO("%s: added service controller \"%s\"",
mgr->name, c->target);
- ofservice_create(mgr, c->target, c->dscp);
+ ofservice_create(mgr, c->target,
0,
c->dscp);
}
} else {
VLOG_WARN_RL(&rl, "%s: unsupported controller \"%s\"",
}
} else {
VLOG_WARN_RL(&rl, "%s: unsupported controller \"%s\"",
@@
-720,8
+721,7
@@
set_pvconns(struct pvconn ***pvconnsp, size_t *n_pvconnsp,
SSET_FOR_EACH (name, sset) {
struct pvconn *pvconn;
int error;
SSET_FOR_EACH (name, sset) {
struct pvconn *pvconn;
int error;
-
- error = pvconn_open(name, &pvconn, 0);
+ error = pvconn_open(name, 0, &pvconn, 0);
if (!error) {
pvconns[n_pvconns++] = pvconn;
} else {
if (!error) {
pvconns[n_pvconns++] = pvconn;
} else {
@@
-1619,13
+1619,14
@@
connmgr_flushed(struct connmgr *mgr)
* ofservice_reconfigure() must be called to fully configure the new
* ofservice. */
static int
* ofservice_reconfigure() must be called to fully configure the new
* ofservice. */
static int
-ofservice_create(struct connmgr *mgr, const char *target, uint8_t dscp)
+ofservice_create(struct connmgr *mgr, const char *target,
+ uint32_t allowed_versions, uint8_t dscp)
{
struct ofservice *ofservice;
struct pvconn *pvconn;
int error;
{
struct ofservice *ofservice;
struct pvconn *pvconn;
int error;
- error = pvconn_open(target, &pvconn, dscp);
+ error = pvconn_open(target,
allowed_versions,
&pvconn, dscp);
if (error) {
return error;
}
if (error) {
return error;
}