use Route;
use Route::Node;
use Script;
+use DXCIDR;
use strict;
+use warnings qw(all);
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
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($pc->[3])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
return;
}
}
# 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;
}
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;
}
# 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');
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Bad Node $pc->[7], dropped");
return;
}
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 Spotter $pc->[6], dropped");
return;
}
+ # check IP addresses
+ if ($pc->[8] && is_ipaddr($pc->[8])) {
+ my $ip = $pc->[8];
+ $ip =~ s/,/:/g;
+ $ip =~ s/^::ffff://;
+ if (DXCIDR::find($ip)) {
+
+ }
+ }
+
# convert the date to a unix date
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("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]) || (my @bad = BadWords::check($pc->[2]))) {
+ my $bw = join ', ', @bad;
+ $bw = qq{ '$bw'} if $bw;
+ dbg("PCPROT: Bad DX spot$bw, ignored");
return;
}
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($pc->[5])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
return;
}
}
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($pc->[3])) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
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;
}
} 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 $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;
+
if ($call) {
my $ncall = $parent->call;
if ($ncall ne $call) {
next if DXChannel::get($call);
$user = DXUser::get($call);
dbg("DXProt::_add_thingy call $call normalised to $normcall, deleting spurious user $call");
- $user->del;
+ $user->del if $user;
$call = $normcall; # this is safe because a route add will ignore duplicates
}
@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 && defined $build && $build > 0) || ($version >= 3000 && $version <= 3500)) ) {
+ if ($user->is_ak1a && (($version >= 5455 && $build > 0) || ($version >= 3000 && $version <= 3500)) ) {
$user->sort('S');
- $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)) && $version =~ /^\d+$/) {
- unless ($version == 5000 && $build == 0) {
+ } elsif ($user->is_spider && ($version < 3000 || ($version > 4000 && $version < 5455))) {
+ unless ($version > 0 && $build == 0) {
$user->sort('A');
- $build //= 0;
+ $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;
+ my $oldsort = $user->sort // '';
+
+ 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 $parent->{call} now " . $parent->obscount) if isdbg('obscount');
+ dbg("ROUTE: reset obscount on $call now " . $parent->obscount) if isdbg('obscount');
}
} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($text)) {
- dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+ my $bw = join ', ', @bad;
+ dbg($line) if isdbg('nologchan');
+ dbg("PCPROT: Badwords: '$bw', dropped");
return;
}
}
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;
}
projects / spider.git / blobdiff