diff options
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/posix/posix_resolv_gai.c | 5 | ||||
| -rw-r--r-- | src/platform/posix/posix_sockaddr.c | 8 | ||||
| -rw-r--r-- | src/platform/windows/win_resolv.c | 1 | ||||
| -rw-r--r-- | src/platform/windows/win_sockaddr.c | 9 |
4 files changed, 14 insertions, 9 deletions
diff --git a/src/platform/posix/posix_resolv_gai.c b/src/platform/posix/posix_resolv_gai.c index 1799935e..c6732a12 100644 --- a/src/platform/posix/posix_resolv_gai.c +++ b/src/platform/posix/posix_resolv_gai.c @@ -182,6 +182,7 @@ resolv_task(resolv_item *item) sin6 = (void *) probe->ai_addr; sa->s_in6.sa_family = NNG_AF_INET6; sa->s_in6.sa_port = item->port; + sa->s_in6.sa_scope = sin6->sin6_scope_id; memcpy(sa->s_in6.sa_addr, sin6->sin6_addr.s6_addr, 16); break; } @@ -318,9 +319,9 @@ resolv_worker(void *unused) NNI_ARG_UNUSED(unused); - nni_thr_set_name(NULL, "nng:resolver"); + nni_thr_set_name(NULL, "nng:resolver"); - nni_mtx_lock(&resolv_mtx); + nni_mtx_lock(&resolv_mtx); for (;;) { nni_aio * aio; resolv_item *item; diff --git a/src/platform/posix/posix_sockaddr.c b/src/platform/posix/posix_sockaddr.c index ba088ed9..dc795cfe 100644 --- a/src/platform/posix/posix_sockaddr.c +++ b/src/platform/posix/posix_sockaddr.c @@ -1,5 +1,5 @@ // -// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2020 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 @@ -53,8 +53,9 @@ nni_posix_nn2sockaddr(void *sa, const nni_sockaddr *na) #ifdef SIN6_LEN sin6->sin6_len = sizeof(*sin6); #endif - sin6->sin6_family = PF_INET6; - sin6->sin6_port = nsin6->sa_port; + sin6->sin6_family = PF_INET6; + sin6->sin6_port = nsin6->sa_port; + sin6->sin6_scope_id = nsin6->sa_scope; memcpy(sin6->sin6_addr.s6_addr, nsin6->sa_addr, 16); return (sizeof(*sin6)); @@ -99,6 +100,7 @@ nni_posix_sockaddr2nn(nni_sockaddr *na, const void *sa) nsin6 = &na->s_in6; nsin6->sa_family = NNG_AF_INET6; nsin6->sa_port = sin6->sin6_port; + nsin6->sa_scope = sin6->sin6_scope_id; memcpy(nsin6->sa_addr, sin6->sin6_addr.s6_addr, 16); break; case AF_UNIX: diff --git a/src/platform/windows/win_resolv.c b/src/platform/windows/win_resolv.c index d1cc058e..d810ecac 100644 --- a/src/platform/windows/win_resolv.c +++ b/src/platform/windows/win_resolv.c @@ -154,6 +154,7 @@ resolv_task(resolv_item *item) sin6 = (void *) probe->ai_addr; sa.s_in6.sa_family = NNG_AF_INET6; sa.s_in6.sa_port = item->port; + sa.s_in6.sa_scope = sin6->sin6_scope_id; memcpy(sa.s_in6.sa_addr, sin6->sin6_addr.s6_addr, 16); nni_aio_set_sockaddr(item->aio, &sa); break; diff --git a/src/platform/windows/win_sockaddr.c b/src/platform/windows/win_sockaddr.c index d1fed2c7..818f670b 100644 --- a/src/platform/windows/win_sockaddr.c +++ b/src/platform/windows/win_sockaddr.c @@ -1,5 +1,5 @@ // -// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2020 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 @@ -9,7 +9,6 @@ // #include "core/nng_impl.h" -#include "win_impl.h" #include <string.h> @@ -34,8 +33,9 @@ nni_win_nn2sockaddr(SOCKADDR_STORAGE *ss, const nni_sockaddr *sa) case NNG_AF_INET6: sin6 = (void *) ss; memset(sin6, 0, sizeof(*sin6)); - sin6->sin6_family = PF_INET6; - sin6->sin6_port = sa->s_in6.sa_port; + sin6->sin6_family = PF_INET6; + sin6->sin6_port = sa->s_in6.sa_port; + sin6->sin6_scope_id = sa->s_in6.sa_scope; memcpy(sin6->sin6_addr.s6_addr, sa->s_in6.sa_addr, 16); return (sizeof(*sin6)); } @@ -63,6 +63,7 @@ nni_win_sockaddr2nn(nni_sockaddr *sa, const SOCKADDR_STORAGE *ss) sin6 = (void *) ss; sa->s_in6.sa_family = NNG_AF_INET6; sa->s_in6.sa_port = sin6->sin6_port; + sa->s_in6.sa_scope = sin6->sin6_scope_id; memcpy(sa->s_in6.sa_addr, sin6->sin6_addr.s6_addr, 16); return (0); } |