# {user} as well as a true user and also it may not
# have originated here.
- 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};
-
-
+ my ($from, $to);
+ if ($thing->{out}) {
+ $from = $thing->{o};
+ $from ||= $thing->{user} unless Route::User::get($thing->{user});
+ $from ||= $thing->{origin};
+ $to = $thing->{touser} unless Route::User::get($thing->{touser});
+ $to ||= $thing->{group};
+ } else {
+ $from ||= $thing->{user} unless Route::User::get($thing->{user});
+ $from ||= $thing->{origin};
+ $to = $thing->{o};
+ $to ||= $thing->{touser} unless Route::User::get($thing->{touser});
+ $to ||= $thing->{group};
+ }
$thing->{DXProt} = DXProt::pc51($to, $from, $thing->{out});
}
return $thing->{DXProt};
my $thing = shift;
my $dxchan = shift;
my $buf;
-
+ if ($dxchan->{call} eq $thing->{touser}) {
+ $buf = $dxchan->msg('pingi', ($thing->{user} || $thing->{origin}), $thing->{ft}, $thing->{fave});
+ }
return $buf;
}
} else {
# it's a reply, look in the ping list for this one
- my $ref = $ping{$thing->{id}} if exists $thing->{id};
- $ref ||= find(($thing->{user}||$thing->{origin}), ($thing->{touser}||$thing->{group}));
+ my $ref;
+ $ref = $ping{$thing->{id}} if exists $thing->{id};
+ $ref = find(($thing->{user}||$thing->{origin}), ($thing->{touser}||$thing->{group})) unless $ref;
if ($ref) {
my $t = tv_interval($ref->{t}, [ gettimeofday ]);
my $tochan = DXChannel::get($ref->{touser} || $ref->{group});
$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->{touser} || $ref->{group}), $s, $ave))
- }
+ $thing->{ft} = sprintf "%.2f", $t;
+ $thing->{fave} = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
+ $thing->send($dxc);
}
delete $ping{$ref->{id}};
}
}
} else {
- $thing->{route} = $thing->{o} if $thing->{o};
$thing->broadcast($dxchan);
}
}