To: ntp@TRANTOR.UMD.EDU
Subject: patch to ntpdc.c 3.1
Date: Thu, 02 Feb 89 17:20:23 EST
From: "Louis A. Mamakos" <louie@TRANTOR.UMD.EDU>

Here is a patch to the latest version of ntpdc.c that was just announced.  Note
that the tar file has NOT been updated with this fix.

louie

*** /tmp/,RCSt1023537	Thu Feb  2 17:13:53 1989
--- ntpdc.c	Thu Feb  2 17:12:03 1989
***************
*** 103,108 ****
--- 103,113 ----
  		argv++, argc--;
  	}
  
+ 	if (!vflag) {
+ 		printf("   (rem)  Address   (lcl)      Strat Poll Reach    Delay   Offset    Disp\n");
+ 		printf("==========================================================================\n");
+         }
+ 
  	/*
  	 * Listen for returning packets; may be more than one packet per
  	 * host. 
***************
*** 161,170 ****
  	if (sendto(s, packet, sizeof(struct ntpdata), 0,
  		   (struct sockaddr *) &watcher, sizeof(watcher)) < 0)
  		perror(host);
- 	if (!vflag) {
- 		printf("   (rem)  Address   (lcl)      Strat Poll Reach    Delay   Offset    Disp\n");
- 		printf("==========================================================================\n");
-         }
  }
  
  /*
--- 166,171 ----
***************
*** 211,224 ****
  		delay[i] = (double) ((long) (ntohl(n->info_filter.delay[i])/1000.0));
  		offset[i] = (double) ((long) (ntohl(n->info_filter.offset[i])/1000.0));
  	}
! 	dsp = ntohl(n->estdisp)/1000.0;
! 	del = ntohl(n->estdelay);
! 	off = ntohl(n->estoffset);
  	c = ' ';
  	if (ntohs(n->flags))
! 		c = '-';		/* mark peer selection */
  	if (ntohs(n->flags) & PEER_FL_SELECTED)
! 		c = '*';		/* mark pre-configured */
  	sin.sin_addr.s_addr = n->net_address;
  	printf("%c%-15.15s ", c, cvthname(&sin));
  	sin.sin_addr.s_addr = n->my_address;
--- 212,225 ----
  		delay[i] = (double) ((long) (ntohl(n->info_filter.delay[i])/1000.0));
  		offset[i] = (double) ((long) (ntohl(n->info_filter.offset[i])/1000.0));
  	}
! 	dsp = ((long) ntohl(n->estdisp))/1000.0;
! 	del = (long) ntohl(n->estdelay);	/* leave in milliseconds */
! 	off = (long) ntohl(n->estoffset);	/* leave in milliseconds */
  	c = ' ';
  	if (ntohs(n->flags))
! 		c = '-';		/* mark pre-configured */
  	if (ntohs(n->flags) & PEER_FL_SELECTED)
! 		c = '*';		/* mark peer selection */
  	sin.sin_addr.s_addr = n->net_address;
  	printf("%c%-15.15s ", c, cvthname(&sin));
  	sin.sin_addr.s_addr = n->my_address;
***************
*** 241,250 ****
  
  	sin.sin_addr.s_addr = n->net_address;
  	for (i = 0; i < PEER_SHIFT; i++) {
! 		delay[i] = (double) ntohl(n->info_filter.delay[i])/1000.0;
! 		offset[i] = (double) ntohl(n->info_filter.offset[i])/1000.0;
  	}
! 	dsp = (double) ((long) ntohl(n->estdisp));
  	del = (double) ((long) ntohl(n->estdelay));
  	off = (double) ((long) ntohl(n->estoffset));
  	printf("Neighbor address %s port:%d",
--- 242,251 ----
  
  	sin.sin_addr.s_addr = n->net_address;
  	for (i = 0; i < PEER_SHIFT; i++) {
! 		delay[i] = (double) (long) ntohl(n->info_filter.delay[i]);
! 		offset[i] = (double) (long) ntohl(n->info_filter.offset[i]);
  	}
! 	dsp = (double) ((long) ntohl(n->estdisp)) / 1000.0;
  	del = (double) ((long) ntohl(n->estdelay));
  	off = (double) ((long) ntohl(n->estoffset));
  	printf("Neighbor address %s port:%d",
***************
*** 281,291 ****
  	printf(" samples: %u\n", ntohs((u_short)n->info_filter.index) + 1);
  	printf("Delay(ms)  ");
  	for (i = 0; i < PEER_SHIFT; i++)
! 		printf("%7.2f ", ntohl(delay[i]));
  	printf("\n");
  	printf("Offset(ms) ");
  	for (i = 0; i < PEER_SHIFT; i++)
! 		printf("%7.2f ", ntohl(offset[i]));
  	printf("\n");
  	printf("\n\tdelay: %f offset: %f dsp %f\n", del, off, dsp);
  	printf("\n");
--- 282,292 ----
  	printf(" samples: %u\n", ntohs((u_short)n->info_filter.index) + 1);
  	printf("Delay(ms)  ");
  	for (i = 0; i < PEER_SHIFT; i++)
! 		printf("%7.2f ", delay[i]);
  	printf("\n");
  	printf("Offset(ms) ");
  	for (i = 0; i < PEER_SHIFT; i++)
! 		printf("%7.2f ", offset[i]);
  	printf("\n");
  	printf("\n\tdelay: %f offset: %f dsp %f\n", del, off, dsp);
  	printf("\n");