summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-frame.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-05-24 21:10:29 -0400
committerAnders Broman <a.broman58@gmail.com>2015-05-26 12:09:28 +0000
commita713b1314d3d4ba79c1bec2f5dc930e752b6e9b9 (patch)
treee39e792fed0f5773a00ae72363e537636182f20d /epan/dissectors/packet-frame.c
parentda93752b6d3c49274a46f6b938d576c7b4bf2ac4 (diff)
downloadwireshark-a713b1314d3d4ba79c1bec2f5dc930e752b6e9b9.tar.gz
Duplicate the presence of the "ignored" field in order to remove proto_tree_add_text.
Change-Id: I0906c28656a104210f6fd1f95c9cee7899308538 Reviewed-on: https://code.wireshark.org/review/8619 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-frame.c')
-rw-r--r--epan/dissectors/packet-frame.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 3781ec32a6..df9258073b 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -275,7 +275,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
gboolean old_visible;
/* Put in frame header information. */
- cap_len = tvb_length(tvb);
+ cap_len = tvb_captured_length(tvb);
frame_len = tvb_reported_length(tvb);
cap_plurality = plurality(cap_len, "", "s");
@@ -470,7 +470,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
if (pinfo->fd->flags.ignored) {
/* Ignored package, stop handling here */
col_set_str(pinfo->cinfo, COL_INFO, "<Ignored>");
- proto_tree_add_text (tree, tvb, 0, 0, "This frame is marked as ignored");
+ proto_tree_add_boolean_format(tree, hf_frame_ignored, tvb, 0, 0, TRUE, "This frame is marked as ignored");
return tvb_captured_length(tvb);
}