X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml%2FPing.pm;h=59c8ff3e6ee9067c0f16378b7660c82d820e08fd;hb=0dff8311e76fac314d73e64b4af1a8beabfe166d;hp=06d96ff617cff373e0487dad01f8021dbbaa2ecf;hpb=9cc26cc7a73efb7679d3e8e819ba0019307f8607;p=spider.git

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index 06d96ff6..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,7 +66,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);
@@ -97,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) {
@@ -120,7 +123,8 @@ sub handle_ping_reply
 				$tochan->{nopings} = $nopings; # pump up the timer
 			}
 			_handle_believe($from, $fromdxchan->{call});
-		} elsif ($dxchan->is_user) {
+		} 
+		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))