add incoming route/channel for progress dbg

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index d1023270291a4be2209741b4d5197c9f63b4974f..e268d0f9970b595d1a35df0da70c92ca335f826c 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -224,11 +224,15 @@ sub handle_11
        # add it
        Spot::add(@spot);
 
+       my $ip = '';
+       $ip ||= $spot[14] if exists $spot[14];
        if (isdbg('progress')) {
-               my $ip = '';
-               $ip = sprintf "($spot[14])" if $spot[14]; 
-               my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]$ip\@$spot[7]", cldatetime($spot[2]);
-               $s .= " '$spot[3]'" if $spot[3];
+               my $sip = $ip ? sprintf "($ip)" : '' unless $ip =~ m|[\(\)\*]|;
+               $sip ||= '';
+               my $d = ztime($spot[2]);
+               my $s = "SPOT: $spot[1] on $spot[0] \@ $d by $spot[4]$sip\@$spot[7]";
+               $s .= $spot[3] ? " '$spot[3]'" : q{ ''};
+               $s .=  " route: $origin";
                dbg($s);
        }
        
@@ -969,6 +973,7 @@ sub handle_23
 
        # note this only takes the first one it gets
        Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
+       dbg("WWV: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r route: $origin") if isdbg('progress');
 
        if (defined &Local::wwv) {
                my $rep;
@@ -1372,6 +1377,7 @@ sub handle_73
        }
 
        my $wcy = WCY::update($d, @$pc[2..12]);
+       dbg("WCY: " . join(', ', @$pc[2..12]) . " route: $origin") if isdbg('progress');
 
        if (defined &Local::wcy) {
                my $rep;
@@ -1476,6 +1482,9 @@ sub _add_thingy
        my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
        my @rout;
 
+       # remove spurious IPV6 prefix on IPV4 addresses
+       $ip =~ s/^::ffff:// if $ip;
+       
        if ($call) {
                my $ncall = $parent->call;
                if ($is_node) {
@@ -2014,7 +2023,7 @@ sub handle_93
 
        if (isdbg('progress')) {
                my $vs = $via ne '*' ? " via $via" : ''; 
-               my $s = "ANNTALK: $from\@$onode$via -> $to '$text'";
+               my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
                dbg($s);
        }