--- loncom/lond	2003/08/12 03:28:31	1.134
+++ loncom/lond	2003/08/22 16:07:11	1.138
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.134 2003/08/12 03:28:31 albertel Exp $
+# $Id: lond,v 1.138 2003/08/22 16:07:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,6 +50,13 @@
 #      population).  Since the time averaged connection rate is close to zero
 #      because lonc's purpose is to maintain near continuous connnections,
 #      preforking is not really needed.
+# 08/xx/2003 Ron Fox:  Add management requests.  Management requests
+#      will be validated via a call to ValidateManager. At present, this
+#      is done by simple host verification.  In the future we can modify
+#      this function to do a certificate check.
+#      Management functions supported include:
+#       - pushing /home/httpd/lonTabs/hosts.tab
+#       - pushing /home/httpd/lonTabs/domain.tab
 ###
 
 use strict;
@@ -74,7 +81,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.134 $'; #' stupid emacs
+my $VERSION='$Revision: 1.138 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -645,7 +652,7 @@ sub make_new_child {
 		   if ($userinput =~ /^ping/) {
                        print $client "$currenthostid\n";
 # ------------------------------------------------------------------------ pong
-		   } elsif ($userinput =~ /^pong/) {
+		   }elsif ($userinput =~ /^pong/) {
                        my $reply=&reply("ping",$hostid{$clientip});
                        print $client "$currenthostid:$reply\n"; 
 # ------------------------------------------------------------------------ ekey
@@ -676,6 +683,10 @@ sub make_new_child {
 		   } elsif ($userinput =~ /^userload/) {
 		       my $userloadpercent=&userload();
 		       print $client "$userloadpercent\n";
+
+#
+#        Transactions requiring encryption:
+#
 # ----------------------------------------------------------------- currentauth
 		   } elsif ($userinput =~ /^currentauth/) {
 		     if ($wasenc==1) {
@@ -690,6 +701,12 @@ sub make_new_child {
 		     } else {
 		       print $client "refused\n";
 		     }
+#--------------------------------------------------------------------- pushfile
+		   } elsif($userinput =~ /^pushfile/) { 
+		       print $client "ok\n";
+#--------------------------------------------------------------------- reinit
+		   } elsif($userinput =~ /^reinit/) {
+		       print $client "ok\n";
 # ------------------------------------------------------------------------ auth
                    } elsif ($userinput =~ /^auth/) {
 		     if ($wasenc==1) {
@@ -1726,6 +1743,19 @@ sub make_new_child {
                        }
                        if ($ulsout eq '') { $ulsout='empty'; }
                        print $client "$ulsout\n";
+# ----------------------------------------------------------------- setannounce
+                   } elsif ($userinput =~ /^setannounce/) {
+		       my ($cmd,$announcement)=split(/:/,$userinput);
+		       chomp($announcement);
+		       $announcement=&unescape($announcement);
+                       if (my $store=IO::File->new('>'.$perlvar{'lonDocRoot'}.
+						'/announcement.txt')) {
+			   print $store $announcement;
+                           close $store;
+			   print $client "ok\n";
+		       } else {
+			   print $client "error: ".($!+0)."\n";
+		       }
 # ------------------------------------------------------------------ Hanging up
                    } elsif (($userinput =~ /^exit/) ||
                             ($userinput =~ /^init/)) {
@@ -2098,8 +2128,8 @@ sub userload {
 	my $curtime=time;
 	while ($filename=readdir(LONIDS)) {
 	    if ($filename eq '.' || $filename eq '..') {next;}
-	    my ($atime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[8];
-	    if ($curtime-$atime < 3600) { $numusers++; }
+	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
+	    if ($curtime-$mtime < 3600) { $numusers++; }
 	}
 	closedir(LONIDS);
     }
@@ -2381,6 +2411,17 @@ Send along temporarily stored informatio
 
 List part of a user's directory.
 
+=item pushtable
+
+Pushes a file in /home/httpd/lonTab directory.  Currently limited to:
+hosts.tab and domain.tab. The old file is copied to  *.tab.backup but
+must be restored manually in case of a problem with the new table file.
+pushtable requires that the request be encrypted and validated via
+ValidateManager.  The form of the command is:
+enc:pushtable tablename <tablecontents> \n
+where pushtable, tablename and <tablecontents> will be encrypted, but \n is a 
+cleartext newline.
+
 =item Hanging up (exit or init)
 
 What to do when a client tells the server that they (the client)
@@ -2391,6 +2432,7 @@ are leaving the network.
 If B<lond> is sent an unknown command (not in the list above),
 it replys to the client "unknown_cmd".
 
+
 =item UNKNOWN CLIENT
 
 If the anti-spoofing algorithm cannot verify the client,