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

fixed dropping packets from nodes with an RTPS message version higher than own version

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

1
src/core/ddsi/include/ddsi/q_protocol.h
View file

@ -146,6 +146,7 @@ struct cdrstring {
/* Only one specific version is grokked */ /* Only one specific version is grokked */
#define RTPS_MAJOR 2 #define RTPS_MAJOR 2
#define RTPS_MINOR 1 #define RTPS_MINOR 1
#define RTPS_MINOR_MINIMUM 1
typedef struct Header { typedef struct Header {
nn_protocolid_t protocol; nn_protocolid_t protocol;

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

@ -2922,7 +2922,7 @@ static int handle_submsg_sequence
malformed message. */ malformed message. */
if (rst->protocol_version.major < RTPS_MAJOR || if (rst->protocol_version.major < RTPS_MAJOR ||
(rst->protocol_version.major == RTPS_MAJOR && (rst->protocol_version.major == RTPS_MAJOR &&
rst->protocol_version.minor <= RTPS_MINOR)) rst->protocol_version.minor < RTPS_MINOR_MINIMUM))
goto malformed; goto malformed;
} }
else if (is_own_vendor (rst->vendor)) else if (is_own_vendor (rst->vendor))
@ -3048,9 +3048,12 @@ static bool do_packet
( (
(size_t) sz < RTPS_MESSAGE_HEADER_SIZE || (size_t) sz < RTPS_MESSAGE_HEADER_SIZE ||
buff[0] != 'R' || buff[1] != 'T' || buff[2] != 'P' || buff[3] != 'S' || buff[0] != 'R' || buff[1] != 'T' || buff[2] != 'P' || buff[3] != 'S' ||
hdr->version.major != RTPS_MAJOR || hdr->version.minor != RTPS_MINOR hdr->version.major != RTPS_MAJOR || (hdr->version.major == RTPS_MAJOR && hdr->version.minor < RTPS_MINOR_MINIMUM)
) )
{ {
if ((hdr->version.major == RTPS_MAJOR && hdr->version.minor < RTPS_MINOR_MINIMUM))
TRACE (("HDR("PGIDFMT" vendor %d.%d) len %lu\n, version mismatch: %d.%d\n",
PGUIDPREFIX (hdr->guid_prefix), hdr->vendorid.id[0], hdr->vendorid.id[1], (unsigned long) sz, hdr->version.major, hdr->version.minor));
if (NN_PEDANTIC_P) if (NN_PEDANTIC_P)
malformed_packet_received_nosubmsg (buff, sz, "header", hdr->vendorid); malformed_packet_received_nosubmsg (buff, sz, "header", hdr->vendorid);
} }