X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=0d137e529bd3710f7dd391eadf9ee126f4fe0083;hb=f0ac8322367c66080b6dbb74da4de72dae126dc3;hp=9519c004dee7f6f924ebcb6345fed3fb66ef368d;hpb=3eb9538d135d9ff21d8ce7c0e0c6b3e6d7fb59a9;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 9519c004..0d137e52 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
@@ -319,7 +319,8 @@ sub normal
 				dbg('chan', "LOOP: $field[1] came in on wrong channel");
 				return;
 			}
-			if (DXChannel->get($field[1])) {
+			my $dxchan;
+			if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
 				dbg('chan', "LOOP: $field[1] connected locally");
 				return;
 			}
@@ -359,7 +360,8 @@ sub normal
 				dbg('chan', "LOOP: $field[2] came in on wrong channel");
 				return;
 			}
-			if (DXChannel->get($field[2])) {
+			my $dxchan;
+			if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
 				dbg('chan', "LOOP: $field[2] connected locally");
 				return;
 			}
@@ -369,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
 		}
 		
@@ -383,11 +393,14 @@ 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) {
-					if (DXChannel->get($call)) {
+					my $dxchan;
+					if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
 						dbg('chan', "LOOP: $call connected locally");
 					}
 				    if ($node->dxchan != $self) {
@@ -454,7 +467,8 @@ sub normal
 						dbg('chan', "LOOP: $call come in on wrong channel");
 						return;
 					}
-					if (DXChannel->get($call)) {
+					my $dxchan;
+					if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
 						dbg('chan', "LOOP: $call connected locally");
 						return;
 					}
@@ -502,11 +516,11 @@ sub normal
 			$wwvdup{$dupkey} = $d;
 			$field[6] =~ s/-\d+$//o;            # remove spotter's ssid
 		
-			my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..$#field]);
+			my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..8]);
 
 			my $r;
 			eval {
-				$r = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+				$r = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..8]);
 			};
 #			dbg('local', "Local::wwv2 error $@") if $@;
 			return if $r;
@@ -514,9 +528,9 @@ sub normal
 			# DON'T be silly and send on PC27s!
 			return if $pcno == 27;
 
-			# broadcast to the eager users
-			broadcast_users("WWV de $field[7] <$field[2]>:   SFI=$sfi, A=$k, K=$i, $field[6]", 'wwv', $wwv );
-			last SWITCH;
+			# broadcast to the eager world
+			send_wwv_spot($self, $line, $d, $field[2], $sfi, $k, $i, @field[6..8]);
+			return;
 		}
 		
 		if ($pcno == 24) {		# set here status
@@ -531,6 +545,10 @@ sub normal
 				route($field[1], $line);
 				return;
 			}
+			if ($field[2] eq $main::mycall) {
+				dbg('chan', "Trying to merge to myself, ignored");
+				return;
+			}
 
 			Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
 			
@@ -657,6 +675,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]);
 			}
@@ -817,6 +836,45 @@ sub send_dx_spot
 	}
 }
 
+sub send_wwv_spot
+{
+	my $self = shift;
+	my $line = shift;
+	my @dxchan = DXChannel->get_all();
+	my $dxchan;
+	
+	# send it if it isn't the except list and isn't isolated and still has a hop count
+	# taking into account filtering and so on
+	foreach $dxchan (@dxchan) {
+		my $routeit;
+		my ($filter, $hops) = Filter::it($dxchan->{wwvfilter}, @_, $self->{call} ) if $dxchan->{wwvfilter};
+		if ($dxchan->is_ak1a) {
+			next if $dxchan == $self;
+			if ($hops) {
+				$routeit = $line;
+				$routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+			} else {
+				$routeit = adjust_hops($dxchan, $line);  # adjust its hop count by node name
+				next unless $routeit;
+			}
+			if ($filter) {
+				$dxchan->send($routeit) if $routeit;
+			} else {
+				$dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
+				
+			}
+		} elsif ($dxchan->is_user && $dxchan->{wwv}) {
+			my $buf = "WWV de $_[6] <$_[1]>:   SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
+			$buf .= "\a\a" if $dxchan->{beep};
+			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+				$dxchan->send($buf) if !$hops || ($hops && $filter);
+			} else {
+				$dxchan->delay($buf) if !$hops || ($hops && $filter);
+			}
+		}					
+	}
+}
+
 sub send_local_config
 {
 	my $self = shift;