X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=f50b1e14907ea67133bf96b408ad1f89ed47d7c0;hb=3643ef870e040d437448632209039477eac4e52c;hp=35aae2e5ed6a4b6114c7aa7c10eeefca2e57501d;hpb=b4826d1f4125788e14fed3adbb99e66242904e74;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 35aae2e5..f50b1e14 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -80,6 +80,7 @@ sub start
 	}
 	$self->state('init');
 	$self->pc50_t(time);
+
 	Log('DXProt', "$call connected");
 }
 
@@ -160,7 +161,7 @@ sub normal
 				my @list;
 				
 				if ($field[4] eq '*') {	# sysops
-					$target = "Sysops";
+					$target = "SYSOP";
 					@list = map { $_->priv >= 5 ? $_ : () } get_all_users();
 				} elsif ($field[4] gt ' ') { # speciality list handling
 					my ($name) = split /\./, $field[4]; 
@@ -204,6 +205,7 @@ sub normal
 			last SWITCH if !$node; # ignore if havn't seen a PC19 for this one yet
 			my $i;
 			
+			
 			for ($i = 2; $i < $#field; $i++) {
 				my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (-) (\d)/o;
 				next if length $call < 3;
@@ -218,8 +220,9 @@ sub normal
 				$call =~ s/-\d+$//o;        # remove ssid for users
 				my $user = DXUser->get_current($call);
 				$user = DXUser->new($call) if !$user;
-				$user->node($node->call);
 				$user->homenode($node->call) if !$user->homenode;
+				$user->node($node->call);
+				$user->lastin($main::systime);
 				$user->put;
 			}
 			
@@ -267,10 +270,13 @@ sub normal
 				if (!$user) {
 					$user = DXUser->new($call);
 					$user->sort('A');
-					$user->node($call);
+					$user->priv(1);                   # I have relented and defaulted nodes
+					$self->{priv} = 1;                # to user RCMDs allowed
 					$user->homenode($call);
-					$user->put;
+					$user->node($call);
 				}
+				$user->lastin($main::systime);
+				$user->put;
 			}
 			
 			# queue up any messages
@@ -321,7 +327,7 @@ sub normal
 			last SWITCH;
 		}
 		
-		if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42) { # mail/file handling
+		if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
 			DXMsg::process($self, $line);
 			return;
 		}
@@ -330,15 +336,19 @@ sub normal
 			if ($field[1] eq $main::mycall) {
 				my $ref = DXUser->get_current($field[2]);
 				Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
-				if ($ref->{priv}) {	# you have to have SOME privilege, the commands have further filtering
-					$self->{remotecmd} = 1; # for the benefit of any command that needs to know
-					my @in = (DXCommandmode::run_cmd($self, $field[3]));
-					for (@in) {
-						s/\s*$//og;
-						$self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
-						Log('rcmd', 'out', $field[2], $_);
+				unless ($field[3] =~ /rcmd/i) {    # not allowed to relay RCMDS!
+					if ($ref->{priv}) {	# you have to have SOME privilege, the commands have further filtering
+						$self->{remotecmd} = 1; # for the benefit of any command that needs to know
+						my @in = (DXCommandmode::run_cmd($self, $field[3]));
+						for (@in) {
+							s/\s*$//og;
+							$self->send(pc35($main::mycall, $field[2], "$main::mycall:$_"));
+							Log('rcmd', 'out', $field[2], $_);
+						}
+						delete $self->{remotecmd};
 					}
-					delete $self->{remotecmd};
+				} else {
+					$self->send(pc35($main::mycall, $field[2], "$main::mycall:Tut tut tut...!"));
 				}
 			} else {
 				route($field[1], $line);
@@ -415,9 +425,6 @@ sub normal
 		if ($pcno == 48) {
 			last SWITCH;
 		}
-		if ($pcno == 49) {
-			last SWITCH;
-		}
 		
 		if ($pcno == 50) {		# keep alive/user list
 			my $ref = DXCluster->get_exact($field[1]);
@@ -528,6 +535,7 @@ sub finish
 	
 	# now broadcast to all other ak1a nodes that I have gone
 	broadcast_ak1a(pc21($call, 'Gone.'), $self);
+	
 	Log('DXProt', $call . " Disconnected");
 	$ref->del() if $ref;
 }