From 844eacfe0fada02e7aa8f879289d3794e656d24f Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Fri, 18 Dec 2015 17:57:31 +0000 Subject: [PATCH] Use _map_v4v6_address(). Suggested by: hrs MFC after: 1 week --- lib/libc/net/getaddrinfo.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index b37e4fa6dfe..ed1a388768d 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -797,10 +797,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);