From: djk Date: Mon, 8 Feb 1999 15:29:09 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: R_1_24~20 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f38b81521d0430ef67023c3afaab2f4180e5b3bf;p=spider.git *** empty log message *** --- diff --git a/Changes b/Changes index a05a88ed..64e40c93 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +08Feb99======================================================================== +1. added a $SIG{ALRM} in the client to actually catch the alarm when it goes +off which means that the netrom/ax25 call programs terminate properly! 30Jan99======================================================================== 1. Some of the dates we get can cause crashes, tried to make it more robust (oh and Y2K compliant) diff --git a/cmd/set/lockout.pl b/cmd/set/lockout.pl index a1e83c32..911a8288 100644 --- a/cmd/set/lockout.pl +++ b/cmd/set/lockout.pl @@ -22,7 +22,10 @@ foreach $call (@args) { $ref->put(); push @out, $self->msg("lockout", $call); } else { - push @out, $self->msg('e3', 'set/lockout', $call); + $ref = DXUser->new($call); + $ref->lockout(1); + $ref->put(); + push @out, $self->msg("lockoutc", $call); } } return (1, @out); diff --git a/connect/gb7tlh b/connect/gb7tlh index 3918effc..7ecadfb9 100644 --- a/connect/gb7tlh +++ b/connect/gb7tlh @@ -2,6 +2,6 @@ timeout 15 don't forget to chmod 4775 netrom_call! connect ax25 /usr/sbin/netrom_call bbs gb7djk g1tlh-0 'Connect' '' -'Connect' 'cluster' -'Connect' +'Connect' 'ak1a' +'Connect' '' client gb7tlh ax25 diff --git a/perl/Messages b/perl/Messages index 81e3e2c2..6f78b8d3 100644 --- a/perl/Messages +++ b/perl/Messages @@ -63,6 +63,7 @@ package DXM; loce2 => 'Don\'t recognise \"$_[0]\" as a Lat/Long (eg 52 20 N 0 16 E)', loc => 'Your Lat/Long is now \"$_[0]\"', lockout => '$_[0] Locked out', + lockoutc => '$_[0] Created and Locked out', lockoutun => '$_[0] Unlocked', m2 => '$_[0] Information: $_[1]', merge1 => 'Merge request for $_[1] spots and $_[2] WWV sent to $_[0]', diff --git a/perl/client.pl b/perl/client.pl index 6358d022..ffae6e58 100755 --- a/perl/client.pl +++ b/perl/client.pl @@ -345,6 +345,7 @@ $SIG{'INT'} = \&sig_term; $SIG{'TERM'} = \&sig_term; $SIG{'HUP'} = 'IGNORE'; $SIG{'CHLD'} = \&sig_chld; +$SIG{'ALRM'} = \&timeout; dbgadd('connect'); @@ -415,7 +416,7 @@ if ($connsort eq "connect") { open(IN, "$cpath/$mcall") or cease(2); @in = ; close IN; - + alarm($timeout); for (@in) {