X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=c4344339f16131424117c3e1d36f6f6f9fbe5af4;hb=1935ba236a7ef4999bceb00b6faf28038f3b052e;hp=4e55b9402c534a512a530362d26f380c9c2218b8;hpb=16b98fc9cae1d4fb357aad17850a2aa1a601b053;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 4e55b940..c4344339 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -49,11 +49,11 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $pc9x_dupe_age = 60; # catch loops of circular (usually) D records $pc10_dupe_age = 45; # just something to catch duplicate PC10->PC93 conversions -$pc92_slug_changes = 60*5; # slug any changes going outward for this long +$pc92_slug_changes = 60*1; # slug any changes going outward for this long $last_pc92_slug = 0; # the last time we sent out any delayed add or del PC92s $pc9x_time_tolerance = 15*60; # the time on a pc9x is allowed to be out by this amount $pc9x_past_age = (122*60)+ # maximum age in the past of a px9x (a config record might be the only - $pc9x_time_tolerance; # thing a node might send - once an hour and we allow an extra hour for luck) +$pc9x_time_tolerance; # thing a node might send - once an hour and we allow an extra hour for luck) # this is actually the partition between "yesterday" and "today" but old. $pc92filterdef = bless ([ @@ -65,6 +65,10 @@ $pc92filterdef = bless ([ ['zone', 'nz', 3], ], 'Filter::Cmd'); +our %pc11q; +# this is a place to park an incoming PC11 in the sure and certain hope that +# a PC61 will be along soon. This has the side benefit that it will delay a +# a PC11 for one second - assuming that it is not removed by a PC61 version # incoming talk commands sub handle_10 @@ -125,6 +129,8 @@ sub handle_10 $main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6])); } +my $last; + # DX Spot handling sub handle_11 { @@ -158,17 +164,21 @@ sub handle_11 # if this is a 'nodx' node then ignore it if ($badnode->in($pc->[7])) { - dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr'); + dbg("PCPROT: Bad Node $pc->[7], dropped") if isdbg('chanerr'); return; } - # if this is a 'bad spotter' user then ignore it + # if this is a 'bad spotter' or an unknown user then ignore it. BUT if it's got an IP address then allow it through my $nossid = $pc->[6]; $nossid =~ s/-\d+$//; if ($badspotter->in($nossid)) { - dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); + dbg("PCPROT: Bad Spotter $pc->[6], dropped") if isdbg('chanerr'); return; } +# unless (is_ipaddr($pc->[8]) || DXUser::get_current($pc->[6])) { +# dbg("PCPROT: Unknown Spotter $pc->[6], dropped") if isdbg('chanerr'); +# return; +# } # convert the date to a unix date my $d = cltounix($pc->[3], $pc->[4]); @@ -200,6 +210,7 @@ sub handle_11 } my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]); + # global spot filtering on INPUT if ($self->{inspotsfilter}) { my ($filter, $hops) = $self->{inspotsfilter}->it(@spot); @@ -209,17 +220,75 @@ sub handle_11 } } + # If is a new PC11, store it, releasing the one that is there (if any), + # if a PC61 comes along then dump the stored PC11 + # If there is a different PC11 stored, release that one and store this PC11 instead, + my $key = join '|', @spot[0..2,4,7]; + if (0) { + + if ($pc->[0] eq 'PC11') { + my $r = [$main::systime, $key, \@spot, $line, $origin, $pc]; + if (!$last) { + $last = [$main::systime, $key, \@spot, $line, $origin, $pc]; + dbg("PC11: $origin -> $key stored") if isdbg('pc11'); + return; + } elsif ($key eq $last->[1]) { # same as last one + dbg("PC11: $origin -> $key dupe dropped") if isdbg('pc11'); + return; + } else { + # it's a different PC11, kick the stored one onward and store this one instead, + dbg("PC11: PC11 new $origin -> $key stored, $last->[4] -> $last->[1] passed onward") if isdbg('pc11'); + @spot = @{$last->[2]}; + $line = $last->[3]; + $origin = $last->[4]; + $pc = $last->[5]; + $last = $r; + } + } elsif ($pc->[0] eq 'PC61') { + if ($last) { + if ($last->[1] eq $key) { + # dump $last and proceed with the PC61 + dbg("PC11: $origin -> $key dropped in favour of PC61") if isdbg('pc11'); + undef $last; + } else { + # it's a different spot send out stored pc11 + dbg("PC11: last $last->[4] -> $last->[1] different PC61 $origin -> $key, send PC11 first ") if isdbg('pc11'); + $last->[1] = 'new pc61'; + handle_11($self, 11, $last->[3], $last->[4], $last->[5]); + undef $last; + dbg("PC11: now process PC61 $origin -> $key") if isdbg('pc11'); + } + } + } else { + dbg("PC11: Unexpected line '$line' in bagging area (expecting PC61, PC11), ignored"); + return; + } + +} + # this goes after the input filtering, but before the add # so that if it is input filtered, it isn't added to the dup # list. This allows it to come in from a "legitimate" source if (Spot::dup(@spot[0..4,5])) { - dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr'); + dbg("PCPROT: Duplicate Spot $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot'); return; } - + # add it Spot::add(@spot); + my $ip = ''; + $ip ||= $spot[14] if exists $spot[14]; + if (isdbg('progress')) { + 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); + } + # # @spot at this point contains:- # freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node @@ -256,8 +325,8 @@ sub handle_11 } else { route(undef, $to, pc34($main::mycall, $to, $cmd)); } - if ($to ne $pc->[7]) { - $to = $pc->[7]; + if ($to ne $origin) { + $to = $origin; $node = Route::Node::get($to); if ($node) { $dxchan = $node->dxchan; @@ -290,6 +359,12 @@ sub handle_11 send_dx_spot($self, $line, @spot) if @spot; } +# used to kick outstanding PC11 if required +sub pc11_process +{ + +} + # announces sub handle_12 { @@ -608,7 +683,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'); @@ -617,7 +692,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); @@ -625,12 +700,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"); } } @@ -647,14 +722,16 @@ 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!!! } - $user->sort('A') unless $user->is_node; return $user; } @@ -709,7 +786,7 @@ sub handle_19 next unless $ver && $ver =~ /^\d+$/; next if $ver < 5000; # only works with version 5 software next if length $call < 3; # min 3 letter callsigns - next if $call eq $main::mycall; + next if $call eq $main::mycall || $call eq $main::myalias; # check that this PC19 isn't trying to alter the wrong dxchan $h = 0; @@ -853,7 +930,7 @@ sub handle_21 my @rout; - if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me! + if ($call ne $main::mycall && $call ne $main::myalias) { # don't allow malicious buggers to disconnect me! my $node = Route::Node::get($call); if ($node) { @@ -864,7 +941,7 @@ sub handle_21 my $dxchan = DXChannel::get($call); if ($dxchan && $dxchan != $self) { - dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr'); + dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chan'); return; } @@ -876,7 +953,7 @@ sub handle_21 push @rout, $call if $dxchan && @rout == 0; } } else { - dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr'); + dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chan'); return; } @@ -957,6 +1034,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; @@ -1014,7 +1092,7 @@ sub handle_25 return; } if ($pc->[2] eq $main::mycall) { - dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chanerr'); + dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chan'); return; } @@ -1169,7 +1247,7 @@ sub handle_41 return; } - if ($call eq $main::mycall && $call eq $main::myalias) { + if ($call eq $main::mycall || $call eq $main::myalias) { dbg "DXPROT: PC41 trying to update $call from outside via $origin, ignored"; return; } @@ -1298,6 +1376,10 @@ sub handle_51 my $from = $pc->[2]; my $flag = $pc->[3]; + if ($to eq $main::myalias) { + dbg("DXPROT: Ping addressed to \$myalias ($main::myalias), ignored") if isdbg('chan'); + return; + } # is it for us? if ($to eq $main::mycall) { @@ -1356,6 +1438,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; @@ -1411,7 +1494,7 @@ sub _decode_pc92_call my $is_extnode = $flag & 2; my $here = $flag & 1; my $ip = $part[3]; - $ip ||= $part[1] if $part[1] && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/); + $ip ||= $part[1] if $part[1] && $part[1] !~ /^\d+$/ && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/); $ip =~ s/,/:/g if $ip; return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip); } @@ -1460,32 +1543,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; - 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"); + 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; - my $r = Route::User::get($call); - if ($ip) { - $r->ip($ip); - Log('DXProt', "PC92A $call -> $ip on $ncall"); + if ($pc92_slug_changes && $parent == $main::routeroot) { + $things_add{$call} = Route::get($call); + delete $things_del{$call}; } - } - if ($pc92_slug_changes && $parent == $main::routeroot) { - $things_add{$call} = Route::get($call); - delete $things_del{$call}; + } else { + dbgprintring(10) if isdbg('nologchan'); + dbg("DXProt::add_thingy: Trying to add parent $call to itself $ncall, ignored"); } } + return @rout; } @@ -1646,7 +1738,11 @@ sub pc92_handle_first_slot my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot; if ($call && $is_node) { if ($call eq $main::mycall) { - dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr'); + dbg("PCPROT: $call looped back onto \$main::mycall ($main::mycall), ignored") if isdbg('chan'); + return; + } + if ($call eq $main::myalias) { + dbg("PCPROT: $call looped back onto \$main::myalias ($main::myalias), ignored") if isdbg('chan'); return; } # this is only accepted from my "self". @@ -1707,21 +1803,26 @@ sub handle_92 # } if ($pcall eq $main::mycall) { - dbg("PCPROT: looped back, ignored") if isdbg('chanerr'); + dbg("PCPROT: looped back, ignored") if isdbg('chan'); + return; + } + + if ($pcall eq $main::myalias) { + dbg("PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored") if isdbg('chan'); return; } if ($pcall eq $self->{call} && $self->{state} eq 'init') { if ($self->{isolate}) { - dbg("PC9x received, but $pcall is isolated, ignored"); + dbg("DXPROT: PC9x received, but $pcall is isolated, ignored"); return; } elsif (!$self->user->wantpc9x) { - dbg("PC9x explicitly switched off on $pcall, ignored"); + dbg("DXPROT: PC9x explicitly switched off on $pcall, ignored"); return; } else { $self->state('init92'); $self->{do_pc9x} = 1; - dbg("Do pc9x set on $pcall"); + dbg("DXPROT: Do pc9x set on $pcall"); } } unless ($self->{do_pc9x}) { @@ -1987,6 +2088,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;