X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=1ba996c8fa2a55470371bad975d0a48de2c45c6b;hb=710e02b70cb2530802812577229cd62a50da8090;hp=84afd64de0bfc477eec52849f8d84190e94798b1;hpb=efe672a9629651117e499b23065afcb981e5083d;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 84afd64d..1ba996c8 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -55,7 +55,7 @@ $pc9x_time_tolerance = 15*60; # the time on a pc9x is allowed to be out by this $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) # this is actually the partition between "yesterday" and "today" but old. -$senderverify = 1; # 1 - check for forged PC11 or PC61. +$senderverify = 0; # 1 - check for forged PC11 or PC61. # 2 - if forged, dump them. @@ -133,6 +133,8 @@ sub handle_10 } my $last; +my $pc11_saved; +my $pc11_saved_time; # DX Spot handling sub handle_11 @@ -142,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) { @@ -151,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 @@ -220,14 +225,65 @@ 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 (my $key = Spot::dup(@spot[0..4,7])) { + 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. @@ -346,7 +402,14 @@ sub handle_11 # 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 @@ -700,23 +763,36 @@ sub handle_18 $self->send(pc20()); } -sub check_add_node +sub check_add_user { my $call = shift; my $type = shift; - + my $homenode = shift; # add this station to the user database, if required (don't remove SSID from nodes) my $user = DXUser::get_current($call); 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($type || 'A'); + $user->sort($type || 'U'); + if ($user->is_node) { + $user->priv(1); # I have relented and defaulted nodes + $user->lockout(1) if $user->is_node; + } else { + $user->homenode($homenode) if $homenode; + $user->node($homenode); + } $user->lastin($main::systime); # this make it last longer than just this invocation $user->put; # just to make sure it gets written away!!! + dbg("DXProt: PC92 new user record for $call created"); + } + + # this is to fix a problem I introduced some build ago by using this function for users + # whereas it was only being used for nodes. + if ($user->is_user && $user->lockout && $user->priv == 1) { + $user->priv(0); + $user->lockout(0); + dbg("DXProt: PC92 user record for $call depriv'd and unlocked"); + $user->put; } return $user; } @@ -792,7 +868,7 @@ sub handle_19 next; } - my $user = check_add_node($call); + my $user = check_add_user($call, 'A'); # if (eph_dup($genline)) { # dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr'); @@ -1479,8 +1555,13 @@ sub _decode_pc92_call my $is_node = $flag & 4; my $is_extnode = $flag & 2; my $here = $flag & 1; - my $ip = $part[3]; - $ip ||= $part[1] if $part[1] && $part[1] !~ /^\d+$/ && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/); + my $ip; + if ($part[1] =~ /[,.]/) { + $ip = $part[1]; + $part[1] = $part[2] = 0; + } elsif ($part[3] =~ /[,.]/) { + $ip = $part[3]; + } $ip =~ s/,/:/g if $ip; return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip); } @@ -1536,42 +1617,49 @@ sub _add_thingy my $ncall = $parent->call; 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. + my $r; + + # normalise call, delete any unnormalised calls in the users file. + # then ignore this thingy + my $normcall = normalise_call($call); + if ($normcall ne $call) { + next if DXChannel::get($call); $user = DXUser::get($call); - unless ($user) { - $user = DXUser->new($call); - dbg("PCProt::_add_thingy new user $call"); - } + dbg("DXProt::_add_thingy call $call normalised to $normcall, deleting spurious user $call"); + $user->del; + $call = $normcall; # this is safe because a route add will ignore duplicates } + if ($is_node) { dbg("ROUTE: added node $call to $ncall") if isdbg('routelow'); + $user = check_add_user($call, 'A'); @rout = $parent->add($call, $version, Route::here($here), $ip); - my $r = Route::Node::get($call); + $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 { + if ($version && $version =~ /\d+/) { + my $old = $user->sort; + if ($user->is_ak1a && (($version >= 5455 && defined $build && $build > 0) || ($version >= 3000 && $version <= 3500)) ) { + $user->sort('S'); + $build //= 0; + dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) updated to " . $user->sort); + } elsif ($user->is_spider && ($version < 3000 || ($version > 4000 && $version < 5455)) && $version =~ /^\d+$/) { + unless ($version == 5000 && $build == 0) { $user->sort('A'); + $build //= 0; + dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort); } - dbg("PCProt::_add_thingy node $call sort updated " . $user->sort); } } } else { dbg("ROUTE: added user $call to $ncall") if isdbg('routelow'); - my $user = check_add_node($call, 'U'); + $user = check_add_user($call, 'U', $parent->call); @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"); - } + $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); @@ -1744,11 +1832,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 ($main::mycall), ignored") if isdbg('chan'); + LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::mycall ($main::mycall), ignored"); return; } if ($call eq $main::myalias) { - dbg("PCPROT: $call looped back onto \$main::myalias ($main::myalias), ignored") if isdbg('chan'); + LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::myalias ($main::myalias), ignored"); return; } # this is only accepted from my "self". @@ -1782,7 +1870,7 @@ sub pc92_handle_first_slot } $parent->here(Route::here($here)); $parent->version($version || $pc19_version) if $version; - $parent->build($build) if $build; + $build =~ s/^0\.//, $parent->build($build) if $build; $parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call; return ($parent, @radd); } @@ -1809,12 +1897,12 @@ sub handle_92 # } if ($pcall eq $main::mycall) { - dbg("PCPROT: looped back, ignored") if isdbg('chan'); + LogDbg('err', "PCPROT: looped back, ignored"); return; } if ($pcall eq $main::myalias) { - dbg("PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored") if isdbg('chan'); + LogDbg('err', "PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored"); return; } @@ -1878,10 +1966,10 @@ sub handle_92 if (@dxchan) { $_->send($line) for @dxchan; } else { - dbg("PCPROT: no return route, ignored") if isdbg('chanerr') + dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route'); } } else { - dbg("PCPROT: no return route, ignored") if isdbg('chanerr') + dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route'); } } return; @@ -1900,13 +1988,24 @@ sub handle_92 ($parent, $add) = $self->pc92_handle_first_slot(\@ent, $parent, $t, $hops); return unless $parent; # dupe - + push @radd, $add if $add; $parent->reset_obs; - $parent->version($ent[4]) if $ent[4]; - if ($ent[5]) { - $ent[5] =~ s/^0.//; - $parent->build($ent[5]); + my $call = $parent->call; + my $version = $ent[4] // 0; + my $build = $ent[5] // 0; + $build =~ s/^0\.//; + my $oldbuild = $parent->build // 0; + $oldbuild =~ s/^0\.//; + my $oldversion = $parent->version // 0; + my $user = check_add_user($parent->call, 'S'); + my $oldsort = $user->sort; + if ($oldsort ne 'S' || $oldversion != $version || $build != $oldbuild) { + dbg("PCProt PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild) sort: 'S' (was $oldsort)"); + $user->sort('S'); + $user->version($parent->version($version)); + $user->build($parent->build($build)); + $user->put; } dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount'); @@ -1950,9 +2049,14 @@ sub handle_92 my $dxc; next unless $_ && @$_; if ($_->[0] eq $main::mycall) { - dbg("PCPROT: $_->[0] refers to me, ignored") if isdbg('chanerr'); + dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route'); + next; + } + if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) { + LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored"); next; } + push @nent, $_; } @@ -1981,7 +2085,7 @@ sub handle_92 push @users, $r->[0]; } } else { - dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); + dbg("PCPROT: $self->{call} : pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr') || isdbg('route'); } }