projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
undo rounding change
[spider.git]
/
perl
/
DXXml
/
Ping.pm
diff --git
a/perl/DXXml/Ping.pm
b/perl/DXXml/Ping.pm
index f2620e6b8eb6ada1abd5497cff19e5b3f0a7b635..21662dae5a7a009a885c466d46e4c3dc2e19025f 100644
(file)
--- a/
perl/DXXml/Ping.pm
+++ b/
perl/DXXml/Ping.pm
@@
-63,10
+63,9
@@
sub add
my $ref = $pings{$to} || [];
my $r = {};
my $self = DXXml::Ping->new(to=>$to, '-hirestime'=>[ gettimeofday ], s=>'1');
my $ref = $pings{$to} || [];
my $r = {};
my $self = DXXml::Ping->new(to=>$to, '-hirestime'=>[ gettimeofday ], s=>'1');
- $self->{u} = $from
unless $from eq $main::mycall
;
+ $self->{u} = $from;
$self->{'-via'} = $via if $via && DXChannel::get($via);
$self->{o} = $main::mycall;
$self->{'-via'} = $via if $via && DXChannel::get($via);
$self->{o} = $main::mycall;
- $self->{id} = $self->nextid;
$self->route($dxchan);
push @$ref, $self;
$self->route($dxchan);
push @$ref, $self;
@@
-98,14
+97,10
@@
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->{
to
});
+ my $dxchan = DXChannel::get($r->{
u
});
next unless $dxchan;
my $t = tv_interval($r->{'-hirestime'}, [ gettimeofday ]);
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;
if ($tochan) {
my $nopings = $tochan->user->nopings || $DXProt::obscount;
push @{$tochan->{pingtime}}, $t;
@@
-127,11
+122,16
@@
sub handle_ping_reply
$ivp->handle_ping;
}
} elsif (my $rref = Route::Node::get($r->{to})) {
$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;
}
}
$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))
+ }
}
}
}
}