Revert "add first take on IP address remembering"

This reverts commit c7a3cfda9336d765d387e9328f817d1f0e5230d1.

diff --git a/Changes b/Changes
index bf420e828ddcf647ccbb2957a0678b97eb4ed874..464188c887222a25e2e77775958fad33ffa22826 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,13 +1,3 @@
-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/DXProtHandle.pm b/perl/DXProtHandle.pm
index 0c71e5900d96d3fb5ebd3a01360993d92be8ba05..19d4a31c1888853bc12c7ff0d0410ec3a25c1850 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -222,27 +222,14 @@ 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];
-       my $implied = '';
-       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;
-               $implied = '*' if $ip;
-       }
-       
        if (isdbg('progress')) {
-               my $sip = $ip ? sprintf "($ip$implied)" : '' unless $ip =~ m|[\(\)\*]|;
-               my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]$sip\@$spot[7]", cldatetime($spot[2]);
+               my $sip = $ip ? sprintf "($ip)" : '' unless $ip =~ m|[\(\)\*]|;
+               my $d = cldatetime($spot[2]);
+               $d =~ /^s+//;
+               my $s = "SPOT: $spot[1] on $spot[0] \@ $d by $spot[4]$sip\@$spot[7]";
                $s .= " '$spot[3]'" if $spot[3];
                dbg($s);
        }
@@ -254,8 +241,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)) {
@@ -1495,44 +1482,25 @@ 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);
-                       $r = Route::Node::get($call);
+                       my $r = Route::Node::get($call);
                        $r->PC92C_dxchan($dxchan->call, $hops) if $r;
-                       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);
+                       if ($ip) {
+                               $r->ip($ip);
+                               Log('DXProt', "PC92A $call -> $ip on $ncall");
                        }
                } 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;
-                       $r = Route::User::get($call);
-                       if ($newuser) {
-                               $user->sort('U') unless $user->sort;
+                       my $r = Route::User::get($call);
+                       if ($ip) {
+                               $r->ip($ip);
+                               Log('DXProt', "PC92A $call -> $ip on $ncall");
                        }
                }
-               $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 3497fa8af71e4eb41b3d8bba230dc26e5449ff86..d385382b80fe13469bc9e8f85360ed26a54b39e0 100644 (file)
--- 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 $noips);
+use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3);
 
 %u = ();
 $dbm = undef;
@@ -30,7 +30,6 @@ $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 = (
@@ -92,7 +91,6 @@ $noips = 4;
                  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 09b0e634e6fc28c6f81ff4faac933e734ceb5109..3c4b51f3d0d2504adff8ccaf7bd61781bf6163f9 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -29,7 +29,6 @@ $now = time;
 $cnum = 0;
 $connect_timeout = 5;
 $disc_waittime = 1.5;
-%conns;
 
 our %delqueue;
 
@@ -103,12 +102,6 @@ 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 81452decdb0f720b034acc9edd288f5125fe2958..6c8c44a858653adc507374f7dea9099c6c2ff39f 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -32,7 +32,6 @@ 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 67014fc3a569eb4988c0877aa148a05e89a36b87..89e84d4072b1910b83b6b41d05c2d50431df2b4e 100644 (file)
--- 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, version, flags, ip)
+# called as $parent->add(call, dxchan, version, flags)
 #
 
 sub add