Skip to contentSkip to conversation

sunrpc: Use helper to set v4 mapped addr in ip_map_parse

PATCH In review Pavel Emelyanov 2 participants 2 messages Oct 5, 2010 – Oct 12, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sunrpc: Use helper to set v4 mapped addr in ip_map_parse

---
 net/sunrpc/svcauth_unix.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
net/sunrpc/svcauth_unix.c +2 -3
index 8b378f9..560677d 100644
@@ -220,10 +220,9 @@ static int ip_map_parse(struct cache_detail *cd,
 	switch (address.sa.sa_family) {
 	case AF_INET:
 		/* Form a mapped IPv4 address in sin6 */
-		memset(&sin6, 0, sizeof(sin6));
 		sin6.sin6_family = AF_INET6;
-		sin6.sin6_addr.s6_addr32[2] = htonl(0xffff);
-		sin6.sin6_addr.s6_addr32[3] = address.s4.sin_addr.s_addr;
+		ipv6_addr_set_v4mapped(address.s4.sin_addr.s_addr,
+				&sin6.sin6_addr);
 		break;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	case AF_INET6:
Signature · 1 line
1.5.5.6
#1 lore raw
Quoted 1 line · Pavel Emelyanov

Thanks, applying.

(Assuming someone else is testing for ipv6 regressions, though--I don't have a setup for it currently.)

--b.

Quoted 24 lines
---
 net/sunrpc/svcauth_unix.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
net/sunrpc/svcauth_unix.c +2 -3
index 8b378f9..560677d 100644
@@ -220,10 +220,9 @@ static int ip_map_parse(struct cache_detail *cd,
 	switch (address.sa.sa_family) {
 	case AF_INET:
 		/* Form a mapped IPv4 address in sin6 */
-		memset(&sin6, 0, sizeof(sin6));
 		sin6.sin6_family = AF_INET6;
-		sin6.sin6_addr.s6_addr32[2] = htonl(0xffff);
-		sin6.sin6_addr.s6_addr32[3] = address.s4.sin_addr.s_addr;
+		ipv6_addr_set_v4mapped(address.s4.sin_addr.s_addr,
+				&sin6.sin6_addr);
 		break;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	case AF_INET6:
Signature · 1 line
1.5.5.6