X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml%2FPing.pm;h=21662dae5a7a009a885c466d46e4c3dc2e19025f;hb=6d1745603b0d1bb463194999129713c978f4244f;hp=f2620e6b8eb6ada1abd5497cff19e5b3f0a7b635;hpb=d24f05ab0fb916b36d783894f1271a4609697e55;p=spider.git

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index f2620e6b..21662dae 100644
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -63,10 +63,9 @@ sub add
 	my $ref = $pings{$to} || [];
 	my $r = {};
 	my $self = DXXml::Ping->new(to=>$to, '-hirestime'=>[ gettimeofday ], s=>'1');
-	$self->{u} = $from unless $from eq $main::mycall;
+	$self->{u} = $from;
 	$self->{'-via'} = $via if $via && DXChannel::get($via);
 	$self->{o} = $main::mycall;
-	$self->{id} = $self->nextid;
 	$self->route($dxchan);
 
 	push @$ref, $self;
@@ -98,14 +97,10 @@ sub handle_ping_reply
 	my $tochan = DXChannel::get($from);
 	while (@$ref) {
 		my $r = shift @$ref;
-		my $dxchan = DXChannel::get($r->{to});
+		my $dxchan = DXChannel::get($r->{u});
 		next unless $dxchan;
 		my $t = tv_interval($r->{'-hirestime'}, [ gettimeofday ]);
-		if ($dxchan->is_user) {
-			my $s = sprintf "%.2f", $t; 
-			my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
-			$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
-		} elsif ($dxchan->is_node) {
+		if ($dxchan->is_node) {
 			if ($tochan) {
 				my $nopings = $tochan->user->nopings || $DXProt::obscount;
 				push @{$tochan->{pingtime}}, $t;
@@ -127,11 +122,16 @@ sub handle_ping_reply
 					$ivp->handle_ping;
 				}
 			} elsif (my $rref = Route::Node::get($r->{to})) {
-				if (my $ivp = Investigate::get($from, $fromdxchan->{to})) {
+				if (my $ivp = Investigate::get($from, $fromdxchan->{call})) {
 					$ivp->handle_ping;
 				}
 			}
-		}
+		}		
+		if ($dxchan->is_user) {
+			my $s = sprintf "%.2f", $t; 
+			my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
+			$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
+		} 
 	}
 }