X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=cd6a7518348d007968a25cea940334d27db2dfee;hb=18d20f736241e0f9423f83fee86db16141cdf1b5;hp=0f7a1ff381c08c409a9c98eec162ca1908076ceb;hpb=931777f77682d04a945ef31886bd5ab6569fc55d;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 0f7a1ff3..cd6a7518 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -224,10 +224,13 @@ sub handle_11
 	# add it
 	Spot::add(@spot);
 
+	my $ip = '';
+	$ip ||= $spot[14] if exists $spot[14];
 	if (isdbg('progress')) {
-		my $ip = '';
-		$ip = sprintf "($spot[14])" if $spot[14]; 
-		my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]$ip\@$spot[7]", cldatetime($spot[2]);
+		my $sip = $ip ? sprintf "($ip)" : '' unless $ip =~ m|[\(\)\*]|;
+		$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];
 		dbg($s);
 	}
@@ -1478,6 +1481,9 @@ 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;
+	
 	if ($call) {
 		my $ncall = $parent->call;
 		if ($is_node) {
@@ -2016,7 +2022,7 @@ sub handle_93
 
 	if (isdbg('progress')) {
 		my $vs = $via ne '*' ? " via $via" : ''; 
-		my $s = "ANNTALK: $from\@$onode$via -> $to '$text'";
+		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'";
 		dbg($s);
 	}