X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=5189746aa5ba35f28e62f649c686618f6720d68b;hb=d1d0a158e45ea7dba36caa70822d22bff7a9a00b;hp=a6668a36db0daeef1752d86b796d4dcaf7d82e18;hpb=61a666ccf108505f0cec2e5c682fde019fc3a051;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index a6668a36..5189746a 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -36,6 +36,9 @@ 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 @@ -46,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 ); $pc9x_dupe_age = 60; # catch loops of circular (usually) D records @@ -59,6 +62,7 @@ $pc9x_time_tolerance; # thing a node might send - once an hour and we # 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. +$pc11_dwell_time = 2; # number of seconds to wait for a PC61 to come to substitute the PC11 $pc92filterdef = bless ([ @@ -89,16 +93,6 @@ 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; - } - } # is it for me or one of mine? my ($from, $to, $via, $call, $dxchan); @@ -117,7 +111,7 @@ sub handle_10 return; } - # if this is a 'bad spotter' user then ignore it + my $nossid = $from; $nossid =~ s/-\d+$//; if ($badspotter->in($nossid)) { @@ -133,14 +127,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; -my $pc11_saved_time; +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 @@ -160,7 +167,9 @@ sub handle_11 } } - dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11"); + my $type = + + dbg("INPUT $self->{call} -> $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); # my ($hops) = $pc->[8] =~ /^H(\d+)/; @@ -185,61 +194,60 @@ sub handle_11 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($line) if isdbg('nologchan'); - dbg("PCPROT: Bad Spotter $pc->[6], dropped"); - return; - } - - # check IP addresses - if ($pc->[8] && is_ipaddr($pc->[8])) { - my $ip = $pc->[8]; - $ip =~ s/,/:/g; - $ip =~ s/^::ffff://; - if (DXCIDR::find($ip)) { - - } - } - # convert the date to a unix date 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($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]) || (my @bad = BadWords::check($pc->[2]))) { - my $bw = join ', ', @bad; - $bw = qq{ '$bw'} if $bw; - dbg("PCPROT: Bad DX spot$bw, ignored"); + 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])) { - my $bw = join ', ', @bad; - dbg($line) if isdbg('nologchan'); - dbg("PCPROT: Badwords: '$bw', dropped"); - 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); @@ -249,64 +257,91 @@ 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 (Spot::dup_find(@spot[0..4,7])) { + dbg("DUPE $pc->[0] $self->{call} -> key: $key dumped") if isdbg('pc11'); + return; + } else { + ++$pc61_rx; + } + + 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, saved 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 ($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 - } + + 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: 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 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; + $pcno = 61; + $pc->[0] = 'PC61'; + $pc->[7] = $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"); + delete $pc11_saved{$key}; } - } - 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"); + # 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("SAVED $self->{call} -> NEW $pc->[0] spot $key waiting for a better offer") if isdbg("pc11"); + return; + } } } + my $count = $pc11_to_61+$rpc11_to_61; + my $percent = $pc11_rx ? $count*100 / $pc11_rx : 0; + my $pc11_61 = $pc61_rx ? $pc11_rx*100 / $pc61_rx : 0; + dbg(sprintf("PASSED $self->{call} -> $pc->[0] spot $key, pc11: $pc11_rx pc61: $pc61_rx PC11/PC61 ratio: %0.1f%% total pc11->pc61: $count (%0.1f%%) ", $pc11_61, $percent)) 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,7])) { - dbg("PCPROT: Duplicate Spot $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot'); + 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: $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 @@ -328,15 +363,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); @@ -421,18 +465,32 @@ 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 + if ($recurse) { + if ($pc11_saved{$key}) { + dbg("END RECURSED $self->{call} $pc->[0] key: $key removed and finished") if isdbg('pc11'); + delete $pc11_saved{$key}; + } else { + dbg("END RECURSED $self->{call} $pc->[0] key: $key finished") if isdbg('pc11'); + } + $recurse = 0; + } else { + dbg("END NORMAL $self->{call} $pc->[0] key: $key finished") if isdbg('pc11'); + } } # 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); + foreach my $key (keys %pc11_saved) { + my $r = $pc11_saved{$key}; + if ($main::systime > $r->[0] + $pc11_dwell_time) { + dbg("SAVED PC11 spot $key timed out waiting, recursing") if isdbg("pc11"); + my $self = $r->[1]; + delete $pc11_saved{$key}; + $self->handle_11(@$r[2..5], 1); + } } } @@ -448,16 +506,6 @@ sub handle_12 # announce duplicate checking $pc->[3] =~ s/^\s+//; # remove leading blanks - 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; - } - } - # if this is a 'nodx' node then ignore it if ($badnode->in($pc->[5])) { dbg($line) if isdbg('nologchan'); @@ -481,6 +529,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.]+$/){ @@ -750,15 +809,18 @@ sub handle_18 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'); @@ -773,7 +835,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) { @@ -974,7 +1036,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; } @@ -1068,7 +1130,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; } @@ -1683,12 +1745,12 @@ sub _add_thingy 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); + 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 v: $version b: $build sort ($old) downgraded to " . $user->sort); } } } @@ -2045,23 +2107,23 @@ sub handle_92 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'); + 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)"); + 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)"); + 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"); + dbg("PCPROT: PC92 K node $call updated - marked as PC92 K user"); $user->K(1); ++$changed; } @@ -2268,17 +2330,6 @@ 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)) { - my $bw = join ', ', @bad; - dbg($line) if isdbg('nologchan'); - dbg("PCPROT: Badwords: '$bw', dropped"); - return; - } - } # if this is a 'bad spotter' user then ignore it my $nossid = $from; @@ -2295,6 +2346,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) {