diff options
Diffstat (limited to 'src/components/transport_manager/src')
3 files changed, 16 insertions, 5 deletions
diff --git a/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc b/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc index c8d9dc3811..e141a65ec0 100644 --- a/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc +++ b/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc @@ -87,7 +87,8 @@ void CloudWebsocketTransportAdapter::CreateDevice(const std::string& uid) { // Extract host and port from endpoint string boost::regex group_pattern( "(wss?:\\/\\/)([A-Z\\d\\.-]{2,}\\.?([A-Z]{2,})?)(:)(\\d{2,5})(\\/" - "[A-Z\\d\\.-]+)*\\/?"); + "[A-Z\\d\\.-]+)*\\/?", + boost::regex::icase); boost::smatch results; std::string str = uid; diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc index 41487b054b..71fc41ada9 100644 --- a/src/components/transport_manager/src/transport_manager_default.cc +++ b/src/components/transport_manager/src/transport_manager_default.cc @@ -46,7 +46,7 @@ #if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) #include "transport_manager/cloud/cloud_websocket_transport_adapter.h" -#endif +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT #if defined(BUILD_TESTS) #include "transport_manager/iap2_emulation/iap2_transport_adapter.h" @@ -105,7 +105,7 @@ int TransportManagerDefault::Init(resumption::LastState& last_state) { ta_usb = NULL; #endif // USB_SUPPORT -#if defined CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) transport_adapter::TransportAdapterImpl* ta_cloud = new transport_adapter::CloudWebsocketTransportAdapter(last_state, get_settings()); @@ -116,7 +116,7 @@ int TransportManagerDefault::Init(resumption::LastState& last_state) { #endif // TELEMETRY_MONITOR AddTransportAdapter(ta_cloud); ta_cloud = NULL; -#endif +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT #if defined BUILD_TESTS const uint16_t iap2_bt_emu_port = 23456; diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc index 32c572157f..a2bc95bfdd 100644 --- a/src/components/transport_manager/src/transport_manager_impl.cc +++ b/src/components/transport_manager/src/transport_manager_impl.cc @@ -46,7 +46,9 @@ #include "utils/macro.h" #include "config_profile/profile.h" +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) #include "transport_manager/cloud/cloud_websocket_transport_adapter.h" +#endif #include "transport_manager/common.h" #include "transport_manager/transport_adapter/transport_adapter.h" #include "transport_manager/transport_adapter/transport_adapter_event.h" @@ -133,6 +135,9 @@ void TransportManagerImpl::ReconnectionTimeout() { void TransportManagerImpl::AddCloudDevice( const transport_manager::transport_adapter::CloudAppProperties& cloud_properties) { +#if !defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) + LOG4CXX_TRACE(logger_, "Cloud app support is disabled. Exiting function"); +#else transport_adapter::DeviceType type = transport_adapter::DeviceType::UNKNOWN; if (cloud_properties.cloud_transport_type == "WS") { type = transport_adapter::DeviceType::CLOUD_WEBSOCKET; @@ -156,12 +161,17 @@ void TransportManagerImpl::AddCloudDevice( cloud_properties); } } - +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT return; } void TransportManagerImpl::RemoveCloudDevice(const DeviceHandle device_handle) { +#if !defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) + LOG4CXX_TRACE(logger_, "Cloud app support is disabled. Exiting function"); + return; +#else DisconnectDevice(device_handle); +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT } int TransportManagerImpl::ConnectDevice(const DeviceHandle device_handle) { |