X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=4cf7db7fae76c184b2f3b38e61bac3356a048d90;hb=85564500ce87c832f2a99fd96ccc1775dc896a0d;hp=d9abfad6f3a4d6f17c1ae236a61ed9557aa2687b;hpb=d0bc1d6db90b5f0765b668d1b08062fb99240ca4;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index d9abfad6..4cf7db7f 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
@@ -371,9 +371,17 @@ sub normal
 		}
 		
 		if ($pcno == 18) {		# link request
+			$self->state('init');	
+
+			# first clear out any nodes on this dxchannel
+			my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
+			foreach my $node (@gonenodes) {
+				next if $node->dxchan == $DXProt::me;
+				broadcast_ak1a(pc21($node->call, 'Gone, re-init') , $self) unless $self->{isolate}; 
+				$node->del();
+			}
 			$self->send_local_config();
 			$self->send(pc20());
-			$self->state('init');	
 			return;             # we don't pass these on
 		}
 		
@@ -385,11 +393,13 @@ sub normal
 				my $call = uc $field[$i+1];
 				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);
 				if ($node) {
-				        my $dxchan;
+					my $dxchan;
 					if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
 						dbg('chan', "LOOP: $call connected locally");
 					}
@@ -661,6 +671,7 @@ sub normal
 		if ($pcno == 50) {		# keep alive/user list
 			my $node = DXCluster->get_exact($field[1]);
 			if ($node) {
+				return unless $node->isa('DXNode');
 				return unless $node->dxchan == $self;
 				$node->update_users($field[2]);
 			}