X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml%2FPing.pm;h=d70d6e9a46104cb379b95653af96862f4b0388b0;hb=37f82ebe660cdbce6054bb0a0e50b774fc46a893;hp=21662dae5a7a009a885c466d46e4c3dc2e19025f;hpb=20efba5d5f656113144785e0ef84296e6d2c2e69;p=spider.git

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index 21662dae..d70d6e9a 100644
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -63,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;
+	$self->{u} = $from unless $from eq $main::mycall;
 	$self->{'-via'} = $via if $via && DXChannel::get($via);
 	$self->{o} = $main::mycall;
 	$self->route($dxchan);
@@ -118,16 +118,9 @@ sub handle_ping_reply
 					$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
 				}
 				$tochan->{nopings} = $nopings; # pump up the timer
-				if (my $ivp = Investigate::get($from, $fromdxchan->{call})) {
-					$ivp->handle_ping;
-				}
-			} elsif (my $rref = Route::Node::get($r->{to})) {
-				if (my $ivp = Investigate::get($from, $fromdxchan->{call})) {
-					$ivp->handle_ping;
-				}
 			}
-		}		
-		if ($dxchan->is_user) {
+			_handle_believe($from, $fromdxchan->{call});
+		} elsif ($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))
@@ -135,4 +128,18 @@ sub handle_ping_reply
 	}
 }
 
+sub _handle_believe
+{
+	my ($from, $via) = @_;
+	
+	if (my $ivp = Investigate::get($from, $via)) {
+		$ivp->handle_ping;
+	} else {
+		my $user = DXUser->get_current($from);
+		if ($user) {
+			$user->set_believe($via);
+			$user->put;
+		}
+	}
+}
 1;