Skip to content

O
OpenXG-RAN
Commit 2439efc7 authored by Cedric Roux's avatar Cedric Roux
Browse files
Options

NR PDCP: SRBs always have MAC-I, even when integrity is not active

parent f207b202
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
View file @ 2439efc7
...@@ -65,7 +65,9 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity, ...@@ -65,7 +65,9 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
header_size = 3; header_size = 3;
} }
if (entity->has_integrity) { /* SRBs always have MAC-I, even if integrity is not active */
if (entity->has_integrity
|| entity->type == NR_PDCP_SRB) {
integrity_size = 4; integrity_size = 4;
} else { } else {
integrity_size = 0; integrity_size = 0;
...@@ -180,7 +182,9 @@ static void nr_pdcp_entity_recv_sdu(nr_pdcp_entity_t *entity, ...@@ -180,7 +182,9 @@ static void nr_pdcp_entity_recv_sdu(nr_pdcp_entity_t *entity,
header_size = 3; header_size = 3;
} }
if (entity->has_integrity) { /* SRBs always have MAC-I, even if integrity is not active */
if (entity->has_integrity
|| entity->type == NR_PDCP_SRB) {
integrity_size = 4; integrity_size = 4;
} else { } else {
integrity_size = 0; integrity_size = 0;
...@@ -193,6 +197,9 @@ static void nr_pdcp_entity_recv_sdu(nr_pdcp_entity_t *entity, ...@@ -193,6 +197,9 @@ static void nr_pdcp_entity_recv_sdu(nr_pdcp_entity_t *entity,
(unsigned char *)buf + header_size + size, (unsigned char *)buf + header_size + size,
(unsigned char *)buf, header_size + size, (unsigned char *)buf, header_size + size,
entity->rb_id, count, entity->is_gnb ? 1 : 0); entity->rb_id, count, entity->is_gnb ? 1 : 0);
else if (integrity_size == 4)
/* set MAC-I to 0 for SRBs with integrity not active */
memset(buf + header_size + size, 0, 4);
if (entity->has_ciphering) if (entity->has_ciphering)
entity->cipher(entity->security_context, entity->cipher(entity->security_context,
......
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