X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXProt.pm;h=ff891427079e0da82419badd01176534a9be815e;hb=b4902de2965ded18eadc0588d24130b62274eec0;hp=27416fab8e36952cd442263605024c3dd4dde1fb;hpb=1994ae9ca216a19bf373948c5e8d79a9d58369d6;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 27416fab..ff891427 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -22,6 +22,8 @@ use DXLog;
 use Spot;
 use DXProtout;
 use DXDebug;
+use Local;
+
 use Carp;
 
 use strict;
@@ -118,8 +120,11 @@ sub start
 sub normal
 {
 	my ($self, $line) = @_;
-	my @field = split /[\^\~]/, $line;
+	my @field = split /\^/, $line;
+	pop @field if $field[-1] eq '~';
 	
+#	print join(',', @field), "\n";
+						
 	# ignore any lines that don't start with PC
 	return if !$field[0] =~ /^PC/;
 	
@@ -128,6 +133,14 @@ sub normal
 	return unless $pcno;
 	return if $pcno < 10 || $pcno > 51;
 	
+	# local processing 1
+	my $pcr;
+	eval {
+		$pcr = Local::pcprot($self, $pcno, @field);
+	};
+#	dbg('local', "Local::pcprot error $@") if $@;
+	return if $pcr;
+	
  SWITCH: {
 		if ($pcno == 10) {		# incoming talk
 			
@@ -140,7 +153,7 @@ sub normal
 				Log('talk', $call, $field[1], $field[6], $text);
 				$call = $main::myalias if $call eq $main::mycall;
 				my $ref = DXChannel->get($call);
-				$ref->send("$call de $field[1]: $text") if $ref;
+				$ref->send("$call de $field[1]: $text") if $ref && $ref->{talk};
 			} else {
 				route($field[2], $line); # relay it on its way
 			}
@@ -154,9 +167,9 @@ sub normal
 			
 			# convert the date to a unix date
 			my $d = cltounix($field[3], $field[4]);
-			# bang out (and don't pass on) if date is invalid or the spot is too old
-			if (!$d || ($pcno == 11 && $d < $main::systime - $pc11_max_age)) {
-				dbg('chan', "Spot ignored, invalid date or too old\n");
+			# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
+			if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
+				dbg('chan', "Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
 				return;
 			}
 
@@ -177,12 +190,20 @@ sub normal
 			
 			$spotdup{$dupkey} = $d;
 			
-			my $spot = Spot::add($freq, $field[2], $d, $text, $spotter);
+			my $spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
 			
+			# local processing 
+			my $r;
+			eval {
+				$r = Local::spot($self, $freq, $field[2], $d, $text, $spotter, $field[7]);
+			};
+#			dbg('local', "Local::spot1 error $@") if $@;
+			return if $r;
+
 			# send orf to the users
 			if ($spot && $pcno == 11) {
 				my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
-				broadcast_users("$buf\a\a");
+				broadcast_users("$buf\a\a", 'dx', $spot);
 			}
 
 			# DON'T be silly and send on PC26s!
@@ -216,9 +237,9 @@ sub normal
 				$target = "All" if !$target;
 				
 				if (@list > 0) {
-					broadcast_list("$to$target de $field[1]: $text", @list);
+					broadcast_list("$to$target de $field[1]: $text", 'ann', undef, @list);
 				} else {
-					broadcast_users("$target de $field[1]: $text");
+					broadcast_users("$target de $field[1]: $text", 'ann', undef);
 				}
 				Log('ann', $target, $field[1], $text);
 				
@@ -250,7 +271,7 @@ sub normal
 			
 			for ($i = 2; $i < $#field; $i++) {
 				my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
-				next if length $call < 3 || length $call > 8;
+				next if !$call || length $call < 3 || length $call > 8;
 				next if !$confmode;
 				$call = uc $call;
 				next if DXCluster->get_exact($call); # we already have this (loop?)
@@ -364,13 +385,27 @@ sub normal
 				dbg('chan', "Dup WWV Spot ignored\n");
 				return;
 			}
-			
+			if ($d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) {
+				dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
+				return;
+			}
 			$wwvdup{$dupkey} = $d;
-			Geomag::update($field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+			$field[6] =~ s/-\d+$//o;            # remove spotter's ssid
+		
+			my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..$#field]);
+
+			my $r;
+			eval {
+				$r = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+			};
+#			dbg('local', "Local::wwv2 error $@") if $@;
+			return if $r;
 
 			# 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, K=$k, A=$i, $field[6]", 'wwv', $wwv );
 			last SWITCH;
 		}
 		
@@ -381,8 +416,32 @@ sub normal
 			last SWITCH;
 		}
 		
-		if ($pcno == 25) {
-			last SWITCH;
+		if ($pcno == 25) {      # merge request
+			unless ($field[1] eq $main::mycall) {
+				dbg('chan', "merge request to $field[1] from $field[2] ignored");
+				return;
+			}
+
+			Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
+			
+			# spots
+			if ($field[3] > 0) {
+				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]));
+				}
+			}
+
+			# wwv
+			if ($field[4] > 0) {
+				my @in = reverse Geomag::search(0, $field[4], time, 1);
+				my $in;
+				foreach $in (@in) {
+					$self->send(pc27(@{$in}));
+				}
+			}
+			return;
 		}
 		
 		if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
@@ -486,7 +545,7 @@ sub normal
 		
 		if ($pcno == 50) {		# keep alive/user list
 			my $ref = DXCluster->get_exact($field[1]);
-			$ref->update_users($field[2]) if $ref;
+			$ref->update_users($field[2]) if $ref;			
 			last SWITCH;
 		}
 		
@@ -672,28 +731,45 @@ sub broadcast_ak1a
 }
 
 # broadcast to all users
+# storing the spot or whatever until it is in a state to receive it
 sub broadcast_users
 {
 	my $s = shift;				# the line to be rebroadcast
+	my $sort = shift;           # the type of transmission
+	my $fref = shift;           # a reference to an object to filter on
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
 	my @dxchan = get_all_users();
 	my $dxchan;
+	my @out;
 	
 	foreach $dxchan (@dxchan) {
 		next if grep $dxchan == $_, @except;
-		$s =~ s/\a//og if !$dxchan->{beep};
-		$dxchan->send($s);		# send it if it isn't the except list or hasn't a passout flag
+		push @out, $dxchan;
 	}
+	broadcast_list($s, $sort, $fref, @out);
 }
 
 # broadcast to a list of users
 sub broadcast_list
 {
 	my $s = shift;
+	my $sort = shift;
+	my $fref = shift;
 	my $dxchan;
 	
 	foreach $dxchan (@_) {
-		$dxchan->send($s);		# send it 
+		
+		next if $sort eq 'dx' && !$dxchan->{dx};
+		next if $sort eq 'ann' && !$dxchan->{ann};
+		next if $sort eq 'wwv' && !$dxchan->{wwv};
+		next if $sort eq 'wx' && !$dxchan->{wx};
+
+		$s =~ s/\a//og unless $dxchan->{beep};
+		if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+			$dxchan->send($s);	
+		} else {
+			$dxchan->delay($s);
+		}
 	}
 }