From a7bb20730744b6522d61ca462d2426db817428ed Mon Sep 17 00:00:00 2001 From: ume Date: Mon, 28 Dec 2015 03:39:32 +0000 Subject: [PATCH] MFC r292445, r292554: Use _map_v4v6_address(). git-svn-id: svn://svn.freebsd.org/base/stable/9@292827 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- lib/libc/net/getaddrinfo.c | 7 +++---- 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 195910fd4..1084c9717 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -777,10 +777,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 f36016249..71b1c0132 100644 --- a/lib/libc/net/name6.c +++ b/lib/libc/net/name6.c @@ -799,10 +799,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); -- 2.45.0