X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=4b7e1d9f3cafffd3e6e53680dc5fcd3c8f7cb0e3;hb=412fb1b9e4070d7791f4e986b55bbc0c06f612ea;hp=ab1e7572b45c426a374cbebd3da369d1100ec6d7;hpb=775fd16897916dccc374098ba6130b0f8858b636;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ab1e7572..4b7e1d9f 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -34,7 +34,14 @@ use Route;
 use Route::Node;
 
 use strict;
-use vars qw($me $pc11_max_age $pc23_max_age
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+use vars qw($me $pc11_max_age $pc23_max_age $last_pc50
 			$last_hour $last10 %eph  %pings %rcmds
 			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist);
@@ -52,7 +59,7 @@ $censorpc = 1;					# Do a BadWords::check on text fields and reject things
 $baddx = new DXHash "baddx";
 $badspotter = new DXHash "badspotter";
 $badnode = new DXHash "badnode";
-$last10 = time;
+$last10 = $last_pc50 = time;
 
 @checklist = 
 (
@@ -213,18 +220,21 @@ sub start
 	# remember type of connection
 	$self->{consort} = $line;
 	$self->{outbound} = $sort eq 'O';
-	$self->{priv} = $user->priv || 1;     # other clusters can always be 'normal' users
+	my $priv = $user->priv;
+	$priv = $user->priv(1) unless $priv;
+	$self->{priv} = $priv;     # other clusters can always be 'normal' users
 	$self->{lang} = $user->lang || 'en';
 	$self->{isolate} = $user->{isolate};
 	$self->{consort} = $line;	# save the connection type
 	$self->{here} = 1;
+	$self->{width} = 80;
 
 	# get the output filters
 	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
 	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
 	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
 	$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
-	$self->{routefilter} = Filter::read_in('route', $call, 0) || Filter::read_in('route', 'node_default', 0) ;
+	$self->{routefilter} = Filter::read_in('route', $call, 0) || Filter::read_in('route', 'node_default', 0) unless $self->{isolate} ;
 
 
 	# get the INPUT filters (these only pertain to Clusters)
@@ -232,7 +242,7 @@ sub start
 	$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1) || Filter::read_in('wwv', 'node_default', 1);
 	$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
 	$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
-	$self->{inroutefilter} = Filter::read_in('route', $call, 1) || Filter::read_in('route', 'node_default', 1);
+	$self->{inroutefilter} = Filter::read_in('route', $call, 1) || Filter::read_in('route', 'node_default', 1) unless $self->{isolate};
 	
 	# set unbuffered and no echo
 	$self->send_now('B',"0");
@@ -569,7 +579,7 @@ sub normal
 						$r->flags($flags);
 						push @rout, $r;
 					}
-					$r->addparent($ncall);
+					$r->addparent($parent);
 				} else {
 					push @rout, $parent->add_user($call, $flags);
 				}
@@ -617,11 +627,17 @@ sub normal
 				dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
 				return;
 			}
+			my $uref = Route::User::get($ucall);
+			unless ($uref) {
+				dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+				return;
+			}
+			
 
 			# input filter if required
 			return unless $self->in_filter_route($parent);
-
-			my @rout = $parent->del_user($ucall);
+			
+			my @rout = $parent->del_user($uref);
 
 			if (eph_dup($line)) {
 				dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
@@ -716,7 +732,7 @@ sub normal
 					$user = DXUser->new($call);
 					$user->sort('A');
 					$user->priv(1);                   # I have relented and defaulted nodes
-					$self->{priv} = 1;                # to user RCMDs allowed
+					$user->lockout(1);
 					$user->homenode($call);
 					$user->node($call);
 				}
@@ -856,7 +872,7 @@ sub normal
 				return;
 			}
 
-			Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
+			Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[2]");
 			
 			# spots
 			if ($field[3] > 0) {
@@ -1113,20 +1129,22 @@ sub process
 	my $t = time;
 	my @dxchan = DXChannel->get_all();
 	my $dxchan;
+	my $pc50s;
 	
+	# send out a pc50 on EVERY channel all at once
+	if ($t >= $last_pc50 + $DXProt::pc50_interval) {
+		$pc50s = pc50($me, scalar DXChannel::get_all_users);
+		eph_dup($pc50s);
+		$last_pc50 = $t;
+	}
+
 	foreach $dxchan (@dxchan) {
 		next unless $dxchan->is_node();
 		next if $dxchan == $me;
-		
-		# send a pc50 out on this channel
-		$dxchan->{pc50_t} = $main::systime unless exists $dxchan->{pc50_t};
-		if ($t >= $dxchan->{pc50_t} + $DXProt::pc50_interval) {
-			my $s = pc50($me, scalar DXChannel::get_all_users);
-			eph_dup($s);
-			$dxchan->send($s);
-			$dxchan->{pc50_t} = $t;
-		} 
 
+		# send the pc50
+		$dxchan->send($pc50s) if $pc50s;
+		
 		# send a ping out on this channel
 		if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
 			if ($dxchan->{nopings} <= 0) {
@@ -1718,7 +1736,6 @@ sub disconnect
 	my $node = Route::Node::get($call);
 	my @rout;
 	if ($node) {
-#		@rout = $node->del_nodes;    # at the next level
 		@rout = $node->del($main::routeroot);
 	}