#
# XML Ping handler
#
-# $Id$
+#
#
# Copyright (c) Dirk Koopman, G1TLH
#
use DXDebug;
use DXProt;
use IsoTime;
-use Investigate;
use Time::HiRes qw(gettimeofday tv_interval);
+use Route::Node;
-use vars qw($VERSION $BRANCH @ISA %pings);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw(@ISA %pings);
@ISA = qw(DXXml);
%pings = (); # outstanding ping requests outbound
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});
}
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);
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) {
$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});
- } 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))
{
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;