Changeset 1122:d4371b7aa0ff in freeDiameter for libfdcore

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

Location:

libfdcore

Files:

• endpoints.c (modified) (6 diffs)
• p_ce.c (modified) (1 diff)
• server.c (modified) (2 diffs)
• tcp.c (modified) (1 diff)

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" : "-",

libfdcore/p_ce.c

@@ -110 +110 @@
         for (li = fd_g_config->cnf_endpoints.next; li != &fd_g_config->cnf_endpoints; li = li->next) {
                 struct fd_endpoint * ep = (struct fd_endpoint *)li;
-                
                 CHECK_FCT( fd_msg_avp_new ( dictobj, 0, &avp ) );
                 CHECK_FCT( fd_msg_avp_value_encode ( &ep->ss, avp ) );

libfdcore/server.c

@@ -342 +342 @@
         int empty_conf_ep = FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints);
         
+        struct fd_list filter_list = FD_LIST_INITIALIZER(filter_list);
+        
         /* SCTP */
         if (!fd_g_config->cnf_flags.no_sctp) {
@@ -447 +449 @@
         }
         
+        /* we will filter this list and create endpoints with port information */
+        #ifdef ADDRESS_AVP_INCLUDE_PORT
+        fd_list_move_end(&filter_list, &fd_g_config->cnf_endpoints);
+        while (!FD_IS_LIST_EMPTY(&filter_list)) {
+                struct fd_endpoint * ep = (struct fd_endpoint *)filter_list.next;
+                in_port_t * port = NULL;
+                fd_list_unlink(&ep->chain);
+                
+                switch( ep->sa.sa_family ) {
+                case AF_INET: port = &ep->sin.sin_port; break;
+                case AF_INET6: port = &ep->sin6.sin6_port; break;
+                }
+                
+                if (port) {
+                        if (fd_g_config->cnf_port) {
+                                *port = htons(fd_g_config->cnf_port);
+                                CHECK_FCT(fd_ep_add_merge( &fd_g_config->cnf_endpoints, &ep->sa, sSAlen(&ep->sa), ep->flags ));
+                        }
+                        if (fd_g_config->cnf_port_tls) {
+                                *port = htons(fd_g_config->cnf_port_tls);
+                                CHECK_FCT(fd_ep_add_merge( &fd_g_config->cnf_endpoints, &ep->sa, sSAlen(&ep->sa), ep->flags ));
+                        }
+                }
+                free(ep);
+        }
+        #endif /* ADDRESS_AVP_INCLUDE_PORT */
+        
         {
                 char * buf = NULL;

libfdcore/tcp.c

@@ -138 +138 @@
         pthread_cleanup_push(fd_cleanup_socket, &s);
         
-        LOG_D( "Attempting TCP connection to %s...", fd_sa_dump_node(&buf, &len, NULL, sa, NI_NUMERICHOST | NI_NUMERICSERV)?:"<error>" );
+        LOG_D( "Attempting TCP connection to %s...", fd_sa_dump(&buf, &len, NULL, sa, NI_NUMERICHOST | NI_NUMERICSERV)?:"<error>" );
         free(buf);