From c0db34077ae54c0bcd8f32ea0ca3814d165ad92d Mon Sep 17 00:00:00 2001 From: Guido Casati Date: Thu, 7 Nov 2024 17:41:22 +0100 Subject: [PATCH] Explicitly include the mandatory IE cn_support in the E1 Setup Request * this commit is making explicit the mandatory IE cn_support in the E1 Setup Request message * also, init cn_support in E1 Setup Request initial message preparation --- openair2/COMMON/e1ap_messages_types.h | 7 +++++++ openair2/E1AP/e1ap_setup.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/openair2/COMMON/e1ap_messages_types.h b/openair2/COMMON/e1ap_messages_types.h index 67b1efd141..af15a29987 100644 --- a/openair2/COMMON/e1ap_messages_types.h +++ b/openair2/COMMON/e1ap_messages_types.h @@ -72,6 +72,11 @@ typedef enum cell_group_id_e { SCG, } cell_group_id_t; +typedef enum CN_Support_e { + cn_support_EPC = 0, + cn_support_5GC, +} cn_Support_t; + typedef struct PLMN_ID_s { int mcc; int mnc; @@ -97,6 +102,8 @@ typedef struct e1ap_setup_req_s { char * gNB_cu_up_name; uint64_t transac_id; int supported_plmns; + // CN Support + cn_Support_t cn_support; struct { PLMN_ID_t id; int supported_slices; diff --git a/openair2/E1AP/e1ap_setup.c b/openair2/E1AP/e1ap_setup.c index fc59a881fa..d464564b27 100644 --- a/openair2/E1AP/e1ap_setup.c +++ b/openair2/E1AP/e1ap_setup.c @@ -90,6 +90,9 @@ MessageDef *RCconfig_NR_CU_E1(const E1_t *entity) if (*gnbParms[GNB_GNB_NAME_IDX].strptr) e1Setup->gNB_cu_up_name = *(gnbParms[GNB_GNB_NAME_IDX].strptr); + // Only 5GC supported + e1Setup->cn_support = cn_support_5GC; + paramdef_t PLMNParams[] = GNBPLMNPARAMS_DESC; paramlist_def_t PLMNParamList = {GNB_CONFIG_STRING_PLMN_LIST, NULL, 0}; /* map parameter checking array instances to parameter definition array instances */