diff options
author | Michael Mann <mmann78@netscape.net> | 2014-08-17 16:11:15 -0400 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-08-18 07:53:39 +0000 |
commit | 945b371a259ef8ed4fb94b13798162e688234f64 (patch) | |
tree | bdc7bc1620287a6b95452a5f7a0db9ed83d86f5f /epan/dissectors/packet-negoex.c | |
parent | 83ad0d063c47aa3cc8da53a8f3c61cdd68027145 (diff) |
Eliminate proto_tree_add_text from some dissectors.
Other minor cleanup while in the neighborhood.
Change-Id: I77cac916d617f56f92f686e9cd9f15fba058facf
Reviewed-on: https://code.wireshark.org/review/3675
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-negoex.c')
-rw-r--r-- | epan/dissectors/packet-negoex.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c index 81e3173435..b3228db219 100644 --- a/epan/dissectors/packet-negoex.c +++ b/epan/dissectors/packet-negoex.c @@ -64,6 +64,7 @@ static int hf_negoex_checksum_vector_count = -1; static int hf_negoex_checksum_vector_pad = -1; static int hf_negoex_checksum = -1; static int hf_negoex_errorcode = -1; +static int hf_negoex_data = -1; static gint ett_negoex = -1; static gint ett_negoex_msg = -1; @@ -134,7 +135,7 @@ dissect_negoex_alert_message(tvbuff_t *tvb, offset += 4; /* The rest */ - proto_tree_add_text(tree, tvb, offset, tvb_length(tvb) - offset, + proto_tree_add_bytes_format(tree, hf_negoex_data, tvb, offset, -1, NULL, "The rest of the alert message"); } @@ -485,7 +486,7 @@ dissect_negoex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_text(negoex_msg_tree, tvb, offset, message_len - 40, + proto_tree_add_bytes_format(negoex_msg_tree, hf_negoex_data, tvb, offset, message_len - 40, NULL, "The rest of the message"); } @@ -589,6 +590,9 @@ proto_register_negoex(void) { &hf_negoex_errorcode, { "ErrorCode", "negoex.errorcode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + { &hf_negoex_data, + { "Data", "negoex.data", FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, }; static gint *ett[] = { |