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
unless ($recurse) {
if ($pcno == 61) {
+ ++$pc61_rx;
+
if ($pc11_saved) {
if ($key eq $pc11_saved->[0]) {
++$pc11_to_61;
- dbg("recurse: $recurse saved PC11 spot $key dumped, better pc61 received pc11: $pc11_rx -> pc61 $pc11_to_61 ") if isdbg("pc11");
+ 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 ($r && $r->ip) { # do we have an ip addres
$pcno = 61; # now turn this into a PC61
$spot[14] = $r->ip;
- ++$pc11_to_61;
- dbg("recurse: $recurse PC11 spot $key promoted to pc61 ip $spot[14] pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11");
+ ++$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;
}
}
} else {
- dbg("recurse: $recurse PC61 spot $key passed onward") if isdbg("pc11");
+ 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;
}
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;
}