X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=60040e4d525b527732abc578e0724462868e1325;hb=7dd07d0e32e95c4dc1ada18c92d3b5cce5c4d128;hp=22c82ea4ccccbaa9cb3003415b3d43bd72947d54;hpb=bb3889c1d4930e2ca96b47aea10ce5e803737043;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 22c82ea4..60040e4d 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -49,7 +49,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $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 $pc11_extract_route + $pc92filterdef $senderverify $pc11_dwell_time $pc11_extract_route $pc92_ad_enabled $pc92c_ipaddr_enable ); $pc9x_dupe_age = 60; # catch loops of circular (usually) D records @@ -141,7 +141,9 @@ sub handle_10 } # convert this to a PC93, coming from mycall with origin set and process it as such - $main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6])); + my $ref = Route::get($pc->[6]); + my $ip = $ref->ip; + $main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6]), $ip); } my %pc11_saved; # delayed PC11s @@ -168,7 +170,8 @@ sub handle_11 } } - dbg("INPUT $self->{call}: $line origin $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); + dbg("---") if isdbg("pc11") || isdbg("pc61"); + dbg("INPUT $self->{call}: $line via: $origin recurse: $recurse") if isdbg("pc11") || isdbg("pc61"); # my ($hops) = $pc->[8] =~ /^H(\d+)/; @@ -256,74 +259,79 @@ sub handle_11 } } + # Populate the routing table + $self->populate_routing_table($pc->[7], $pc->[6], $pc->[8]); + my $r = Route::User::get($pc->[6]); + if ($pcno == 61) { + unless ($pc->[8] && is_ipaddr($pc->[8])) { + dbg("PCPROT: ROUTE $self->{call} NO IP ADDRESS in '$line'!"); + } + } # 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) { - 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}) { + # before we promote because it's a better pc61, check that it's not a dupe (but don't insert it). + if (Spot::dup_find(@spot[0..4,7])) { + dbg("PCPROT: Duplicate Spot $self->{call}: $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot') || isdbg('pc11'); + delete $pc11_saved{$key}; + return; } - } - 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) { + dbg(sprintf("PROMOTED $self->{call}: BETTER $pc->[0] $key, using pc61, WAITING pc11 DUMPED: $pc61_rx pc11: $pc11_rx better pc61: $pc11_to_61 (%0.1f%%)", $percent)) if isdbg("pc11"); - if (Spot::dup_find(@spot[0..4,7])) { - dbg("DUPE $pc->[0] $self->{call}: key: $key dumped") if isdbg('pc11'); - return; - } else { + delete $pc11_saved{$key}; # because we have promoted it, no longer needed. + + # so unlike the promotion by route, there is a stored, but uncounted PC11 + # which have discarded. But we have chosen to use better PC61 that's just come in + # so we allow the PC61 to be counted later, but count the now discarded PC11 + # because it *did* come in. ++$pc11_rx; - } + } + } + + if ($pcno == 11) { + # if this fires then we have already had one or more PC11s but no PC61 for this spot if ($pc11_saved{$key}) { - dbg("DUPE $pc->[0] $self->{call } key: $key is saved, ignored") if isdbg("pc11"); + dbg("DUPE $self->{call} $pc->[0] 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 + # before we promote by route, check that it's not been preceded by a previous PC61 + if (Spot::dup_find(@spot[0..4,7])) { + my $s = exists $pc11_saved{$key} ? " stored $key removed" : ""; + dbg("PCPROT: Duplicate Spot $self->{call}: PC11$s, recurse: $recurse, ignored\n") if isdbg('chanerr') || isdbg('dupespot') || isdbg('pc11'); + delete $pc11_saved{$key}; + return; + } - if ($r && $r->ip) { # do we have an ip addres + + # If we have an ip address we can promote by route + if ($r && $r->ip) { $pcno = 61; $pc->[0] = 'PC61'; - $pc->[7] = $spot[14] = $r->ip; + my $hops = $pc->[8]; + $pc->[8] = $spot[14] = $r->ip; ++$rpc11_to_61; 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"); + dbg(sprintf("PROMOTED $self->{call}: ROUTE 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, '~'; + + # update the stats (NOTE, thie record was a PC11, it has now become a PC61 + # this is NOT the same choosing a better PC61, that is a separate record. + ++$pc11_rx; # 'cos we received as a PC11 it and it won't be a pc11 anymore + --$pc61_rx; # 'cos we'll increment it later as it's now a pc61, no double counting + +# dbg("CHANGED saved key: $key PC11 line to $line") if isdbg('pc11'); delete $pc11_saved{$key}; } @@ -336,12 +344,13 @@ sub handle_11 } } } - - # 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 + # + ## NOTE: this is where we insert the spot into the DXDupe cache + # if (Spot::dup(@spot[0..4,7])) { dbg("PCPROT: Duplicate Spot $self->{call}: $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot') || isdbg('pc11'); return; @@ -349,18 +358,23 @@ sub handle_11 dbg("PROCESSING $self->{call}: $pc->[0] key: $key") if isdbg('pc11'); - # we check IP addresses for PC61 - this will also dedupe PC11 copies + if ($pcno == 11) { + ++$pc11_rx; + } else { + ++$pc61_rx; + } + + # we check IP addresses for PC61 - this will also dedupe PC11 promotions 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"); + 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 @@ -489,18 +503,18 @@ sub handle_11 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 $data = "$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'); + dbg("END $self->{call}: RECURSED $data removed and finished $stats") if isdbg('pc11'); delete $pc11_saved{$key}; } else { - dbg("END RECURSED $data finished $stats") if isdbg('pc11'); + dbg("END $self->{call}: RECURSED NO KEY finished $stats") if isdbg('pc11'); } $recurse = 0; } else { - dbg("END NORMAL $data finished $stats") if isdbg('pc11'); + dbg("END $self->{call}: NORMAL $data finished $stats") if isdbg('pc11'); } } @@ -510,7 +524,8 @@ sub pc11_process 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"); + dbg("---") if isdbg("pc11"); + dbg("RECURSE $r->[1]->{call}: 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); @@ -858,6 +873,7 @@ sub handle_18 $parent->version($version); my ($build) = $pc->[1] =~ /Build: (\d+(?:\.\d+)?)/; $build += 0; + $build = 0 unless $build > 1; $self->{build} = $build; $self->user->build($build); $parent->build($build); @@ -890,7 +906,7 @@ sub handle_18 $self->user->version($self->version); } - if ($pc->[1] =~ /CC\*Cluster/i || $pc->[1] =~ /\bpc9x/i) { + if ($pc->[1] =~ /CC\s*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) { @@ -2306,7 +2322,7 @@ sub handle_92 } # broadcast it if we get here - $self->broadcast_route_pc9x($pcall, undef, $line, 0); + $self->broadcast_route_pc9x($pcall, undef, $line, 0) unless !$pc92_ad_enabled && ($sort eq 'A' || $sort eq 'D'); } # get all the routes for a thing, bearing in mind that the thing (e.g. a user) @@ -2373,7 +2389,11 @@ sub handle_93 my $via = uc $pc->[5]; my $text = $pc->[6]; my $onode = uc $pc->[7]; - $onode = $pcall if @$pc <= 8; + my $ipaddr = $pc->[8]; + + $onode = undef unless $onode && is_callsign($onode); + $onode //= $pcall; + $ipaddr = undef unless $ipaddr && is_ipaddr($ipaddr); # this is catch loops caused by bad software ... if (eph_dup("PC93|$from|$text|$onode", $pc10_dupe_age)) { @@ -2412,6 +2432,8 @@ sub handle_93 } } + $self->populate_routing_table($onode, $from, $ipaddr); + # if it is routeable then then treat it like a talk my $ref = Route::get($to); if ($ref) { @@ -2490,4 +2512,48 @@ sub handle_default } } +sub populate_routing_table +{ + my ($self, $node, $user, $ip) = @_; + + my $rn = Route::Node::get($node); + unless ($rn) { + $rn = Route::Node->new($node); + dbg("ROUTE $self->{call}: ADD NEW node: $node") if isdbg('pc11'); + } + + my $ru; + if ($user ne $node) { + $ru = Route::User::get($user); + unless ($ru) { + $rn->add_user($user, 0, undef); + dbg("ROUTE $self->{call}: ADD NEW user: $user -> $node") if isdbg('pc11'); + } + $ru = Route::User::get($user); + } + + # Add/Change any IP address info + + # as we have a route to a user, if it (or the node) does not exist then create them + # link the user to the node if not already done. + # then add or alter the IP address + if ($ip && is_ipaddr($ip)) { + my $new = $ip; + if ($ru) { + if ($ru->ip ne $new) { + if ($ru->ip) { + my $old = $ru->ip; + $ru->ip($new); + dbg("ROUTE $self->{call}: ALTER IP node: $node user: $user old IP: '$old'-> new IP: '$new'") if isdbg('pc11'); + } else{ + $ru->ip($new); + dbg("ROUTE $self->{call}: NEW IP node: $node user: $user IP: '$new'") if isdbg('pc11'); + } + } + } else { + dbg("ROUTE $self->{call}: ADD Failed for node $node user $user") if isdbg('pc11'); + } + } +} + 1;