X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml%2FPing.pm;h=e02b61f85ca081a9fceb5fbf823c485d41621c2d;hb=5a3a431137bc8eacba130cdb8aa6292371ca685a;hp=a9d72083c213df926ef80157c83453973ac9c7fe;hpb=8c5872e6e9c50d45da129fe90f98e57a6fd486f6;p=spider.git

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index a9d72083..e02b61f8 100644
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -37,6 +37,7 @@ sub handle_input
 									   oid=>$self->{id},
 									   ot=>$self->{t}
 									  );
+			$dxchan->send($rep->toxml);
 		} else {
 			handle_ping_reply($dxchan, $self->{o}, $self->{ot}, $self->{oid});
 		}
@@ -65,7 +66,6 @@ sub add
 	$self->{u} = $from unless $from eq $main::mycall;
 	$self->{'-via'} = $via if $via && DXChannel::get($via);
 	$self->{o} = $main::mycall;
-	$self->{id} = $self->nextid;
 	$self->route($dxchan);
 
 	push @$ref, $self;
@@ -97,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->{o});
 		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;
@@ -122,16 +118,29 @@ 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->{to})) {
-					$ivp->handle_ping;
-				}
 			}
-		}
+			_handle_believe($from, $fromdxchan->{call});
+		} 
+		if (exists $r->{u} && ($dxchan = DXChannel::get($r->{u})) && $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))
+		} 
 	}
 }
 
+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;