Commit 28fcd6f7 authored by Anton Kozhemiachenko's avatar Anton Kozhemiachenko

Fix srb_id issue (in TC 7.1.2.2.1 the first SRB2 message comes on invalid SRB)

parent fc77df61
......@@ -112,7 +112,7 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
LOG_I(PDCP, "%s: Entity security status(%d): ciphering %d, integrity check %d\n", __FUNCTION__, entity->has_ciphering,
entity->has_ciphering?entity->ciphering_algorithm:-1, entity->has_integrity?entity->integrity_algorithm:-1);
LOG_MSG(_buffer, size, "RLC => PDCP: rcvd_count=%zu, rcvd_sn=%d: ", rcvd_count, rcvd_sn);
LOG_MSG(_buffer, size, "RLC => PDCP: rcvd_count=%zu, rcvd_sn=%d, rb_id=%d: ", rcvd_count, rcvd_sn, entity->rb_id);
if (entity->has_ciphering)
{
......
......@@ -888,12 +888,12 @@ static void deliver_pdu_srb(void *_ue, nr_pdcp_entity_t *entity,
srb_found:
LOG_D(PDCP, "%s(): (srb %d) calling rlc_data_req size %d\n", __func__, srb_id, size);
LOG_MSG(buf, size, "%s: PDCP => RLC: ", __FUNCTION__);
LOG_MSG(buf, size, "%s: PDCP => RLC, rb_id=%d: ", __FUNCTION__, srb_id);
//for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
//printf("\n");
if ((RC.nrrrc == NULL) || (!NODE_IS_CU(node_type))) {
if (entity->is_gnb) {
f1ap_dl_rrc_message_t dl_rrc = {.old_gNB_DU_ue_id = 0xFFFFFF, .rrc_container = (uint8_t *)buf, .rrc_container_length = size, .rnti = ue->rntiMaybeUEid, .srb_id = DCCH};
f1ap_dl_rrc_message_t dl_rrc = {.old_gNB_DU_ue_id = 0xFFFFFF, .rrc_container = (uint8_t *)buf, .rrc_container_length = size, .rnti = ue->rntiMaybeUEid, .srb_id = srb_id};
gNB_RRC_INST *rrc = RC.nrrrc[0];
rrc->mac_rrc.dl_rrc_message_transfer(0, &dl_rrc);
} else { // UE
......
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