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

rejecting DRB addition if DRB field not present at setup in PDCP-Config

Browse Source
This commit is contained in:
francescomani
2025-04-18 09:44:41 +02:00
parent f3eb713084
commit ba2a0c4d1e
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+14 -11
View File
@@ -817,9 +817,15 @@ void add_drb(int is_gnb,
nr_pdcp_ue_t *ue; nr_pdcp_ue_t *ue;
int drb_id = s->drb_Identity; int drb_id = s->drb_Identity;
int sn_size_ul = decode_sn_size_ul(*s->pdcp_Config->drb->pdcp_SN_SizeUL); if (!s->pdcp_Config || !s->pdcp_Config->drb) {
int sn_size_dl = decode_sn_size_dl(*s->pdcp_Config->drb->pdcp_SN_SizeDL); LOG_E(PDCP, "DRB field mandatory present at setup. DRB %d not configured.\n", drb_id);
int discard_timer = decode_discard_timer(*s->pdcp_Config->drb->discardTimer); return;
}
struct NR_PDCP_Config__drb *drb = s->pdcp_Config->drb;
int sn_size_ul = decode_sn_size_ul(*drb->pdcp_SN_SizeUL);
int sn_size_dl = decode_sn_size_dl(*drb->pdcp_SN_SizeDL);
int discard_timer = decode_discard_timer(*drb->discardTimer);
int has_integrity; int has_integrity;
int has_ciphering; int has_ciphering;
@@ -830,20 +836,18 @@ void add_drb(int is_gnb,
t_reordering = decode_t_reordering(*s->pdcp_Config->t_Reordering); t_reordering = decode_t_reordering(*s->pdcp_Config->t_Reordering);
} }
if (s->pdcp_Config->drb != NULL if (drb->integrityProtection != NULL)
&& s->pdcp_Config->drb->integrityProtection != NULL)
has_integrity = 1; has_integrity = 1;
else else
has_integrity = 0; has_integrity = 0;
if (s->pdcp_Config->ext1 != NULL if (s->pdcp_Config->ext1 != NULL && s->pdcp_Config->ext1->cipheringDisabled != NULL)
&& s->pdcp_Config->ext1->cipheringDisabled != NULL)
has_ciphering = 0; has_ciphering = 0;
else else
has_ciphering = 1; has_ciphering = 1;
if ((!s->cnAssociation) || s->cnAssociation->present == NR_DRB_ToAddMod__cnAssociation_PR_NOTHING) { if ((!s->cnAssociation) || s->cnAssociation->present == NR_DRB_ToAddMod__cnAssociation_PR_NOTHING) {
LOG_E(PDCP,"%s:%d:%s: fatal, cnAssociation is missing or present is NR_DRB_ToAddMod__cnAssociation_PR_NOTHING\n",__FILE__,__LINE__,__FUNCTION__); LOG_E(PDCP, "fatal, cnAssociation is missing or present is NR_DRB_ToAddMod__cnAssociation_PR_NOTHING\n");
exit(-1); exit(-1);
} }
@@ -857,7 +861,7 @@ void add_drb(int is_gnb,
pdusession_id = s->cnAssociation->choice.eps_BearerIdentity; pdusession_id = s->cnAssociation->choice.eps_BearerIdentity;
else { else {
if (!s->cnAssociation->choice.sdap_Config) { if (!s->cnAssociation->choice.sdap_Config) {
LOG_E(PDCP,"%s:%d:%s: fatal, sdap_Config is null",__FILE__,__LINE__,__FUNCTION__); LOG_E(PDCP,"fatal, sdap_Config is null");
exit(-1); exit(-1);
} }
pdusession_id = s->cnAssociation->choice.sdap_Config->pdu_Session; pdusession_id = s->cnAssociation->choice.sdap_Config->pdu_Session;
@@ -870,8 +874,7 @@ void add_drb(int is_gnb,
} }
/* TODO(?): accept different UL and DL SN sizes? */ /* TODO(?): accept different UL and DL SN sizes? */
if (sn_size_ul != sn_size_dl) { if (sn_size_ul != sn_size_dl) {
LOG_E(PDCP, "%s:%d:%s: fatal, bad SN sizes, must be same. ul=%d, dl=%d\n", LOG_E(PDCP, "fatal, bad SN sizes, must be same. ul=%d, dl=%d\n", sn_size_ul, sn_size_dl);
__FILE__, __LINE__, __FUNCTION__, sn_size_ul, sn_size_dl);
exit(1); exit(1);
} }