svn commit: r292826 - stable/10/lib/libc/net

[Hajimu UMEMOTO]

Author: ume
Date: Mon Dec 28 03:37:13 2015
New Revision: 292826
URL: https://svnweb.freebsd.org/changeset/base/292826

Log:
  MFC r292445, r292554:
    Use _map_v4v6_address().

Modified:
  stable/10/lib/libc/net/getaddrinfo.c
  stable/10/lib/libc/net/name6.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/net/getaddrinfo.c
==============================================================================
--- stable/10/lib/libc/net/getaddrinfo.c	Mon Dec 28 03:27:51 2015	(r292825)
+++ stable/10/lib/libc/net/getaddrinfo.c	Mon Dec 28 03:37:13 2015	(r292826)
@@ -778,10 +778,9 @@ match_addrselectpolicy(struct sockaddr *
 		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);

Modified: stable/10/lib/libc/net/name6.c
==============================================================================
--- stable/10/lib/libc/net/name6.c	Mon Dec 28 03:27:51 2015	(r292825)
+++ stable/10/lib/libc/net/name6.c	Mon Dec 28 03:37:13 2015	(r292826)
@@ -795,10 +795,9 @@ match_addrselectpolicy(struct sockaddr *
 		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);