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 /utilities/ovs-openflowd.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 'utilities/ovs-openflowd.c')
| -rw-r--r-- | utilities/ovs-openflowd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 7c61dbea1..8307891ad 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -39,11 +39,11 @@ #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 "vconn-ssl.h" #include "vconn.h" #include "vlog.h" @@ -294,7 +294,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) 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}, @@ -476,10 +476,10 @@ parse_options(int argc, char *argv[], struct ofsettings *s) LEAK_CHECKER_OPTION_HANDLERS #ifdef HAVE_OPENSSL - VCONN_SSL_OPTION_HANDLERS + STREAM_SSL_OPTION_HANDLERS case OPT_BOOTSTRAP_CA_CERT: - vconn_ssl_set_ca_cert_file(optarg, true); + stream_ssl_set_ca_cert_file(optarg, true); break; #endif @@ -506,7 +506,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) /* 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. */ |