X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml%2FPing.pm;h=29d7ab1c6a89ac7b1d99f92a7b627b6fcf82bed8;hb=0e5d48bce6d4ab1119f1375a6a57af188947ceff;hp=d2a07b73aedf06870ad51a136ffba1d24383399f;hpb=b9dffeff7239952814342dad19db3a51def6fab7;p=spider.git diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm index d2a07b73..29d7ab1c 100644 --- a/perl/DXXml/Ping.pm +++ b/perl/DXXml/Ping.pm @@ -1,7 +1,7 @@ # # XML Ping handler # -# $Id$ +# # # Copyright (c) Dirk Koopman, G1TLH # @@ -13,8 +13,8 @@ package DXXml::Ping; use DXDebug; use DXProt; use IsoTime; -use Investigate; use Time::HiRes qw(gettimeofday tv_interval); +use Route::Node; use vars qw(@ISA %pings); @ISA = qw(DXXml); @@ -116,6 +116,12 @@ sub handle_ping_reply $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6); } $tochan->{nopings} = $nopings; # pump up the timer + dbg("ROUTE: $tochan->{call} ping obscount reset to $tochan->{nopings}") if isdbg('obscount'); + my $nref = Route::Node::get($tochan->{call}); + if ($nref) { + my $n = $nref->reset_obs; + dbg("ROUTE: reset obscount on $tochan->{call} to $n (ping)") if isdbg('obscount'); + } } _handle_believe($from, $fromdxchan->{call}); } @@ -131,14 +137,10 @@ 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; - } + my $user = DXUser->get_current($from); + if ($user) { + $user->set_believe($via); + $user->put; } } 1;