$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 $pc61_extract_route $pc92_ad_enabled $pc92c_ipaddr_enabled
);
$pc9x_dupe_age = 60; # catch loops of circular (usually) D records
$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
+$pc61_extract_route = 0; # generate missing user route entry and IP address from passing PC61s
$pc92filterdef = bless ([
}
# 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
}
}
- # Populate the routing table
- my $rn = Route::Node::get($pc->[7]);
- unless ($rn) {
- $rn = Route::Node->new($pc->[7]);
- dbg("ROUTE $self->{call}: ADD NEW node: $pc->[7]") if isdbg('pc11');
- }
- my $r = Route::User::get($pc->[6]);
- unless ($r) {
- $rn->add_user($pc->[6], 0, undef);
- dbg("ROUTE $self->{call}: ADD NEW user: $pc->[6] -> $pc->[7]") if isdbg('pc11');
- $r = Route::User::get($pc->[6]);
- }
-
- # Add/Change any IP address info
+ my $rug = Route::User::get($pc->[6]);
if ($pcno == 61) {
-
- # 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 ($pc->[8]) {
- my $new = $pc->[8];
- if ($r) {
- if ($r->ip ne $new) {
- if ($r->ip) {
- my $old = $r->ip;
- $r->ip($new);
- dbg("ROUTE $self->{call}: ALTER IP node: $pc->[7] user: $pc->[6] old IP: '$old'-> new IP: '$new'") if isdbg('pc11');
- } else{
- $r->ip($new);
- dbg("ROUTE $self->{call}: NEW IP node: $pc->[7] user: $pc->[6] IP: '$new'") if isdbg('pc11');
- }
- }
- } else {
- dbg("ROUTE $self->{call}: ADD Failed for node $pc->[7] user $pc->[6]") if isdbg('pc11');
- }
- } else {
- dbg("PCPROT: ROUTE $self->{call} NO IP ADDRESS in '$line'!");
+ unless ($pc->[8] && is_ipaddr($pc->[8])) {
+ LogDbg('err', "PCPROT: ROUTE $self->{call} NO IP ADDRESS in '$line'!");
+ return;
}
+ if ($pc61_extract_route) {
+ $self->populate_routing_table($pc->[7], $pc->[6], $pc->[8]);
+ }
}
# this is where we decide to delay PC11s in the hope that a PC61 will be along soon.
if ($pcno == 61) {
if ($pc11_saved{$key}) {
- # before we promote by route, check that it's not a dupe (but don't insert it).
+ # 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};
}
++$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 we have an ip address we can promote by route
- if ($r && $r->ip) {
+ if ($rug && $rug->ip) {
$pcno = 61;
$pc->[0] = 'PC61';
my $hops = $pc->[8];
- $pc->[8] = $spot[14] = $r->ip;
+ $pc->[8] = $spot[14] = $rug->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
- ++$pc11_rx; # 'cos we received it and it won't be a pc11 anymore
+ # 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');
#
# As for spots generated from non-PC92 nodes, we'll see after about do_pc9x3h20m...
#
- if ($senderverify) {
+ if ($senderverify || isdbg('suspicious')) {
+ my $sv = $senderverify;
+ $sv += 2 if isdbg('suspicious');
my $nroute = Route::Node::get($pc->[7]);
- my $uroute = Route::Node::get($pc->[6]);
my $local = DXChannel::get($pc->[7]);
-
+ my $uref = DXUser::get_current($pc->[7]);
+ my $s = '';
+ my $ip = $pcno == 61 ? $pc->[8] : '';
+
if ($nroute && ($nroute->last_PC92C || ($local && !$local->do_pc9x))) {
- my $s = '';
- my $ip = $pcno == 61 ? $pc->[8] : '';
# $s .= "User $pc->[6] not logged in, " unless $uroute;
$s .= "User $pc->[6] not on node $pc->[7], " unless $nroute->is_user($pc->[6]);
# $s .= "Node $pc->[7] at '$ip' not on Node's IP " . $nroute->ip if $ip && $nroute && $nroute->ip && $nroute->ip ne $ip;
- 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");
- return unless $senderverify < 2;
- }
+ }
+ # check for ip addresses on spots from non-pc9x nodes - if they have it's likely done by DXSpider nodes
+ #if ($ip && ($nroute && !$nroute->do_pc9x || $uref && $uref->is_spider)) {
+ # $s .= "PC$pcno has spurious ipaddr '$ip' from non-pc9x node $pc->[7]";
+ #}
+ if ($s) {
+ my $action = $sv > 1 ? ", DUMPED" : '';
+ $s =~ s/, $//;
+ dbg("PCPROT: Bad Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action");
+ return unless $sv < 2;
}
}
$conf = $conf eq '*';
# reject this if we think it is a node already
- my $r = Route::Node::get($call);
- my $u = DXUser::get_current($call) unless $r;
- if ($r || ($u && $u->is_node)) {
+ my $rng = Route::Node::get($call);
+ my $u = DXUser::get_current($call) unless $rng;
+ if ($rng || ($u && $u->is_node)) {
dbg("PCPROT: $call is a node") if isdbg('chanerr');
next;
}
- $r = Route::User::get($call);
+ my $rug = Route::User::get($call);
my $flags = Route::here($here)|Route::conf($conf);
- if ($r) {
- my $au = $r->addparent($parent);
- if ($r->flags != $flags) {
- $r->flags($flags);
- $au = $r;
+ if ($rug) {
+ my $au = $rug->addparent($parent);
+ if ($rug->flags != $flags) {
+ $rug->flags($flags);
+ $au = $rug;
}
- push @rout, $r if $h && $au;
+ push @rout, $rug if $h && $au;
} else {
my @ans = $parent->add_user($call, $flags);
push @rout, @ans if $h && @ans;
$self->state('init');
my $parent = Route::Node::get($self->{call});
-
+
+ my ($software, $version, $build) = (undef, 0, 0);
+
# record the type and version offered
- if (my ($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) {
+ if (($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) {
$version += 0;
$version += 53 if $version < 6;
$self->{version} = $version;
$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+)?/) {
+ } elsif (($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);
$user->node($homenode);
$user->priv(0);
}
- $user->lastin($main::systime); # this make it last longer than just this invocation
+ $user->lastin($main::systime); # this makes it last longer than just this invocation
$user->put; # just to make sure it gets written away!!!
dbg("DXProt: PC92 new user record for $call created");
}
next;
}
+ if ($call eq $main::myalias) {
+ LogDbg('err', "ROUTE: $call eq \$myalias from $self->{call}, ignored!!!");
+ dbgprintring(3) if isdbg('nologchan');
+ next;
+ }
+
my $user = check_add_user($call, 'A');
# if (eph_dup($genline)) {
$user->del if $user;
$call = $normcall; # this is safe because a route add will ignore duplicates
}
-
+
+ if ($call eq $main::myalias && $is_node) {
+ LogDbg('err', "ROUTE: $call eq \$myalias from $ncall - downgraded to user!!!");
+ dbgprintring(3) if isdbg('nologchan');
+ $is_node = 0;
+ }
if ($is_node) {
dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
$user = check_add_user($call, 'A');
dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route');
next;
}
- if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) {
+
+ my $isnode = ($_->[1] | $_->[2]);
+ if (($_->[0] eq $main::myalias && $isnode) || ($_->[0] eq $main::mycall && !$isnode)) {
LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored");
next;
}
$self->route_pc16($pcall, undef, $parent, @pc16) if @pc16;
}
- # broadcast it if we get here
+ # broadcast it if we get here (but not if it's an A or D record and pc92_ad_enabled isn't set;
+ if ($sort eq 'A' || $sort eq 'D') {
+ return unless $pc92_ad_enabled;
+ }
$self->broadcast_route_pc9x($pcall, undef, $line, 0);
}
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)) {
}
}
+ $self->populate_routing_table($onode, $from, $ipaddr) if $pc61_extract_route;
+
# if it is routeable then then treat it like a talk
my $ref = Route::get($to);
if ($ref) {
}
}
+# does what it says on the tin..
+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