Replace NNG_OPT_SUB_SUBSCRIBE/UNSUBSCRIBE with functions.

The main purpose is to eliminate the NNI_TYPE_OPAQUE options,
by putting these into their own first class, protocol-specific, functions.

4 files changed, 119 insertions, 82 deletions

diff --git a/src/sp/protocol/pubsub0/pub_test.c b/src/sp/protocol/pubsub0/pub_test.c
index 733d6fb5..f3cf6e2d 100644
--- a/src/sp/protocol/pubsub0/pub_test.c
+++ b/src/sp/protocol/pubsub0/pub_test.c
@@ -141,7 +141,7 @@ test_pub_send_queued(void)
 	// test to be really meaningful.
 	NUTS_PASS(nng_pub0_open(&pub));
 	NUTS_PASS(nng_sub0_open(&sub));
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, "", 0));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "", 0));
 	NUTS_PASS(nng_socket_set_int(pub, NNG_OPT_SENDBUF, 10));
 	NUTS_PASS(nng_socket_set_int(sub, NNG_OPT_RECVBUF, 10));
 	NUTS_PASS(nng_socket_set_ms(pub, NNG_OPT_SENDTIMEO, 1000));
diff --git a/src/sp/protocol/pubsub0/sub.c b/src/sp/protocol/pubsub0/sub.c
index 5d6a2a05..a4741114 100644
--- a/src/sp/protocol/pubsub0/sub.c
+++ b/src/sp/protocol/pubsub0/sub.c
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include "core/nng_impl.h"
+#include "core/socket.h"
 #include "nng/protocol/pubsub0/sub.h"
 
 // Subscriber protocol.  The SUB protocol receives messages sent to
@@ -454,13 +455,11 @@ sub0_ctx_set_recv_buf_len(void *arg, const void *buf, size_t sz, nni_type t)
 // to replace this with a patricia trie, like old nanomsg had.
 
 static int
-sub0_ctx_subscribe(void *arg, const void *buf, size_t sz, nni_type t)
+sub0_ctx_subscribe(sub0_ctx *ctx, const void *buf, size_t sz)
 {
-	sub0_ctx   *ctx  = arg;
 	sub0_sock  *sock = ctx->sock;
 	sub0_topic *topic;
 	sub0_topic *new_topic;
-	NNI_ARG_UNUSED(t);
 
 	nni_mtx_lock(&sock->lk);
 	NNI_LIST_FOREACH (&ctx->topics, topic) {
@@ -492,13 +491,11 @@ sub0_ctx_subscribe(void *arg, const void *buf, size_t sz, nni_type t)
 }
 
 static int
-sub0_ctx_unsubscribe(void *arg, const void *buf, size_t sz, nni_type t)
+sub0_ctx_unsubscribe(sub0_ctx *ctx, const void *buf, size_t sz)
 {
-	sub0_ctx   *ctx  = arg;
 	sub0_sock  *sock = ctx->sock;
 	sub0_topic *topic;
 	size_t      len;
-	NNI_ARG_UNUSED(t);
 
 	nni_mtx_lock(&sock->lk);
 	NNI_LIST_FOREACH (&ctx->topics, topic) {
@@ -580,14 +577,6 @@ static nni_option sub0_ctx_options[] = {
 	    .o_set  = sub0_ctx_set_recv_buf_len,
 	},
 	{
-	    .o_name = NNG_OPT_SUB_SUBSCRIBE,
-	    .o_set  = sub0_ctx_subscribe,
-	},
-	{
-	    .o_name = NNG_OPT_SUB_UNSUBSCRIBE,
-	    .o_set  = sub0_ctx_unsubscribe,
-	},
-	{
 	    .o_name = NNG_OPT_SUB_PREFNEW,
 	    .o_get  = sub0_ctx_get_prefer_new,
 	    .o_set  = sub0_ctx_set_prefer_new,
@@ -637,20 +626,6 @@ sub0_sock_set_recv_buf_len(void *arg, const void *buf, size_t sz, nni_type t)
 }
 
 static int
-sub0_sock_subscribe(void *arg, const void *buf, size_t sz, nni_type t)
-{
-	sub0_sock *sock = arg;
-	return (sub0_ctx_subscribe(&sock->master, buf, sz, t));
-}
-
-static int
-sub0_sock_unsubscribe(void *arg, const void *buf, size_t sz, nni_type t)
-{
-	sub0_sock *sock = arg;
-	return (sub0_ctx_unsubscribe(&sock->master, buf, sz, t));
-}
-
-static int
 sub0_sock_get_prefer_new(void *arg, void *buf, size_t *szp, nni_type t)
 {
 	sub0_sock *sock = arg;
@@ -686,14 +661,6 @@ static nni_proto_ctx_ops sub0_ctx_ops = {
 
 static nni_option sub0_sock_options[] = {
 	{
-	    .o_name = NNG_OPT_SUB_SUBSCRIBE,
-	    .o_set  = sub0_sock_subscribe,
-	},
-	{
-	    .o_name = NNG_OPT_SUB_UNSUBSCRIBE,
-	    .o_set  = sub0_sock_unsubscribe,
-	},
-	{
 	    .o_name = NNG_OPT_RECVBUF,
 	    .o_get  = sub0_sock_get_recv_buf_len,
 	    .o_set  = sub0_sock_set_recv_buf_len,
@@ -736,3 +703,91 @@ nng_sub0_open(nng_socket *sock)
 {
 	return (nni_proto_open(sock, &sub0_proto));
 }
+
+int
+nng_sub0_socket_subscribe(nng_socket id, const void *buf, size_t sz)
+{
+	int        rv;
+	nni_sock  *s;
+	sub0_sock *sock;
+
+	if (((rv = nni_init()) != 0) ||
+	    ((rv = nni_sock_find(&s, id.id)) != 0)) {
+		return (rv);
+	}
+	// validate the socket type
+	if (nni_sock_proto_ops(s)->sock_init != sub0_sock_init) {
+		nni_sock_rele(s);
+		return (NNG_ENOTSUP);
+	}
+	sock = nni_sock_proto_data(s);
+	rv   = sub0_ctx_subscribe(&sock->master, buf, sz);
+	nni_sock_rele(s);
+	return (rv);
+}
+
+int
+nng_sub0_socket_unsubscribe(nng_socket id, const void *buf, size_t sz)
+{
+	int        rv;
+	nni_sock  *s;
+	sub0_sock *sock;
+
+	if (((rv = nni_init()) != 0) ||
+	    ((rv = nni_sock_find(&s, id.id)) != 0)) {
+		return (rv);
+	}
+	// validate the socket type
+	if (nni_sock_proto_ops(s)->sock_init != sub0_sock_init) {
+		nni_sock_rele(s);
+		return (NNG_ENOTSUP);
+	}
+	sock = nni_sock_proto_data(s);
+	rv   = sub0_ctx_unsubscribe(&sock->master, buf, sz);
+	nni_sock_rele(s);
+	return (rv);
+}
+
+int
+nng_sub0_ctx_subscribe(nng_ctx id, const void *buf, size_t sz)
+{
+	int       rv;
+	nni_ctx  *c;
+	sub0_ctx *ctx;
+
+	if (((rv = nni_init()) != 0) ||
+	    ((rv = nni_ctx_find(&c, id.id, false)) != 0)) {
+		return (rv);
+	}
+	// validate the socket type
+	if (nni_ctx_proto_ops(c)->ctx_init != sub0_ctx_init) {
+		nni_ctx_rele(c);
+		return (NNG_ENOTSUP);
+	}
+	ctx = nni_ctx_proto_data(c);
+	rv  = sub0_ctx_subscribe(ctx, buf, sz);
+	nni_ctx_rele(c);
+	return (rv);
+}
+
+int
+nng_sub0_ctx_unsubscribe(nng_ctx id, const void *buf, size_t sz)
+{
+	int       rv;
+	nni_ctx  *c;
+	sub0_ctx *ctx;
+
+	if (((rv = nni_init()) != 0) ||
+	    ((rv = nni_ctx_find(&c, id.id, false)) != 0)) {
+		return (rv);
+	}
+	// validate the socket type
+	if (nni_ctx_proto_ops(c)->ctx_init != sub0_ctx_init) {
+		nni_ctx_rele(c);
+		return (NNG_ENOTSUP);
+	}
+	ctx = nni_ctx_proto_data(c);
+	rv  = sub0_ctx_unsubscribe(ctx, buf, sz);
+	nni_ctx_rele(c);
+	return (rv);
+}
diff --git a/src/sp/protocol/pubsub0/sub_test.c b/src/sp/protocol/pubsub0/sub_test.c
index 9802a35e..9929de64 100644
--- a/src/sp/protocol/pubsub0/sub_test.c
+++ b/src/sp/protocol/pubsub0/sub_test.c
@@ -82,7 +82,7 @@ test_sub_poll_readable(void)
 
 	NUTS_PASS(nng_sub0_open(&sub));
 	NUTS_PASS(nng_pub0_open(&pub));
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, "a", 1));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "a", 1));
 	NUTS_PASS(nng_socket_set_ms(sub, NNG_OPT_RECVTIMEO, 1000));
 	NUTS_PASS(nng_socket_set_ms(pub, NNG_OPT_SENDTIMEO, 1000));
 	NUTS_PASS(nng_socket_get_recv_poll_fd(sub, &fd));
@@ -126,7 +126,7 @@ test_sub_recv_late(void)
 	NUTS_PASS(nng_sub0_open(&sub));
 	NUTS_PASS(nng_pub0_open(&pub));
 	NUTS_PASS(nng_aio_alloc(&aio, NULL, NULL));
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, "", 0));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "", 0));
 	NUTS_PASS(nng_socket_set_ms(sub, NNG_OPT_RECVTIMEO, 1000));
 	NUTS_PASS(nng_socket_set_ms(pub, NNG_OPT_SENDTIMEO, 1000));
 	NUTS_PASS(nng_socket_get_recv_poll_fd(sub, &fd));
@@ -325,19 +325,11 @@ test_sub_recv_buf_option(void)
 static void
 test_sub_subscribe_option(void)
 {
-	nng_socket  sub;
-	size_t      sz;
-	int         v;
-	const char *opt = NNG_OPT_SUB_SUBSCRIBE;
-
+	nng_socket sub;
 	NUTS_PASS(nng_sub0_open(&sub));
 
-	NUTS_PASS(nng_socket_set(sub, opt, "abc", 3));
-	NUTS_PASS(nng_socket_set(sub, opt, "abc", 3)); // duplicate
-	NUTS_PASS(nng_socket_set_bool(sub, opt, false));
-	NUTS_PASS(nng_socket_set_int(sub, opt, 32));
-	sz = sizeof(v);
-	NUTS_FAIL(nng_socket_get(sub, opt, &v, &sz), NNG_EWRITEONLY);
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "abc", 3));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "abc", 3)); // duplicate
 
 	NUTS_CLOSE(sub);
 }
@@ -345,23 +337,14 @@ test_sub_subscribe_option(void)
 static void
 test_sub_unsubscribe_option(void)
 {
-	nng_socket  sub;
-	size_t      sz;
-	int         v;
-	const char *opt1 = NNG_OPT_SUB_SUBSCRIBE;
-	const char *opt2 = NNG_OPT_SUB_UNSUBSCRIBE;
+	nng_socket sub;
 
 	NUTS_PASS(nng_sub0_open(&sub));
 
-	NUTS_PASS(nng_socket_set(sub, opt1, "abc", 3));
-	NUTS_FAIL(nng_socket_set(sub, opt2, "abc123", 6), NNG_ENOENT);
-	NUTS_PASS(nng_socket_set(sub, opt2, "abc", 3));
-	NUTS_FAIL(nng_socket_set(sub, opt2, "abc", 3), NNG_ENOENT);
-	NUTS_PASS(nng_socket_set_int(sub, opt1, 32));
-	NUTS_FAIL(nng_socket_set_int(sub, opt2, 23), NNG_ENOENT);
-	NUTS_PASS(nng_socket_set_int(sub, opt2, 32));
-	sz = sizeof(v);
-	NUTS_FAIL(nng_socket_get(sub, opt2, &v, &sz), NNG_EWRITEONLY);
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "abc", 3));
+	NUTS_FAIL(nng_sub0_socket_unsubscribe(sub, "abc123", 6), NNG_ENOENT);
+	NUTS_PASS(nng_sub0_socket_unsubscribe(sub, "abc", 3));
+	NUTS_FAIL(nng_sub0_socket_unsubscribe(sub, "abc", 3), NNG_ENOENT);
 
 	NUTS_CLOSE(sub);
 }
@@ -403,7 +386,7 @@ test_sub_drop_new(void)
 	NUTS_PASS(nng_pub0_open(&pub));
 	NUTS_PASS(nng_socket_set_int(sub, NNG_OPT_RECVBUF, 2));
 	NUTS_PASS(nng_socket_set_bool(sub, NNG_OPT_SUB_PREFNEW, false));
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, NULL, 0));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, NULL, 0));
 	NUTS_PASS(nng_socket_set_ms(sub, NNG_OPT_RECVTIMEO, 200));
 	NUTS_PASS(nng_socket_set_ms(pub, NNG_OPT_SENDTIMEO, 1000));
 	NUTS_MARRY(pub, sub);
@@ -429,7 +412,7 @@ test_sub_drop_old(void)
 	NUTS_PASS(nng_pub0_open(&pub));
 	NUTS_PASS(nng_socket_set_int(sub, NNG_OPT_RECVBUF, 2));
 	NUTS_PASS(nng_socket_set_bool(sub, NNG_OPT_SUB_PREFNEW, true));
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, NULL, 0));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, NULL, 0));
 	NUTS_PASS(nng_socket_set_ms(sub, NNG_OPT_RECVTIMEO, 200));
 	NUTS_PASS(nng_socket_set_ms(pub, NNG_OPT_SENDTIMEO, 1000));
 	NUTS_MARRY(pub, sub);
@@ -459,10 +442,10 @@ test_sub_filter(void)
 	NUTS_PASS(nng_socket_set_int(sub, NNG_OPT_RECVBUF, 10));
 
 	// Set up some default filters
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, "abc", 3));
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, "def", 3));
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, "ghi", 3));
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_SUBSCRIBE, "jkl", 3));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "abc", 3));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "def", 3));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "ghi", 3));
+	NUTS_PASS(nng_sub0_socket_subscribe(sub, "jkl", 3));
 
 	NUTS_MARRY(pub, sub);
 
@@ -474,7 +457,7 @@ test_sub_filter(void)
 	NUTS_PASS(nng_send(pub, "jkl-mno", 6, 0));
 
 	NUTS_SLEEP(100);
-	NUTS_PASS(nng_socket_set(sub, NNG_OPT_SUB_UNSUBSCRIBE, "ghi", 3));
+	NUTS_PASS(nng_sub0_socket_unsubscribe(sub, "ghi", 3));
 	sz = sizeof(buf);
 	NUTS_PASS(nng_recv(sub, buf, &sz, 0));
 	NUTS_TRUE(sz == 3);
@@ -512,11 +495,11 @@ test_sub_multi_context(void)
 	NUTS_PASS(nng_ctx_open(&c1, sub));
 	NUTS_PASS(nng_ctx_open(&c2, sub));
 
-	NUTS_PASS(nng_ctx_set(c1, NNG_OPT_SUB_SUBSCRIBE, "one", 3));
-	NUTS_PASS(nng_ctx_set(c1, NNG_OPT_SUB_SUBSCRIBE, "all", 3));
+	NUTS_PASS(nng_sub0_ctx_subscribe(c1, "one", 3));
+	NUTS_PASS(nng_sub0_ctx_subscribe(c1, "all", 3));
 
-	NUTS_PASS(nng_ctx_set(c2, NNG_OPT_SUB_SUBSCRIBE, "two", 3));
-	NUTS_PASS(nng_ctx_set(c2, NNG_OPT_SUB_SUBSCRIBE, "all", 3));
+	NUTS_PASS(nng_sub0_ctx_subscribe(c2, "two", 3));
+	NUTS_PASS(nng_sub0_ctx_subscribe(c2, "all", 3));
 
 	nng_aio_set_timeout(aio1, 100);
 	nng_aio_set_timeout(aio2, 100);
diff --git a/src/sp/protocol/pubsub0/xsub_test.c b/src/sp/protocol/pubsub0/xsub_test.c
index eec73505..fdbc5632 100644
--- a/src/sp/protocol/pubsub0/xsub_test.c
+++ b/src/sp/protocol/pubsub0/xsub_test.c
@@ -7,7 +7,8 @@
 // found online at https://opensource.org/licenses/MIT.
 //
 
-#include "nng/nng.h"
+#include <nng/nng.h>
+#include <nng/protocol/pubsub0/sub.h>
 #include <nuts.h>
 
 static void
@@ -257,22 +258,20 @@ test_xsub_recv_buf_option(void)
 static void
 test_xsub_subscribe_option(void)
 {
-	nng_socket  sub;
-	const char *opt = NNG_OPT_SUB_SUBSCRIBE;
+	nng_socket sub;
 
 	NUTS_PASS(nng_sub0_open_raw(&sub));
-	NUTS_FAIL(nng_socket_set(sub, opt, "abc", 3), NNG_ENOTSUP);
+	NUTS_FAIL(nng_sub0_socket_subscribe(sub, "abc", 3), NNG_ENOTSUP);
 	NUTS_CLOSE(sub);
 }
 
 static void
 test_xsub_unsubscribe_option(void)
 {
-	nng_socket  sub;
-	const char *opt = NNG_OPT_SUB_UNSUBSCRIBE;
+	nng_socket sub;
 
 	NUTS_PASS(nng_sub0_open_raw(&sub));
-	NUTS_FAIL(nng_socket_set(sub, opt, "abc", 3), NNG_ENOTSUP);
+	NUTS_FAIL(nng_sub0_socket_unsubscribe(sub, "abc", 3), NNG_ENOTSUP);
 	NUTS_CLOSE(sub);
 }