]> gb7djk.dxcluster.net Git - spider.git/commitdiff
make all pings update the node averages
authorminima <minima>
Wed, 11 Jan 2006 22:20:03 +0000 (22:20 +0000)
committerminima <minima>
Wed, 11 Jan 2006 22:20:03 +0000 (22:20 +0000)
perl/DXXml/Ping.pm

index 1e7aea6fb85d219be60ee3fceadf87313256043b..0fc4426a771ea39ba7752d5f94684a9ef139a526 100644 (file)
@@ -101,11 +101,7 @@ sub handle_ping_reply
                my $dxchan = DXChannel::get($r->{u});
                next unless $dxchan;
                my $t = tv_interval($r->{'-hirestime'}, [ gettimeofday ]);
                my $dxchan = DXChannel::get($r->{u});
                next unless $dxchan;
                my $t = tv_interval($r->{'-hirestime'}, [ gettimeofday ]);
-               if ($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))
-               } elsif ($dxchan->is_node) {
+               if ($dxchan->is_node) {
                        if ($tochan) {
                                my $nopings = $tochan->user->nopings || $DXProt::obscount;
                                push @{$tochan->{pingtime}}, $t;
                        if ($tochan) {
                                my $nopings = $tochan->user->nopings || $DXProt::obscount;
                                push @{$tochan->{pingtime}}, $t;
@@ -127,11 +123,16 @@ sub handle_ping_reply
                                        $ivp->handle_ping;
                                }
                        } elsif (my $rref = Route::Node::get($r->{to})) {
                                        $ivp->handle_ping;
                                }
                        } elsif (my $rref = Route::Node::get($r->{to})) {
-                               if (my $ivp = Investigate::get($from, $fromdxchan->{to})) {
+                               if (my $ivp = Investigate::get($from, $fromdxchan->{call})) {
                                        $ivp->handle_ping;
                                }
                        }
                                        $ivp->handle_ping;
                                }
                        }
-               }
+               }               
+               if ($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))
+               } 
        }
 }
 
        }
 }