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->{id} = $self->nextid;
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 ]);
- 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;
$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;
}
}
- }
+ }
+ 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))
+ }
}
}