Changeset 1136:140450615773 in freeDiameter for libfdcore/server.c

Timestamp:

May 16, 2013, 3:56:31 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Revert changeset 1122 (ADDRESS_AVP_INCLUDE_PORT) as this will create too much interop issues. The Host-IP-Address AVP is not normally used to discover peer address, but only for validation of the addresses where a packet is received from -- which is quite useless with a connected transport connection, but anyway...

File:

• libfdcore/server.c (modified) (2 diffs)

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) {
@@ -449 +447 @@
         }
         
-        /* 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;