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

Remove dead code

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-12-28 06:00:17 +01:00
parent 3c0b86df9c
commit a2aab8eab2
6 changed files with 4 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/ddsi/src/q_init.c
View file

@ -535,18 +535,6 @@ int rtps_config_prep (struct cfgst *cfgst)
goto err_config_late_error;
}
#if ! OS_SOCKET_HAS_IPV6
/* If the platform doesn't support IPv6, guarantee useIpv6 is
false. There are two ways of going about it, one is to do it
silently, the other to let the user fix his config. Clearly, we
have chosen the latter. */
if (config.useIpv6)
{
DDS_ERROR("IPv6 addressing requested but not supported on this platform\n");
goto err_config_late_error;
}
#endif
#ifdef DDSI_INCLUDE_NETWORK_CHANNELS
{
/* Determine number of configured channels to be able to

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

@ -17,10 +17,6 @@
#include "os/os.h"
#ifndef _WIN32
#include <netdb.h>
#endif
#include "ddsi/q_log.h"
#include "ddsi/q_nwif.h"
#include "ddsi/q_globals.h"
@ -46,12 +42,16 @@ unsigned locator_to_hopefully_unique_uint32 (const nn_locator_t *src)
memcpy (&id, src->address + 12, sizeof (id));
else
{
#if OS_SOCKET_HAS_IPV6
md5_state_t st;
md5_byte_t digest[16];
md5_init (&st);
md5_append (&st, (const md5_byte_t *) ((const os_sockaddr_in6 *) src)->sin6_addr.s6_addr, 16);
md5_finish (&st, digest);
memcpy (&id, digest, sizeof (id));
#else
DDS_FATAL("IPv6 unavailable\n");
#endif
}
return id;
}