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

Refactoring: fix inconsistency in nr_sdap_delete_entity

Browse Source 
The function was printing a "not found" error message even in the case
the return value was set to "true". Return directly true/false.

This is relevant in PDU Session Release procedures.
This commit is contained in:
Guido Casati
2025-09-24 14:37:32 +02:00
parent 42a9f2f08f
commit ae1de1aeaa
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/SDAP/nr_sdap/nr_sdap_entity.c
+4 -5
View File
@@ -577,12 +577,11 @@ bool nr_sdap_delete_entity(ue_id_t ue_id, int pdusession_id)
{ {
nr_sdap_entity_t *entityPtr = sdap_info.sdap_entity_llist; nr_sdap_entity_t *entityPtr = sdap_info.sdap_entity_llist;
nr_sdap_entity_t *entityPrev = NULL; nr_sdap_entity_t *entityPrev = NULL;
bool ret = false;
int upperBound = 0; int upperBound = 0;
if (entityPtr == NULL && (pdusession_id) * (pdusession_id - NGAP_MAX_PDU_SESSION) > 0) { if (entityPtr == NULL && (pdusession_id) * (pdusession_id - NGAP_MAX_PDU_SESSION) > 0) {
LOG_E(SDAP, "SDAP entities not established or Invalid range of pdusession_id [0, 256].\n"); LOG_E(SDAP, "SDAP entities not established or Invalid range of pdusession_id [0, 256].\n");
return ret; return false;
} }
LOG_D(SDAP, "Deleting SDAP entity for UE %lx and PDU Session id %d\n", ue_id, entityPtr->pdusession_id); LOG_D(SDAP, "Deleting SDAP entity for UE %lx and PDU Session id %d\n", ue_id, entityPtr->pdusession_id);
@@ -592,7 +591,7 @@ bool nr_sdap_delete_entity(ue_id_t ue_id, int pdusession_id)
remove_ip_if(entityPtr); remove_ip_if(entityPtr);
free(entityPtr); free(entityPtr);
LOG_D(SDAP, "Successfully deleted Entity.\n"); LOG_D(SDAP, "Successfully deleted Entity.\n");
ret = true; return true;
} else { } else {
while ((entityPtr->ue_id != ue_id || entityPtr->pdusession_id != pdusession_id) && entityPtr->next_entity != NULL while ((entityPtr->ue_id != ue_id || entityPtr->pdusession_id != pdusession_id) && entityPtr->next_entity != NULL
&& upperBound < SDAP_MAX_NUM_OF_ENTITIES) { && upperBound < SDAP_MAX_NUM_OF_ENTITIES) {
@@ -608,11 +607,11 @@ bool nr_sdap_delete_entity(ue_id_t ue_id, int pdusession_id)
} }
free(entityPtr); free(entityPtr);
LOG_D(SDAP, "Successfully deleted Entity.\n"); LOG_D(SDAP, "Successfully deleted Entity.\n");
ret = true; return true;
} }
} }
LOG_E(SDAP, "Entity does not exist or it was not found.\n"); LOG_E(SDAP, "Entity does not exist or it was not found.\n");
return ret; return false;
} }
bool nr_sdap_delete_ue_entities(ue_id_t ue_id) bool nr_sdap_delete_ue_entities(ue_id_t ue_id)