osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

SPRT: fix 'sprt.payload' exists multiple times with NOT compatible types: FT_NONE and FT_UINT32 

Change-Id: Ie6c6f71e413463f93924c1a47b908a1c97d94407
Reviewed-on: https://code.wireshark.org/review/14209
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexis La Goutte 2016-02-27 19:26:54 +01:00 committed by Michael Mann
parent 4ef2e2f389
commit 72fb00f9c2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-sprt.c
View File

@ -325,7 +325,7 @@ static int hf_sprt_ack_field_items = -1;
static int hf_sprt_transport_channel_item = -1;
static int hf_sprt_sequence_item = -1;
static int hf_sprt_payload = -1;
static int hf_sprt_payload_length = -1;
static int hf_sprt_payload_no_data = -1;
static int hf_sprt_payload_reserved_bit = -1;
static int hf_sprt_payload_message_id = -1;
@ -885,7 +885,7 @@ dissect_sprt_data(tvbuff_t *tvb,
if (payload_length > 0)
{
ti = proto_tree_add_uint(sprt_tree, hf_sprt_payload, tvb, offset, 1, payload_length);
ti = proto_tree_add_uint(sprt_tree, hf_sprt_payload_length, tvb, offset, 1, payload_length);
proto_item_set_len(ti, payload_length);
sprt_payload_tree = proto_item_add_subtree(ti, ett_payload);
@ -1694,10 +1694,10 @@ proto_register_sprt(void)
},
/* SPRT payload, if any: */
{
&hf_sprt_payload,
&hf_sprt_payload_length,
{
"Payload (in bytes)",
"sprt.payload",
"sprt.payload.length",
FT_UINT32,
BASE_DEC,
NULL,