{
my $thing = shift;
unless ($thing->{Aranea}) {
- $thing->{Aranea} = Aranea::genmsg($thing, qw(id));
+ $thing->{Aranea} = Aranea::genmsg($thing, qw(id out));
}
return $thing->{Aranea};
}
{
my $thing = shift;
my $dxchan = shift;
+ unless ($thing->{DXProt}) {
+ # we need to tease out the nodes out of all of this.
+ # bear in mind that a proxied PC prot node could be in
+ # {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});
+ $from ||= $thing->{origin};
+ my $to = $thing->{touser} if Route::Node::get($thing->{touser});
+ $to ||= $thing->{group};
+
+ $thing->{DXProt} = DXProt::pc51($to, $from, $thing->{out});
+ }
return $thing->{DXProt};
}
} else {
# it's a reply, look in the ping list for this one
- my $ref = $ping{$thing->{id}} || $thing->find;
+ my $ref = $ping{$thing->{id}} if exists $thing->{id};
+ $ref ||= $thing->find;
if ($ref) {
my $t = tv_interval($thing->{t}, [ gettimeofday ]);
if (my $dxc = DXChannel::get($thing->{user} || $thing->{origin})) {