remove 'u=' if 'o=' eq mycall

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

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index a1b0a6a122ba6e3a8a792ef69d819c4216b9ecb0..d70d6e9a46104cb379b95653af96862f4b0388b0 100644 (file)
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -30,6 +30,20 @@ sub handle_input
        my $self = shift;
        my $dxchan = shift;
        
+       if ($self->{to} eq $main::mycall) {
+               if ($self->{s} eq '1') {
+                       my $rep = DXXml::Ping->new(to=>$self->{o}, 
+                                                                          s=>'0',
+                                                                          oid=>$self->{id},
+                                                                          ot=>$self->{t}
+                                                                         );
+                       $dxchan->send($rep->toxml);
+               } else {
+                       handle_ping_reply($dxchan, $self->{o}, $self->{ot}, $self->{oid});
+               }
+       } else {
+               $self->route($dxchan);
+       }
 }
 
 sub topcxx
@@ -52,7 +66,6 @@ sub add
        $self->{u} = $from unless $from eq $main::mycall;
        $self->{'-via'} = $via if $via && DXChannel::get($via);
        $self->{o} = $main::mycall;
-       $self->{id} = $self->nextid;
        $self->route($dxchan);
 
        push @$ref, $self;
@@ -68,6 +81,8 @@ sub handle_ping_reply
 {
        my $fromdxchan = shift;
        my $from = shift;
+       my $ot = shift;
+       my $oid = shift;
        my $fromxml;
        
        if (ref $from) {
@@ -82,14 +97,10 @@ sub handle_ping_reply
        my $tochan = DXChannel::get($from);
        while (@$ref) {
                my $r = shift @$ref;
-               my $dxchan = DXChannel::get($r->{to});
+               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;
@@ -107,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;