RTPS: Fixed dissection of compressed data when using PL_CDR* encapsulation.
It was not using the right tvb when dissecting uncompressed data with PL_CDR_LE or PL_CDR_BE encapsulation
This commit is contained in:
parent
e3cb80d828
commit
2a9e59f4cf
|
@ -9819,6 +9819,7 @@ gint rtps_prepare_encapsulated_data(
|
||||||
* could be used to define a custom compressor plugin for matching purposes.
|
* could be used to define a custom compressor plugin for matching purposes.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void dissect_serialized_data(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint offset,
|
static void dissect_serialized_data(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint offset,
|
||||||
int size, const char *label, guint16 vendor_id, gboolean is_discovery_data,
|
int size, const char *label, guint16 vendor_id, gboolean is_discovery_data,
|
||||||
endpoint_guid * guid, gint32 frag_number /* -1 if no fragmentation */) {
|
endpoint_guid * guid, gint32 frag_number /* -1 if no fragmentation */) {
|
||||||
|
@ -9924,7 +9925,7 @@ static void dissect_serialized_data(proto_tree *tree, packet_info *pinfo, tvbuff
|
||||||
}
|
}
|
||||||
else if (frag_number != NOT_A_FRAGMENT) {
|
else if (frag_number != NOT_A_FRAGMENT) {
|
||||||
/* fragments should be dissected as raw bytes (not parametrized) */
|
/* fragments should be dissected as raw bytes (not parametrized) */
|
||||||
proto_tree_add_item(dissected_data_holdeer_tree, hf_rtps_issue_data, tvb,
|
proto_tree_add_item(dissected_data_holdeer_tree, hf_rtps_issue_data, data_holder_tvb,
|
||||||
offset, size, ENC_NA);
|
offset, size, ENC_NA);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -9932,7 +9933,7 @@ static void dissect_serialized_data(proto_tree *tree, packet_info *pinfo, tvbuff
|
||||||
/* Instead of showing a warning like before, we now dissect the data as
|
/* Instead of showing a warning like before, we now dissect the data as
|
||||||
* (id - length - value) members */
|
* (id - length - value) members */
|
||||||
dissect_parametrized_serialized_data(dissected_data_holdeer_tree,
|
dissect_parametrized_serialized_data(dissected_data_holdeer_tree,
|
||||||
tvb, offset, size, encapsulation_encoding);
|
data_holder_tvb, offset, size, encapsulation_encoding);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue