}
}
- # 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.
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");
+ my $percent = $pc11_rx ? $pc11_to_61 * 100 / $pc11_rx : 0;
+ dbg(sprintf("recurse: $recurse saved PC11 spot $key dumped, better pc61 received pc61: $pc61_rx pc11: $pc11_rx -> pc61: $pc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11");
undef $pc11_saved;
}
}
++$pc11_rx;
if ($pc11_saved) {
- if ($key eq $pc11_saved->[0]) {
+ 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
}
$pcno = 61; # now turn this into a PC61
$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");
+ my $percent = $pc11_rx ? $rpc11_to_61 * 100 / $pc11_rx : 0;
+ dbg(sprintf("recurse: $recurse PC11 spot $key promoted to pc61 ip $spot[14] pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11");
undef $pc11_saved;
}
}
} else {
- dbg("recurse: $recurse PC61 spot $key passed onward pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11");
+ my $count = $pc11_to_61+$rpc11_to_61;
+ my $percent = $pc11_rx ? $count*100 / $pc11_rx : 0;
+ dbg(sprintf("recurse: $recurse PC61 spot $key passed onward pc61: $pc61_rx pc11: $pc11_rx -> pc61: $count (%0.1f%%)", $percent)) 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
return;
}
+ # 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
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->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;
}