aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/sock_test.c17
-rw-r--r--src/nng.c24
-rw-r--r--src/sp/transport/tcp/tcp_test.c9
-rw-r--r--src/sp/transport/tls/tls_tran_test.c9
-rw-r--r--src/tools/nngcat/nngcat.c26
5 files changed, 18 insertions, 67 deletions
diff --git a/src/core/sock_test.c b/src/core/sock_test.c
index 5981a2e3..08ca8233 100644
--- a/src/core/sock_test.c
+++ b/src/core/sock_test.c
@@ -353,27 +353,24 @@ void
test_url_option(void)
{
nng_socket s1;
- char url[NNG_MAXADDRLEN];
+ char *url;
nng_listener l;
nng_dialer d;
- size_t sz;
NUTS_OPEN(s1);
// Listener
NUTS_PASS(nng_listener_create(&l, s1, "inproc://url1"));
- memset(url, 0, sizeof(url));
- sz = sizeof(url);
- NUTS_PASS(nng_listener_get(l, NNG_OPT_URL, url, &sz));
+ NUTS_PASS(nng_listener_get_string(l, NNG_OPT_URL, &url));
NUTS_MATCH(url, "inproc://url1");
- NUTS_FAIL(nng_listener_set(l, NNG_OPT_URL, url, sz), NNG_EREADONLY);
- sz = sizeof(url);
+ NUTS_FAIL(nng_listener_set_string(l, NNG_OPT_URL, url), NNG_EREADONLY);
+ nng_strfree(url);
// Dialer
NUTS_PASS(nng_dialer_create(&d, s1, "inproc://url2"));
- NUTS_PASS(nng_dialer_get(d, NNG_OPT_URL, url, &sz));
+ NUTS_PASS(nng_dialer_get_string(d, NNG_OPT_URL, &url));
NUTS_MATCH(url, "inproc://url2");
- NUTS_FAIL(nng_dialer_set(d, NNG_OPT_URL, url, sz), NNG_EREADONLY);
+ NUTS_FAIL(nng_dialer_set_string(d, NNG_OPT_URL, url), NNG_EREADONLY);
NUTS_CLOSE(s1);
}
@@ -396,7 +393,6 @@ test_listener_options(void)
NUTS_FAIL(nng_listener_set_size(l, "BAD_OPT", 1), NNG_ENOTSUP);
NUTS_FAIL(
nng_listener_set_bool(l, NNG_OPT_RECVMAXSZ, true), NNG_EBADTYPE);
- NUTS_FAIL(nng_listener_set(l, NNG_OPT_RECVMAXSZ, &sz, 1), NNG_EINVAL);
// Cannot set inappropriate options
NUTS_FAIL(
@@ -431,7 +427,6 @@ test_dialer_options(void)
NUTS_FAIL(nng_dialer_set_size(d, "BAD_OPT", 1), NNG_ENOTSUP);
NUTS_FAIL(
nng_dialer_set_bool(d, NNG_OPT_RECVMAXSZ, true), NNG_EBADTYPE);
- NUTS_FAIL(nng_dialer_set(d, NNG_OPT_RECVMAXSZ, &sz, 1), NNG_EINVAL);
// Cannot set inappropriate options
NUTS_FAIL(
diff --git a/src/nng.c b/src/nng.c
index 5ea21d21..796f9ea5 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -674,12 +674,6 @@ dialer_set(nng_dialer id, const char *n, const void *v, size_t sz, nni_type t)
}
int
-nng_dialer_set(nng_dialer id, const char *n, const void *v, size_t sz)
-{
- return (dialer_set(id, n, v, sz, NNI_TYPE_OPAQUE));
-}
-
-int
nng_dialer_set_int(nng_dialer id, const char *n, int v)
{
return (dialer_set(id, n, &v, sizeof(v), NNI_TYPE_INT32));
@@ -746,12 +740,6 @@ dialer_get(nng_dialer id, const char *n, void *v, size_t *szp, nni_type t)
}
int
-nng_dialer_get(nng_dialer id, const char *n, void *v, size_t *szp)
-{
- return (dialer_get(id, n, v, szp, NNI_TYPE_OPAQUE));
-}
-
-int
nng_dialer_get_int(nng_dialer id, const char *n, int *v)
{
return (dialer_get(id, n, v, NULL, NNI_TYPE_INT32));
@@ -818,12 +806,6 @@ listener_set(
}
int
-nng_listener_set(nng_listener id, const char *n, const void *v, size_t sz)
-{
- return (listener_set(id, n, v, sz, NNI_TYPE_OPAQUE));
-}
-
-int
nng_listener_set_int(nng_listener id, const char *n, int v)
{
return (listener_set(id, n, &v, sizeof(v), NNI_TYPE_INT32));
@@ -891,12 +873,6 @@ listener_get(
}
int
-nng_listener_get(nng_listener id, const char *n, void *v, size_t *szp)
-{
- return (listener_get(id, n, v, szp, NNI_TYPE_OPAQUE));
-}
-
-int
nng_listener_get_int(nng_listener id, const char *n, int *v)
{
return (listener_get(id, n, v, NULL, NNI_TYPE_INT32));
diff --git a/src/sp/transport/tcp/tcp_test.c b/src/sp/transport/tcp/tcp_test.c
index 5a4e5647..ac2d6be9 100644
--- a/src/sp/transport/tcp/tcp_test.c
+++ b/src/sp/transport/tcp/tcp_test.c
@@ -154,12 +154,6 @@ test_tcp_no_delay_option(void)
nng_dialer_get_int(d, NNG_OPT_TCP_NODELAY, &x), NNG_EBADTYPE);
x = 0;
NUTS_FAIL(nng_dialer_set_int(d, NNG_OPT_TCP_NODELAY, x), NNG_EBADTYPE);
- // This assumes sizeof (bool) != sizeof (int)
- if (sizeof(bool) != sizeof(int)) {
- NUTS_FAIL(
- nng_dialer_set(d, NNG_OPT_TCP_NODELAY, &x, sizeof(x)),
- NNG_EINVAL);
- }
NUTS_PASS(nng_listener_create(&l, s, addr));
NUTS_PASS(nng_listener_get_bool(l, NNG_OPT_TCP_NODELAY, &v));
@@ -167,9 +161,6 @@ test_tcp_no_delay_option(void)
x = 0;
NUTS_FAIL(
nng_listener_set_int(l, NNG_OPT_TCP_NODELAY, x), NNG_EBADTYPE);
- // This assumes sizeof (bool) != sizeof (int)
- NUTS_FAIL(nng_listener_set(l, NNG_OPT_TCP_NODELAY, &x, sizeof(x)),
- NNG_EINVAL);
NUTS_PASS(nng_dialer_close(d));
NUTS_PASS(nng_listener_close(l));
diff --git a/src/sp/transport/tls/tls_tran_test.c b/src/sp/transport/tls/tls_tran_test.c
index ee11d8b9..1965bdce 100644
--- a/src/sp/transport/tls/tls_tran_test.c
+++ b/src/sp/transport/tls/tls_tran_test.c
@@ -205,12 +205,6 @@ test_tls_no_delay_option(void)
nng_dialer_get_int(d, NNG_OPT_TCP_NODELAY, &x), NNG_EBADTYPE);
x = 0;
NUTS_FAIL(nng_dialer_set_int(d, NNG_OPT_TCP_NODELAY, x), NNG_EBADTYPE);
- // This assumes sizeof (bool) != sizeof (int)
- if (sizeof(bool) != sizeof(int)) {
- NUTS_FAIL(
- nng_dialer_set(d, NNG_OPT_TCP_NODELAY, &x, sizeof(x)),
- NNG_EINVAL);
- }
NUTS_PASS(nng_listener_create(&l, s, addr));
NUTS_PASS(nng_listener_set_ptr(l, NNG_OPT_TLS_CONFIG, lc));
@@ -219,9 +213,6 @@ test_tls_no_delay_option(void)
x = 0;
NUTS_FAIL(
nng_listener_set_int(l, NNG_OPT_TCP_NODELAY, x), NNG_EBADTYPE);
- // This assumes sizeof (bool) != sizeof (int)
- NUTS_FAIL(nng_listener_set(l, NNG_OPT_TCP_NODELAY, &x, sizeof(x)),
- NNG_EINVAL);
NUTS_PASS(nng_dialer_close(d));
NUTS_PASS(nng_listener_close(l));
diff --git a/src/tools/nngcat/nngcat.c b/src/tools/nngcat/nngcat.c
index da3bd6d6..547b336b 100644
--- a/src/tools/nngcat/nngcat.c
+++ b/src/tools/nngcat/nngcat.c
@@ -1112,8 +1112,8 @@ main(int ac, char **av)
nng_strerror(rv));
}
if (zthome != NULL) {
- rv = nng_dialer_set(d, NNG_OPT_ZT_HOME, zthome,
- strlen(zthome) + 1);
+ rv = nng_dialer_set_string(
+ d, NNG_OPT_ZT_HOME, zthome);
if ((rv != 0) && (rv != NNG_ENOTSUP)) {
fatal("Unable to set ZT home: %s",
nng_strerror(rv));
@@ -1122,12 +1122,11 @@ main(int ac, char **av)
rv = nng_dialer_start(d, async);
act = "dial";
if ((rv == 0) && (verbose == OPT_VERBOSE)) {
- char ustr[256];
- size_t sz;
- sz = sizeof(ustr);
- if (nng_dialer_get(
- d, NNG_OPT_URL, ustr, &sz) == 0) {
+ char *ustr;
+ if (nng_dialer_get_string(
+ d, NNG_OPT_URL, &ustr) == 0) {
printf("Connected to: %s\n", ustr);
+ nng_strfree(ustr);
}
}
break;
@@ -1148,8 +1147,8 @@ main(int ac, char **av)
nng_strerror(rv));
}
if (zthome != NULL) {
- rv = nng_listener_set(l, NNG_OPT_ZT_HOME,
- zthome, strlen(zthome) + 1);
+ rv = nng_listener_set_string(
+ l, NNG_OPT_ZT_HOME, zthome);
if ((rv != 0) && (rv != NNG_ENOTSUP)) {
fatal("Unable to set ZT home: %s",
nng_strerror(rv));
@@ -1158,12 +1157,11 @@ main(int ac, char **av)
rv = nng_listener_start(l, async);
act = "listen";
if ((rv == 0) && (verbose == OPT_VERBOSE)) {
- char ustr[256];
- size_t sz;
- sz = sizeof(ustr);
- if (nng_listener_get(
- l, NNG_OPT_URL, ustr, &sz) == 0) {
+ char *ustr;
+ if (nng_listener_get_string(
+ l, NNG_OPT_URL, &ustr) == 0) {
printf("Listening at: %s\n", ustr);
+ nng_strfree(ustr);
}
}
break;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-18 16:58:25 +0000