remove any leading ::ffff: on ipv4 addresses

[spider.git] / perl / watchdbg

diff --git a/perl/watchdbg b/perl/watchdbg
index 745d6983ebff1598ddf626d4ebdfb5e8249e82d1..8d9551d3db9e1cb366defc6186484a19a741964c 100755 (executable)
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -6,6 +6,7 @@
 # examples:-
 # 
 #   watchdbg g1tlh       # watch everything g1tlh does
+#   watchdbg -2 PCPROT       # watch all PCPROT messages + up to 2 lines before
 #   watchdbg gb7baa gb7djk   # watch the conversation between BAA and DJK 
 #
 
@@ -22,45 +23,64 @@ BEGIN {
 }
 
 use IO::File;
-use DXVars;
+use SysVar;
 use DXUtil;
 use DXLog;
 
 use strict;
 
 my $fp = DXLog::new('debug', 'dat', 'd');
-my @today = Julian::unixtoj(time()); 
-my $fh = $fp->open(@today) or die $!; 
+my $today = $fp->unixtoj(time()); 
+my $fh = $fp->open($today) or die $!; 
+my $nolines = 1;
+$nolines = shift if $ARGV[0] =~ /^-?\d+$/;
+$nolines = abs $nolines if $nolines < 0;  
 my $exp = join '|', @ARGV;
+my @prev;
 
 # seek to end of file
 $fh->seek(0, 2);
 for (;;) {
-       my $line = <$fh>;
+       my $line = $fh->getline;
        if ($line) {
                if ($exp) {
-                       printit($line) if $line =~ m{(?:$exp)}oi;
+                       push @prev, $line;
+                       shift @prev while @prev > $nolines; 
+                       if ($line =~ m{(?:$exp)}oi) {
+                               printit(@prev); 
+                               @prev = ();
+                       }
                } else {
-            printit($line);
-        }
+                       printit($line);
+               }
        } else {
                sleep(1);
-
+               
                # check that the debug hasn't rolled over to next day
                # open it if it has
-               my @now = Julian::unixtoj(time()); 
-               if ($today[1] != $now[1]) {
+               my $now = $fp->unixtoj(time()); 
+               if ($today->cmp($now)) {
                        $fp->close;
-                       $fh = $fp->open(@now) or die $!; 
+                       my $i;
+                       for ($i = 0; $i < 20; $i++) {
+                               last if $fh = $fp->open($now);
+                               sleep 5;
+                       }
+                       die $! if $i >= 20; 
+                       $today = $now;
                }
        }
 }
 
 sub printit
 {
-       my $line = shift;
-       my @line =  split '\^', $line;
-       my $t = shift @line;
-       print atime($t), ' ', join('^', @line); 
+       while (@_) {
+               my $line = shift;
+               chomp $line;
+               $line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
+               my ($t, $l) =  split /\^/, $line, 2;
+               $t = time unless defined $t;
+               printf "%02d:%02d:%02d %s\n", (gmtime($t))[2,1,0], $l; 
+       }
 }
 exit(0);