--- loncom/Attic/lonc	2001/11/27 19:32:46	1.19
+++ loncom/Attic/lonc	2001/11/28 21:19:58	1.21
@@ -16,7 +16,7 @@
 # 12/05 Scott Harrison
 # 12/05 Gerd Kortemeyer
 # 01/10/01 Scott Harrison
-# 03/14/01,03/15,06/12,11/26,11/27 Gerd Kortemeyer
+# 03/14/01,03/15,06/12,11/26,11/27,11/28 Gerd Kortemeyer
 # 
 # based on nonforker from Perl Cookbook
 # - server who multiplexes without forking
@@ -182,12 +182,14 @@ sub subreply {
                                       Type    => SOCK_STREAM,
                                       Timeout => 10)
        or return "con_lost";
+
+
     $SIG{ALRM}=sub { die "timeout" };
     $SIG{__DIE__}='DEFAULT';
     eval {
      alarm(10);
      print $sclient "$cmd\n";
-     my $answer=<$sclient>;
+     $answer=<$sclient>;
      chomp($answer);
      alarm(0);
     };
@@ -352,15 +354,30 @@ unless (
        sleep($st);
        exit; 
      };
-# --------------------------------------- Send a ping to make other end do USR1
+# ----------------------------------------------------------------- Init dialog
 
 &status("Init dialogue: $conserver");
 
+     $SIG{ALRM}=sub { die "timeout" };
+     $SIG{__DIE__}='DEFAULT';
+     eval {
+         alarm(60);
 print $remotesock "init\n";
 $answer=<$remotesock>;
 print $remotesock "$answer";
 $answer=<$remotesock>;
 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<");
 if ($answer ne 'ok') {
        my $st=120+int(rand(240));
@@ -430,11 +447,19 @@ if ($cipher=new IDEA $cipherkey) {
             }
             $cmd="enc:$cmdlength:$encrequest\n";
         }
-
+    $SIG{ALRM}=sub { die "timeout" };
+    $SIG{__DIE__}='DEFAULT';
+    eval {
+        alarm(60);
         print $remotesock "$cmd\n";
         $answer=<$remotesock>;
 	chomp($answer);
-        if ($answer ne '') {
+        alarm(0);
+    };
+    $SIG{ALRM}='DEFAULT';
+    $SIG{__DIE__}=\&catchexception;
+
+        if (($answer ne '') && ($@!~/timeout/)) {
 	    unlink("$dfname");
             &logthis("Delayed $cmd to $conserver: >$answer<");
             &logperm("S:$conserver:$bcmd");