X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=79b9b8ba4a67498a7accde3f7753ab8a1f75dce1;hb=a24cc09d8262093df92c767d3010c0a5fd6e42d7;hp=57a83cc508c760f666ca553344276e3e2c542f5a;hpb=f11237c455a6440b5158206dcb2d03850ed1b7b0;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 57a83cc5..79b9b8ba 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -44,17 +44,20 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $eph_pc15_restime $pc9x_past_age $pc9x_dupe_age $pc10_dupe_age $pc92_slug_changes $last_pc92_slug $pc92Ain $pc92Cin $pc92Din $pc92Kin $pc9x_time_tolerance - $pc92filterdef + $pc92filterdef $senderverify ); $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. +$senderverify = 0; # 1 - check for forged PC11 or PC61. + # 2 - if forged, dump them. + $pc92filterdef = bless ([ # tag, sort, field, priv, special parser @@ -65,6 +68,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 +132,10 @@ sub handle_10 $main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6])); } +my $last; +my $pc11_saved; +my $pc11_saved_time; + # DX Spot handling sub handle_11 { @@ -133,6 +144,7 @@ sub handle_11 my $line = shift; my $origin = shift; my $pc = shift; + my $recurse = shift || 0; # route 'foreign' pc26s if ($pcno == 26) { @@ -142,6 +154,8 @@ sub handle_11 } } + dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11"); + # my ($hops) = $pc->[8] =~ /^H(\d+)/; # is the spotted callsign blank? This should really be trapped earlier but it @@ -169,10 +183,6 @@ sub handle_11 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]); @@ -202,8 +212,10 @@ sub handle_11 return; } } + 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); @@ -213,14 +225,95 @@ sub handle_11 } } + # this is where we decide to delay PC11s in the hope that a PC61 will be along soon. + + my $key = join '|', @spot[0..2,4,7]; # not including text + unless ($recurse) { + if ($pcno == 61) { + if ($pc11_saved) { + if ($key eq $pc11_saved->[0]) { + dbg("saved PC11 spot $key dumped, better pc61 received") if isdbg("pc11"); + undef $pc11_saved; + } + } + } + if ($pcno == 11) { + if ($pc11_saved) { + if ($key eq $pc11_saved->[0]) { + dbg("saved PC11 spot $key, dupe pc11 received and dumped") if isdbg("pc11"); + return; # because it's a dup + } + } + + # can we promote this to a PC61? + my $r = Route::User::get($spot[4]); # find spotter + if ($r && $r->ip) { # do we have an ip addres + $pcno = 61; # now turn this into a PC61 + $spot[14] = $r->ip; + dbg("PC11 spot $key promoted to pc61 ip $spot[14]") if isdbg("pc11"); + undef $pc11_saved; + } + } + + if ($pc11_saved && $key ne $pc11_saved) { + dbg("saved PC11 spot $pc11_saved->[0] ne new key $key, recursing") if isdbg("pc11"); + shift @$pc11_saved; # saved key + my $self = shift @$pc11_saved; + my @saved = @$pc11_saved; + undef $pc11_saved; + $self->handle_11(@saved, 1); + } + + # if we are still a PC11, save it for a better offer + if ($pcno == 11) { + $pc11_saved = [$key, $self, $pcno, $line, $origin, $pc]; + $pc11_saved_time = $main::systime; + dbg("saved new PC11 spot $key for a better offer") if isdbg("pc11"); + return; + } else { + dbg("PC61 spot $key passed onward") if isdbg("pc11"); + } + } + + # 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'); + if (Spot::dup(@spot[0..4,7])) { + dbg("PCPROT: Duplicate Spot $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot'); return; } + + # here we verify the spotter is currently connected to the node it says it is one. AKA email sender verify + # but without the explicit probe to the node. We are relying on "historical" information, but it very likely + # to be current once we have seen the first PC92C from that node. + # + # As for spots generated from non-PC92 nodes, we'll see after about do_pc9x3h20m... + # + if ($senderverify) { + my $nroute = Route::Node::get($pc->[7]); + my $uroute = Route::Node::get($pc->[6]); + my $local = DXChannel::get($pc->[7]); + + if ($nroute && ($nroute->last_PC92C || ($local && !$local->do_pc9x))) { + my $s = ''; + my $ip = $pcno == 61 ? $pc->[8] : ''; +# $s .= "User $pc->[6] not logged in, " unless $uroute; + $s .= "User $pc->[6] not on node $pc->[7], " unless $nroute->is_user($pc->[6]); +# $s .= "Node $pc->[7] at '$ip' not on Node's IP " . $nroute->ip if $ip && $nroute && $nroute->ip && $nroute->ip ne $ip; + if ($s) { + my $action = $senderverify > 1 ? ", DUMPED" : ''; + $s =~ s/, $//; + dbg("PCProt: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action"); + return unless $senderverify < 2; + } + } + } + # 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, + # add it Spot::add(@spot); @@ -272,8 +365,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; @@ -306,6 +399,19 @@ sub handle_11 send_dx_spot($self, $line, @spot) if @spot; } +# used to kick outstanding PC11 if required +sub pc11_process +{ + if ($pc11_saved && $main::systime > $pc11_saved_time) { + dbg("saved PC11 spot $pc11_saved->[0] timed out waiting, recursing") if isdbg("pc11"); + shift @$pc11_saved; # saved key + my $self = shift @$pc11_saved; + my @saved = @$pc11_saved; + undef $pc11_saved; + $self->handle_11(@saved, 1); + } +} + # announces sub handle_12 { @@ -624,7 +730,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'); @@ -633,7 +739,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); @@ -641,12 +747,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"); } } @@ -660,6 +766,8 @@ sub handle_18 sub check_add_node { my $call = shift; + my $type = shift; + # add this station to the user database, if required (don't remove SSID from nodes) my $user = DXUser::get_current($call); @@ -669,7 +777,7 @@ sub check_add_node $user->lockout(1); $user->homenode($call); $user->node($call); - $user->sort('A'); + $user->sort($type || 'A'); $user->lastin($main::systime); # this make it last longer than just this invocation $user->put; # just to make sure it gets written away!!! } @@ -1435,7 +1543,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); } @@ -1489,30 +1597,56 @@ sub _add_thingy 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) { + my $user; + unless (DXChannel::get($call)) { # i.e. external entity - create an user entry for it - ALL entities will appear in ALL user files from now on. + $user = DXUser::get($call); + unless ($user) { + $user = DXUser->new($call); + dbg("PCProt::_add_thingy new user $call") if isdbg('route'); + } } - } 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 ($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 ($user && $user->sort eq 'U') { + if (defined $version) { + if ($version >= 5455 && $build > 0 || $version >= 3000 ) { + $user->sort('S'); + } else { + $user->sort('A'); + } + dbg("PCProt::_add_thingy node $call sort updated " . $user->sort) if isdbg('route'); + } + } + } else { + dbg("ROUTE: added user $call to $ncall") if isdbg('routelow'); + my $user = check_add_node($call, 'U'); + @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}; + } + $user->close($main::systime, $ip) if $user; # this just updates lastseen and the connlist list containing the IP address + } else { + dbgprintring(10) if isdbg('nologchan'); + dbg("DXProt::add_thingy: Trying to add parent $call to itself $ncall, ignored"); } } + return @rout; } @@ -1833,7 +1967,10 @@ sub handle_92 push @radd, $add if $add; $parent->reset_obs; $parent->version($ent[4]) if $ent[4]; - $parent->build($ent[5]) if $ent[5]; + if ($ent[5]) { + $ent[5] =~ s/^0.//; + $parent->build($ent[5]); + } dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount'); } @@ -1879,6 +2016,11 @@ sub handle_92 dbg("PCPROT: $_->[0] refers to me, ignored") if isdbg('chanerr'); next; } + if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) { + dbg("PCPROT: $_->[0] changing type to " . $_->[1]?"Node":"User" . ", ignored") if isdbg('chanerr'); + next; + } + push @nent, $_; }