X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=5c6ca1fb928abd18426cce68525fedbcb3e20cf6;hb=4c60d18d0d58ece2406680d4afd4ff016532c11c;hp=d51b9f1a7e256193985b0919f4523aec28d50957;hpb=4a4022d665224a6ac7b7a539a4c1042aecbc07de;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index d51b9f1a..5c6ca1fb 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -27,7 +27,6 @@ use DXDb;
 use AnnTalk;
 use Geomag;
 use WCY;
-use Time::HiRes qw(gettimeofday tv_interval);
 use BadWords;
 use DXHash;
 use Route;
@@ -57,7 +56,6 @@ $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc23
 
 $last_hour = time;				# last time I did an hourly periodic update
-%pings = ();                    # outstanding ping requests outbound
 %rcmds = ();                    # outstanding rcmd requests outbound
 %nodehops = ();                 # node specific hop control
 %pc19list = ();					# list of outstanding PC19s that haven't had PC16s on them
@@ -84,7 +82,7 @@ $handle_xml = 0;				# handle XML sentences
 @checklist = 
 (
  [ qw(i c c m bp bc c) ],			# pc10
- [ qw(i f bm d t m c c h) ],		# pc11
+ [ qw(i f m d t m c c h) ],		# pc11
  [ qw(i c bm m bm bm p h) ],		# pc12
  [ qw(i c h) ],					# 
  [ qw(i c h) ],					# 
@@ -479,6 +477,18 @@ sub handle_11
 			
 	# rsfp check
 	#			return if $rspfcheck and !$self->rspfcheck(1, $_[7], $_[6]);
+	
+	# is the spotted callsign blank? This should really be trapped earlier but it
+	# could break other protocol sentences. Also check for lower case characters.
+	if ($_[2] =~ /^\s*$/) {
+		dbg("PCPROT: blank callsign, dropped") if isdbg('chanerr');
+		return;
+	}
+	if ($_[2] =~ /[a-z]/) {
+		dbg("PCPROT: lowercase characters, dropped") if isdbg('chanerr');
+		return;
+	}
+
 
 	# if this is a 'nodx' node then ignore it
 	if ($badnode->in($_[7])) {
@@ -935,7 +945,7 @@ sub handle_18
 			$self->user->put;
 			$self->sort('S');
 		}
-		$self->{handle_xml}++ if $_[1] =~ /\bxml\b/;
+		$self->{handle_xml}++ if $main::do_xml && $_[1] =~ /\bxml\b/;
 	} else {
 		$self->version(50.0);
 		$self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/;
@@ -1550,7 +1560,7 @@ sub handle_51
 		if ($flag == 1) {
 			$self->send(pc51($from, $to, '0'));
 		} else {
-			$self->handle_ping_reply($from);
+			DXXml::Ping::handle_ping_reply($self, $from);
 		}
 	} else {
 
@@ -1565,56 +1575,6 @@ sub handle_51
 	}
 }
 
-sub handle_ping_reply
-{
-	my $self = shift;
-	my $from = shift;
-	my $id = shift;
-	
-	# it's a reply, look in the ping list for this one
-	my $ref = $pings{$from};
-	return unless $ref;
-
-	my $tochan =  DXChannel::get($from);
-	while (@$ref) {
-		my $r = shift @$ref;
-		my $dxchan = DXChannel::get($r->{call});
-		next unless $dxchan;
-		my $t = tv_interval($r->{t}, [ 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 ($tochan) {
-				my $nopings = $tochan->user->nopings || $obscount;
-				push @{$tochan->{pingtime}}, $t;
-				shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-				
-				# cope with a missed ping, this means you must set the pingint large enough
-				if ($t > $tochan->{pingint}  && $t < 2 * $tochan->{pingint} ) {
-					$t -= $tochan->{pingint};
-				}
-				
-				# calc smoothed RTT a la TCP
-				if (@{$tochan->{pingtime}} == 1) {
-					$tochan->{pingave} = $t;
-				} else {
-					$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
-				}
-				$tochan->{nopings} = $nopings; # pump up the timer
-				if (my $ivp = Investigate::get($from, $self->{call})) {
-					$ivp->handle_ping;
-				}
-			} elsif (my $rref = Route::Node::get($r->{call})) {
-				if (my $ivp = Investigate::get($from, $self->{call})) {
-					$ivp->handle_ping;
-				}
-			}
-		}
-	}
-}
-
 # dunno but route it
 sub handle_75
 {
@@ -1737,7 +1697,7 @@ sub process
 			if ($dxchan->{nopings} <= 0) {
 				$dxchan->disconnect;
 			} else {
-				addping($main::mycall, $dxchan->call);
+				DXXml::Ping::add($main::me, $dxchan->call);
 				$dxchan->{nopings} -= 1;
 				$dxchan->{lastping} = $t;
 				$dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
@@ -2195,29 +2155,6 @@ sub load_hops
 	return ();
 }
 
-
-# add a ping request to the ping queues
-sub addping
-{
-	my ($from, $to, $via) = @_;
-	my $ref = $pings{$to} || [];
-	my $r = {};
-	$r->{call} = $from;
-	$r->{t} = [ gettimeofday ];
-	if ($via && (my $dxchan = DXChannel::get($via))) {
-		$dxchan->send(pc51($to, $main::mycall, 1));
-	} else {
-		route(undef, $to, pc51($to, $main::mycall, 1));
-	}
-	push @$ref, $r;
-	$pings{$to} = $ref;
-	my $u = DXUser->get_current($to);
-	if ($u) {
-		$u->lastping(($via || $from), $main::systime);
-		$u->put;
-	}
-}
-
 sub process_rcmd
 {
 	my ($self, $tonode, $fromnode, $user, $cmd) = @_;