From c7a3cfda9336d765d387e9328f817d1f0e5230d1 Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Mon, 27 Apr 2020 16:48:08 +0100 Subject: [PATCH] add first take on IP address remembering --- Changes | 10 ++++++++ perl/DXDebug.pm | 3 ++- perl/DXProtHandle.pm | 55 +++++++++++++++++++++++++++++++++++--------- perl/DXUser.pm | 4 +++- perl/Msg.pm | 7 ++++++ perl/Route.pm | 1 + perl/Route/Node.pm | 2 +- 7 files changed, 68 insertions(+), 14 deletions(-) diff --git a/Changes b/Changes index 464188c8..bf420e82 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,13 @@ +27Apr20======================================================================= +1. Start recording IP addresses that users are using both in the user file + and in the routing table. The IP addresses come from PC92 A records and + also from PC61 spot records. +2. Use this information to work backwards to, for instance, put an IP address + on a spot that came in on a PC11 before any PC61 or PC62 A arrived. That + IP address may be on a PC61 for a different spot that had come previously. +3. Show which debugging category triggered any debug output. Debug output + that was not trigger, but just output (e.g. the startup stuff) has no + category. 25Apr20======================================================================= 1. Add maximum no of users on node to show/cluster. 2. Add ability to show last n lines of debugging ring buffer. diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm index 947923f2..f5c16401 100644 --- a/perl/DXDebug.pm +++ b/perl/DXDebug.pm @@ -96,7 +96,8 @@ sub dbg($) for (@l) { s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg; print "$_\n" if defined \*STDOUT && !$no_stdout; - my $str = "$t^$_"; + my $tag = $_isdbg ? "($_isdbg) " : ''; + my $str = "$t^$tag$_"; &$callback($str) if $callback; if ($dbgringlth) { shift @dbgring while (@dbgring > $dbgringlth); diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 0beabcf2..a28bb12b 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -222,11 +222,25 @@ sub handle_11 } # add it + $spot[14] =~ s/^::ffff:// if exists $spot[14]; # remove rubbish ipv4 addresses dressed up as ipv6 Spot::add(@spot); + # create a spotter if doesn't exit and there is an ip available and in anycase remember the IP address + my $user = DXUser::get_current($spot[4]); + $user = DXUser->new($spot[4]) unless $user; + my $r = Route::get($spot[4]); + my $ip = $spot[14] if exists $spot[14]; + if ($ip) { + $user->ip($ip), $user->put if !$user->ip || $user->ip ne $ip; + $r->ip($ip) if $r && !$r->ip; + } else { + $ip ||= $r->ip if $r; + $ip ||= $user->ip; + $ip .= '*' if $ip; + } + if (isdbg('progress')) { - my $ip = ''; - $ip = sprintf "($spot[14])" if $spot[14]; + $ip = $ip ? sprintf "($ip)" : ''; my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]$ip\@$spot[7]", cldatetime($spot[2]); $s .= " '$spot[3]'" if $spot[3]; dbg($s); @@ -239,8 +253,8 @@ sub handle_11 # you should be able to route on any of these # + # fix up qra locators of known users - my $user = DXUser::get_current($spot[4]); if ($user) { my $qra = $user->qra; unless ($qra && is_qra($qra)) { @@ -1480,25 +1494,44 @@ sub _add_thingy if ($call) { my $ncall = $parent->call; + my $user = DXUser::get_current($call); + my $r; + my $newuser = !$user; + $user = DXUser->new($call) unless $user; + $user->homenode($parent->call) unless $user->homenode; + $user->node($parent->call); + $user->lastin($main::systime) unless DXChannel::get($ncall); if ($is_node) { dbg("ROUTE: added node $call to $ncall") if isdbg('routelow'); @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 ($newuser) { + $user->sort('S') unless $user->sort; + $user->priv(1) unless exists $user->{priv}; + $user->lockout(1) unless exists $user->{lookout} || $main::me->call eq $call || DXChannel::get($call) || Msg::get($call); } } else { dbg("ROUTE: added user $call to $ncall") if isdbg('routelow'); @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 ($newuser) { + $user->sort('U') unless $user->sort; } } + $ip ||= $user->ip; + if ($ip) { + $user->ip($ip); + $r->ip($ip); + my $s = "PC92A $call -> $ip on $ncall"; + Log('DXProt', $s); + dbg($s) if isdbg('routelow'); + } + $user->put; + + # create a node user if required + if ($pc92_slug_changes && $parent == $main::routeroot) { $things_add{$call} = Route::get($call); delete $things_del{$call}; diff --git a/perl/DXUser.pm b/perl/DXUser.pm index d385382b..3497fa8a 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -20,7 +20,7 @@ use File::Copy; use strict; -use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3); +use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3 $noips); %u = (); $dbm = undef; @@ -30,6 +30,7 @@ $lasttime = 0; $lrusize = 2000; $tooold = 86400 * 365; # this marks an old user who hasn't given enough info to be useful $v3 = 0; +$noips = 4; # hash of valid elements and a simple prompt %valid = ( @@ -91,6 +92,7 @@ $v3 = 0; believe => '1,Believable nodes,parray', lastping => '1,Last Ping at,ptimelist', maxconnect => '1,Max Connections', + ip => '1,IP address', ); #no strict; diff --git a/perl/Msg.pm b/perl/Msg.pm index 3c4b51f3..09b0e634 100644 --- a/perl/Msg.pm +++ b/perl/Msg.pm @@ -29,6 +29,7 @@ $now = time; $cnum = 0; $connect_timeout = 5; $disc_waittime = 1.5; +%conns; our %delqueue; @@ -102,6 +103,12 @@ sub conns return $ref; } +# this is called as a FUNCTION i.e my $conn = Msg::get($call); +sub get +{ + return $conns{shift}; +} + # this is only called by any dependent processes going away unexpectedly sub pid_gone { diff --git a/perl/Route.pm b/perl/Route.pm index 6c8c44a8..81452dec 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -32,6 +32,7 @@ use vars qw(%list %valid $filterdef $maxlevel); cq => '0,CQ Zone', state => '0,State', city => '0,City', + ip => '0,IP Address', ); $filterdef = bless ([ diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm index 89e84d40..67014fc3 100644 --- a/perl/Route/Node.pm +++ b/perl/Route/Node.pm @@ -63,7 +63,7 @@ sub max # object with that callsign. The upper layers are expected to do something # sensible with this! # -# called as $parent->add(call, dxchan, version, flags) +# called as $parent->add(call, version, flags, ip) # sub add -- 2.43.0