Changeset 140:34e47f4addf8 in freeDiameter

Timestamp:

Dec 16, 2009, 5:20:31 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix broken test

Files:

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

freeDiameter/endpoints.c

@@ -53 +53 @@
         
         /* Filter out loopback addresses, unspecified addresses, and invalid families */
-        ptr.sa = sa;
-        switch (sa->sa_family) {
-                case AF_INET:
-                        if (IN_IS_ADDR_UNSPECIFIED(&ptr.sin->sin_addr) || IN_IS_ADDR_LOOPBACK(&ptr.sin->sin_addr))
+        if (! (flags & EP_ACCEPTALL)) {
+                ptr.sa = sa;
+                switch (sa->sa_family) {
+                        case AF_INET:
+                                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_UNSPECIFIED(&ptr.sin6->sin6_addr) || IN6_IS_ADDR_LOOPBACK(&ptr.sin6->sin6_addr))
+                                        return 0;
+                                break;
+
+                        default:
                                 return 0;
-                        break;
-                        
-                case AF_INET6:
-                        if (IN6_IS_ADDR_UNSPECIFIED(&ptr.sin6->sin6_addr) || IN6_IS_ADDR_LOOPBACK(&ptr.sin6->sin6_addr))
-                                return 0;
-                        break;
-                        
-                default:
-                        return 0;
+                }
+        } else {
+                /* remove it */
+                flags &= ~EP_ACCEPTALL;
         }
         

freeDiameter/tests/testcnx.c

@@ -591 +591 @@
                 aip = ai;
                 while (aip) {
-                        CHECK( 0, fd_ep_add_merge( &eps, aip->ai_addr, aip->ai_addrlen, EP_FL_DISC ));
+                        CHECK( 0, fd_ep_add_merge( &eps, aip->ai_addr, aip->ai_addrlen, EP_FL_DISC | EP_ACCEPTALL ));
                         aip = aip->ai_next;
                 };

include/freeDiameter/freeDiameter.h

@@ -679 +679 @@
 #define EP_FL_LL        (1 << 3)        /* Lower layer mechanism provided this endpoint */
 #define EP_FL_PRIMARY   (1 << 4)        /* This endpoint is primary in a multihomed SCTP association */
+#define EP_ACCEPTALL    (1 << 15)       /* This flag allows bypassing the address filter in fd_ep_add_merge. */
         uint32_t        flags;          /* Additional information about the endpoint */