X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=c039659bd96dbfab15373c542cf92578f449e503;hb=1479f550842390ca770899e5cf1c6ce79087fe82;hp=46ba890932204210fda710a84fe993d20e45ec36;hpb=5232a160e5361e9bdcb8e2202c8063b8df6bd9dc;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 46ba8909..c039659b 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -197,7 +197,10 @@ sub normal
 			}
 			
 			# if this is a 'nodx' node then ignore it
-			last SWITCH if grep $field[7] =~ /^$_/,  @DXProt::nodx_node;
+			if (grep $field[7] =~ /^$_/,  @DXProt::nodx_node) {
+				dbg('chan', "Bad DXNode, dropped");
+				return;
+			}
 			
 			# convert the date to a unix date
 			my $d = cltounix($field[3], $field[4]);
@@ -310,20 +313,26 @@ sub normal
 		
 		if ($pcno == 16) {		# add a user
 			my $node = DXCluster->get_exact($field[1]); 
+			my $dxchan;
+			if (!$node && ($dxchan = DXChannel->get($field[1]))) {
+				# add it to the node table if it isn't present and it's
+				# connected locally
+				$node = DXNode->new($dxchan, $field[1], 0, 1, 5400);
+				broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+				
+			}
 			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: $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;
-			
-			
+						
 			for ($i = 2; $i < $#field; $i++) {
 				my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
 				next if !$call || length $call < 3 || length $call > 8;
@@ -351,13 +360,20 @@ sub normal
 		
 		if ($pcno == 17) {		# remove a user
 			my $node = DXCluster->get_exact($field[2]);
+			my $dxchan;
+			if (!$node && ($dxchan = DXChannel->get($field[2]))) {
+				# add it to the node table if it isn't present and it's
+				# connected locally
+				$node = DXNode->new($dxchan, $field[2], 0, 1, 5400);
+				broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+				return;
+			}
 			return unless $node;
 			return unless $node->isa('DXNode');
 			if ($node->dxchan != $self) {
 				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;