diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-01-06 14:35:20 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-01-06 14:35:20 -0800 |
| commit | fe55ad159d8fd396a9e4914a03eea93d096d03b1 (patch) | |
| tree | a93cfe10ba67e6980488d207d451cab3fb4cb8d3 /vswitchd/ovs-vswitchd.c | |
| parent | 108496163d4d7f77766c2b05c5c20131d6c436a9 (diff) | |
| download | openvswitch-fe55ad159d8fd396a9e4914a03eea93d096d03b1.tar.gz | |
vconn: Reimplement in terms of the "stream" abstraction.
This reduces the amount of redundancy in the source tree, by making all of
the current implementations of a vconn simply delegate to the "stream"
abstraction.
Diffstat (limited to 'vswitchd/ovs-vswitchd.c')
| -rw-r--r-- | vswitchd/ovs-vswitchd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 606285df6..1d1fa291f 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -36,12 +36,12 @@ #include "proc-net-compat.h" #include "process.h" #include "signals.h" +#include "stream-ssl.h" #include "stream.h" #include "svec.h" #include "timeval.h" #include "unixctl.h" #include "util.h" -#include "vconn-ssl.h" #include "vconn.h" #include "vswitchd/vswitch-idl.h" @@ -148,7 +148,7 @@ parse_options(int argc, char *argv[]) VLOG_LONG_OPTIONS, LEAK_CHECKER_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}, @@ -183,12 +183,13 @@ parse_options(int argc, char *argv[]) VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS - VCONN_SSL_OPTION_HANDLERS LEAK_CHECKER_OPTION_HANDLERS #ifdef HAVE_OPENSSL + STREAM_SSL_OPTION_HANDLERS + case OPT_PEER_CA_CERT: - vconn_ssl_set_peer_ca_cert_file(optarg); + stream_ssl_set_peer_ca_cert_file(optarg); break; #endif |