X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=b75d70843321984180a2a942cccd179f0f5d7c39;hb=2090157518d0d2da860345507680f4ad91b043a2;hp=6dc13795deccd8ff99c2c8530e961536155baec9;hpb=f18ba64dd93bbf7c47e6b5143bfc99af817888e8;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 6dc13795..b75d7084 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -222,30 +222,17 @@ sub handle_11 } # add it - $spot[14] =~ s/^::ffff:// if exists $spot[14]; # remove rubbish ipv4 addresses dressed up as ipv6 Spot::add(@spot); - # create a spotter if doesn't exit and there is an ip available and in anycase remember the IP address - my $user = DXUser::get_current($spot[4]); - $user = DXUser->new($spot[4]) unless $user; - my $r = Route::get($spot[4]); - my $ip = $spot[14] if exists $spot[14]; - my $implied = ''; - if ($ip) { - $ip =~ s/[\(\)\*]+//g; # strip these off :-) - $user->ip($spot[7], $ip); - $user->put; - $r->ip($spot[7], $ip) if $r; - } else { - $ip ||= $r->ip($spot[7]) if $r; - $ip ||= $user->ip($spot[7]); - $implied = '*' if $ip; - } - + my $ip = ''; + $ip ||= $spot[14] if exists $spot[14]; if (isdbg('progress')) { - my $sip = $ip ? sprintf "($ip$implied)" : ''; - my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]$sip\@$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); } @@ -256,8 +243,8 @@ sub handle_11 # you should be able to route on any of these # - # fix up qra locators of known users + my $user = DXUser::get_current($spot[4]); if ($user) { my $qra = $user->qra; unless ($qra && is_qra($qra)) { @@ -637,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'); @@ -646,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); @@ -654,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"); } } @@ -676,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; } @@ -986,7 +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: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r") if isdbg('progress'); + 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; @@ -1390,7 +1379,7 @@ sub handle_73 } my $wcy = WCY::update($d, @$pc[2..12]); - dbg("WCY: " . join ', ', @$pc[2..12]) if isdbg('progress'); + 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; @@ -1495,52 +1484,41 @@ 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; - my $user = DXUser::get_current($call); - my $r; - my $newuser = !$user; - $user = DXUser->new($call) unless $user; - $user->homenode($parent->call) unless $user->homenode; - $user->node($parent->call); - $user->lastin($main::systime) unless DXChannel::get($ncall); - if ($is_node) { - dbg("ROUTE: added node $call to $ncall") if isdbg('routelow'); - @rout = $parent->add($call, $version, Route::here($here), $ip); - $r = Route::Node::get($call); - $r->PC92C_dxchan($dxchan->call, $hops) if $r; - if ($newuser) { - $user->sort('S') unless $user->sort; - $user->priv(1) unless exists $user->{priv}; - $user->lockout(1) unless exists $user->{lookout} || $main::me->call eq $call || DXChannel::get($call) || Msg::get($call); + if ($ncall ne $call) { + if ($is_node) { + dbg("ROUTE: added node $call to $ncall") if isdbg('routelow'); + @rout = $parent->add($call, $version, Route::here($here), $ip); + my $r = Route::Node::get($call); + $r->PC92C_dxchan($dxchan->call, $hops) if $r; + if ($ip) { + $r->ip($ip); + Log('DXProt', "PC92A $call -> $ip on $ncall"); + } + } else { + dbg("ROUTE: added user $call to $ncall") if isdbg('routelow'); + @rout = $parent->add_user($call, Route::here($here), $ip); + $dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan; + my $r = Route::User::get($call); + if ($ip) { + $r->ip($ip); + Log('DXProt', "PC92A $call -> $ip on $ncall"); + } } - } else { - dbg("ROUTE: added user $call to $ncall") if isdbg('routelow'); - @rout = $parent->add_user($call, Route::here($here), $ip); - $dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan; - $r = Route::User::get($call); - if ($newuser) { - $user->sort('U') unless $user->sort; + if ($pc92_slug_changes && $parent == $main::routeroot) { + $things_add{$call} = Route::get($call); + delete $things_del{$call}; } - } - $ip ||= $user->ip($ncall); - if ($ip) { - $ip =~ s/^::ffff://; # remove ipv6 stuff from the front of an ipv4 address - $user->ip($ncall, $ip); - $r->ip($ncall, $ip); - my $s = "PC92A $call -> $ip on $ncall"; - Log('DXProt', $s); - dbg($s) if isdbg('routelow'); - } - $user->put; - - # create a node user if required - - if ($pc92_slug_changes && $parent == $main::routeroot) { - $things_add{$call} = Route::get($call); - delete $things_del{$call}; + } else { + dbgprintring(10); + dbg("DXProt::add_thingy: Trying to add parent $call to itself $ncall, ignored"); } } + return @rout; } @@ -2053,7 +2031,7 @@ sub handle_93 if (isdbg('progress')) { my $vs = $via ne '*' ? " via $via" : ''; - my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'"; + my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin"; dbg($s); }