niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try to get the locator kind right when using UDP and the debug monitor port is enabled

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2018-06-07 16:52:08 +02:00
parent 2ee9e9de02
commit 07600793b6
2 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/ddsi/src/ddsi_tcp.c
View file

@ -749,18 +749,13 @@ static os_handle ddsi_tcp_conn_handle (ddsi_tran_base_t base)
static bool ddsi_tcp_supports (int32_t kind) static bool ddsi_tcp_supports (int32_t kind)
{ {
return return kind == ddsi_tcp_factory_g.m_kind;
(
(config.transport_selector == TRANS_TCP && kind == NN_LOCATOR_KIND_TCPv4)
#if OS_SOCKET_HAS_IPV6
|| (config.transport_selector == TRANS_TCP6 && kind == NN_LOCATOR_KIND_TCPv6)
#endif
);
} }
static int ddsi_tcp_locator (ddsi_tran_base_t base, nn_locator_t *loc) static int ddsi_tcp_locator (ddsi_tran_base_t base, nn_locator_t *loc)
{ {
*loc = gv.extloc; loc->kind = ddsi_tcp_factory_g.m_kind;
memcpy(loc->address, gv.extloc.address, sizeof(loc->address));
loc->port = base->m_port; loc->port = base->m_port;
return 0; return 0;
} }

8
src/core/ddsi/src/ddsi_udp.c
View file

@ -173,12 +173,8 @@ static os_handle ddsi_udp_conn_handle (ddsi_tran_base_t base)
static bool ddsi_udp_supports (int32_t kind) static bool ddsi_udp_supports (int32_t kind)
{ {
return return
( kind == ddsi_udp_factory_g.m_kind ||
(config.transport_selector == TRANS_UDP && (kind == NN_LOCATOR_KIND_UDPv4 || kind == NN_LOCATOR_KIND_UDPv4MCGEN)) (kind == NN_LOCATOR_KIND_UDPv4MCGEN && ddsi_udp_factory_g.m_kind == NN_LOCATOR_KIND_UDPv4);
#if OS_SOCKET_HAS_IPV6
|| (config.transport_selector == TRANS_UDP6 && kind == NN_LOCATOR_KIND_UDPv6)
#endif
);
} }
static int ddsi_udp_conn_locator (ddsi_tran_base_t base, nn_locator_t *loc) static int ddsi_udp_conn_locator (ddsi_tran_base_t base, nn_locator_t *loc)