X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=2814d07fd8807ee0a6cdb222599fe7861c42e6d4;hb=219f4947f4cb1cd34e4b4ebd38b70e5868eceb95;hp=50a6416e77e50f30067ee8f6040d5c6ac421d664;hpb=be5e1ae1ec75bdead65ffb14945b9f5fe164e58a;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 50a6416e..2814d07f 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -144,7 +144,9 @@ 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 @@ -252,17 +254,6 @@ sub handle_11 } } - # 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. @@ -270,10 +261,13 @@ 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 = $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; } } @@ -294,8 +288,9 @@ sub handle_11 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 = $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; } @@ -316,13 +311,14 @@ sub handle_11 } } else { - dbg("recurse: $recurse 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; + 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 @@ -332,6 +328,18 @@ sub handle_11 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 @@ -796,7 +804,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; @@ -807,7 +815,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'); @@ -822,7 +830,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) { @@ -1023,7 +1031,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; } @@ -1117,7 +1125,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; }