use Route;
use Route::Node;
use Script;
+use DXCIDR;
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
+ $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
# 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 = 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 ([
return;
}
- # will we allow it at all?
- if ($censorpc) {
- my @bad;
- if (@bad = BadWords::check($pc->[3])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
- return;
- }
- }
# is it for me or one of mine?
my ($from, $to, $via, $call, $dxchan);
# if this is a 'nodx' node then ignore it
if ($badnode->in($pc->[6]) || ($via && $badnode->in($via))) {
- dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Node, dropped");
return;
}
- # if this is a 'bad spotter' user then ignore it
+
my $nossid = $from;
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Spotter, dropped");
return;
}
return;
}
}
+
+ # will we allow it at all?
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($pc->[3])) {
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
+ return;
+ }
+ }
# 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 $last;
-my $pc11_saved;
-my $pc11_saved_time;
+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");
+ 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+)/;
# is the spotted callsign blank? This should really be trapped earlier but it
# could break other protocol sentences. Also check for lower case characters.
if ($pc->[2] =~ /^\s*$/) {
- dbg("PCPROT: blank callsign, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: blank callsign, dropped");
return;
}
if ($pc->[2] =~ /[a-z]/) {
- dbg("PCPROT: lowercase characters, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: lowercase characters, dropped");
return;
}
# if this is a 'nodx' node then ignore it
if ($badnode->in($pc->[7])) {
- dbg("PCPROT: Bad Node $pc->[7], dropped") if isdbg('chanerr');
- return;
- }
-
- # if this is a 'bad spotter' or an unknown user then ignore it. BUT if it's got an IP address then allow it through
- my $nossid = $pc->[6];
- $nossid =~ s/-\d+$//;
- if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter $pc->[6], dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Node $pc->[7], dropped");
return;
}
my $d = cltounix($pc->[3], $pc->[4]);
# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
if (!$d || (($pcno == 11 || $pcno == 61) && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
- dbg("PCPROT: Spot ignored, invalid date or out of range ($pc->[3] $pc->[4])\n") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Spot ignored, invalid date or out of range ($pc->[3] $pc->[4])\n");
return;
}
# is it 'baddx'
- if ($baddx->in($pc->[2]) || BadWords::check($pc->[2])) {
- dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
+ if ($baddx->in($pc->[2])) {
+ dbg("PCPROT: Bad DX spot '$pc->[2]', ignored");
+ dbg($line) if isdbg('nologchan');
return;
}
- # do some de-duping
+ # is it claiming to be BUST(ed)
$pc->[5] =~ s/^\s+//; # take any leading blanks off
$pc->[2] = unpad($pc->[2]); # take off leading and trailing blanks from spotted callsign
if ($pc->[2] =~ /BUST\w*$/) {
+ dbg($line) if isdbg('nologchan');
dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
return;
}
- if ($censorpc) {
- my @bad;
- if (@bad = BadWords::check($pc->[5])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
- return;
- }
- }
+ my $nossid = $pc->[6];
+ $nossid =~ s/-\d+$//;
my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]);
+ # $f0 = frequency
+ # $f1 = call
+ # $f2 = date in unix format
+ # $f3 = comment
+ # $f4 = spotter
+ # $f5 = spotted dxcc country
+ # $f6 = spotter dxcc country
+ # $f7 = origin
+ # $f8 = spotted itu
+ # $f9 = spotted cq zone
+ # $f10 = spotter itu
+ # $f11 = spotter cq zone
+ # $f12 = spotted us state
+ # $f13 = spotter us state
+ # $f14 = ip address
+
+
+ # is this is a 'bad spotter' or an unknown user then ignore it.
+ if ($badspotter->in($nossid)) {
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Spotter $pc->[6], dropped");
+ return;
+ }
+
# global spot filtering on INPUT
if ($self->{inspotsfilter}) {
my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
}
}
+ # 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 ($pc11_saved) {
- if ($key eq $pc11_saved->[0]) {
- dbg("saved PC11 spot $key dumped, better pc61 received") if isdbg("pc11");
- undef $pc11_saved;
+
+ 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;
}
+
+ ++$pc11_to_61;
+
+ my $percent = $pc11_rx ? $pc11_to_61 * 100 / $pc11_rx : 0;
+ 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");
+
+ 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 ($pc11_saved) {
- if ($key eq $pc11_saved->[0]) {
- dbg("saved PC11 spot $key, dupe pc11 received and dumped") if isdbg("pc11");
- return; # because it's a dup
- }
+
+ # if this fires then we have already had one or more PC11s but no PC61 for this spot
+ if ($pc11_saved{$key}) {
+ 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
- if ($r && $r->ip) { # do we have an ip addres
- $pcno = 61; # now turn this into a PC61
- $spot[14] = $r->ip;
- dbg("PC11 spot $key promoted to pc61 ip $spot[14]") if isdbg("pc11");
- undef $pc11_saved;
+ # 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 ($pc11_saved && $key ne $pc11_saved) {
- dbg("saved PC11 spot $pc11_saved->[0] ne new key $key, 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);
- }
- # if we are still a PC11, save it for a better offer
- if ($pcno == 11) {
- $pc11_saved = [$key, $self, $pcno, $line, $origin, $pc];
- $pc11_saved_time = $main::systime;
- dbg("saved new PC11 spot $key for a better offer") if isdbg("pc11");
- return;
- } else {
- dbg("PC61 spot $key passed onward") if isdbg("pc11");
+ # If we have an ip address we can promote by route
+ if ($r && $r->ip) {
+ $pcno = 61;
+ $pc->[0] = 'PC61';
+ 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 $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};
+ }
+
+ # 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) {
+ $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;
+ }
}
}
-
# 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 $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');
+
+ 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: 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
if ($s) {
my $action = $senderverify > 1 ? ", DUMPED" : '';
$s =~ s/, $//;
- dbg("PCProt: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action");
+ dbg("PCPROT: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action");
return unless $senderverify < 2;
}
}
}
- # If is a new PC11, store it, releasing the one that is there (if any),
- # if a PC61 comes along then dump the stored PC11
- # If there is a different PC11 stored, release that one and store this PC11 instead,
+ # we until here to do any censorship to try and reduce the amount of noise that repeated copies
+ # from other connected nodes cause
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($pc->[5])) {
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
+ return;
+ }
+ }
+
# add it
Spot::add(@spot);
# 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 = "$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 $self->{call}: RECURSED $data removed and finished $stats") if isdbg('pc11');
+ delete $pc11_saved{$key};
+ } else {
+ dbg("END $self->{call}: RECURSED NO KEY finished $stats") if isdbg('pc11');
+ }
+ $recurse = 0;
+ } else {
+ dbg("END $self->{call}: 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) {
- 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("---") 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);
+ }
}
}
+# 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
{
# announce duplicate checking
$pc->[3] =~ s/^\s+//; # remove leading blanks
- if ($censorpc) {
- my @bad;
- if (@bad = BadWords::check($pc->[3])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
- return;
- }
- }
-
# if this is a 'nodx' node then ignore it
if ($badnode->in($pc->[5])) {
- dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Node, dropped");
return;
}
my $nossid = $pc->[1];
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Spotter, dropped");
return;
}
return;
}
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($pc->[3])) {
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
+ return;
+ }
+ }
+
+
my $dxchan;
if ((($dxchan = DXChannel::get($pc->[2])) && $dxchan->is_user) || $pc->[4] =~ /^[\#\w.]+$/){
$self->state('init');
my $parent = Route::Node::get($self->{call});
-
+
# record the type and version offered
- if (my ($version) = $pc->[1] =~ /DXSpider Version: (\d+\.\d+)/) {
- $self->{version} = 53 + $version;
- $self->user->version(53 + $version);
- $parent->version(0 + $version);
+ 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->user->version($version);
+ $parent->version($version);
my ($build) = $pc->[1] =~ /Build: (\d+(?:\.\d+)?)/;
- $self->{build} = 0 + $build;
- $self->user->build(0 + $build);
- $parent->build(0 + $build);
- dbg("$self->{call} = DXSpider version $version build $build");
+ $build += 0;
+ $build = 0 unless $build > 1;
+ $self->{build} = $build;
+ $self->user->build($build);
+ $parent->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\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) {
} else {
$user->homenode($homenode) if $homenode;
$user->node($homenode);
+ $user->priv(0);
}
$user->lastin($main::systime); # this make it last longer than just this invocation
$user->put; # just to make sure it gets written away!!!
# this is to fix a problem I introduced some build ago by using this function for users
# whereas it was only being used for nodes.
- if ($user->is_user && $user->lockout && $user->priv == 1) {
+ if ($user->is_user && $user->lockout && ($user->priv // 0) == 1) {
$user->priv(0);
$user->lockout(0);
dbg("DXProt: PC92 user record for $call depriv'd and unlocked");
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;
}
my $is_node = $flag & 4;
my $is_extnode = $flag & 2;
my $here = $flag & 1;
- my $ip;
- $part[1] //= '';
- $part[2] //= '';
- $part[3] //= '';
- if ($part[1] =~ /[,.]/) {
- $ip = $part[1];
- $part[1] = $part[2] = 0;
- } elsif ($part[3] =~ /[,.]/) {
- $ip = $part[3];
- }
- $ip =~ s/,/:/g if $ip;
- return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip);
+ my $version = $part[1] || 0;
+ my $build = $part[2] || 0;
+ my $ip = $part[3] || '';
+
+ # remember that, at this stage, IPV6 addresses have : replaced by ,
+ if (length $version > 4 && $version =~ /[,\.][\da-f]{1,4}/i) {
+ $ip = $version;
+ $version = 0;
+ }
+ $version =~ s/\D//g;
+ $version = 0 unless $version && $version =~ /^[0-9]+$/;
+ $build =~ s/^0\.//;
+ $build =~ s/\D//g;
+ $build = 0 unless $build && $build =~ /^[0-9]+$/;
+ if ($ip) {
+ $ip =~ s/,/:/g;
+ $ip =~ s/^::ffff://i;
+ $ip = '' unless is_ipaddr($ip);
+ }
+ dbg("'$icall' = '" . join("', '", $call, $is_node, $is_extnode, $here, $version, $build, $ip) . "'") if isdbg('pc92');
+ return ($call, $is_node, $is_extnode, $here, $version+0, $build+0, $ip);
}
# decode a pc92 call: flag call : version : build
$ip =~ s/:/,/g;
$extra .= ':' . $ip;
}
+
return "$flag$call$extra";
}
my @rout;
# remove spurious IPV6 prefix on IPV4 addresses
- $ip =~ s/^::ffff:// if $ip;
- $build //= 0;
- $version //= 0;
+ $build ||= 0;
+ $version ||= 0;
if ($call) {
my $ncall = $parent->call;
@rout = $parent->add($call, $version, Route::here($here), $ip);
$r = Route::Node::get($call);
$r->PC92C_dxchan($dxchan->call, $hops) if $r;
- if ($version && $version =~ /\d+/) {
+ if ($version && is_numeric($version) && !$r->K && !$user->K) {
my $old = $user->sort;
if ($user->is_ak1a && (($version >= 5455 && $build > 0) || ($version >= 3000 && $version <= 3500)) ) {
$user->sort('S');
- dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) updated to " . $user->sort);
- } elsif ($user->is_spider && $version =~ /^\d+$/ && ($version < 3000 || ($version > 4000 && $version < 5455))) {
- unless ($version == 5000 && $build == 0) {
+ dbg("PCPROT::_add_thingy node $call v: $version b: $build sort ($old) updated to " . $user->sort);
+ } elsif ($user->is_spider && ($version < 3000 || ($version > 4000 && $version < 5455))) {
+ unless ($version > 0 && $build == 0) {
$user->sort('A');
- $build //= 0;
- dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort);
+ $build ||= 0;
+ dbg("PCPROT::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort);
}
}
}
+ $r->version($user->version) if $user->version;
+ $r->build($user->build) if $user->build;
+ $r->K(1) if $user->K;
} else {
dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
$user = check_add_user($call, 'U', $parent->call);
}
$parent->here(Route::here($here));
$parent->version($version || $pc19_version) if $version;
- $build =~ s/^0\.//, $parent->build($build) if $build;
+ $parent->build($build) if $build;
$parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call;
return ($parent, @radd);
}
push @radd, $add if $add;
$parent->reset_obs;
my $call = $parent->call;
- my $version = $ent[4] // 0;
- my $build = $ent[5] // 0;
+ my $version = $ent[4] || 0;
+ my $build = $ent[5] || 0;
$build =~ s/^0\.//;
- my $oldbuild = $parent->build // 0;
- $oldbuild =~ s/^0\.//;
- my $oldversion = $parent->version // 0;
+ my $oldbuild = $parent->build || 0;
+ my $oldversion = $parent->version || 0;
my $user = check_add_user($parent->call, 'S');
my $oldsort = $user->sort // '';
- if ($oldsort ne 'S' || $oldversion != $version || $build != $oldbuild) {
- dbg("PCProt PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild) sort: 'S' (was $oldsort)");
- $user->sort('S');
- $user->version($parent->version($version));
- $user->build($parent->build($build));
- $user->put;
- }
- dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
+ dbg("PCPROT: PC92 K v: $version ov: $oldversion b: $build ob: $oldbuild pk: " . ($parent->K || '0') . " uk: " . ($user->K || 0)) if isdbg('pc92k');
+
+ if (is_numeric($version) || is_numeric($build)) {
+ my $changed = 0;
+ if (($oldversion ne $version || $build ne $oldbuild)) {
+ dbg("PCPROT: PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild)");
+ $user->version($parent->version($version));
+ $user->build($parent->build($build));
+ ++$changed;
+ }
+ if ($oldsort ne 'S') {
+ dbg("PCPROT: PC92 K node $call updated sort: $sort (was $oldsort)");
+ $user->sort('S');
+ ++$changed;
+ }
+ unless ($user->K) {
+ dbg("PCPROT: PC92 K node $call updated - marked as PC92 K user");
+ $user->K(1);
+ ++$changed;
+ }
+ $user->put if $changed;
+ $parent->K(1); # mark this as come in on a K
+ } else {
+ dbg("DXProt PC92 K version call $call: invalid version: '$version' or build: '$version', ignored");
+ }
+ dbg("ROUTE: reset obscount on $call now " . $parent->obscount) if isdbg('obscount');
}
} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
}
# 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)
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)) {
my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
dbg($s);
}
-
- # will we allow it at all?
- if ($censorpc) {
- my @bad;
- if (@bad = BadWords::check($text)) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
- return;
- }
- }
# if this is a 'bad spotter' user then ignore it
my $nossid = $from;
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Spotter, dropped");
return;
}
return;
}
+ # will we allow it at all?
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($text)) {
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
+ return;
+ }
+ }
+
+ $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) {
}
}
+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;
projects / spider.git / blobdiff