Remove untyped nng_socket_get and nng_socket_set.

19 files changed, 30 insertions, 298 deletions

diff --git a/src/core/buf_size_test.c b/src/core/buf_size_test.c
index 78678d66..b33a713b 100644
--- a/src/core/buf_size_test.c
+++ b/src/core/buf_size_test.c
@@ -1,5 +1,5 @@
 //
-// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -19,7 +19,6 @@ test_buffer_options(void)
 {
 	nng_socket s1;
 	int        val;
-	size_t     sz;
 	char      *opt;
 
 	char *cases[] = {
@@ -33,87 +32,21 @@ test_buffer_options(void)
 
 		NUTS_CASE(opt);
 
-		// Can't receive a size into zero bytes.
-		sz = 0;
-		NUTS_FAIL(nng_socket_get(s1, opt, &val, &sz), NNG_EINVAL);
-
 		// Can set a valid size
 		NUTS_PASS(nng_socket_set_int(s1, opt, 1234));
 		NUTS_PASS(nng_socket_get_int(s1, opt, &val));
 		NUTS_TRUE(val == 1234);
 
-		val = 0;
-		sz  = sizeof(val);
-		NUTS_PASS(nng_socket_get(s1, opt, &val, &sz));
-		NUTS_TRUE(val == 1234);
-		NUTS_TRUE(sz == sizeof(val));
-
 		// Can't set a negative size
 		NUTS_FAIL(nng_socket_set_int(s1, opt, -5), NNG_EINVAL);
 
-		// Can't pass a buf too small for size
-		sz  = sizeof(val) - 1;
-		val = 1;
-		NUTS_FAIL(nng_socket_set(s1, opt, &val, sz), NNG_EINVAL);
 		// Buffer sizes are limited to sane levels
 		NUTS_FAIL(nng_socket_set_int(s1, opt, 0x100000), NNG_EINVAL);
 	}
 	NUTS_PASS(nng_close(s1));
 }
 
-void
-test_buffer_legacy(void)
-{
-#if NNG_ENABLE_COMPAT
-	nng_socket s1;
-	char      *opt;
-
-	char *cases[] = {
-		NNG_OPT_RECVBUF,
-		NNG_OPT_SENDBUF,
-		NULL,
-	};
-	int legacy[] = {
-		NN_RCVBUF,
-		NN_SNDBUF,
-	};
-
-	NUTS_PASS(nng_pair1_open(&s1));
-	for (int i = 0; (opt = cases[i]) != NULL; i++) {
-		int    cnt;
-		int    os = (int) s1.id;
-		size_t sz;
-		int    nno = legacy[i];
-
-		NUTS_CASE(opt);
-
-		sz = sizeof(cnt);
-		NUTS_PASS(nng_socket_set_int(s1, opt, 10));
-		NUTS_TRUE(
-		    nn_getsockopt(os, NN_SOL_SOCKET, nno, &cnt, &sz) == 0);
-		NUTS_TRUE(cnt == 10240); // 1k multiple
-
-		cnt = 1;
-		NUTS_TRUE(
-		    nn_setsockopt(os, NN_SOL_SOCKET, nno, &cnt, sz) == 0);
-		NUTS_TRUE(
-		    nn_getsockopt(os, NN_SOL_SOCKET, nno, &cnt, &sz) == 0);
-		NUTS_TRUE(cnt == 1024); // round up!
-		NUTS_PASS(nng_socket_get_int(s1, opt, &cnt));
-		NUTS_TRUE(cnt == 1);
-
-		NUTS_TRUE(
-		    nn_setsockopt(os, NN_SOL_SOCKET, nno, &cnt, 100) == -1);
-		NUTS_TRUE(nn_errno() == EINVAL);
-	}
-	NUTS_PASS(nng_close(s1));
-#endif
-}
-
 NUTS_TESTS = {
 	{ "buffer options", test_buffer_options },
-#if NNG_ENABLE_COMPAT
-	{ "buffer legacy", test_buffer_legacy },
-#endif
 	{ NULL, NULL },
 };
diff --git a/src/core/sock_test.c b/src/core/sock_test.c
index 08ca8233..28a1201a 100644
--- a/src/core/sock_test.c
+++ b/src/core/sock_test.c
@@ -97,32 +97,32 @@ void
 test_socket_name(void)
 {
 	nng_socket s1;
-	char       name[128]; // 64 is max
 	char      *str;
 	long       id;
 	char      *end;
-	size_t     sz;
+	char      *name;
 
-	sz = sizeof(name);
 	NUTS_OPEN(s1);
-	NUTS_PASS(nng_socket_get(s1, NNG_OPT_SOCKNAME, name, &sz));
-	NUTS_TRUE(sz > 0 && sz < 64);
-	NUTS_TRUE(sz == strlen(name) + 1);
+	NUTS_PASS(nng_socket_get_string(s1, NNG_OPT_SOCKNAME, &name));
+	NUTS_TRUE(strlen(name) > 0);
+	NUTS_TRUE(strlen(name) < 64);
 	id = strtol(name, &end, 10);
 	NUTS_TRUE(id == (long) s1.id);
 	NUTS_TRUE(end != NULL && *end == '\0');
+	nng_strfree(name);
 
-	NUTS_PASS(nng_socket_set(s1, NNG_OPT_SOCKNAME, "hello", 6));
-	sz = sizeof(name);
-	NUTS_PASS(nng_socket_get(s1, NNG_OPT_SOCKNAME, name, &sz));
-	NUTS_TRUE(sz == 6);
+	NUTS_PASS(nng_socket_set_string(s1, NNG_OPT_SOCKNAME, "hello"));
+	NUTS_PASS(nng_socket_get_string(s1, NNG_OPT_SOCKNAME, &name));
 	NUTS_MATCH(name, "hello");
+	nng_strfree(name);
 
-	memset(name, 'A', 64);
-	name[64] = '\0';
+	char buf[128];
+	memset(buf, 'A', 128);
+	buf[127] = 0;
 
-	// strings must be NULL terminated
-	NUTS_FAIL(nng_socket_set(s1, NNG_OPT_SOCKNAME, name, 5), NNG_EINVAL);
+	// strings must not be too long
+	NUTS_FAIL(
+	    nng_socket_set_string(s1, NNG_OPT_SOCKNAME, buf), NNG_EINVAL);
 
 	NUTS_PASS(nng_socket_get_string(s1, NNG_OPT_SOCKNAME, &str));
 	NUTS_ASSERT(str != NULL);
@@ -137,23 +137,22 @@ void
 test_socket_name_oversize(void)
 {
 	nng_socket s1;
-	char       name[256]; // 64 is max
-	size_t     sz = sizeof(name);
+	char       buf[256]; // 64 is max
+	size_t     sz = sizeof(buf);
+	char      *name;
 
-	memset(name, 'A', sz);
+	memset(buf, 'A', sz);
 	NUTS_OPEN(s1);
 
-	NUTS_FAIL(nng_socket_set(s1, NNG_OPT_SOCKNAME, name, sz), NNG_EINVAL);
-	name[sz - 1] = '\0';
-	NUTS_FAIL(nng_socket_set(s1, NNG_OPT_SOCKNAME, name, sz), NNG_EINVAL);
+	buf[sz - 1] = '\0';
+	NUTS_FAIL(
+	    nng_socket_set_string(s1, NNG_OPT_SOCKNAME, buf), NNG_EINVAL);
 
-	strcpy(name, "hello");
-	NUTS_PASS(nng_socket_set(s1, NNG_OPT_SOCKNAME, name, sz));
-	sz = sizeof(name);
-	memset(name, 'B', sz);
-	NUTS_PASS(nng_socket_get(s1, NNG_OPT_SOCKNAME, name, &sz));
-	NUTS_TRUE(sz == 6);
+	strcpy(buf, "hello");
+	NUTS_PASS(nng_socket_set_string(s1, NNG_OPT_SOCKNAME, buf));
+	NUTS_PASS(nng_socket_get_string(s1, NNG_OPT_SOCKNAME, &name));
 	NUTS_MATCH(name, "hello");
+	nng_strfree(name);
 	NUTS_CLOSE(s1);
 }
 
@@ -371,6 +370,7 @@ test_url_option(void)
 	NUTS_PASS(nng_dialer_get_string(d, NNG_OPT_URL, &url));
 	NUTS_MATCH(url, "inproc://url2");
 	NUTS_FAIL(nng_dialer_set_string(d, NNG_OPT_URL, url), NNG_EREADONLY);
+	nng_strfree(url);
 
 	NUTS_CLOSE(s1);
 }
@@ -467,7 +467,6 @@ test_timeout_options(void)
 {
 	nng_socket   s1;
 	nng_duration to;
-	size_t       sz;
 
 	char *cases[] = {
 		NNG_OPT_RECVTIMEO,
@@ -482,33 +481,16 @@ test_timeout_options(void)
 		bool b;
 		TEST_CASE(cases[i]);
 
-		// Can't receive a duration into zero bytes.
-		sz = 0;
-		NUTS_FAIL(nng_socket_get(s1, cases[i], &to, &sz), NNG_EINVAL);
-
 		// Type mismatches
 		NUTS_FAIL(nng_socket_get_bool(s1, cases[i], &b), NNG_EBADTYPE);
-		sz = 1;
-		NUTS_FAIL(nng_socket_get(s1, cases[i], &b, &sz), NNG_EINVAL);
 
 		// Can set a valid duration
 		NUTS_PASS(nng_socket_set_ms(s1, cases[i], 1234));
 		NUTS_PASS(nng_socket_get_ms(s1, cases[i], &to));
 		NUTS_TRUE(to == 1234);
 
-		to = 0;
-		sz = sizeof(to);
-		NUTS_PASS(nng_socket_get(s1, cases[i], &to, &sz));
-		NUTS_TRUE(to == 1234);
-		NUTS_TRUE(sz == sizeof(to));
-
 		// Can't set a negative duration
 		NUTS_FAIL(nng_socket_set_ms(s1, cases[i], -5), NNG_EINVAL);
-
-		// Can't pass a buf too small for duration
-		sz = sizeof(to) - 1;
-		to = 1;
-		NUTS_FAIL(nng_socket_set(s1, cases[i], &to, sz), NNG_EINVAL);
 	}
 	NUTS_CLOSE(s1);
 }
@@ -518,7 +500,6 @@ test_size_options(void)
 {
 	nng_socket s1;
 	size_t     val;
-	size_t     sz;
 	char      *opt;
 
 	char *cases[] = {
@@ -530,26 +511,11 @@ test_size_options(void)
 	for (int i = 0; (opt = cases[i]) != NULL; i++) {
 		TEST_CASE(opt);
 
-		// Can't receive a size into zero bytes.
-		sz = 0;
-		NUTS_FAIL(nng_socket_get(s1, opt, &val, &sz), NNG_EINVAL);
-
 		// Can set a valid duration
 		NUTS_PASS(nng_socket_set_size(s1, opt, 1234));
 		NUTS_PASS(nng_socket_get_size(s1, opt, &val));
 		NUTS_TRUE(val == 1234);
 
-		val = 0;
-		sz  = sizeof(val);
-		NUTS_PASS(nng_socket_get(s1, opt, &val, &sz));
-		NUTS_TRUE(val == 1234);
-		NUTS_TRUE(sz == sizeof(val));
-
-		// Can't pass a buf too small for size
-		sz  = sizeof(val) - 1;
-		val = 1;
-		NUTS_FAIL(nng_socket_set(s1, opt, &val, sz), NNG_EINVAL);
-
 		// We limit the limit to 4GB. Clear it if you want to
 		// ship more than 4GB at a time.
 #if defined(_WIN64) || defined(_LP64)
diff --git a/src/core/socket.c b/src/core/socket.c
index 1e0b0404..b3fb96b2 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -210,6 +210,9 @@ static int
 sock_set_sockname(void *s, const void *buf, size_t sz, nni_type t)
 {
 	int rv;
+	if (sz >= 64) {
+		return (NNG_EINVAL);
+	}
 	rv = (nni_copyin_str(
 	    SOCK(s)->s_name, buf, sizeof(SOCK(s)->s_name), sz, t));
 #ifdef NNG_ENABLE_STATS
diff --git a/src/nng.c b/src/nng.c
index 796f9ea5..bc68a5d3 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -965,12 +965,6 @@ socket_set(
 }
 
 int
-nng_socket_set(nng_socket id, const char *n, const void *v, size_t sz)
-{
-	return (socket_set(id, n, v, sz, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_socket_set_int(nng_socket id, const char *n, int v)
 {
 	return (socket_set(id, n, &v, sizeof(v), NNI_TYPE_INT32));
@@ -1031,12 +1025,6 @@ socket_get(nng_socket s, const char *name, void *val, size_t *szp, nni_type t)
 }
 
 int
-nng_socket_get(nng_socket id, const char *n, void *v, size_t *szp)
-{
-	return (socket_get(id, n, v, szp, NNI_TYPE_OPAQUE));
-}
-
-int
 nng_socket_get_int(nng_socket id, const char *n, int *v)
 {
 	return (socket_get(id, n, v, NULL, NNI_TYPE_INT32));
diff --git a/src/sp/protocol/bus0/bus_test.c b/src/sp/protocol/bus0/bus_test.c
index 3fb2aa56..a6b04df9 100644
--- a/src/sp/protocol/bus0/bus_test.c
+++ b/src/sp/protocol/bus0/bus_test.c
@@ -300,7 +300,6 @@ test_bus_recv_buf_option(void)
 	nng_socket  s;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_RECVBUF;
 
 	NUTS_PASS(nng_bus0_open(&s));
@@ -312,15 +311,6 @@ test_bus_recv_buf_option(void)
 	NUTS_PASS(nng_socket_set_int(s, opt, 3));
 	NUTS_PASS(nng_socket_get_int(s, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(s, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(s, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(s, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(s, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(s, opt, &b), NNG_EBADTYPE);
 
@@ -334,7 +324,6 @@ test_bus_send_buf_option(void)
 	nng_socket  s2;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_SENDBUF;
 
 	NUTS_PASS(nng_bus0_open(&s1));
@@ -348,15 +337,6 @@ test_bus_send_buf_option(void)
 	NUTS_PASS(nng_socket_set_int(s1, opt, 3));
 	NUTS_PASS(nng_socket_get_int(s1, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(s1, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(s1, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(s1, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(s1, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(s1, opt, &b), NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/pair0/pair0_test.c b/src/sp/protocol/pair0/pair0_test.c
index c2bcb7ac..b01bdf91 100644
--- a/src/sp/protocol/pair0/pair0_test.c
+++ b/src/sp/protocol/pair0/pair0_test.c
@@ -282,19 +282,15 @@ test_pair0_send_buffer(void)
 	nng_socket s;
 	int        v;
 	bool       b;
-	size_t     sz;
 
 	NUTS_PASS(nng_pair0_open(&s));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v));
 	NUTS_TRUE(v == 0);
 	NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_SENDBUF, &b), NNG_EBADTYPE);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(s, NNG_OPT_SENDBUF, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, -1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100000), NNG_EINVAL);
 	NUTS_FAIL(
 	    nng_socket_set_bool(s, NNG_OPT_SENDBUF, false), NNG_EBADTYPE);
-	NUTS_FAIL(nng_socket_set(s, NNG_OPT_SENDBUF, &b, 1), NNG_EINVAL);
 	NUTS_PASS(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v));
 	NUTS_TRUE(v == 100);
@@ -307,19 +303,15 @@ test_pair0_recv_buffer(void)
 	nng_socket s;
 	int        v;
 	bool       b;
-	size_t     sz;
 
 	NUTS_PASS(nng_pair0_open(&s));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v));
 	NUTS_TRUE(v == 0);
 	NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_RECVBUF, &b), NNG_EBADTYPE);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(s, NNG_OPT_RECVBUF, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, -1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100000), NNG_EINVAL);
 	NUTS_FAIL(
 	    nng_socket_set_bool(s, NNG_OPT_RECVBUF, false), NNG_EBADTYPE);
-	NUTS_FAIL(nng_socket_set(s, NNG_OPT_RECVBUF, &b, 1), NNG_EINVAL);
 	NUTS_PASS(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v));
 	NUTS_TRUE(v == 100);
diff --git a/src/sp/protocol/pair1/pair1_poly_test.c b/src/sp/protocol/pair1/pair1_poly_test.c
index acd7f44d..40e84d30 100644
--- a/src/sp/protocol/pair1/pair1_poly_test.c
+++ b/src/sp/protocol/pair1/pair1_poly_test.c
@@ -269,8 +269,6 @@ test_poly_ttl(void)
 	// cannot set insane TTLs
 	NUTS_FAIL(nng_socket_set_int(s1, NNG_OPT_MAXTTL, 0), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s1, NNG_OPT_MAXTTL, 1000), NNG_EINVAL);
-	ttl = 8;
-	NUTS_FAIL(nng_socket_set(s1, NNG_OPT_MAXTTL, &ttl, 1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(s1, NNG_OPT_MAXTTL, true), NNG_EBADTYPE);
 
 	NUTS_MARRY(s1, c1);
diff --git a/src/sp/protocol/pair1/pair1_test.c b/src/sp/protocol/pair1/pair1_test.c
index 8c6d433e..8d2ad940 100644
--- a/src/sp/protocol/pair1/pair1_test.c
+++ b/src/sp/protocol/pair1/pair1_test.c
@@ -319,7 +319,6 @@ test_pair1_ttl(void)
 	NUTS_FAIL(nng_socket_set_int(s1, NNG_OPT_MAXTTL, 0), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s1, NNG_OPT_MAXTTL, 1000), NNG_EINVAL);
 	ttl = 8;
-	NUTS_FAIL(nng_socket_set(s1, NNG_OPT_MAXTTL, &ttl, 1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(s1, NNG_OPT_MAXTTL, true), NNG_EBADTYPE);
 
 	NUTS_MARRY(s1, c1);
@@ -466,19 +465,15 @@ test_pair1_send_buffer(void)
 	nng_socket s;
 	int        v;
 	bool       b;
-	size_t     sz;
 
 	NUTS_PASS(nng_pair1_open(&s));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v));
 	NUTS_TRUE(v == 0);
 	NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_SENDBUF, &b), NNG_EBADTYPE);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(s, NNG_OPT_SENDBUF, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, -1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100000), NNG_EINVAL);
 	NUTS_FAIL(
 	    nng_socket_set_bool(s, NNG_OPT_SENDBUF, false), NNG_EBADTYPE);
-	NUTS_FAIL(nng_socket_set(s, NNG_OPT_SENDBUF, &b, 1), NNG_EINVAL);
 	NUTS_PASS(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v));
 	NUTS_TRUE(v == 100);
@@ -491,19 +486,15 @@ test_pair1_recv_buffer(void)
 	nng_socket s;
 	int        v;
 	bool       b;
-	size_t     sz;
 
 	NUTS_PASS(nng_pair1_open(&s));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v));
 	NUTS_TRUE(v == 0);
 	NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_RECVBUF, &b), NNG_EBADTYPE);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(s, NNG_OPT_RECVBUF, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, -1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100000), NNG_EINVAL);
 	NUTS_FAIL(
 	    nng_socket_set_bool(s, NNG_OPT_RECVBUF, false), NNG_EBADTYPE);
-	NUTS_FAIL(nng_socket_set(s, NNG_OPT_RECVBUF, &b, 1), NNG_EINVAL);
 	NUTS_PASS(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v));
 	NUTS_TRUE(v == 100);
diff --git a/src/sp/protocol/pipeline0/push_test.c b/src/sp/protocol/pipeline0/push_test.c
index dd3328f3..5eb98844 100644
--- a/src/sp/protocol/pipeline0/push_test.c
+++ b/src/sp/protocol/pipeline0/push_test.c
@@ -481,19 +481,15 @@ test_push_send_buffer(void)
 	nng_socket s;
 	int        v;
 	bool       b;
-	size_t     sz;
 
 	NUTS_PASS(nng_push0_open(&s));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v));
 	NUTS_TRUE(v == 0);
 	NUTS_FAIL(nng_socket_get_bool(s, NNG_OPT_SENDBUF, &b), NNG_EBADTYPE);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(s, NNG_OPT_SENDBUF, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, -1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100000), NNG_EINVAL);
 	NUTS_FAIL(
 	    nng_socket_set_bool(s, NNG_OPT_SENDBUF, false), NNG_EBADTYPE);
-	NUTS_FAIL(nng_socket_set(s, NNG_OPT_SENDBUF, &b, 1), NNG_EINVAL);
 	NUTS_PASS(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v));
 	NUTS_TRUE(v == 100);
diff --git a/src/sp/protocol/pubsub0/pub_test.c b/src/sp/protocol/pubsub0/pub_test.c
index f3cf6e2d..a2a20dd7 100644
--- a/src/sp/protocol/pubsub0/pub_test.c
+++ b/src/sp/protocol/pubsub0/pub_test.c
@@ -264,7 +264,6 @@ test_pub_send_buf_option(void)
 	nng_socket  pub;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_SENDBUF;
 
 	NUTS_PASS(nng_pub0_open(&pub));
@@ -276,15 +275,6 @@ test_pub_send_buf_option(void)
 	NUTS_PASS(nng_socket_set_int(pub, opt, 3));
 	NUTS_PASS(nng_socket_get_int(pub, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(pub, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(pub, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(pub, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(pub, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(pub, opt, &b), NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/pubsub0/sub_test.c b/src/sp/protocol/pubsub0/sub_test.c
index d0a441ce..74a547f4 100644
--- a/src/sp/protocol/pubsub0/sub_test.c
+++ b/src/sp/protocol/pubsub0/sub_test.c
@@ -296,7 +296,6 @@ test_sub_recv_buf_option(void)
 	nng_socket  sub;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_RECVBUF;
 
 	NUTS_PASS(nng_sub0_open(&sub));
@@ -308,15 +307,6 @@ test_sub_recv_buf_option(void)
 	NUTS_PASS(nng_socket_set_int(sub, opt, 3));
 	NUTS_PASS(nng_socket_get_int(sub, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(sub, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(sub, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(sub, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(sub, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(sub, opt, &b), NNG_EBADTYPE);
 
@@ -355,7 +345,6 @@ test_sub_prefer_new_option(void)
 {
 	nng_socket  sub;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_SUB_PREFNEW;
 
 	NUTS_PASS(nng_sub0_open(&sub));
@@ -364,13 +353,6 @@ test_sub_prefer_new_option(void)
 	NUTS_PASS(nng_socket_set_bool(sub, opt, false));
 	NUTS_PASS(nng_socket_get_bool(sub, opt, &b));
 	NUTS_TRUE(b == false);
-	sz = sizeof(b);
-	b  = true;
-	NUTS_PASS(nng_socket_get(sub, opt, &b, &sz));
-	NUTS_TRUE(b == false);
-	NUTS_TRUE(sz == sizeof(bool));
-
-	NUTS_FAIL(nng_socket_set(sub, opt, "abc", 3), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(sub, opt, 1), NNG_EBADTYPE);
 
 	NUTS_CLOSE(sub);
diff --git a/src/sp/protocol/pubsub0/xsub_test.c b/src/sp/protocol/pubsub0/xsub_test.c
index fdbc5632..eb918e14 100644
--- a/src/sp/protocol/pubsub0/xsub_test.c
+++ b/src/sp/protocol/pubsub0/xsub_test.c
@@ -229,7 +229,6 @@ test_xsub_recv_buf_option(void)
 	nng_socket  sub;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_RECVBUF;
 
 	NUTS_PASS(nng_sub0_open_raw(&sub));
@@ -240,15 +239,6 @@ test_xsub_recv_buf_option(void)
 	NUTS_PASS(nng_socket_set_int(sub, opt, 3));
 	NUTS_PASS(nng_socket_get_int(sub, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(sub, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(sub, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(sub, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(sub, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(sub, opt, &b), NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/reqrep0/req_test.c b/src/sp/protocol/reqrep0/req_test.c
index 08b40b08..71e08877 100644
--- a/src/sp/protocol/reqrep0/req_test.c
+++ b/src/sp/protocol/reqrep0/req_test.c
@@ -36,7 +36,6 @@ test_req_ttl_option(void)
 	nng_socket  req;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_MAXTTL;
 
 	NUTS_PASS(nng_req0_open(&req));
@@ -51,15 +50,6 @@ test_req_ttl_option(void)
 	NUTS_PASS(nng_socket_set_int(req, opt, 3));
 	NUTS_PASS(nng_socket_get_int(req, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(req, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(req, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(req, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(req, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(req, opt, &b), NNG_EBADTYPE);
 
@@ -72,14 +62,11 @@ test_req_resend_option(void)
 	nng_socket   req;
 	nng_duration d;
 	bool         b;
-	size_t       sz  = sizeof(b);
 	const char  *opt = NNG_OPT_REQ_RESENDTIME;
 
 	NUTS_PASS(nng_req0_open(&req));
 
 	NUTS_TRUE(nng_socket_set_ms(req, opt, 10) == 0);
-	NUTS_FAIL(nng_socket_set(req, opt, "", 1), NNG_EINVAL);
-	NUTS_FAIL(nng_socket_get(req, opt, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(req, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(req, opt, &b), NNG_EBADTYPE);
 
@@ -94,14 +81,11 @@ test_req_resend_tick_option(void)
 	nng_socket   req;
 	nng_duration d;
 	bool         b;
-	size_t       sz  = sizeof(b);
 	const char  *opt = NNG_OPT_REQ_RESENDTICK;
 
 	NUTS_PASS(nng_req0_open(&req));
 
 	NUTS_TRUE(nng_socket_set_ms(req, opt, 10) == 0);
-	NUTS_FAIL(nng_socket_set(req, opt, "", 1), NNG_EINVAL);
-	NUTS_FAIL(nng_socket_get(req, opt, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(req, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(req, opt, &b), NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/reqrep0/xrep_test.c b/src/sp/protocol/reqrep0/xrep_test.c
index 3c033e9b..d5110469 100644
--- a/src/sp/protocol/reqrep0/xrep_test.c
+++ b/src/sp/protocol/reqrep0/xrep_test.c
@@ -321,7 +321,6 @@ test_xrep_ttl_option(void)
 	nng_socket  rep;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_MAXTTL;
 
 	NUTS_PASS(nng_rep0_open_raw(&rep));
@@ -334,15 +333,6 @@ test_xrep_ttl_option(void)
 	NUTS_PASS(nng_socket_set_int(rep, opt, 3));
 	NUTS_PASS(nng_socket_get_int(rep, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(rep, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_TRUE(nng_socket_set(rep, opt, "", 1) == NNG_EINVAL);
-	sz = 1;
-	NUTS_TRUE(nng_socket_get(rep, opt, &v, &sz) == NNG_EINVAL);
 	NUTS_TRUE(nng_socket_set_bool(rep, opt, true) == NNG_EBADTYPE);
 	NUTS_TRUE(nng_socket_get_bool(rep, opt, &b) == NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/reqrep0/xreq_test.c b/src/sp/protocol/reqrep0/xreq_test.c
index e8725acb..28f381fe 100644
--- a/src/sp/protocol/reqrep0/xreq_test.c
+++ b/src/sp/protocol/reqrep0/xreq_test.c
@@ -321,7 +321,6 @@ test_xreq_ttl_option(void)
 	nng_socket  rep;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_MAXTTL;
 
 	NUTS_PASS(nng_req0_open_raw(&rep));
@@ -334,15 +333,7 @@ test_xreq_ttl_option(void)
 	NUTS_PASS(nng_socket_set_int(rep, opt, 3));
 	NUTS_PASS(nng_socket_get_int(rep, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(rep, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
 
-	NUTS_TRUE(nng_socket_set(rep, opt, "", 1) == NNG_EINVAL);
-	sz = 1;
-	NUTS_TRUE(nng_socket_get(rep, opt, &v, &sz) == NNG_EINVAL);
 	NUTS_TRUE(nng_socket_set_bool(rep, opt, true) == NNG_EBADTYPE);
 	NUTS_TRUE(nng_socket_get_bool(rep, opt, &b) == NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/survey0/respond_test.c b/src/sp/protocol/survey0/respond_test.c
index 5e3dad34..15061cc2 100644
--- a/src/sp/protocol/survey0/respond_test.c
+++ b/src/sp/protocol/survey0/respond_test.c
@@ -464,7 +464,6 @@ test_resp_ttl_option(void)
 	nng_socket  resp;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_MAXTTL;
 
 	NUTS_PASS(nng_respondent0_open(&resp));
@@ -477,15 +476,6 @@ test_resp_ttl_option(void)
 	NUTS_PASS(nng_socket_set_int(resp, opt, 3));
 	NUTS_PASS(nng_socket_get_int(resp, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(resp, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(resp, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(resp, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(resp, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(resp, opt, &b), NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/survey0/survey_test.c b/src/sp/protocol/survey0/survey_test.c
index e860dc14..6a5574c0 100644
--- a/src/sp/protocol/survey0/survey_test.c
+++ b/src/sp/protocol/survey0/survey_test.c
@@ -36,7 +36,6 @@ test_surv_ttl_option(void)
 	nng_socket  surv;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_MAXTTL;
 
 	NUTS_PASS(nng_surveyor0_open(&surv));
@@ -51,15 +50,6 @@ test_surv_ttl_option(void)
 	NUTS_PASS(nng_socket_set_int(surv, opt, 3));
 	NUTS_PASS(nng_socket_get_int(surv, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(surv, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(surv, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(surv, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(surv, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(surv, opt, &b), NNG_EBADTYPE);
 
@@ -72,14 +62,11 @@ test_surv_survey_time_option(void)
 	nng_socket   surv;
 	nng_duration d;
 	bool         b;
-	size_t       sz  = sizeof(b);
 	const char  *opt = NNG_OPT_SURVEYOR_SURVEYTIME;
 
 	NUTS_PASS(nng_surveyor0_open(&surv));
 
 	NUTS_PASS(nng_socket_set_ms(surv, opt, 10));
-	NUTS_FAIL(nng_socket_set(surv, opt, "", 1), NNG_EINVAL);
-	NUTS_FAIL(nng_socket_get(surv, opt, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(surv, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(surv, opt, &b), NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/survey0/xrespond_test.c b/src/sp/protocol/survey0/xrespond_test.c
index 2e4cd743..8106f161 100644
--- a/src/sp/protocol/survey0/xrespond_test.c
+++ b/src/sp/protocol/survey0/xrespond_test.c
@@ -321,7 +321,6 @@ test_xresp_ttl_option(void)
 	nng_socket  resp;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_MAXTTL;
 
 	NUTS_PASS(nng_respondent0_open_raw(&resp));
@@ -334,15 +333,7 @@ test_xresp_ttl_option(void)
 	NUTS_PASS(nng_socket_set_int(resp, opt, 3));
 	NUTS_PASS(nng_socket_get_int(resp, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(resp, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
 
-	NUTS_FAIL(nng_socket_set(resp, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(resp, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(resp, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(resp, opt, &b), NNG_EBADTYPE);
 
diff --git a/src/sp/protocol/survey0/xsurvey_test.c b/src/sp/protocol/survey0/xsurvey_test.c
index d55719af..e90939e9 100644
--- a/src/sp/protocol/survey0/xsurvey_test.c
+++ b/src/sp/protocol/survey0/xsurvey_test.c
@@ -320,7 +320,6 @@ test_xsurvey_ttl_option(void)
 	nng_socket  s;
 	int         v;
 	bool        b;
-	size_t      sz;
 	const char *opt = NNG_OPT_MAXTTL;
 
 	NUTS_PASS(nng_surveyor0_open_raw(&s));
@@ -333,15 +332,6 @@ test_xsurvey_ttl_option(void)
 	NUTS_PASS(nng_socket_set_int(s, opt, 3));
 	NUTS_PASS(nng_socket_get_int(s, opt, &v));
 	NUTS_TRUE(v == 3);
-	v  = 0;
-	sz = sizeof(v);
-	NUTS_PASS(nng_socket_get(s, opt, &v, &sz));
-	NUTS_TRUE(v == 3);
-	NUTS_TRUE(sz == sizeof(v));
-
-	NUTS_FAIL(nng_socket_set(s, opt, "", 1), NNG_EINVAL);
-	sz = 1;
-	NUTS_FAIL(nng_socket_get(s, opt, &v, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_bool(s, opt, true), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_get_bool(s, opt, &b), NNG_EBADTYPE);