projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jsonrpc: Check RPC status after trying to send, not before.
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index e2816cfc347d9bf1bb724d66e897916cea1a856b..56a530730f50b665fae95f91509ed0f26b7e84d2 100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-26,16
+26,15
@@
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
-#include "fault.h"
#include "learning-switch.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
#include "learning-switch.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
+#include "stream-ssl.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn-ssl.h"
#include "vconn.h"
#include "vlog.h"
#include "vconn.h"
#include "vlog.h"
@@
-84,7
+83,6
@@
main(int argc, char *argv[])
int i;
set_program_name(argv[0]);
int i;
set_program_name(argv[0]);
- register_fault_handlers();
time_init();
vlog_init();
parse_options(argc, argv);
time_init();
vlog_init();
parse_options(argc, argv);
@@
-257,7
+255,7
@@
parse_options(int argc, char *argv[])
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_LONG_OPTIONS
+
STREAM
_SSL_LONG_OPTIONS
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#endif
{0, 0, 0, 0},
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#endif
{0, 0, 0, 0},
@@
-317,10
+315,10
@@
parse_options(int argc, char *argv[])
DAEMON_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
DAEMON_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_OPTION_HANDLERS
+
STREAM
_SSL_OPTION_HANDLERS
case OPT_PEER_CA_CERT:
case OPT_PEER_CA_CERT:
-
vconn
_ssl_set_peer_ca_cert_file(optarg);
+
stream
_ssl_set_peer_ca_cert_file(optarg);
break;
#endif
break;
#endif