X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml%2FPing.pm;h=6088a4628b92756d946bfe4eac2c8398e2592974;hb=edcc29c641eeb483d47d93a488e3a8206d55d900;hp=4fee5f75544ebbd227f4467e281a97c92f00e6aa;hpb=fd0a34c34ad4112ee21e0730f7307498ff437e18;p=spider.git

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index 4fee5f75..6088a462 100644
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -13,8 +13,8 @@ package DXXml::Ping;
 use DXDebug;
 use DXProt;
 use IsoTime;
-use Investigate;
 use Time::HiRes qw(gettimeofday tv_interval);
+use Route::Node;
 
 use vars qw(@ISA %pings);
 @ISA = qw(DXXml);
@@ -68,10 +68,10 @@ sub add
 
 	push @$ref, $self;
 	$pings{$to} = $ref;
-	my $u = DXUser->get_current($to);
+	my $u = DXUser::get_current($to);
 	if ($u) {
 		$u->lastping(($via || $from), $main::systime);
-		$u->put;
+		$u->put unless $dxchan->{_nospawn};
 	}
 }
 
@@ -116,6 +116,12 @@ sub handle_ping_reply
 					$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
 				}
 				$tochan->{nopings} = $nopings; # pump up the timer
+				dbg("ROUTE: $tochan->{call} ping obscount reset to $tochan->{nopings}") if isdbg('obscount');
+				my $nref = Route::Node::get($tochan->{call});
+				if ($nref) {
+					my $n = $nref->reset_obs;
+					dbg("ROUTE: reset obscount on $tochan->{call} to $n (ping)") if isdbg('obscount');
+				}
 			}
 			_handle_believe($from, $fromdxchan->{call});
 		} 
@@ -130,15 +136,12 @@ sub handle_ping_reply
 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;
-		}
+
+	my $dxchan = DXChannel::get($from);
+	my $user = $dxchan->user || DXUser::get($from);
+	if ($user) {
+		$user->set_believe($via);
+		$user->put unless $dxchan->{_nospawn};
 	}
 }
 1;