projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge back some files from SIMPLEROUTE
[spider.git]
/
perl
/
DXXml
/
Ping.pm
diff --git
a/perl/DXXml/Ping.pm
b/perl/DXXml/Ping.pm
index d70d6e9a46104cb379b95653af96862f4b0388b0..d2a07b73aedf06870ad51a136ffba1d24383399f 100644
(file)
--- a/
perl/DXXml/Ping.pm
+++ b/
perl/DXXml/Ping.pm
@@
-16,12
+16,7
@@
use IsoTime;
use Investigate;
use Time::HiRes qw(gettimeofday tv_interval);
use Investigate;
use Time::HiRes qw(gettimeofday tv_interval);
-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});
}
@@
-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) {
@@
-120,7
+118,8
@@
sub handle_ping_reply
$tochan->{nopings} = $nopings; # pump up the timer
}
_handle_believe($from, $fromdxchan->{call});
$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))
my $s = sprintf "%.2f", $t;
my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))