From 01a095a26856c3338b7a0cd1e9c9c8059ede8037 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 2 Nov 2023 14:56:09 +0100
Subject: [PATCH] assoc_id only to be stored for DU

---
 openair2/F1AP/f1ap_common.h  | 4 +++-
 openair2/F1AP/f1ap_cu_task.c | 3 ++-
 openair2/F1AP/f1ap_du_task.c | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/openair2/F1AP/f1ap_common.h b/openair2/F1AP/f1ap_common.h
index 5dcd661b3b..2071234be0 100644
--- a/openair2/F1AP/f1ap_common.h
+++ b/openair2/F1AP/f1ap_common.h
@@ -401,7 +401,9 @@ typedef struct f1ap_cudu_inst_s {
   f1ap_net_config_t net_config;
 
   /* SCTP information */
-  sctp_assoc_t assoc_id;
+  struct {
+    sctp_assoc_t assoc_id;
+  } du;
   uint16_t sctp_in_streams;
   uint16_t sctp_out_streams;
 
diff --git a/openair2/F1AP/f1ap_cu_task.c b/openair2/F1AP/f1ap_cu_task.c
index 38fb722b3e..1c2b727237 100644
--- a/openair2/F1AP/f1ap_cu_task.c
+++ b/openair2/F1AP/f1ap_cu_task.c
@@ -55,7 +55,8 @@ static void cu_task_handle_sctp_association_ind(instance_t instance,
 {
   // save the assoc id
   f1ap_cudu_inst_t *f1ap_cu_data = getCxt(instance);
-  f1ap_cu_data->assoc_id         = sctp_new_association_ind->assoc_id;
+  // we don't need the assoc_id, subsequent messages (the first being F1 Setup
+  // Request), will deliver the assoc_id
   f1ap_cu_data->sctp_in_streams  = sctp_new_association_ind->in_streams;
   f1ap_cu_data->sctp_out_streams = sctp_new_association_ind->out_streams;
 }
diff --git a/openair2/F1AP/f1ap_du_task.c b/openair2/F1AP/f1ap_du_task.c
index e53a1e5134..7ba479e1f9 100644
--- a/openair2/F1AP/f1ap_du_task.c
+++ b/openair2/F1AP/f1ap_du_task.c
@@ -76,11 +76,11 @@ void du_task_handle_sctp_association_resp(instance_t instance, sctp_new_associat
   }
 
   // save the assoc id
-  f1ap_du_data->assoc_id         = sctp_new_association_resp->assoc_id;
+  f1ap_du_data->du.assoc_id = sctp_new_association_resp->assoc_id;
   f1ap_du_data->sctp_in_streams  = sctp_new_association_resp->in_streams;
   f1ap_du_data->sctp_out_streams = sctp_new_association_resp->out_streams;
   /* setup parameters for F1U and start the server */
-  DU_send_F1_SETUP_REQUEST(f1ap_du_data->assoc_id, &f1ap_du_data->setupReq);
+  DU_send_F1_SETUP_REQUEST(f1ap_du_data->du.assoc_id, &f1ap_du_data->setupReq);
 }
 
 void du_task_handle_sctp_data_ind(instance_t instance, sctp_data_ind_t *sctp_data_ind) {
@@ -102,7 +102,7 @@ void *F1AP_DU_task(void *arg) {
     MessageDef *msg = NULL;
     itti_receive_msg(TASK_DU_F1, &msg);
     instance_t myInstance=ITTI_MSG_DESTINATION_INSTANCE(msg);
-    sctp_assoc_t assoc_id = getCxt(0) != NULL ? getCxt(0)->assoc_id : 0;
+    sctp_assoc_t assoc_id = getCxt(0) != NULL ? getCxt(0)->du.assoc_id : 0;
     LOG_D(F1AP, "DU Task Received %s for instance %ld: sending SCTP messages via assoc_id %d\n", ITTI_MSG_NAME(msg), myInstance, assoc_id);
     switch (ITTI_MSG_ID(msg)) {
       case F1AP_SETUP_REQ: