X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=57a83cc508c760f666ca553344276e3e2c542f5a;hb=102b51ca564ef29e7f84d2cf65d0eaa5fdab671a;hp=3e283a18e804ce96d0ff7a978f001c28ae91d9d7;hpb=9bd1b50613d46b88fb7a5fb4a7e4f9882b935387;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 3e283a18..57a83cc5 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -224,13 +224,15 @@ sub handle_11
 	# add it
 	Spot::add(@spot);
 
-	my $ip = $spot[14] if exists $spot[14];
+	my $ip = '';
+	$ip ||= $spot[14] if exists $spot[14];
 	if (isdbg('progress')) {
 		my $sip = $ip ? sprintf "($ip)" : '' unless $ip =~ m|[\(\)\*]|;
-		my $d = cldatetime($spot[2]);
-		$d =~ s/^s+//;
+		$sip ||= '';
+		my $d = ztime($spot[2]);
 		my $s = "SPOT: $spot[1] on $spot[0] \@ $d by $spot[4]$sip\@$spot[7]";
-		$s .= " '$spot[3]'" if $spot[3];
+		$s .= $spot[3] ? " '$spot[3]'" : q{ ''};
+		$s .=  " route: $origin";
 		dbg($s);
 	}
 	
@@ -661,13 +663,15 @@ sub check_add_node
 
 	# add this station to the user database, if required (don't remove SSID from nodes)
 	my $user = DXUser::get_current($call);
-	if (!$user) {
+	unless ($user) {
 		$user = DXUser->new($call);
 		$user->priv(1);		# I have relented and defaulted nodes
 		$user->lockout(1);
 		$user->homenode($call);
 		$user->node($call);
 		$user->sort('A');
+		$user->lastin($main::systime); # this make it last longer than just this invocation
+		$user->put;				# just to make sure it gets written away!!!
 	}
 	return $user;
 }
@@ -971,7 +975,7 @@ sub handle_23
 
 	# note this only takes the first one it gets
 	Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
-	dbg("WWV: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r") if isdbg('progress');
+	dbg("WWV: <$pc->[2]>, sfi=$sfi k=$k info=$i '$pc->[6]' $pc->[7]\@$pc->[8] $r route: $origin") if isdbg('progress');
 
 	if (defined &Local::wwv) {
 		my $rep;
@@ -1375,7 +1379,7 @@ sub handle_73
 	}
 
 	my $wcy = WCY::update($d, @$pc[2..12]);
-	dbg("WCY: " . join ', ', @$pc[2..12]) if isdbg('progress');
+	dbg("WCY: <$pc->[2]> K=$pc->[5] expK=$pc->[6] A=$pc->[4] R=$pc->[7] SFI=$pc->[3] SA=$pc->[8] GMF=$pc->[9] Au=$pc->[10] $pc->[11]\@$pc->[12] route: $origin") if isdbg('progress');
 
 	if (defined &Local::wcy) {
 		my $rep;
@@ -1481,7 +1485,7 @@ sub _add_thingy
 	my @rout;
 
 	# remove spurious IPV6 prefix on IPV4 addresses
-	$ip =~ s/^::ffff://;
+	$ip =~ s/^::ffff:// if $ip;
 	
 	if ($call) {
 		my $ncall = $parent->call;
@@ -2021,7 +2025,7 @@ sub handle_93
 
 	if (isdbg('progress')) {
 		my $vs = $via ne '*' ? " via $via" : ''; 
-		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'";
+		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
 		dbg($s);
 	}