Changeset 1540:407e0a889c7e in freeDiameter for libfdcore/cnxctx.c

Timestamp:

May 1, 2020, 5:20:33 PM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

SCTP ConnectPeer?: sctp_bindx() to local endpoints

When connecting to an SCTP peer using sctp_connectx() with local
addresses configured with ListenOn?, bind to the ListenOn? addresses
using sctp_bindx() so that the SCTP INIT only contains the
configured local addresses, matching what is advertised in the CER,
and disable SCTP_AUTO_ASCONF.

If no local addresses are configured with ListenOn?, the previous
behaviour of sctp_connectx() and enable SCTP_AUTO_ASCONF is used.

File:

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

libfdcore/cnxctx.c

@@ -331 +331 @@
 }
 
-/* Same for SCTP, accepts a list of remote addresses to connect to (see sctp_connectx for how they are used) */
-struct cnxctx * fd_cnx_cli_connect_sctp(int no_ip6, uint16_t port, struct fd_list * list)
+/* Same for SCTP, accepts a list of remote addresses to connect to (see sctp_connectx for how they are used).
+ * If src_list is not NULL and not empty, list of local addresses to connect from via sctp_bindx(). */
+struct cnxctx * fd_cnx_cli_connect_sctp(int no_ip6, uint16_t port, struct fd_list * list, struct fd_list * src_list)
 {
 #ifdef DISABLE_SCTP
@@ -345 +346 @@
         sSS primary;
 
-        TRACE_ENTRY("%p", list);
+        TRACE_ENTRY("%p %p", list, src_list);
         CHECK_PARAMS_DO( list && !FD_IS_LIST_EMPTY(list), return NULL );
 
+        /* Log SCTP association source and destination endpoints */
+        {
+                char * buf = NULL;
+                size_t len = 0, offset = 0;
+                CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset, "Connecting SCTP endpoints"), );
+                CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset, " source: "), );
+                if (src_list && !FD_IS_LIST_EMPTY(src_list)) {
+                        CHECK_MALLOC_DO( fd_ep_dump( &buf, &len, &offset, 0, 0, src_list ), );
+                } else {
+                        CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset, "(ANY)"), );
+                }
+                CHECK_MALLOC_DO( fd_dump_extend( &buf, &len, &offset, ", destination: "), );
+                CHECK_MALLOC_DO( fd_ep_dump( &buf, &len, &offset, 0, 0, list ), );
+                LOG_D("%s", buf ?: "Error determining SCTP endpoints");
+                free(buf);
+        }
+
         fd_sa_sdump_numeric(sa_buf, &((struct fd_endpoint *)(list->next))->sa);
 
@@ -353 +371 @@
 
         {
-                int ret = fd_sctp_client( &sock, no_ip6, port, list );
+                int ret = fd_sctp_client( &sock, no_ip6, port, list, src_list );
                 if (ret != 0) {
                         LOG_D("SCTP connection to [%s,...] failed: %s", sa_buf, strerror(ret));