fix find

[spider.git] / perl / Thingy / Ping.pm

diff --git a/perl/Thingy/Ping.pm b/perl/Thingy/Ping.pm
index edcd8fe741927acec6282f0ecd666cd195582ce6..30359a422e7b6b89e22fef22c9a074d51a96a29c 100644 (file)
--- a/perl/Thingy/Ping.pm
+++ b/perl/Thingy/Ping.pm
@@ -31,7 +31,7 @@ sub gen_Aranea
 {
        my $thing = shift;
        unless ($thing->{Aranea}) {
-               $thing->{Aranea} = Aranea::genmsg($thing, qw(id));
+               $thing->{Aranea} = Aranea::genmsg($thing, qw(id out));
        }
        return $thing->{Aranea};
 }
@@ -47,6 +47,19 @@ sub gen_DXProt
 {
        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};
 }
 
@@ -85,17 +98,18 @@ sub handle
                } 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 ||= find($thing->{origin}, $thing->{group});
                        if ($ref) {
-                               my $t = tv_interval($thing->{t}, [ gettimeofday ]);
-                               if (my $dxc = DXChannel::get($thing->{user} || $thing->{origin})) {
+                               my $t = tv_interval($ref->{t}, [ gettimeofday ]);
+                               if (my $dxc = DXChannel::get($ref->{user} || $ref->{origin})) {
                                        
-                                       my $tochan = DXChannel::get($thing->{touser} || $thing->{group});
+                                       my $tochan = DXChannel::get($ref->{touser} || $ref->{group});
                                        
                                        if ($dxc->is_user) {
                                                my $s = sprintf "%.2f", $t; 
                                                my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
-                                               $dxc->send($dxc->msg('pingi', ($thing->{touser} || $thing->{group}), $s, $ave))
+                                               $dxc->send($dxc->msg('pingi', $ref->{user}, $s, $ave))
                                        } elsif ($dxc->is_node) {
                                                if ($tochan ) {
                                                        my $nopings = $tochan->user->nopings || $DXProt::obscount;
@@ -165,10 +179,17 @@ sub forget
 
 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;