improve node initialisation debugging

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index fdc0b0543aa102e41a7b4ee8529e875e8580e503..b3278d36a78a835405f2a72bf8adf68d4e7a142f 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);
        }
        
@@ -620,7 +624,7 @@ sub handle_18
                $self->{build} = 0 + $build;
                $self->user->build(0 + $build);
                $parent->build(0 + $build);
-               dbg("DXSpider version $version build $build");
+               dbg("$self->{call} = DXSpider version $version build $build");
                unless ($self->is_spider) {
                        dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
                        $self->user->sort('S');
@@ -629,7 +633,7 @@ sub handle_18
                }
 #              $self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/;
        } else {
-               dbg("Unknown software");
+               dbg("$self->{call} = Unknown software ($pc->[1] $pc->[2])");
                $self->version(50.0);
                $self->version($pc->[2] / 100) if $pc->[2] && $pc->[2] =~ /^\d+$/;
                $self->user->version($self->version);
@@ -637,12 +641,12 @@ sub handle_18
 
        if ($pc->[1] =~ /\bpc9x/) {
                if ($self->{isolate}) {
-                       dbg("pc9x recognised, but $self->{call} is isolated, using old protocol");
+                       dbg("$self->{call} pc9x recognised, but node is isolated, using old protocol");
                } elsif (!$self->user->wantpc9x) {
-                       dbg("pc9x explicitly switched off on $self->{call}, using old protocol");
+                       dbg("$self->{call} pc9x explicitly switched off, using old protocol");
                } else {
                        $self->{do_pc9x} = 1;
-                       dbg("Do px9x set on $self->{call}");
+                       dbg("$self->{call} Set do PC9x");
                }
        }
 
@@ -659,13 +663,15 @@ sub check_add_node
 
        # add this station to the user database, if required (don't remove SSID from nodes)
        my $user = DXUser::get_current($call);
-       if (!$user) {
+       unless ($user) {
                $user = DXUser->new($call);
                $user->priv(1);         # I have relented and defaulted nodes
                $user->lockout(1);
                $user->homenode($call);
                $user->node($call);
                $user->sort('A');
+               $user->lastin($main::systime); # this make it last longer than just this invocation
+               $user->put;                             # just to make sure it gets written away!!!
        }
        return $user;
 }
@@ -969,6 +975,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: <$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 +1379,7 @@ sub handle_73
        }
 
        my $wcy = WCY::update($d, @$pc[2..12]);
+       dbg("WCY: <$pc->[2]> K=$pc->[5] expK=$pc->[6] A=$pc->[4] R=$pc->[7] SFI=$pc->[3] SA=$pc->[8] GMF=$pc->[9] Au=$pc->[10] $pc->[11]\@$pc->[12] route: $origin") if isdbg('progress');
 
        if (defined &Local::wcy) {
                my $rep;
@@ -1476,6 +1484,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) {
@@ -2012,6 +2023,12 @@ sub handle_93
                return;
        }
 
+       if (isdbg('progress')) {
+               my $vs = $via ne '*' ? " via $via" : ''; 
+               my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
+               dbg($s);
+       }
+       
        # will we allow it at all?
        if ($censorpc) {
                my @bad;