--- loncom/Attic/lonc 2001/11/27 19:32:46 1.19 +++ loncom/Attic/lonc 2001/11/27 23:11:42 1.20 @@ -352,15 +352,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 +445,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");