diff options
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/posix/posix_tcpdial.c | 15 | ||||
| -rw-r--r-- | src/platform/tcp_stream_test.c | 6 | ||||
| -rw-r--r-- | src/platform/windows/win_tcpdial.c | 15 |
3 files changed, 0 insertions, 36 deletions
diff --git a/src/platform/posix/posix_tcpdial.c b/src/platform/posix/posix_tcpdial.c index 12fa990f..c526185f 100644 --- a/src/platform/posix/posix_tcpdial.c +++ b/src/platform/posix/posix_tcpdial.c @@ -341,20 +341,6 @@ tcp_dialer_get_keepalive(void *arg, void *buf, size_t *szp, nni_type t) } static nng_err -tcp_dialer_get_locaddr(void *arg, void *buf, size_t *szp, nni_type t) -{ - nni_tcp_dialer *d = arg; - nng_sockaddr sa; - - nni_mtx_lock(&d->mtx); - if (nni_posix_sockaddr2nn(&sa, &d->src, d->srclen) != 0) { - sa.s_family = NNG_AF_UNSPEC; - } - nni_mtx_unlock(&d->mtx); - return (nni_copyout_sockaddr(&sa, buf, szp, t)); -} - -static nng_err tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t) { nni_tcp_dialer *d = arg; @@ -412,7 +398,6 @@ tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t) static const nni_option tcp_dialer_options[] = { { .o_name = NNG_OPT_LOCADDR, - .o_get = tcp_dialer_get_locaddr, .o_set = tcp_dialer_set_locaddr, }, { diff --git a/src/platform/tcp_stream_test.c b/src/platform/tcp_stream_test.c index 3dffed82..faf5e662 100644 --- a/src/platform/tcp_stream_test.c +++ b/src/platform/tcp_stream_test.c @@ -425,12 +425,6 @@ test_tcp_dialer_loc_addr(void) nng_stream_dialer *d; nng_sockaddr sa; NUTS_PASS(nng_stream_dialer_alloc(&d, "tcp://127.0.0.1:80")); - NUTS_PASS(nng_stream_dialer_get_addr(d, NNG_OPT_LOCADDR, &sa)); - NUTS_TRUE(sa.s_family == NNG_AF_UNSPEC); - - // cannot set a local port - sa.s_in.sa_family = NNG_AF_INET; - sa.s_in.sa_port = 8080; NUTS_FAIL(nng_stream_dialer_set_addr(d, NNG_OPT_LOCADDR, &sa), NNG_EADDRINVAL); diff --git a/src/platform/windows/win_tcpdial.c b/src/platform/windows/win_tcpdial.c index a3d64869..c03d564f 100644 --- a/src/platform/windows/win_tcpdial.c +++ b/src/platform/windows/win_tcpdial.c @@ -311,20 +311,6 @@ tcp_dialer_get_keepalive(void *arg, void *buf, size_t *szp, nni_type t) } static nng_err -tcp_dialer_get_locaddr(void *arg, void *buf, size_t *szp, nni_type t) -{ - nni_tcp_dialer *d = arg; - nng_sockaddr sa; - - nni_mtx_lock(&d->mtx); - if (nni_win_sockaddr2nn(&sa, &d->src, sizeof(d->src)) != 0) { - sa.s_family = NNG_AF_UNSPEC; - } - nni_mtx_unlock(&d->mtx); - return (nni_copyout_sockaddr(&sa, buf, szp, t)); -} - -static nng_err tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t) { nni_tcp_dialer *d = arg; @@ -380,7 +366,6 @@ tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t) static const nni_option tcp_dialer_options[] = { { .o_name = NNG_OPT_LOCADDR, - .o_get = tcp_dialer_get_locaddr, .o_set = tcp_dialer_set_locaddr, }, { |
