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

Fix compilation issues with vrtsim taps client

Browse Source 
Fix two issues regarding vrtsims taps client implementation:
 - Incorrect #define used to enable taps socket handling
 - flatbuffers package name changing between ubuntu versions
This commit is contained in:
Bartosz Podrygajlo
2026-01-21 11:35:12 +01:00
parent 102965a669
commit 13f46a0c0a
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/vrtsim/CMakeLists.txt
+9 -1
View File
@@ -26,6 +26,14 @@ if (OAI_VRTSIM_TAPS_CLIENT)
add_library(taps_client taps_client.cpp ${TAPS_API_HEADER}) add_library(taps_client taps_client.cpp ${TAPS_API_HEADER})
target_include_directories(taps_client PUBLIC .) target_include_directories(taps_client PUBLIC .)
find_package(Flatbuffers REQUIRED) find_package(FlatBuffers QUIET)
if(NOT FlatBuffers_FOUND)
# Fall back to lowercase (Ubuntu 22.04)
find_package(Flatbuffers REQUIRED)
set(FLATBUFFERS_TARGET flatbuffers)
else()
set(FLATBUFFERS_TARGET flatbuffers::flatbuffers)
endif()
target_link_libraries(taps_client PUBLIC ${FLATBUFFERS_TARGET})
target_link_libraries(taps_client PUBLIC flatbuffers taps_api SIMU nanomsg) target_link_libraries(taps_client PUBLIC flatbuffers taps_api SIMU nanomsg)
endif() endif()
radio/vrtsim/vrtsim.c
+2 -2
View File
@@ -189,13 +189,13 @@ static void vrtsim_readconfig(vrtsim_state_t *vrtsim_state)
} else { } else {
AssertFatal(false, "Invalid role configuration\n"); AssertFatal(false, "Invalid role configuration\n");
} }
#ifdef ENABLE_TAPS_CLIENT #ifdef OAI_VRTSIM_TAPS_CLIENT
if (vrtsim_state->taps_socket) { if (vrtsim_state->taps_socket) {
LOG_A(HW, "VRTSIM: will use taps socket %s\n", vrtsim_state->taps_socket); LOG_A(HW, "VRTSIM: will use taps socket %s\n", vrtsim_state->taps_socket);
} }
#else #else
if (vrtsim_state->taps_socket) { if (vrtsim_state->taps_socket) {
AssertFatal(false, "Invalid configuration: Build with ENABLE_TAPS_CLIENT to use taps socket\n"); AssertFatal(false, "Invalid configuration: Build with OAI_VRTSIM_TAPS_CLIENT to use taps socket\n");
} }
#endif #endif
} }