Changeset 210:2b5027949f85 in freeDiameter for freeDiameter/endpoints.c

Timestamp:

Feb 16, 2010, 4:33:03 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix issue where the same address can be added several times in a list

File:

• freeDiameter/endpoints.c (modified) (4 diffs)

freeDiameter/endpoints.c

@@ -47 +47 @@
                 sSA6 *sin6;
         } ptr;
+        in_port_t * port;
         int cmp = -1;
         
@@ -52 +53 @@
         CHECK_PARAMS( list && sa && (sl <= sizeof(sSS)) );
         
+        ptr.sa = sa;
+        
         /* Filter out a bunch of invalid addresses */
-        if (! (flags & EP_ACCEPTALL)) {
-                ptr.sa = sa;
-                switch (sa->sa_family) {
-                        case AF_INET:
+        switch (sa->sa_family) {
+                case AF_INET:
+                        if (! (flags & EP_ACCEPTALL)) {
                                 if (IN_IS_ADDR_UNSPECIFIED(&ptr.sin->sin_addr) 
                                  || IN_IS_ADDR_LOOPBACK(&ptr.sin->sin_addr)
@@ -64 +66 @@
                                  || (ptr.sin->sin_addr.s_addr == INADDR_BROADCAST))
                                         return 0;
-                                break;
-
-                        case AF_INET6:
+                        }
+                        port = &ptr.sin->sin_port;
+                        break;
+
+                case AF_INET6:
+                        if (! (flags & EP_ACCEPTALL)) {
                                 if (IN6_IS_ADDR_UNSPECIFIED(&ptr.sin6->sin6_addr) 
                                  || IN6_IS_ADDR_LOOPBACK(&ptr.sin6->sin6_addr)
@@ -73 +78 @@
                                  || IN6_IS_ADDR_SITELOCAL(&ptr.sin6->sin6_addr))
                                         return 0;
+                        }
+                        port = &ptr.sin6->sin6_port;
+                        break;
+
+                default:
+                        return 0;
+        }
+
+        /* remove the ACCEPTALL flag */
+        flags &= ~EP_ACCEPTALL;
+        
+        /* Search place in the list */
+        for (li = list->next; li != list; li = li->next) {
+                ep = (struct fd_endpoint *)li;
+                in_port_t * ep_port;
+                
+                /* First, compare the address family */
+                if (ep->sa.sa_family < sa->sa_family)
+                        continue;
+                if (ep->sa.sa_family > sa->sa_family)
+                        break;
+                
+                /* Then compare the address field */
+                switch (sa->sa_family) {
+                        case AF_INET:
+                                cmp = memcmp(&ep->sin.sin_addr, &ptr.sin->sin_addr, sizeof(struct in_addr));
+                                ep_port = &ep->sin.sin_port;
                                 break;
-
+                        case AF_INET6:
+                                cmp = memcmp(&ep->sin6.sin6_addr, &ptr.sin6->sin6_addr, sizeof(struct in6_addr));
+                                ep_port = &ep->sin6.sin6_port;
+                                break;
                         default:
+                                /* Filter this out */
                                 return 0;
                 }
-        } else {
-                /* remove it */
-                flags &= ~EP_ACCEPTALL;
-        }
-        
-        /* Search place in the list */
-        for (li = list->next; li != list; li = li->next) {
-                ep = (struct fd_endpoint *)li;
-                
-                cmp = memcmp(&ep->ss, sa, sl);
-                if (cmp >= 0)
-                        break;
+                if (cmp < 0)
+                        continue;
+                if (cmp > 0)
+                        break;
+                
+                /* Finally compare the port, only if not 0 */
+                if (*port == 0)
+                        break;
+                if (*ep_port == 0) {
+                        /* save the port information in the list, and break */
+                        *ep_port = *port;
+                        break;
+                }
+                if (*ep_port < *port)
+                        continue;
+                if (*ep_port > *port)
+                        cmp = 1;
+                break;
         }