Commit c40cceb4 authored by Maud Tribaudeau's avatar Maud Tribaudeau

reestablishment for LTE

parent 537605a6
This diff is collapsed.
...@@ -297,30 +297,29 @@ void rrc_pdcp_config_req ( ...@@ -297,30 +297,29 @@ void rrc_pdcp_config_req (
const rb_id_t rb_idP, const rb_id_t rb_idP,
const uint8_t security_modeP); const uint8_t security_modeP);
/*! \fn bool rrc_pdcp_config_asn1_req (const protocol_ctxt_t* const , SRB_ToAddModList_t* srb2add_list, DRB_ToAddModList_t* drb2add_list, DRB_ToReleaseList_t* drb2release_list) /*! \fn bool rrc_pdcp_config_asn1_req (const protocol_ctxt_t* const , SRB_ToAddModList_t* srb2add_list, DRB_ToAddModList_t*
* \brief Function for RRC to configure a Radio Bearer. * drb2add_list, DRB_ToReleaseList_t* drb2release_list) \brief Function for RRC to configure a Radio Bearer. \param[in] ctxt_pP
* \param[in] ctxt_pP Running context. * Running context. \param[in] index index of UE or eNB depending on the eNB_flag \param[in] srb2add_list SRB
* \param[in] index index of UE or eNB depending on the eNB_flag * configuration list to be created. \param[in] drb2add_list DRB configuration list to be created. \param[in] drb2release_list
* \param[in] srb2add_list SRB configuration list to be created. * DRB configuration list to be released. \param[in] security_mode Security algorithm to apply for integrity/ciphering
* \param[in] drb2add_list DRB configuration list to be created. * \param[in] kRRCenc RRC encryption key
* \param[in] drb2release_list DRB configuration list to be released. * \param[in] kRRCint RRC integrity key
* \param[in] security_mode Security algorithm to apply for integrity/ciphering * \param[in] kUPenc User-Plane encryption key
* \param[in] kRRCenc RRC encryption key * \param[in] defaultDRB Default DRB ID
* \param[in] kRRCint RRC integrity key * \param[in] previous_rnti_for_reestab rnti in case of reestablishment to get previous pdcp context
* \param[in] kUPenc User-Plane encryption key * \return A status about the processing, OK or error code.
* \param[in] defaultDRB Default DRB ID */
* \return A status about the processing, OK or error code. bool rrc_pdcp_config_asn1_req(const protocol_ctxt_t *const ctxt_pP,
*/ LTE_SRB_ToAddModList_t *const srb2add_list,
bool rrc_pdcp_config_asn1_req(const protocol_ctxt_t *const ctxt_pP, LTE_DRB_ToAddModList_t *const drb2add_list,
LTE_SRB_ToAddModList_t *const srb2add_list,
LTE_DRB_ToAddModList_t *const drb2add_list,
LTE_DRB_ToReleaseList_t *const drb2release_list, LTE_DRB_ToReleaseList_t *const drb2release_list,
const uint8_t security_modeP, const uint8_t security_modeP,
uint8_t *const kRRCenc, uint8_t *const kRRCenc,
uint8_t *const kRRCint, uint8_t *const kRRCint,
uint8_t *const kUPenc, uint8_t *const kUPenc,
LTE_PMCH_InfoList_r9_t *pmch_InfoList_r9, LTE_PMCH_InfoList_r9_t *pmch_InfoList_r9,
rb_id_t *const defaultDRB); rb_id_t *const defaultDRB,
const rnti_t previous_rnti_for_reestab);
/*! \fn void pdcp_add_UE(const protocol_ctxt_t* const ctxt_pP) /*! \fn void pdcp_add_UE(const protocol_ctxt_t* const ctxt_pP)
* \brief Function (for RRC) to add a new UE in PDCP module * \brief Function (for RRC) to add a new UE in PDCP module
......
...@@ -939,16 +939,17 @@ void nr_pdcp_add_drbs(eNB_flag_t enb_flag, ...@@ -939,16 +939,17 @@ void nr_pdcp_add_drbs(eNB_flag_t enb_flag,
} }
/* Dummy function due to dependency from LTE libraries */ /* Dummy function due to dependency from LTE libraries */
bool rrc_pdcp_config_asn1_req(const protocol_ctxt_t *const ctxt_pP, bool rrc_pdcp_config_asn1_req(const protocol_ctxt_t *const ctxt_pP,
LTE_SRB_ToAddModList_t *const srb2add_list, LTE_SRB_ToAddModList_t *const srb2add_list,
LTE_DRB_ToAddModList_t *const drb2add_list, LTE_DRB_ToAddModList_t *const drb2add_list,
LTE_DRB_ToReleaseList_t *const drb2release_list, LTE_DRB_ToReleaseList_t *const drb2release_list,
const uint8_t security_modeP, const uint8_t security_modeP,
uint8_t *const kRRCenc, uint8_t *const kRRCenc,
uint8_t *const kRRCint, uint8_t *const kRRCint,
uint8_t *const kUPenc, uint8_t *const kUPenc,
LTE_PMCH_InfoList_r9_t *pmch_InfoList_r9, LTE_PMCH_InfoList_r9_t *pmch_InfoList_r9,
rb_id_t *const defaultDRB) rb_id_t *const defaultDRB,
const rnti_t previous_rnti_for_reestab)
{ {
return 0; return 0;
} }
......
...@@ -1252,17 +1252,18 @@ rrc_ue_process_radioResourceConfigDedicated( ...@@ -1252,17 +1252,18 @@ rrc_ue_process_radioResourceConfigDedicated(
derive_key_nas(RRC_INT_ALG, UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm, UE_rrc_inst[ctxt_pP->module_id].kenb, kRRCint); derive_key_nas(RRC_INT_ALG, UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm, UE_rrc_inst[ctxt_pP->module_id].kenb, kRRCint);
// Refresh SRBs // Refresh SRBs
rrc_pdcp_config_asn1_req(ctxt_pP, rrc_pdcp_config_asn1_req(
radioResourceConfigDedicated->srb_ToAddModList, ctxt_pP,
(LTE_DRB_ToAddModList_t *)NULL, radioResourceConfigDedicated->srb_ToAddModList,
(LTE_DRB_ToReleaseList_t *)NULL, (LTE_DRB_ToAddModList_t *)NULL,
UE_rrc_inst[ctxt_pP->module_id].ciphering_algorithm | (LTE_DRB_ToReleaseList_t *)NULL,
(UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm << 4), UE_rrc_inst[ctxt_pP->module_id].ciphering_algorithm | (UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm << 4),
kRRCenc, kRRCenc,
kRRCint, kRRCint,
NULL, NULL,
(LTE_PMCH_InfoList_r9_t *)NULL, (LTE_PMCH_InfoList_r9_t *)NULL,
NULL); NULL,
0);
// Refresh SRBs // Refresh SRBs
rrc_rlc_config_asn1_req(ctxt_pP, rrc_rlc_config_asn1_req(ctxt_pP,
radioResourceConfigDedicated->srb_ToAddModList, radioResourceConfigDedicated->srb_ToAddModList,
...@@ -1400,17 +1401,18 @@ rrc_ue_process_radioResourceConfigDedicated( ...@@ -1400,17 +1401,18 @@ rrc_ue_process_radioResourceConfigDedicated(
derive_key_nas(UP_ENC_ALG, UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm, UE_rrc_inst[ctxt_pP->module_id].kenb, kUPenc); derive_key_nas(UP_ENC_ALG, UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm, UE_rrc_inst[ctxt_pP->module_id].kenb, kUPenc);
// Refresh DRBs // Refresh DRBs
rrc_pdcp_config_asn1_req(ctxt_pP, rrc_pdcp_config_asn1_req(
(LTE_SRB_ToAddModList_t *)NULL, ctxt_pP,
radioResourceConfigDedicated->drb_ToAddModList, (LTE_SRB_ToAddModList_t *)NULL,
(LTE_DRB_ToReleaseList_t *)NULL, radioResourceConfigDedicated->drb_ToAddModList,
UE_rrc_inst[ctxt_pP->module_id].ciphering_algorithm | (LTE_DRB_ToReleaseList_t *)NULL,
(UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm << 4), UE_rrc_inst[ctxt_pP->module_id].ciphering_algorithm | (UE_rrc_inst[ctxt_pP->module_id].integrity_algorithm << 4),
NULL, NULL,
NULL, NULL,
kUPenc, kUPenc,
(LTE_PMCH_InfoList_r9_t *)NULL, (LTE_PMCH_InfoList_r9_t *)NULL,
UE_rrc_inst[ctxt_pP->module_id].defaultDRB); UE_rrc_inst[ctxt_pP->module_id].defaultDRB,
0);
// Refresh DRBs // Refresh DRBs
rrc_rlc_config_asn1_req(ctxt_pP, rrc_rlc_config_asn1_req(ctxt_pP,
(LTE_SRB_ToAddModList_t *)NULL, (LTE_SRB_ToAddModList_t *)NULL,
...@@ -4832,8 +4834,8 @@ void decode_MBSFNAreaConfiguration( module_id_t ue_mod_idP, uint8_t eNB_index, f ...@@ -4832,8 +4834,8 @@ void decode_MBSFNAreaConfiguration( module_id_t ue_mod_idP, uint8_t eNB_index, f
NULL, // key rrc integrity NULL, // key rrc integrity
NULL, // key encryption NULL, // key encryption
&(UE_rrc_inst[ue_mod_idP].mcch_message[eNB_index]->pmch_InfoList_r9), &(UE_rrc_inst[ue_mod_idP].mcch_message[eNB_index]->pmch_InfoList_r9),
NULL NULL,
); 0);
rrc_rlc_config_asn1_req(&ctxt, rrc_rlc_config_asn1_req(&ctxt,
NULL,// SRB_ToAddModList NULL,// SRB_ToAddModList
NULL,// DRB_ToAddModList NULL,// DRB_ToAddModList
...@@ -5828,12 +5830,16 @@ void *rrc_control_socket_thread_fct(void *arg) { ...@@ -5828,12 +5830,16 @@ void *rrc_control_socket_thread_fct(void *arg) {
UE->DRB_configList = CALLOC(1,sizeof(LTE_DRB_ToAddModList_t)); UE->DRB_configList = CALLOC(1,sizeof(LTE_DRB_ToAddModList_t));
asn1cSeqAdd(&UE->DRB_configList->list,UE->DRB_config[0][0]); asn1cSeqAdd(&UE->DRB_configList->list,UE->DRB_config[0][0]);
rrc_pdcp_config_asn1_req(&ctxt, rrc_pdcp_config_asn1_req(&ctxt,
(LTE_SRB_ToAddModList_t *) NULL, (LTE_SRB_ToAddModList_t *)NULL,
UE->DRB_configList, UE->DRB_configList,
(LTE_DRB_ToReleaseList_t *) NULL, (LTE_DRB_ToReleaseList_t *)NULL,
0xff, NULL, NULL, NULL, 0xff,
(LTE_PMCH_InfoList_r9_t *) NULL NULL,
,NULL); NULL,
NULL,
(LTE_PMCH_InfoList_r9_t *)NULL,
NULL,
0);
rrc_rlc_config_asn1_req(&ctxt, rrc_rlc_config_asn1_req(&ctxt,
(LTE_SRB_ToAddModList_t *)NULL, (LTE_SRB_ToAddModList_t *)NULL,
UE->DRB_configList, UE->DRB_configList,
...@@ -6033,11 +6039,16 @@ void *rrc_control_socket_thread_fct(void *arg) { ...@@ -6033,11 +6039,16 @@ void *rrc_control_socket_thread_fct(void *arg) {
UE->DRB_configList = CALLOC(1,sizeof(LTE_DRB_ToAddModList_t)); UE->DRB_configList = CALLOC(1,sizeof(LTE_DRB_ToAddModList_t));
asn1cSeqAdd(&UE->DRB_configList->list,UE->DRB_config[0][0]); asn1cSeqAdd(&UE->DRB_configList->list,UE->DRB_config[0][0]);
rrc_pdcp_config_asn1_req(&ctxt, rrc_pdcp_config_asn1_req(&ctxt,
(LTE_SRB_ToAddModList_t *) NULL, (LTE_SRB_ToAddModList_t *)NULL,
UE->DRB_configList, UE->DRB_configList,
(LTE_DRB_ToReleaseList_t *) NULL, (LTE_DRB_ToReleaseList_t *)NULL,
0xff, NULL, NULL, NULL, 0xff,
(LTE_PMCH_InfoList_r9_t *) NULL,NULL); NULL,
NULL,
NULL,
(LTE_PMCH_InfoList_r9_t *)NULL,
NULL,
0);
rrc_rlc_config_asn1_req(&ctxt, rrc_rlc_config_asn1_req(&ctxt,
(LTE_SRB_ToAddModList_t *)NULL, (LTE_SRB_ToAddModList_t *)NULL,
UE->DRB_configList, UE->DRB_configList,
...@@ -6187,11 +6198,16 @@ void *rrc_control_socket_thread_fct(void *arg) { ...@@ -6187,11 +6198,16 @@ void *rrc_control_socket_thread_fct(void *arg) {
UE->DRB_configList = CALLOC(1,sizeof(LTE_DRB_ToAddModList_t)); UE->DRB_configList = CALLOC(1,sizeof(LTE_DRB_ToAddModList_t));
asn1cSeqAdd(&UE->DRB_configList->list,UE->DRB_config[0][0]); asn1cSeqAdd(&UE->DRB_configList->list,UE->DRB_config[0][0]);
rrc_pdcp_config_asn1_req(&ctxt, rrc_pdcp_config_asn1_req(&ctxt,
(LTE_SRB_ToAddModList_t *) NULL, (LTE_SRB_ToAddModList_t *)NULL,
UE->DRB_configList, UE->DRB_configList,
(LTE_DRB_ToReleaseList_t *) NULL, (LTE_DRB_ToReleaseList_t *)NULL,
0xff, NULL, NULL, NULL, 0xff,
(LTE_PMCH_InfoList_r9_t *) NULL,NULL); NULL,
NULL,
NULL,
(LTE_PMCH_InfoList_r9_t *)NULL,
NULL,
0);
rrc_rlc_config_asn1_req(&ctxt, rrc_rlc_config_asn1_req(&ctxt,
(LTE_SRB_ToAddModList_t *)NULL, (LTE_SRB_ToAddModList_t *)NULL,
UE->DRB_configList, UE->DRB_configList,
......
This diff is collapsed.
...@@ -268,15 +268,17 @@ static void rrc_M2AP_init_MBMS( ...@@ -268,15 +268,17 @@ static void rrc_M2AP_init_MBMS(
LOG_I(RRC, "[eNB %d] Frame %d : Radio Bearer config request for MBMS\n", enb_mod_idP, frameP); //check the lcid LOG_I(RRC, "[eNB %d] Frame %d : Radio Bearer config request for MBMS\n", enb_mod_idP, frameP); //check the lcid
// Configuring PDCP and RLC for MBMS Radio Bearer // Configuring PDCP and RLC for MBMS Radio Bearer
rrc_pdcp_config_asn1_req(&ctxt, rrc_pdcp_config_asn1_req(&ctxt,
(LTE_SRB_ToAddModList_t *)NULL, // LTE_SRB_ToAddModList (LTE_SRB_ToAddModList_t *)NULL, // LTE_SRB_ToAddModList
(LTE_DRB_ToAddModList_t *)NULL, // LTE_DRB_ToAddModList (LTE_DRB_ToAddModList_t *)NULL, // LTE_DRB_ToAddModList
(LTE_DRB_ToReleaseList_t *)NULL, (LTE_DRB_ToReleaseList_t *)NULL,
0, // security mode 0, // security mode
NULL, // key rrc encryption NULL, // key rrc encryption
NULL, // key rrc integrity NULL, // key rrc integrity
NULL // key encryption NULL // key encryption
, &(RC.rrc[enb_mod_idP]->carrier[CC_id].mcch_message->pmch_InfoList_r9) ,
,NULL); &(RC.rrc[enb_mod_idP]->carrier[CC_id].mcch_message->pmch_InfoList_r9),
NULL,
0);
rrc_rlc_config_asn1_req(&ctxt, rrc_rlc_config_asn1_req(&ctxt,
NULL, // LTE_SRB_ToAddModList NULL, // LTE_SRB_ToAddModList
......
...@@ -706,22 +706,46 @@ int gtpv1u_update_s1u_tunnel( ...@@ -706,22 +706,46 @@ int gtpv1u_update_s1u_tunnel(
pthread_mutex_lock(&globGtp.gtp_lock); pthread_mutex_lock(&globGtp.gtp_lock);
getInstRetInt(compatInst(instance)); getInstRetInt(compatInst(instance));
if ( inst->ue2te_mapping.find(create_tunnel_req->rnti) == inst->ue2te_mapping.end() ) { // Check if tunnels already exist for new rnti
LOG_E(GTPU,"[%ld] Update not already existing tunnel (new rnti %x, old rnti %x)\n", if (inst->ue2te_mapping.find(create_tunnel_req->rnti) != inst->ue2te_mapping.end()) {
instance, create_tunnel_req->rnti, prior_rnti); LOG_E(GTPU, "[%ld] Update already existing tunnel for new rnti %x\n", instance, create_tunnel_req->rnti);
return -1;
} }
// Check if tunnels exists for old rnti because we should take these tunnels.
// If we do not have tunnels, we create new one to not stop the software
auto it=inst->ue2te_mapping.find(prior_rnti); auto it=inst->ue2te_mapping.find(prior_rnti);
if (it == inst->ue2te_mapping.end()) {
if ( it != inst->ue2te_mapping.end() ) { LOG_W(GTPU,
"[%ld] Update a not existing tunnel, start create the new one (new rnti %x, old rnti %x)\n",
instance,
create_tunnel_req->rnti,
prior_rnti);
pthread_mutex_unlock(&globGtp.gtp_lock); pthread_mutex_unlock(&globGtp.gtp_lock);
AssertFatal(false, "logic bug: update of non-existing tunnel (new ue id %u, old ue id %u)\n", create_tunnel_req->rnti, prior_rnti); gtpv1u_enb_create_tunnel_resp_t tmp;
/* we don't know if we need 4G or 5G PDCP and can therefore not create a (void)gtpv1u_create_s1u_tunnel(instance, create_tunnel_req, &tmp, pdcp_data_req);
* new tunnel */
return 0; return 0;
} }
// If tunnels exist for old rnti, we use them for new rnti
inst->ue2te_mapping[create_tunnel_req->rnti]=it->second; inst->ue2te_mapping[create_tunnel_req->rnti]=it->second;
// Replace old RNTI by new one in te2ue_mapping
teid_t teid_incoming, teid_outcoming = 0;
for (int i = 0; i < create_tunnel_req->num_tunnels; i++) {
teid_incoming = it->second.bearers[create_tunnel_req->eps_bearer_id[i]].teid_incoming;
teid_outcoming = create_tunnel_req->sgw_S1u_teid[i];
globGtp.te2ue_mapping[teid_incoming].ue_id = create_tunnel_req->rnti;
LOG_I(GTPU,
"[%ld] Updated tunnel (new rnti %x, old rnti %x) DL teid =%x UL teid =%x\n",
instance,
create_tunnel_req->rnti,
prior_rnti,
teid_incoming,
teid_outcoming);
}
// Remove old rnti value from ue2te_mapping
inst->ue2te_mapping.erase(it); inst->ue2te_mapping.erase(it);
pthread_mutex_unlock(&globGtp.gtp_lock); pthread_mutex_unlock(&globGtp.gtp_lock);
return 0; return 0;
......
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