Skip to content

Commit

Permalink
[Core, Services, Protobuf] Fixed compatibility with Ubuntu 18.04 (gcc…
Browse files Browse the repository at this point in the history 
…7 / protobuf 3.0)
  • Loading branch information
@FlorianReimold
FlorianReimold committed May 15, 2024
1 parent 1fd8cde commit 54cece0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
3 changes: 2 additions & 1 deletion ecal/core_pb/src/ecal/core/pb/ecal.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ message Content // topic content

enum eCmdType // command type
{
reserved 7 to 11;
// Reserved fields in enums are not supported in protobuf 3.0
// reserved 7 to 11;

bct_none = 0; // undefined command
bct_set_sample = 1; // set sample content
Expand Down
3 changes: 2 additions & 1 deletion ecal/core_pb/src/ecal/core/pb/layer.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ message ConnnectionPar // connection parameter for read

enum eTLayerType // transport layer
{
reserved 2, 3, 42;
// Reserved fields in enums are not supported in protobuf 3.0
// reserved 2, 3, 42;

tl_none = 0; // undefined
tl_ecal_udp_mc = 1; // ecal udp multicast
Expand Down
12 changes: 6 additions & 6 deletions ecal/service/ecal_service/src/client_session_impl_v0.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,22 @@ namespace eCAL
const asio::ip::tcp::resolver::query query(server_list_[server_list_index].first, std::to_string(server_list_[server_list_index].second));

resolver_.async_resolve(query
, service_call_queue_strand_.wrap([me = enable_shared_from_this<ClientSessionV0>::shared_from_this(), server_list_index]
, service_call_queue_strand_.wrap([me = enable_shared_from_this<ClientSessionV0>::shared_from_this(), server_list_index_copy = server_list_index] // gcc 7 forces us to assign the server_list_index to a new variable
(asio::error_code ec, const asio::ip::tcp::resolver::iterator& resolved_endpoints)
{
if (ec)
{
#if ECAL_SERVICE_LOG_DEBUG_ENABLED
{
const std::string message = "Failed resolving endpoint [" + me->server_list_[server_list_index].first + ":" + std::to_string(me->server_list_[server_list_index].second) + "]: " + ec.message();
const std::string message = "Failed resolving endpoint [" + me->server_list_[server_list_index_copy].first + ":" + std::to_string(me->server_list_[server_list_index_copy].second) + "]: " + ec.message();
ECAL_SERVICE_LOG_DEBUG(me->logger_, message);
}
#endif

if (server_list_index + 1 < me->server_list_.size())
if (server_list_index_copy + 1 < me->server_list_.size())
{
// Try next possible endpoint
me->resolve_endpoint(server_list_index + 1);
me->resolve_endpoint(server_list_index_copy + 1);
}
else
{
Expand All @@ -136,15 +136,15 @@ namespace eCAL
#if ECAL_SERVICE_LOG_DEBUG_VERBOSE_ENABLED
// Verbose-debug log of all endpoints
{
std::string endpoints_str = "Resolved endpoints for " + me->server_list_[server_list_index].first + ": ";
std::string endpoints_str = "Resolved endpoints for " + me->server_list_[server_list_index_copy].first + ": ";
for (auto it = resolved_endpoints; it != asio::ip::tcp::resolver::iterator(); ++it)
{
endpoints_str += endpoint_to_string(*it) + ", ";
}
ECAL_SERVICE_LOG_DEBUG_VERBOSE(me->logger_, endpoints_str);
}
#endif //ECAL_SERVICE_LOG_DEBUG_VERBOSE_ENABLED
me->connect_to_endpoint(resolved_endpoints, server_list_index);
me->connect_to_endpoint(resolved_endpoints, server_list_index_copy);
}
}));
}
Expand Down
12 changes: 6 additions & 6 deletions ecal/service/ecal_service/src/client_session_impl_v1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,22 +108,22 @@ namespace eCAL
const asio::ip::tcp::resolver::query query(server_list_[server_list_index].first, std::to_string(server_list_[server_list_index].second));

resolver_.async_resolve(query
, service_call_queue_strand_.wrap([me = enable_shared_from_this<ClientSessionV1>::shared_from_this(), server_list_index]
, service_call_queue_strand_.wrap([me = enable_shared_from_this<ClientSessionV1>::shared_from_this(), server_list_index_copy = server_list_index]
(asio::error_code ec, const asio::ip::tcp::resolver::iterator& resolved_endpoints)
{
if (ec)
{
#if ECAL_SERVICE_LOG_DEBUG_ENABLED
{
const std::string message = "Failed resolving endpoint [" + me->server_list_[server_list_index].first + ":" + std::to_string(me->server_list_[server_list_index].second) + "]: " + ec.message();
const std::string message = "Failed resolving endpoint [" + me->server_list_[server_list_index_copy].first + ":" + std::to_string(me->server_list_[server_list_index_copy].second) + "]: " + ec.message();
ECAL_SERVICE_LOG_DEBUG(me->logger_, message);
}
#endif

if (server_list_index + 1 < me->server_list_.size())
if (server_list_index_copy + 1 < me->server_list_.size())
{
// Try next possible endpoint
me->resolve_endpoint(server_list_index + 1);
me->resolve_endpoint(server_list_index_copy + 1);
}
else
{
Expand All @@ -146,15 +146,15 @@ namespace eCAL
#if ECAL_SERVICE_LOG_DEBUG_VERBOSE_ENABLED
// Verbose-debug log of all endpoints
{
std::string endpoints_str = "Resolved endpoints for " + me->server_list_[server_list_index].first + ": ";
std::string endpoints_str = "Resolved endpoints for " + me->server_list_[server_list_index_copy].first + ": ";
for (auto it = resolved_endpoints; it != asio::ip::tcp::resolver::iterator(); ++it)
{
endpoints_str += endpoint_to_string(*it) + ", ";
}
ECAL_SERVICE_LOG_DEBUG_VERBOSE(me->logger_, endpoints_str);
}
#endif //ECAL_SERVICE_LOG_DEBUG_VERBOSE_ENABLED
me->connect_to_endpoint(resolved_endpoints, server_list_index);
me->connect_to_endpoint(resolved_endpoints, server_list_index_copy);
}
}));
}
Expand Down

0 comments on commit 54cece0

Please sign in to comment.