X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=a6982f1f2bf53a47025e22200556f58c7ba39522;hb=26622cd57a1f5b29f9e22092cd4149c9a1e30dc6;hp=ff891427079e0da82419badd01176534a9be815e;hpb=b4902de2965ded18eadc0588d24130b62274eec0;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ff891427..a6982f1f 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -22,12 +22,15 @@ use DXLog;
 use Spot;
 use DXProtout;
 use DXDebug;
+use Filter;
 use Local;
 
 use Carp;
 
 use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age %spotdup %wwvdup $last_hour %pings %rcmds %nodehops);
+use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age 
+			%spotdup %wwvdup $last_hour %pings %rcmds 
+			%nodehops @baddx $baddxfn);
 
 $me = undef;					# the channel id for this cluster
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
@@ -39,7 +42,9 @@ $last_hour = time;				# last time I did an hourly periodic update
 %pings = ();                    # outstanding ping requests outbound
 %rcmds = ();                    # outstanding rcmd requests outbound
 %nodehops = ();                 # node specific hop control
+@baddx = ();                    # list of illegal spotted callsigns
 
+$baddxfn = "$main::data/baddx.pl";
 
 sub init
 {
@@ -69,6 +74,9 @@ sub init
 		$wwvdup{$dupkey} = $_->[1];
 	}
 
+	# load the baddx file
+	do "$baddxfn" if -e "$baddxfn";
+	print "$@\n" if $@;
 }
 
 #
@@ -99,6 +107,11 @@ sub start
 	$self->{isolate} = $user->{isolate};
 	$self->{consort} = $line;	# save the connection type
 	$self->{here} = 1;
+
+	# get the filters
+	$self->{spotfilter} = Filter::read_in('spots', $call);
+	$self->{wwvfilter} = Filter::read_in('wwv', $call);
+	$self->{annfilter} = Filter::read_in('ann', $call);
 	
 	# set unbuffered
 	$self->send_now('B',"0");
@@ -189,27 +202,64 @@ sub normal
 			}
 			
 			$spotdup{$dupkey} = $d;
+
+			# is it 'baddx'
+			if (grep $field[2] eq $_, @baddx) {
+				dbg('chan', "Bad DX spot, ignored");
+				return;
+			}
 			
-			my $spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
+			my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
+
+            #
+			# @spot at this point contains:-
+            # freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node
+			# then  spotted itu, spotted cq, spotters itu, spotters cq
+			# you should be able to route on any of these
+            #
 			
 			# local processing 
 			my $r;
 			eval {
-				$r = Local::spot($self, $freq, $field[2], $d, $text, $spotter, $field[7]);
+				$r = Local::spot($self, @spot);
 			};
 #			dbg('local', "Local::spot1 error $@") if $@;
 			return if $r;
 
+			# DON'T be silly and send on PC26s!
+			return if $pcno == 26;
+
+			# send out the filtered spots
+			my @dxchan = get_all_ak1a();
+			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) {
+				next if $dxchan == $self;
+				my $routeit;
+				my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @spot, $self->{call} ) if $dxchan->{spotfilter};
+				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};
+				}					
+			}
+
 			# send orf to the users
-			if ($spot && $pcno == 11) {
+			if (@spot) {
 				my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
-				broadcast_users("$buf\a\a", 'dx', $spot);
+				broadcast_users("$buf\a\a", 'dx', $spot[0]);
 			}
 
-			# DON'T be silly and send on PC26s!
-			return if $pcno == 26;
-			
-			last SWITCH;
+			return;
 		}
 		
 		if ($pcno == 12) {		# announces
@@ -354,6 +404,7 @@ sub normal
 			
 			# queue mail
 			DXMsg::queue_msg(0);
+
 			return;
 		}
 		
@@ -405,7 +456,7 @@ sub normal
 			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 );
+			broadcast_users("WWV de $field[7] <$field[2]>:   SFI=$sfi, A=$k, K=$i, $field[6]", 'wwv', $wwv );
 			last SWITCH;
 		}
 		
@@ -672,8 +723,11 @@ sub send_local_config
 		@nodes = (DXCluster->get_exact($main::mycall));
 	} else {
 		# create a list of all the nodes that are not connected to this connection
-		@nodes = DXNode::get_all();
+		# and are not themselves isolated, this to make sure that isolated nodes
+        # don't appear outside of this node
+		@nodes = DXNode::get_all(); 
 		@nodes = grep { $_->dxchan != $self } @nodes;
+		@nodes = grep { !($_->dxchan && $_->dxchan->isolate) } @nodes;
 	}
 
 	my @s = $me->pc19(@nodes);
@@ -758,13 +812,19 @@ sub broadcast_list
 	my $dxchan;
 	
 	foreach $dxchan (@_) {
+		my $filter = 1;
 		
-		next if $sort eq 'dx' && !$dxchan->{dx};
+		if ($sort eq 'dx') {
+		    next unless $dxchan->{dx};
+			($filter) = Filter::it($dxchan->{spotfilter}, @{$fref}) if ref $fref;
+			next unless $filter;
+		}
 		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 {