Commit 8c55ccc9 authored by Laurent THOMAS's avatar Laurent THOMAS

Fix a critical bug introduced by F1-U in 4G

parent 32ebb876
...@@ -1546,7 +1546,7 @@ void pdcp_add_UE(const protocol_ctxt_t *const ctxt_pP) { ...@@ -1546,7 +1546,7 @@ void pdcp_add_UE(const protocol_ctxt_t *const ctxt_pP) {
pdcp_enb[ctxt_pP->module_id].rnti[i]=ctxt_pP->rnti; pdcp_enb[ctxt_pP->module_id].rnti[i]=ctxt_pP->rnti;
pdcp_enb[ctxt_pP->module_id].uid[i]=i; pdcp_enb[ctxt_pP->module_id].uid[i]=i;
pdcp_enb[ctxt_pP->module_id].num_ues++; pdcp_enb[ctxt_pP->module_id].num_ues++;
printf("add new uid is %d %x\n\n", i, ctxt_pP->rnti); LOG_I(PDCP,"add new uid is %d %x\n", i, ctxt_pP->rnti);
pdcp_init_stats_UE(ctxt_pP->module_id, i); pdcp_init_stats_UE(ctxt_pP->module_id, i);
// ret=1; // ret=1;
break; break;
......
...@@ -418,7 +418,8 @@ rb_found: ...@@ -418,7 +418,8 @@ rb_found:
AssertFatal(type != ngran_eNB_CU && type != ngran_ng_eNB_CU && type != ngran_gNB_CU, AssertFatal(type != ngran_eNB_CU && type != ngran_ng_eNB_CU && type != ngran_gNB_CU,
"Can't be CU, bad node type %d\n", type); "Can't be CU, bad node type %d\n", type);
if (NODE_IS_DU(type) && is_srb == 1) { if (NODE_IS_DU(type)) {
if (is_srb == 1) {
MessageDef *msg = itti_alloc_new_message_sized(TASK_RLC_ENB, 0, F1AP_UL_RRC_MESSAGE, sizeof(*msg) + size); MessageDef *msg = itti_alloc_new_message_sized(TASK_RLC_ENB, 0, F1AP_UL_RRC_MESSAGE, sizeof(*msg) + size);
F1AP_UL_RRC_MESSAGE(msg).rrc_container = (uint8_t*)(msg+1); F1AP_UL_RRC_MESSAGE(msg).rrc_container = (uint8_t*)(msg+1);
memcpy(F1AP_UL_RRC_MESSAGE(msg).rrc_container, buf, size); memcpy(F1AP_UL_RRC_MESSAGE(msg).rrc_container, buf, size);
...@@ -443,6 +444,7 @@ rb_found: ...@@ -443,6 +444,7 @@ rb_found:
return; return;
} }
} }
}
memblock = get_free_mem_block(size, __func__); memblock = get_free_mem_block(size, __func__);
if (memblock == NULL) { if (memblock == NULL) {
......
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