diff options
| author | John Thacker <johnthacker@gmail.com> | 2020-03-19 06:59:03 -0400 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2020-03-19 13:02:52 +0000 |
| commit | 8a959eff088fe4123ea93e491c969a3b8c51b896 (patch) | |
| tree | b560130caf025fb88a9df89ce9f10876db85e797 | |
| parent | 2ba42a047e767dd7e9fcd1f7256c2ab301b2c76d (diff) | |
RTPS: hf_rtps_nokey_data_frag_number is FT_UINT32
In (deprecated) NOKEY_DATA_FRAG, the frag_number field is a uint32
so ret_uint should be used, etc. Fixing to be like DATA_FRAG.
Change-Id: I75848dfbde114cf6e4bdc6864d0690a75ca58d1d
Reviewed-on: https://code.wireshark.org/review/36500
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-rtps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index a0f631d0fa..bbc40fb51d 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -7817,7 +7817,7 @@ static void dissect_NOKEY_DATA_FRAG(tvbuff_t *tvb, packet_info *pinfo, gint offs guint32 wid; /* Writer EntityID */ gboolean from_builtin_writer; gint old_offset = offset; - gint32 frag_number = 0; + guint32 frag_number = 0; proto_item *octet_item; proto_tree_add_bitmask_value(tree, tvb, offset + 1, hf_rtps_sm_flags, ett_rtps_flags, NOKEY_DATA_FRAG_FLAGS, flags); @@ -7850,7 +7850,7 @@ static void dissect_NOKEY_DATA_FRAG(tvbuff_t *tvb, packet_info *pinfo, gint offs offset += 8; /* Fragment number */ - proto_tree_add_item_ret_int(tree, hf_rtps_nokey_data_frag_number, tvb, + proto_tree_add_item_ret_uint(tree, hf_rtps_nokey_data_frag_number, tvb, offset, 4, encoding, &frag_number); offset += 4; @@ -7878,7 +7878,7 @@ static void dissect_NOKEY_DATA_FRAG(tvbuff_t *tvb, packet_info *pinfo, gint offs (((wid & 0xc2) == 0xc2) || ((wid & 0xc3) == 0xc3)) ? TRUE : FALSE; dissect_serialized_data(tree, pinfo, tvb,offset, octets_to_next_header - (offset - old_offset) + 4, - "serializedData", vendor_id, from_builtin_writer, NULL, frag_number); + "serializedData", vendor_id, from_builtin_writer, NULL, (gint32)frag_number); } } |