70

Unix/Linux 网络时间协议版本3 Network Time Protocol Version 3 (NTP) distribution for Unix systems

Replied: Mon, 20 Jan 1997 18:19:00 -0500
Replied: "Frank Kardel <[e-mail]> "
Received: from snow-white.ee.udel.edu by whimsy.udel.edu id aa08036;
          19 Jan 97 16:52 GMT
Received: from Flinx.dialin.informatik.uni-erlangen.de (kardel.dialin.informatik.uni-erlangen.de [131.188.19.204]) by immd4.informatik.uni-erlangen.de with SMTP
	id RAA16177 (8.7.6/7.5b-FAU); for <[e-mail]>; Sun, 19 Jan 1997 17:51:58 +0100 (MET)
Received: by Flinx.dialin.informatik.uni-erlangen.de (Smail3.1.29.0 #8)
	id m0vm0Rr-0005vPC; Sun, 19 Jan 1997 17:50:23 +0100
Message-Id: <[e-mail]>
Date: Sun, 19 Jan 1997 17:50:23 +0100
From: Frank Kardel <[e-mail]>
To: Harlan Stenn <[e-mail]>
Subject: patch for 5.88.1


Hi,

here is another small patch (i fixed some bugs of 5.88.1 in respect to
parse).

Thanks,
  Frank

Index: ChangeLog
diff -c ChangeLog:1.1.1.5 ChangeLog:1.5
*** ChangeLog:1.1.1.5	Sun Jan 19 13:20:21 1997
--- ChangeLog	Sun Jan 19 15:08:53 1997
***************
*** 1,3 ****
--- 1,11 ----
+ Sun Jan 19 14:56:29 1997  Frank Kardel  <[e-mail]>
+ 
+ 	* parseutil/dcfd.c (main): msyslog() is used for xntp code -
+  	dcfd.c is a standalone utility and thus not linked to libntp.a. So
+  	dcfd.c has to use syslog() directly.
+ 
+ 	* xntpd/refclock_parse.c: removed stream_nop(), parse_leap()
+ 
  Wed Jan 15 02:09:42 1997  Harlan Stenn  <[e-mail]>
  
  	* configure.in: For irix6, if -n{32,64} is not present in CFLAGS
Index: libparse/clk_computime.c
diff -c libparse/clk_computime.c:1.1.1.2 libparse/clk_computime.c:1.8
*** libparse/clk_computime.c:1.1.1.2	Sun Jan 19 13:09:34 1997
--- libparse/clk_computime.c	Sun Jan 19 13:44:35 1997
***************
*** 4,10 ****
  
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_COMPUTIME)
  /*
!  * clk_computime.c,v 1.7 1996/12/01 16:04:12 kardel Exp
   * 
   * Supports Diem's Computime Radio Clock
   * 
--- 4,10 ----
  
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_COMPUTIME)
  /*
!  * clk_computime.c,v 1.8 1997/01/19 12:44:35 kardel Exp
   * 
   * Supports Diem's Computime Radio Clock
   * 
***************
*** 128,133 ****
--- 128,136 ----
  
  /*
   * clk_computime.c,v
+  * Revision 1.8  1997/01/19 12:44:35  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 1.7  1996/12/01 16:04:12  kardel
   * freeze for 5.86.12.2 PARSE-Patch
   *
Index: libparse/clk_dcf7000.c
diff -c libparse/clk_dcf7000.c:1.1.1.15 libparse/clk_dcf7000.c:3.18
*** libparse/clk_dcf7000.c:1.1.1.15	Sun Jan 19 13:09:31 1997
--- libparse/clk_dcf7000.c	Sun Jan 19 13:44:36 1997
***************
*** 1,7 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_dcf7000.c,v 3.17 1996/12/01 16:04:13 kardel Exp
   *  
!  * clk_dcf7000.c,v 3.17 1996/12/01 16:04:13 kardel Exp
   *
   * ELV DCF7000 module
   *
--- 1,7 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_dcf7000.c,v 3.18 1997/01/19 12:44:36 kardel Exp
   *  
!  * clk_dcf7000.c,v 3.18 1997/01/19 12:44:36 kardel Exp
   *
   * ELV DCF7000 module
   *
***************
*** 131,136 ****
--- 131,139 ----
   * History:
   *
   * clk_dcf7000.c,v
+  * Revision 3.18  1997/01/19 12:44:36  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 3.17  1996/12/01 16:04:13  kardel
   * freeze for 5.86.12.2 PARSE-Patch
   *
Index: libparse/clk_hopf6021.c
diff -c libparse/clk_hopf6021.c:1.1.1.5 libparse/clk_hopf6021.c:3.5
*** libparse/clk_hopf6021.c:1.1.1.5	Sun Jan 19 13:09:33 1997
--- libparse/clk_hopf6021.c	Sun Jan 19 13:44:37 1997
***************
*** 1,8 ****
  /*
   *
!  * /src/NTP/REPOSITORY/v4/libparse/clk_hopf6021.c,v 3.4 1996/11/24 20:09:43 kardel Exp
   *
!  * clk_hopf6021.c,v 3.4 1996/11/24 20:09:43 kardel Exp
   *
   * Radiocode Clocks HOPF Funkuhr 6021 mit serieller Schnittstelle
   * base code version from 24th Nov 1995 - history at end
--- 1,8 ----
  /*
   *
!  * /src/NTP/REPOSITORY/v4/libparse/clk_hopf6021.c,v 3.5 1997/01/19 12:44:37 kardel Exp
   *
!  * clk_hopf6021.c,v 3.5 1997/01/19 12:44:37 kardel Exp
   *
   * Radiocode Clocks HOPF Funkuhr 6021 mit serieller Schnittstelle
   * base code version from 24th Nov 1995 - history at end
***************
*** 220,225 ****
--- 220,228 ----
   * History:
   *
   * clk_hopf6021.c,v
+  * Revision 3.5  1997/01/19 12:44:37  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 3.4  1996/11/24 20:09:43  kardel
   * RELEASE_5_86_12_2 reconcilation
   *
Index: libparse/clk_meinberg.c
diff -c libparse/clk_meinberg.c:1.1.1.18 libparse/clk_meinberg.c:3.23
*** libparse/clk_meinberg.c:1.1.1.18	Sun Jan 19 13:09:25 1997
--- libparse/clk_meinberg.c	Sun Jan 19 13:44:38 1997
***************
*** 1,7 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_meinberg.c,v 3.22 1996/12/01 16:04:14 kardel Exp
   *  
!  * clk_meinberg.c,v 3.22 1996/12/01 16:04:14 kardel Exp
   *
   * Meinberg clock support
   *
--- 1,7 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_meinberg.c,v 3.23 1997/01/19 12:44:38 kardel Exp
   *  
!  * clk_meinberg.c,v 3.23 1997/01/19 12:44:38 kardel Exp
   *
   * Meinberg clock support
   *
***************
*** 457,462 ****
--- 457,465 ----
   * History:
   *
   * clk_meinberg.c,v
+  * Revision 3.23  1997/01/19 12:44:38  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 3.22  1996/12/01 16:04:14  kardel
   * freeze for 5.86.12.2 PARSE-Patch
   *
Index: libparse/clk_rawdcf.c
diff -c libparse/clk_rawdcf.c:1.1.1.18 libparse/clk_rawdcf.c:3.23
*** libparse/clk_rawdcf.c:1.1.1.18	Sun Jan 19 13:09:29 1997
--- libparse/clk_rawdcf.c	Sun Jan 19 13:44:39 1997
***************
*** 1,7 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_rawdcf.c,v 3.22 1996/12/01 16:04:15 kardel Exp
   *  
!  * clk_rawdcf.c,v 3.22 1996/12/01 16:04:15 kardel Exp
   *
   * Raw DCF77 pulse clock support
   *
--- 1,7 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_rawdcf.c,v 3.23 1997/01/19 12:44:39 kardel Exp
   *  
!  * clk_rawdcf.c,v 3.23 1997/01/19 12:44:39 kardel Exp
   *
   * Raw DCF77 pulse clock support
   *
***************
*** 540,545 ****
--- 540,548 ----
   * History:
   *
   * clk_rawdcf.c,v
+  * Revision 3.23  1997/01/19 12:44:39  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 3.22  1996/12/01 16:04:15  kardel
   * freeze for 5.86.12.2 PARSE-Patch
   *
Index: libparse/clk_rcc8000.c
diff -c libparse/clk_rcc8000.c:1.1.1.7 libparse/clk_rcc8000.c:3.5
*** libparse/clk_rcc8000.c:1.1.1.7	Sun Jan 19 13:09:32 1997
--- libparse/clk_rcc8000.c	Sun Jan 19 13:44:40 1997
***************
*** 1,7 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_rcc8000.c,v 3.4 1996/11/24 20:09:45 kardel Exp
   *  
!  * clk_rcc8000.c,v 3.4 1996/11/24 20:09:45 kardel Exp
   *
   * Radiocode Clocks Ltd RCC 8000 Intelligent Off-Air Master Clock support
   *
--- 1,7 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_rcc8000.c,v 3.5 1997/01/19 12:44:40 kardel Exp
   *  
!  * clk_rcc8000.c,v 3.5 1997/01/19 12:44:40 kardel Exp
   *
   * Radiocode Clocks Ltd RCC 8000 Intelligent Off-Air Master Clock support
   *
***************
*** 134,139 ****
--- 134,142 ----
   * History:
   *
   * clk_rcc8000.c,v
+  * Revision 3.5  1997/01/19 12:44:40  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 3.4  1996/11/24 20:09:45  kardel
   * RELEASE_5_86_12_2 reconcilation
   *
Index: libparse/clk_schmid.c
diff -c libparse/clk_schmid.c:1.1.1.17 libparse/clk_schmid.c:3.22
*** libparse/clk_schmid.c:1.1.1.17	Sun Jan 19 13:09:26 1997
--- libparse/clk_schmid.c	Sun Jan 19 13:44:41 1997
***************
*** 1,7 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_schmid.c,v 3.21 1996/12/01 16:04:15 kardel Exp
   *  
!  * clk_schmid.c,v 3.21 1996/12/01 16:04:15 kardel Exp
   *
   * Schmid clock support
   *
--- 1,7 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_schmid.c,v 3.22 1997/01/19 12:44:41 kardel Exp
   *  
!  * clk_schmid.c,v 3.22 1997/01/19 12:44:41 kardel Exp
   *
   * Schmid clock support
   *
***************
*** 177,182 ****
--- 177,185 ----
   * History:
   *
   * clk_schmid.c,v
+  * Revision 3.22  1997/01/19 12:44:41  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 3.21  1996/12/01 16:04:15  kardel
   * freeze for 5.86.12.2 PARSE-Patch
   *
Index: libparse/clk_trimtaip.c
diff -c libparse/clk_trimtaip.c:1.1.1.6 libparse/clk_trimtaip.c:1.4
*** libparse/clk_trimtaip.c:1.1.1.6	Sun Jan 19 13:09:32 1997
--- libparse/clk_trimtaip.c	Sun Jan 19 13:44:41 1997
***************
*** 1,5 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_trimtaip.c,v 1.3 1996/11/24 20:09:47 kardel Exp
   *
   * Trimble SV6 clock support
   */
--- 1,5 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_trimtaip.c,v 1.4 1997/01/19 12:44:41 kardel Exp
   *
   * Trimble SV6 clock support
   */
***************
*** 117,122 ****
--- 117,125 ----
   * History:
   *
   * clk_trimtaip.c,v
+  * Revision 1.4  1997/01/19 12:44:41  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 1.3  1996/11/24 20:09:47  kardel
   * RELEASE_5_86_12_2 reconcilation
   *
Index: libparse/clk_trimtsip.c
diff -c libparse/clk_trimtsip.c:1.1.1.6 libparse/clk_trimtsip.c:1.7
*** libparse/clk_trimtsip.c:1.1.1.6	Sun Jan 19 13:09:30 1997
--- libparse/clk_trimtsip.c	Sun Jan 19 13:44:42 1997
***************
*** 1,5 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_trimtsip.c,v 1.6 1996/12/01 12:59:10 kardel Exp
   *
   * Trimble TSIP support - CURRENTLY VERY MUCH UNDER CONSTRUCTION
   */
--- 1,5 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/clk_trimtsip.c,v 1.7 1997/01/19 12:44:42 kardel Exp
   *
   * Trimble TSIP support - CURRENTLY VERY MUCH UNDER CONSTRUCTION
   */
***************
*** 496,501 ****
--- 496,504 ----
   * History:
   *
   * clk_trimtsip.c,v
+  * Revision 1.7  1997/01/19 12:44:42  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 1.6  1996/12/01 12:59:10  kardel
   * appropriate casts for conversion routine parameters
   *
Index: libparse/parse.c
diff -c libparse/parse.c:1.1.1.22 libparse/parse.c:3.42
*** libparse/parse.c:1.1.1.22	Sun Jan 19 13:09:27 1997
--- libparse/parse.c	Sun Jan 19 15:37:19 1997
***************
*** 1,17 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/parse.c,v 3.40 1996/12/01 16:04:16 kardel Exp
   *  
!  * parse.c,v 3.40 1996/12/01 16:04:16 kardel Exp
   *
   * Parser module for reference clock
   *
   * PARSEKERNEL define switches between two personalities of the module
!  * if PARSEKERNEL is defined this module can be used with dcf77sync.c as
!  * a PARSEKERNEL kernel module. In this case the time stamps will be
   * a struct timeval.
   * when PARSEKERNEL is not defined NTP time stamps will be used.
   *
!  * Copyright (c) 1992,1993,1994,1995,1996 by Frank Kardel
   * Friedrich-Alexander Universitt Erlangen-Nrnberg, Germany
   *                                    
   * This program is distributed in the hope that it will be useful,
--- 1,17 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/parse.c,v 3.42 1997/01/19 14:37:19 kardel Exp
   *  
!  * parse.c,v 3.42 1997/01/19 14:37:19 kardel Exp
   *
   * Parser module for reference clock
   *
   * PARSEKERNEL define switches between two personalities of the module
!  * if PARSEKERNEL is defined this module can be used
!  * as kernel module. In this case the time stamps will be
   * a struct timeval.
   * when PARSEKERNEL is not defined NTP time stamps will be used.
   *
!  * Copyright (c) 1992,1993,1994,1995,1996, 1997 by Frank Kardel
   * Friedrich-Alexander Universitt Erlangen-Nrnberg, Germany
   *                                    
   * This program is distributed in the hope that it will be useful,
***************
*** 37,43 ****
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
  
  #if	!(defined(lint) || defined(__GNUC__))
! static char rcsid[] = "parse.c,v 3.40 1996/12/01 16:04:16 kardel Exp";
  #endif
  
  #include <sys/types.h>
--- 37,43 ----
  #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
  
  #if	!(defined(lint) || defined(__GNUC__))
! static char rcsid[] = "parse.c,v 3.42 1997/01/19 14:37:19 kardel Exp";
  #endif
  
  #include <sys/types.h>
***************
*** 1094,1099 ****
--- 1094,1105 ----
   * History:
   *
   * parse.c,v
+  * Revision 3.42  1997/01/19 14:37:19  kardel
+  * fixed comments
+  *
+  * Revision 3.41  1997/01/19 12:44:43  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 3.40  1996/12/01 16:04:16  kardel
   * freeze for 5.86.12.2 PARSE-Patch
   *
Index: libparse/parse_conf.c
diff -c libparse/parse_conf.c:1.1.1.15 libparse/parse_conf.c:3.24
*** libparse/parse_conf.c:1.1.1.15	Sun Jan 19 13:09:24 1997
--- libparse/parse_conf.c	Sun Jan 19 13:44:45 1997
***************
*** 1,7 ****
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/parse_conf.c,v 3.23 1996/12/01 16:04:17 kardel Exp
   *  
!  * parse_conf.c,v 3.23 1996/12/01 16:04:17 kardel Exp
   *
   * Parser configuration module for reference clocks
   *
--- 1,7 ----
  /*
!  * /src/NTP/REPOSITORY/v4/libparse/parse_conf.c,v 3.24 1997/01/19 12:44:45 kardel Exp
   *  
!  * parse_conf.c,v 3.24 1997/01/19 12:44:45 kardel Exp
   *
   * Parser configuration module for reference clocks
   *
***************
*** 117,122 ****
--- 117,125 ----
   * History:
   *
   * parse_conf.c,v
+  * Revision 3.24  1997/01/19 12:44:45  kardel
+  * 3-5.88.1 reconcilation
+  *
   * Revision 3.23  1996/12/01 16:04:17  kardel
   * freeze for 5.86.12.2 PARSE-Patch
   *
Index: parseutil/dcfd.c
diff -c parseutil/dcfd.c:1.1.1.12 parseutil/dcfd.c:3.30
*** parseutil/dcfd.c:1.1.1.12	Sun Jan 19 13:09:59 1997
--- parseutil/dcfd.c	Sun Jan 19 15:41:15 1997
***************
*** 1,19 ****
  /*
!  * /src/NTP/REPOSITORY/v4/parseutil/dcfd.c,v 3.27 1996/12/01 16:05:02 kardel Exp
   *  
!  * dcfd.c,v 3.27 1996/12/01 16:05:02 kardel Exp
   *
   * DCF77 100/200ms pulse synchronisation daemon program (via 50Baud serial line)
   *
   * Features:
   *  DCF77 decoding
!  *  NTP loopfilter logic for local clock
   *  interactive display for debugging
   *
   * Lacks:
   *  Leap second handling (at that level you should switch to xntp3 - really!)
   *
!  * Copyright (C) 1993,1994,1995,1996 by Frank Kardel
   * Friedrich-Alexander Universitt Erlangen-Nrnberg, Germany
   *                                    
   * This program is distributed in the hope that it will be useful,
--- 1,19 ----
  /*
!  * /src/NTP/REPOSITORY/v4/parseutil/dcfd.c,v 3.30 1997/01/19 14:41:15 kardel Exp
   *  
!  * dcfd.c,v 3.30 1997/01/19 14:41:15 kardel Exp
   *
   * DCF77 100/200ms pulse synchronisation daemon program (via 50Baud serial line)
   *
   * Features:
   *  DCF77 decoding
!  *  simple NTP loopfilter logic for local clock
   *  interactive display for debugging
   *
   * Lacks:
   *  Leap second handling (at that level you should switch to xntp3 - really!)
   *
!  * Copyright (C) 1993, 1994, 1995, 1996, 1997 by Frank Kardel
   * Friedrich-Alexander Universitt Erlangen-Nrnberg, Germany
   *                                    
   * This program is distributed in the hope that it will be useful,
***************
*** 40,45 ****
--- 40,46 ----
  /*
   * NTP compilation environment
   */
+ #include "l_stdlib.h"
  #ifdef USE_PROTOTYPES
  #include "ntp_stdlib.h"