Changes in freeDiameter/config.c [24:bd83ce9328ed:20:277ec00d793e] in freeDiameter

File:

• freeDiameter/config.c (modified) (3 diffs)

freeDiameter/config.c

@@ -100 +100 @@
                         struct fd_endpoint * ep = (struct fd_endpoint *)li;
                         if (li != fd_g_config->cnf_endpoints.next) fd_log_debug("                             ");
-                        sSA_DUMP_NODE( &ep->sa, NI_NUMERICHOST );
+                        sSA_DUMP_NODE( &ep->ss, NI_NUMERICHOST );
                         fd_log_debug("\n");
                         li = li->next;
@@ -229 +229 @@
         }
         
-        /* Validate local endpoints */
-        if ((!FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) && (fd_g_config->cnf_flags.no_ip4 || fd_g_config->cnf_flags.no_ip6)) {
-                struct fd_list * li;
-                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;
-                        if ( (fd_g_config->cnf_flags.no_ip4 && (ep->sa.sa_family == AF_INET))
-                           ||(fd_g_config->cnf_flags.no_ip6 && (ep->sa.sa_family == AF_INET6)) ) {
-                                li = li->prev;
-                                fd_list_unlink(&ep->chain);
-                                if (TRACE_BOOL(INFO)) {
-                                        fd_log_debug("Info: Removing local address conflicting with the flags no_IP / no_IP6 : ");
-                                        sSA_DUMP_NODE( &ep->sa, AI_NUMERICHOST );
-                                        fd_log_debug("\n");
-                                }
-                                free(ep);
-                        }
-                }
-        }
-        
         /* Configure TLS default parameters */
         if (! fd_g_config->cnf_sec_data.prio_string) {
@@ -258 +239 @@
         }
         if (! fd_g_config->cnf_sec_data.dh_bits) {
-                if (TRACE_BOOL(INFO)) {
-                        fd_log_debug("Generating Diffie-Hellman parameters of size %d (this takes a few seconds)... ", GNUTLS_DEFAULT_DHBITS);
-                }
+                TRACE_DEBUG(FULL, "Generating DH parameters...");
                 CHECK_GNUTLS_DO( gnutls_dh_params_generate2( 
                                         fd_g_config->cnf_sec_data.dh_cache,
                                         GNUTLS_DEFAULT_DHBITS),
                                  { TRACE_DEBUG(INFO, "Error in DH bits value : %d", GNUTLS_DEFAULT_DHBITS); return EINVAL; } );
-                if (TRACE_BOOL(INFO)) {
-                        fd_log_debug("Done!\n");
-                }
-        }
+                TRACE_DEBUG(FULL, "DH parameters generated.");
+        }
+        
         
         return 0;