Changeset 1122:d4371b7aa0ff in freeDiameter for libfdcore/endpoints.c

Timestamp:

May 14, 2013, 7:01:31 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

New CMake option: ADDRESS_AVP_INCLUDE_PORT. Turn off for standard Host-IP-Address AVPs

File:

• libfdcore/endpoints.c (modified) (6 diffs)

libfdcore/endpoints.c

@@ -94 +94 @@
                         return 0;
         }
-
+        
         /* remove the ACCEPTALL flag */
         flags &= ~EP_ACCEPTALL;
@@ -135 +135 @@
                         break;
                 }
-                if (*ep_port < *port)
-                        continue;
+                if (*ep_port < *port) {
+                        cmp = -1;
+                        continue;
+                }
                 if (*ep_port > *port)
                         cmp = 1;
@@ -217 +219 @@
         while ((li_out != list) && (li_ex != exclude_list)) {
                 int cmp;
-
+                in_port_t * port_out, *port_ex;
+                
                 out = (struct fd_endpoint *)li_out;
                 ex = (struct fd_endpoint *)li_ex;
@@ -235 +238 @@
                         case AF_INET:
                                 cmp = memcmp(&out->sin.sin_addr, &ex->sin.sin_addr, sizeof(struct in_addr));
+                                port_out = &out->sin.sin_port;
+                                port_ex = &ex->sin.sin_port;
                                 break;
                         case AF_INET6:
                                 cmp = memcmp(&out->sin6.sin6_addr, &ex->sin6.sin6_addr, sizeof(struct in6_addr));
+                                port_out = &out->sin6.sin6_port;
+                                port_ex = &ex->sin6.sin6_port;
                                 break;
                         default:
@@ -250 +257 @@
                         li_ex = li_ex->next;
                         continue;
+                }
+                
+                if (port_out && (*port_out != 0) && (*port_ex != 0)) {
+                        if (*port_out < *port_ex) {
+                                li_out = li_out->next;
+                                continue;
+                        }
+                        if (*port_out > *port_ex) {
+                                li_ex = li_ex->next;
+                                continue;
+                        }
                 }
         
@@ -298 +316 @@
         }
         
-        CHECK_MALLOC_DO( fd_sa_dump_node_serv( FD_DUMP_STD_PARAMS, &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV ), return NULL);
+        CHECK_MALLOC_DO( fd_sa_dump( FD_DUMP_STD_PARAMS, &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV ), return NULL);
         CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{%s%s%s%s%s}",
                                 (ep->flags & EP_FL_CONF)        ? "C" : "-",