more warnings squashed

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 4572b94ec49a2dd337e6fdb81ac94aeece40edd8..2cf116d4a6107007b855fc1a70fb4bde77b750f0 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -34,6 +34,7 @@ use Route::Node;
 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
@@ -1556,8 +1557,9 @@ sub _decode_pc92_call
        my $is_extnode = $flag & 2;
        my $here = $flag & 1;
        my $ip;
-       $part[1] //= 0;
-       $part[2] //= 0;
+       $part[1] //= '';
+       $part[2] //= '';
+       $part[3] //= '';
        if ($part[1] =~ /[,.]/) {
                $ip = $part[1];
                $part[1] = $part[2] = 0;
@@ -1614,7 +1616,9 @@ sub _add_thingy
 
        # 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) {
@@ -1628,7 +1632,7 @@ sub _add_thingy
                                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
                        }
                        
@@ -1638,13 +1642,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 && $version =~ /^\d+$/) {
                                        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+$/) {
+                                       } elsif ($user->is_spider && $version =~ /^\d+$/ && ($version < 3000 || ($version > 4000 && $version < 5455))) {
                                                unless ($version == 5000 && $build == 0) {
                                                        $user->sort('A');
                                                        $build //= 0;
@@ -1994,22 +1997,23 @@ sub handle_92
                        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;
+                       my $oldbuild = $parent->build || 0;
                        $oldbuild =~ s/^0\.//;
-                       my $oldversion = $parent->version // 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 // '';
+                       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') {