f1ap: remove asn1 f1ap from the public f1ap interfaces

Author: frankist

apps/examples/du/du_example.cpp

@@ -16,6 +16,7 @@
 #include "radio_notifier_sample.h"
 #include "srsran/asn1/rrc_nr/msg_common.h"
 #include "srsran/du/du_cell_config_helpers.h"
+#include "srsran/f1ap/common/f1ap_message.h"
 #include "srsran/fapi/logging_decorator_factories.h"
 #include "srsran/fapi_adaptor/mac/mac_fapi_adaptor_factory.h"
 #include "srsran/fapi_adaptor/phy/phy_fapi_adaptor_factory.h"

apps/gnb/CMakeLists.txt

@@ -6,8 +6,6 @@
 # the distribution.
 #
 
-add_subdirectory(adapters)
-
 add_executable(gnb
         gnb.cpp
         gnb_appconfig_cli11_schema.cpp
@@ -18,6 +16,7 @@ add_executable(gnb
         helpers/metrics_plotter_stdout.cpp
         helpers/gnb_console_helper.cpp
         helpers/metrics_hub.cpp
+        adapters/f1ap_adapter.cpp
         )
 
 install(TARGETS gnb

apps/gnb/adapters/CMakeLists.txt

@@ -0,0 +1,36 @@
+/*
+ *
+ * Copyright 2021-2023 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#include "f1ap_adapter.h"
+#include "srsran/f1ap/common/f1ap_message.h"
+
+using namespace srsran;
+
+f1ap_local_adapter::f1ap_local_adapter(const std::string& log_name, dlt_pcap& f1ap_pcap_) :
+  logger(srslog::fetch_basic_logger(log_name)), f1ap_pcap(f1ap_pcap_)
+{
+}
+
+void f1ap_local_adapter::on_new_message(const f1ap_message& msg)
+{
+  report_fatal_error_if_not(handler, "F1AP message handler not set");
+  logger.debug("Received a PDU of type {}", msg.pdu.type().to_string());
+
+  if (f1ap_pcap.is_write_enabled()) {
+    byte_buffer   buf;
+    asn1::bit_ref bref(buf);
+    if (msg.pdu.pack(bref) != asn1::SRSASN_SUCCESS) {
+      logger.error("Failed to pack PDU");
+    } else {
+      f1ap_pcap.push_pdu(std::move(buf));
+    }
+  }
+  handler->handle_message(msg);
+}

apps/gnb/adapters/f1ap_adapter.cpp

@@ -19,28 +19,11 @@ namespace srsran {
 class f1ap_local_adapter : public f1ap_message_notifier
 {
 public:
-  explicit f1ap_local_adapter(const std::string& log_name, dlt_pcap& f1ap_pcap_) :
-    logger(srslog::fetch_basic_logger(log_name)), f1ap_pcap(f1ap_pcap_)
-  {
-  }
+  explicit f1ap_local_adapter(const std::string& log_name, dlt_pcap& f1ap_pcap_);
 
   void attach_handler(f1ap_message_handler* handler_) { handler = handler_; }
-  void on_new_message(const f1ap_message& msg) override
-  {
-    report_fatal_error_if_not(handler, "F1AP message handler not set");
-    logger.debug("Received a PDU of type {}", msg.pdu.type().to_string());
-
-    if (f1ap_pcap.is_write_enabled()) {
-      byte_buffer   buf;
-      asn1::bit_ref bref(buf);
-      if (msg.pdu.pack(bref) != asn1::SRSASN_SUCCESS) {
-        logger.error("Failed to pack PDU");
-      } else {
-        f1ap_pcap.push_pdu(std::move(buf));
-      }
-    }
-    handler->handle_message(msg);
-  }
+
+  void on_new_message(const f1ap_message& msg) override;
 
 private:
   srslog::basic_logger& logger;

apps/gnb/adapters/f1ap_adapter.h

@@ -10,13 +10,10 @@
 
 #pragma once
 
-#include "srsran/asn1/f1ap/f1ap.h"
-
 namespace srsran {
 
-struct f1ap_message {
-  asn1::f1ap::f1ap_pdu_c pdu;
-};
+// Forward declaration.
+struct f1ap_message;
 
 /// This interface is used to push F1AP messages to the F1 interface.
 class f1ap_message_handler

include/srsran/f1ap/common/f1ap_common.h

@@ -0,0 +1,22 @@
+/*
+ *
+ * Copyright 2021-2023 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include "srsran/asn1/f1ap/f1ap.h"
+
+namespace srsran {
+
+/// \brief F1AP message transferred between a CU-CP and a DU.
+struct f1ap_message {
+  asn1::f1ap::f1ap_pdu_c pdu;
+};
+
+} // namespace srsran

include/srsran/f1ap/common/f1ap_message.h

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include "srsran/asn1/f1ap/f1ap_pdu_contents_ue.h"
 #include "srsran/cu_cp/cu_cp_types.h"
 #include <vector>
 

include/srsran/f1ap/cu_cp/f1ap_cu_ue_context_update.h

@@ -147,14 +147,14 @@ class f1ap_du_paging_notifier
 };
 
 /// Combined entry point for F1AP handling.
-class f1ap_interface : public f1ap_message_handler,
-                       public f1ap_event_handler,
-                       public f1ap_rrc_message_transfer_procedure_handler,
-                       public f1ap_connection_manager,
-                       public f1ap_ue_context_manager
+class f1ap_du : public f1ap_message_handler,
+                public f1ap_event_handler,
+                public f1ap_rrc_message_transfer_procedure_handler,
+                public f1ap_connection_manager,
+                public f1ap_ue_context_manager
 {
 public:
-  virtual ~f1ap_interface() = default;
+  virtual ~f1ap_du() = default;
 };
 
 } // namespace srs_du

include/srsran/f1ap/du/f1ap_du.h

@@ -8,11 +8,11 @@ namespace srsran {
 namespace srs_du {
 
 /// Creates an instance of an F1AP DU interface, notifying outgoing packets on the specified listener object.
-std::unique_ptr<f1ap_interface> create_f1ap(f1ap_message_notifier&      event_notifier,
-                                            f1ap_du_configurator&       du_mng,
-                                            task_executor&              ctrl_exec,
-                                            du_high_ue_executor_mapper& ue_exec_mapper,
-                                            f1ap_du_paging_notifier&    paging_notifier);
+std::unique_ptr<f1ap_du> create_f1ap(f1ap_message_notifier&      event_notifier,
+                                     f1ap_du_configurator&       du_mng,
+                                     task_executor&              ctrl_exec,
+                                     du_high_ue_executor_mapper& ue_exec_mapper,
+                                     f1ap_du_paging_notifier&    paging_notifier);
 
 } // namespace srs_du
 } // namespace srsran