[Netpass-devel] NetPass/bin macscan.pl,1.13,1.14 portinfo.pl,1.2,1.3

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

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

Modified Files:
	macscan.pl portinfo.pl 
Log Message:
fixed/features to audit.mhtml web page

Index: macscan.pl
===================================================================
RCS file: /cvsroot/netpass/NetPass/bin/macscan.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- macscan.pl	22 Dec 2005 18:31:02 -0000	1.13
+++ macscan.pl	19 Jan 2006 21:41:48 -0000	1.14
@@ -103,6 +103,7 @@
 use threads;
 use threads::shared;
 use Getopt::Std;
+use lib '/u1/project/netpass/NetPass-2/lib';
 use lib '/opt/netpass/lib/';
 use FileHandle;
 use Pod::Usage;
@@ -311,24 +312,29 @@
 					my @nOkMacs;
 					my $mac;
 					
+					print "[$tid] Port $p contains macs: ".join(',', @{$pm->{$p}})."\n" if $D;
+
 					foreach $mac (@{$pm->{$p}}) {
 						my $mok = $np->db->macIsRegistered($mac);
-
 						if ( $mok == -1 ) {
+							print "[$tid] reg status of $mac is 'dbfailure'\n" if $D;
 							_log("ERROR", "macIsRegistered($mac) failed: ".$np->db->error()."\n");
 						}
 						elsif ( $mok == 0 ) {
 							# mac is not registered 
+							print "[$tid] reg status of $mac is 'not registered'\n" if $D;
 							$portIsOK = 0;
 							push @nOkMacs, $mac."/NR";
 						} 
 						elsif ($np->db->macStatus($mac) =~ /^[P]QUAR/) {
 							# mac registered but quarantined
+							print "[$tid] reg status of $mac is 'registered but quarantined'\n" if $D;
 							$portIsOK = 0;
 							push @nOkMacs, $mac."/Q";
 							#_log("INFO", "$mac is quarantined, port state is ".join(',',@$curVlanSetting)."\n");
 						} else {
 							# mac is registered and unquar
+							print "[$tid] reg status of $mac is 'registered and unquarantined'\n" if $D;
 							push @okMacs, $mac;
 						}
 					}

Index: portinfo.pl
===================================================================
RCS file: /cvsroot/netpass/NetPass/bin/portinfo.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- portinfo.pl	18 Jan 2006 17:01:30 -0000	1.2
+++ portinfo.pl	19 Jan 2006 21:41:48 -0000	1.3
@@ -47,7 +47,8 @@
 
 use strict;
 use Getopt::Std;
-use lib '/opt/netpass/lib';
+use lib '/u1/project/netpass/NetPass-2/lib';
+#use lib '/opt/netpass/lib';
 use FileHandle;
 use Pod::Usage;