Changeset 134:6b2989c066a6 in freeDiameter

Timestamp:

Dec 15, 2009, 6:15:41 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fixed loopback test for correct network order

Files:

• freeDiameter/endpoints.c (modified) (1 diff)
• include/freeDiameter/libfreeDiameter.h (modified) (1 diff)

freeDiameter/endpoints.c

@@ -56 +56 @@
         switch (sa->sa_family) {
                 case AF_INET:
-                        if (ptr.sin->sin_addr.s_addr == INADDR_LOOPBACK)
+                        if (IN_IS_ADDR_LOOPBACK(&ptr.sin->sin_addr))
                                 return 0;
                 case AF_INET6:
-                        if (!memcmp(&ptr.sin6->sin6_addr, &in6addr_loopback, sizeof(struct in6_addr)))
+                        if (IN6_IS_ADDR_LOOPBACK(&ptr.sin6->sin6_addr))
                                 return 0;
         }

include/freeDiameter/libfreeDiameter.h

@@ -395 +395 @@
 #endif /* INADDR_LOOPBACK */
 
+/* An IP equivalent to IN6_IS_ADDR_LOOPBACK */
+#ifndef IN_IS_ADDR_LOOPBACK
+#define IN_IS_ADDR_LOOPBACK(a) \
+  ((((long int) (a)->s_addr) & ntohl(0xff000000)) == ntohl(0x7f000000))
+#endif /* IN_IS_ADDR_LOOPBACK */
+
+
 /* create a V4MAPPED address */
 #define IN6_ADDR_V4MAP( a6, a4 ) {                      \