diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-01-01 22:12:07 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-01-01 22:12:07 -0800 |
| commit | 1e945e873d3bd791354dec504e42025502c6042f (patch) | |
| tree | 8c7aafedabd36bb0ecb65da68acf8818aba78aa1 /src/transport/ws | |
| parent | 7e83c78ad2c98a7c32a1b9557deaa13723e75b02 (diff) | |
| download | nng-1e945e873d3bd791354dec504e42025502c6042f.tar.gz nng-1e945e873d3bd791354dec504e42025502c6042f.tar.bz2 nng-1e945e873d3bd791354dec504e42025502c6042f.zip | |
Fix HTTP sconn race, and compile bugs introduced.
Diffstat (limited to 'src/transport/ws')
| -rw-r--r-- | src/transport/ws/websocket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/transport/ws/websocket.c b/src/transport/ws/websocket.c index 1162338e..5a5a4b00 100644 --- a/src/transport/ws/websocket.c +++ b/src/transport/ws/websocket.c @@ -603,7 +603,7 @@ ws_ep_fini(void *arg) nni_mtx_fini(&ep->mtx); #ifdef NNG_TRANSPORT_WSS if (ep->tls) { - nng_tls_config_fini(ep->tls); + nni_tls_config_fini(ep->tls); } #endif NNI_FREE_STRUCT(ep); @@ -706,7 +706,7 @@ ws_ep_init(void **epp, const char *url, nni_sock *sock, int mode) #ifdef NNG_TRANSPORT_WSS if (strncmp(url, "wss://", 4) == 0) { - rv = nng_tls_config_init(&ep->tls, + rv = nni_tls_config_init(&ep->tls, mode == NNI_EP_MODE_DIAL ? NNG_TLS_MODE_CLIENT : NNG_TLS_MODE_SERVER); if (rv != 0) { @@ -817,7 +817,7 @@ wss_ep_setopt_tlsconfig(void *arg, const void *v, size_t sz) } if (rv == 0) { if (ep->tls != NULL) { - nng_tls_config_fini(ep->tls); + nni_tls_config_fini(ep->tls); } nni_tls_config_hold(cfg); ep->tls = cfg; |