Consolidate loopback address tests

Many different places were testing if an address is a loopback
address. Consolidate these into one function to make it easier to
alter.

Change-Id: I9c4465f3bdc4e840c83d69456504caaac1c544e7
Reviewed-on: http://gerrit.openafs.org/2375
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index 32c2891d8e5e204c3027bb0518e36949362cfe3e..c00dd2166c21cbfbd5c8e52c91a29f02e7cad9f1 100644 (file)
--- a/src/afs/afs_server.c
+++ b/src/afs/afs_server.c
@@ -1358,7 +1358,7 @@ afs_SetServerPrefs(struct srvAddr *sa)
 
 #ifdef notdef
        if (!s) {
-           if (afsifinfo[i].ipaddr != 0x7f000001) {    /* ignore loopback */
+           if (!rx_IsLoopbackAddr(afsifinfo[i].ipaddr)) {      /* ignore loopback */
                *cnt += 1;
                if (*cnt > 16)
                    return;
@@ -1421,7 +1421,7 @@ afs_SetServerPrefs(struct srvAddr *sa)
            net = ipif->ipif_local_addr & netmask;
 #ifdef notdef
            if (!s) {
-               if (ipif->ipif_local_addr != 0x7f000001) {      /* ignore loopback */
+               if (!rx_IsLoopbackAddr(ipif->ipif_local_addr)) {        /* ignore loopback */
                    *cnt += 1;
                    if (*cnt > 16)
                        return;

diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c
index 2c7db4cec2b3d9b160c38e0d6e0492f4c0fd1156..533b58b5780d0d6c5045987fd606519c5972e242 100644 (file)
--- a/src/libadmin/test/vos.c
+++ b/src/libadmin/test/vos.c
@@ -1643,7 +1643,7 @@ GetServer(char *aname)
        memcpy(&addr, th->h_addr, sizeof(addr));
     }
 
-    if (addr == htonl(0x7f000001)) {   /* local host */
+    if (rx_IsLoopbackAddr(ntohl(addr))) {      /* local host */
        code = gethostname(hostname, MAXHOSTCHARS);
        if (code)
            return 0;

diff --git a/src/rx/IRIX/rx_knet.c b/src/rx/IRIX/rx_knet.c
index c6a00c1f3485241267297f170b53592aa8a25344..67d0a2ed78653ca5831f1d6972dd9b88a3e88c04 100644 (file)
--- a/src/rx/IRIX/rx_knet.c
+++ b/src/rx/IRIX/rx_knet.c
@@ -374,7 +374,7 @@ rxi_EnumGetIfInfo(struct hashbucket *h, caddr_t key, caddr_t arg1,
        *(int *)arg1 = different;
     }
     rxmtu = rxmtu * rxi_nRecvFrags + ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE);
-    if ((ifinaddr != 0x7f000001) && (rxmtu > rx_maxReceiveSize)) {
+    if (!rx_IsLoopbackAddr(ifinaddr) && (rxmtu > rx_maxReceiveSize)) {
        rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, rxmtu);
        rx_maxReceiveSize = MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser);
     }

diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c
index 22c85a6eb72f04b33f093ce6bb4afd4541105cef..97a153a6f8bd993a1f946c00fd28c8d11fda9055 100644 (file)
--- a/src/rx/SOLARIS/rx_knet.c
+++ b/src/rx/SOLARIS/rx_knet.c
@@ -123,7 +123,7 @@ rxi_GetIFInfo()
            maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu);
            addrs[i] = ifinaddr;
 
-           if (ifinaddr != 0x7f000001 && maxmtu > rx_maxReceiveSize) {
+           if (!rx_IsLoopbackAddr(ifinaddr) && maxmtu > rx_maxReceiveSize) {
                rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu);
                rx_maxReceiveSize =
                    MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser);
@@ -184,7 +184,7 @@ rxi_GetIFInfo()
            addrs[i] = ifinaddr;
            i++;
 
-           if (ifinaddr != 0x7f000001 && maxmtu > rx_maxReceiveSize) {
+           if (!rx_IsLoopbackAddr(ifinaddr) && maxmtu > rx_maxReceiveSize) {
                rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu);
                rx_maxReceiveSize =
                    MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser);

diff --git a/src/rx/rx.h b/src/rx/rx.h
index 990dc865e0d55c73a86d367ce79498b55163880e..3e46218322ef3b5212f991323bab536297dbe6c7 100644 (file)
--- a/src/rx/rx.h
+++ b/src/rx/rx.h
@@ -122,6 +122,12 @@ int ntoh_syserr_conv(int error);
 #define        rx_SecurityClassOf(conn)        ((conn)->securityIndex)
 #define rx_SecurityObjectOf(conn)      ((conn)->securityObject)
 
+static_inline int
+rx_IsLoopbackAddr(afs_uint32 addr)
+{
+    return (addr == 0x7f000001);
+}
+
 /*******************
  * Macros callable by the user to further define attributes of a
  * service.  Must be called before rx_StartServer

diff --git a/src/rx/rx_getaddr.c b/src/rx/rx_getaddr.c
index 9a5104da7061a95d78310d992b7ba69e193b3b13..15a13c3cd2b63f5e7d188e0d6bb665ae09d82399 100644 (file)
--- a/src/rx/rx_getaddr.c
+++ b/src/rx/rx_getaddr.c
@@ -240,7 +240,7 @@ rx_getAllAddr_internal(afs_uint32 buffer[], int maxSize, int loopbacks)
            if (count >= maxSize)       /* no more space */
                dpf(("Too many interfaces..ignoring 0x%x\n",
                       a->sin_addr.s_addr));
-           else if (!loopbacks && a->sin_addr.s_addr == htonl(0x7f000001)) {
+           else if (!loopbacks && rx_IsLoopbackAddr(ntohl(a->sin_addr.s_addr))) {
                addrcount--;
                continue;       /* skip loopback address as well. */
            } else if (loopbacks && ifm->ifm_flags & IFF_LOOPBACK) {
@@ -329,7 +329,7 @@ rx_getAllAddrMaskMtu(afs_uint32 addrBuffer[], afs_uint32 maskBuffer[],
            }
            a = (struct sockaddr_in *) info.rti_info[RTAX_IFA];
 
-           if (a->sin_addr.s_addr != htonl(0x7f000001) ) {
+           if (!rx_IsLoopbackAddr(ntohl(a->sin_addr.s_addr))) ) {
                if (count >= maxSize) { /* no more space */
                    dpf(("Too many interfaces..ignoring 0x%x\n",
                           a->sin_addr.s_addr));
@@ -430,7 +430,7 @@ rx_getAllAddr_internal(afs_uint32 buffer[], int maxSize, int loopbacks)
        }
        if (a->sin_addr.s_addr != 0) {
             if (!loopbacks) {
-                if (a->sin_addr.s_addr == htonl(0x7f000001)) 
+                if (rx_IsLoopbackAddr(ntohl(a->sin_addr.s_addr)))
                    continue;   /* skip loopback address as well. */
             } else {
                 if (ifr->ifr_flags & IFF_LOOPBACK) 
@@ -517,7 +517,7 @@ rx_getAllAddrMaskMtu(afs_uint32 addrBuffer[], afs_uint32 maskBuffer[],
                continue;       /* ignore this address */
            }
 
-            if (a->sin_addr.s_addr == htonl(0x7f000001) )
+            if (rx_IsLoopbackAddr(ntohl(a->sin_addr.s_addr)))
                 continue;   /* skip loopback address as well. */
 
            if (count >= maxSize) {     /* no more space */

diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index a88213f9e973492c2ace0cbb2ee77f3b8a37eff7..f14cf271cc4baf73035807653097d74392b9f94c 100644 (file)
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -532,7 +532,7 @@ rxi_GetcbiInfo(void)
            rxmtu * rxi_nRecvFrags + ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE);
        maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu);
        addrs[i++] = ifinaddr;
-       if ((ifinaddr != 0x7f000001) && (maxmtu > rx_maxReceiveSize)) {
+       if (!rx_IsLoopbackAddr(ifinaddr) && (maxmtu > rx_maxReceiveSize)) {
            rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu);
            rx_maxReceiveSize = MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser);
        }
@@ -658,7 +658,7 @@ rxi_GetIFInfo(void)
                            ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE);
                        maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu);
                        addrs[i++] = ifinaddr;
-                       if ((ifinaddr != 0x7f000001) && 
+                       if (!rx_IsLoopbackAddr(ifinaddr) &&
                            (maxmtu > rx_maxReceiveSize)) {
                            rx_maxReceiveSize = 
                                MIN(RX_MAX_PACKET_SIZE, maxmtu);
@@ -711,7 +711,7 @@ rxi_GetIFInfo(void)
                    ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE);
                maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu);
                addrs[i++] = ifinaddr;
-               if ((ifinaddr != 0x7f000001) && (maxmtu > rx_maxReceiveSize)) {
+               if (!rx_IsLoopbackAddr(ifinaddr) && (maxmtu > rx_maxReceiveSize)) {
                    rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu);
                    rx_maxReceiveSize =
                        MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser);

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index 9712120a3807fec7429152cb330da58904ce4bae..b4b729db659b930d7b9148cdd6b646c7b452b773 100644 (file)
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -541,7 +541,7 @@ rx_GetIFInfo(void)
        if (a->sin_family != AF_INET)
            continue;
        rxi_NetAddrs[rxi_numNetAddrs] = ntohl(a->sin_addr.s_addr);
-       if (rxi_NetAddrs[rxi_numNetAddrs] == 0x7f000001) {
+       if (rx_IsLoopbackAddr(rxi_NetAddrs[rxi_numNetAddrs])) {
            /* we don't really care about "localhost" */
            continue;
        }
@@ -634,7 +634,7 @@ rx_GetIFInfo(void)
 #endif
        }
 
-       if (rxi_NetAddrs[rxi_numNetAddrs] != 0x7f000001) {      /* ignore lo0 */
+       if (!rx_IsLoopbackAddr(rxi_NetAddrs[rxi_numNetAddrs])) {        /* ignore lo0 */
            int maxsize;
            maxsize =
                rxi_nRecvFrags * (myNetMTUs[rxi_numNetAddrs] - RX_IP_SIZE);

diff --git a/src/util/netutils.c b/src/util/netutils.c
index 03a90e3b6d89e6f1c781b7324f0f661280ceeaa6..14f2f1721a49067e9b65f6da5966587a896553ba 100644 (file)
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -51,10 +51,6 @@
 #define MAX_NETFILE_LINE       2048    /* length of a line in the netrestrict file */
 #define MAXIPADDRS             1024    /* from afsd.c */
 
-#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK (afs_uint32)0x7f000001
-#endif
-
 int ParseNetInfoFile_int(afs_uint32 *, afs_uint32 *, afs_uint32 *,
                          int, char reason[], const char *,
                          int);
@@ -412,7 +408,7 @@ filterAddrs(afs_uint32 addr1[], afs_uint32 addr2[], afs_uint32 mask1[],
        }
 
        /* Always mask loopback address */
-       if (found && addr1[i] == INADDR_LOOPBACK) 
+       if (found && rx_IsLoopbackAddr(addr1[i]))
            found = 0;
 
        if (found) {

diff --git a/src/volser/vos.c b/src/volser/vos.c
index 69b52440a3187da988a03e19932232611ddd1633..bf55a1ca580babfc0f7ad2a0625b89ad643adc34 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -236,7 +236,7 @@ GetServer(char *aname)
        memcpy(&addr, th->h_addr, sizeof(addr));
     }
 
-    if (addr == htonl(0x7f000001)) {   /* local host */
+    if (rx_IsLoopbackAddr(ntohl(addr))) {      /* local host */
        code = gethostname(hostname, MAXHOSTCHARS);
        if (code)
            return 0;