Move GTP UE ID update out of message decoder
This commit is contained in:
@@ -50,7 +50,6 @@
|
|||||||
#include "asn1_msg.h"
|
#include "asn1_msg.h"
|
||||||
#include "intertask_interface.h"
|
#include "intertask_interface.h"
|
||||||
#include "LAYER2/NR_MAC_gNB/mac_proto.h"
|
#include "LAYER2/NR_MAC_gNB/mac_proto.h"
|
||||||
#include <openair3/ocp-gtpu/gtp_itf.h>
|
|
||||||
|
|
||||||
#include "openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.h"
|
#include "openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.h"
|
||||||
|
|
||||||
@@ -83,7 +82,6 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance, sctp_assoc_t assoc_id
|
|||||||
/* strange: it is not named OLD_GNB_DU_UE... */
|
/* strange: it is not named OLD_GNB_DU_UE... */
|
||||||
old_gNB_DU_ue_id_stack = ie->value.choice.GNB_DU_UE_F1AP_ID_1;
|
old_gNB_DU_ue_id_stack = ie->value.choice.GNB_DU_UE_F1AP_ID_1;
|
||||||
old_gNB_DU_ue_id = &old_gNB_DU_ue_id_stack;
|
old_gNB_DU_ue_id = &old_gNB_DU_ue_id_stack;
|
||||||
gtpv1u_update_ue_id(getCxt(instance)->gtpInst, old_gNB_DU_ue_id_stack, du_ue_f1ap_id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* mandatory */
|
/* mandatory */
|
||||||
|
|||||||
@@ -716,6 +716,9 @@ void dl_rrc_message_transfer(const f1ap_dl_rrc_message_t *dl_rrc)
|
|||||||
pthread_mutex_unlock(&mac->sched_lock);
|
pthread_mutex_unlock(&mac->sched_lock);
|
||||||
nr_rlc_remove_ue(dl_rrc->gNB_DU_ue_id);
|
nr_rlc_remove_ue(dl_rrc->gNB_DU_ue_id);
|
||||||
nr_rlc_update_rnti(*dl_rrc->old_gNB_DU_ue_id, dl_rrc->gNB_DU_ue_id);
|
nr_rlc_update_rnti(*dl_rrc->old_gNB_DU_ue_id, dl_rrc->gNB_DU_ue_id);
|
||||||
|
instance_t f1inst = get_f1_gtp_instance();
|
||||||
|
if (f1inst >= 0) // we actually use F1-U
|
||||||
|
gtpv1u_update_ue_id(f1inst, *dl_rrc->old_gNB_DU_ue_id, dl_rrc->gNB_DU_ue_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* the DU ue id is the RNTI */
|
/* the DU ue id is the RNTI */
|
||||||
|
|||||||
Reference in New Issue
Block a user