Changeset 378:41e3c2a3721c in freeDiameter for freeDiameter/cnxctx.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/cnxctx.c (modified) (4 diffs)

freeDiameter/cnxctx.c

@@ -37 +37 @@
 #include "cnxctx.h"
 
+#include <net/if.h>
+#include <ifaddrs.h> /* for getifaddrs */
+
 /* The maximum size of Diameter message we accept to receive (<= 2^24) to avoid too big mallocs in case of trashed headers */
 #ifndef DIAMETER_MSG_SIZE_MAX
 #define DIAMETER_MSG_SIZE_MAX   65535   /* in bytes */
 #endif /* DIAMETER_MSG_SIZE_MAX */
+
 
 /* Connections contexts (cnxctx) in freeDiameter are wrappers around the sockets and TLS operations .
@@ -74 +78 @@
  */
 
-
 /*******************************************/
 /*     Creation of a connection object     */
@@ -468 +471 @@
 
 /* Get the list of endpoints (IP addresses) of the local and remote peers on this connection */
-int fd_cnx_getendpoints(struct cnxctx * conn, struct fd_list * local, struct fd_list * remote)
-{
-        TRACE_ENTRY("%p %p %p", conn, local, remote);
-        CHECK_PARAMS(conn);
-        
-        if (local) {
-                /* Retrieve the local endpoint(s) of the connection */
-                switch (conn->cc_proto) {
-                        case IPPROTO_TCP: {
-                                sSS ss;
-                                socklen_t sl;
-                                CHECK_FCT(fd_tcp_get_local_ep(conn->cc_socket, &ss, &sl));
-                                CHECK_FCT(fd_ep_add_merge( local, (sSA *)&ss, sl, EP_FL_LL | EP_FL_PRIMARY));
-                        }
-                        break;
-
-                        #ifndef DISABLE_SCTP
-                        case IPPROTO_SCTP: {
-                                CHECK_FCT(fd_sctp_get_local_ep(conn->cc_socket, local));
-                        }
-                        break;
-                        #endif /* DISABLE_SCTP */
-
-                        default:
-                                CHECK_PARAMS(0);
-                }
-        }
-        
-        if (remote) {
-                /* Check we have a full connection object, not a listening socket (with no remote) */
-                CHECK_PARAMS( conn->cc_incoming );
-                
-                /* Retrieve the peer endpoint(s) of the connection */
-                switch (conn->cc_proto) {
-                        case IPPROTO_TCP: {
-                                sSS ss;
-                                socklen_t sl;
-                                CHECK_FCT(fd_tcp_get_remote_ep(conn->cc_socket, &ss, &sl));
-                                CHECK_FCT(fd_ep_add_merge( remote, (sSA *)&ss, sl, EP_FL_LL | EP_FL_PRIMARY ));
-                        }
-                        break;
-
-                        #ifndef DISABLE_SCTP
-                        case IPPROTO_SCTP: {
-                                CHECK_FCT(fd_sctp_get_remote_ep(conn->cc_socket, remote));
-                        }
-                        break;
-                        #endif /* DISABLE_SCTP */
-
-                        default:
-                                CHECK_PARAMS(0);
-                }
+int fd_cnx_getremoteeps(struct cnxctx * conn, struct fd_list * eps)
+{
+        TRACE_ENTRY("%p %p %p", conn, eps);
+        CHECK_PARAMS(conn && eps);
+        
+        /* Check we have a full connection object, not a listening socket (with no remote) */
+        CHECK_PARAMS( conn->cc_incoming );
+
+        /* Retrieve the peer endpoint(s) of the connection */
+        switch (conn->cc_proto) {
+                case IPPROTO_TCP: {
+                        sSS ss;
+                        socklen_t sl;
+                        CHECK_FCT(fd_tcp_get_remote_ep(conn->cc_socket, &ss, &sl));
+                        CHECK_FCT(fd_ep_add_merge( eps, (sSA *)&ss, sl, EP_FL_LL | EP_FL_PRIMARY ));
+                }
+                break;
+
+                #ifndef DISABLE_SCTP
+                case IPPROTO_SCTP: {
+                        CHECK_FCT(fd_sctp_get_remote_ep(conn->cc_socket, eps));
+                }
+                break;
+                #endif /* DISABLE_SCTP */
+
+                default:
+                        CHECK_PARAMS(0);
         }
 
         return 0;
 }
-
 
 /* Get a string describing the remote peer address (ip address or fqdn) */
@@ -531 +508 @@
         CHECK_PARAMS_DO( conn, return "" );
         return conn->cc_remid;
+}
+
+/* Retrieve a list of all IP addresses of the local system from the kernel, using  */
+int fd_cnx_get_local_eps(struct fd_list * list)
+{
+        struct ifaddrs *iflist, *cur;
+        CHECK_SYS(getifaddrs(&iflist));
+        
+        for (cur = iflist; cur != NULL; cur = cur->ifa_next) {
+                if (cur->ifa_flags & IFF_LOOPBACK)
+                        continue;
+                
+                if (fd_g_config->cnf_flags.no_ip4 && (cur->ifa_addr->sa_family == AF_INET))
+                        continue;
+                
+                if (fd_g_config->cnf_flags.no_ip6 && (cur->ifa_addr->sa_family == AF_INET6))
+                        continue;
+                
+                CHECK_FCT(fd_ep_add_merge( list, cur->ifa_addr, sSAlen(cur->ifa_addr), EP_FL_LL ));
+        }
+        
+        freeifaddrs(iflist);
+        
+        return 0;
 }