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-openflowd.c
diff --git
a/utilities/ovs-openflowd.c
b/utilities/ovs-openflowd.c
index 7c61dbea1532197fadbb881cebbd2cdab7cdcc59..5f4b24bd0714d873d8d32116c809f54dfe9978ea 100644
(file)
--- a/
utilities/ovs-openflowd.c
+++ b/
utilities/ovs-openflowd.c
@@
-29,7
+29,6
@@
#include "daemon.h"
#include "dirs.h"
#include "dpif.h"
#include "daemon.h"
#include "dirs.h"
#include "dpif.h"
-#include "fault.h"
#include "leak-checker.h"
#include "list.h"
#include "netdev.h"
#include "leak-checker.h"
#include "list.h"
#include "netdev.h"
@@
-39,11
+38,11
@@
#include "packets.h"
#include "poll-loop.h"
#include "rconn.h"
#include "packets.h"
#include "poll-loop.h"
#include "rconn.h"
+#include "stream-ssl.h"
#include "svec.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "svec.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"
@@
-114,7
+113,6
@@
main(int argc, char *argv[])
struct netflow_options nf_options;
set_program_name(argv[0]);
struct netflow_options nf_options;
set_program_name(argv[0]);
- register_fault_handlers();
time_init();
vlog_init();
parse_options(argc, argv, &s);
time_init();
vlog_init();
parse_options(argc, argv, &s);
@@
-294,7
+292,7
@@
parse_options(int argc, char *argv[], struct ofsettings *s)
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_LONG_OPTIONS
+
STREAM
_SSL_LONG_OPTIONS
{"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
#endif
{0, 0, 0, 0},
{"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
#endif
{0, 0, 0, 0},
@@
-476,10
+474,10
@@
parse_options(int argc, char *argv[], struct ofsettings *s)
LEAK_CHECKER_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
LEAK_CHECKER_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_OPTION_HANDLERS
+
STREAM
_SSL_OPTION_HANDLERS
case OPT_BOOTSTRAP_CA_CERT:
case OPT_BOOTSTRAP_CA_CERT:
-
vconn
_ssl_set_ca_cert_file(optarg, true);
+
stream
_ssl_set_ca_cert_file(optarg, true);
break;
#endif
break;
#endif
@@
-506,7
+504,7
@@
parse_options(int argc, char *argv[], struct ofsettings *s)
/* Set accept_controller_regex. */
if (!s->accept_controller_re) {
s->accept_controller_re
/* Set accept_controller_regex. */
if (!s->accept_controller_re) {
s->accept_controller_re
- =
vconn
_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*";
+ =
stream
_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*";
}
/* Mode of operation. */
}
/* Mode of operation. */