Changeset 22:0b3b46da2c12 in freeDiameter for freeDiameter/config.c

Timestamp:

Oct 19, 2009, 6:43:09 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Progress on server code

File:

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

freeDiameter/config.c

@@ -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->ss.ss_family == AF_INET))
+                           ||(fd_g_config->cnf_flags.no_ip6 && (ep->ss.ss_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->ss, AI_NUMERICHOST );
+                                        fd_log_debug("\n");
+                                }
+                                free(ep);
+                        }
+                }
+        }
+        
         /* Configure TLS default parameters */
         if (! fd_g_config->cnf_sec_data.prio_string) {
@@ -239 +258 @@
         }
         if (! fd_g_config->cnf_sec_data.dh_bits) {
-                TRACE_DEBUG(FULL, "Generating DH parameters...");
+                if (TRACE_BOOL(INFO)) {
+                        fd_log_debug("Generating Diffie-Hellman parameters of size %d (this takes a few seconds)... ", GNUTLS_DEFAULT_DHBITS);
+                }
                 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; } );
-                TRACE_DEBUG(FULL, "DH parameters generated.");
-        }
-        
+                if (TRACE_BOOL(INFO)) {
+                        fd_log_debug("Done!\n");
+                }
+        }
         
         return 0;