From 6eeb25771727db8bf7368096b19acf97ec857960 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Mon, 29 Jan 2018 14:47:52 +0100
Subject: [PATCH] add UE_Capability to type eNB_RRC_UE_t and read it when
received
---
openair2/RRC/LITE/defs.h | 2 ++
openair2/RRC/LITE/rrc_eNB.c | 24 +++++++++++++++++++-----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/openair2/RRC/LITE/defs.h b/openair2/RRC/LITE/defs.h
index 9a346f7fb7..91e50a16d8 100644
--- a/openair2/RRC/LITE/defs.h
+++ b/openair2/RRC/LITE/defs.h
@@ -395,6 +395,8 @@ typedef struct eNB_RRC_UE_s {
MeasConfig_t* measConfig;
HANDOVER_INFO* handover_info;
MeasResults_t* measResults;
+
+ UE_EUTRA_Capability_t* UE_Capability;
#if defined(ENABLE_SECURITY)
/* KeNB as derived from KASME received from EPC */
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 9fb1165beb..bae9138b5f 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -4994,7 +4994,6 @@ rrc_eNB_decode_dcch(
asn_dec_rval_t dec_rval;
//UL_DCCH_Message_t uldcchmsg;
UL_DCCH_Message_t *ul_dcch_msg = NULL; //&uldcchmsg;
- UE_EUTRA_Capability_t *UE_EUTRA_Capability = NULL;
int i;
struct rrc_eNB_ue_context_s* ue_context_p = NULL;
@@ -5385,18 +5384,33 @@ rrc_eNB_decode_dcch(
xer_fprint(stdout, &asn_DEF_UL_DCCH_Message, (void *)ul_dcch_msg);
#endif
LOG_I(RRC, "got UE capabilities for UE %x\n", ctxt_pP->rnti);
+ if (ue_context_p->ue_context.UE_Capability) {
+ LOG_I(RRC, "freeing old UE capabilities for UE %x\n", ctxt_pP->rnti);
+ asn_DEF_UE_EUTRA_Capability.free_struct(&asn_DEF_UE_EUTRA_Capability,
+ ue_context_p->ue_context.UE_Capability, 0);
+ ue_context_p->ue_context.UE_Capability = 0;
+ }
dec_rval = uper_decode(NULL,
&asn_DEF_UE_EUTRA_Capability,
- (void **)&UE_EUTRA_Capability,
+ (void **)&ue_context_p->ue_context.UE_Capability,
ul_dcch_msg->message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.
choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list.
array[0]->ueCapabilityRAT_Container.buf,
ul_dcch_msg->message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.
choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list.
array[0]->ueCapabilityRAT_Container.size, 0, 0);
- //#ifdef XER_PRINT
- //xer_fprint(stdout, &asn_DEF_UE_EUTRA_Capability, (void *)UE_EUTRA_Capability);
- //#endif
+#ifdef XER_PRINT
+ xer_fprint(stdout, &asn_DEF_UE_EUTRA_Capability, ue_context_p->ue_context.UE_Capability);
+#endif
+
+ if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
+ LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Failed to decode UE capabilities (%zu bytes)\n",
+ PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
+ dec_rval.consumed);
+ asn_DEF_UE_EUTRA_Capability.free_struct(&asn_DEF_UE_EUTRA_Capability,
+ ue_context_p->ue_context.UE_Capability, 0);
+ ue_context_p->ue_context.UE_Capability = 0;
+ }
#if defined(ENABLE_USE_MME)
--
GitLab