From 6a50035b242b972c1d9b659ba63e037a0a8afe71 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Fri, 29 Dec 2017 14:21:20 -0800 Subject: fixes #166 Websocket TLS mapping This introduces the wss:// scheme, which is available and works like the ws:// scheme if TLS is enabled in the library. The library modularization is refactored somewhat, to make it easier to use. There is now a single NNG_ENABLE_TLS that enables TLS support under the hood. This also adds a new option for the TLS transport, NNG_OPT_TLS_CONFIG (and a similar one for WSS, NNG_OPT_TLS_WSS_CONFIG) that offer access to the underlying TLS configuration object, which now has a public API to go with it as well. Note that it is also possible to use pure HTTPS using the *private* API, which will be exposed in a public form soon. --- tests/multistress.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/multistress.c') diff --git a/tests/multistress.c b/tests/multistress.c index 7088ac14..6a41a551 100644 --- a/tests/multistress.c +++ b/tests/multistress.c @@ -44,7 +44,7 @@ const char *inproc_template = "inproc://nng_multistress_%d"; const char *ipc_template = "ipc:///tmp/nng_multistress_%d"; const char *templates[] = { -#ifdef NNG_HAVE_TCP +#ifdef NNG_TRANSPORT_TCP "tcp://127.0.0.1:%d", #endif // It would be nice to test TCPv6, but CI doesn't support it. @@ -52,10 +52,10 @@ const char *templates[] = { #ifdef NNG_TEST_TCPV6 "tcp://[::1]:%d", #endif -#ifdef NNG_HAVE_INPROC +#ifdef NNG_TRANSPORT_INPROC "inproc://nng_multistress_%d", #endif -#ifdef NNG_HAVE_IPC +#ifdef NNG_TRANSPORT_IPC "ipc:///tmp/nng_multistress_%d", #endif }; -- cgit v1.2.3-70-g09d2