X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml%2FPing.pm;h=0fc4426a771ea39ba7752d5f94684a9ef139a526;hb=84c9ab90dffd89792b08f4adca0f3f43270967a5;hp=a1b0a6a122ba6e3a8a792ef69d819c4216b9ecb0;hpb=4937d077fd03279aae2cbba6f1252ffdb04cc7a5;p=spider.git

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index a1b0a6a1..0fc4426a 100644
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -30,6 +30,20 @@ sub handle_input
 	my $self = shift;
 	my $dxchan = shift;
 	
+	if ($self->{to} eq $main::mycall) {
+		if ($self->{s} eq '1') {
+			my $rep = DXXml::Ping->new(to=>$self->{o}, 
+									   s=>'0',
+									   oid=>$self->{id},
+									   ot=>$self->{t}
+									  );
+			$dxchan->send($rep->toxml);
+		} else {
+			handle_ping_reply($dxchan, $self->{o}, $self->{ot}, $self->{oid});
+		}
+	} else {
+		$self->route($dxchan);
+	}
 }
 
 sub topcxx
@@ -49,7 +63,7 @@ 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;
@@ -68,6 +82,8 @@ sub handle_ping_reply
 {
 	my $fromdxchan = shift;
 	my $from = shift;
+	my $ot = shift;
+	my $oid = shift;
 	my $fromxml;
 	
 	if (ref $from) {
@@ -82,14 +98,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;
@@ -111,11 +123,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))
+		} 
 	}
 }