get alternate pinging working properly at half pingint

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

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index d70d6e9a46104cb379b95653af96862f4b0388b0..59c8ff3e6ee9067c0f16378b7660c82d820e08fd 100644 (file)
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -38,6 +38,9 @@ sub handle_input
                                                                           ot=>$self->{t}
                                                                          );
                        $dxchan->send($rep->toxml);
+                       if ($dxchan->{outgoing} && abs($dxchan->{lastping} - $main::systime) < 15) {
+                               $dxchan->{lastping} += $dxchan->{pingint} / 2; 
+                       }
                } else {
                        handle_ping_reply($dxchan, $self->{o}, $self->{ot}, $self->{oid});
                }
@@ -97,7 +100,7 @@ sub handle_ping_reply
        my $tochan = DXChannel::get($from);
        while (@$ref) {
                my $r = shift @$ref;
-               my $dxchan = DXChannel::get($r->{u});
+               my $dxchan = DXChannel::get($r->{o});
                next unless $dxchan;
                my $t = tv_interval($r->{'-hirestime'}, [ gettimeofday ]);
                if ($dxchan->is_node) {
@@ -120,7 +123,8 @@ sub handle_ping_reply
                                $tochan->{nopings} = $nopings; # pump up the timer
                        }
                        _handle_believe($from, $fromdxchan->{call});
-               } elsif ($dxchan->is_user) {
+               } 
+               if (exists $r->{u} && ($dxchan = DXChannel::get($r->{u})) && $dxchan->is_user) {
                        my $s = sprintf "%.2f", $t; 
                        my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
                        $dxchan->send($dxchan->msg('pingi', $from, $s, $ave))