From 81dbcb740bdfe7737c52b3a5c7c9907f527abeba Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 23 Jul 2012 07:34:53 +0000
Subject: [PATCH] remove callback subroutine in SLP.pm.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13326 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/SLP.pm | 83 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 4 deletions(-)

diff --git a/perl-xCAT/xCAT/SLP.pm b/perl-xCAT/xCAT/SLP.pm
index 7078b29a7..fc6bf8b4c 100644
--- a/perl-xCAT/xCAT/SLP.pm
+++ b/perl-xCAT/xCAT/SLP.pm
@@ -20,6 +20,9 @@ use constant REQ_INTERVAL => 1;
 my %xid_to_srvtype_map;
 my $xid;
 my $gprlist; 
+my %searchmacs;
+my %ip4neigh;
+my %ip6neigh;
 
 sub getmulticasthash {
 	my $hash=0;
@@ -126,9 +129,10 @@ sub dodiscover {
 		    			}
                         $rspcount++;
 		    			$rethash{$peername} = $result;
-		    			if ($args{Callback}) {
-		    				$args{Callback}->($result);
-		    			}
+		    			#if ($args{Callback}) {
+		    			#	$args{Callback}->($result);
+		    			#}
+		    			handle_new_slp_entity($result);
 		    		}
 		    	}
                 if ($args{Time} and $args{Count}) {
@@ -146,7 +150,7 @@ sub dodiscover {
 				}	
 		    }
 		}	
-		return \%rethash;
+		return \%searchmacs;
 	}
 }
 
@@ -513,4 +517,75 @@ unless (caller) {
 	print Dumper(xCAT::SLP::dodiscover(SrvTypes=>$srvtypes));
 	#TODO: pass-in socket and not wait inside SLP.pm example
 }
+###########################################
+# Parse the slp resulte data
+###########################################
+sub handle_new_slp_entity {
+        my $data = shift;
+        delete $data->{sockaddr}; #won't need it
+        my $mac = get_mac_for_addr($data->{peername});
+        unless ($mac) { return; }
+        $searchmacs{$mac} = $data;
+}
+###########################################
+# Get mac addresses
+###########################################
+sub get_mac_for_addr {
+        my $neigh;
+        my $addr = shift;
+        if ($addr =~ /:/) {
+                get_ipv6_neighbors();
+                return $ip6neigh{$addr};
+        } else {
+                get_ipv4_neighbors();
+                return $ip4neigh{$addr};
+        }
+}
+
+###########################################
+# Get ipv4 mac addresses
+###########################################
+sub get_ipv4_neighbors {
+    if (xCAT::Utils->isAIX()) {
+        my @ipdata = `arp -a`;
+        %ip6neigh=();
+        for my $entry (@ipdata) {
+            if ($entry =~ /(\d+\.\d+\.\d+\.\d+)/) {
+                my $ip = $1;
+                #if ($entry =~ /at (\w+\:\w+\:\w+\:\w+\:\w+\:\w+)/) {
+                #    $ip4neigh{$ip}=$1;
+                if ($entry =~ /at (\w+)\:(\w+)\:(\w+)\:(\w+)\:(\w+)\:(\w+)/) {
+                     $ip4neigh{$ip}=$1.$2.$3.$4.$5.$6;
+                }
+
+            }
+        }
+    } else {
+        #TODO: something less 'hacky'
+        my @ipdata = `ip -4 neigh`;
+        %ip6neigh=();
+        foreach (@ipdata) {
+            if (/^(\S*)\s.*lladdr\s*(\S*)\s/) {
+                    $ip4neigh{$1}=$2;
+            }
+        }
+    }
+}
+
+
+
+###########################################
+# Get ipv6 mac addresses
+###########################################
+sub get_ipv6_neighbors {
+        #TODO: something less 'hacky'
+        my @ipdata = `ip -6 neigh`;
+        %ip6neigh=();
+        foreach (@ipdata) {
+                if (/^(\S*)\s.*lladdr\s*(\S*)\s/) {
+                        $ip6neigh{$1}=$2;
+                }
+        }
+}
+
 1;