From: Dirk Koopman <djk@tobit.co.uk>
Date: Tue, 30 Apr 2024 12:25:23 +0000 (+0100)
Subject: fixes for priv and lockout status on nodes.
X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=cc9c30938b63e913b096a64d2b737a6ffceffa88;p=spider.git

fixes for priv and lockout status on nodes.
---

diff --git a/Changes b/Changes
index 4161d2ac..ca517916 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,18 @@
+30Apr24======================================================================
+1. "Fix" PC92 and PC19 node user creation and modification such that non-
+   connected nodes or nodes that DON'T have sysop altered privilege and
+   lockout status are set to priv 1 and are locked out. This will also alter
+   historical mistakes and *may* bring the user file back into alignment with
+   current thinking. Just like the last couple of times this has been 
+   attempted - hurrumph! Thanks to Luigi IK5ZUK for the headsup. 
+
+   There have been extensive debug message changes that are now emitted and 
+   can be tracked with: watchdbg 'user|update'
+29Apr24======================================================================
+1. New bands.pl produced with most of the work done by Andy G4PIQ and 
+   Kin EA3CV.
+2. The RBN module will now take data directly from SkimmerServers. Thanks to
+   Frank DL2CC.
 20Apr24======================================================================
 1. Try to "fix" Spot deduping (again). This is probably Work In Progress...
 2. A new(er) band.pl gratefully received from Andy G4PIQ.
diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 6403ba65..dc27225d 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -939,6 +939,7 @@ sub check_add_user
 	my $call = shift;
 	my $type = shift;
 	my $homenode = shift;
+	my $changed = 0;
 
 	# add this station to the user database, if required (don't remove SSID from nodes)
 	my $user = DXUser::get_current($call);
@@ -947,25 +948,27 @@ sub check_add_user
 		$user->sort($type || 'U');
 		if ($user->is_node) {
 			$user->priv(1);		# I have relented and defaulted nodes
-			$user->lockout(1) if $user->is_node;
+			$user->lockout(1);
 		} else {
 			$user->homenode($homenode) if $homenode;
 			$user->node($homenode);
 			$user->priv(0);
+			$user->lockout(0);
 		}
 		$user->lastin($main::systime); # this makes it last longer than just this invocation
-		$user->put;				# just to make sure it gets written away!!!
+		++$changed;
 		dbg(sprintf "DXProt: PC92 new user record for $call created type: %s priv: %d lockout: %d", $user->sort, $user->priv, $user->lockout);
 	}
 
 	# this is to fix a problem I introduced some build ago by using this function for users
 	# whereas it was only being used for nodes.
-	if ($user->is_user && $user->lockout && ($user->priv // 0) == 1) {
+	if ($user->is_user && $user->lockout && ($user->priv || 0) == 1) {
+		dbg(sprintf "DXProt: PC92 user record for $call type: %s priv: %d lockout: %d updated, depriv'd and unlocked", $user->sort, $user->priv, $user->lockout);
 		$user->priv(0);
 		$user->lockout(0);
-		dbg("DXProt: PC92 user record for $call depriv'd and unlocked");
-		$user->put;
+		++$changed;
 	}
+	$user->put if $changed;				# just to make sure it gets written away!!!
 	return $user;
 }
 
@@ -1045,14 +1048,6 @@ sub handle_19
 			dbgprintring(3) if isdbg('nologchan');
 			next;
 		}
-		
-		my $user = check_add_user($call, 'A');
-
-#		if (eph_dup($genline)) {
-#			dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
-#			next;
-#		}
-
 
 		unless ($h) {
 			if ($parent->via_pc92) {
@@ -1061,6 +1056,7 @@ sub handle_19
 			}
 		}
 
+		my $user = check_add_user($call, 'A');
 		my $r = Route::Node::get($call);
 		my $flags = Route::here($here)|Route::conf($conf);
 
@@ -1829,7 +1825,7 @@ sub _add_thingy
 			}
 			if ($is_node) {
 				dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
-				$user = check_add_user($call, 'A');
+				$user = check_add_user($call, 'S');
 				@rout = $parent->add($call, $version, Route::here($here), $ip);
 				$r = Route::Node::get($call);
 				$r->PC92C_dxchan($dxchan->call, $hops) if $r;
@@ -2210,12 +2206,18 @@ sub handle_92
 					++$changed;
 				}
 				if ($oldsort ne 'S') {
-					dbg("PCPROT: PC92 K rec, node $call updated sort: $sort (was $oldsort)");
 					$user->sort('S');
-					++$changed;
+					unless (DXChannel::get($user->call)) { # only do this if not connected
+						my $oldpriv = $user->priv;
+						my $oldlock = $user->lockout;
+						$user->priv(1) unless defined $oldpriv && $oldpriv;
+						$user->lockout(1) unless defined $oldlock;
+						dbg(sprintf "PCPROT: PC92 K rec, node $call updated sort: $oldsort->S priv: '$oldpriv'->%d lockout: '$oldlock'->%s", $user->priv || 0, $user->lockout || 0);
+						++$changed;
+					}
 				}
 				unless ($user->K) {
-					dbg("PCPROT: PC92 K rec, node $call updated - marked as sending PC92 K records ");
+					dbg(sprintf "PCPROT: PC92 K rec, node $call updated - marked as sending PC92 K records priv: %d lockout: %d ", $user->priv || 0, $user->lockout || 0);
 					$user->K(1);
 					++$changed;
 				}