fix find

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

diff --git a/perl/Thingy/Ping.pm b/perl/Thingy/Ping.pm
index 6fe808b53423a45d23b6712191dba3d9a44bc3ea..30359a422e7b6b89e22fef22c9a074d51a96a29c 100644 (file)
--- a/perl/Thingy/Ping.pm
+++ b/perl/Thingy/Ping.pm
@@ -19,15 +19,19 @@ use DXDebug;
 use DXUtil;
 use Thingy;
 use Spot;
+use Time::HiRes qw(gettimeofday tv_interval);
 
-use vars qw(@ISA);
+
+use vars qw(@ISA %ping);
 @ISA = qw(Thingy);
 
+my $id;
+
 sub gen_Aranea
 {
        my $thing = shift;
        unless ($thing->{Aranea}) {
-               $thing->{Aranea} = Aranea::genmsg($thing);
+               $thing->{Aranea} = Aranea::genmsg($thing, qw(id out));
        }
        return $thing->{Aranea};
 }
@@ -43,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};
 }
 
@@ -57,7 +74,8 @@ sub gen_DXCommandmode
 
 sub from_DXProt
 {
-       my $thing = shift;
+       my $thing = ref $_[0] ? shift : $_[0]->SUPER::new();
+       
        while (@_) {
                my $k = shift;
                $thing->{$k} = shift;
@@ -70,7 +88,110 @@ sub handle
        my $thing = shift;
        my $dxchan = shift;
 
-       $thing->broadcast($dxchan);
+       # is it for us?
+       if ($thing->{group} eq $main::mycall) {
+               if ($thing->{out} == 1) {
+                       my $repthing = $thing->new_reply;
+                       $repthing->{out} = 0;
+                       $repthing->{id} = $thing->{id};
+                       $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 ||= find($thing->{origin}, $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 ($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
+                                               }
+                                       }
+                               }
+                       }
+               }
+       } else {
+               $thing->broadcast($dxchan);
+       }
+}
+
+# this just creates a ping for onward transmission
+# remember it if you want to ping someone from here    
+sub new_ping
+{
+       my $pkg = shift;
+       my $thing = $pkg->SUPER::new(@_);
+}
+
+# do this for pings we generate ourselves
+sub remember
+{
+       my $thing = shift;
+       $thing->{t} = [ gettimeofday ];
+       $thing->{out} = 1;
+       $thing->{id} = ++$id;
+       my $u = DXUser->get_current($thing->{to});
+       if ($u) {
+               $u->lastping(($thing->{user} || $thing->{group}), $main::systime);
+               $u->put;
+       }
+       $ping{$id} = $thing;
 }
 
+# remove any pings outstanding that we have remembered for this
+# callsign, return the number of forgotten pings
+sub forget
+{
+       my $call = shift;
+       my $count = 0;
+       my @out;        
+       foreach my $thing (values %ping) {
+               if (($thing->{user} || $thing->{group}) eq $call) {
+                       $count++;
+                       delete $ping{$thing->{id}};
+               }
+       }
+       return $count;
+}
+
+sub find
+{
+       my $to = shift;
+       my $from = shift;
+       my $user = shift;
+       
+       foreach my $thing (values %ping) {
+               if ($thing->{origin} eq $from && $thing->{group} eq $to) {
+                       if ($user) {
+                               return if $thing->{user} && $thing->{user} eq $user; 
+                       } else {
+                               return $thing;
+                       }
+               }
+       }
+       return undef;
+}
 1;