X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FInvestigate.pm;h=d827d61cc4d8d37628b14a13287f981ce49106b4;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=d59a57b5a1ba17f976d2fe47660366076510e400;hpb=23d5848190b73200389fdfc2291e3453b3b91b15;p=spider.git

diff --git a/perl/Investigate.pm b/perl/Investigate.pm
index d59a57b5..d827d61c 100644
--- a/perl/Investigate.pm
+++ b/perl/Investigate.pm
@@ -21,12 +21,6 @@ use DXDebug;
 use DXUtil;
 
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw (%list %valid $pingint $maxpingwait);
 
 $pingint = 5;					# interval between pings for each investigation
@@ -47,6 +41,7 @@ my $lastping = 0;				# last ping done
 		  pcxx => '0,Stored PCProt,parray',
 		 );
 
+my %via = ();
 
 sub new
 {
@@ -87,13 +82,14 @@ sub handle_ping
 	my $self = shift;
 	dbg("Investigate: ping received for $self->{call} via $self->{via}") if isdbg('investigate');
 	if ($self->{state} eq 'waitping') {
+		$via{$self->{via}} = 0;       # cue up next ping on this interface
 		delete $list{"$self->{via},$self->{call}"};
 		my $user = DXUser->get_current($self->{via});
 		if ($user) {
 			$user->set_believe($self->{call});
 			$user->put;
 		}
-		my $dxchan = DXChannel->get($self->{via});
+		my $dxchan = DXChannel::get($self->{via});
 		if ($dxchan) {
 			dbg("Investigate: sending PC19 for $self->{call}") if isdbg('investigate');
 			foreach my $pc (@{$self->{pcxx}}) {
@@ -120,11 +116,13 @@ sub process
 {
 	while (my ($k, $v) = each %list) {
 		if ($v->{state} eq 'start') {
-			if ($main::systime > $lastping+$pingint) {
-				DXProt::addping($main::mycall, $v->{call}, $v->{via});
+			my $via = $via{$v->{via}} || 0;
+			if ($main::systime > $via+$pingint) {
+				DXXml::Ping::add($main::me, $v->{call}, $v->{via});
 				$v->{start} = $lastping = $main::systime;
 				dbg("Investigate: ping sent to $v->{call} via $v->{via}") if isdbg('investigate');
 				$v->chgstate('waitping');
+				$via{$v->{via}} = $main::systime;
 			}
 		} elsif ($v->{state} eq 'waitping') {
 			if ($main::systime > $v->{start} + $maxpingwait) {