12

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

    snt_rawdcf,			/* synthesize time code from input */
    (void *)0,			/* buffer bit representation */
--- 84,103 ----
   * 59		      - usually missing (minute indication), except for leap insertion
   */
  
! /* clk_rawdcf.c */
! static u_long ext_bf P((char *, int, char *));
! static unsigned pcheck P((char *, int, char *));
! struct dcfparam;
! static u_long convert_rawdcf P((unsigned char *, int, struct dcfparam *, clocktime_t *));
! static u_long cvt_rawdcf P((char *, unsigned int, void *, clocktime_t *, void *));
! static u_long pps_rawdcf P((parse_t *, int, timestamp_t *));
! static u_long snt_rawdcf P((parse_t *, timestamp_t *));
  
  clockformat_t clock_rawdcf =
  {
!   NULL,				/* no input handling */
    cvt_rawdcf,			/* raw dcf input conversion */
!   NULL,				/* no character bound synchronisation */
    pps_rawdcf,			/* examining PPS information */
    snt_rawdcf,			/* synthesize time code from input */
    (void *)0,			/* buffer bit representation */
***************
*** 314,325 ****
   * raw dcf input routine - needs to fix up 50 baud
   * characters for 1/0 decision
   */
! static u_long cvt_rawdcf(buffer, size, param, clock)
!   register unsigned char   *buffer;
!   register int              size;
!   register void            *param;
    register clocktime_t     *clock;
  {
    register unsigned char *s = buffer;
    register unsigned char *e = buffer + size;
    register unsigned char *b = dcfparam.onebits;
--- 319,332 ----
   * raw dcf input routine - needs to fix up 50 baud
   * characters for 1/0 decision
   */
! static u_long cvt_rawdcf(bp, size, vf, clock, vt)
!   register char   	   *bp;
!   register unsigned int     size;
!   register void            *vf;
    register clocktime_t     *clock;
+   register void            *vt;
  {
+   register unsigned char *buffer = (unsigned char *) bp;
    register unsigned char *s = buffer;
    register unsigned char *e = buffer + size;
    register unsigned char *b = dcfparam.onebits;
***************
*** 366,372 ****
  	}
        else
  	{
! 	  parseprintf(DD_RAWDCF,("parse: cvt_rawdcf: character check for 0x%x@%d FAILED\n", *s, s - buffer));
  	  *s = ~0;
  	  rtc = CVT_FAIL|CVT_BADFMT;
  	}
--- 373,379 ----
  	}
        else
  	{
! 	  parseprintf(DD_RAWDCF,("parse: cvt_rawdcf: character check for 0x%x@%ld FAILED\n", *s, (long)(s - buffer)));
  	  *s = ~0;
  	  rtc = CVT_FAIL|CVT_BADFMT;
  	}
diff -rc old/usr.sbin/xntp/xntpd/clk_rcc8000.c new/usr.sbin/xntp/xntpd/clk_rcc8000.c
*** old/usr.sbin/xntp/xntpd/clk_rcc8000.c	Mon Aug 10 17:42:54 1998
--- new/usr.sbin/xntp/xntpd/clk_rcc8000.c	Mon Aug 10 17:18:50 1998
***************
*** 52,66 ****
    0 
  };
  
! static unsigned long cvt_rcc8000();
  
  clockformat_t clock_rcc8000 =
  {
!   (unsigned long (*)())0,       /* no input handling */
!   cvt_rcc8000,		/* Radiocode clock conversion */
    syn_simple,			/* easy time stamps for RS232 (fallback) */
!   (unsigned long (*)())0,       /* no direct PPS monitoring */
!   (unsigned long (*)())0,	/* no time code synthesizer monitoring */
    (void *)&rcc8000_fmt,		/* conversion configuration */
    "Radiocode RCC8000",
    31,				/* string buffer */
--- 52,66 ----
    0 
  };
  
! static u_long cvt_rcc8000 P((char *, unsigned int, void *, clocktime_t *, void *));
  
  clockformat_t clock_rcc8000 =
  {
!   NULL,				/* no input handling */
!   cvt_rcc8000,			/* Radiocode clock conversion */
    syn_simple,			/* easy time stamps for RS232 (fallback) */
!   NULL,				/* no direct PPS monitoring */
!   NULL,				/* no time code synthesizer monitoring */
    (void *)&rcc8000_fmt,		/* conversion configuration */
    "Radiocode RCC8000",
    31,				/* string buffer */
***************
*** 73,84 ****
  };
  
  static unsigned long
! cvt_rcc8000(buffer, size, format, clock)
    register char          *buffer;
!   register int            size;
!   register struct format *format;
    register clocktime_t   *clock;
  {
    if (!Strok(buffer, format->fixed_string)) return CVT_NONE;
  #define	OFFS(x) format->field_offsets[(x)].offset
  #define STOI(x, y) Stoi(&buffer[OFFS(x)], y, format->field_offsets[(x)].length)
--- 73,86 ----
  };
  
  static unsigned long
! cvt_rcc8000(buffer, size, vf, clock, vt)
    register char          *buffer;
!   register unsigned int   size;
!   register void          *vf;
    register clocktime_t   *clock;
+   register void          *vt;
  {
+   register struct format *format = vf;
    if (!Strok(buffer, format->fixed_string)) return CVT_NONE;
  #define	OFFS(x) format->field_offsets[(x)].offset
  #define STOI(x, y) Stoi(&buffer[OFFS(x)], y, format->field_offsets[(x)].length)
diff -rc old/usr.sbin/xntp/xntpd/clk_schmid.c new/usr.sbin/xntp/xntpd/clk_schmid.c
*** old/usr.sbin/xntp/xntpd/clk_schmid.c	Mon Aug 10 17:42:54 1998
--- new/usr.sbin/xntp/xntpd/clk_schmid.c	Mon Aug 10 17:18:28 1998
***************
*** 63,77 ****
  #define   WS_MEST	0x04
  #define WS_LEAP		0x10
  
! static u_long cvt_schmid();
  
  clockformat_t clock_schmid =
  {
!   (unsigned long (*)())0,	/* no input handling */
    cvt_schmid,			/* Schmid conversion */
    syn_simple,			/* easy time stamps */
!   (u_long (*)())0,		/* not direct PPS monitoring */
!   (u_long (*)())0,		/* no time code synthesizer monitoring */
    (void *)0,			/* conversion configuration */
    "Schmid",			/* Schmid receiver */
    12,				/* binary data buffer */
--- 63,77 ----
  #define   WS_MEST	0x04
  #define WS_LEAP		0x10
  
! static u_long cvt_schmid P((char *, unsigned int, void *, clocktime_t *, void *));
  
  clockformat_t clock_schmid =
  {
!   NULL,				/* no input handling */
    cvt_schmid,			/* Schmid conversion */
    syn_simple,			/* easy time stamps */
!   NULL,				/* not direct PPS monitoring */
!   NULL,				/* no time code synthesizer monitoring */
    (void *)0,			/* conversion configuration */
    "Schmid",			/* Schmid receiver */
    12,				/* binary data buffer */
***************
*** 85,96 ****
  
  
  static u_long
! cvt_schmid(buffer, size, format, clock)
!   register unsigned char *buffer;
!   register int            size;
!   register struct format *format;
    register clocktime_t   *clock;
  {
    if ((size != 11) || (buffer[10] != (unsigned char)'\375'))
      {
        return CVT_NONE;
--- 85,98 ----
  
  
  static u_long
! cvt_schmid(bp, size, vf, clock, vt)
!   register char 	 *bp;
!   register unsigned int   size;
!   register void 	 *vf;
    register clocktime_t   *clock;
+   register void 	 *vt;
  {
+   register unsigned char *buffer = (unsigned char *) bp;
    if ((size != 11) || (buffer[10] != (unsigned char)'\375'))
      {
        return CVT_NONE;
diff -rc old/usr.sbin/xntp/xntpd/clk_trimtaip.c new/usr.sbin/xntp/xntpd/clk_trimtaip.c
*** old/usr.sbin/xntp/xntpd/clk_trimtaip.c	Mon Aug 10 17:42:54 1998
--- new/usr.sbin/xntp/xntpd/clk_trimtaip.c	Mon Aug 10 17:18:04 1998
***************
*** 43,57 ****
    0
  };
  
! static unsigned long cvt_trimtaip();
  
  clockformat_t clock_trimtaip =
  {
!   (unsigned long (*)())0,	/* no input handling */
    cvt_trimtaip,			/* Trimble conversion */
    syn_simple,			/* easy time stamps for RS232 (fallback) */
    pps_simple,			/* easy PPS monitoring */
!   (unsigned long (*)())0,	/* no time code synthesizer monitoring */
    (void *)&trimsv6_fmt,		/* conversion configuration */
    "Trimble SV6/TAIP",
    37,				/* string buffer */
--- 43,60 ----
    0
  };
  
! 
! 
! /* clk_trimtaip.c */
! static u_long cvt_trimtaip P((char *, unsigned int, void *, clocktime_t *, void *));
  
  clockformat_t clock_trimtaip =
  {
!   NULL,				/* no input handling */
    cvt_trimtaip,			/* Trimble conversion */
    syn_simple,			/* easy time stamps for RS232 (fallback) */
    pps_simple,			/* easy PPS monitoring */
!   NULL,				/* no time code synthesizer monitoring */
    (void *)&trimsv6_fmt,		/* conversion configuration */
    "Trimble SV6/TAIP",
    37,				/* string buffer */
***************
*** 63,75 ****
    '\0'
  };
  
! static unsigned long
! cvt_trimtaip(buffer, size, format, clock)
    register char          *buffer;
!   register int            size;
!   register struct format *format;
    register clocktime_t   *clock;
  {
    long gpsfix;
    u_char calc_csum = 0;
    long   recv_csum;
--- 66,80 ----
    '\0'
  };
  
! static u_long
! cvt_trimtaip(buffer, size, vf, clock, vt)
    register char          *buffer;
!   register unsigned int   size;
!   register void		 *vf;
    register clocktime_t   *clock;
+   register void		 *vt;
  {
+   register struct format *format = vf;
    long gpsfix;
    u_char calc_csum = 0;
    long   recv_csum;
diff -rc old/usr.sbin/xntp/xntpd/clk_trimtsip.c new/usr.sbin/xntp/xntpd/clk_trimtsip.c
*** old/usr.sbin/xntp/xntpd/clk_trimtsip.c	Mon Aug 10 17:42:54 1998
--- new/usr.sbin/xntp/xntpd/clk_trimtsip.c	Mon Aug 10 17:17:37 1998
***************
*** 104,111 ****
    u_char  t_leap;		/* possible leap warning */
  };
  
! static unsigned long inp_tsip();
! static unsigned long cvt_trimtsip();
  
  struct clockformat clock_trimtsip =
  {
--- 104,114 ----
    u_char  t_leap;		/* possible leap warning */
  };
  
! static u_long inp_tsip P((parse_t *, unsigned int, timestamp_t *));
! static u_long cvt_trimtsip P((char *, unsigned int, void *, clocktime_t *, void *));
! static float getflt P((u_char *));
! static double getdbl P((u_char *));
! static int getint P((u_char *));
  
  struct clockformat clock_trimtsip =
  {
***************
*** 113,120 ****
    cvt_trimtsip,			/* Trimble TSIP conversion */
    syn_simple,			/* easy time stamps for RS232 (fallback) */
    pps_simple,			/* easy PPS monitoring */
!   (unsigned long (*)())0,	/* no time code synthesizer monitoring */
!   (void *)0,			/* no configuration data */
    "Trimble SV6/TSIP",
    128,				/* input buffer */
    CVT_FIXEDONLY,                /* we do our own input handling */
--- 116,123 ----
    cvt_trimtsip,			/* Trimble TSIP conversion */
    syn_simple,			/* easy time stamps for RS232 (fallback) */
    pps_simple,			/* easy PPS monitoring */
!   NULL,				/* no time code synthesizer monitoring */
!   NULL,				/* no configuration data */
    "Trimble SV6/TSIP",
    128,				/* input buffer */
    CVT_FIXEDONLY,                /* we do our own input handling */
***************
*** 131,139 ****
  #define DLE		0x10
  #define ETX		0x03
  
  static unsigned long inp_tsip(parseio, ch, ctime)
       register parse_t      *parseio;
!      register unsigned char ch;
       register timestamp_t  *ctime;
  {
    register struct trimble *t = (struct trimble *)parseio->parse_pdata;
--- 134,143 ----
  #define DLE		0x10
  #define ETX		0x03
  
+ 
  static unsigned long inp_tsip(parseio, ch, ctime)
       register parse_t      *parseio;
!      register unsigned int ch;
       register timestamp_t  *ctime;
  {
    register struct trimble *t = (struct trimble *)parseio->parse_pdata;
***************
*** 213,225 ****
   * convert TSIP type format
   */
  static unsigned long
! cvt_trimtsip(buffer, size, format, clock, t)
    register char          *buffer;
!   register int            size;
!   register struct format *format;
    register clocktime_t   *clock;
!   register struct trimble *t;
  {
  #define mb(_X_) (buffer[2+(_X_)]) /* shortcut for buffer access */
    register u_char cmd;
  
--- 217,230 ----
   * convert TSIP type format
   */
  static unsigned long
! cvt_trimtsip(buffer, size, vf, clock, vt)
    register char          *buffer;
!   register unsigned int   size;
!   register void		 *vf;
    register clocktime_t   *clock;
!   register void		 *vt;
  {
+   register struct trimble *t = vt;
  #define mb(_X_) (buffer[2+(_X_)]) /* shortcut for buffer access */
    register u_char cmd;
  
diff -rc old/usr.sbin/xntp/xntpd/ntp_config.c new/usr.sbin/xntp/xntpd/ntp_config.c
*** old/usr.sbin/xntp/xntpd/ntp_config.c	Mon Aug 10 17:42:52 1998
--- new/usr.sbin/xntp/xntpd/ntp_config.c	Mon Aug 10 17:25:57 1998
***************
*** 484,490 ****
  	/*
  	 * Decode argument list
  	 */
! 	while ((c = ntp_getopt(argc, argv, xntp_options)) != EOF)
  		switch (c) {
  #ifdef DEBUG
  		case 'd':
--- 484,490 ----
  	/*
  	 * Decode argument list
  	 */
! 	while ((c = ntp_getopt(argc, argv, xntp_options)) != -1)
  		switch (c) {
  #ifdef DEBUG
  		case 'd':
***************
*** 646,652 ****
  	/*
  	 * Decode argument list
  	 */
! 	while ((c = ntp_getopt(argc, argv, xntp_options)) != EOF) {
  		switch (c) {
  		case 'a':
  			proto_config(PROTO_AUTHENTICATE, 1);
--- 646,652 ----
  	/*
  	 * Decode argument list
  	 */
! 	while ((c = ntp_getopt(argc, argv, xntp_options)) != -1) {
  		switch (c) {
  		case 'a':
  			proto_config(PROTO_AUTHENTICATE, 1);
diff -rc old/usr.sbin/xntp/xntpd/ntp_control.c new/usr.sbin/xntp/xntpd/ntp_control.c
*** old/usr.sbin/xntp/xntpd/ntp_control.c	Mon Aug 10 17:42:52 1998
--- new/usr.sbin/xntp/xntpd/ntp_control.c	Mon Aug 10 17:28:13 1998
***************
*** 28,34 ****
  struct ctl_proc {
  	short control_code;	/* defined request code */
  	u_short flags;		/* flags word */
! 	void (*handler)();	/* routine to handle request */
  };
  
  /*
--- 28,35 ----
  struct ctl_proc {
  	short control_code;	/* defined request code */
  	u_short flags;		/* flags word */
! 	void (*handler)		/* routine to handle request */
! 		P((struct recvbuf *, int));
  };
  
  /*
diff -rc old/usr.sbin/xntp/xntpd/ntp_proto.c new/usr.sbin/xntp/xntpd/ntp_proto.c
*** old/usr.sbin/xntp/xntpd/ntp_proto.c	Mon Aug 10 17:42:52 1998
--- new/usr.sbin/xntp/xntpd/ntp_proto.c	Mon Aug 10 17:26:57 1998
***************
*** 103,108 ****
--- 103,110 ----
  extern int debug;
  
  static	void	clear_all	P((void));
+ static	int	default_get_precision P((void));
+ 
  
  /*
   * transmit - Transmit Procedure. See Section 3.4.2 of the
diff -rc old/usr.sbin/xntp/xntpd/ntpd.c new/usr.sbin/xntp/xntpd/ntpd.c
*** old/usr.sbin/xntp/xntpd/ntpd.c	Mon Aug 10 17:42:52 1998
--- new/usr.sbin/xntp/xntpd/ntpd.c	Mon Aug 10 17:25:37 1998
***************
*** 168,187 ****
  #endif	/* not DEBUG */
  
  #ifdef NO_MAIN_ALLOWED
  CALL(xntpd,"xntpd",xntpdmain);
  #endif
  
  /*
   * Main program.  Initialize us, disconnect us from the tty if necessary,
   * and loop waiting for I/O and/or timer expiries.
   */
- #if !defined(VMS)
- void
- #endif /* VMS */
  #ifndef NO_MAIN_ALLOWED
! main
  #else
! xntpdmain
  #endif
  (argc, argv)
       int argc;
--- 168,187 ----
  #endif	/* not DEBUG */
  
  #ifdef NO_MAIN_ALLOWED
+ void xntpdmain P((int, char *[]));
  CALL(xntpd,"xntpd",xntpdmain);
+ #else
+ int main P((int, char *[]));
  #endif
  
  /*
   * Main program.  Initialize us, disconnect us from the tty if necessary,
   * and loop waiting for I/O and/or timer expiries.
   */
  #ifndef NO_MAIN_ALLOWED
! int main
  #else
! void xntpdmain
  #endif
  (argc, argv)
       int argc;
Only in new/usr.sbin/xntp/xntpd: obj.i386
diff -rc old/usr.sbin/xntp/xntpd/parse.c new/usr.sbin/xntp/xntpd/parse.c
*** old/usr.sbin/xntp/xntpd/parse.c	Mon Aug 10 17:42:54 1998
--- new/usr.sbin/xntp/xntpd/parse.c	Mon Aug 10 17:20:52 1998
***************
*** 73,79 ****
  extern clockformat_t *clockformats[];
  extern unsigned short nformats;