--- loncom/lond	2002/10/30 14:50:04	1.103
+++ loncom/lond	2003/01/15 04:43:14	1.106
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.103 2002/10/30 14:50:04 www Exp $
+# $Id: lond,v 1.106 2003/01/15 04:43:14 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,13 +54,13 @@
 # 02/19 Matthew Hall
 # 02/25 Gerd Kortemeyer
 # 05/11 Scott Harrison
+# 01/xx/2003 Ron Fox.. Remove preforking.  This makes the general daemon
+#      logic simpler (and there were problems maintaining the preforked
+#      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.
 ###
 
-# based on "Perl Cookbook" ISBN 1-56592-243-3
-# preforker - server who forks first
-# runs as a daemon
-# HUPs
-# uses IDEA encryption
 
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
@@ -491,37 +491,35 @@ close(PIDSAVE);
 &logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");
 &status('Starting');
 
-# ------------------------------------------------------- Now we are on our own
-    
-# Fork off our children.
-for (1 .. $PREFORK) {
-    make_new_child();
-}
+
 
 # ----------------------------------------------------- Install signal handlers
 
-&status('Forked children');
 
 $SIG{CHLD} = \&REAPER;
 $SIG{INT}  = $SIG{TERM} = \&HUNTSMAN;
 $SIG{HUP}  = \&HUPSMAN;
 $SIG{USR1} = \&checkchildren;
 
-# And maintain the population.
+
+
+# --------------------------------------------------------------
+#   Accept connections.  When a connection comes in, it is validated
+#   and if good, a child process is created to process transactions
+#   along the connection.
+
 while (1) {
-    &status('Sleeping');
-    sleep;                          # wait for a signal (i.e., child's death)
-    &logthis('Woke up');
-    &status('Woke up');
-    for ($i = $children; $i < $PREFORK; $i++) {
-        make_new_child();           # top up the child pool
-    }
+    $client = $server->accept() or next;
+    make_new_child($client);
 }
 
 sub make_new_child {
+    my $client;
     my $pid;
     my $cipher;
     my $sigset;
+
+    $client = shift;
     &logthis("Attempting to start child");    
     # block signal for fork
     $sigset = POSIX::SigSet->new(SIGINT);
@@ -555,10 +553,6 @@ sub make_new_child {
         &Authen::Krb5::init_context();
         &Authen::Krb5::init_ets();
 
-        # handle connections until we've reached $MAX_CLIENTS_PER_CHILD
-        for ($i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
-            &status('Idle, waiting for connection');
-            $client = $server->accept()     or last;
             &status('Accepted connection');
 # =============================================================================
             # do something with the connection
@@ -566,7 +560,7 @@ sub make_new_child {
 	    $client->sockopt(SO_KEEPALIVE, 1);# Enable monitoring of
 	                                      # connection liveness.
             # see if we know client and check for spoof IP by challenge
-            my $caller=getpeername($client);
+		my $caller = getpeername($client);
             my ($port,$iaddr)=unpack_sockaddr_in($caller);
             my $clientip=inet_ntoa($iaddr);
             my $clientrec=($hostid{$clientip} ne undef);
@@ -721,13 +715,22 @@ sub make_new_child {
 			      }
 			      }
                           } elsif ($howpwd eq 'krb4') {
-                             $null=pack("C",0);
-			     unless ($upass=~/$null/) {
-                              $pwdcorrect=(
-                                 Authen::Krb4::get_pw_in_tkt($uname,"",
-                                        $contentpwd,'krbtgt',$contentpwd,1,
-							     $upass) == 0);
-			     } else { $pwdcorrect=0; }
+                              $null=pack("C",0);
+                              unless ($upass=~/$null/) {
+                                  my $krb4_error = &Authen::Krb4::get_pw_in_tkt
+                                      ($uname,"",$contentpwd,'krbtgt',
+                                       $contentpwd,1,$upass);
+                                  if (!$krb4_error) {
+                                      $pwdcorrect = 1;
+                                  } else { 
+                                      $pwdcorrect=0; 
+                                      # log error if it is not a bad password
+                                      if ($krb4_error != 62) {
+       &logthis('krb4:'.$uname.','.$contentpwd.','.
+                &Authen::Krb4::get_err_txt($Authen::Krb4::error));
+                                      }
+                                  }
+                              }
                           } elsif ($howpwd eq 'krb5') {
 			      $null=pack("C",0);
 			      unless ($upass=~/$null/) {
@@ -1218,6 +1221,48 @@ sub make_new_child {
                        } else {
                            print $client "error:$!\n";
                        }
+# ----------------------------------------------------------------- dumpcurrent
+                   } elsif ($userinput =~ /^dumpcurrent/) {
+                       my ($cmd,$udom,$uname,$namespace)
+                          =split(/:/,$userinput);
+                       $namespace=~s/\//\_/g;
+                       $namespace=~s/\W//g;
+                       my $qresult='';
+                       my $proname=propath($udom,$uname);
+                       if (tie(%hash,'GDBM_File',
+                               "$proname/$namespace.db",
+                               &GDBM_READER(),0640)) {
+                           # Structure of %data:
+                           # $data{$symb}->{$parameter}=$value;
+                           # $data{$symb}->{'v.'.$parameter}=$version;
+                           # since $parameter will be unescaped, we do not
+                           # have to worry about silly parameter names...
+                           my %data = ();
+                           while (my ($key,$value) = each(%hash)) {
+                              my ($v,$symb,$param) = split(/:/,$key);
+                              next if ($v eq 'version' || $symb eq 'keys');
+                              next if (exists($data{$symb}) && 
+                                       exists($data{$symb}->{$param}) &&
+                                       $data{$symb}->{'v.'.$param} > $v);
+                              #&logthis("v = ".$v." p = ".$param." s = ".$symb);
+                              $data{$symb}->{$param}=$value;
+                              $data{$symb}->{'v.'.$param}=$value;
+                           }
+                           if (untie(%hash)) {
+                             while (my ($symb,$param_hash) = each(%data)) {
+                               while(my ($param,$value) = each (%$param_hash)){
+                                 next if ($param =~ /^v\./);
+                                 $qresult.=$symb.':'.$param.'='.$value.'&';
+                               }
+                             }
+                             chop($qresult);
+                             print $client "$qresult\n";
+                           } else {
+                             print $client "error:$!\n";
+                           }
+                       } else {
+                           print $client "error:$!\n";
+                       }
 # ------------------------------------------------------------------------ dump
                    } elsif ($userinput =~ /^dump/) {
                        my ($cmd,$udom,$uname,$namespace,$regexp)
@@ -1495,21 +1540,19 @@ sub make_new_child {
                 &logthis("<font color=blue>WARNING: "
                 ."Rejected client $clientip, closing connection</font>");
             }
-	}              
+	}             
 
 # =============================================================================
        
 	&logthis("<font color=red>CRITICAL: "
 		 ."Disconnect from $clientip ($hostid{$clientip})</font>");    
-        # tidy up gracefully and finish
-    
-        $server->close();
+
 
         # this exit is VERY important, otherwise the child will become
         # a producer of more and more children, forking yourself into
         # process death.
         exit;
-    }
+    
 }