From 557092898d7ac9d7451d565720c56fba811494e8 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 7 Jan 2010 13:59:44 -0800 Subject: [PATCH] stream: Really enable SSL streams. 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 8d97afe9..dcd8da58 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 f964d348..9bc3f8c5 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 1ae50bf5..b3d78418 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 694c308a..f39a0325 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 \ -- 2.30.2