loncom/lonc - diff

Return to lonc CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/Attic/lonc between versions 1.19 and 1.20

version 1.19, 2001/11/27 19:32:46	version 1.20, 2001/11/27 23:11:42
Line 352 unless (	Line 352 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 430 if ($cipher=new IDEA $cipherkey) {	Line 445 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");

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

Removed from v.1.19
changed lines
	Added in v.1.20