diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-03-15 22:41:57 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-03-15 22:41:57 +0000 |
| commit | 689e8bd8559fec00503b4563af219c2c842101e3 (patch) | |
| tree | f47ad51a0b89e8928364c8ae55f70a5d16d8dfdf /epan/dissectors/packet-dua.c | |
| parent | 320c1117f60b6d777043d9e2ac01dcbcc1ca95cd (diff) | |
From http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1539 :
Hexadecimal and octal are unsigned. Don't let dissectors register signed
fields (FT_INT*) to be displayed in hexadecimal (including HEX_DEC and DEC_HEX)
or octal. Fix dissectors that do that mostly by changing the fields to
unsigned though in PANA it appears the fields are meant to be signed so
change those fields to be displayed in decimal.
This fixes an assertion crash in hfinfo_numeric_format() if/when someone tries
to create a filter using one of these mixed signed/unsigned fields (because
that routine does not know how to present the user with a signed value in
hex).
Also add FT_*INT64 to the "make sure it's not BASE_NONE" check.
svn path=/trunk/; revision=24643
Diffstat (limited to 'epan/dissectors/packet-dua.c')
| -rw-r--r-- | epan/dissectors/packet-dua.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c index b1f2283a69..8be4d407ba 100644 --- a/epan/dissectors/packet-dua.c +++ b/epan/dissectors/packet-dua.c @@ -324,7 +324,7 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_i } call_dissector(data_handle, protocol_data_tvb, pinfo, tree); - + proto_item_append_text(parameter_item, " (%u byte%s)", protocol_data_length, plurality(protocol_data_length, "", "s")); } @@ -716,7 +716,7 @@ proto_register_dua(void) /* Setup list of header fields */ static hf_register_info hf[] = { - { &hf_int_interface_id, { "Integer interface identifier", "dua.int_interface_identifier", FT_INT32, BASE_HEX, NULL, 0x0, "", HFILL } }, + { &hf_int_interface_id, { "Integer interface identifier", "dua.int_interface_identifier", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_text_interface_id, { "Text interface identifier", "dua.text_interface_identifier", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_info_string, { "Info string", "dua.info_string", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_dlci_reserved, { "Reserved", "dua.dlci_reserved", FT_UINT16, BASE_DEC, NULL, RESERVED_BIT_MASK, "", HFILL } }, |