Changeset 378:41e3c2a3721c in freeDiameter for freeDiameter/server.c

Timestamp:

Jul 5, 2010, 4:21:22 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Replaced old mechanism to discover local addresses by a call to getifaddrs, lot cleaner!
Should close #4

File:

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

freeDiameter/server.c

@@ -270 +270 @@
                 CHECK_POSIX( pthread_create( &s->thr, NULL, serv_th, s ) );
                 
-                /* Retrieve the list of endpoints if it was empty */
-                if (empty_conf_ep) {
-                        (void) fd_cnx_getendpoints(s->conn, &fd_g_config->cnf_endpoints, NULL);
-                        if (TRACE_BOOL(FULL)){
-                                fd_log_debug("  Local server address(es) :\n");
-                                fd_ep_dump( 5, &fd_g_config->cnf_endpoints );
-                        }
-                }
-                
                 /* Create the server on secure port */
                 CHECK_MALLOC( s = new_serv(IPPROTO_SCTP, 1) );
@@ -344 +335 @@
         }
         
+        /* Now, if we still have not got the list of local adresses, try to read it from the kernel directly */
+        if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) {
+                CHECK_FCT(fd_cnx_get_local_eps(&fd_g_config->cnf_endpoints));
+                if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) {
+                        TRACE_DEBUG(INFO, "Unable to find the addresses of the local system. Please use \"ListenOn\" parameter in the configuration.");
+                        return EINVAL;
+                }
+        }
+        if (TRACE_BOOL(FULL)){
+                fd_log_debug("  Local server address(es) :\n");
+                fd_ep_dump( 5, &fd_g_config->cnf_endpoints );
+        }
         return 0;
 }