Improve the selection of parser for XML::Simple.

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

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index 1e7aea6fb85d219be60ee3fceadf87313256043b..06d96ff617cff373e0487dad01f8021dbbaa2ecf 100644 (file)
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -66,7 +66,6 @@ sub add
        $self->{u} = $from;
        $self->{'-via'} = $via if $via && DXChannel::get($via);
        $self->{o} = $main::mycall;
-       $self->{id} = $self->nextid;
        $self->route($dxchan);
 
        push @$ref, $self;
@@ -101,11 +100,7 @@ sub handle_ping_reply
                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;
@@ -123,16 +118,28 @@ sub handle_ping_reply
                                        $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
                                }
                                $tochan->{nopings} = $nopings; # pump up the timer
-                               if (my $ivp = Investigate::get($from, $fromdxchan->{call})) {
-                                       $ivp->handle_ping;
-                               }
-                       } elsif (my $rref = Route::Node::get($r->{to})) {
-                               if (my $ivp = Investigate::get($from, $fromdxchan->{to})) {
-                                       $ivp->handle_ping;
-                               }
                        }
-               }
+                       _handle_believe($from, $fromdxchan->{call});
+               } elsif ($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))
+               } 
        }
 }
 
+sub _handle_believe
+{
+       my ($from, $via) = @_;
+       
+       if (my $ivp = Investigate::get($from, $via)) {
+               $ivp->handle_ping;
+       } else {
+               my $user = DXUser->get_current($from);
+               if ($user) {
+                       $user->set_believe($via);
+                       $user->put;
+               }
+       }
+}
 1;