Received: from louie.udel.edu by huey.udel.edu id aa05908; 9 Feb 94 18:18 EST
Received: from faui45.informatik.uni-erlangen.de by louie.udel.edu id aa21398;
          9 Feb 94 18:13 EST
Received: from faui43.informatik.uni-erlangen.de by uni-erlangen.de with SMTP;
	id AA29809 (5.65c-6/7.3v-FAU); Thu, 10 Feb 1994 00:12:50 +0100
Received: from faui45x.informatik.uni-erlangen.de by immd4.informatik.uni-erlangen.de with SMTP;
	id AA11633 (5.65c-6/7.3m-FAU); Thu, 10 Feb 1994 00:12:46 +0100
From: Frank Kardel <Frank.Kardel@informatik.uni-erlangen.de>
Message-Id: <199402092312.AA11633@faui43.informatik.uni-erlangen.de>
Subject: .zz Patches
To: Mills@udel.edu
Date: Thu, 10 Feb 94 0:12:41 MET
Cc: Frank.Kardel@informatik.uni-erlangen.de, 
    Paul_Vixie@corpmis.sjc.hw.sony.com, Piete.Brooks@cl.cam.ac.uk
X-Mailer: ELM [version 2.3 PL11]

Guys,

Ok, here are some patches (including some WWVB cleanup 8-) relative
to the zz version. The KERNEL stuff in ntp_timex.h must still
be resolved.

diff -c Makefile:1.1.1.11 Makefile:3.46
*** Makefile:1.1.1.11	Wed Feb  9 23:54:57 1994
--- Makefile	Wed Feb  9 23:54:57 1994
***************
*** 162,168 ****
  FRC:
  
  savebin:
! 	@test -d bin || mkdir bin
  	@echo
  	@echo '### saving $(TARGETS) $(OPTTARG) in bin'
  	-@for f in $(TARGETS) $(OPTTARG); \
--- 162,168 ----
  FRC:
  
  savebin:
! 	-@test -d bin || mkdir bin
  	@echo
  	@echo '### saving $(TARGETS) $(OPTTARG) in bin'
  	-@for f in $(TARGETS) $(OPTTARG); \
diff -c include/ntp_machine.h:1.1.1.11 include/ntp_machine.h:1.27
*** include/ntp_machine.h:1.1.1.11	Wed Feb  9 23:56:27 1994
--- include/ntp_machine.h	Wed Feb  9 23:56:27 1994
***************
*** 274,280 ****
  #ifndef STR_SYSTEM
  #define STR_SYSTEM "UNIX/Ultrix"
  #endif
- #define HAVE_TERMIOS
  #endif
  
  /*
--- 274,279 ----
diff -c lib/systime.c:1.1.1.11 lib/systime.c:1.9
*** lib/systime.c:1.1.1.11	Wed Feb  9 23:57:45 1994
--- lib/systime.c	Wed Feb  9 23:57:45 1994
***************
*** 47,58 ****
   * We also remember the clock precision we computed from the kernel in
   * case someone asks us.
   */
  	LONG adj_precision;	/* adj precision in usec (tickadj) */
  	LONG tvu_maxslew;	/* maximum adjust doable in 1<<CLOCK_ADJ sec (usec) */
  
  	U_LONG tsf_maxslew;	/* same as above, as LONG format */
  
- 	LONG sys_clock;
  	l_fp sys_clock_offset;	/* correction for current system time */
  
  /*
--- 47,59 ----
   * We also remember the clock precision we computed from the kernel in
   * case someone asks us.
   */
+ 	LONG sys_clock;
+ 
  	LONG adj_precision;	/* adj precision in usec (tickadj) */
  	LONG tvu_maxslew;	/* maximum adjust doable in 1<<CLOCK_ADJ sec (usec) */
  
  	U_LONG tsf_maxslew;	/* same as above, as LONG format */
  
  	l_fp sys_clock_offset;	/* correction for current system time */
  
  /*
diff -c machines/sunos4.bsd:1.1.1.3 machines/sunos4.bsd:1.3
*** machines/sunos4.bsd:1.1.1.3	Wed Feb  9 23:58:15 1994
--- machines/sunos4.bsd	Wed Feb  9 23:58:15 1994
***************
*** 1,6 ****
  RANLIB=	    ranlib
  DEFS_LOCAL= -DREFCLOCK
! DEFS=       -DSYS_SUNOS4	
  AUTHDEFS=   -DDES -DMD5
  CLOCKDEFS=  -DLOCAL_CLOCK
  DAEMONLIBS= -lkvm
--- 1,6 ----
  RANLIB=	    ranlib
  DEFS_LOCAL= -DREFCLOCK
! DEFS=       -DSYS_SUNOS4 -DHAVE_BSD_TTYS
  AUTHDEFS=   -DDES -DMD5
  CLOCKDEFS=  -DLOCAL_CLOCK
  DAEMONLIBS= -lkvm
diff -c machines/ultrix.bsd:1.1.1.2 machines/ultrix.bsd:1.3
*** machines/ultrix.bsd:1.1.1.2	Wed Feb  9 23:58:19 1994
--- machines/ultrix.bsd	Wed Feb  9 23:58:19 1994
***************
*** 1,6 ****
  RANLIB=	     ranlib
  DEFS_LOCAL=  -DREFCLOCK
! DEFS=        -DSYS_ULTRIX
  AUTHDEFS=    -DDES -DMD5
  CLOCKDEFS=   -DLOCAL_CLOCK
  DAEMONLIBS=
--- 1,6 ----
  RANLIB=	     ranlib
  DEFS_LOCAL=  -DREFCLOCK
! DEFS=        -DSYS_ULTRIX -DHAVE_TERMIOS
  AUTHDEFS=    -DDES -DMD5
  CLOCKDEFS=   -DLOCAL_CLOCK
  DAEMONLIBS=
diff -c machines/ultrix.posix:1.1.1.2 machines/ultrix.posix:1.3
*** machines/ultrix.posix:1.1.1.2	Wed Feb  9 23:58:20 1994
--- machines/ultrix.posix	Wed Feb  9 23:58:20 1994
***************
*** 1,6 ****
  RANLIB=	    ranlib
  DEFS_LOCAL= -DREFCLOCK
! DEFS=       -DSYS_ULTRIX -DNTP_POSIX_SOURCE -DHAVE_SIGNALED_IO
  AUTHDEFS=   -DDES -DMD5
  CLOCKDEFS=  -DLOCAL_CLOCK
  DAEMONLIBS=
--- 1,6 ----
  RANLIB=	    ranlib
  DEFS_LOCAL= -DREFCLOCK
! DEFS=       -DSYS_ULTRIX -DNTP_POSIX_SOURCE -DHAVE_SIGNALED_IO -DHAVE_TERMIOS
  AUTHDEFS=   -DDES -DMD5
  CLOCKDEFS=  -DLOCAL_CLOCK
  DAEMONLIBS=
diff -c parse/clk_dcf7000.c:1.1.1.8 parse/clk_dcf7000.c:3.11
*** parse/clk_dcf7000.c:1.1.1.8	Wed Feb  9 23:58:51 1994
--- parse/clk_dcf7000.c	Wed Feb  9 23:58:51 1994
***************
*** 1,8 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_DCF7000)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_dcf7000.c,v 3.10 1994/01/25 19:05:07 kardel Exp
   *  
!  * clk_dcf7000.c,v 3.10 1994/01/25 19:05:07 kardel Exp
   *
   * ELV DCF7000 module
   *
--- 1,8 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_DCF7000)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_dcf7000.c,v 3.11 1994/02/02 17:45:14 kardel Exp
   *  
!  * clk_dcf7000.c,v 3.11 1994/02/02 17:45:14 kardel Exp
   *
   * ELV DCF7000 module
   *
***************
*** 121,126 ****
--- 121,129 ----
   * History:
   *
   * clk_dcf7000.c,v
+  * Revision 3.11  1994/02/02  17:45:14  kardel
+  * rcs ids fixed
+  *
   * Revision 3.6  1993/10/09  15:01:27  kardel
   * file structure unified
   *
diff -c parse/clk_meinberg.c:1.1.1.8 parse/clk_meinberg.c:3.13
*** parse/clk_meinberg.c:1.1.1.8	Wed Feb  9 23:58:53 1994
--- parse/clk_meinberg.c	Wed Feb  9 23:58:53 1994
***************
*** 1,8 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_MEINBERG)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_meinberg.c,v 3.11 1994/01/25 19:05:10 kardel Exp
   *  
!  * clk_meinberg.c,v 3.11 1994/01/25 19:05:10 kardel Exp
   *
   * Meinberg clock support
   *
--- 1,8 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_MEINBERG)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_meinberg.c,v 3.13 1994/02/02 17:45:21 kardel Exp
   *  
!  * clk_meinberg.c,v 3.13 1994/02/02 17:45:21 kardel Exp
   *
   * Meinberg clock support
   *
***************
*** 414,419 ****
--- 414,422 ----
   * History:
   *
   * clk_meinberg.c,v
+  * Revision 3.13  1994/02/02  17:45:21  kardel
+  * rcs ids fixed
+  *
   * Revision 3.11  1994/01/25  19:05:10  kardel
   * 94/01/23 reconcilation
   *
diff -c parse/clk_rawdcf.c:1.1.1.8 parse/clk_rawdcf.c:3.11
*** parse/clk_rawdcf.c:1.1.1.8	Wed Feb  9 23:58:54 1994
--- parse/clk_rawdcf.c	Wed Feb  9 23:58:54 1994
***************
*** 1,8 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_RAWDCF)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_rawdcf.c,v 3.9 1994/01/25 19:05:12 kardel Exp
   *  
!  * clk_rawdcf.c,v 3.9 1994/01/25 19:05:12 kardel Exp
   *
   * Raw DCF77 pulse clock support
   *
--- 1,8 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_RAWDCF)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_rawdcf.c,v 3.11 1994/02/02 17:45:23 kardel Exp
   *  
!  * clk_rawdcf.c,v 3.11 1994/02/02 17:45:23 kardel Exp
   *
   * Raw DCF77 pulse clock support
   *
***************
*** 529,534 ****
--- 529,537 ----
   * History:
   *
   * clk_rawdcf.c,v
+  * Revision 3.11  1994/02/02  17:45:23  kardel
+  * rcs ids fixed
+  *
   * Revision 3.9  1994/01/25  19:05:12  kardel
   * 94/01/23 reconcilation
   *
diff -c parse/clk_schmid.c:1.1.1.8 parse/clk_schmid.c:3.12
*** parse/clk_schmid.c:1.1.1.8	Wed Feb  9 23:58:55 1994
--- parse/clk_schmid.c	Wed Feb  9 23:58:55 1994
***************
*** 1,8 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_SCHMID)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_schmid.c,v 3.10 1994/01/25 19:05:15 kardel Exp
   *  
!  * clk_schmid.c,v 3.10 1994/01/25 19:05:15 kardel Exp
   *
   * Schmid clock support
   *
--- 1,8 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_SCHMID)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_schmid.c,v 3.12 1994/02/02 17:45:25 kardel Exp
   *  
!  * clk_schmid.c,v 3.12 1994/02/02 17:45:25 kardel Exp
   *
   * Schmid clock support
   *
***************
*** 168,173 ****
--- 168,176 ----
   * History:
   *
   * clk_schmid.c,v
+  * Revision 3.12  1994/02/02  17:45:25  kardel
+  * rcs ids fixed
+  *
   * Revision 3.10  1994/01/25  19:05:15  kardel
   * 94/01/23 reconcilation
   *
diff -c parse/clk_trimble.c:1.1.1.3 parse/clk_trimble.c:3.9
*** parse/clk_trimble.c:1.1.1.3	Wed Feb  9 23:58:56 1994
--- parse/clk_trimble.c	Wed Feb  9 23:58:57 1994
***************
*** 1,6 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_TRIMSV6)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_trimble.c,v 3.7 1994/01/25 19:05:17 kardel Exp
   *
   * Trimble SV6 clock support
   */
--- 1,6 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_TRIMSV6)
  /*
!  * /src/NTP/REPOSITORY/v3/parse/clk_trimble.c,v 3.9 1994/02/02 17:45:27 kardel Exp
   *
   * Trimble SV6 clock support
   */
***************
*** 106,111 ****
--- 106,114 ----
   * History:
   *
   * clk_trimble.c,v
+  * Revision 3.9  1994/02/02  17:45:27  kardel
+  * rcs ids fixed
+  *
   * Revision 3.7  1994/01/25  19:05:17  kardel
   * 94/01/23 reconcilation
   *
diff -c parse/parse.c:1.1.1.8 parse/parse.c:3.21
*** parse/parse.c:1.1.1.8	Wed Feb  9 23:58:59 1994
--- parse/parse.c	Wed Feb  9 23:59:00 1994
***************
*** 1,8 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
  /*
!  * /src/NTP/REPOSITORY/v3/parse/parse.c,v 3.19 1994/01/25 19:05:20 kardel Exp
   *  
!  * parse.c,v 3.19 1994/01/25 19:05:20 kardel Exp
   *
   * Parser module for reference clock
   *
--- 1,8 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
  /*
!  * /src/NTP/REPOSITORY/v3/parse/parse.c,v 3.21 1994/02/02 17:45:30 kardel Exp
   *  
!  * parse.c,v 3.21 1994/02/02 17:45:30 kardel Exp
   *
   * Parser module for reference clock
   *
***************
*** 1148,1153 ****
--- 1148,1156 ----
   * History:
   *
   * parse.c,v
+  * Revision 3.21  1994/02/02  17:45:30  kardel
+  * rcs ids fixed
+  *
   * Revision 3.19  1994/01/25  19:05:20  kardel
   * 94/01/23 reconcilation
   *
diff -c parse/parse_conf.c:1.1.1.8 parse/parse_conf.c:3.15
*** parse/parse_conf.c:1.1.1.8	Wed Feb  9 23:59:01 1994
--- parse/parse_conf.c	Wed Feb  9 23:59:01 1994
***************
*** 1,8 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
  /*
!  * /src/NTP/REPOSITORY/v3/parse/parse_conf.c,v 3.13 1994/01/25 19:05:23 kardel Exp
   *  
!  * parse_conf.c,v 3.13 1994/01/25 19:05:23 kardel Exp
   *
   * Parser configuration module for reference clocks
   *
--- 1,8 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
  /*
!  * /src/NTP/REPOSITORY/v3/parse/parse_conf.c,v 3.15 1994/02/02 17:45:32 kardel Exp
   *  
!  * parse_conf.c,v 3.15 1994/02/02 17:45:32 kardel Exp
   *
   * Parser configuration module for reference clocks
   *
***************
*** 81,86 ****
--- 81,89 ----
   * History:
   *
   * parse_conf.c,v
+  * Revision 3.15  1994/02/02  17:45:32  kardel
+  * rcs ids fixed
+  *
   * Revision 3.13  1994/01/25  19:05:23  kardel
   * 94/01/23 reconcilation
   *
diff -c parse/parsesolaris.c:1.1.1.6 parse/parsesolaris.c:3.12
*** parse/parsesolaris.c:1.1.1.6	Wed Feb  9 23:59:02 1994
--- parse/parsesolaris.c	Wed Feb  9 23:59:02 1994
***************
*** 1,7 ****
  /*
!  * /src/NTP/REPOSITORY/v3/parse/parsesolaris.c,v 3.9 1994/01/25 19:05:26 kardel Exp
   *  
!  * parsesolaris.c,v 3.9 1994/01/25 19:05:26 kardel Exp
   *
   * STREAMS module for reference clocks
   * (SunOS5.x - not fully tested - buyer beware ! - OS KILLERS may still be
--- 1,7 ----
  /*
!  * /src/NTP/REPOSITORY/v3/parse/parsesolaris.c,v 3.12 1994/02/02 17:45:35 kardel Exp
   *  
!  * parsesolaris.c,v 3.12 1994/02/02 17:45:35 kardel Exp
   *
   * STREAMS module for reference clocks
   * (SunOS5.x - not fully tested - buyer beware ! - OS KILLERS may still be
***************
*** 139,145 ****
  /*ARGSUSED*/
  int _init(void)
  {
!   static char revision[] = "3.9";
    char *s, *S, *t;
    
    /*
--- 139,145 ----
  /*ARGSUSED*/
  int _init(void)
  {
!   static char revision[] = "3.12";
    char *s, *S, *t;
    
    /*
***************
*** 1179,1184 ****
--- 1179,1187 ----
   * History:
   *
   * parsesolaris.c,v
+  * Revision 3.12  1994/02/02  17:45:35  kardel
+  * rcs ids fixed
+  *
   * Revision 3.9  1994/01/25  19:05:26  kardel
   * 94/01/23 reconcilation
   *
diff -c parse/parsestreams.c:1.1.1.7 parse/parsestreams.c:3.14
*** parse/parsestreams.c:1.1.1.7	Wed Feb  9 23:59:03 1994
--- parse/parsestreams.c	Wed Feb  9 23:59:04 1994
***************
*** 1,7 ****
  /*
!  * /src/NTP/REPOSITORY/v3/parse/parsestreams.c,v 3.12 1994/01/25 19:05:30 kardel Exp
   *  
!  * parsestreams.c,v 3.12 1994/01/25 19:05:30 kardel Exp
   *
   * STREAMS module for reference clocks
   * (SunOS4.x)
--- 1,7 ----
  /*
!  * /src/NTP/REPOSITORY/v3/parse/parsestreams.c,v 3.14 1994/02/02 17:45:38 kardel Exp
   *  
!  * parsestreams.c,v 3.14 1994/02/02 17:45:38 kardel Exp
   *
   * STREAMS module for reference clocks
   * (SunOS4.x)
***************
*** 1258,1263 ****
--- 1258,1266 ----
   * History:
   *
   * parsestreams.c,v
+  * Revision 3.14  1994/02/02  17:45:38  kardel
+  * rcs ids fixed
+  *
   * Revision 3.12  1994/01/25  19:05:30  kardel
   * 94/01/23 reconcilation
   *
diff -c xntpd/ntp_proto.c:1.1.1.20 xntpd/ntp_proto.c:3.22
*** xntpd/ntp_proto.c:1.1.1.20	Thu Feb 10 00:00:36 1994
--- xntpd/ntp_proto.c	Thu Feb 10 00:00:36 1994
***************
*** 25,31 ****
  l_fp	sys_refskew;		/* accumulated skew since last update */
  struct peer *sys_peer;		/* our current peer */
  u_char	sys_poll;		/* log2 of desired system poll interval */
! LONG	sys_clock;		/* second part of current time */
  LONG	sys_lastselect;		/* sys_clock at last synch-dist update */
  
  /*
--- 25,31 ----
  l_fp	sys_refskew;		/* accumulated skew since last update */
  struct peer *sys_peer;		/* our current peer */
  u_char	sys_poll;		/* log2 of desired system poll interval */
! extern LONG	sys_clock;	/* second part of current time - now in systime.c */
  LONG	sys_lastselect;		/* sys_clock at last synch-dist update */
  
  /*
diff -c xntpd/ntpd.c:1.1.1.28 xntpd/ntpd.c:3.32
*** xntpd/ntpd.c:1.1.1.28	Thu Feb 10 00:00:43 1994
--- xntpd/ntpd.c	Thu Feb 10 00:00:43 1994
***************
*** 139,145 ****
  			(void) dup2(0, 1);
  			(void) dup2(0, 2);
  #ifdef NTP_POSIX_SOURCE
! #if	defined(SOLARIS) || defined(SYS_PTX) || defined(SYS_AUX3) || defined(SYS_AIX)
  			(void) setsid();
  #else
  			(void) setpgid(0, 0);
--- 139,145 ----
  			(void) dup2(0, 1);
  			(void) dup2(0, 2);
  #ifdef NTP_POSIX_SOURCE
! #if	defined(SOLARIS) || defined(SYS_PTX) || defined(SYS_AUX3) || defined(SYS_AIX) || defined(SYS_ULTRIX)
  			(void) setsid();
  #else
  			(void) setpgid(0, 0);
diff -c xntpd/refclock_parse.c:1.1.1.10 xntpd/refclock_parse.c:3.47
*** xntpd/refclock_parse.c:1.1.1.10	Thu Feb 10 00:00:54 1994
--- xntpd/refclock_parse.c	Thu Feb 10 00:00:54 1994
***************
*** 1,8 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
  /*
!  * /src/NTP/REPOSITORY/v3/xntpd/refclock_parse.c,v 3.45 1994/01/25 19:06:27 kardel Exp
   *
!  * refclock_parse.c,v 3.45 1994/01/25 19:06:27 kardel Exp
   *
   * generic reference clock driver for receivers
   *
--- 1,8 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
  /*
!  * /src/NTP/REPOSITORY/v3/xntpd/refclock_parse.c,v 3.47 1994/02/02 17:44:30 kardel Exp
   *
!  * refclock_parse.c,v 3.47 1994/02/02 17:44:30 kardel Exp
   *
   * generic reference clock driver for receivers
   *
***************
*** 3396,3401 ****
--- 3396,3404 ----
   * History:
   *
   * refclock_parse.c,v
+  * Revision 3.47  1994/02/02  17:44:30  kardel
+  * rcs ids fixed
+  *
   * Revision 3.45  1994/01/25  19:06:27  kardel
   * 94/01/23 reconcilation
   *

-- 
	   Frank Kardel (kardel@informatik.uni-erlangen.de)
    All SCSI disks will from now on be required to send an email
         notice 24 hours prior to complete hardware failure!