[Netpass-devel] NetPass/lib NetPass.pm,1.22,1.23

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6223/lib

Modified Files:
	NetPass.pm 
Log Message:
bug fixes

Index: NetPass.pm
===================================================================
RCS file: /cvsroot/netpass/NetPass/lib/NetPass.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- NetPass.pm	31 Aug 2005 20:09:16 -0000	1.22
+++ NetPass.pm	9 Sep 2005 12:32:11 -0000	1.23
@@ -524,6 +524,7 @@
 	my $community = shift;
 	my $mac       = shift;
 	my $loopctl   = shift;
+	my $myNW      = shift;
 
 	# first determine which port this mac address is on. if we dont find the 
 	# mac on this switch - stop.
@@ -544,7 +545,7 @@
 		return (undef, undef, undef, undef);
 	}
 
-	my $ifIndex = $snmp->get_mac_port($mac); 
+	my $ifIndex = $snmp->get_mac_port($mac, $myNW); 
 	return (undef, undef, undef, undef) if !defined($ifIndex); # not on this switch
 
 	_log ("DEBUG", "$mac possibly found on $switch / $ifIndex. checking to see if it links to another switch.\n");
@@ -565,7 +566,7 @@
 
 		return $self->search_topology($next_switch,
 					      ($self->cfg->getCommunities($next_switch))[1],
-					      $mac, $loopctl);
+					      $mac, $loopctl, $myNW);
 	}
 
 	# otherwise, it's this switch. to preserve the semantics
@@ -616,7 +617,7 @@
 				
 				my ($_sw, $_po, $_mp, $_pm) = $self->search_topology($bsw, 
 										     ($self->cfg->getCommunities($bsw))[1],
-										     $mac, {});
+										     $mac, {}, $myNW);
 				
 				next if (!defined($_sw) || !defined($_po));