[ovs-dev] [PATCH 6/7] stream: Really enable SSL streams.

Justin Pettit jpettit at nicira.com
Thu Jan 7 15:57:25 PST 2010


Probably a good idea.

--Justin


On Jan 7, 2010, at 3:01 PM, Ben Pfaff wrote:

> SSL streams were supposed to work, but they didn't.  Oops.
> ---
> lib/stream.c          |    6 ++++++
> tests/automake.mk     |    2 +-
> utilities/automake.mk |    2 +-
> vswitchd/automake.mk  |    2 +-
> 4 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/stream.c b/lib/stream.c
> index 8d97afe..dcd8da5 100644
> --- a/lib/stream.c
> +++ b/lib/stream.c
> @@ -48,11 +48,17 @@ enum stream_state {
> static struct stream_class *stream_classes[] = {
>     &tcp_stream_class,
>     &unix_stream_class,
> +#ifdef HAVE_OPENSSL
> +    &ssl_stream_class,
> +#endif
> };
> 
> static struct pstream_class *pstream_classes[] = {
>     &ptcp_pstream_class,
>     &punix_pstream_class,
> +#ifdef HAVE_OPENSSL
> +    &pssl_pstream_class,
> +#endif
> };
> 
> /* Check the validity of the stream class structures. */
> diff --git a/tests/automake.mk b/tests/automake.mk
> index f964d34..9bc3f8c 100644
> --- a/tests/automake.mk
> +++ b/tests/automake.mk
> @@ -109,7 +109,7 @@ tests_test_lockfile_LDADD = lib/libopenvswitch.a
> 
> noinst_PROGRAMS += tests/test-ovsdb
> tests_test_ovsdb_SOURCES = tests/test-ovsdb.c tests/idltest.c tests/idltest.h
> -tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
> +tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
> EXTRA_DIST += tests/uuidfilt.pl tests/idltest.ovsidl
> BUILT_SOURCES += tests/idltest.c tests/idltest.h
> noinst_DATA += tests/idltest.ovsschema
> diff --git a/utilities/automake.mk b/utilities/automake.mk
> index 1ae50bf..b3d7841 100644
> --- a/utilities/automake.mk
> +++ b/utilities/automake.mk
> @@ -76,7 +76,7 @@ utilities_ovs_openflowd_LDADD = \
> 	$(SSL_LIBS)
> 
> utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
> -utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a
> +utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
> 
> utilities_ovs_wdt_SOURCES = utilities/ovs-wdt.c
> 
> diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
> index 694c308..f39a032 100644
> --- a/vswitchd/automake.mk
> +++ b/vswitchd/automake.mk
> @@ -26,7 +26,7 @@ vswitchd_ovs_brcompatd_SOURCES = \
> 	vswitchd/vswitch-idl.c \
> 	vswitchd/vswitch-idl.h
> 
> -vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a
> +vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
> 
> EXTRA_DIST += \
> 	vswitchd/ovs-vswitchd.8.in \
> -- 
> 1.6.3.3
> 
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org





More information about the dev mailing list