diff options
6 files changed, 17 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 351bfb4ab6..b344f91342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,7 @@ option(ENABLE_GCOV "gcov code coverage feature" OFF) option(ENABLE_SANITIZE "Sanitize tool" OFF) option(ENABLE_SECURITY "Security Ford protocol protection" ON) option(ENABLE_HMI_PTU_DECRYPTION "Policy table update parsed by hmi" ON) +option(ENABLE_IAP2EMULATION "IAP2 emulation via tcp" OFF) option(USE_COTIRE "Use Cotire to speed up build (currently only for commands tests)" ON) option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON) option(USE_CCACHE "Turn on ccache usage" ON) @@ -422,6 +423,11 @@ if(ENABLE_HMI_PTU_DECRYPTION) message(STATUS "HMI PTU decription enabled") endif() +if(ENABLE_IAP2EMULATION) + add_definitions(-DENABLE_IAP2EMULATION) + message(STATUS "IAP2 emulation enabled") +endif() + set(RTLIB rt) if(CMAKE_SYSTEM_NAME STREQUAL "QNX") set(RTLIB ) diff --git a/src/components/transport_manager/CMakeLists.txt b/src/components/transport_manager/CMakeLists.txt index 11986ee9fa..a539c64578 100644 --- a/src/components/transport_manager/CMakeLists.txt +++ b/src/components/transport_manager/CMakeLists.txt @@ -106,8 +106,8 @@ else() ) endif() -if(NOT BUILD_TESTS) - list (APPEND EXCLUDE_PATH +if(NOT ENABLE_IAP2EMULATION) + list (APPEND EXCLUDE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/include/iap2_emulation/iap2_transport_adapter.h ${CMAKE_CURRENT_SOURCE_DIR}/src/iap2_emulation/iap2_transport_adapter.cc ) diff --git a/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h b/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h index 6e7a306879..5b746662f1 100644 --- a/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h +++ b/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h @@ -66,7 +66,7 @@ class TcpDevice : public Device { **/ TcpDevice(const in_addr_t& in_addr, const std::string& name); -#if defined(BUILD_TESTS) +#if defined(ENABLE_IAP2EMULATION) /** * @brief TcpDevice * @param in_addr IP address of device diff --git a/src/components/transport_manager/src/tcp/tcp_client_listener.cc b/src/components/transport_manager/src/tcp/tcp_client_listener.cc index d29ffeb144..c2cbac4e13 100644 --- a/src/components/transport_manager/src/tcp/tcp_client_listener.cc +++ b/src/components/transport_manager/src/tcp/tcp_client_listener.cc @@ -300,13 +300,13 @@ void TcpClientListener::Loop() { const auto device_uid = device_name + std::string(":") + std::to_string(port_); -#if defined(BUILD_TESTS) +#if defined(ENABLE_IAP2EMULATION) auto tcp_device = std::make_shared<TcpDevice>( client_address.sin_addr.s_addr, device_uid, device_name); #else auto tcp_device = std::make_shared<TcpDevice>( client_address.sin_addr.s_addr, device_uid); -#endif // BUILD_TESTS +#endif // ENABLE_IAP2EMULATION DeviceSptr device = controller_->AddDevice(tcp_device); auto tcp_device_raw = static_cast<TcpDevice*>(device.get()); diff --git a/src/components/transport_manager/src/tcp/tcp_device.cc b/src/components/transport_manager/src/tcp/tcp_device.cc index 4542f76c1d..16abdfc22d 100644 --- a/src/components/transport_manager/src/tcp/tcp_device.cc +++ b/src/components/transport_manager/src/tcp/tcp_device.cc @@ -46,7 +46,7 @@ TcpDevice::TcpDevice(const in_addr_t& in_addr, const std::string& name) LOG4CXX_AUTO_TRACE(logger_); } -#if defined(BUILD_TESTS) +#if defined(ENABLE_IAP2EMULATION) TcpDevice::TcpDevice(const in_addr_t& in_addr, const std::string& device_uid, const std::string& transport_switch_id) @@ -61,7 +61,7 @@ TcpDevice::TcpDevice(const in_addr_t& in_addr, logger_, "Device parameters: " << device_uid << " / " << transport_switch_id); } -#endif // BUILD_TESTS +#endif // ENABLE_IAP2EMULATION bool TcpDevice::IsSameAs(const Device* other) const { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc index 868fcc3f15..0cf9e93f40 100644 --- a/src/components/transport_manager/src/transport_manager_default.cc +++ b/src/components/transport_manager/src/transport_manager_default.cc @@ -48,9 +48,9 @@ #include "transport_manager/cloud/cloud_websocket_transport_adapter.h" #endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT -#if defined(BUILD_TESTS) +#if defined(ENABLE_IAP2EMULATION) #include "transport_manager/iap2_emulation/iap2_transport_adapter.h" -#endif // BUILD_TEST +#endif // ENABLE_IAP2EMULATION namespace transport_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager") @@ -143,7 +143,7 @@ int TransportManagerDefault::Init( AddTransportAdapter(ta_cloud); #endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT -#if defined BUILD_TESTS +#if defined ENABLE_IAP2EMULATION const uint16_t iap2_bt_emu_port = 23456; transport_adapter::IAP2BluetoothEmulationTransportAdapter* iap2_bt_emu_adapter = @@ -158,7 +158,7 @@ int TransportManagerDefault::Init( iap2_usb_emu_port, last_state_wrapper, settings); AddTransportAdapter(iap2_usb_emu_adapter); -#endif // BUILD_TEST +#endif // ENABLE_IAP2EMULATION LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; |