Update of /cvsroot/netpass/NetPass/lib/NetPass
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15191/lib/NetPass
Modified Files:
DB.pm Network.pm
Log Message:
bug fixes, see CHANGES file, see message on netpass-users before deploying these changes
Index: DB.pm
===================================================================
RCS file: /cvsroot/netpass/NetPass/lib/NetPass/DB.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- DB.pm 22 Aug 2005 19:26:07 -0000 1.54
+++ DB.pm 31 Aug 2005 20:09:17 -0000 1.55
@@ -1273,7 +1273,7 @@
$osC = qq{OS='$os', } if defined($os) && ($os ne "") && ($os ne "Unknown");
$unC = qq{username='$username', } if defined($username) && ($username ne "");
- $sql = qq{UPDATE register SET ipAddress='$ip', registeredOn=NOW(), status='unquar', $unC $osC switchIP=NULL, switchPort=NULL WHERE macAddress = '$mac'};
+ $sql = qq{UPDATE register SET ipAddress='$ip', lastSeen=NOW(), status='unquar', $unC $osC switchIP=NULL, switchPort=NULL WHERE macAddress = '$mac'};
_log("DEBUG", "$mac $ip sql=$sql\n");
$rv = $self->{'dbh'}->do($sql);
if (!defined($rv)) {
Index: Network.pm
===================================================================
RCS file: /cvsroot/netpass/NetPass/lib/NetPass/Network.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Network.pm 23 Jun 2005 20:21:08 -0000 1.5
+++ Network.pm 31 Aug 2005 20:09:17 -0000 1.6
@@ -243,11 +243,14 @@
my $ip2 = ip2int($1);
$mac = $2;
next if (!$ii && $mac =~ /incomplete/);
- $rv{$1} = $2 if (($ip2 & $mask) == $nw);
+ my $mac2;
+ foreach my $_mp (split(/:/, $mac)) {
+ $mac2 .= substr("00".$_mp, -2);
+ }
+ $rv{$1} = $mac2 if (($ip2 & $mask) == $nw);
}
}
return \%rv;
-
}
# distinct address or regexp passed in
|
