projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix show/node type
[spider.git]
/
perl
/
DXXml
/
Ping.pm
diff --git
a/perl/DXXml/Ping.pm
b/perl/DXXml/Ping.pm
index d70d6e9a46104cb379b95653af96862f4b0388b0..270587198928773eba4b9e1dd72f722aa593a324 100644
(file)
--- a/
perl/DXXml/Ping.pm
+++ b/
perl/DXXml/Ping.pm
@@
-1,7
+1,7
@@
#
# XML Ping handler
#
#
# XML Ping handler
#
-#
$Id$
+#
#
# Copyright (c) Dirk Koopman, G1TLH
#
#
# Copyright (c) Dirk Koopman, G1TLH
#
@@
-13,15
+13,10
@@
package DXXml::Ping;
use DXDebug;
use DXProt;
use IsoTime;
use DXDebug;
use DXProt;
use IsoTime;
-use Investigate;
use Time::HiRes qw(gettimeofday tv_interval);
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
@ISA = qw(DXXml);
%pings = (); # outstanding ping requests outbound
@@
-38,6
+33,9
@@
sub handle_input
ot=>$self->{t}
);
$dxchan->send($rep->toxml);
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});
}
} else {
handle_ping_reply($dxchan, $self->{o}, $self->{ot}, $self->{oid});
}
@@
-70,7
+68,7
@@
sub add
push @$ref, $self;
$pings{$to} = $ref;
push @$ref, $self;
$pings{$to} = $ref;
- my $u = DXUser
->
get_current($to);
+ my $u = DXUser
::
get_current($to);
if ($u) {
$u->lastping(($via || $from), $main::systime);
$u->put;
if ($u) {
$u->lastping(($via || $from), $main::systime);
$u->put;
@@
-97,7
+95,7
@@
sub handle_ping_reply
my $tochan = DXChannel::get($from);
while (@$ref) {
my $r = shift @$ref;
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) {
next unless $dxchan;
my $t = tv_interval($r->{'-hirestime'}, [ gettimeofday ]);
if ($dxchan->is_node) {
@@
-118,9
+116,16
@@
sub handle_ping_reply
$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
}
$tochan->{nopings} = $nopings; # pump up the timer
$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});
}
_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 $s = sprintf "%.2f", $t;
my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
@@
-132,14
+137,10
@@
sub _handle_believe
{
my ($from, $via) = @_;
{
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;
}
}
1;