fixes #219 transports should take URL structure instead of string address

This eliminates a bunch of redundant URL parsing, using the common
URL logic we already have in place.

While here I fixed a problem with the TLS and WSS test suites that
was failing on older Ubuntu -- apparently older versions of mbedTLS
were unhappy if selecting OPTIONAL verification without a validate
certificate chain.

2 files changed, 10 insertions, 15 deletions

diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c
index df404b81..8e75490b 100644
--- a/src/supplemental/websocket/websocket.c
+++ b/src/supplemental/websocket/websocket.c
@@ -1522,12 +1522,11 @@ err:
 }
 
 int
-nni_ws_listener_init(nni_ws_listener **wslp, const char *addr)
+nni_ws_listener_init(nni_ws_listener **wslp, nni_url *url)
 {
 	nni_ws_listener *l;
 	int              rv;
 	char *           host;
-	char *           serv;
 
 	if ((l = NNI_ALLOC_STRUCT(l)) == NULL) {
 		return (NNG_ENOMEM);
@@ -1539,7 +1538,8 @@ nni_ws_listener_init(nni_ws_listener **wslp, const char *addr)
 	NNI_LIST_INIT(&l->pend, nni_ws, node);
 	NNI_LIST_INIT(&l->reply, nni_ws, node);
 
-	if ((rv = nni_url_parse(&l->url, addr)) != 0) {
+	// make a private copy of the url structure.
+	if ((rv = nni_url_clone(&l->url, url)) != 0) {
 		nni_ws_listener_fini(l);
 		return (rv);
 	}
@@ -1548,12 +1548,7 @@ nni_ws_listener_init(nni_ws_listener **wslp, const char *addr)
 	if (strlen(host) == 0) {
 		host = NULL;
 	}
-	serv = l->url->u_port;
-	if (strlen(serv) == 0) {
-		serv = (strcmp(l->url->u_scheme, "wss") == 0) ? "443" : "80";
-	}
-
-	rv = nni_http_handler_init(&l->handler, l->url->u_path, ws_handler);
+	rv = nni_http_handler_init(&l->handler, url->u_path, ws_handler);
 	if (rv != 0) {
 		nni_ws_listener_fini(l);
 		return (rv);
@@ -1561,7 +1556,7 @@ nni_ws_listener_init(nni_ws_listener **wslp, const char *addr)
 
 	if (((rv = nni_http_handler_set_host(l->handler, host)) != 0) ||
 	    ((rv = nni_http_handler_set_data(l->handler, l, 0)) != 0) ||
-	    ((rv = nni_http_server_init(&l->server, addr)) != 0)) {
+	    ((rv = nni_http_server_init(&l->server, url)) != 0)) {
 		nni_ws_listener_fini(l);
 		return (rv);
 	}
@@ -1841,7 +1836,7 @@ nni_ws_dialer_fini(nni_ws_dialer *d)
 }
 
 int
-nni_ws_dialer_init(nni_ws_dialer **dp, const char *addr)
+nni_ws_dialer_init(nni_ws_dialer **dp, nni_url *url)
 {
 	nni_ws_dialer *d;
 	int            rv;
@@ -1853,12 +1848,12 @@ nni_ws_dialer_init(nni_ws_dialer **dp, const char *addr)
 	NNI_LIST_INIT(&d->wspend, nni_ws, node);
 	nni_mtx_init(&d->mtx);
 
-	if ((rv = nni_url_parse(&d->url, addr)) != 0) {
+	if ((rv = nni_url_clone(&d->url, url)) != 0) {
 		nni_ws_dialer_fini(d);
 		return (rv);
 	}
 
-	if ((rv = nni_http_client_init(&d->client, addr)) != 0) {
+	if ((rv = nni_http_client_init(&d->client, url)) != 0) {
 		nni_ws_dialer_fini(d);
 		return (rv);
 	}
diff --git a/src/supplemental/websocket/websocket.h b/src/supplemental/websocket/websocket.h
index ddd09b72..2cabb9cc 100644
--- a/src/supplemental/websocket/websocket.h
+++ b/src/supplemental/websocket/websocket.h
@@ -29,7 +29,7 @@ typedef int (*nni_ws_listen_hook)(void *, nni_http_req *, nni_http_res *);
 // on INADDR_ANY port 80, with path "/".  For connect side, INADDR_ANY
 // makes no sense.  (TBD: return NNG_EADDRINVAL, or try loopback?)
 
-extern int  nni_ws_listener_init(nni_ws_listener **, const char *);
+extern int  nni_ws_listener_init(nni_ws_listener **, nni_url *);
 extern void nni_ws_listener_fini(nni_ws_listener *);
 extern void nni_ws_listener_close(nni_ws_listener *);
 extern int  nni_ws_listener_proto(nni_ws_listener *, const char *);
@@ -40,7 +40,7 @@ extern void nni_ws_listener_hook(
 extern int nni_ws_listener_set_tls(nni_ws_listener *, nng_tls_config *);
 extern int nni_ws_listener_get_tls(nni_ws_listener *, nng_tls_config **s);
 
-extern int  nni_ws_dialer_init(nni_ws_dialer **, const char *);
+extern int  nni_ws_dialer_init(nni_ws_dialer **, nni_url *);
 extern void nni_ws_dialer_fini(nni_ws_dialer *);
 extern void nni_ws_dialer_close(nni_ws_dialer *);
 extern int  nni_ws_dialer_proto(nni_ws_dialer *, const char *);