git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Avoid use-after-free with VLAN splinters and multiple bridges.
[sliver-openvswitch.git]
/
tests
/
test-jsonrpc.c
diff --git
a/tests/test-jsonrpc.c
b/tests/test-jsonrpc.c
index
44edda8
..
d892ece
100644
(file)
--- a/
tests/test-jsonrpc.c
+++ b/
tests/test-jsonrpc.c
@@
-57,14
+57,12
@@
parse_options(int argc, char *argv[])
DAEMON_OPTION_ENUMS
};
static struct option long_options[] = {
DAEMON_OPTION_ENUMS
};
static struct option long_options[] = {
- {"verbose", optional_argument,
0
, 'v'},
- {"help", no_argument,
0
, 'h'},
+ {"verbose", optional_argument,
NULL
, 'v'},
+ {"help", no_argument,
NULL
, 'h'},
DAEMON_LONG_OPTIONS,
DAEMON_LONG_OPTIONS,
-#ifdef HAVE_OPENSSL
- {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
- STREAM_SSL_LONG_OPTIONS
-#endif
- {0, 0, 0, 0},
+ {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
+ STREAM_SSL_LONG_OPTIONS,
+ {NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
};
char *short_options = long_options_to_short_options(long_options);
@@
-84,13
+82,11
@@
parse_options(int argc, char *argv[])
DAEMON_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
-#ifdef HAVE_OPENSSL
STREAM_SSL_OPTION_HANDLERS
case OPT_BOOTSTRAP_CA_CERT:
stream_ssl_set_ca_cert_file(optarg, true);
break;
STREAM_SSL_OPTION_HANDLERS
case OPT_BOOTSTRAP_CA_CERT:
stream_ssl_set_ca_cert_file(optarg, true);
break;
-#endif
case '?':
exit(EXIT_FAILURE);
case '?':
exit(EXIT_FAILURE);
@@
-182,8
+178,6
@@
do_listen(int argc OVS_UNUSED, char *argv[])
bool done;
int error;
bool done;
int error;
- die_if_already_running();
-
error = jsonrpc_pstream_open(argv[1], &pstream);
if (error) {
ovs_fatal(error, "could not listen on \"%s\"", argv[1]);
error = jsonrpc_pstream_open(argv[1], &pstream);
if (error) {
ovs_fatal(error, "could not listen on \"%s\"", argv[1]);