fixes #872 create unified nng_stream API

This is a major change, and includes changes to use a polymorphic
stream API for all transports.  There have been related bugs fixed
along the way.  Additionally the man pages have changed.

The old non-polymorphic APIs are removed now.  This is a breaking
change, but the old APIs were never part of any released public API.

1 files changed, 81 insertions, 114 deletions

diff --git a/src/platform/windows/win_tcpconn.c b/src/platform/windows/win_tcpconn.c
index 54d22dea..c77bbc72 100644
--- a/src/platform/windows/win_tcpconn.c
+++ b/src/platform/windows/win_tcpconn.c
@@ -1,5 +1,5 @@
 //
-// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2019 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 // Copyright 2018 Devolutions <info@devolutions.net>
 //
@@ -110,8 +110,8 @@ tcp_recv_cancel(nni_aio *aio, void *arg, int rv)
 	nni_mtx_unlock(&c->mtx);
 }
 
-void
-nni_tcp_conn_recv(nni_tcp_conn *c, nni_aio *aio)
+static void
+tcp_recv(nni_tcp_conn *c, nni_aio *aio)
 {
 	int rv;
 
@@ -225,10 +225,11 @@ tcp_send_cb(nni_win_io *io, int rv, size_t num)
 	nni_aio_finish_synch(aio, rv, num);
 }
 
-void
-nni_tcp_conn_send(nni_tcp_conn *c, nni_aio *aio)
+static void
+tcp_send(void *arg, nni_aio *aio)
 {
-	int rv;
+	nni_tcp_conn *c = arg;
+	int           rv;
 
 	if (nni_aio_begin(aio) != 0) {
 		return;
@@ -251,49 +252,10 @@ nni_tcp_conn_send(nni_tcp_conn *c, nni_aio *aio)
 	nni_mtx_unlock(&c->mtx);
 }
 
-int
-nni_win_tcp_conn_init(nni_tcp_conn **connp, SOCKET s)
-{
-	nni_tcp_conn *c;
-	int           rv;
-	BOOL          yes;
-	DWORD         no;
-
-	// Don't inherit the handle (CLOEXEC really).
-	SetHandleInformation((HANDLE) s, HANDLE_FLAG_INHERIT, 0);
-
-	if ((c = NNI_ALLOC_STRUCT(c)) == NULL) {
-		return (NNG_ENOMEM);
-	}
-	c->s = INVALID_SOCKET;
-	nni_mtx_init(&c->mtx);
-	nni_cv_init(&c->cv, &c->mtx);
-	nni_aio_list_init(&c->recv_aios);
-	nni_aio_list_init(&c->send_aios);
-	c->conn_aio = NULL;
-
-	if (((rv = nni_win_io_init(&c->recv_io, tcp_recv_cb, c)) != 0) ||
-	    ((rv = nni_win_io_init(&c->send_io, tcp_send_cb, c)) != 0) ||
-	    ((rv = nni_win_io_register((HANDLE) s)) != 0)) {
-		nni_tcp_conn_fini(c);
-		return (rv);
-	}
-
-	no = 0;
-	(void) setsockopt(
-	    s, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &no, sizeof(no));
-	yes = 1;
-	(void) setsockopt(
-	    s, IPPROTO_TCP, TCP_NODELAY, (char *) &yes, sizeof(yes));
-
-	c->s   = s;
-	*connp = c;
-	return (0);
-}
-
-void
-nni_tcp_conn_close(nni_tcp_conn *c)
+static void
+tcp_close(void *arg)
 {
+	nni_tcp_conn *c = arg;
 	nni_mtx_lock(&c->mtx);
 	if (!c->closed) {
 		c->closed = true;
@@ -310,50 +272,8 @@ nni_tcp_conn_close(nni_tcp_conn *c)
 	nni_mtx_unlock(&c->mtx);
 }
 
-int
-nni_tcp_conn_peername(nni_tcp_conn *c, nni_sockaddr *sa)
-{
-	if (nni_win_sockaddr2nn(sa, &c->peername) < 0) {
-		return (NNG_EADDRINVAL);
-	}
-	return (0);
-}
-
-int
-nni_tcp_conn_sockname(nni_tcp_conn *c, nni_sockaddr *sa)
-{
-	if (nni_win_sockaddr2nn(sa, &c->sockname) < 0) {
-		return (NNG_EADDRINVAL);
-	}
-	return (0);
-}
-
-int
-nni_tcp_conn_set_nodelay(nni_tcp_conn *c, bool val)
-{
-	BOOL b;
-	b = val ? TRUE : FALSE;
-	if (setsockopt(
-	        c->s, IPPROTO_TCP, TCP_NODELAY, (void *) &b, sizeof(b)) != 0) {
-		return (nni_win_error(WSAGetLastError()));
-	}
-	return (0);
-}
-
-int
-nni_tcp_conn_set_keepalive(nni_tcp_conn *c, bool val)
-{
-	BOOL b;
-	b = val ? TRUE : FALSE;
-	if (setsockopt(
-	        c->s, SOL_SOCKET, SO_KEEPALIVE, (void *) &b, sizeof(b)) != 0) {
-		return (nni_win_error(WSAGetLastError()));
-	}
-	return (0);
-}
-
 static int
-tcp_conn_get_peername(void *arg, void *buf, size_t *szp, nni_type t)
+tcp_get_peername(void *arg, void *buf, size_t *szp, nni_type t)
 {
 	nni_tcp_conn *c = arg;
 	nng_sockaddr  sa;
@@ -365,7 +285,7 @@ tcp_conn_get_peername(void *arg, void *buf, size_t *szp, nni_type t)
 }
 
 static int
-tcp_conn_get_sockname(void *arg, void *buf, size_t *szp, nni_type t)
+tcp_get_sockname(void *arg, void *buf, size_t *szp, nni_type t)
 {
 	nni_tcp_conn *c = arg;
 	nng_sockaddr  sa;
@@ -377,7 +297,7 @@ tcp_conn_get_sockname(void *arg, void *buf, size_t *szp, nni_type t)
 }
 
 static int
-tcp_conn_set_nodelay(void *arg, const void *buf, size_t sz, nni_type t)
+tcp_set_nodelay(void *arg, const void *buf, size_t sz, nni_type t)
 {
 	nni_tcp_conn *c = arg;
 	bool          val;
@@ -395,7 +315,7 @@ tcp_conn_set_nodelay(void *arg, const void *buf, size_t sz, nni_type t)
 }
 
 static int
-tcp_conn_set_keepalive(void *arg, const void *buf, size_t sz, nni_type t)
+tcp_set_keepalive(void *arg, const void *buf, size_t sz, nni_type t)
 {
 	nni_tcp_conn *c = arg;
 	bool          val;
@@ -414,7 +334,7 @@ tcp_conn_set_keepalive(void *arg, const void *buf, size_t sz, nni_type t)
 }
 
 static int
-tcp_conn_get_nodelay(void *arg, void *buf, size_t *szp, nni_type t)
+tcp_get_nodelay(void *arg, void *buf, size_t *szp, nni_type t)
 {
 	nni_tcp_conn *c   = arg;
 	BOOL          b   = 0;
@@ -428,7 +348,7 @@ tcp_conn_get_nodelay(void *arg, void *buf, size_t *szp, nni_type t)
 }
 
 static int
-tcp_conn_get_keepalive(void *arg, void *buf, size_t *szp, nni_type t)
+tcp_get_keepalive(void *arg, void *buf, size_t *szp, nni_type t)
 {
 	nni_tcp_conn *c   = arg;
 	BOOL          b   = 0;
@@ -441,48 +361,49 @@ tcp_conn_get_keepalive(void *arg, void *buf, size_t *szp, nni_type t)
 	return (nni_copyout_bool(b, buf, szp, t));
 }
 
-static const nni_option tcp_conn_options[] = {
+static const nni_option tcp_options[] = {
 	{
 	    .o_name = NNG_OPT_REMADDR,
-	    .o_get  = tcp_conn_get_peername,
+	    .o_get  = tcp_get_peername,
 	},
 	{
 	    .o_name = NNG_OPT_LOCADDR,
-	    .o_get  = tcp_conn_get_sockname,
+	    .o_get  = tcp_get_sockname,
 	},
 	{
 	    .o_name = NNG_OPT_TCP_NODELAY,
-	    .o_get  = tcp_conn_get_nodelay,
-	    .o_set  = tcp_conn_set_nodelay,
+	    .o_get  = tcp_get_nodelay,
+	    .o_set  = tcp_set_nodelay,
 	},
 	{
 	    .o_name = NNG_OPT_TCP_KEEPALIVE,
-	    .o_get  = tcp_conn_get_keepalive,
-	    .o_set  = tcp_conn_set_keepalive,
+	    .o_get  = tcp_get_keepalive,
+	    .o_set  = tcp_set_keepalive,
 	},
 	{
 	    .o_name = NULL,
 	},
 };
 
-int
-nni_tcp_conn_getopt(
-    nni_tcp_conn *c, const char *name, void *buf, size_t *szp, nni_type t)
+static int
+tcp_getx(void *arg, const char *name, void *buf, size_t *szp, nni_type t)
 {
-	return (nni_getopt(tcp_conn_options, name, c, buf, szp, t));
+	nni_tcp_conn *c = arg;
+	return (nni_getopt(tcp_options, name, c, buf, szp, t));
 }
 
-int
-nni_tcp_conn_setopt(
-    nni_tcp_conn *c, const char *name, const void *buf, size_t sz, nni_type t)
+static int
+tcp_setx(void *arg, const char *name, const void *buf, size_t sz, nni_type t)
 {
-	return (nni_setopt(tcp_conn_options, name, c, buf, sz, t));
+	nni_tcp_conn *c = arg;
+	return (nni_setopt(tcp_options, name, c, buf, sz, t));
 }
 
-void
-nni_tcp_conn_fini(nni_tcp_conn *c)
+static void
+tcp_free(void *arg)
 {
-	nni_tcp_conn_close(c);
+	nni_tcp_conn *c = arg;
+	tcp_close(c);
 
 	nni_mtx_lock(&c->mtx);
 	while ((!nni_list_empty(&c->recv_aios)) ||
@@ -502,3 +423,49 @@ nni_tcp_conn_fini(nni_tcp_conn *c)
 	nni_mtx_fini(&c->mtx);
 	NNI_FREE_STRUCT(c);
 }
+
+int
+nni_win_tcp_conn_init(nni_tcp_conn **connp, SOCKET s)
+{
+	nni_tcp_conn *c;
+	int           rv;
+	BOOL          yes;
+	DWORD         no;
+
+	// Don't inherit the handle (CLOEXEC really).
+	SetHandleInformation((HANDLE) s, HANDLE_FLAG_INHERIT, 0);
+
+	if ((c = NNI_ALLOC_STRUCT(c)) == NULL) {
+		return (NNG_ENOMEM);
+	}
+	c->s = INVALID_SOCKET;
+	nni_mtx_init(&c->mtx);
+	nni_cv_init(&c->cv, &c->mtx);
+	nni_aio_list_init(&c->recv_aios);
+	nni_aio_list_init(&c->send_aios);
+	c->conn_aio    = NULL;
+	c->ops.s_close = tcp_close;
+	c->ops.s_free  = tcp_free;
+	c->ops.s_send  = tcp_send;
+	c->ops.s_recv  = tcp_recv;
+	c->ops.s_getx  = tcp_getx;
+	c->ops.s_setx  = tcp_setx;
+
+	if (((rv = nni_win_io_init(&c->recv_io, tcp_recv_cb, c)) != 0) ||
+	    ((rv = nni_win_io_init(&c->send_io, tcp_send_cb, c)) != 0) ||
+	    ((rv = nni_win_io_register((HANDLE) s)) != 0)) {
+		tcp_free(c);
+		return (rv);
+	}
+
+	no = 0;
+	(void) setsockopt(
+	    s, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &no, sizeof(no));
+	yes = 1;
+	(void) setsockopt(
+	    s, IPPROTO_TCP, TCP_NODELAY, (char *) &yes, sizeof(yes));
+
+	c->s   = s;
+	*connp = c;
+	return (0);
+}