179

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

Replied: Thu, 05 Mar 1998 21:23:53 -0500
Replied: "Marc Brett <[e-mail]> "
Received: from mail.eecis.udel.edu by whimsy.udel.edu id aa23592;
          5 Mar 1998 11:19 EST
Received: by diamond.waii.com id KAA12045; Thu, 5 Mar 1998 10:14:09 -0600 sender [e-mail] for 
Received: from mail.wg.waii.com(137.144.128.17) user <[e-mail]> by diamond.waii.com via smap (3.2)
	id xma011875; Thu, 5 Mar 98 10:13:12 -0600
Received: from merlin.london.waii.com (merlin.london.waii.com [136.250.33.1])
	by mail1.wg.waii.com (8.8.7/8.8.7) with ESMTP id KAA36416;
	Thu, 5 Mar 1998 10:12:56 -0600
Received: from rgs0.london.waii.com (rgs0.london.waii.com [136.250.40.10])
          by merlin.london.waii.com (8.8.4/8.8.4) with SMTP
	  id QAA28018; Thu, 5 Mar 1998 16:12:51 GMT
Received: by rgs0.london.waii.com (951211.SGI.8.6.12.PATCH1502/920502.SGI)
	 id QAA13772; Thu, 5 Mar 1998 16:12:48 GMT
From: Marc Brett <[e-mail]>
Message-Id: <[e-mail]>
Date: Thu, 5 Mar 1998 16:12:47 +0000
In-Reply-To: [e-mail]
        "prerelease testing of xntp3-5.92a" (Mar  3,  1:18pm)
References: <[e-mail]>
X-Mailer: Z-Mail (3.2.0 26oct94 MediaMail)
To: [e-mail]
Subject: Re: prerelease testing of xntp3-5.92a
Cc: [e-mail], Craig Leres <[e-mail]>, 
    Marc Brett <[e-mail]>, [e-mail]
Mime-Version: 1.0
Content-Type: multipart/mixed;
	boundary="PART-BOUNDARY=.19803051612.ZM13770.london.waii.com"

--
--PART-BOUNDARY=.19803051612.ZM13770.london.waii.com
Content-Type: text/plain; charset=us-ascii

Harlan,

Please find three attachments with this message.

The first are some diffs to suppress various compiler warning messages on
AIX 3.2.5, IRIX 6.4 (most of them), IRIX 5.3 and SunOS 4.1.3

The second attachment is to translate the Jupiter driver from ANSI C to
the hybrid ANSI/K&R C to get it to compile on SunOS 4.1.3.

The last attachment contains some SunOS compiler warnings for the msfees
driver.  They look serious, but I couldn't figure out the author's intent.
Perhaps you'd like a go at untangling this?

The xntpd daemon is running well on an AIX 3.2.5 platform at the moment.

Regards,

Marc


On Mar 3,  1:18pm, [e-mail] wrote:
> Subject: prerelease testing of xntp3-5.92a
> Guys,
>
> A prerelease version of XNTP3 is available on:
>
> 	ftp://ftp.uedl.edu/pub/ntp/testing/
>
> in files xntp3-5.92a.tar.gz and xntp3-5.92a-export.tar.gz .
>
> I've rolled a fair number of patches an a new driver (Jupiter) in to
> this beast, so if y'all could give it a try and let me know, I'd
> appreciate it.
>
> Harlan
>-- End of excerpt from [e-mail]



-- 
Marc Brett  [phone]            Western Geophysical
[e-mail]                     455 London Road, Isleworth
FAX: [phone]                   Middlesex TW7 5AB    UK

--PART-BOUNDARY=.19803051612.ZM13770.london.waii.com
X-Zm-Content-Name: xntp3-5.92a.diffs
Content-Description: Text
Content-Type: text/plain ; name="xntp3-5.92a.diffs" ; charset=us-ascii

*** include/ntp_stdlib.h.orig	Wed Sep 24 04:40:44 1997
--- include/ntp_stdlib.h	Thu Mar  5 11:45:49 1998
***************
*** 40,46 ****
  extern	const char *clockname	P((int));
  extern	int	clocktime	P((int, int, int, int, int, u_long, u_long *, u_int32 *));
  extern	char *	emalloc		P((u_int));
! extern	int	ntp_getopt	P((int, char **, char *));
  extern	void	init_auth	P((void));
  extern	void	init_lib	P((void));
  extern	void	init_random	P((void));
--- 40,46 ----
  extern	const char *clockname	P((int));
  extern	int	clocktime	P((int, int, int, int, int, u_long, u_long *, u_int32 *));
  extern	char *	emalloc		P((u_int));
! extern	int	ntp_getopt	P((int, char **, const char *));
  extern	void	init_auth	P((void));
  extern	void	init_lib	P((void));
  extern	void	init_random	P((void));
*** include/ntpd.h.orig	Tue Mar  3 05:30:56 1998
--- include/ntpd.h	Thu Mar  5 12:29:16 1998
***************
*** 48,54 ****
  struct ctl_var {
    u_short code;
    u_short flags;
!   const char *text;
  };
  /*
   * Flag values
--- 48,54 ----
  struct ctl_var {
    u_short code;
    u_short flags;
!   char *text;
  };
  /*
   * Flag values
*** libntp/authkeys.c.orig	Mon Aug 11 05:35:19 1997
--- libntp/authkeys.c	Thu Mar  5 12:57:59 1998
***************
*** 562,569 ****
  	u_int32 *pkt;
  	int length;	/* length of encrypted portion of packet */
  {
-     int sendlength = 0;
- 
      if (keyno && keyno != cache_keyid) {
  	authkeyuncached++;
  	if (!authhavekey(keyno)) {
--- 562,567 ----
***************
*** 574,580 ****
  
  #ifdef	DES
      if (!keyno || (cache_flags & KEY_DES))
! 	return sendlength = DESauthencrypt(keyno, pkt, length);
  #endif
  
  #ifdef	MD5
--- 572,578 ----
  
  #ifdef	DES
      if (!keyno || (cache_flags & KEY_DES))
! 	return DESauthencrypt(keyno, pkt, length);
  #endif
  
  #ifdef	MD5
*** libntp/getopt.c.orig	Mon Aug 11 05:51:22 1997
--- libntp/getopt.c	Thu Mar  5 11:48:12 1998
***************
*** 51,60 ****
  ntp_getopt(argc, argv, optstring)
  	int argc;
  	char *argv[];
! 	char *optstring;
  {
  	register char c;
! 	register char *place;
  
  	prog = argv[0];
  	ntp_optarg = NULL;
--- 51,60 ----
  ntp_getopt(argc, argv, optstring)
  	int argc;
  	char *argv[];
! 	const char *optstring;
  {
  	register char c;
! 	register const char *place;
  
  	prog = argv[0];
  	ntp_optarg = NULL;
*** libntp/statestr.c.orig	Mon Aug 11 06:46:08 1997
--- libntp/statestr.c	Thu Mar  5 11:26:35 1998
***************
*** 130,136 ****
  
  	while (codetab->code != -1) {
  		if (codetab->code == code)
! 			return codetab->string;
  		codetab++;
  	}
  	(void) sprintf(buf, "%s_%d", codetab->string, code);
--- 130,136 ----
  
  	while (codetab->code != -1) {
  		if (codetab->code == code)
! 			return (char *) codetab->string;
  		codetab++;
  	}
  	(void) sprintf(buf, "%s_%d", codetab->string, code);
*** ntpq/ntpq.c.orig	Sat Sep 20 05:50:16 1997
--- ntpq/ntpq.c	Thu Mar  5 11:30:24 1998
***************
*** 1840,1846 ****
  	int n;
  	struct xcmd *xcp;
  	char *cmd;
! 	char *cmdsort[100];
  	int length[100];
  	int maxlength;
  	int numperline;
--- 1840,1846 ----
  	int n;
  	struct xcmd *xcp;
  	char *cmd;
! 	const char *cmdsort[100];
  	int length[100];
  	int maxlength;
  	int numperline;
*** ntpq/ntpq_ops.c.orig	Tue Aug 12 06:37:19 1997
--- ntpq/ntpq_ops.c	Thu Mar  5 11:32:42 1998
***************
*** 180,187 ****
  char flash3[] = " x.-+#*o";	/* flash decode for peer status version 3 */
  
  struct varlist {
!   const char *name;
!   const char *value;
  } varlist[MAXLIST] = { { 0, 0 } };
  
  /*
--- 180,187 ----
  char flash3[] = " x.-+#*o";	/* flash decode for peer status version 3 */
  
  struct varlist {
!   char *name;
!   char *value;
  } varlist[MAXLIST] = { { 0, 0 } };
  
  /*
*** util/tickadj.c.orig	Tue Mar  3 05:55:26 1998
--- util/tickadj.c	Thu Mar  5 12:24:21 1998
***************
*** 127,133 ****
  int setnoprintf = 0;
  
  const char *kmem = KMEM;
! const char *file = NULL;
  int   fd  = -1;
  
  static	void	getoffsets	P((unsigned long *, unsigned long *, unsigned long *, unsigned long *));
--- 127,133 ----
  int setnoprintf = 0;
  
  const char *kmem = KMEM;
! char *file = NULL;
  int   fd  = -1;
  
  static	void	getoffsets	P((unsigned long *, unsigned long *, unsigned long *, unsigned long *));
*** xntpd/ntp_control.c.orig	Tue Mar  3 05:28:36 1998
--- xntpd/ntp_control.c	Thu Mar  5 12:33:50 1998
***************
*** 939,945 ****
  	const char *tag;
  	l_fp *ts;
  {
! 	register char *cp, *cq;
  	char buffer[200];
  
  	cp = buffer;
--- 939,946 ----
  	const char *tag;
  	l_fp *ts;
  {
! 	register const char *cq;
! 	register char *cp;
  	char buffer[200];
  
  	cp = buffer;
*** xntpd/refclock_atom.c.orig	Sat Sep 27 05:22:54 1997
--- xntpd/refclock_atom.c	Wed Mar  4 18:57:54 1998
***************
*** 252,261 ****
  	int i;
  	l_fp lftemp;		/* l_fp temps */
  
- #ifdef	DEBUG
- 	if (debug > 2)
- 		printf("pps_sample: pollcnt %d\n", up->pollcnt);
- #endif
  	/*
  	 * This routine is called once per second by an auxilliary
  	 * routine in another driver. It saves the sign-extended
--- 252,257 ----
***************
*** 268,273 ****
--- 264,273 ----
  
  	pp = peer->procptr;
  	up = (struct atomunit *)pp->unitptr;
+ #ifdef	DEBUG
+ 	if (debug > 2)
+ 		printf("pps_sample: pollcnt %d\n", up->pollcnt);
+ #endif
  
  	L_CLR(&lftemp);
  	L_ADDF(&lftemp, tsr->l_f);
*** xntpd/refclock_leitch.c.orig	Sun Aug 17 04:30:39 1997
--- xntpd/refclock_leitch.c	Wed Mar  4 18:51:14 1998
***************
*** 667,673 ****
  
  	if (rbufp->recv_length < 6)
  		return(0);
! #define BAD(A) (rbufp->recv_buffer[A] < '0') || (rbufp->recv_buffer[A] > '9')
  	if (BAD(0)||BAD(1)||BAD(2)||BAD(3)||BAD(4)||BAD(5))
  		return(0);
  #define ATOB(A) ((rbufp->recv_buffer[A])-'0')
--- 667,676 ----
  
  	if (rbufp->recv_length < 6)
  		return(0);
! #ifdef BAD
! #undef BAD
! #endif
! #define BAD(A) ((rbufp->recv_buffer[A] < '0') || (rbufp->recv_buffer[A] > '9'))
  	if (BAD(0)||BAD(1)||BAD(2)||BAD(3)||BAD(4)||BAD(5))
  		return(0);
  #define ATOB(A) ((rbufp->recv_buffer[A])-'0')
*** xntpdc/ntpdc.c.orig	Tue Aug 12 06:51:46 1997
--- xntpdc/ntpdc.c	Thu Mar  5 12:19:26 1998
***************
*** 1254,1260 ****
  	int n;
  	struct xcmd *xcp;
  	char *cmd;
! 	char *cmdsort[100];
  	int length[100];
  	int maxlength;
  	int numperline;
--- 1254,1260 ----
  	int n;
  	struct xcmd *xcp;
  	char *cmd;
! 	const char *cmdsort[100];
  	int length[100];
  	int maxlength;
  	int numperline;
*** xntpdc/ntpdc_ops.c.orig	Tue Aug 12 07:03:48 1997
--- xntpdc/ntpdc_ops.c	Thu Mar  5 12:21:11 1998
***************
*** 2204,2209 ****
--- 2204,2210 ----
  	l_fp ts;
  	int res;
  	long val;
+ 	u_long uval;
  	int err;
  
  
***************
*** 2237,2246 ****
  			fudgedata.fudgeval_flags = htonl((u_int32)val);
  	} else if (STREQ(pcmd->argval[1].string, "flags")) {
  		fudgedata.which = htonl(FUDGE_FLAGS);
! 		if (!hextoint(pcmd->argval[2].string, &val))
  			err = 1;
  		else
! 			fudgedata.fudgeval_flags = htonl((u_int32)(val & 0xf));
  	} else {
  		(void) fprintf(stderr, "What fudge is %s?\n",
  		    pcmd->argval[1].string);
--- 2238,2247 ----
  			fudgedata.fudgeval_flags = htonl((u_int32)val);
  	} else if (STREQ(pcmd->argval[1].string, "flags")) {
  		fudgedata.which = htonl(FUDGE_FLAGS);
! 		if (!hextoint(pcmd->argval[2].string, &uval))
  			err = 1;
  		else
! 			fudgedata.fudgeval_flags = htonl((u_int32)(uval & 0xf));
  	} else {
  		(void) fprintf(stderr, "What fudge is %s?\n",
  		    pcmd->argval[1].string);

--PART-BOUNDARY=.19803051612.ZM13770.london.waii.com
X-Zm-Content-Name: xntp3-5.92a.jupiter.diffs
Content-Description: Text
Content-Type: text/plain ; name="xntp3-5.92a.jupiter.diffs" ; charset=us-ascii

*** xntpd/refclock_jupiter.c.orig	Tue Mar  3 05:56:55 1998
--- xntpd/refclock_jupiter.c	Thu Mar  5 14:52:27 1998
***************
*** 69,75 ****
  
  /* XXX */
  #ifdef sun
! char *strerror(int);
  #endif
  
  /*
--- 69,75 ----
  
  /* XXX */
  #ifdef sun
! char *strerror P((int));
  #endif
  
  /*
***************
*** 154,164 ****
  	int ssize;			/* space used in sbuf */
  };
  
  /*
   * Function prototypes
   */
! static	void	jupiter_canmsg(struct peer *, u_int);
! static	u_short	jupiter_cksum(u_short *, u_int);
  #ifdef QSORT_USES_VOID_P
  	int	jupiter_cmpl_fp	P((const void *, const void *));
  #else
--- 154,178 ----
  	int ssize;			/* space used in sbuf */
  };
  
+ /* XXX should be somewhere else */
+ #ifdef __GNUC__
+ #if __GNUC__ < 2  || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+ #ifndef __attribute__
+ #define __attribute__(args)
+ #endif
+ #endif