add DXCIDR, fix version no tracking

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 105181675ec85b9df10d2685b48821c205a3039b..36360f712a189798fd69bd7c961735a38f4d64a6 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -32,6 +32,7 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
+use DXCIDR;
 
 use strict;
 use warnings qw(all);
@@ -185,6 +186,16 @@ sub handle_11
                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)
@@ -1647,12 +1658,12 @@ sub _add_thingy
                                @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 &&  $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))) {
+                                       } elsif ($user->is_spider && ($version < 3000 || ($version > 4000 && $version < 5455))) {
                                                unless ($version == 5000 && $build == 0) {
                                                        $user->sort('A');
                                                        $build //= 0;
@@ -1660,6 +1671,9 @@ sub _add_thingy
                                                }
                                        }
                                }
+                               $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);
@@ -2004,22 +2018,38 @@ sub handle_92
                        my $call = $parent->call;
                        my $version = $ent[4] || 0;
                        my $build = $ent[5] ||  0;
+                       $build =~ s/^0\.//;
                        my $oldbuild = $parent->build || 0;
                        my $oldversion = $parent->version || 0;
                        my $user = check_add_user($parent->call, 'S');
                        my $oldsort = $user->sort // '';
-#                      if ($version =~ /^\d+$/  && $oldversion =~ /^\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');
+
+                       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));
-                                       $user->put;
+                                       ++$changed;
                                }
-#                      } else {
-#                              dbg("DXProt PC92 K version strings new: '$version' old: '$oldversion'");
-#                      }
-                       dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
+                               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 $call now " . $parent->obscount) if isdbg('obscount');
                }
        } elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {