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
$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 $pc11_dwell_time
+ $pc92filterdef $senderverify $pc11_dwell_time $pc11_extract_route
);
$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
+$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 ([
$main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6]));
}
-my $last;
-my $pc11_saved;
-my $pc11_saved_time;
-my $pc11_rx;
-my $rpc11_to_61;
-my $pc11_to_61;
-my $pc61_rx;
+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
}
}
- dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61");
+ dbg("INPUT $self->{call}: $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61");
# my ($hops) = $pc->[8] =~ /^H(\d+)/;
}
}
- # 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.
unless ($recurse) {
if ($pcno == 61) {
- ++$pc61_rx;
-
- if ($pc11_saved) {
- if ($key eq $pc11_saved->[0]) {
- ++$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 (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) {
- ++$pc11_rx;
-
- if ($pc11_saved) {
- if ($key eq $pc11_saved->[0]) {
- dbg("recurse: $recurse 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: $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;
+
+ 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 = int($rpc11_to_61 * 100 / $pc11_rx);
- dbg("recurse: $recurse PC11 spot $key promoted to pc61 ($percent\%) ip $spot[14] pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11");
- undef $pc11_saved;
+ 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
+ # 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) {
- 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");
+ $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;
}
-
- } else {
- dbg("recurse: $recurse PC61 spot $key passed onward pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11");
- $recurse = 0;
- undef $pc11_saved;
}
}
-
+
# 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: 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
}
}
- # 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;
-
+ # 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
{
- 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;
- 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("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
sub handle_12
{
$self->state('init');
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;
$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');
$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);
$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;
}
projects / spider.git / blobdiff