From: Michael Brown <mcb30@ipxe.org>
Date: Fri, 23 May 2014 12:36:35 +0000 (+0100)
Subject: [ipv6] Include network device when transcribing multicast addresses
X-Git-Tag: v1.20.1~1165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a1adea0360e73c91ebed63b671303601a63b450;p=thirdparty%2Fipxe.git

[ipv6] Include network device when transcribing multicast addresses

Destination multicast addresses require a sin6_scope_id, which should
therefore be transcribed to a network device name by ipv6_sock_ntoa().

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/net/ipv6.c b/src/net/ipv6.c
index f753751df..771249403 100644
--- a/src/net/ipv6.c
+++ b/src/net/ipv6.c
@@ -900,7 +900,7 @@ static const char * ipv6_sock_ntoa ( struct sockaddr *sa ) {
 	const char *netdev_name;
 
 	/* Identify network device, if applicable */
-	if ( IN6_IS_ADDR_LINKLOCAL ( in ) ) {
+	if ( IN6_IS_ADDR_LINKLOCAL ( in ) || IN6_IS_ADDR_MULTICAST ( in ) ) {
 		netdev = find_netdev_by_index ( sin6->sin6_scope_id );
 		netdev_name = ( netdev ? netdev->name : "UNKNOWN" );
 	} else {