maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/740-pdcp-handle-sdap-header' into integration_2024_w09

Browse Source
This commit is contained in:
Jaroslava Fiedlerova
2024-03-01 10:07:40 +01:00
parent cd5209a782 10a6ce8bdd
commit 01722ff8fa
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
+10 -3
View File
@@ -42,6 +42,7 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
uint32_t rcvd_count; uint32_t rcvd_count;
int header_size; int header_size;
int integrity_size; int integrity_size;
int sdap_header_size = 0;
int rx_deliv_sn; int rx_deliv_sn;
uint32_t rx_deliv_hfn; uint32_t rx_deliv_hfn;
@@ -62,6 +63,7 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
entity->stats.rxpdu_pkts++; entity->stats.rxpdu_pkts++;
entity->stats.rxpdu_bytes += size; entity->stats.rxpdu_bytes += size;
if (entity->has_sdap_rx) sdap_header_size = 1; // SDAP Header is one byte
if (entity->sn_size == 12) { if (entity->sn_size == 12) {
rcvd_sn = ((buffer[0] & 0xf) << 8) | rcvd_sn = ((buffer[0] & 0xf) << 8) |
@@ -82,7 +84,7 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
integrity_size = 0; integrity_size = 0;
} }
if (size < header_size + integrity_size + 1) { if (size < header_size + sdap_header_size + integrity_size + 1) {
LOG_E(PDCP, "bad PDU received (size = %d)\n", size); LOG_E(PDCP, "bad PDU received (size = %d)\n", size);
entity->stats.rxpdu_dd_pkts++; entity->stats.rxpdu_dd_pkts++;
@@ -106,7 +108,8 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
if (entity->has_ciphering) if (entity->has_ciphering)
entity->cipher(entity->security_context, entity->cipher(entity->security_context,
buffer+header_size, size-header_size, buffer + header_size + sdap_header_size,
size - (header_size + sdap_header_size),
entity->rb_id, rcvd_count, entity->is_gnb ? 0 : 1); entity->rb_id, rcvd_count, entity->is_gnb ? 0 : 1);
if (entity->has_integrity) { if (entity->has_integrity) {
@@ -184,6 +187,7 @@ static int nr_pdcp_entity_process_sdu(nr_pdcp_entity_t *entity,
int sn; int sn;
int header_size; int header_size;
int integrity_size; int integrity_size;
int sdap_header_size = 0;
char *buf = pdu_buffer; char *buf = pdu_buffer;
DevAssert(size + 3 + 4 <= pdu_max_size); DevAssert(size + 3 + 4 <= pdu_max_size);
int dc_bit; int dc_bit;
@@ -194,6 +198,8 @@ static int nr_pdcp_entity_process_sdu(nr_pdcp_entity_t *entity,
count = entity->tx_next; count = entity->tx_next;
sn = entity->tx_next & entity->sn_max; sn = entity->tx_next & entity->sn_max;
if (entity->has_sdap_tx) sdap_header_size = 1; // SDAP header is one byte
/* D/C bit is only to be set for DRBs */ /* D/C bit is only to be set for DRBs */
if (entity->type == NR_PDCP_DRB_AM || entity->type == NR_PDCP_DRB_UM) { if (entity->type == NR_PDCP_DRB_AM || entity->type == NR_PDCP_DRB_UM) {
dc_bit = 0x80; dc_bit = 0x80;
@@ -236,7 +242,8 @@ static int nr_pdcp_entity_process_sdu(nr_pdcp_entity_t *entity,
if (entity->has_ciphering && (entity->is_gnb || entity->security_mode_completed)) { if (entity->has_ciphering && (entity->is_gnb || entity->security_mode_completed)) {
entity->cipher(entity->security_context, entity->cipher(entity->security_context,
(unsigned char *)buf + header_size, size + integrity_size, (unsigned char *)buf + header_size + sdap_header_size,
size + integrity_size - sdap_header_size,
entity->rb_id, count, entity->is_gnb ? 1 : 0); entity->rb_id, count, entity->is_gnb ? 1 : 0);
} else { } else {
entity->security_mode_completed = true; entity->security_mode_completed = true;