diff --git a/Makefile b/Makefile index aad209c1..a7896ffb 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,17 @@ SIMHV3_URL=http://simh.trailing-edge.com/sources include conf/network +# if user hasn't changed HOSTNAME, and MCHN is not DB, then update HOSTNAME +ifeq ($(HOSTNAME),DB-ITS.EXAMPLE.COM) + ifneq ($(MCHN),DB) + HOSTNAME = $(MCHN)-ITS.EXAMPLE.COM + endif +endif + # The directores listed in SRC, DOC, and BIN are put on the sources tape. SRC = syseng sysen1 sysen2 sysen3 sysnet kshack dragon channa \ _teco_ emacs emacs1 rms klh syshst sra mrc ksc eak gren \ - bawden _mail_ l lisp libdoc comlap lspsrc nilcom rwk chprog rg \ + bawden l lisp libdoc comlap lspsrc nilcom rwk chprog rg \ inquir acount gz sys decsys ecc alan sail kcc kcc_sy c games archy dcp \ spcwar rwg libmax rat z emaxim rz maxtul aljabr cffk das ell ellen \ jim jm jpg macrak maxdoc maxsrc mrg munfas paulw reh rlb rlb% share \ @@ -100,6 +107,7 @@ TEK=tools/tek4010/tek4010 SIMH_IMLAC=tools/simh/BIN/imlac $(OUT)/ssv22.iml H3TEXT=$(shell cd build; ls h3text.*) +NAMES=$(shell cd build; ls names.*) DDT=$(shell cd src; ls sysen1/ddt.* syseng/lsrtns.* syseng/msgs.* syseng/datime.* syseng/ntsddt.*) SALV=$(shell cd src; ls kshack/nsalv.* syseng/format.* syseng/rfn.*) KSFEDR=$(shell cd src; ls kshack/ksfedr.*) @@ -225,13 +233,14 @@ $(KLDCPDIR): $(KLFEDR) $(MKDIR) $(OUT)/_klfe_ $(KLFEDR) > "$(OUT)/_klfe_/kldcp.$(leftparen)dir$(rightparen)" -$(OUT)/sources.tape: $(OUT)/stamp/touch $(ITSTAR) $(OUT)/stamp/pdp10 $(OUT)/syshst/$(H3TEXT) +$(OUT)/sources.tape: $(OUT)/stamp/touch $(ITSTAR) $(OUT)/stamp/pdp10 $(OUT)/syshst/$(H3TEXT) $(OUT)/_mail_/$(NAMES) $(MKDIR) $(OUT) $(RM) -f src/*/*~ $(ITSTAR) -cf $@ -C src $(SRC) $(ITSTAR) -rf $@ -C doc $(DOC) $(ITSTAR) -rf $@ -C bin $(BIN) $(ITSTAR) -rf $@ -C $(OUT) syshst + $(ITSTAR) -rf $@ -C $(OUT) _mail_ $(OUT)/salv.tape: $(WRITETAPE) $(RAM) $(NSALV) $(MKDIR) $(OUT) @@ -286,11 +295,11 @@ out/pdp10-ka/stamp/pdp10: $(KA10) start out/pdp10-ka/run $(MKDIR) $(OUT)/stamp $(TOUCH) $@ -out/pdp10-kl/stamp/pdp10: $(KL10) start +out/pdp10-kl/stamp/pdp10: $(KL10) start out/pdp10-kl/run $(MKDIR) $(OUT)/stamp $(TOUCH) $@ -out/pdp10-ks/stamp/pdp10: $(KS10) start +out/pdp10-ks/stamp/pdp10: $(KS10) start out/pdp10-ks/run $(MKDIR) $(OUT)/stamp $(TOUCH) $@ @@ -310,15 +319,21 @@ out/simh/system: out/pdp10-ka/system: $(MKDIR) $(OUT)/system - cp build/pdp10-ka/config.* $(OUT)/system + x=`echo $(IP) | tr . ,`; \ + $(SED) -e "s/%IP%/$$x/" \ + -e 's/%NETMASK%/$(NETMASK)/' < build/pdp10-ka/config.202 > $(OUT)/system/config.202 out/pdp10-kl/system: $(MKDIR) $(OUT)/system - cp build/pdp10-kl/config.* $(OUT)/system + x=`echo $(IP) | tr . ,`; \ + $(SED) -e "s/%IP%/$$x/" \ + -e 's/%NETMASK%/$(NETMASK)/' < build/pdp10-kl/config.203 > $(OUT)/system/config.203 out/pdp10-ks/system: $(MKDIR) $(OUT)/system - cp build/pdp10-ks/config.* $(OUT)/system + x=`echo $(IP) | tr . ,`; \ + $(SED) -e "s/%IP%/$$x/" \ + -e 's/%NETMASK%/$(NETMASK)/' < build/pdp10-ks/config.202 > $(OUT)/system/config.202 out/simhv3/system: $(MKDIR) $(OUT)/system @@ -335,14 +350,30 @@ out/simh/boot: build/mchn/$(MCHN)/boot out/pdp10-ka/run: build/mchn/$(MCHN)/run $(MKDIR) $(OUT)/stamp - cp $< $@ + $(SED) -e 's/%IP%/$(IP)/' \ + -e 's/%GW%/$(GW)/' < $< > $@ + +out/pdp10-kl/run: build/mchn/$(MCHN)/run + $(MKDIR) $(OUT)/stamp + $(SED) -e 's/%IP%/$(IP)/' \ + -e 's/%GW%/$(GW)/' < $< > $@ + +out/pdp10-ks/run: build/pdp10-ks/run + $(MKDIR) $(OUT)/stamp + $(SED) -e 's/%IP%/$(IP)/' \ + -e 's/%GW%/$(GW)/' < $< > $@ $(OUT)/syshst/$(H3TEXT): build/$(H3TEXT) $(MKDIR) $(OUT)/syshst $(SED) -e 's/%IP%/$(IP)/' \ - -e 's/%HOSTNAME%/$(HOSTNAME)/' < $< > $@ + -e 's/%HOSTNAME%/$(HOSTNAME)/' \ + -e 's/%MCHN%/$(MCHN)/' < $< > $@ $(CAT) conf/hosts >> $@ +$(OUT)/_mail_/$(NAMES): build/$(NAMES) + $(MKDIR) $(OUT)/_mail_ + $(SED) -e 's/%MCHN%/$(MCHN)/' < $< > $@ + $(KLH10): cd tools/klh10; \ $(RM) -rf tmp; \ diff --git a/build/h3text.2018 b/build/h3text.2018 index d35d77b8..41c9fb88 100644 --- a/build/h3text.2018 +++ b/build/h3text.2018 @@ -32,7 +32,7 @@ NET : 192.0.0.0 : C-192 : HOST : CHAOS 177001 : BRIDGE, LOCAL-TIME-SERVER : UNIX : UNIX : : ;;; Generated by build script. -HOST : CHAOS 177002, %IP% : %HOSTNAME%, DB : PDP-10 : ITS : : +HOST : CHAOS 177002, %IP% : %HOSTNAME%, %MCHN% : PDP-10 : ITS : : ;; SDF public ITS machines. HOST : 205.166.94.7 : HACTRN.ORG, HX : PDP-10 : ITS : : diff --git a/build/mchn/DB/run b/build/mchn/DB/run new file mode 100644 index 00000000..c89a356d --- /dev/null +++ b/build/mchn/DB/run @@ -0,0 +1,17 @@ +set console wru=034 +set cpu its +set cpu idle +set tim y2k +set ch enabled +set ch node=177002 +set ch peer=localhost:44041 +att ch 44042 +set dz 8b lines=8 +at -u dz0 10004 +# VT52 +at -u dz0 line=7,10018 +# GT40 +at -u dz0 line=6,10019 +set rpa0 rp06 +at rpa0 out/simh/rp0.dsk +b rpa0 diff --git a/build/mchn/KA/run b/build/mchn/KA/run index 717de82d..84daafe9 100644 --- a/build/mchn/KA/run +++ b/build/mchn/KA/run @@ -40,8 +40,8 @@ at auxcpu 10006 set imp enabled set imp mac=e2:6c:84:1d:34:a3 set imp ip=192.168.2.101/24 -set imp gw=172.31.1.100 -set imp host=10.3.0.6 +set imp gw=%GW% +set imp host=%IP% at imp tap:tap0 set ch enabled set ch node=177002 diff --git a/build/pdp10-kl/run b/build/mchn/KL/run similarity index 81% rename from build/pdp10-kl/run rename to build/mchn/KL/run index 3366e84b..3b725a99 100644 --- a/build/pdp10-kl/run +++ b/build/mchn/KL/run @@ -24,9 +24,18 @@ set rpa2 rp04 at rpa0 out/pdp10-kl/rp04.0 at rpa1 out/pdp10-kl/rp04.1 at rpa2 out/pdp10-kl/rp04.2 +# +set imp enabled +set imp mac=e2:6c:84:1d:34:a3 +set imp ip=192.168.2.101/24 +set imp gw=%GW% +set imp host=%IP% +at imp tap:tap0 +# set ch enabled set ch node=177002 set ch peer=localhost:44041 att ch 44042 +# load -i bin/kl10/boot/@.ddt go diff --git a/src/_mail_/names.2010 b/build/names.2010 similarity index 78% rename from src/_mail_/names.2010 rename to build/names.2010 index 31216245..6bdb7b4b 100644 --- a/src/_mail_/names.2010 +++ b/build/names.2010 @@ -1,7 +1,7 @@ ;;; -*- Fundamental -*- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; -;;; This file belongs on DB. DO NOT COPY TO OTHER MACHINES!! +;;; This file belongs on %MCHN%. DO NOT COPY TO OTHER MACHINES!! ;;; ;;; The format of this file is documented in .MAIL.;NAMES INFO. ;;; You should read that before modifying it. Also, there are @@ -22,20 +22,20 @@ ;;; Various special sacred lists - don't mung these! -(SYS-OPERATING-TROUBLE (EQV-LIST DB-ADMIN)) -(MAGIC-DRAGON-KEEPER (EQV-LIST DB-ADMIN)) +(SYS-OPERATING-TROUBLE (EQV-LIST %MCHN%-ADMIN)) +(MAGIC-DRAGON-KEEPER (EQV-LIST %MCHN%-ADMIN)) ; Mail maintenance stuff. Do not fuck with this. (BUG-MAIL (EQV-LIST BUG-QMAIL)) (BUG-MAILER (EQV-LIST BUG-QMAIL)) (BUG-QMAIL (EQV-LIST BUG-MAIL-AND-POSTMASTER [.MAIL.;MAIL BUGS])) -(BUG-MAIL-AND-POSTMASTER (EQV-LIST DB-ADMIN)) +(BUG-MAIL-AND-POSTMASTER (EQV-LIST %MCHN%-ADMIN)) (POSTMASTER (EQV-LIST BUG-MAIL-AND-POSTMASTER)) -(MAIL-DIR-MAINT (EQV-LIST DB-ADMIN)) +(MAIL-DIR-MAINT (EQV-LIST %MCHN%-ADMIN)) (MAIL-MAINTAINERS (EQV-LIST ([.MAIL.;FAILED STUFF] (R-OPTION FAST-APPEND)) - DB-ADMIN)) + %MCHN%-ADMIN)) (H3MAKE-MAINTAINERS (EQV-LIST ([.MAIL.;FAILED STUFF] (R-OPTION FAST-APPEND)) - DB-ADMIN)) + %MCHN%-ADMIN)) (COMSAT (EQV-LIST MAIL-MAINTAINERS)) (H3MAKE (EQV-LIST H3MAKE-MAINTAINERS)) (DEAD-MAIL-RECEIPTS (EQV-LIST [NUL:])) ; out for dead msgs @@ -46,7 +46,7 @@ ; Inquire database daemon. These are needed in order to update ; the database! -(UPDATE-ITS-INQUIR (EQV-LIST UPDATE-INQUIR@DB)) +(UPDATE-ITS-INQUIR (EQV-LIST UPDATE-INQUIR@%MCHN%)) (UPDATE-INQUIR (EQV-LIST ([INQUIR;INQUPD RECORD] (R-OPTION APPEND)) [INQUIR;.UPD1. >] (PGM [INQUIR;INQUPD BIN] @@ -67,18 +67,18 @@ ;; The entry for "*" is the only one which varies in the NAMES file for ;; each site. -(* (R-OPTION NOTDIST) (EQV-LIST *DB)) +(* (R-OPTION NOTDIST) (EQV-LIST *%MCHN%)) ;; *msg mailing lists -- see .MAIL.;BBOARD INFO for accepted policy on ;; which list to use for what purpose. -(*ITS (R-OPTION NOTDIST) (EQV-LIST *DB)) +(*ITS (R-OPTION NOTDIST) (EQV-LIST *%MCHN%)) ;; BBOARD goes most everywhere but is not shown by :MSGS by default (BBOARD (EQV-LIST (*BBOARD))) (*BBOARD (EQV-LIST *MSGS-TO-ITSES)) ;; Hosts that can receive *msgs -(*DB (EQV-LIST *MSGS-TO-ITSES)) +(*%MCHN% (EQV-LIST *MSGS-TO-ITSES)) (*MSGS-TO-ITSES (R-OPTION NOTDIST) - (EQV-LIST (*MSG-SINK@DB (R-OPTION NOTDIST)))) + (EQV-LIST (*MSG-SINK@%MCHN% (R-OPTION NOTDIST)))) ; This is final "sink". Mailer converts to filename specially. (*MSG-SINK (R-OPTION NOTDIST)) @@ -86,26 +86,26 @@ ; vectored to (BUG RANDOM-PROGRAM) instead, at a host address patched ; into COMSAT at location BUGHST. -(BUG-RANDOM-PROGRAM (EQV-LIST DB-ADMIN)) +(BUG-RANDOM-PROGRAM (EQV-LIST %MCHN%-ADMIN)) ;; The remaining names are not necessary to the operation of ITS but ;; are generally useful, I suppose. ; Plausible generic contact names. -(NETWORK-LIAISON (EQV-LIST DB-ADMIN)) +(NETWORK-LIAISON (EQV-LIST %MCHN%-ADMIN)) (LIASON (EQV-LIST NETWORK-LIAISON)) (LIAISON (EQV-LIST NETWORK-LIAISON)) (ACTION (EQV-LIST NETWORK-LIAISON)) ; Personal lists and stuff. -(DB-ADMIN (EQV-LIST [.MAIL.;ADMIN MAIL])) +(%MCHN%-ADMIN (EQV-LIST [.MAIL.;ADMIN MAIL])) -(ACCOUNTS-NOTIFICATION (EQV-LIST DB-ADMIN)) -(USER-ACCOUNTS (EQV-LIST DB-ADMIN)) -(ACCOUNTS-HELD-REFUSED (EQV-LIST DB-ADMIN)) -(USER-ACCOUNTS-ARCHIVE (EQV-LIST DB-ADMIN)) -(PASSWORD-SYSTEM (EQV-LIST DB-ADMIN)) -(BUGGY-PWORD (EQV-LIST DB-ADMIN)) -(HIPY-PAPY-BTHUTHDTH-THUTHDA-BTHUTHDY (EQV-LIST DB-ADMIN)) +(ACCOUNTS-NOTIFICATION (EQV-LIST %MCHN%-ADMIN)) +(USER-ACCOUNTS (EQV-LIST %MCHN%-ADMIN)) +(ACCOUNTS-HELD-REFUSED (EQV-LIST %MCHN%-ADMIN)) +(USER-ACCOUNTS-ARCHIVE (EQV-LIST %MCHN%-ADMIN)) +(PASSWORD-SYSTEM (EQV-LIST %MCHN%-ADMIN)) +(BUGGY-PWORD (EQV-LIST %MCHN%-ADMIN)) +(HIPY-PAPY-BTHUTHDTH-THUTHDA-BTHUTHDY (EQV-LIST %MCHN%-ADMIN)) diff --git a/build/pdp10-ka/build.tcl b/build/pdp10-ka/build.tcl index 5ef9ea1b..160f866b 100644 --- a/build/pdp10-ka/build.tcl +++ b/build/pdp10-ka/build.tcl @@ -62,12 +62,11 @@ proc quit_emulator {} { } proc initialize_comsat {} { - # commented out because you cannot run COMSAT initialization without network - # support - #respond "*" ":job comsat\r" - #respond "*" ":load .mail.;comsat launch\r" - #respond "*" "debug/-1\r" - #type "mfinit\033g" + respond "*" ":job comsat\r" + respond "*" ":load .mail.;comsat launch\r" + respond "*" "debug/-1\r" + type "mfinit\033g" + respond "Proceeding will launch Comsat" ":kill\r" } source build/ka10/include.tcl diff --git a/build/pdp10-ka/config.202 b/build/pdp10-ka/config.202 index cd3976fa..25433dc9 100644 --- a/build/pdp10-ka/config.202 +++ b/build/pdp10-ka/config.202 @@ -236,7 +236,8 @@ DEFOPT NETP==1 ; Has net connection DEFOPT IMPP==1 ; Has IMP interface DEFOPT KAIMP==1 DEFOPT IMPUS==306 ; ARPA net host number -DEFOPT IMPUS3== ; Internet host number +DEFOPT IMPUS3== ; IP address +DEFOPT NM%IMP==0 ; Subnet mask (doesn't appear to work if set to real mask) DEFOPT NCPP==0 ; Flush NCP code DEFOPT NNETCH==20. ; # NCP net channels DEFOPT INETP==1 ; Include Internet code diff --git a/build/pdp10-kl/build.tcl b/build/pdp10-kl/build.tcl index cd46ac3b..de079521 100644 --- a/build/pdp10-kl/build.tcl +++ b/build/pdp10-kl/build.tcl @@ -48,13 +48,13 @@ proc quit_emulator {} { } proc initialize_comsat {} { - # commented out because you cannot run COMSAT initialization without network - # support - #respond "*" ":job comsat\r" - #respond "*" ":load .mail.;comsat launch\r" - #respond "*" "debug/-1\r" - #type "mfinit\033g" + respond "*" ":job comsat\r" + respond "*" ":load .mail.;comsat launch\r" + respond "*" "debug/-1\r" + type "mfinit\033g" + respond "Proceeding will launch Comsat" ":kill\r" } + source build/kl10/include.tcl source build/build.tcl diff --git a/build/pdp10-kl/config.203 b/build/pdp10-kl/config.203 index 30e03de8..137d5ac7 100644 --- a/build/pdp10-kl/config.203 +++ b/build/pdp10-kl/config.203 @@ -512,7 +512,8 @@ DEFOPT XBL==25. ; # TCP connections DEFOPT IMPP==1 ; Has IMP interface DEFOPT KAIMP==1 DEFOPT IMPUS==106 ; ARPA net host number -DEFOPT IMPUS3== ; Internet host number +DEFOPT IMPUS3== ; IP address +DEFOPT NM%IMP== ; Subnet mask DEFOPT NCPP==0 ; Flush NCP code DEFOPT NNETCH==30. ; # NCP network channels DEFOPT CHAOSP==1 ;NO CHAOS NET diff --git a/build/pdp10-kl/start b/build/pdp10-kl/start index edac8fab..dcc44111 100755 --- a/build/pdp10-kl/start +++ b/build/pdp10-kl/start @@ -57,5 +57,5 @@ while test -n "$1"; do shift done -tools/sims/BIN/pdp10-kl build/pdp10-kl/run +tools/sims/BIN/pdp10-kl out/pdp10-kl/run exit 0 diff --git a/build/pdp10-ks/boot b/build/pdp10-ks/boot index a449db17..28b2367f 100644 --- a/build/pdp10-ks/boot +++ b/build/pdp10-ks/boot @@ -3,6 +3,8 @@ set cpu its set cpu idle set dz 8b lines=8 at -u dz0 10004 +set imp enabled +set imp simp set ch enabled set ch node=177002 set ch peer=localhost:44041 diff --git a/build/pdp10-ks/build.tcl b/build/pdp10-ks/build.tcl index bffc4164..3b9056f1 100644 --- a/build/pdp10-ks/build.tcl +++ b/build/pdp10-ks/build.tcl @@ -51,12 +51,11 @@ proc quit_emulator {} { } proc initialize_comsat {} { - # commented out because you cannot run COMSAT initialization without network - # support - #respond "*" ":job comsat\r" - #respond "*" ":load .mail.;comsat launch\r" - #respond "*" "debug/-1\r" - #type "mfinit\033g" + respond "*" ":job comsat\r" + respond "*" ":load .mail.;comsat launch\r" + respond "*" "debug/-1\r" + type "mfinit\033g" + respond "Proceeding will launch Comsat" ":kill\r" } source build/ks10/include.tcl diff --git a/build/pdp10-ks/config.202 b/build/pdp10-ks/config.202 index 13525485..19256382 100644 --- a/build/pdp10-ks/config.202 +++ b/build/pdp10-ks/config.202 @@ -960,6 +960,14 @@ DEFOPT NMTCS==1 ;Number of magtape units (so why not NMTUS?) DEFOPT TM03S==1 ;TM03/RH11 Unibus tape controller DEFOPT NETP==1 ; Connected to a network +DEFOPT INETP==1 ; Include Internet code +DEFOPT TCPP==1 ; Include TCP code +DEFOPT XBL==30. ; # TCP network channels +DEFOPT IMPP==1 ; Has an IMP interface +DEFOPT SSIMP==1 ; Hooked to "Simulated Simple IMP" +DEFOPT IMPUS==106 ; ARPA net host number +DEFOPT IMPUS3== ; IP address +DEFOPT NM%IMP== ; Subnet mask DEFOPT CHAOSP==1 ;CHAOS NET DEFOPT MYCHAD==177002 ;CHAOS NET ADDRESS DEFOPT NINDX==30. ;NUMBER OF INDICES diff --git a/build/pdp10-ks/init b/build/pdp10-ks/init index 1812cf9a..ebe9226d 100644 --- a/build/pdp10-ks/init +++ b/build/pdp10-ks/init @@ -3,6 +3,8 @@ set cpu its set tim y2k set ch enabled set ch node=177002 +set imp enabled +set imp simp at tua0 out/pdp10-ks/minsys.tape at tua1 out/pdp10-ks/salv.tape set rpa0 rp06 diff --git a/build/pdp10-ks/run b/build/pdp10-ks/run new file mode 100644 index 00000000..7e5e3a75 --- /dev/null +++ b/build/pdp10-ks/run @@ -0,0 +1,25 @@ +set console wru=034 +set cpu its +set cpu idle +set dz 8b lines=8 +at -u dz0 10004 +# +set imp enabled +set imp simp +set imp mac=e2:6c:84:1d:34:a3 +set imp ip=192.168.2.101/24 +set imp gw=%GW% +set imp host=%IP% +at imp tap:tap0 +# +set ch enabled +set ch node=177002 +set ch peer=localhost:44041 +att ch 44042 +# VT52 +at -u dz0 line=7,10018 +# GT40 +at -u dz0 line=6,10019 +set rpa0 rp06 +at rpa0 out/pdp10-ks/rp0.dsk +b rpa0 diff --git a/build/pdp10-ks/start b/build/pdp10-ks/start index 2c9998ad..1d14d7a4 100755 --- a/build/pdp10-ks/start +++ b/build/pdp10-ks/start @@ -56,5 +56,5 @@ while test -n "$1"; do shift done -tools/sims/BIN/pdp10-ks build/pdp10-ks/boot +tools/sims/BIN/pdp10-ks out/pdp10-ks/run exit 0