diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-03-14 15:40:46 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-03-14 17:16:39 -0700 |
| commit | 85ccb0066a86a3558ae81cd357463f8dc631f94b (patch) | |
| tree | 15838902439f6ed188ffb70fe2170605f26894bc /src/platform/windows/win_tcp.c | |
| parent | f4de6b5302df8befbd2b229b701d0bf9ca81a5fb (diff) | |
| download | nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.tar.gz nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.tar.bz2 nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.zip | |
fixes #289 nng_sockaddr could just be a union
fixes #290 sockaddr improvements
Diffstat (limited to 'src/platform/windows/win_tcp.c')
| -rw-r--r-- | src/platform/windows/win_tcp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/platform/windows/win_tcp.c b/src/platform/windows/win_tcp.c index 8062eb3e..17f7845d 100644 --- a/src/platform/windows/win_tcp.c +++ b/src/platform/windows/win_tcp.c @@ -274,10 +274,10 @@ nni_plat_tcp_ep_init(nni_plat_tcp_ep **epp, const nni_sockaddr *lsa, ep->s = INVALID_SOCKET; - if ((rsa != NULL) && (rsa->s_un.s_family != NNG_AF_UNSPEC)) { + if ((rsa != NULL) && (rsa->s_family != NNG_AF_UNSPEC)) { ep->remlen = nni_win_nn2sockaddr(&ep->remaddr, rsa); } - if ((lsa != NULL) && (lsa->s_un.s_family != NNG_AF_UNSPEC)) { + if ((lsa != NULL) && (lsa->s_family != NNG_AF_UNSPEC)) { ep->loclen = nni_win_nn2sockaddr(&ep->locaddr, lsa); } @@ -659,15 +659,15 @@ nni_plat_tcp_ntop(const nni_sockaddr *sa, char *ipstr, char *portstr) const void *ap; uint16_t port; int af; - switch (sa->s_un.s_family) { + switch (sa->s_family) { case NNG_AF_INET: - ap = &sa->s_un.s_in.sa_addr; - port = sa->s_un.s_in.sa_port; + ap = &sa->s_in.sa_addr; + port = sa->s_in.sa_port; af = AF_INET; break; case NNG_AF_INET6: - ap = &sa->s_un.s_in6.sa_addr; - port = sa->s_un.s_in6.sa_port; + ap = &sa->s_in6.sa_addr; + port = sa->s_in6.sa_port; af = AF_INET6; break; default: |