MFC r280849,280915-280916,281015-281016,282097,282408,282415,283542,

     284864,285169-285170,285435:

ntp 4.2.8p3.

Relnotes:	yes
Approved by:	re (?)

1 files changed, 19 insertions, 19 deletions

diff --git a/contrib/ntp/libntp/refnumtoa.c b/contrib/ntp/libntp/refnumtoa.c
index 7c5d96e..e6ca55ae 100644
--- a/contrib/ntp/libntp/refnumtoa.c
+++ b/contrib/ntp/libntp/refnumtoa.c
@@ -1,36 +1,36 @@
 /*
  * refnumtoa - return asciized refclock addresses stored in local array space
  */
+#include <config.h>
 #include <stdio.h>
 
-#include "ntp_fp.h"
+#include "ntp_net.h"
 #include "lib_strbuf.h"
 #include "ntp_stdlib.h"
 
-char *
+const char *
 refnumtoa(
-	struct sockaddr_storage* num
+	sockaddr_u *num
 	)
 {
-	register u_int32 netnum;
-	register char *buf;
-	register const char *rclock;
+	u_int32 netnum;
+	char *buf;
+	const char *rclock;
 
-	LIB_GETBUF(buf);
+	if (!ISREFCLOCKADR(num))
+		return socktoa(num);
 
-	if(num->ss_family == AF_INET) {
-		netnum = ntohl(((struct sockaddr_in*)num)->sin_addr.s_addr);
-		rclock = clockname((int)((u_long)netnum >> 8) & 0xff);
+	LIB_GETBUF(buf);
+	netnum = SRCADR(num);
+	rclock = clockname((int)((u_long)netnum >> 8) & 0xff);
 
-		if (rclock != NULL)
-		    (void)sprintf(buf, "%s(%lu)", rclock, (u_long)netnum & 0xff);
-		else
-	    	(void)sprintf(buf, "REFCLK(%lu,%lu)",
-				  ((u_long)netnum >> 8) & 0xff, (u_long)netnum & 0xff);
+	if (rclock != NULL)
+		snprintf(buf, LIB_BUFLENGTH, "%s(%lu)",
+			 rclock, (u_long)netnum & 0xff);
+	else
+		snprintf(buf, LIB_BUFLENGTH, "REFCLK(%lu,%lu)",
+			 ((u_long)netnum >> 8) & 0xff,
+			 (u_long)netnum & 0xff);
 
-	}
-	else {
-		(void)sprintf(buf, "refclock address type not implemented yet, use IPv4 refclock address.");
-	}
 	return buf;
 }