X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=16b67023a7f09d579ff8bfd01ac2246f3188f74a;hb=9da1742219a27b1c02fd57794412088e4d7b3d1d;hp=4bdb307fe49b589c5bd367fae12d66f4afceb552;hpb=d99e357e5203c7742b57c51b7c2dd103c1836c01;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4bdb307f..16b67023 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -31,7 +31,7 @@ use strict;
 use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age 
 			%spotdup %wwvdup $last_hour %pings %rcmds 
 			%nodehops @baddx $baddxfn $pc12_dup_age
-			%anndup);
+			%anndup $allowzero);
 
 $me = undef;					# the channel id for this cluster
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
@@ -178,6 +178,14 @@ sub normal
 		}
 		
 		if ($pcno == 11 || $pcno == 26) { # dx spot
+
+			# route 'foreign' pc26s 
+			if ($pcno == 26) {
+				if ($field[7] ne $main::mycall) {
+					route($field[7], $line);
+					return;
+				}
+			}
 			
 			# if this is a 'nodx' node then ignore it
 			last SWITCH if grep $field[7] =~ /^$_/,  @DXProt::nodx_node;
@@ -305,10 +313,15 @@ sub normal
 		
 		if ($pcno == 16) {		# add a user
 			my $node = DXCluster->get_exact($field[1]); 
-			last SWITCH if !$node; # ignore if havn't seen a PC19 for this one yet
-			last SWITCH unless $node->isa('DXNode');
+			return unless $node; # ignore if havn't seen a PC19 for this one yet
+			return unless $node->isa('DXNode');
 			if ($node->dxchan != $self) {
-				dbg('chan', "LOOP: come in on wrong channel");
+				dbg('chan', "LOOP: $field[1] came in on wrong channel");
+				return;
+			}
+			my $dxchan;
+			if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
+				dbg('chan', "LOOP: $field[1] connected locally");
 				return;
 			}
 			my $i;
@@ -341,9 +354,15 @@ sub normal
 		
 		if ($pcno == 17) {		# remove a user
 			my $node = DXCluster->get_exact($field[2]);
-			last SWITCH unless $node->isa('DXNode');
+			return unless $node;
+			return unless $node->isa('DXNode');
 			if ($node->dxchan != $self) {
-				dbg('chan', "LOOP: come in on wrong channel");
+				dbg('chan', "LOOP: $field[2] came in on wrong channel");
+				return;
+			}
+			my $dxchan;
+			if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
+				dbg('chan', "LOOP: $field[2] connected locally");
 				return;
 			}
 			my $ref = DXCluster->get_exact($field[1]);
@@ -360,23 +379,36 @@ sub normal
 		
 		if ($pcno == 19) {		# incoming cluster list
 			my $i;
+			my $newline = "PC19^";
 			for ($i = 1; $i < $#field-1; $i += 4) {
 				my $here = $field[$i];
 				my $call = uc $field[$i+1];
-				my $confmode = $field[$i+2] eq '*';
+				my $confmode = $field[$i+2];
 				my $ver = $field[$i+3];
+
+				$ver = 5400 if !$ver && $allowzero;
 				
 				# now check the call over
-				my $node = DXCluster->get_exact($call); # we already have this
-				if ($node && $node->dxchan != $self) {
-					dbg('chan', "LOOP: come in on wrong channel");
-					return;
+				my $node = DXCluster->get_exact($call);
+				if ($node) {
+					my $dxchan;
+					if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
+						dbg('chan', "LOOP: $call connected locally");
+					}
+				    if ($node->dxchan != $self) {
+						dbg('chan', "LOOP: $call come in on wrong channel");
+						next;
+					}
+					dbg('chan', "already have $call");
+					next;
 				}
-				next if $node;
 				
 				# check for sane parameters
 				next if $ver < 5000; # only works with version 5 software
 				next if length $call < 3; # min 3 letter callsigns
+
+				# add it to the nodes table and outgoing line
+				$newline .= "$here^$call^$confmode^$ver^";
 				DXNode->new($self, $call, $confmode, $here, $ver);
 				
 				# unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
@@ -399,6 +431,11 @@ sub normal
 			
 			# queue up any messages
 			DXMsg::queue_msg(0) if $self->state eq 'normal';
+			return if $newline eq "PC19^";
+
+			# add hop count 
+			$newline .=  get_hops(19) . "^";
+			$line = $newline;
 			last SWITCH;
 		}
 		
@@ -419,7 +456,12 @@ sub normal
 				my $node = DXCluster->get_exact($call);
 				if ($node) {
 					if ($node->dxchan != $self) {
-						dbg('chan', "LOOP: come in on wrong channel");
+						dbg('chan', "LOOP: $call come in on wrong channel");
+						return;
+					}
+					my $dxchan;
+					if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
+						dbg('chan', "LOOP: $call connected locally");
 						return;
 					}
 					$node->del();
@@ -440,6 +482,15 @@ sub normal
 		}
 		
 		if ($pcno == 23 || $pcno == 27) { # WWV info
+			
+			# route 'foreign' pc27s 
+			if ($pcno == 27) {
+				if ($field[8] ne $main::mycall) {
+					route($field[8], $line);
+					return;
+				}
+			}
+
 			# do some de-duping
 			my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
 			my $sfi = unpad($field[3]);
@@ -494,7 +545,7 @@ sub normal
 				my @in = reverse Spot::search(1, undef, undef, 0, $field[3]-1);
 				my $in;
 				foreach $in (@in) {
-					$self->send(pc26(@{$in}[0..4], $in->[7]));
+					$self->send(pc26(@{$in}[0..4], $field[2]));
 				}
 			}
 
@@ -503,14 +554,18 @@ sub normal
 				my @in = reverse Geomag::search(0, $field[4], time, 1);
 				my $in;
 				foreach $in (@in) {
-					$self->send(pc27(@{$in}));
+					$self->send(pc27(@{$in}[0..5], $field[2]));
 				}
 			}
 			return;
 		}
-		
+
 		if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
-			DXMsg::process($self, $line);
+			if ($field[1] eq $main::mycall) {
+				DXMsg::process($self, $line);
+			} else {
+				route($field[1], $line);
+			}
 			return;
 		}
 		
@@ -558,10 +613,8 @@ sub normal
 			return;
 		}
 		
-		if ($pcno == 37) {
-			last SWITCH;
-		}
-		
+		# for pc 37 see 44 onwards
+
 		if ($pcno == 38) {		# node connected list from neighbour
 			return;
 		}
@@ -598,25 +651,22 @@ sub normal
 		if ($pcno == 43) {
 			last SWITCH;
 		}
-		if ($pcno == 44) {
-			last SWITCH;
-		}
-		if ($pcno == 45) {
-			last SWITCH;
-		}
-		if ($pcno == 46) {
-			last SWITCH;
-		}
-		if ($pcno == 47) {
-			last SWITCH;
-		}
-		if ($pcno == 48) {
-			last SWITCH;
+		if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 49) {
+			if ($field[1] eq $main::mycall) {
+				;
+			} else {
+				route($field[1], $line);
+			}
+			return;
 		}
 		
 		if ($pcno == 50) {		# keep alive/user list
-			my $ref = DXCluster->get_exact($field[1]);
-			$ref->update_users($field[2]) if $ref;			
+			my $node = DXCluster->get_exact($field[1]);
+			if ($node) {
+				return unless $node->isa('DXNode');
+				return unless $node->dxchan == $self;
+				$node->update_users($field[2]);
+			}
 			last SWITCH;
 		}
 		
@@ -726,7 +776,7 @@ sub finish
 	delete $pings{$call};
 	
 	# now broadcast to all other ak1a nodes that I have gone
-	broadcast_ak1a(pc21($call, 'Gone.'), $self);
+	broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
 	
 	Log('DXProt', $call . " Disconnected");
 	$ref->del() if $ref;
@@ -963,7 +1013,7 @@ sub get_all_user_calls
 
 sub get_hops
 {
-	my ($pcno) = @_;
+	my $pcno = shift;
 	my $hops = $DXProt::hopcount{$pcno};
 	$hops = $DXProt::def_hopcount if !$hops;
 	return "H$hops";