X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=5193a227043bb3d1a4a28430560ebf2a415f81c0;hb=34f47f7d220c9244769f1c6360a92fcae18803ba;hp=0beabcf224b11d3697bfe76f4d86bab5aa1d1a22;hpb=c480ac94da7dbd5762fcd15aa556c874d223e14e;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 0beabcf2..5193a227 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -224,10 +224,11 @@ sub handle_11
 	# add it
 	Spot::add(@spot);
 
+	my $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|[\(\)\*]|;
+		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 +1479,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 ($call) {
 		my $ncall = $parent->call;
 		if ($is_node) {