diff options
author | Michael Mann <mmann78@netscape.net> | 2015-08-15 09:39:05 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-08-16 02:32:12 +0000 |
commit | 2e2129a9140a4be860fa09c77fd9f2d550c6fbda (patch) | |
tree | be5e099073bc8922523ded107a99b9be645f2e56 /epan/dissectors/packet-dcerpc.c | |
parent | 8b4572728d541e1039e4665dca8c6427db4a2132 (diff) |
Conversion of random proto_tree_add_text calls.
Change-Id: I6505ce34de84bfe46d5bc7b4d6a3c6044f3fb4b5
Reviewed-on: https://code.wireshark.org/review/10041
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dcerpc.c')
-rw-r--r-- | epan/dissectors/packet-dcerpc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 1791dd120b..740c154fa2 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -570,6 +570,7 @@ static int hf_dcerpc_array_actual_count = -1; static int hf_dcerpc_op = -1; static int hf_dcerpc_referent_id32 = -1; static int hf_dcerpc_referent_id64 = -1; +static int hf_dcerpc_null_pointer = -1; static int hf_dcerpc_fragments = -1; static int hf_dcerpc_fragment = -1; static int hf_dcerpc_fragment_overlap = -1; @@ -2684,9 +2685,8 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* we got a NULL pointer */ if (id == 0) { - proto_tree_add_text(tree, tvb, offset-pointer_size, - pointer_size, - "(NULL pointer) %s",text); + proto_tree_add_bytes_format_value(tree, hf_dcerpc_null_pointer, tvb, offset-pointer_size, + pointer_size, NULL, "%s", text); goto after_ref_id; } @@ -2728,9 +2728,8 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* we got a NULL pointer */ if (id == 0) { - proto_tree_add_text(tree, tvb, offset-pointer_size, - pointer_size, - "(NULL pointer) %s",text); + proto_tree_add_bytes_format_value(tree, hf_dcerpc_null_pointer, tvb, offset-pointer_size, + pointer_size, NULL, "%s",text); goto after_ref_id; } @@ -2786,9 +2785,8 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* we got a NULL pointer */ if (id == 0) { - proto_tree_add_text(tree, tvb, offset-pointer_size, - pointer_size, - "(NULL pointer) %s", text); + proto_tree_add_bytes_format_value(tree, hf_dcerpc_null_pointer, tvb, offset-pointer_size, + pointer_size, NULL, "%s",text); goto after_ref_id; } @@ -2820,9 +2818,8 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* we got a NULL pointer */ if (id == 0) { - proto_tree_add_text(tree, tvb, offset-pointer_size, - pointer_size, - "(NULL pointer) %s",text); + proto_tree_add_bytes_format_value(tree, hf_dcerpc_null_pointer, tvb, offset-pointer_size, + pointer_size, NULL, "%s",text); goto after_ref_id; } @@ -6363,6 +6360,9 @@ proto_register_dcerpc(void) { &hf_dcerpc_op, { "Operation", "dcerpc.op", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_dcerpc_null_pointer, + { "NULL Pointer", "dcerpc.null_pointer", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_dcerpc_fragments, { "Reassembled DCE/RPC Fragments", "dcerpc.fragments", FT_NONE, BASE_NONE, NULL, 0x0, "DCE/RPC Fragments", HFILL }}, |