sctp: add connection name

Author: pgawlowicz

apps/gnb/gnb.cpp

@@ -88,6 +88,7 @@ static void populate_cli11_generic_args(CLI::App& app)
 static void compute_derived_args(const gnb_appconfig& gnb_params)
 {
   /// Simply set the respective values in the appconfig.
+  ngap_nw_config.connection_name = "AMF";
   ngap_nw_config.connect_address = gnb_params.amf_cfg.ip_addr;
   ngap_nw_config.connect_port    = gnb_params.amf_cfg.port;
   ngap_nw_config.bind_address    = gnb_params.amf_cfg.bind_addr;
@@ -110,6 +111,7 @@ static void compute_derived_args(const gnb_appconfig& gnb_params)
 
   /// E2 interface - simply set the respective values in the appconfig.
   if (gnb_params.e2_cfg.enable_du_e2) {
+    e2_nw_config.connection_name = "NearRT-RIC";
     e2_nw_config.connect_address = gnb_params.e2_cfg.ip_addr;
     e2_nw_config.connect_port    = gnb_params.e2_cfg.port;
     e2_nw_config.bind_address    = gnb_params.e2_cfg.bind_addr;

include/srsran/gateways/sctp_network_gateway.h

@@ -24,6 +24,7 @@ constexpr uint16_t NGAP_PPID = 60; // NGAP PPID, see TS 38.412, section 7.
 
 /// \brief Configuration for SCTP network gateway
 struct sctp_network_gateway_config : common_network_gateway_config {
+  std::string connection_name;
   std::string connect_address;
   int         connect_port = 0;
   int         ppid         = 0; /// the Payload Protocol Identifier

lib/gateways/sctp_network_gateway_impl.cpp

@@ -248,7 +248,10 @@ bool sctp_network_gateway_impl::create_and_connect()
     return false;
   }
 
-  fmt::print("Connecting to AMF on {}:{}\n", config.connect_address.c_str(), connect_port.c_str());
+  fmt::print("Connecting to {} on {}:{}\n",
+             config.connection_name.c_str(),
+             config.connect_address.c_str(),
+             connect_port.c_str());
   std::chrono::time_point<std::chrono::steady_clock> start = std::chrono::steady_clock::now();
   struct addrinfo*                                   result;
   for (result = results; result != nullptr; result = result->ai_next) {

tests/integrationtests/e2ap/e2ap_integration_test.cpp

@@ -94,6 +94,7 @@ class e2ap_integration_test : public ::testing::Test
     cfg.e2sm_kpm_enabled = true;
 
     sctp_network_gateway_config nw_config;
+    nw_config.connection_name   = "NearRT-RIC";
     nw_config.connect_address   = "127.0.0.1";
     nw_config.connect_port      = 36421;
     nw_config.bind_address      = "127.0.0.101";
@@ -168,6 +169,7 @@ class e2ap_gw_connector_integration_test : public ::testing::Test
     cfg.gnb_id           = 123;
 
     sctp_network_gateway_config nw_config;
+    nw_config.connection_name   = "NearRT-RIC";
     nw_config.connect_address   = "127.0.0.1";
     nw_config.connect_port      = 36421;
     nw_config.bind_address      = "127.0.0.101";

tests/integrationtests/ngap/ngap_integration_test.cpp

@@ -91,6 +91,7 @@ class ngap_integration_test : public ::testing::Test
     cfg.slice_configurations.push_back(slice_cfg);
 
     sctp_network_gateway_config nw_config;
+    nw_config.connection_name   = "AMF";
     nw_config.connect_address   = "10.12.1.105";
     nw_config.connect_port      = 38412;
     nw_config.bind_address      = "10.8.1.10";

tests/unittests/gateways/sctp_network_gateway_test.cpp

@@ -150,6 +150,7 @@ TEST_F(sctp_network_gateway_tester, when_socket_not_exists_then_connect_fails)
   ASSERT_FALSE(client_control_notifier.get_connection_dropped());
 
   sctp_network_gateway_config config;
+  config.connection_name   = "TEST";
   config.connect_address   = "127.0.0.1";
   config.connect_port      = get_unused_sctp_port(config.connect_address);
   config.non_blocking_mode = true;
@@ -166,6 +167,7 @@ TEST_F(sctp_network_gateway_tester, when_v6_socket_not_exists_then_connect_fails
   ASSERT_FALSE(client_control_notifier.get_connection_dropped());
 
   sctp_network_gateway_config config;
+  config.connection_name   = "TEST";
   config.connect_address   = "::1";
   config.connect_port      = get_unused_sctp_port(config.connect_address);
   config.non_blocking_mode = true;
@@ -186,6 +188,7 @@ TEST_F(sctp_network_gateway_tester, when_config_valid_then_trx_succeeds)
   ASSERT_NE(server_config.bind_port, 0);
 
   sctp_network_gateway_config client_config;
+  client_config.connection_name   = "TEST";
   client_config.connect_address   = server_config.bind_address;
   client_config.connect_port      = server_config.bind_port;
   client_config.non_blocking_mode = true;
@@ -227,6 +230,7 @@ TEST_F(sctp_network_gateway_tester, when_v6_config_valid_then_trx_succeeds)
   ASSERT_NE(server_config.bind_port, 0);
 
   sctp_network_gateway_config client_config;
+  client_config.connection_name   = "TEST";
   client_config.connect_address   = server_config.bind_address;
   client_config.connect_port      = server_config.bind_port;
   client_config.non_blocking_mode = true;
@@ -268,6 +272,7 @@ TEST_F(sctp_network_gateway_tester, when_hostname_resolved_then_trx_succeeds)
   ASSERT_NE(server_config.bind_port, 0);
 
   sctp_network_gateway_config client_config;
+  client_config.connection_name   = "TEST";
   client_config.connect_address   = server_config.bind_address;
   client_config.connect_port      = server_config.bind_port;
   client_config.non_blocking_mode = true;