From 7b2ff9af7ff71cb56ab16484f0a90dd56e2ac483 Mon Sep 17 00:00:00 2001 From: Eric Swenson Date: Fri, 3 Nov 2023 15:33:06 -0700 Subject: [PATCH] Updated DM gunner to enable autologout and disable IMP status checking. Also increase TTYTAB block size to accommodate those systems with more than 25 TTY channels. Finally, update autologout code to comment out the code that checks for the number of sockets owned by a network job, since the logic only worked with the DM NCP-based network implementation. This logic needs a reworking for current internet/chaosnet networking. --- src/sysen2/{gunner.mta382 => gunner.mta383} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename src/sysen2/{gunner.mta382 => gunner.mta383} (99%) diff --git a/src/sysen2/gunner.mta382 b/src/sysen2/gunner.mta383 similarity index 99% rename from src/sysen2/gunner.mta382 rename to src/sysen2/gunner.mta383 index 02c7593c..510fab58 100644 --- a/src/sysen2/gunner.mta382 +++ b/src/sysen2/gunner.mta383 @@ -45,6 +45,7 @@ P=17 .XCREF O,A,B,C,D,E,F,G,T,P NCPP==0 ;Don't use NCP. +EJSHAK==1 ;Don't check number of network sockets for not-logged-in "network user" ; CONSTANTS FOR ERRCHK (FROM MUDDLE) TB==12 @@ -303,8 +304,8 @@ PTABLE: ; PUSHJ P,IDLSRV ? 0 ? <5*60.>*30. ? 0 ? SIXBIT /IDLSRV/ ? 0 ? 0 PUSHJ P,DEMSCN ? 0 ? <15.*60.>*30. ? 0 ? SIXBIT /DEMSCN/ ? 0 ? 0 PUSHJ P,RNDFLS ? 0 ? <5*60.>*30. ? 0 ? SIXBIT /RNDFLS/ ? 0 ? 0 -; PUSHJ P,ALOG ? 0 ? <5*60.>*30. ? 0 ? SIXBIT /ALOG/ ? 0 ? 0 - PUSHJ P,NCPUP ? 0 ? <5*60.>*30. ? 0 ? SIXBIT /NCPUP/ ? 0 ? 0 + PUSHJ P,ALOG ? 0 ? <5*60.>*30. ? 0 ? SIXBIT /ALOG/ ? 0 ? 0 +; PUSHJ P,NCPUP ? 0 ? <5*60.>*30. ? 0 ? SIXBIT /NCPUP/ ? 0 ? 0 PUSHJ P,HOURLY ? 0 ? <60.*60.>*30. ? 0 ? SIXBIT /HOURLY/ ? 0 ? 0 ; PUSHJ P,MSCAN ? 0 ? 0 ? 0 ? SIXBIT /MSCAN/ ? 0 ? 0 ; PUSHJ P,ZTSCAN ? 0 ? <10.*60.>*30. ? 0 ? SIXBIT /ZTSCAN/ ? 0 ? 0 @@ -3832,7 +3833,7 @@ NTLONG==PARMEN ; OFFSETS INTO 'BLOCKS' FOR NET USERS--CHOOSE ONE IMPURE -TTYTAB: BLOCK 31 ; ONE WORD/TTY +TTYTAB: BLOCK 100 ; ONE WORD/TTY JOBTAB: BLOCK 100 ; ONE WORD/JOB (FOR BUILDING JOB TREES) ; PARAMETERS FOR THIS CROCK. INITIALIZED FROM FILE TAA;GUNNER INIT (FOR NOW), @@ -4079,10 +4080,12 @@ GCLAS1: MOVE C,@TTYTYP JRST [MOVEI C,$CPROG JRST GCLASO] ; SHOULD NEVER GET HERE MOVEI D,0 +IFE EJSHAK,[ PUSHJ P,NETQ ; DOES OWNER HAVE NET SOCKETS? JRST [MOVEI C,$CPROG JRST GCLASO] ; NO JFCL ; HERE, DON'T CARE HOW MANY SKIPS +] HLRO C,@UNAME AOJE C,[MOVEI C,$CNNLG JRST GCLASO] ; NON-LOGGED-IN NET USER