cu_cp: fix incorrect sctp parameters

Author: alvasMan

include/srsran/support/io/sctp_socket.h

@@ -75,3 +75,34 @@ class sctp_socket
 };
 
 } // namespace srsran
+
+namespace fmt {
+template <>
+struct formatter<srsran::sctp_socket_params> {
+  template <typename ParseContext>
+  auto parse(ParseContext& ctx)
+  {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  auto format(const srsran::sctp_socket_params& cfg, FormatContext& ctx)
+  {
+    return format_to(ctx.out(),
+                     "if_name={} ai_family={} ai_socktype={} reuse_addr={} non_blockin_mode={} rx_timeout={} "
+                     "rto_initial={} rto_min={} rto_max={} init_max_attempts={} max_init_timeo={} no_delay={}",
+                     cfg.if_name,
+                     cfg.ai_family,
+                     cfg.ai_socktype,
+                     cfg.reuse_addr,
+                     cfg.non_blocking_mode,
+                     cfg.rx_timeout.count(),
+                     cfg.rto_initial,
+                     cfg.rto_min,
+                     cfg.rto_max,
+                     cfg.init_max_attempts,
+                     cfg.max_init_timeo,
+                     cfg.nodelay);
+  }
+};
+} // namespace fmt

lib/ngap/gateways/n2_connection_client_factory.cpp

@@ -232,6 +232,7 @@ class n2_sctp_gateway_client : public n2_connection_client
         sctp_cfg.connect_address,
         sctp_cfg.connect_port,
         std::make_unique<sctp_to_n2_pdu_notifier>(std::move(cu_cp_rx_pdu_notifier), pcap_writer, logger));
+
     if (sctp_sender == nullptr) {
       logger.error(
           "Failed to establish N2 TNL connection to AMF on {}:{}.\n", sctp_cfg.connect_address, sctp_cfg.connect_port);
@@ -275,12 +276,17 @@ srsran::srs_cu_cp::create_n2_connection_client(const n2_connection_client_config
   // Connection to AMF through SCTP.
   const auto&                           nw_mode = std::get<n2_connection_client_config::network>(params.mode);
   srsran::sctp_network_connector_config sctp_cfg;
-  sctp_cfg.dest_name       = "AMF";
-  sctp_cfg.if_name         = "N2";
-  sctp_cfg.connect_address = nw_mode.amf_address;
-  sctp_cfg.connect_port    = nw_mode.amf_port;
-  sctp_cfg.bind_address    = nw_mode.bind_address;
-  sctp_cfg.bind_interface  = nw_mode.bind_interface;
-  sctp_cfg.ppid            = NGAP_PPID;
+  sctp_cfg.dest_name         = "AMF";
+  sctp_cfg.if_name           = "N2";
+  sctp_cfg.connect_address   = nw_mode.amf_address;
+  sctp_cfg.connect_port      = nw_mode.amf_port;
+  sctp_cfg.bind_address      = nw_mode.bind_address;
+  sctp_cfg.bind_interface    = nw_mode.bind_interface;
+  sctp_cfg.rto_initial       = nw_mode.rto_initial;
+  sctp_cfg.rto_min           = nw_mode.rto_min;
+  sctp_cfg.rto_max           = nw_mode.rto_max;
+  sctp_cfg.init_max_attempts = nw_mode.init_max_attempts;
+  sctp_cfg.max_init_timeo    = nw_mode.max_init_timeo;
+  sctp_cfg.ppid              = NGAP_PPID;
   return std::make_unique<n2_sctp_gateway_client>(nw_mode.broker, sctp_cfg, params.pcap);
 }

lib/support/network/sctp_socket.cpp

@@ -9,10 +9,11 @@
  */
 
 #include "srsran/support/io/sctp_socket.h"
+#include "srsran/adt/optional.h"
 #include "srsran/srslog/srslog.h"
 #include "srsran/support/error_handling.h"
-#include "srsran/support/format_utils.h"
 #include "srsran/support/io/sockets.h"
+#include "srsran/support/srsran_assert.h"
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <netinet/sctp.h>
@@ -31,10 +32,7 @@ bool sctp_subscribe_to_events(const unique_fd& fd)
   events.sctp_shutdown_event         = 1;
   events.sctp_association_event      = 1;
 
-  if (::setsockopt(fd.value(), IPPROTO_SCTP, SCTP_EVENTS, &events, sizeof(events)) != 0) {
-    return false;
-  }
-  return true;
+  return ::setsockopt(fd.value(), IPPROTO_SCTP, SCTP_EVENTS, &events, sizeof(events)) == 0;
 }
 
 /// \brief Modify SCTP default parameters for quicker detection of broken links.
@@ -143,10 +141,7 @@ bool sctp_set_nodelay(const unique_fd& fd, std::optional<bool> nodelay)
   }
 
   int optval = nodelay.value() ? 1 : 0;
-  if (::setsockopt(fd.value(), IPPROTO_SCTP, SCTP_NODELAY, &optval, sizeof(optval)) != 0) {
-    return false;
-  }
-  return true;
+  return ::setsockopt(fd.value(), IPPROTO_SCTP, SCTP_NODELAY, &optval, sizeof(optval)) == 0;
 }
 
 } // namespace
@@ -299,6 +294,7 @@ bool sctp_socket::set_non_blocking()
 
 bool sctp_socket::set_sockopts(const sctp_socket_params& params)
 {
+  logger.debug("Setting socket options. params=[{}]", params);
   if (not sctp_subscribe_to_events(sock_fd)) {
     logger.error(
         "{}: SCTP failed to be created. Cause: Subscribing to SCTP events failed: {}", if_name, strerror(errno));