X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=23c17f0c34177c4913e07e73d86532de462e1a13;hb=deb52e701a0db351d06eb6fe14872dc2fa7a51cb;hp=71aaea80c2226432101888519f2a065fff7b83bd;hpb=a8cf7419289d41680724331cf388e7df68327c3d;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 71aaea80..23c17f0c 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -34,6 +34,7 @@ use Route::Node;
 use Script;
 
 use strict;
+use warnings qw(all);
 
 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
@@ -780,6 +781,7 @@ sub check_add_user
 		} else {
 			$user->homenode($homenode) if $homenode;
 			$user->node($homenode);
+			$user->priv(0);
 		}
 		$user->lastin($main::systime); # this make it last longer than just this invocation
 		$user->put;				# just to make sure it gets written away!!!
@@ -788,7 +790,7 @@ sub check_add_user
 
 	# 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) {
+	if ($user->is_user && $user->lockout && ($user->priv // 0) == 1) {
 		$user->priv(0);
 		$user->lockout(0);
 		dbg("DXProt: PC92 user record for $call depriv'd and unlocked");
@@ -1556,17 +1558,24 @@ sub _decode_pc92_call
 	my $is_extnode = $flag & 2;
 	my $here = $flag & 1;
 	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);
+	my $version = $part[1] || 0;
+	my $build = $part[2] || 0;
+	my $ip = $part[3] || '';
+	
+	if ($version =~ /[,.]/) {
+		$ip = $version;
+		$version = 0;
+	}
+	$version =~ s/\D+//g;
+	$build =~ s/^0\.//;
+	$build =~ s/\D+//g;
+	if ($ip) {
+        $ip =~ s/,/:/g;
+        $ip =~ s/^::ffff://i;
+    }
+	dbg("$icall = '" . join("', '", $call, $is_node, $is_extnode, $here, $version, $build, $ip) . "'") if isdbg('pc92');
+
+	return ($call, $is_node, $is_extnode, $here, $version+0, $build+0, $ip);
 }
 
 # decode a pc92 call: flag call : version : build
@@ -1597,6 +1606,7 @@ sub _encode_pc92_call
 		$ip =~ s/:/,/g;
 		$extra .= ':' . $ip;
 	}
+
 	return "$flag$call$extra";
 }
 
@@ -1613,11 +1623,6 @@ sub _add_thingy
 	my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
 	my @rout;
 
-	# 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) {
@@ -1874,7 +1879,7 @@ sub pc92_handle_first_slot
 	}
 	$parent->here(Route::here($here));
 	$parent->version($version || $pc19_version) if $version;
-	$build =~ s/^0\.//, $parent->build($build) if $build;
+    $parent->build($build) if $build;
 	$parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call;
 	return ($parent, @radd);
 }
@@ -1996,22 +2001,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;
-			$build =~ s/^0\.//;
-			my $oldbuild = $parent->build // 0;
-			$oldbuild =~ s/^0\.//;
-			my $oldversion = $parent->version // 0;
+			my $version = $ent[4] || 0;
+			my $build = $ent[5] ||  0;
+			my $oldbuild = $parent->build || 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;
-			}
-
+#			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');
+					$user->version($parent->version($version));
+					$user->build($parent->build($build));
+					$user->put;
+				}
+#			} else {
+#				dbg("DXProt PC92 K version strings new: '$version' old: '$oldversion'");
+#			}
 			dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
 		}
 	} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {