diff options
| author | Dario Lombardo <lomato@gmail.com> | 2015-02-12 14:41:56 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-03-09 05:34:28 +0000 |
| commit | a242c09fba0778bdb3c657dd21aafa40884bb608 (patch) | |
| tree | 8a6ed3f86d867c10e27ecd3c894779118c3746d5 /epan/dissectors/packet-frame.c | |
| parent | bd64823e3f20a591e78dd404f00c1bb0a5bcb919 (diff) | |
| download | wireshark-a242c09fba0778bdb3c657dd21aafa40884bb608.tar.gz | |
Small improvement in incomplete dissectors check.
This avoids logging "frame" as incomplete dissector.
Change-Id: Ifd32c4326fbe9e86d14c94e065b602ca45cb0a7e
Reviewed-on: https://code.wireshark.org/review/7390
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@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.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 52a1384b08..f7f47d86a3 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -643,13 +643,15 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* bit = i % 8; if (!(decoded[byte] & (1 << bit))) { field_info* fi = proto_find_field_from_offset(tree, i, tvb); - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_WARNING, - "Dissector %s incomplete in frame %u: undecoded byte number %u " - "(0x%.4X+%u)\n", - (fi ? fi->hfinfo->abbrev : "[unknown]"), - pinfo->fd->num, i, i - i % 16, i % 16); - expert_add_info_format(pinfo, tree, &ei_incomplete, - "Undecoded byte number: %u (0x%.4X+%u)", i, i - i % 16, i % 16); + if (fi && fi->hfinfo->id != proto_frame) { + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_WARNING, + "Dissector %s incomplete in frame %u: undecoded byte number %u " + "(0x%.4X+%u)", + (fi ? fi->hfinfo->abbrev : "[unknown]"), + pinfo->fd->num, i, i - i % 16, i % 16); + expert_add_info_format(pinfo, tree, &ei_incomplete, + "Undecoded byte number: %u (0x%.4X+%u)", i, i - i % 16, i % 16); + } } } } |