{
my $thing = shift;
unless ($thing->{Aranea}) {
- $thing->{Aranea} = Aranea::genmsg($thing, qw(id out));
+ $thing->{Aranea} = Aranea::genmsg($thing, qw(id out o));
}
return $thing->{Aranea};
}
# {user} as well as a true user and also it may not
# have originated here.
- my $from = $thing->{user} if Route::Node::get($thing->{user});
+ my $from = $thing->{o};
+ $from ||= $thing->{user} if Route::Node::get($thing->{user});
$from ||= $thing->{origin};
my $to = $thing->{touser} if Route::Node::get($thing->{touser});
$to ||= $thing->{group};
+
$thing->{DXProt} = DXProt::pc51($to, $from, $thing->{out});
}
my $repthing = $thing->new_reply;
$repthing->{out} = 0;
$repthing->{id} = $thing->{id};
+ $repthing->{o} = $thing->{o} if $thing->{o};
$repthing->send($dxchan) if $repthing;
} else {
# it's a reply, look in the ping list for this one
my $ref = $ping{$thing->{id}} if exists $thing->{id};
- $ref ||= $thing->find;
+ $ref ||= find(($thing->{user}||$thing->{origin}), ($thing->{touser}||$thing->{group}));
if ($ref) {
my $t = tv_interval($ref->{t}, [ gettimeofday ]);
- if (my $dxc = DXChannel::get($ref->{user} || $ref->{origin})) {
+ my $tochan = DXChannel::get($ref->{touser} || $ref->{group});
+ if ($tochan) {
+ my $nopings = $tochan->user->nopings || $DXProt::obscount;
+ push @{$tochan->{pingtime}}, $t;
+ shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
- my $tochan = DXChannel::get($ref->{touser} || $ref->{group});
+ # cope with a missed ping, this means you must set the pingint large enough
+ if ($t > $tochan->{pingint} && $t < 2 * $tochan->{pingint} ) {
+ $t -= $tochan->{pingint};
+ }
+ # calc smoothed RTT a la TCP
+ if (@{$tochan->{pingtime}} == 1) {
+ $tochan->{pingave} = $t;
+ } else {
+ $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
+ }
+ $tochan->{nopings} = $nopings; # pump up the timer
+ }
+ if (my $dxc = DXChannel::get($ref->{user} || $ref->{origin})) {
if ($dxc->is_user) {
my $s = sprintf "%.2f", $t;
my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
- $dxc->send($dxc->msg('pingi', $ref->{user}, $s, $ave))
- } elsif ($dxc->is_node) {
- if ($tochan ) {
- my $nopings = $tochan->user->nopings || $DXProt::obscount;
- push @{$tochan->{pingtime}}, $t;
- shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-
- # cope with a missed ping, this means you must set the pingint large enough
- if ($t > $tochan->{pingint} && $t < 2 * $tochan->{pingint} ) {
- $t -= $tochan->{pingint};
- }
-
- # calc smoothed RTT a la TCP
- if (@{$tochan->{pingtime}} == 1) {
- $tochan->{pingave} = $t;
- } else {
- $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
- }
- $tochan->{nopings} = $nopings; # pump up the timer
- }
- }
+ $dxc->send($dxc->msg('pingi', ($ref->{touser} || $ref->{group}), $s, $ave))
+ }
}
+ delete $ping{$ref->{id}};
}
}
} else {
+ $thing->{route} = $thing->{o} if $thing->{o};
$thing->broadcast($dxchan);
}
}
sub find
{
- my $call = shift;
+ my $to = shift;
+ my $from = shift;
+ my $user = shift;
+
foreach my $thing (values %ping) {
- if (($thing->{user} || $thing->{origin}) eq $call) {
- return $thing;
+ if ($thing->{origin} eq $from && $thing->{group} eq $to) {
+ if ($user) {
+ return if $thing->{user} && $thing->{user} eq $user;
+ } else {
+ return $thing;
+ }
}
}
return undef;