IPv6 code cleanup.

bk: 3d343b8bBLK5CcNT3O3LnYNwliO0wA

diff --git a/libntp/socktoa.c b/libntp/socktoa.c
index 87964af9e518df5bbbc0f892546c5a01ad7e535b..aaf125a60718f5a4f37f555a8a011e159633702a 100644 (file)
--- a/libntp/socktoa.c
+++ b/libntp/socktoa.c
@@ -31,14 +31,16 @@ socktoa(
        switch(sock->ss_family) {
 
                case AF_INET :
-                       inet_ntop(AF_INET, &((struct sockaddr_in*)sock)->sin_addr, buffer, LIB_BUFLENGTH);
+                       inet_ntop(AF_INET, &GET_INADDR(*sock), buffer,
+                           LIB_BUFLENGTH);
                        break;
 
                case AF_INET6 :
-                       inet_ntop(AF_INET6, &((struct sockaddr_in6*)sock)->sin6_addr, buffer, LIB_BUFLENGTH);
+                       inet_ntop(AF_INET6, &GET_INADDR6(*sock), buffer,
+                           LIB_BUFLENGTH);
        }
        return buffer;
 #else
-       return numtoa(((struct sockaddr_in *)sock)->sin_addr.s_addr);
+       return numtoa(GET_INADDR(*sock));
 #endif
 }

diff --git a/libntp/socktohost.c b/libntp/socktohost.c
index 30143f2e3dbc8c53315a92ac0e8384f0e0e8d32f..ccc7c8522eeb3c799139012bc7fc883ad9f511a7 100644 (file)
--- a/libntp/socktohost.c
+++ b/libntp/socktohost.c
@@ -25,7 +25,7 @@ socktohost(
 
        LIB_GETBUF(buffer);
        if (getnameinfo((struct sockaddr *)sock, SOCKLEN(sock), buffer,
-           NI_MAXHOST, NULL, NULL, 0))
+           LIB_BUFLENGTH /* NI_MAXHOST*/, NULL, NULL, 0))
                return stoa(sock);
 
        return buffer;

diff --git a/ntpd/ntp_restrict.c b/ntpd/ntp_restrict.c
index 7913113122947076790f7f1e1c3b53b66b9e094c..90850a2064651f8502e2a9510ac110c11bb04995 100644 (file)
--- a/ntpd/ntp_restrict.c
+++ b/ntpd/ntp_restrict.c
@@ -237,8 +237,8 @@ restrictions(
                 * Need to know whether this is from the ntp port or not.
                 */
                hostaddr6 = GET_INADDR6(*srcadr);
-               isntpport =
-                   ((((struct sockaddr_in6 *)srcadr)->sin6_port) == NTP_PORT);
+               isntpport = (ntohs(((struct sockaddr_in6 *)srcadr)->sin6_port)
+                   == NTP_PORT);
 
                /*
                 * Ignore any packets with a multicast source address

diff --git a/ntpdc/ntpdc_ops.c b/ntpdc/ntpdc_ops.c
index 374e42c903c51b387b146c5dbe67c1d5dbbada4b..5870c5792c89118784fe3717e5515b65c6af4e1a 100644 (file)
--- a/ntpdc/ntpdc_ops.c
+++ b/ntpdc/ntpdc_ops.c
@@ -1631,6 +1631,8 @@ again:
                       "=====================================================================\n");
 
        while (items > 0) {
+               memset((char *)&resaddr, 0, sizeof(resaddr));
+               memset((char *)&maskaddr, 0, sizeof(maskaddr));
                if (rl->v6_flag != 0) {
                        GET_INADDR6(resaddr) = rl->addr6;
                        GET_INADDR6(maskaddr) = rl->mask6;