X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=6147f23e6bc8a4b18f921d26bdb9722be9d7f930;hb=b8c9c3d07fcf1229a9da44b5b11fc94dccd8d05c;hp=fc6e13ef25032a3e9148d529be12dac5ce214ecd;hpb=f8de8b2dedec09d040a107af6bb82e31e4667c87;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index fc6e13ef..6147f23e 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 = 1; # number of seconds to wait for a PC61 to come to substitute the PC11 $pc92filterdef = bless ([ @@ -142,6 +146,10 @@ sub handle_10 my $last; my $pc11_saved; my $pc11_saved_time; +my $pc11_rx; +my $rpc11_to_61; +my $pc11_to_61; +my $pc61_rx; # DX Spot handling sub handle_11 @@ -161,7 +169,9 @@ sub handle_11 } } - dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); + my $type = + + dbg("INPUT $self->{call} -> $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); # my ($hops) = $pc->[8] =~ /^H(\d+)/; @@ -202,7 +212,7 @@ sub handle_11 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*$/) { @@ -216,19 +226,22 @@ sub handle_11 my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]); - # check IP addresses - 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"); - # sneakily put it into the dup list to prevent following PC11s also getting through :-) - Spot::dup(@spot[0..4,7]); - return; - } - } + # $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)) { @@ -250,19 +263,37 @@ 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 recurse: $recurse dumped") if isdbg('pc11'); + return; + } else { + ++$pc61_rx; + } + if ($pc11_saved) { if ($key eq $pc11_saved->[0]) { - dbg("saved PC11 spot $key dumped, better pc61 received") if isdbg("pc11"); + ++$pc11_to_61; + my $percent = $pc11_rx ? $pc11_to_61 * 100 / $pc11_rx : 0; + dbg(sprintf("PROMOTED BETTER $pc->[0] $key received, saved PC11 DUMPED pc61: $pc61_rx recurse: $recurse pc11: $pc11_rx -> pc61: $pc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11"); undef $pc11_saved; } } } if ($pcno == 11) { + + if (Spot::dup_find(@spot[0..4,7])) { + dbg("DUPE $pc->[0] $self->{call} -> key: $key recurse: $recurse dumped") if isdbg('pc11'); + return; + } else { + ++$pc11_rx; + } + if ($pc11_saved) { - if ($key eq $pc11_saved->[0]) { - dbg("saved PC11 spot $key, dupe pc11 received and dumped") if isdbg("pc11"); + if ($key eq $pc11_saved->[0] ) { + dbg("DUPE $pc->[0] $self->{call } key: $key same as saved recurse: $recurse, dumped") if isdbg("pc11"); return; # because it's a dup } } @@ -270,41 +301,73 @@ sub handle_11 # 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"); + $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 spot $key PROMOTED to PC61 IP $spot[14] recurse: $recurse pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61 (%0.1f%%)", $percent)) 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; + # if it is STILL (despite all efforts to change it) a PC11 + if ($pcno == 11) { + if ($pc11_saved && $key ne $pc11_saved->[0]) { + if (Spot::dup_find(@spot[0..4,7])) { + dbg("DUPE saved PC11 $self->{call} -> key: $pc11_saved->[0] recurse: $recurse dumped") if isdbg('pc11'); + } else { + dbg("RECURSE $self->{call} -> NEW $pc->[0] spot $key ne $pc11_saved->[0] recurse: $recurse, SAVE + recursing") if isdbg("pc11"); + # shift @$pc11_saved; # saved key + my $self = $pc11_saved->[1]; + my @saved = @$pc11_saved[2..5]; + $self->handle_11(@saved, 1); + } + } + $pc11_saved = [$key, $self, $pcno, $line, $origin, $pc]; + $pc11_saved_time = $main::systime; + dbg("SAVED $self->{call} -> NEW $pc->[0] spot $key for a better offer, recurse: $recurse") if isdbg("pc11"); + return; + } + } else { - dbg("PC61 spot $key passed onward") if isdbg("pc11"); + 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, recurse: $recurse pc11: $pc11_rx pc61: $pc61_rx PC11/PC61 ratio: %0.1f%% pc11->pc61 conversions: $count (%0.1f%%) ", $pc11_61, $percent)) if isdbg("pc11"); + $recurse = 0; + undef $pc11_saved; } + } else { + # recursed + 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, recurse: $recurse pc11: $pc11_rx pc61: $pc61_rx PC11/PC61 ratio: %0.1f%% pc11->pc61 conversions: $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 @@ -332,8 +395,8 @@ sub handle_11 } } -# we until here to do any censorship to try and reduce the amount of noise that repeated copies -# from other connected nodes cause + # 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])) { @@ -344,9 +407,6 @@ 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, # add it Spot::add(@spot); @@ -431,13 +491,26 @@ 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 eq $pc11_saved->[0]) { + dbg("END RECURSED $self->{call} $pc->[0] key: $key saved_key removed and finished") if isdbg('pc11'); + undef $pc11_saved; + } 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"); + if ($pc11_saved && $main::systime > $pc11_saved_time + $pc11_dwell_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; @@ -761,7 +834,7 @@ sub handle_18 my $parent = Route::Node::get($self->{call}); # record the type and version offered - if (my ($version) = $pc->[1] =~ /(?:DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+))/) { + 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; @@ -772,7 +845,7 @@ sub handle_18 $self->{build} = $build; $self->user->build($build); $parent->build($build); - dbg("$self->{call} = DXSpider version $version 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'); @@ -787,7 +860,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) { @@ -988,7 +1061,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; } @@ -1082,7 +1155,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; }