Diff for /loncom/Attic/lonc between versions 1.18 and 1.22

version 1.18, 2001/11/26 22:20:26 version 1.22, 2001/11/29 18:57:46
Line 5 Line 5
 # provides persistent TCP connections to the other servers in the network  # provides persistent TCP connections to the other servers in the network
 # through multiplexed domain sockets  # through multiplexed domain sockets
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # PID in subdir logs/lonc.pid  # PID in subdir logs/lonc.pid
 # kill kills  # kill kills
 # HUP restarts  # HUP restarts
Line 16 Line 40
 # 12/05 Scott Harrison  # 12/05 Scott Harrison
 # 12/05 Gerd Kortemeyer  # 12/05 Gerd Kortemeyer
 # 01/10/01 Scott Harrison  # 01/10/01 Scott Harrison
 # 03/14/01,03/15,06/12,11/26 Gerd Kortemeyer  # 03/14/01,03/15,06/12,11/26,11/27,11/28 Gerd Kortemeyer
 #   # 
 # based on nonforker from Perl Cookbook  # based on nonforker from Perl Cookbook
 # - server who multiplexes without forking  # - server who multiplexes without forking
Line 182  sub subreply { Line 206  sub subreply {
                                       Type    => SOCK_STREAM,                                        Type    => SOCK_STREAM,
                                       Timeout => 10)                                        Timeout => 10)
        or return "con_lost";         or return "con_lost";
     print $sclient "$cmd\n";  
     my $answer=<$sclient>;  
     chomp($answer);      $SIG{ALRM}=sub { die "timeout" };
     if (!$answer) { $answer="con_lost"; }      $SIG{__DIE__}='DEFAULT';
       eval {
        alarm(10);
        print $sclient "$cmd\n";
        $answer=<$sclient>;
        chomp($answer);
        alarm(0);
       };
       if ((!$answer) || ($@=~/timeout/)) { $answer="con_lost"; }
       $SIG{ALRM}='DEFAULT';
       $SIG{__DIE__}=\&catchexception;
  } else { $answer='self_reply'; }   } else { $answer='self_reply'; }
  return $answer;   return $answer;
 }  }
Line 344  unless ( Line 378  unless (
        sleep($st);         sleep($st);
        exit;          exit; 
      };       };
 # --------------------------------------- Send a ping to make other end do USR1  # ----------------------------------------------------------------- Init dialog
   
 &status("Init dialogue: $conserver");  &status("Init dialogue: $conserver");
   
        $SIG{ALRM}=sub { die "timeout" };
        $SIG{__DIE__}='DEFAULT';
        eval {
            alarm(60);
 print $remotesock "init\n";  print $remotesock "init\n";
 $answer=<$remotesock>;  $answer=<$remotesock>;
 print $remotesock "$answer";  print $remotesock "$answer";
 $answer=<$remotesock>;  $answer=<$remotesock>;
 chomp($answer);  chomp($answer);
             alarm(0);
        };
        $SIG{ALRM}='DEFAULT';
        $SIG{__DIE__}=\&catchexception;
    
        if ($@=~/timeout/) {
    &logthis("Timed out during init: $conserver");
            exit;
        }
   
   
 &logthis("Init reply for $conserver: >$answer<");  &logthis("Init reply for $conserver: >$answer<");
 if ($answer ne 'ok') {  if ($answer ne 'ok') {
        my $st=120+int(rand(240));         my $st=120+int(rand(240));
Line 422  if ($cipher=new IDEA $cipherkey) { Line 471  if ($cipher=new IDEA $cipherkey) {
             }              }
             $cmd="enc:$cmdlength:$encrequest\n";              $cmd="enc:$cmdlength:$encrequest\n";
         }          }
       $SIG{ALRM}=sub { die "timeout" };
       $SIG{__DIE__}='DEFAULT';
       eval {
           alarm(60);
         print $remotesock "$cmd\n";          print $remotesock "$cmd\n";
         $answer=<$remotesock>;          $answer=<$remotesock>;
  chomp($answer);   chomp($answer);
         if ($answer ne '') {          alarm(0);
       };
       $SIG{ALRM}='DEFAULT';
       $SIG{__DIE__}=\&catchexception;
   
           if (($answer ne '') && ($@!~/timeout/)) {
     unlink("$dfname");      unlink("$dfname");
             &logthis("Delayed $cmd to $conserver: >$answer<");              &logthis("Delayed $cmd to $conserver: >$answer<");
             &logperm("S:$conserver:$bcmd");              &logperm("S:$conserver:$bcmd");
Line 576  sub handle { Line 633  sub handle {
             }              }
             $request="enc:$cmdlength:$encrequest\n";              $request="enc:$cmdlength:$encrequest\n";
         }          }
   # --------------------------------------------------------------- Main exchange
       $SIG{ALRM}=sub { die "timeout" };
       $SIG{__DIE__}='DEFAULT';
       eval {
           alarm(300);
         &status("Sending $conserver: $request");          &status("Sending $conserver: $request");
         print $remotesock "$request";          print $remotesock "$request";
         &status("Waiting for reply from $conserver: $request");          &status("Waiting for reply from $conserver: $request");
         $answer=<$remotesock>;          $answer=<$remotesock>;
         &status("Received reply: $request");          &status("Received reply: $request");
           alarm(0);
       };
       if ($@=~/timeout/) { 
          $answer='';
          &logthis(
           "<font color=red>CRITICAL: Timeout $conserver: $request</font>");
       }  
       $SIG{ALRM}='DEFAULT';
       $SIG{__DIE__}=\&catchexception;
   
   
         if ($answer) {          if ($answer) {
    if ($answer =~ /^enc/) {     if ($answer =~ /^enc/) {
                my ($cmd,$cmdlength,$encinput)=split(/:/,$answer);                 my ($cmd,$cmdlength,$encinput)=split(/:/,$answer);

Removed from v.1.18  
changed lines
  Added in v.1.22


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>