diff options
| author | ume <ume@FreeBSD.org> | 2015-12-28 03:37:13 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2015-12-28 03:37:13 +0000 |
| commit | b20f90aa796e5437aae33edffcab1f004930c8f0 (patch) | |
| tree | 74a86e646f08c477215fb94c0a78c4b1479f7529 /lib | |
| parent | 98e3a0ddfe89ece6f510205d46a62c718de6c8f0 (diff) | |
| download | FreeBSD-src-b20f90aa796e5437aae33edffcab1f004930c8f0.zip FreeBSD-src-b20f90aa796e5437aae33edffcab1f004930c8f0.tar.gz | |
MFC r292445, r292554:
Use _map_v4v6_address().
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/net/getaddrinfo.c | 7 | ||||
| -rw-r--r-- | lib/libc/net/name6.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index 4733e51..54ac329 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -778,10 +778,9 @@ match_addrselectpolicy(struct sockaddr *addr, struct policyhead *head) memset(&key, 0, sizeof(key)); key.sin6_family = AF_INET6; key.sin6_len = sizeof(key); - key.sin6_addr.s6_addr[10] = 0xff; - key.sin6_addr.s6_addr[11] = 0xff; - memcpy(&key.sin6_addr.s6_addr[12], - &((struct sockaddr_in *)addr)->sin_addr, 4); + _map_v4v6_address( + (char *)&((struct sockaddr_in *)addr)->sin_addr, + (char *)&key.sin6_addr); break; default: return(NULL); diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c index 97880a2..74d7380 100644 --- a/lib/libc/net/name6.c +++ b/lib/libc/net/name6.c @@ -795,10 +795,9 @@ match_addrselectpolicy(struct sockaddr *addr, struct policyhead *head) memset(&key, 0, sizeof(key)); key.sin6_family = AF_INET6; key.sin6_len = sizeof(key); - key.sin6_addr.s6_addr[10] = 0xff; - key.sin6_addr.s6_addr[11] = 0xff; - memcpy(&key.sin6_addr.s6_addr[12], - &((struct sockaddr_in *)addr)->sin_addr, 4); + _map_v4v6_address( + (char *)&((struct sockaddr_in *)addr)->sin_addr, + (char *)&key.sin6_addr); break; default: return(NULL); |
