diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-10-11 08:31:58 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-10-11 08:31:58 +0000 |
| commit | fff62572e6f62cea5d6344e6b0aec26c31b4a7bf (patch) | |
| tree | 22b2dbde0082ccd6dbbf2061813d93493a005133 | |
| parent | ec8c4b3fd5b6430c342019298055b4c98f69e77f (diff) | |
| download | wireshark-fff62572e6f62cea5d6344e6b0aec26c31b4a7bf.tar.gz | |
Copy over changes from trunk:
------------------------------------------------------------------------
r45464 | guy | 2012-10-11 01:23:29 -0700 (Thu, 11 Oct 2012) | 4 lines
hf_isup_cic is now BASE_DEC, so there's no reason to use
proto_tree_add_uint_format() to make it display in decimal -
proto_tree_add_uint() suffices.
------------------------------------------------------------------------
r45463 | etxrab | 2012-10-11 01:12:41 -0700 (Thu, 11 Oct 2012) | 4 lines
"Prepare/Apply a filter" on ISUP CIC should make a filter with decimal
CIC number, not hex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7848
------------------------------------------------------------------------
svn path=/trunk-1.8/; revision=45467
| -rw-r--r-- | epan/dissectors/packet-isup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 86f7c1dc6a..23388228bc 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -8041,7 +8041,7 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_isup, tvb, 0, -1, ENC_NA); isup_tree = proto_item_add_subtree(ti, ett_isup); - proto_tree_add_uint_format(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic, "CIC: %u", cic); + proto_tree_add_uint(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic); } message_tvb = tvb_new_subset_remaining(tvb, CIC_LENGTH); dissect_ansi_isup_message(message_tvb, pinfo, isup_tree); @@ -8079,7 +8079,7 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_isup, tvb, 0, -1, ENC_NA); isup_tree = proto_item_add_subtree(ti, ett_isup); - proto_tree_add_uint_format(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic, "CIC: %u", cic); + proto_tree_add_uint(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic); } message_tvb = tvb_new_subset_remaining(tvb, CIC_LENGTH); dissect_isup_message(message_tvb, pinfo, isup_tree, itu_isup_variant); @@ -8277,7 +8277,7 @@ proto_register_isup(void) static hf_register_info hf[] = { { &hf_isup_cic, { "CIC", "isup.cic", - FT_UINT16, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_isup_message_type, |