X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=056402b9501257fc410ba747e72bfb3e49949e9b;hb=363839f98405239478bbe5a85efad1d679a1c722;hp=ed8d2e5bf67c10c5d87914e50c4ff62916f335a5;hpb=ece0b001419b8e755540eaff4ce3a558fd7d939f;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ed8d2e5b..056402b9 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");
@@ -244,15 +254,14 @@ sub start
 	$self->{pingint} = $ping;
 	$self->{nopings} = $user->nopings || 2;
 	$self->{pingtime} = [ ];
-	$self->{pingave} = 0;
+	$self->{pingave} = 999;
+	$self->{lastping} = $main::systime;
 
 	# send initialisation string
 	unless ($self->{outbound}) {
 		$self->send(pc18());
-		$self->{lastping} = $main::systime;
-	} else {
-		$self->{lastping} = $main::systime + ($self->pingint / 2);
 	}
+	
 	$self->state('init');
 	$self->{pc50_t} = $main::systime;
 
@@ -422,7 +431,7 @@ sub normal
 					my $node;
 					my $to = $user->homenode;
 					my $last = $user->lastoper || 0;
-					if ($to ne $main::mycall && $send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = Route::Node::get($to)) ) {
+					if ($send_opernam && $to && $to ne $main::mycall && $main::systime > $last + $DXUser::lastoperinterval && ($node = Route::Node::get($to)) ) {
 						my $cmd = "forward/opernam $spot[4]";
 						# send the rcmd but we aren't interested in the replies...
 						my $dxchan = $node->dxchan;
@@ -561,7 +570,15 @@ sub normal
 				
 				$conf = $conf eq '*';
 
-				my $r = Route::User::get($call);
+				# reject this if we think it is a node already
+				my $r = Route::Node::get($call);
+				my $u = DXUser->get_current($call) unless $r;
+				if ($r || ($u && $u->is_node)) {
+					dbg("PCPROT: $call is a node") if isdbg('chanerr');
+					next;
+				}
+				
+				$r = Route::User::get($call);
 				my $flags = Route::here($here)|Route::conf($conf);
 				
 				if ($r) {
@@ -569,7 +586,7 @@ sub normal
 						$r->flags($flags);
 						push @rout, $r;
 					}
-					$r->addparent($ncall);
+					$r->addparent($parent);
 				} else {
 					push @rout, $parent->add_user($call, $flags);
 				}
@@ -612,16 +629,22 @@ sub normal
 				dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
 				return;
 			}
+
+			my $uref = Route::User::get($ucall);
+			unless ($uref) {
+				dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+				return;
+			}
 			my $parent = Route::Node::get($ncall);
 			unless ($parent) {
 				dbg("PCPROT: Route::Node $ncall 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');
@@ -638,7 +661,7 @@ sub normal
 			# first clear out any nodes on this dxchannel
 			my $parent = Route::Node::get($self->{call});
 			my @rout = $parent->del_nodes;
-			$self->route_pc21(@rout, $parent);
+			$self->route_pc21(@rout, $parent) if @rout;
 			$self->send_local_config();
 			$self->send(pc20());
 			return;             # we don't pass these on
@@ -716,7 +739,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);
 				}
@@ -737,6 +760,7 @@ sub normal
 			$self->send_local_config();
 			$self->send(pc22());
 			$self->state('normal');
+			$self->{lastping} = 0;
 			return;
 		}
 		
@@ -782,6 +806,7 @@ sub normal
 		
 		if ($pcno == 22) {
 			$self->state('normal');
+			$self->{lastping} = 0;
 			return;
 		}
 				
@@ -856,7 +881,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) {
@@ -920,6 +945,11 @@ sub normal
 #			my $ref = Route::get($call) || Route->new($call);
 #			return unless $self->in_filter_route($ref);
 
+			if ($field[3] eq $field[2]) {
+				dbg('PCPROT: invalid value') if isdbg('chanerr');
+				return;
+			}
+
 			# add this station to the user database, if required
 			my $user = DXUser->get_current($call);
 			$user = DXUser->new($call) if !$user;
@@ -1016,7 +1046,12 @@ sub normal
 									for (@{$tochan->{pingtime}}) {
 										$st += $_;
 									}
-									$tochan->{pingave} = $st / @{$tochan->{pingtime}};
+									if (@{$tochan->{pingtime}} == 1) {
+										$tochan->{pingave} = $t;
+									} else {
+										$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 8);
+									}
+#									$tochan->{pingave} = $st / @{$tochan->{pingtime}};
 								}
 							} 
 						}
@@ -1108,20 +1143,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) {
@@ -1343,10 +1380,7 @@ sub send_announce
 	foreach $dxchan (@dxchan) {
 		next if $dxchan == $me;
 		next if $dxchan == $self && $self->is_node;
-		my $routeit;
-		my ($filter, $hops);
-
-		$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq)
+		$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 	}
 }
 
@@ -1357,6 +1391,7 @@ sub announce
 	my $isolate = shift;
 	my $to = shift;
 	my $target = shift;
+	my $text = shift;
 	my ($filter, $hops);
 
 	if ($self->{annfilter}) {
@@ -1384,7 +1419,7 @@ sub send_local_config
 		# create a list of all the nodes that are not connected to this connection
 		# and are not themselves isolated, this to make sure that isolated nodes
         # don't appear outside of this node
-		my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes();
+		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
 		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
 		my @intcalls = map { $_->nodes } @localnodes if @localnodes;
 		my $ref = Route::Node::get($self->{call});
@@ -1705,6 +1740,8 @@ sub disconnect
 	my $pc39flag = shift;
 	my $call = $self->call;
 
+	return if $self->{disconnecting}++;
+	
 	unless ($pc39flag && $pc39flag == 1) {
 		$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
 	}
@@ -1713,7 +1750,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);
 	}
 	
@@ -1767,7 +1803,7 @@ sub send_route
 	for (; @_ && $no; $no--) {
 		my $r = shift;
 		
-		if ($self->{routefilter}) {
+		if (!$self->{isolate} && $self->{routefilter}) {
 			$filter = undef;
 			if ($r) {
 				($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
@@ -1780,7 +1816,7 @@ sub send_route
 				dbg("was sent a null value") if isdbg('chanerr');
 			}
 		} else {
-			push @rin, $r;
+			push @rin, $r unless $self->{isolate} && $r->call ne $main::mycall;
 		}
 	}
 	if (@rin) {
@@ -1805,13 +1841,11 @@ sub broadcast_route
 	my $dxchan;
 	my $line;
 	
-	foreach $dxchan (@dxchan) {
-		next if $dxchan == $self;
-		next if $dxchan == $me;
-		if ($dxchan->{routefilter}) {
+	unless ($self->{isolate}) {
+		foreach $dxchan (@dxchan) {
+			next if $dxchan == $self;
+			next if $dxchan == $me;
 			$dxchan->send_route($generate, @_);
-		} else {
-			$dxchan->send_route($generate, @_) unless $self->{isolate} || $dxchan->{isolate};
 		}
 	}
 }