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

Accept "raweth" locators and check vendorid

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-06-14 20:02:07 +02:00 • committed by eboasson
parent e1ac4d7095
commit f33867e884
1 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/core/ddsi/src/ddsi_plist.c
View file

@ -2332,20 +2332,18 @@ static dds_return_t add_locator (nn_locators_t *ls, uint64_t *present, uint64_t
return 0; return 0;
} }
static int locator_address_prefix12_zero (const nn_locator_t *loc) static int locator_address_prefix_zero (const nn_locator_t *loc, size_t prefixlen)
{ {
/* loc has has 32 bit ints preceding the address, hence address is assert (prefixlen <= sizeof (loc->address));
4-byte aligned; reading char* as unsigneds isn't illegal type for (size_t i = 0; i < prefixlen; i++)
punning */ if (loc->address[i] != 0)
const uint32_t *u = (const uint32_t *) loc->address; return 0;
return (u[0] == 0 && u[1] == 0 && u[2] == 0); return 1;
} }
static int locator_address_zero (const nn_locator_t *loc) static int locator_address_zero (const nn_locator_t *loc)
{ {
/* see locator_address_prefix12_zero */ return locator_address_prefix_zero (loc, sizeof (loc->address));
const uint32_t *u = (const uint32_t *) loc->address;
return (u[0] == 0 && u[1] == 0 && u[2] == 0 && u[3] == 0);
} }
static dds_return_t do_locator (nn_locators_t *ls, uint64_t *present, uint64_t wanted, uint64_t fl, const struct dd *dd, const struct ddsi_tran_factory *factory) static dds_return_t do_locator (nn_locators_t *ls, uint64_t *present, uint64_t wanted, uint64_t fl, const struct dd *dd, const struct ddsi_tran_factory *factory)
@ -2367,26 +2365,34 @@ static dds_return_t do_locator (nn_locators_t *ls, uint64_t *present, uint64_t w
{ {
case NN_LOCATOR_KIND_UDPv4: case NN_LOCATOR_KIND_UDPv4:
case NN_LOCATOR_KIND_TCPv4: case NN_LOCATOR_KIND_TCPv4:
if (loc.port <= 0 || loc.port > 65535) if (!ddsi_factory_supports (factory, loc.kind))
return 0;
if (!ddsi_is_valid_port (factory, loc.port))
return DDS_RETCODE_BAD_PARAMETER; return DDS_RETCODE_BAD_PARAMETER;
if (!locator_address_prefix12_zero (&loc)) if (!locator_address_prefix_zero (&loc, 12))
return DDS_RETCODE_BAD_PARAMETER; return DDS_RETCODE_BAD_PARAMETER;
break; break;
case NN_LOCATOR_KIND_UDPv6: case NN_LOCATOR_KIND_UDPv6:
case NN_LOCATOR_KIND_TCPv6: case NN_LOCATOR_KIND_TCPv6:
if (loc.port <= 0 || loc.port > 65535) if (!ddsi_factory_supports (factory, loc.kind))
return 0;
if (!ddsi_is_valid_port (factory, loc.port))
return DDS_RETCODE_BAD_PARAMETER; return DDS_RETCODE_BAD_PARAMETER;
break; break;
case NN_LOCATOR_KIND_UDPv4MCGEN: { case NN_LOCATOR_KIND_UDPv4MCGEN:
if (!vendor_is_eclipse (dd->vendorid))
return 0;
else
{
const nn_udpv4mcgen_address_t *x = (const nn_udpv4mcgen_address_t *) loc.address; const nn_udpv4mcgen_address_t *x = (const nn_udpv4mcgen_address_t *) loc.address;
if (!ddsi_factory_supports (factory, NN_LOCATOR_KIND_UDPv4)) if (!ddsi_factory_supports (factory, NN_LOCATOR_KIND_UDPv4))
return 0; return 0;
if (loc.port <= 0 || loc.port > 65536) if (!ddsi_is_valid_port (factory, loc.port))
return DDS_RETCODE_BAD_PARAMETER; return DDS_RETCODE_BAD_PARAMETER;
if ((uint32_t) x->base + x->count >= 28 || x->count == 0 || x->idx >= x->count) if ((uint32_t) x->base + x->count >= 28 || x->count == 0 || x->idx >= x->count)
return DDS_RETCODE_BAD_PARAMETER; return DDS_RETCODE_BAD_PARAMETER;
break;
} }
break;
case NN_LOCATOR_KIND_INVALID: case NN_LOCATOR_KIND_INVALID:
if (!locator_address_zero (&loc)) if (!locator_address_zero (&loc))
return DDS_RETCODE_BAD_PARAMETER; return DDS_RETCODE_BAD_PARAMETER;
@ -2397,6 +2403,19 @@ static dds_return_t do_locator (nn_locators_t *ls, uint64_t *present, uint64_t w
case NN_LOCATOR_KIND_RESERVED: case NN_LOCATOR_KIND_RESERVED:
/* silently drop "reserved" locators. */ /* silently drop "reserved" locators. */
return 0; return 0;
case NN_LOCATOR_KIND_RAWETH:
if (!vendor_is_eclipse (dd->vendorid))
return 0;
else
{
if (!ddsi_factory_supports (factory, NN_LOCATOR_KIND_RAWETH))
return 0;
if (!ddsi_is_valid_port (factory, loc.port))
return DDS_RETCODE_BAD_PARAMETER;
if (!locator_address_prefix_zero (&loc, 10))
return DDS_RETCODE_BAD_PARAMETER;
}
break;
default: default:
return 0; return 0;
} }