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

fix security compatibility between lite and opensplice

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2018-03-13 17:34:33 -07:00
parent e0068e6dae
commit 6d0de92c6c
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/ddsi/src/q_misc.c
View file

@ -55,6 +55,12 @@ int vendor_is_opensplice (nn_vendorid_t vid)
return (vid.id[0] == pt1.id[0] && vid.id[1] == pt1.id[1]); return (vid.id[0] == pt1.id[0] && vid.id[1] == pt1.id[1]);
} }
int vendor_is_lite (nn_vendorid_t vid)
{
const nn_vendorid_t pt1 = NN_VENDORID_PRISMTECH_LITE;
return (vid.id[0] == pt1.id[0] && vid.id[1] == pt1.id[1]);
}
int is_own_vendor (nn_vendorid_t vendor) int is_own_vendor (nn_vendorid_t vendor)
{ {
const nn_vendorid_t ownid = MY_VENDOR_ID; const nn_vendorid_t ownid = MY_VENDOR_ID;

2
src/core/ddsi/src/q_receive.c
View file

@ -2864,7 +2864,7 @@ static int handle_submsg_sequence
break; break;
case SMID_PT_INFO_CONTAINER: case SMID_PT_INFO_CONTAINER:
if (is_own_vendor (rst->vendor)) if (is_own_vendor (rst->vendor) || vendor_is_lite(rst->vendor))
{ {
state = "parse:pt_info_container"; state = "parse:pt_info_container";
TRACE (("PT_INFO_CONTAINER(")); TRACE (("PT_INFO_CONTAINER("));