Commit aba5098e authored by matzakos's avatar matzakos

Remove hardcoding of port numbers in handling of F1 UE context modification request

parent 12eed23f
...@@ -1154,6 +1154,8 @@ int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, ...@@ -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; 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); 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); 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) { switch (drbs_tobesetupmod_item_p->rLCMode) {
case F1AP_RLCMode_rlc_am: case F1AP_RLCMode_rlc_am:
...@@ -1174,7 +1176,7 @@ int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, ...@@ -1174,7 +1176,7 @@ int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance,
drb_p->drb_id, drb_p->drb_id,
drb_p->up_ul_tnl[0].teid, drb_p->up_ul_tnl[0].teid,
addr, addr,
2152, drb_p->up_ul_tnl[0].port,
lteDURecvCb); lteDURecvCb);
drb_p->up_dl_tnl_length++; drb_p->up_dl_tnl_length++;
} }
......
...@@ -3465,7 +3465,7 @@ static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, co ...@@ -3465,7 +3465,7 @@ static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, co
drb_p.drb_id, drb_p.drb_id,
drb_p.up_ul_tnl[0].teid, drb_p.up_ul_tnl[0].teid,
addr, addr,
2152, drb_p.up_ul_tnl[0].port,
DURecvCb); DURecvCb);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment