support: fix shutdown of the sctp gateway. io broker subscription must happen after an event is handled

Author: frankist

lib/gateways/sctp_network_gateway_impl.cpp

@@ -350,11 +350,11 @@ void sctp_network_gateway_impl::handle_data(const span<socket_buffer_type> paylo
 
 void sctp_network_gateway_impl::handle_connection_loss()
 {
-  // Stop listening to new Rx events.
-  io_sub.reset();
-
   // Notify the connection drop.
   ctrl_notifier.on_connection_loss();
+
+  // Stop listening to new Rx events.
+  io_sub.reset();
 }
 
 ///< Process outgoing PDU and send over SCTP socket to peer.

tests/unittests/e2/e2ap_network_adapter_test.cpp

@@ -136,7 +136,7 @@ class e2ap_network_adapter_test : public ::testing::Test
 
     ric_pcap        = std::make_unique<dummy_e2ap_pcap>();
     ric_net_adapter = std::make_unique<e2ap_network_adapter>(*epoll_broker, *ric_pcap);
-    ric_gw          = create_sctp_network_gateway({ric_config, *ric_net_adapter, *ric_net_adapter});
+    auto ric_gw     = create_sctp_network_gateway({ric_config, *ric_net_adapter, *ric_net_adapter});
     ric_net_adapter->bind_and_listen(std::move(ric_gw));
     ric_e2_iface = std::make_unique<dummy_ric_e2>(*ric_net_adapter);
     ric_net_adapter->connect_e2ap(ric_e2_iface.get(), ric_e2_iface.get());
@@ -155,9 +155,9 @@ class e2ap_network_adapter_test : public ::testing::Test
     cfg                  = srsran::config_helpers::make_default_e2ap_config();
     cfg.e2sm_kpm_enabled = true;
 
-    pcap        = std::make_unique<dummy_e2ap_pcap>();
-    net_adapter = std::make_unique<e2ap_network_adapter>(*epoll_broker, *pcap);
-    e2_agent_gw = create_sctp_network_gateway({e2agent_config, *net_adapter, *net_adapter});
+    pcap             = std::make_unique<dummy_e2ap_pcap>();
+    net_adapter      = std::make_unique<e2ap_network_adapter>(*epoll_broker, *pcap);
+    auto e2_agent_gw = create_sctp_network_gateway({e2agent_config, *net_adapter, *net_adapter});
     net_adapter->connect_gateway(std::move(e2_agent_gw));
     du_metrics       = std::make_unique<dummy_e2_du_metrics>();
     du_meas_provider = std::make_unique<dummy_e2sm_kpm_du_meas_provider>();
@@ -187,15 +187,13 @@ class e2ap_network_adapter_test : public ::testing::Test
   std::unique_ptr<dummy_e2ap_pcap>      ric_pcap;
   std::unique_ptr<e2ap_asn1_packer>     ric_packer;
   std::unique_ptr<e2ap_network_adapter> ric_net_adapter;
-  std::unique_ptr<sctp_network_gateway> ric_gw;
 
   // E2 agent
   e2ap_configuration                       cfg;
   timer_factory                            factory;
   timer_manager                            timers;
   std::unique_ptr<e2ap_network_adapter>    net_adapter;
   manual_task_worker                       task_exec{128};
-  std::unique_ptr<sctp_network_gateway>    e2_agent_gw;
   std::unique_ptr<dummy_e2ap_pcap>         pcap;
   std::unique_ptr<e2_subscription_manager> e2_subscription_mngr;
   std::unique_ptr<e2sm_handler>            e2sm_packer;