From e5695779447cd7f0ca1b0be56677c475b42848a1 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Sat, 12 Sep 2020 12:57:30 +0200
Subject: [PATCH] FlexRAN: send loaded apps/macObjects to RTC

---
 .../CONTROL_MODULES/MAC/flexran_agent_mac.c    | 18 ++++++++++++++++++
 .../CONTROL_MODULES/MAC/flexran_agent_mac.h    |  5 +++++
 openair2/ENB_APP/MESSAGES/V2/flexran.proto     |  2 ++
 openair2/ENB_APP/flexran_agent_app.c           | 17 +++++++++++++++++
 openair2/ENB_APP/flexran_agent_app.h           |  4 ++++
 openair2/ENB_APP/flexran_agent_common.c        | 10 ++++++++++
 6 files changed, 56 insertions(+)

diff --git a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
index 117a457b6e..7ca466e8ff 100644
--- a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+++ b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
@@ -2059,3 +2059,21 @@ void flexran_agent_mac_inform_delegation(mid_t mod_id,
   so->dl_handle = h;
   SLIST_INSERT_HEAD(&flexran_handles[mod_id], so, entries);
 }
+
+void flexran_agent_mac_fill_loaded_mac_objects(
+    mid_t mod_id,
+    Protocol__FlexEnbConfigReply *reply) {
+  int n = 0;
+  flexran_agent_so_handle_t *so = NULL;
+  SLIST_FOREACH(so, &flexran_handles[mod_id], entries)
+    ++n;
+  reply->n_loadedmacobjects = n;
+  reply->loadedmacobjects = calloc(n, sizeof(char *));
+  if (!reply->loadedmacobjects) {
+    reply->n_loadedmacobjects = 0;
+    return;
+  }
+  n = 0;
+  SLIST_FOREACH(so, &flexran_handles[mod_id], entries)
+    reply->loadedmacobjects[n++] = so->name;
+}
diff --git a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h
index 4a3e8f5746..18e567c061 100644
--- a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h
+++ b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h
@@ -139,4 +139,9 @@ void flexran_agent_destroy_mac_slice_config(Protocol__FlexCellConfig *conf);
 void flexran_agent_mac_inform_delegation(mid_t mod_id,
                                          Protocol__FlexControlDelegation *cdm);
 
+/* fill the enb_config_reply with the shared objects in use by the MAC sublayer */
+void flexran_agent_mac_fill_loaded_mac_objects(
+    mid_t mod_id,
+    Protocol__FlexEnbConfigReply *reply);
+
 #endif
diff --git a/openair2/ENB_APP/MESSAGES/V2/flexran.proto b/openair2/ENB_APP/MESSAGES/V2/flexran.proto
index 7fd19c805c..cec7f84b6e 100644
--- a/openair2/ENB_APP/MESSAGES/V2/flexran.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/flexran.proto
@@ -159,6 +159,8 @@ message flex_enb_config_reply {
 	repeated flex_cell_config cell_config = 3;
         optional uint32 device_spec = 4;
         optional flex_s1ap_config s1ap = 5;
+        repeated string loadedApps = 6;
+        repeated string loadedMacObjects = 7;
 }
 
 message flex_ue_config_request {
diff --git a/openair2/ENB_APP/flexran_agent_app.c b/openair2/ENB_APP/flexran_agent_app.c
index fd6a51c97e..5bf06ca631 100644
--- a/openair2/ENB_APP/flexran_agent_app.c
+++ b/openair2/ENB_APP/flexran_agent_app.c
@@ -188,3 +188,20 @@ void flexran_agent_handle_apps(
     }
   }
 }
+
+void flexran_agent_fill_loaded_apps(mid_t mod_id,
+                                    Protocol__FlexEnbConfigReply *reply) {
+  int n = 0;
+  flexran_agent_app_internal_t *so = NULL;
+  SLIST_FOREACH(so, &flexran_apps[mod_id], entries)
+    ++n;
+  reply->n_loadedapps = n;
+  reply->loadedapps = calloc(n, sizeof(char *));
+  if (!reply->loadedapps) {
+    reply->n_loadedapps = 0;
+    return;
+  }
+  n = 0;
+  SLIST_FOREACH(so, &flexran_apps[mod_id], entries)
+    reply->loadedapps[n++] = so->name;
+}
diff --git a/openair2/ENB_APP/flexran_agent_app.h b/openair2/ENB_APP/flexran_agent_app.h
index f5e1fe54c3..4723b344bf 100644
--- a/openair2/ENB_APP/flexran_agent_app.h
+++ b/openair2/ENB_APP/flexran_agent_app.h
@@ -67,4 +67,8 @@ void flexran_agent_handle_apps(
     Protocol__FlexAgentReconfigurationSubsystem **subs,
     int n_subs);
 
+/* Fills the enb_config_reply with the currently loaded (started) apps */
+void flexran_agent_fill_loaded_apps(mid_t mod_id,
+                                    Protocol__FlexEnbConfigReply *reply);
+
 #endif
diff --git a/openair2/ENB_APP/flexran_agent_common.c b/openair2/ENB_APP/flexran_agent_common.c
index 345cb5ad96..abb5b57e0c 100644
--- a/openair2/ENB_APP/flexran_agent_common.c
+++ b/openair2/ENB_APP/flexran_agent_common.c
@@ -330,6 +330,12 @@ int flexran_agent_destroy_enb_config_reply(Protocol__FlexranMessage *msg) {
   if (reply->s1ap)
     flexran_agent_free_s1ap_cell_config(&reply->s1ap);
 
+  if (reply->loadedapps)
+    free(reply->loadedapps);
+
+  if (reply->loadedmacobjects)
+    free(reply->loadedmacobjects);
+
   free(reply->cell_config);
   free(reply);
   free(msg);
@@ -836,6 +842,10 @@ int flexran_agent_enb_config_reply(mid_t mod_id, const void *params, Protocol__F
   if (flexran_agent_get_s1ap_xface(mod_id))
     flexran_agent_fill_s1ap_cell_config(mod_id, &enb_config_reply_msg->s1ap);
 
+  flexran_agent_fill_loaded_apps(mod_id, enb_config_reply_msg);
+
+  flexran_agent_mac_fill_loaded_mac_objects(mod_id, enb_config_reply_msg);
+
   *msg = malloc(sizeof(Protocol__FlexranMessage));
 
   if(*msg == NULL) {