From fef814d4d4c290be71f048e5c2726fcb2b02d6f1 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 24 May 2012 17:44:47 +0000
Subject: [PATCH] Have SLP try node-local scope ipv6.  I don't think this is
 correct, but some targets work better with that destination

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12926 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/SLP.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/SLP.pm b/perl-xCAT/xCAT/SLP.pm
index 72b208998..7078b29a7 100644
--- a/perl-xCAT/xCAT/SLP.pm
+++ b/perl-xCAT/xCAT/SLP.pm
@@ -299,6 +299,7 @@ sub send_service_request_single {
 	my $packet = generate_service_request(%args);
 	my $interfaces = $args{ifacemap}; #get_interfaces(%args);
 	my $socket = $args{'socket'};
+	my @v6addrs;
 	my $v6addr;
 	if ($ip6support) {
 		my $hash=getmulticasthash($args{SrvType});
@@ -306,13 +307,19 @@ sub send_service_request_single {
 		my ($fam, $type, $proto, $name);
 		($fam, $type, $proto, $v6addr, $name) = 
 		   Socket6::getaddrinfo($target,"svrloc",Socket6::AF_INET6(),SOCK_DGRAM,0);
+		push @v6addrs,$v6addr;
+		($fam, $type, $proto, $v6addr, $name) = 
+		   Socket6::getaddrinfo("ff01::1:$hash","svrloc",Socket6::AF_INET6(),SOCK_DGRAM,0);
+		push @v6addrs,$v6addr;
 	}
 	my $ipv4mcastaddr = inet_aton("239.255.255.253"); #per rfc 2608
 	my $ipv4sockaddr  = sockaddr_in(427,$ipv4mcastaddr);
 	foreach my $iface (keys %{$interfaces}) {
 		if ($ip6support) {
 			setsockopt($socket,Socket6::IPPROTO_IPV6(),IPV6_MULTICAST_IF,pack("I",$interfaces->{$iface}->{scopeidx}));
-			$socket->send($packet,0,$v6addr);
+			foreach $v6addr (@v6addrs) {
+				$socket->send($packet,0,$v6addr);
+			}
 		}
 		foreach my $sip (@{$interfaces->{$iface}->{ipv4addrs}}) {
 			my $ip = $sip;