Merge cleanup from John Hay.

bk: 3d307be6WJ0FRQJBV2T-49tzj9ka5w

diff --git a/include/ntp.h b/include/ntp.h
index 52ec364b38e36d688fad420951c603765e3d7fe5..e487228bad487935c953d1ddc1178eaa3e44c99b 100644 (file)
--- a/include/ntp.h
+++ b/include/ntp.h
@@ -514,6 +514,17 @@ struct peer {
 #define GET_INADDR(src)  (CAST_V4(src)->sin_addr.s_addr)
 #define GET_INADDR6(src) (CAST_V6(src)->sin6_addr)
 
+#define SET_HOSTMASK(addr, family)     \
+       do { \
+               memset((char *)(addr), 0, sizeof(struct sockaddr_storage)); \
+               (addr)->ss_family = (family); \
+               if ((family) == AF_INET) \
+                       GET_INADDR(*(addr)) = 0xffffffff; \
+               else \
+                       memset(&GET_INADDR6(*(addr)), 0xff, \
+                           sizeof(struct in6_addr)); \
+       } while(0)
+
 /*
  * NTP packet format.  The mac field is optional.  It isn't really
  * an l_fp either, but for now declaring it that way is convenient.

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 9c5cd726553a6ee0b3898fc39014e3343ae84c2e..ea90503ad9b9f51c9f2a649df651a8890a79616d 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -166,10 +166,10 @@ transmit(
                                    "DENY") == 0 ||
                                    strcmp((char *)&peer->refid,
                                    "CRYP") == 0) {
-                                       struct sockaddr_in mskadr_sin;
+                                       struct sockaddr_storage mskadr_sin;
 
-                                       mskadr_sin.sin_addr.s_addr =
-                                           0xffffffff;
+                                       SET_HOSTMASK(&mskadr_sin,
+                                           peer->srcadr.ss_family);
                                        hack_restrict(RESTRICT_FLAGS,
                                            &peer->srcadr, &mskadr_sin,
                                            0, RES_DONTTRUST |
@@ -316,7 +316,6 @@ receive(
        int     is_authentic;           /* cryptosum ok */
        keyid_t skeyid;                 /* cryptographic keys */
        struct sockaddr_storage *dstadr_sin;    /* active runway */
-       struct sockaddr_storage mskadr_sin;     /* mask for restrict */
        l_fp    p_org;                  /* originate timestamp */
        l_fp    p_xmt;                  /* transmit timestamp */
        int     rval;                   /* cookie snatcher */
@@ -746,19 +745,12 @@ receive(
                if (crypto_flags) {
                        if ((rval = crypto_recv(peer, rbufp)) !=
                            XEVNT_OK) {
-                               struct sockaddr_in mskadr_sin;
+                               struct sockaddr_storage mskadr_sin;
 
                                unpeer(peer);
                                sys_restricted++;
-                               memset((char *)&mskadr_sin, 0,
-                                   sizeof(struct sockaddr_storage));
-                               mskadr_sin.ss_family =
-                                   rbufp->recv_srcadr.ss_family;
-                               if (mskadr_sin.ss_family == AF_INET)
-                                       GET_INADDR(mskadr_sin) = 0xffffffff;
-                               else
-                                       memset(&GET_INADDR6(mskadr_sin), 0xff,
-                                           sizeof(struct in6_addr));
+                               SET_HOSTMASK(&mskadr_sin,
+                                   rbufp->recv_srcadr.ss_family);
                                hack_restrict(RESTRICT_FLAGS,
                                    &rbufp->recv_srcadr, &mskadr_sin,
                                    0, RES_DONTTRUST | RES_TIMEOUT);