Changeset 23:db6c40b8b307 in freeDiameter for freeDiameter/cnxctx.c

Timestamp:

Oct 20, 2009, 5:30:20 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added some code in cnxctx.c mainly

File:

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

freeDiameter/cnxctx.c

@@ -214 +214 @@
                         break;
 
+#ifndef DISABLE_SCTP
                 case IPPROTO_SCTP:
                         CHECK_FCT(fd_sctp_listen(conn->cc_socket));
                         break;
+#endif /* DISABLE_SCTP */
 
                 default:
@@ -400 +402 @@
 }
 
-/* Get the list of endpoints (IP addresses) of the local and remote peers on this conenction */
+/* 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)
 {
@@ -408 +410 @@
         if (local) {
                 /* Retrieve the local endpoint(s) of the connection */
-                TODO("TCP : getsockname");
-                TODO("SCTP: sctp_getladdrs / _sctp_getboundaddrs (waaad)");
+                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, 0, 0, 0, 1 ));
+                        }
+                        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_events );
+                
                 /* Retrieve the peer endpoint(s) of the connection */
-                TODO("TCP : getpeername");
-                TODO("SCTP: sctp_getpaddrs");
-                
-        }
-
-        return ENOTSUP;
+                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, 0, 0, 0, 1 ));
+                        }
+                        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);
+                }
+        }
+
+        return 0;
 }