Virgin import of ntpd 4.1.0

4 files changed, 123 insertions, 169 deletions

diff --git a/contrib/ntp/conf/baldwin.conf b/contrib/ntp/conf/baldwin.conf
index 0781825..0998a9f 100644
--- a/contrib/ntp/conf/baldwin.conf
+++ b/contrib/ntp/conf/baldwin.conf
@@ -6,18 +6,17 @@
 # driver, as well as a multicast server. The prefer keyword on the
 # local clock driver declares an external clock and that the time of
 # this server should not be wiggled by an NTP peer, unless the
-# external clock comes unstuck. Note the use of the multicast group
+# external source comes unstuck. Note the use of the multicast group
 # ID assigned to NTP, 224.0.1.1, which identifies this as a multicast
 # server rather than a broadcast one. The other NTP peers are known
 # stratum-1 chimes intended as backup should the external clock croak.
 #
-peer 127.127.1.0 prefer		# local clock driver
-fudge 127.127.12.0 stratum 0 refid GPS
+server 127.127.1.0 prefer	# local clock driver
 broadcast 224.0.1.1 key 6 ttl 127
-peer rackety.udel.edu		# (Sun4c/40 IPC)
-peer barnstable.udel.edu	# (Sun4c/65 SS1+)
-peer mizbeaver.udel.edu		#(Bancomm bc700LAN)
-peer pogo.udel.edu		# (Sun4c/65 SS1+)
+peer rackety.udel.edu
+peer barnstable.udel.edu
+peer mizbeaver.udel.edu
+peer pogo.udel.edu
 #
 # Miscellaneous stuff
 #
diff --git a/contrib/ntp/conf/grundoon.conf b/contrib/ntp/conf/grundoon.conf
index 4462923..a26522d 100644
--- a/contrib/ntp/conf/grundoon.conf
+++ b/contrib/ntp/conf/grundoon.conf
@@ -2,153 +2,35 @@
 # NTP configuration file (ntp.conf)
 # grundoon.udel.edu
 #
-# This machine can best be described as the kitchen sink. It has, in
-# addition to the baseboard tty ports ttya and ttyb, an 8-line
-# Serial/Parallel Interface (SPIF) with ports ttyz00 through ttyz07. The
-# configuration includes the following drivers, clock addresses and Unix
-# device names.
-#
-# Local Clock			127.127.1.0	/dev/audio
-# PST 1020 WWV/WWVH Receiver	127.127.3.1	/dev/pst1
-# Spectracom 8170 WWVB Receiver	127.127.4.1	/dev/wwvb1
-# IRIG Audio Decoder		127.127.6.0	/dev/audio
-# Scratchbuilt CHU Receiver	127.127.7.1	/dev/chu1
-# NIST ACTS modem		127.127.18.1	/dev/acts1
-# Heath GC-1000 WWV Receiver	127.127.19.1	/dev/pst1
-# PPS Clock			127.127.22.1	none
-#
-# This machine has the kernel modifications described in the README.kern
-# file, as well as the tty_clk, tty_chu and ppsclock streams modules.
-#
-# Spectracom 8170/Netclock-2 WWVB receiver. This receiver is equipped
-# with a 1-pps and IRIG outputs. The 1-pps signal is connected via the
-# ppsclock streams module and the carrier detect line of the CHU
-# receiver below (ttyb). The IRIG signal is connected via an attenuator
-# to the audio port (/dev/audio). The propagation delay computed from
-# geographical coordinates is 8.8 ms, while the receiver delay
-# calibrated at the factory is 17.3 ms, for a total delay of 26.1 ms.
-# This is confirmed within 0.1 ms at the 1-pps signal output using a
-# portable cesium clock. We add a fudge time1 of 3.5 ms so the driver
-# time agrees with the 1-pps signal to within 1 ms. The fudge flag4 is
-# set to cause the receiver to dump the quality table once each day to
-# the clockstats file. 
-
-#
-#server 127.127.4.1		# /dev/wwvb1 -> /dev/ttyz03
-#fudge 127.127.4.1 time1 0.0035 flag4 1
-#
-# IRIG Audio Decoder. The IRGI signal of the Spectracom WWVB receiver is
-# connected to the audio codec via a resistor attenuator. We add a fudge
-# time1 of 3.5 ms so the driver agrees with the calibrated 1-pps signal
-# to within 0.1 ms. We also specify a reference ID of WWVB to indicate
-# the signal origin. Note the prefer keyword in the server line, which
-# favors this driver over all others that survive the clock selection
-# algorithm. See README.refclock for further insight on this feature.
-#
-server 127.127.6.0 prefer	# /dev/audio
-fudge 127.127.6.0 time1 0.0005 refid WWVB
+server 127.127.11.1 prefer	# Arbiter 1088 GPS receiver
+fudge 127.127.11.1 time1 .00487 flag1 1 flag4 1
+server 127.127.22.1 minpoll 4	# PPS quick poll
+fudge 127.127.22.1		# use PLL/FLL loop
 
-#
-# PST/Traconex 1020 WWV/WWVH Receier. The internal DIPswitches are set
-# as near as possible to the delays to WWV (8.8 ms) and WWVH (28.1 ms),
-# as computed from geographical coordinates. We add a fudge time1 of 5.9
-# ms so the driver time agrees with the 1-pps signal to within 1 ms for
-# WWV. We also set the stratum to 1, so this receiver will not normally
-# be selected, unless the primary WWVB receiver comes unstuck.
-#
-server 127.127.3.1		# /dev/pst1 -> ttyz05
-fudge 127.127.3.1 time1 0.0059 stratum 1
+broadcast 128.4.2.255 key 5	# brpadcast on LAN shared key
+broadcast 239.1.1.2 autokey	# multicast on WAN autokey
 
+manycastclient 239.1.1.1 autokey maxpoll 12 ttl 7
+manycastserver 239.1.1.1 
 #
-# Scratchbuilt CHU Receiver. The audio signal from a computer controlled
-# CHU receiver is connected to a gadget box, which contains a 103A modem
-# chip and level converter operating at 300 bps. The propagation delay
-# computed from geographical coordinates is 3.0 ms, which is the value
-# of the fudge time1 parameter. We add a fudge time2 of 9.9 ms so that
-# the driver time agrees with the 1-pps signal to within a few ms,
-# ordinarily the best possible with this receiver. The fudge flag3 is
-# set because the 1-pps signal happens to be connected vit the carrier
-# detect line on this port (ttyb). We also set the stratum to 1, so this
-# receiver will not normally be selected, unless the primary WWVB
-# receiver comes unstuck.
-#
-server 127.127.7.1		# /dev/chu1 -> /dev/ttyb
-fudge 127.127.7.1 time1 0.0030 time2 0.0099 flag3 1 stratum 1
-
-#
-# NIST Automated Computer Time Service. This driver calls a special
-# telephone number in Boulder, CO, to fetch the time directly from the
-# NIST cesium farm. The details of the complicated calling program are
-# in the README.refclock file. The Practical Peripherals 9600SA modem
-# does not work correctly with the ACTS echo-delay scheme for
-# automatically calculating the propagation delay, so the fudge flag2 is
-# set to disable the feature. Instead, we add a fudge time1 of 65.0 ms
-# so that the driver time agrees with th e1-pps signal to within 1 ms.
-# The phone command specifies three alternate telephone numbers,
-# including AT modem command prefix, which will be tried one after the
-# other at each measurement attempt. In this case, a cron job is used to
-# set fudge flag1, causing a measurement attempt, every six hours.
-#
-server 127.127.18.1		# /dev/acts1 -> /dev/ttyz00
-fudge 127.127.18.1 time1 0.0650	flag2 1
-phone atdt13034944774 atdt13034944785 atdt13034944774
-
+# Access control stuff
 #
-# Heath GC-1000 Most Accurate Clock. This is a WWV receiver with a
-# claimed accuracy better than 100 ms under "hi spec" conditions, but
-# such conditions are not frequent. The propagation delay DIPswitchs are
-# set to 9 ms, as close as possible to the 8.8 ms computed from
-# geographical coordinates. We add a fudge time2 of 40.0 ms so that the
-# driver time agrees with the 1-pps signal to within 50 ms, ordinarily
-# the best possible with this receiver. We also set the stratum to 1, so
-# this receiver will not normally be selected, unless the primary WWVB
-# receiver comes unstuck.
+restrict default noserve	# default deny
+restrict 127.0.0.1		# allow local host
+restrict 128.4.0.0 mask 255.255.0.0 # allow DCnet clients
+restrict 128.175.0.0 mask 255.255.0.0 # allow UDel clients
+restrict 140.173.0.0 mask 255.255.0.0 # allow DARTnet/CAIRN clients
 #
-server 127.127.19.1		# /dev/heath1 -> ttyz07
-fudge 127.127.19.1 time1 0.040 stratum 1
-
-#
-# Undisciplined Local Clock. This is a fake driver intended for backup
-# and when no outside source of synchronized time is available. The
-# default stratum is usually 3, but in this case we elect to use stratum
-# 0. Since the server line does not have the prefer keyword, this driver
-# is never used for synchronization, unless no other other
-# synchronization source is available. In case the local host is
-# controlled by some external source, such as an external oscillator or
-# another protocol, the prefer keyword would cause the local host to
-# disregard all other synchronization sources, unless the kernel
-# modifications are in use and declare an unsynchronized condition.
-#
-server 127.127.1.0		# local clock
-fudge 127.127.1.0 stratum 0 
-
-#
-# PPS Clock. This driver is used to capture a 1-pps signal when the PPS
-# kernel modifications are not in use. It can be configured for the
-# tty_clk or ppsclock streams module or no module at all, assuming the
-# RS232 connector is properly wired. Normally, the 1-pps signal is
-# generated by a radio clock, in this cast the Spectracom clock
-# 127.127.4.1 also configured for this host. When used this way, the
-# associated radio clock normally has the prefer keyword in the serve
-# command line. The PPS driver then will be selected only if the prefer
-# peer is operating within nominal error bounds. See the README.refclock
-# file for further details.
+# Authentication stuff
 #
-#server 127.127.22.1		# pps clock
-
+crypto				# enable public key
+keys /usr/local/etc/ntp.keys	# path for keys file
+trustedkey 3 4 5 14		# define trusted keys
+requestkey 14			# key (7) for accessing server variables
+controlkey 14			# key (6) for accessing server variables
 #
-# Miscellaneous stuff. We enable authentication in order to prevent
+# Miscellaneous stuff
 #
 driftfile /etc/ntp.drift	# path for drift file
-statsdir /grundoon/ntpstats/	# directory for statistics files
-filegen peerstats file peerstats type day enable
+statsdir /var/spool/ntpstats/	# directory for statistics files
 filegen loopstats file loopstats type day enable
-filegen clockstats file clockstats type day enable
-
-#
-# Authentication stuff
-#
-keys /usr/local/etc/ntp.keys	# path for keys file
-trustedkey 1 2 3 4 5 6 14 15	# define trusted keys
-requestkey 15			# key (7) for accessing server variables
-controlkey 15			# key (6) for accessing server variables
diff --git a/contrib/ntp/conf/pogo.conf b/contrib/ntp/conf/pogo.conf
index e97d4c5..2014fdd 100644
--- a/contrib/ntp/conf/pogo.conf
+++ b/contrib/ntp/conf/pogo.conf
@@ -1,30 +1,55 @@
 #
 # NTP configuration file (ntp.conf)
-# pogo.udel.edu
-#
-server 127.127.10.1 prefer	# austron 2201A gps receiver
-peer 128.4.1.1			# rackety.udel.edu (Sun4c/40 IPC)
-peer 128.4.1.2			# mizbeaver.udel.edu (Bancomm bc700LAN)
-peer 128.4.1.4			# barnstable.udel.edu (Sun4c/65 SS1+)
-peer 128.4.1.5 maxpoll 8	# churchy.udel.edu (cisco IGS router)
-peer 132.163.135.130 maxpoll 8	# time_A.timefreq.bldrdoc.gov (Cesium)
-peer 131.188.1.40 maxpoll 8	# ntps1-0.uni-erlangen.de (DCF77)
-peer 129.132.2.21 maxpoll 8	# swisstime.ethz.ch (DCF77)
-peer 130.155.98.13 maxpoll 8	# terss.ml.csiro.au (Cesium)
-peer 192.36.143.150 maxpoll 8	# Time1.Stupi.SE (Cesium)
+# SunOS pogo.udel.edu 5.8 Generic sun4u sparc SUNW,Ultra-1
 #
-# Miscellaneous stuff
+server 127.127.6.1 prefer	# IRIG from GPS1
+fudge 127.127.6.1 refid GPS1 time1 -.002777 flag2 1
+server 127.127.4.1		# spectracom GPS receiver
+# delays: prop 0.0088 ant .0002 rcvr .0173 = 26.3 ms; os .0035
+fudge 127.127.4.1 refid GPS2 time1 .000221 
+server 127.127.22.0		# PPS from GPS2
+fudge 127.127.22.0 flag3 1	# kernel PPS
 #
-precision -18			# clock reading precision (usec)
-driftfile /etc/ntp.drift        # path for drift file
-statsdir /pogo/ntpstats/	# directory for statistics files
-filegen peerstats file peerstats type day enable
-filegen loopstats file loopstats type day enable
-filegen clockstats file clockstats type day enable
+# Backups
+#
+server 128.4.1.2		# mizbeaver
+server 128.175.60.175 version 3	# ntp1.nss
+#
+# Services
+#
+manycastclient 239.1.1.1 autokey maxpoll 12 ttl 7
+manycastserver 239.1.1.1
+#
+# Access control stuff
+#
+restrict default noserve	# default deny
+restrict 127.0.0.1		# allow local host
+restrict 128.4.0.0 mask 255.255.0.0 # allow DCnet clients
+restrict 128.175.0.0 mask 255.255.0.0 # allow UDel clients
+restrict 140.173.0.0 mask 255.255.0.0 # allow DARTnet/CAIRN clients
 #
 # Authentication stuff
 #
+# Local filesystem 
+# /etc/ntpkey -> ntpkey.3171396491
+# /etc/ntpkey.3171396491
+#
+# NFS mounted filesystem
+# /usr/local/etc/ntpkey -> /etc/ntpkey
+# /usr/local/etc/ntpkey_dh -> ntpkey_dh.3171396491
+# /usr/local/etc/ntpkey_dh.3171396491
+# /usr/local/etc/ntpkey_pogo.udel.edu -> ntpkey_pogo.udel.edu.3171396491
+# /usr/local/etc/ntpkey_pogo.udel.edu.3171396491
+#
+crypto privatekey /etc/ntpkey	# enable public key
 keys /usr/local/etc/ntp.keys	# path for keys file
-trustedkey 3 4 5 6 14		# define trusted keys
-requestkey 15			# key (7) for accessing server variables
-controlkey 15			# key (6) for accessing server variables
+trustedkey 3 4 5 14		# define trusted keys
+requestkey 14			# key (7) for accessing server variables
+controlkey 14			# key (6) for accessing server variables
+#
+# Miscellaneous stuff
+#
+driftfile /etc/ntp.drift	# path for drift file
+statsdir /var/spool/ntpstats/	# directory for statistics files
+filegen loopstats file loopstats type day enable
+
diff --git a/contrib/ntp/conf/rackety.conf b/contrib/ntp/conf/rackety.conf
new file mode 100644
index 0000000..d3f231c
--- /dev/null
+++ b/contrib/ntp/conf/rackety.conf
@@ -0,0 +1,48 @@
+#
+# NTP configuration file (ntp.conf)
+# SunOS rackety.u 4.1.3 243 sun4c
+#
+server 127.127.4.0 prefer 	# Spectracom GPS receiver #1
+fudge 127.127.4.0 refid GPS1 time1 -.000097 flag1 1
+server 127.127.4.1 		# Spectracom GPS receiver #2
+fudge 127.127.4.1 refid GPS2 time1 -.000097 flag1 1
+server 127.127.4.2		# Spectracom WWVB receiver #1
+# delays: prop 0.0088 ant .0002 rcvr .0173 = 26.3 ms; os .0035
+fudge 127.127.4.2 refid WVB1 time1 .0021 flag4 1 flag1 1
+server 127.127.4.3		# Spectracom WWVB receiver #2
+# delays: prop 0.0088 ant .0002 rcvr .0173 = 26.3 ms; os .0035
+fudge 127.127.4.3 refid WVB2 time1 .0021 flag4 1 flag1 1
+server 127.127.22.1		# PPS
+fudge 127.127.22.1 flag3 1	# kernel PPS 
+#
+# Services
+#
+broadcast 224.0.1.1 autokey	# multicast
+broadcast 128.4.1.255 autokey	# local subnet broadcast
+manycastclient 239.1.1.1 autokey maxpoll 12 ttl 7 # manycast
+manycastserver 239.1.1.1	# manycast
+#
+# Access controls
+#
+restrict default limited	# default limit clients per net
+restrict 127.0.0.1		# allow local host
+restrict 128.4.0.0 mask 255.255.0.0 # allow DCnet clients
+restrict 128.175.0.0 mask 255.255.0.0 # allow UDELnet clients
+restrict 140.173.0.0 mask 255.255.0.0 # allow DARTnet/CAIRN clients
+#
+# Authentication stuff
+#
+crypto				# enable public key
+keys /usr/local/etc/ntp.keys	# symmetric keys file
+trustedkey 3 4 5 14		# define trusted keys
+requestkey 14			# key (7) for accessing server variables
+controlkey 14			# key (6) for accessing server variables
+#
+# Miscellaneous stuff
+#
+driftfile /etc/ntp.drift	# frequency offset
+statsdir /rackety/ntpstats/	# directory for statistics files
+filegen peerstats file peerstats type day enable
+filegen loopstats file loopstats type day enable
+filegen clockstats file clockstats type day enable
+