X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml%2FPing.pm;h=59c8ff3e6ee9067c0f16378b7660c82d820e08fd;hb=0c1082247c57a0ec2fa35a0a81af54b1e6ac2b89;hp=0fc4426a771ea39ba7752d5f94684a9ef139a526;hpb=0dc2041f5f5ed9f58b3f482f425971569acca947;p=spider.git

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index 0fc4426a..59c8ff3e 100644
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -38,6 +38,9 @@ sub handle_input
 									   ot=>$self->{t}
 									  );
 			$dxchan->send($rep->toxml);
+			if ($dxchan->{outgoing} && abs($dxchan->{lastping} - $main::systime) < 15) {
+				$dxchan->{lastping} += $dxchan->{pingint} / 2; 
+			}
 		} else {
 			handle_ping_reply($dxchan, $self->{o}, $self->{ot}, $self->{oid});
 		}
@@ -63,10 +66,9 @@ 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->{id} = $self->nextid;
 	$self->route($dxchan);
 
 	push @$ref, $self;
@@ -98,7 +100,7 @@ sub handle_ping_reply
 	my $tochan = DXChannel::get($from);
 	while (@$ref) {
 		my $r = shift @$ref;
-		my $dxchan = DXChannel::get($r->{u});
+		my $dxchan = DXChannel::get($r->{o});
 		next unless $dxchan;
 		my $t = tv_interval($r->{'-hirestime'}, [ gettimeofday ]);
 		if ($dxchan->is_node) {
@@ -119,16 +121,10 @@ 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});
+		} 
+		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))
@@ -136,4 +132,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;