From ccf10a5a84e348aafa42fe3d528dea0cf8434671 Mon Sep 17 00:00:00 2001 From: minima Date: Wed, 11 Jan 2006 22:20:03 +0000 Subject: [PATCH] make all pings update the node averages --- perl/DXXml/Ping.pm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm index 1e7aea6f..0fc4426a 100644 --- a/perl/DXXml/Ping.pm +++ b/perl/DXXml/Ping.pm @@ -101,11 +101,7 @@ sub handle_ping_reply 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; @@ -127,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)) + } } } -- 2.43.0