use Script;
use strict;
+use warnings;
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
$self->send(pc20());
}
-sub check_add_node
+sub check_add_user
{
my $call = shift;
my $type = shift;
-
+ my $homenode = shift;
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser::get_current($call);
unless ($user) {
$user = DXUser->new($call);
- $user->priv(1); # I have relented and defaulted nodes
- $user->lockout(1);
- $user->homenode($call);
- $user->node($call);
- $user->sort($type || 'A');
+ $user->sort($type || 'U');
+ if ($user->is_node) {
+ $user->priv(1); # I have relented and defaulted nodes
+ $user->lockout(1) if $user->is_node;
+ } else {
+ $user->homenode($homenode) if $homenode;
+ $user->node($homenode);
+ }
$user->lastin($main::systime); # this make 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");
+ }
+
+ # 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) {
+ $user->priv(0);
+ $user->lockout(0);
+ dbg("DXProt: PC92 user record for $call depriv'd and unlocked");
+ $user->put;
}
return $user;
}
next;
}
- my $user = check_add_node($call);
+ my $user = check_add_user($call, 'A');
# if (eph_dup($genline)) {
# dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
my $is_node = $flag & 4;
my $is_extnode = $flag & 2;
my $here = $flag & 1;
- my $ip = $part[3];
- $ip ||= $part[1] if $part[1] && $part[1] !~ /^\d+$/ && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/);
+ 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);
}
# 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) {
my $user;
- unless (DXChannel::get($call)) { # i.e. external entity - create an user entry for it - ALL entities will appear in ALL user files from now on.
+ my $r;
+
+ # normalise call, delete any unnormalised calls in the users file.
+ # then ignore this thingy
+ my $normcall = normalise_call($call);
+ if ($normcall ne $call) {
+ next if DXChannel::get($call);
$user = DXUser::get($call);
- unless ($user) {
- $user = DXUser->new($call);
- dbg("PCProt::_add_thingy new user $call") if isdbg('route');
- }
+ dbg("DXProt::_add_thingy call $call normalised to $normcall, deleting spurious user $call");
+ $user->del if $user;
+ $call = $normcall; # this is safe because a route add will ignore duplicates
}
+
if ($is_node) {
dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
+ $user = check_add_user($call, 'A');
@rout = $parent->add($call, $version, Route::here($here), $ip);
- my $r = Route::Node::get($call);
+ $r = Route::Node::get($call);
$r->PC92C_dxchan($dxchan->call, $hops) if $r;
- if ($ip) {
- $r->ip($ip);
- Log('DXProt', "PC92A $call -> $ip on $ncall");
- }
- if ($user && $user->sort eq 'U') {
- if (defined $version) {
- if ($version >= 5455 && $build > 0 || $version >= 3000 ) {
- $user->sort('S');
- } else {
+ if ($version && $version =~ /^\d+$/) {
+ 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) {
$user->sort('A');
+ $build //= 0;
+ dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort);
}
- dbg("PCProt::_add_thingy node $call sort updated " . $user->sort) if isdbg('route');
}
}
} else {
dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
- my $user = check_add_node($call, 'U');
+ $user = check_add_user($call, 'U', $parent->call);
@rout = $parent->add_user($call, Route::here($here), $ip);
$dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
- my $r = Route::User::get($call);
- if ($ip) {
- $r->ip($ip);
- Log('DXProt', "PC92A $call -> $ip on $ncall");
- }
+ $r = Route::User::get($call);
+ }
+ if ($ip) {
+ $r->ip($ip);
+ Log('DXProt', "PC92A $call -> $ip on $ncall");
}
if ($pc92_slug_changes && $parent == $main::routeroot) {
$things_add{$call} = Route::get($call);
my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot;
if ($call && $is_node) {
if ($call eq $main::mycall) {
- dbg("PCPROT: $call looped back onto \$main::mycall ($main::mycall), ignored") if isdbg('chan');
+ LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::mycall ($main::mycall), ignored");
return;
}
if ($call eq $main::myalias) {
- dbg("PCPROT: $call looped back onto \$main::myalias ($main::myalias), ignored") if isdbg('chan');
+ LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::myalias ($main::myalias), ignored");
return;
}
# this is only accepted from my "self".
}
$parent->here(Route::here($here));
$parent->version($version || $pc19_version) if $version;
- $parent->build($build) if $build;
+ $build =~ s/^0\.//, $parent->build($build) if $build;
$parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call;
return ($parent, @radd);
}
# }
if ($pcall eq $main::mycall) {
- dbg("PCPROT: looped back, ignored") if isdbg('chan');
+ LogDbg('err', "PCPROT: looped back, ignored");
return;
}
if ($pcall eq $main::myalias) {
- dbg("PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored") if isdbg('chan');
+ LogDbg('err', "PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored");
return;
}
if (@dxchan) {
$_->send($line) for @dxchan;
} else {
- dbg("PCPROT: no return route, ignored") if isdbg('chanerr')
+ dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route');
}
} else {
- dbg("PCPROT: no return route, ignored") if isdbg('chanerr')
+ dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route');
}
}
return;
($parent, $add) = $self->pc92_handle_first_slot(\@ent, $parent, $t, $hops);
return unless $parent; # dupe
-
+
push @radd, $add if $add;
$parent->reset_obs;
- $parent->version($ent[4]) if $ent[4];
- if ($ent[5]) {
- $ent[5] =~ s/^0.//;
- $parent->build($ent[5]);
+ my $call = $parent->call;
+ 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 $user = check_add_user($parent->call, 'S');
+ my $oldsort = $user->sort // '';
+ if ($version =~ /^\d+$/) {
+ 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');
}
} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
my $dxc;
next unless $_ && @$_;
if ($_->[0] eq $main::mycall) {
- dbg("PCPROT: $_->[0] refers to me, ignored") if isdbg('chanerr');
+ 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) {
+ LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored");
next;
}
+
push @nent, $_;
}
push @users, $r->[0];
}
} else {
- dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr');
+ dbg("PCPROT: $self->{call} : pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr') || isdbg('route');
}
}
projects / spider.git / blobdiff