From aba5098e30587309f8e5af9c66a8bdaba7e3cdb6 Mon Sep 17 00:00:00 2001 From: matzakos Date: Thu, 17 Mar 2022 17:01:01 +0100 Subject: [PATCH] Remove hardcoding of port numbers in handling of F1 UE context modification request --- openair2/F1AP/f1ap_du_ue_context_management.c | 4 +++- openair2/RRC/NR/rrc_gNB.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openair2/F1AP/f1ap_du_ue_context_management.c b/openair2/F1AP/f1ap_du_ue_context_management.c index 30dec1de08..ca0ddcc82d 100644 --- a/openair2/F1AP/f1ap_du_ue_context_management.c +++ b/openair2/F1AP/f1ap_du_ue_context_management.c @@ -1154,6 +1154,8 @@ int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, F1AP_GTPTunnel_t *ul_up_tnl0 = ul_up_tnl_info_p->uLUPTNLInformation.choice.gTPTunnel; BIT_STRING_TO_TRANSPORT_LAYER_ADDRESS_IPv4(&ul_up_tnl0->transportLayerAddress, drb_p->up_ul_tnl[0].tl_address); OCTET_STRING_TO_INT32(&ul_up_tnl0->gTP_TEID, drb_p->up_ul_tnl[0].teid); + // 3GPP assumes GTP-U is on port 2152, but OAI is configurable + drb_p->up_ul_tnl[0].port=getCxt(false,instance)->setupReq.CUport; switch (drbs_tobesetupmod_item_p->rLCMode) { case F1AP_RLCMode_rlc_am: @@ -1174,7 +1176,7 @@ int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, drb_p->drb_id, drb_p->up_ul_tnl[0].teid, addr, - 2152, + drb_p->up_ul_tnl[0].port, lteDURecvCb); drb_p->up_dl_tnl_length++; } diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c index 28ccfb1181..bded0a619d 100755 --- a/openair2/RRC/NR/rrc_gNB.c +++ b/openair2/RRC/NR/rrc_gNB.c @@ -3465,7 +3465,7 @@ static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, co drb_p.drb_id, drb_p.up_ul_tnl[0].teid, addr, - 2152, + drb_p.up_ul_tnl[0].port, DURecvCb); } }