X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=a607b4094151155fb7edd7553c435ae0e08f2d34;hb=bdea2174f3035fb9b75858dc1d6e2be47b1e8fc1;hp=2e22bc91132f1355e39f9311f4744f0605bd9679;hpb=f848867867d9bcd3a87603bd7a3a3a2b81c781d5;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 2e22bc91..a607b409 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -53,7 +53,7 @@ $baddxfn = "$main::data/baddx.pl";
 (
  [ qw(c c m p bc c) ],			# pc10
  [ qw(f m d t m c c h) ],		# pc11
- [ qw(c bc m bp c p h) ],		# pc12
+ [ qw(c bc m bp bm p h) ],		# pc12
  [ qw(c h) ],					# 
  [ qw(c h) ],					# 
  [ qw(c m h) ],					# 
@@ -67,8 +67,8 @@ $baddxfn = "$main::data/baddx.pl";
  [ qw(d n n n n m c c h) ],		# pc23
  [ qw(c p h) ],					# pc24
  [ qw(c c n n) ],				# pc25
- [ qw(f m d t m c c) ],			# pc26
- [ qw(d n n n n m c c) ],		# pc27
+ [ qw(f m d t m c c bc) ],		# pc26
+ [ qw(d n n n n m c c bc) ],	# pc27
  [ qw(c c c c d t p m bp n p bp bc) ], # pc28
  [ qw(c c n m) ],				# pc29
  [ qw(c c n) ],					# pc30
@@ -141,7 +141,7 @@ sub check
 	
 	my $i;
 	shift;    # not interested in the first field
-	for ($i = 0; $i < @_; $i++) {
+	for ($i = 0; $i < @$ref; $i++) {
 		my ($blank, $act) = $$ref[$i] =~ /^(b?)(\w)$/;
 		return 0 unless $act;
 		next if $blank && $_[$i] =~ /^[ \*]$/;
@@ -175,16 +175,16 @@ sub init
 	$me->{state} = "indifferent";
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
-	#  $me->{sort} = 'M';    # M for me
+	$me->{sort} = 'S';    # S for spider
 
 	# now prime the spot and wwv  duplicates file with data
-    my @today = Julian::unixtoj(time);
-	for (Spot::readfile(@today), Spot::readfile(Julian::sub(@today, 1))) {
-		Spot::dup(@{$_}[0..3]);
-	}
-	for (Geomag::readfile(time)) {
-		Geomag::dup(@{$_}[1..5]);
-	}
+#    my @today = Julian::unixtoj(time);
+#	for (Spot::readfile(@today), Spot::readfile(Julian::sub(@today, 1))) {
+#		Spot::dup(@{$_}[0..3]);
+#	}
+#	for (Geomag::readfile(time)) {
+#		Geomag::dup(@{$_}[1..5]);
+#	}
 
 	# load the baddx file
 	do "$baddxfn" if -e "$baddxfn";
@@ -422,7 +422,7 @@ sub normal
 			# announce duplicate checking
 			$field[3] =~ s/^\s+//;  # remove leading blanks
 			if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-				dbg('chan', "Duplicate Announce ignored\n");
+				dbg('chan', "Duplicate Announce ignored");
 				return;
 			}
 			
@@ -886,6 +886,13 @@ sub normal
 			return;
 		}
 
+		if ($pcno == 75) {		# dunno but route it
+			if ($field[1] ne $main::mycall) {
+				$self->route($field[1], $line);
+			}
+			return;
+		}
+
 		if ($pcno == 73) {  # WCY broadcasts
 			
 			# do some de-duping
@@ -1027,9 +1034,9 @@ sub process
 	my $val;
 	my $cutoff;
 	if ($main::systime - 3600 > $last_hour) {
-		Spot::process;
-		Geomag::process;
-		AnnTalk::process;
+#		Spot::process;
+#		Geomag::process;
+#		AnnTalk::process;
 		$last_hour = $main::systime;
 	}
 }
@@ -1259,7 +1266,10 @@ sub send_announce
 				$dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
 				
 			}
-		} elsif ($dxchan->is_user && $dxchan->{ann}) {
+		} elsif ($dxchan->is_user) {
+			unless ($dxchan->{ann}) {
+				next if $_[0] ne $main::myalias && $_[0] ne $main::mycall;
+			}
 			next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
 			my $buf = "$to$target de $_[0]: $text";
 			$buf .= "\a\a" if $dxchan->{beep};