$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
# 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 ([
return;
}
- # if this is a 'bad spotter' user then ignore it
+
my $nossid = $from;
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
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
}
}
- dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11");
+ dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61");
# my ($hops) = $pc->[8] =~ /^H(\d+)/;
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)) {
- dbg("DXProt: Spot ignore $pc->[8] in badip list") if dbg('badip');
- return;
- }
- }
-
# 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])) {
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;
}
+ 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);
}
}
+ # we check IP addresses for PC61
+ 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;
+ }
+ }
+
# 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) {
+ ++$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 = int($pc11_to_61 * 100 / $pc11_rx);
+ dbg("recurse: $recurse saved PC11 spot $key dumped, better pc61 received ($percent\%) pc61: $pc61_rx pc11: $pc11_rx -> pc61: $pc11_to_61 ") if isdbg("pc11");
undef $pc11_saved;
}
}
}
if ($pcno == 11) {
+
+ ++$pc11_rx;
+
if ($pc11_saved) {
if ($key eq $pc11_saved->[0]) {
- dbg("saved PC11 spot $key, dupe pc11 received and dumped") if isdbg("pc11");
+ dbg("recurse: $recurse saved PC11 spot $key, dupe pc11 received and dumped") if isdbg("pc11");
return; # because it's a dup
}
}
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");
+ ++$rpc11_to_61;
+ my $percent = int($rpc11_to_61 * 100 / $pc11_rx);
+ dbg("recurse: $recurse PC11 spot $key promoted to pc61 ip $spot[14] ($percent\%) pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") 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]) {
+ dbg("recurse: $recurse NEW PC11 spot $key ne $pc11_saved->[0], 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("recurse: $recurse saved new PC11 spot $key for a better offer") if isdbg("pc11");
+ return;
+ }
+
} else {
- dbg("PC61 spot $key passed onward") if isdbg("pc11");
+ my $count = $pc11_to_61+$rpc11_to_61+0;
+ my $percent = $pc11_rx ? int($count / $pc11_rx) : 0;
+ dbg("recurse: $recurse PC61 spot $key passed onward pc61: $pc61_rx pc11: $pc11_rx -> pc61: $count ($percent\%)") if isdbg("pc11");
+ $recurse = 0;
+ undef $pc11_saved;
}
}
+
# this goes after the input filtering, but before the add
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
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;
}
}
}
-# 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])) {
}
}
- # 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);
}
}
+ # cancel any recursion as we have now processed it
+ if ($recurse) {
+ if ($pc11_saved && $key eq $pc11_saved->[0]) {
+ dbg("recurse: $recurse key: $key saved_key: $pc11_saved->[0] removed") if isdbg('pc11');
+ undef $pc11_saved;
+ }
+ $recurse = 0;
+ }
+
# local processing
if (defined &Local::spot) {
my $r;
# send out the filtered spots
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) {
+ 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 $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');
$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) {
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;
}
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;
}
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);
}
}
}
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;
}
projects / spider.git / blobdiff