projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Break passive vconns out into separate pvconn routines and data structures.
[openvswitch]
/
switch
/
switch.c
diff --git
a/switch/switch.c
b/switch/switch.c
index 9d307db9f538515288f76ea0cccc53857108734d..1f85b37b83357253c653a67c7ea3f324ab85754e 100644
(file)
--- a/
switch/switch.c
+++ b/
switch/switch.c
@@
-68,7
+68,7
@@
char serial_num[SERIAL_NUM_LEN] = "None";
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
-static const char *listen_vconn_name;
+static const char *listen_
p
vconn_name;
static struct datapath *dp;
static uint64_t dpid = UINT64_MAX;
static char *port_list;
static struct datapath *dp;
static uint64_t dpid = UINT64_MAX;
static char *port_list;
@@
-102,18
+102,15
@@
main(int argc, char *argv[])
fatal(0, "no support for %s vconn", argv[optind]);
}
error = dp_new(&dp, dpid, rconn);
fatal(0, "no support for %s vconn", argv[optind]);
}
error = dp_new(&dp, dpid, rconn);
- if (listen_vconn_name) {
- struct
vconn *listen_
vconn;
+ if (listen_
p
vconn_name) {
+ struct
pvconn *listen_p
vconn;
int retval;
int retval;
-
- retval =
vconn_open(listen_vconn_name, &listen_
vconn);
+
+ retval =
pvconn_open(listen_pvconn_name, &listen_p
vconn);
if (retval && retval != EAGAIN) {
if (retval && retval != EAGAIN) {
- fatal(retval, "opening %s", listen_vconn_name);
- }
- if (!vconn_is_passive(listen_vconn)) {
- fatal(0, "%s is not a passive vconn", listen_vconn_name);
+ fatal(retval, "opening %s", listen_pvconn_name);
}
}
- dp_add_listen_
vconn(dp, listen_
vconn);
+ dp_add_listen_
pvconn(dp, listen_p
vconn);
}
if (error) {
fatal(error, "could not create datapath");
}
if (error) {
fatal(error, "could not create datapath");
@@
-267,10
+264,10
@@
parse_options(int argc, char *argv[])
break;
case 'l':
break;
case 'l':
- if (listen_vconn_name) {
+ if (listen_
p
vconn_name) {
fatal(0, "-l or --listen may be only specified once");
}
fatal(0, "-l or --listen may be only specified once");
}
- listen_vconn_name = optarg;
+ listen_
p
vconn_name = optarg;
break;
VCONN_SSL_OPTION_HANDLERS
break;
VCONN_SSL_OPTION_HANDLERS