Changeset 135:bbb8ddba4c85 in freeDiameter

Timestamp:

Dec 16, 2009, 2:44:56 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Filter out more invalid addresses

Files:

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

freeDiameter/endpoints.c

@@ -52 +52 @@
         CHECK_PARAMS( list && sa && (sl <= sizeof(sSS)) );
         
-        /* Filter out loopback addresses */
+        /* Filter out loopback addresses, unspecified addresses, and invalid families */
         ptr.sa = sa;
         switch (sa->sa_family) {
                 case AF_INET:
-                        if (IN_IS_ADDR_LOOPBACK(&ptr.sin->sin_addr))
+                        if (IN_IS_ADDR_UNSPECIFIED(&ptr.sin->sin_addr) || IN_IS_ADDR_LOOPBACK(&ptr.sin->sin_addr))
                                 return 0;
+                        break;
+                        
                 case AF_INET6:
-                        if (IN6_IS_ADDR_LOOPBACK(&ptr.sin6->sin6_addr))
+                        if (IN6_IS_ADDR_UNSPECIFIED(&ptr.sin6->sin6_addr) || IN6_IS_ADDR_LOOPBACK(&ptr.sin6->sin6_addr))
                                 return 0;
+                        break;
+                        
+                default:
+                        return 0;
         }
         

include/freeDiameter/libfreeDiameter.h

@@ -401 +401 @@
 #endif /* IN_IS_ADDR_LOOPBACK */
 
+/* An IP equivalent to IN6_IS_ADDR_UNSPECIFIED */
+#ifndef IN_IS_ADDR_UNSPECIFIED
+#define IN_IS_ADDR_UNSPECIFIED(a) \
+  (((long int) (a)->s_addr) == 0x00000000)
+#endif /* IN_IS_ADDR_UNSPECIFIED */
+
 
 /* create a V4MAPPED address */