X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=8c62e392f3e33046bd99b417c3d2f10f7b7d92fc;hb=f8017bac9afdb84424fb70b135ed00522d3907d9;hp=b22fea82586a2bd75f75a48bb9f922a50728e89c;hpb=e148ea6b5e9eb73af10a9ca4132bc257e4b9aac8;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index b22fea82..8c62e392 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -32,8 +32,13 @@ use DXHash; use Route; use Route::Node; use Script; +use DXCIDR; use strict; +use warnings qw(all); +no warnings qw(uninitialized); + + use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime $last_hour $last10 %eph %pings %rcmds $ann_to_talk @@ -44,7 +49,7 @@ 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 $senderverify + $pc92filterdef $senderverify $pc11_dwell_time $pc11_extract_route ); $pc9x_dupe_age = 60; # catch loops of circular (usually) D records @@ -55,8 +60,10 @@ $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. +$pc11_dwell_time = 2; # number of seconds to wait for a PC61 to come to substitute the PC11 +$pc11_extract_route = 1; # generate missing user route entry and IP address from passing PC61s $pc92filterdef = bless ([ @@ -87,14 +94,6 @@ sub handle_10 return; } - # will we allow it at all? - if ($censorpc) { - my @bad; - if (@bad = BadWords::check($pc->[3])) { - dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); - return; - } - } # is it for me or one of mine? my ($from, $to, $via, $call, $dxchan); @@ -108,15 +107,17 @@ sub handle_10 # if this is a 'nodx' node then ignore it if ($badnode->in($pc->[6]) || ($via && $badnode->in($via))) { - dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Bad Node, dropped"); return; } - # if this is a 'bad spotter' user then ignore it + my $nossid = $from; $nossid =~ s/-\d+$//; if ($badspotter->in($nossid)) { - dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Bad Spotter, dropped"); return; } @@ -127,12 +128,27 @@ sub handle_10 return; } } + + # will we allow it at all? + if ($censorpc) { + my @bad; + if (@bad = BadWords::check($pc->[3])) { + my $bw = join ', ', @bad; + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Badwords: '$bw', dropped"); + return; + } + } # convert this to a PC93, coming from mycall with origin set and process it as such $main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6])); } -my $last; +my %pc11_saved; # delayed PC11s +my $pc11_rx; # no of pc11 rxed +my $pc61_rx; # no of pc61 rxed +my $pc11_to_61; # no of 'better' pc61, that replaced stored waiting pc11 +my $rpc11_to_61; # no of pc11s 'promoted' to pc61 by IP captured in routing table # DX Spot handling sub handle_11 @@ -142,6 +158,7 @@ sub handle_11 my $line = shift; my $origin = shift; my $pc = shift; + my $recurse = shift || 0; # route 'foreign' pc26s if ($pcno == 26) { @@ -151,31 +168,28 @@ sub handle_11 } } + dbg("INPUT $self->{call}: $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); + # my ($hops) = $pc->[8] =~ /^H(\d+)/; # is the spotted callsign blank? This should really be trapped earlier but it # could break other protocol sentences. Also check for lower case characters. if ($pc->[2] =~ /^\s*$/) { - dbg("PCPROT: blank callsign, dropped") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: blank callsign, dropped"); return; } if ($pc->[2] =~ /[a-z]/) { - dbg("PCPROT: lowercase characters, dropped") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: lowercase characters, dropped"); return; } # if this is a 'nodx' node then ignore it if ($badnode->in($pc->[7])) { - dbg("PCPROT: Bad Node $pc->[7], dropped") if isdbg('chanerr'); - return; - } - - # 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 $pc->[6], dropped") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Bad Node $pc->[7], dropped"); return; } @@ -183,34 +197,56 @@ sub handle_11 my $d = cltounix($pc->[3], $pc->[4]); # bang out (and don't pass on) if date is invalid or the spot is too old (or too young) if (!$d || (($pcno == 11 || $pcno == 61) && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) { - dbg("PCPROT: Spot ignored, invalid date or out of range ($pc->[3] $pc->[4])\n") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Spot ignored, invalid date or out of range ($pc->[3] $pc->[4])\n"); return; } # is it 'baddx' - if ($baddx->in($pc->[2]) || BadWords::check($pc->[2])) { - dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr'); + if ($baddx->in($pc->[2])) { + dbg("PCPROT: Bad DX spot '$pc->[2]', ignored"); + dbg($line) if isdbg('nologchan'); return; } - # do some de-duping + # is it claiming to be BUST(ed) $pc->[5] =~ s/^\s+//; # take any leading blanks off $pc->[2] = unpad($pc->[2]); # take off leading and trailing blanks from spotted callsign if ($pc->[2] =~ /BUST\w*$/) { + dbg($line) if isdbg('nologchan'); dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr'); return; } - if ($censorpc) { - my @bad; - if (@bad = BadWords::check($pc->[5])) { - dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); - return; - } - } + my $nossid = $pc->[6]; + $nossid =~ s/-\d+$//; my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]); + # $f0 = frequency + # $f1 = call + # $f2 = date in unix format + # $f3 = comment + # $f4 = spotter + # $f5 = spotted dxcc country + # $f6 = spotter dxcc country + # $f7 = origin + # $f8 = spotted itu + # $f9 = spotted cq zone + # $f10 = spotter itu + # $f11 = spotter cq zone + # $f12 = spotted us state + # $f13 = spotter us state + # $f14 = ip address + + + # is this is a 'bad spotter' or an unknown user then ignore it. + if ($badspotter->in($nossid)) { + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Bad Spotter $pc->[6], dropped"); + return; + } + # global spot filtering on INPUT if ($self->{inspotsfilter}) { my ($filter, $hops) = $self->{inspotsfilter}->it(@spot); @@ -220,14 +256,115 @@ 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 (Spot::dup_find(@spot[0..4,7])) { + dbg("DUPE $pc->[0] $self->{call}: key: $key dumped") if isdbg('pc11'); + return; + } else { + ++$pc61_rx; + } + + # as we have a route to a user, if it does not exist, create and link if (and only if) the node exists as well + if ($pc->[8]) { + my $new = $pc->[8]; + # $new =~ s/,/:/g; + my $r = Route::User::get($pc->[6]); + unless ($r) { + my $rn = Route::Node::get($pc->[7]) || Route::Node->new($pc->[7]); + $rn->add_user($pc->[6], 0, $pc->[8]); + $r = Route::User::get($pc->[6]); + } + if ($r) { + if ($r->ip ne $pc->[8]) { + my $old = $r->ip; + $r->ip($new); + dbg("ROUTE ALTER IP node: $pc->[7] user: $pc->[6] old IP: '$old'-> new IP: '$new'") if isdbg('pc11'); + } else { + dbg("ROUTE NEW IP node: $pc->[7] user: $pc->[6] IP: '$new'") if isdbg('pc11'); + } + } else { + dbg("ROUTE ADD Failed for node $pc->[7] user $pc->[6]") if isdbg('pc11'); + } + } + + if ($pc11_saved{$key}) { + ++$pc11_to_61; + my $percent = $pc11_rx ? $pc11_to_61 * 100 / $pc11_rx : 0; + dbg(sprintf("PROMOTED BETTER $self->{call}: $pc->[0] $key, using pc61, WAITING pc11 DUMPED: $pc61_rx pc11: $pc11_rx better pc61: $pc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11"); + delete $pc11_saved{$key}; + } + } + if ($pcno == 11) { + + if (Spot::dup_find(@spot[0..4,7])) { + dbg("DUPE $pc->[0] $self->{call}: key: $key dumped") if isdbg('pc11'); + return; + } else { + ++$pc11_rx; + } + + if ($pc11_saved{$key}) { + dbg("DUPE $pc->[0] $self->{call } key: $key is saved, ignored") 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 address + $pcno = 61; + $pc->[0] = 'PC61'; + my $hops = $pc->[8]; + $pc->[8] = $spot[14] = $r->ip; + ++$rpc11_to_61; + my $percent = $pc11_rx ? $rpc11_to_61 * 100 / $pc11_rx : 0; + dbg(sprintf("PROMOTED ROUTE $self->{call}: pc11 $key PROMOTED to pc61 with IP $spot[14] pc61: $pc61_rx pc11: $pc11_rx route->pc61 $rpc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11"); + $line = join '^', @$pc, $hops, '~'; + dbg("CHANGED saved key: $key PC11 line to $line") if isdbg('pc11'); + delete $pc11_saved{$key}; + } + + # if it is STILL (despite all efforts to change it) a PC11 + # save it and wait - it will be called from pc11_process + if ($pcno == 11) { + $pc11_saved{$key} = [$main::systime, $self, $pcno, $line, $origin, $pc]; + dbg("WAITING $self->{call}: NEW $pc->[0] spot $key waiting for a better offer") if isdbg("pc11"); + 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 (my $key = Spot::dup(@spot[0..4,7])) { - dbg("PCPROT: Duplicate Spot $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot'); + if (Spot::dup(@spot[0..4,7])) { + dbg("PCPROT: Duplicate Spot $self->{call}: $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot') || isdbg('pc11'); return; } + dbg("PROCESSING $self->{call}: $pc->[0] key: $key") if isdbg('pc11'); + + # we check IP addresses for PC61 - this will also dedupe PC11 copies + if (@$pc > 8 && is_ipaddr($pc->[8])) { + my $ip = $pc->[8]; + $ip =~ s/,/:/g; + $ip =~ s/^::ffff://; + if (DXCIDR::find($ip)) { + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: PC61 $ip in badip list, dropped"); + 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. @@ -248,15 +385,24 @@ sub handle_11 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"); + 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, + # we until here to do any censorship to try and reduce the amount of noise that repeated copies + # from other connected nodes cause + if ($censorpc) { + my @bad; + if (@bad = BadWords::check($pc->[5])) { + my $bw = join ', ', @bad; + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Badwords: '$bw', dropped"); + return; + } + } + # add it Spot::add(@spot); @@ -341,12 +487,55 @@ sub handle_11 # send out the filtered spots send_dx_spot($self, $line, @spot) if @spot; + + # cancel any recursion as we have now processed it + my $count = $pc11_to_61+$rpc11_to_61; + my $percent = ($pc11_rx + $pc61_rx) ? ($pc11_rx * 100) / ($pc11_rx + $pc61_rx) : 0; + my $pc11_61 = $pc11_rx ? ($count * 100) / $pc11_rx : 0; + my $data = "$self->{call} $pc->[0] key: $key"; + my $stats = sprintf "pc11: $pc11_rx pc61: $pc61_rx pc11%%: %0.1f%% pc11->pc61: $count(%0.1f%%)", $percent, $pc11_61; + if ($recurse) { + if ($pc11_saved{$key}) { + dbg("END RECURSED $data removed and finished $stats") if isdbg('pc11'); + delete $pc11_saved{$key}; + } else { + dbg("END RECURSED $data finished $stats") if isdbg('pc11'); + } + $recurse = 0; + } else { + dbg("END NORMAL $data finished $stats") if isdbg('pc11'); + } } # used to kick outstanding PC11 if required sub pc11_process { + foreach my $key (keys %pc11_saved) { + my $r = $pc11_saved{$key}; + if ($main::systime > $r->[0] + $pc11_dwell_time) { + dbg("RECURSE PC11 spot $key timed out waiting, resend") if isdbg("pc11"); + my $self = $r->[1]; + delete $pc11_saved{$key}; + $self->handle_11(@$r[2..5], 1); + } + } +} +# return the pc11 / pc61 / promotions data +sub get_pc11_61_stats +{ + my $promotions = $pc11_to_61+$rpc11_to_61; + my $percent = ($pc11_rx + $pc61_rx) ? ($pc11_rx * 100) / ($pc11_rx + $pc61_rx) : 0; + my $pc11_61p = $pc11_rx ? ($promotions * 100) / $pc11_rx : 0; + return { + pc11_rx => $pc11_rx+0, + pc61_rx => $pc61_rx+0, + pc11_to_61 => $pc11_to_61+0, + rpc11_to_61 => $rpc11_to_61+0, + promotions => $promotions+0, + pc11_percent => $percent+0, + promotions_percent => $pc11_61p+0, + }; } # announces @@ -361,17 +550,10 @@ sub handle_12 # announce duplicate checking $pc->[3] =~ s/^\s+//; # remove leading blanks - if ($censorpc) { - my @bad; - if (@bad = BadWords::check($pc->[3])) { - dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); - return; - } - } - # if this is a 'nodx' node then ignore it if ($badnode->in($pc->[5])) { - dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Bad Node, dropped"); return; } @@ -379,7 +561,8 @@ sub handle_12 my $nossid = $pc->[1]; $nossid =~ s/-\d+$//; if ($badspotter->in($nossid)) { - dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Bad Spotter, dropped"); return; } @@ -390,6 +573,17 @@ sub handle_12 return; } + if ($censorpc) { + my @bad; + if (@bad = BadWords::check($pc->[3])) { + my $bw = join ', ', @bad; + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Badwords: '$bw', dropped"); + return; + } + } + + my $dxchan; if ((($dxchan = DXChannel::get($pc->[2])) && $dxchan->is_user) || $pc->[4] =~ /^[\#\w.]+$/){ @@ -657,17 +851,20 @@ sub handle_18 $self->state('init'); my $parent = Route::Node::get($self->{call}); - + # record the type and version offered - if (my ($version) = $pc->[1] =~ /DXSpider Version: (\d+\.\d+)/) { - $self->{version} = 53 + $version; - $self->user->version(53 + $version); - $parent->version(0 + $version); + if (my ($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) { + $version += 0; + $version += 53 if $version < 6; + $self->{version} = $version; + $self->user->version($version); + $parent->version($version); my ($build) = $pc->[1] =~ /Build: (\d+(?:\.\d+)?)/; - $self->{build} = 0 + $build; - $self->user->build(0 + $build); - $parent->build(0 + $build); - dbg("$self->{call} = DXSpider version $version build $build"); + $build += 0; + $self->{build} = $build; + $self->user->build($build); + $parent->build($build); + dbg("$self->{call} = $software version $version build $build"); unless ($self->is_spider) { dbg("Change U " . $self->user->sort . " C $self->{sort} -> S"); $self->user->sort('S'); @@ -675,6 +872,20 @@ sub handle_18 $self->sort('S'); } # $self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/; + } elsif (my ($software, $version, $build) = $pc->[1] =~ /(AR-Cluster)\s+Version:\s+(\d+\.\d+).?(\d+\.\d+)?/) { + dbg("$self->{call} = $software version $version build $build"); + $self->{version} = $version; + $self->user->version($version); + $parent->version($version); + $self->{build} = $build; + $self->user->build($build); + $parent->build($build); + unless ($self->is_arcluster) { + dbg("Change U " . $self->user->sort . " C $self->{sort} -> R"); + $self->user->sort('R'); + $self->user->put; + $self->sort('R'); + } } else { dbg("$self->{call} = Unknown software ($pc->[1] $pc->[2])"); $self->version(50.0); @@ -682,7 +893,7 @@ sub handle_18 $self->user->version($self->version); } - if ($pc->[1] =~ /\bpc9x/) { + if ($pc->[1] =~ /CC\*Cluster/i || $pc->[1] =~ /\bpc9x/i) { if ($self->{isolate}) { dbg("$self->{call} pc9x recognised, but node is isolated, using old protocol"); } elsif (!$self->user->wantpc9x) { @@ -700,23 +911,37 @@ 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->priv(0); + } $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 // 0) == 1) { + $user->priv(0); + $user->lockout(0); + dbg("DXProt: PC92 user record for $call depriv'd and unlocked"); + $user->put; } return $user; } @@ -792,7 +1017,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'); @@ -869,7 +1094,7 @@ sub handle_20 my $origin = shift; my $pc = shift; - if ($self->{do_pc9x} && $self->{state} ne 'init92') { + if ($self->{do_pc9x} && $self->{state} ne 'init92' && $self->{state} ne 'normal') { $self->send("Reseting to oldstyle routing because login call not sent in any pc92"); $self->{do_pc9x} = 0; } @@ -963,7 +1188,7 @@ sub handle_22 my $pc = shift; if ($self->{do_pc9x}) { - if ($self->{state} ne 'init92') { + if ($self->{state} ne 'init92' && $self->{state} ne 'normal') { $self->send("Reseting to oldstyle routing because login call not sent in any pc92"); $self->{do_pc9x} = 0; } @@ -1479,10 +1704,27 @@ 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]+)?,)+/); - $ip =~ s/,/:/g if $ip; - return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip); + my $version = $part[1] || 0; + my $build = $part[2] || 0; + my $ip = $part[3] || ''; + + # remember that, at this stage, IPV6 addresses have : replaced by , + if (length $version > 4 && $version =~ /[,\.][\da-f]{1,4}/i) { + $ip = $version; + $version = 0; + } + $version =~ s/\D//g; + $version = 0 unless $version && $version =~ /^[0-9]+$/; + $build =~ s/^0\.//; + $build =~ s/\D//g; + $build = 0 unless $build && $build =~ /^[0-9]+$/; + if ($ip) { + $ip =~ s/,/:/g; + $ip =~ s/^::ffff://i; + $ip = '' unless is_ipaddr($ip); + } + dbg("'$icall' = '" . join("', '", $call, $is_node, $is_extnode, $here, $version, $build, $ip) . "'") if isdbg('pc92'); + return ($call, $is_node, $is_extnode, $here, $version+0, $build+0, $ip); } # decode a pc92 call: flag call : version : build @@ -1513,6 +1755,7 @@ sub _encode_pc92_call $ip =~ s/:/,/g; $extra .= ':' . $ip; } + return "$flag$call$extra"; } @@ -1530,48 +1773,58 @@ sub _add_thingy my @rout; # remove spurious IPV6 prefix on IPV4 addresses - $ip =~ s/^::ffff:// if $ip; - + $build ||= 0; + $version ||= 0; + if ($call) { 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 if $user; + $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 && is_numeric($version) && !$r->K && !$user->K) { + my $old = $user->sort; + if ($user->is_ak1a && (($version >= 5455 && $build > 0) || ($version >= 3000 && $version <= 3500)) ) { + $user->sort('S'); + 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))) { + unless ($version > 0 && $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->sort15); } } + $r->version($user->version) if $user->version; + $r->build($user->build) if $user->build; + $r->K(1) if $user->K; } 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 +1997,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 +2035,7 @@ sub pc92_handle_first_slot } $parent->here(Route::here($here)); $parent->version($version || $pc19_version) if $version; - $parent->build($build) if $build; + $parent->build($build) if $build; $parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call; return ($parent, @radd); } @@ -1809,12 +2062,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 +2131,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,16 +2153,44 @@ 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; + my $oldversion = $parent->version || 0; + my $user = check_add_user($parent->call, 'S'); + my $oldsort = $user->sort // ''; + + dbg("PCPROT: PC92 K v: $version ov: $oldversion b: $build ob: $oldbuild pk: " . ($parent->K || '0') . " uk: " . ($user->K || 0)) if isdbg('pc92k'); + + if (is_numeric($version) || is_numeric($build)) { + my $changed = 0; + if (($oldversion ne $version || $build ne $oldbuild)) { + dbg("PCPROT: PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild)"); + $user->version($parent->version($version)); + $user->build($parent->build($build)); + ++$changed; + } + if ($oldsort ne 'S') { + dbg("PCPROT: PC92 K node $call updated sort: $sort (was $oldsort)"); + $user->sort('S'); + ++$changed; + } + unless ($user->K) { + dbg("PCPROT: PC92 K node $call updated - marked as PC92 K user"); + $user->K(1); + ++$changed; + } + $user->put if $changed; + $parent->K(1); # mark this as come in on a K + } else { + dbg("DXProt PC92 K version call $call: invalid version: '$version' or build: '$version', ignored"); } - - dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount'); + dbg("ROUTE: reset obscount on $call now " . $parent->obscount) if isdbg('obscount'); } } elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') { @@ -1950,9 +2231,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 +2267,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'); } } @@ -2102,21 +2388,13 @@ sub handle_93 my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin"; dbg($s); } - - # will we allow it at all? - if ($censorpc) { - my @bad; - if (@bad = BadWords::check($text)) { - dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); - return; - } - } # if this is a 'bad spotter' user then ignore it my $nossid = $from; $nossid =~ s/-\d+$//; if ($badspotter->in($nossid)) { - dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Bad Spotter, dropped"); return; } @@ -2126,6 +2404,17 @@ sub handle_93 return; } + # will we allow it at all? + if ($censorpc) { + my @bad; + if (@bad = BadWords::check($text)) { + my $bw = join ', ', @bad; + dbg($line) if isdbg('nologchan'); + dbg("PCPROT: Badwords: '$bw', dropped"); + return; + } + } + # if it is routeable then then treat it like a talk my $ref = Route::get($to); if ($ref) {