From 5a43fe8acce0fac61c064d63d91a75d2f7dada00 Mon Sep 17 00:00:00 2001 From: Robert Schmidt <robert.schmidt@openairinterface.org> Date: Thu, 23 Nov 2023 13:34:36 +0100 Subject: [PATCH] Properly implement PNF/VNF list find --- nfapi/open-nFAPI/vnf/src/vnf.c | 20 +++++++------------- nfapi/open-nFAPI/vnf/src/vnf_p7.c | 18 ++++++++---------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/nfapi/open-nFAPI/vnf/src/vnf.c b/nfapi/open-nFAPI/vnf/src/vnf.c index ce17579d20..836976db63 100644 --- a/nfapi/open-nFAPI/vnf/src/vnf.c +++ b/nfapi/open-nFAPI/vnf/src/vnf.c @@ -92,20 +92,14 @@ nfapi_vnf_pnf_info_t* nfapi_vnf_pnf_list_find(nfapi_vnf_config_t* config, int p5 NFAPI_TRACE(NFAPI_TRACE_DEBUG, "config->pnf_list:%p\n", config->pnf_list); nfapi_vnf_pnf_info_t* curr = config->pnf_list; - while(curr != 0) - { - if(curr->p5_idx == p5_idx) - { - NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s : curr->p5_idx:%d p5_idx:%d\n", __FUNCTION__, curr->p5_idx, p5_idx); - return curr; - } - - NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s : curr->next:%p\n", __FUNCTION__, curr->next); - - curr = curr->next; - } + while (curr != 0) { + if (curr->p5_idx == p5_idx) + return curr; + curr = curr->next; + } + NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): could not find P5 connection for p5_idx %d\n", __func__, p5_idx); - return 0; + return 0; } void vnf_nr_handle_pnf_param_response(void *pRecvMsg, int recvMsgLen, nfapi_vnf_config_t* config, int p5_idx) diff --git a/nfapi/open-nFAPI/vnf/src/vnf_p7.c b/nfapi/open-nFAPI/vnf/src/vnf_p7.c index 5d9fb2ed9b..20b58615ee 100644 --- a/nfapi/open-nFAPI/vnf/src/vnf_p7.c +++ b/nfapi/open-nFAPI/vnf/src/vnf_p7.c @@ -88,16 +88,14 @@ void vnf_p7_connection_info_list_add(vnf_p7_t* vnf_p7, nfapi_vnf_p7_connection_i nfapi_vnf_p7_connection_info_t* vnf_p7_connection_info_list_find(vnf_p7_t* vnf_p7, uint16_t phy_id) { nfapi_vnf_p7_connection_info_t* curr = vnf_p7->p7_connections; - while(curr != 0) - { - if(curr->phy_id == phy_id) - { - return curr; - } - curr = curr->next; - } - - return 0; + while (curr != 0) { + if (curr->phy_id == phy_id) + return curr; + curr = curr->next; + } + NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s(): could not find P7 connection for phy_id %d\n", __func__, phy_id); + + return 0; } nfapi_vnf_p7_connection_info_t* vnf_p7_connection_info_list_delete(vnf_p7_t* vnf_p7, uint16_t phy_id) -- 2.26.2