Skip to content

Commit 9e27b72

Browse files
authored
Agent discovery fix (#80)
* Fix for Agent discovery in RMW * Add conditional compilation for discovery
1 parent 90ff6ab commit 9e27b72

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

rmw_microxrcedds_c/src/rmw_uros_options.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <rmw/ret_types.h>
2222
#include <rmw/error_handling.h>
2323

24-
// #include <uxr/client/client.h>
24+
#include <uxr/client/client.h>
2525

2626
rmw_ret_t rmw_uros_init_options(
2727
int argc, const char * const argv[],
@@ -119,6 +119,7 @@ rmw_ret_t rmw_uros_options_set_udp_address(
119119
#endif
120120
}
121121

122+
#if defined(MICRO_XRCEDDS_UDP) && defined(UCLIENT_PROFILE_DISCOVERY)
122123
bool on_agent_found(const TransportLocator* locator, void* args)
123124
{
124125
rmw_init_options_t * rmw_options = (rmw_init_options_t *) args;
@@ -146,6 +147,7 @@ bool on_agent_found(const TransportLocator* locator, void* args)
146147
}
147148
return false;
148149
}
150+
#endif
149151

150152
rmw_ret_t rmw_uros_discover_agent(rmw_init_options_t * rmw_options)
151153
{
@@ -162,8 +164,6 @@ rmw_ret_t rmw_uros_discover_agent(rmw_init_options_t * rmw_options)
162164

163165
return (strlen(rmw_options->impl->connection_params.agent_address) > 0 )? RMW_RET_OK : RMW_RET_TIMEOUT;
164166
#else
165-
(void) ip;
166-
(void) port;
167167
(void) rmw_options;
168168

169169
RMW_SET_ERROR_MSG("MICRO_XRCEDDS_UDP or UCLIENT_PROFILE_DISCOVERY not set.");

0 commit comments

Comments
 (0)