diff options
author | Jim Young <jyoung@gsu.edu> | 2017-08-28 23:32:43 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-08-29 10:44:44 +0000 |
commit | 6d5fcb7378b89790ab2d3feac0a6579c59b97bef (patch) | |
tree | 417be3e2089189e58c827e10a8a384f241b24fe1 /epan/dissectors/file-pcapng.c | |
parent | fa8a6a3eee3a6ce938cec4c1d8cc0540b27c451a (diff) |
MIME based pcapng dissector: Fixup apparent copy-and-pasteos.
The MIME based pcapng dissector incorrectly displayed the EPB
Flags option's link layer error bits.
Change-Id: Ia14eec39e2a9c4432e6b3d1c0cee718ad2da1cac
Reviewed-on: https://code.wireshark.org/review/23279
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/file-pcapng.c')
-rw-r--r-- | epan/dissectors/file-pcapng.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index 71df3073e5..223162aab1 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -1833,7 +1833,6 @@ proto_register_pcapng(void) FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL } }, - { &hf_pcapng_option_data_packet_flags_link_layer_errors_symbol, { "Symbol Error", "pcapng.options.option.data.packet.flags.link_layer_errors.symbol", FT_BOOLEAN, 16, NULL, 0x8000, @@ -1841,42 +1840,42 @@ proto_register_pcapng(void) }, { &hf_pcapng_option_data_packet_flags_link_layer_errors_preamble, { "Preamble Error", "pcapng.options.option.data.packet.flags.link_layer_errors.preamble", - FT_BOOLEAN, 16, NULL, 0x8000, + FT_BOOLEAN, 16, NULL, 0x4000, NULL, HFILL } }, { &hf_pcapng_option_data_packet_flags_link_layer_errors_start_frame_delimiter, - { "Preamble Error", "pcapng.options.option.data.packet.flags.link_layer_errors.preamble", - FT_BOOLEAN, 16, NULL, 0x8000, + { "Start Frame Delimiter Error", "pcapng.options.option.data.packet.flags.link_layer_errors.start_frame_delimiter", + FT_BOOLEAN, 16, NULL, 0x2000, NULL, HFILL } }, { &hf_pcapng_option_data_packet_flags_link_layer_errors_unaligned_frame, - { "Preamble Error", "pcapng.options.option.data.packet.flags.link_layer_errors.preamble", - FT_BOOLEAN, 16, NULL, 0x4000, + { "Unaligned Frame Error", "pcapng.options.option.data.packet.flags.link_layer_errors.unaligned_frame", + FT_BOOLEAN, 16, NULL, 0x1000, NULL, HFILL } }, { &hf_pcapng_option_data_packet_flags_link_layer_errors_wrong_inter_frame_gap, { "Wrong Inter Frame Gap", "pcapng.options.option.data.packet.flags.link_layer_errors.wrong_inter_frame_gap", - FT_BOOLEAN, 16, NULL, 0x2000, + FT_BOOLEAN, 16, NULL, 0x0800, NULL, HFILL } }, { &hf_pcapng_option_data_packet_flags_link_layer_errors_packet_too_short, { "Packet Too Short", "pcapng.options.option.data.packet.flags.link_layer_errors.packet_too_short", - FT_BOOLEAN, 16, NULL, 0x1000, + FT_BOOLEAN, 16, NULL, 0x0400, NULL, HFILL } }, { &hf_pcapng_option_data_packet_flags_link_layer_errors_packet_too_long, { "Packet Too Long", "pcapng.options.option.data.packet.flags.link_layer_errors.packet_too_long", - FT_BOOLEAN, 16, NULL, 0x0800, + FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL } }, { &hf_pcapng_option_data_packet_flags_link_layer_errors_crc_error, { "CRC Error", "pcapng.options.option.data.packet.flags.link_layer_errors.crc", - FT_BOOLEAN, 16, NULL, 0x0400, + FT_BOOLEAN, 16, NULL, 0x0100, NULL, HFILL } }, { &hf_pcapng_option_data_packet_flags_link_layer_errors_reserved, { "Reserved", "pcapng.options.option.data.packet.flags.link_layer_errors.reserved", - FT_UINT16, BASE_HEX, NULL, 0x03FF, + FT_UINT16, BASE_HEX, NULL, 0x00FF, NULL, HFILL } }, { &hf_pcapng_option_data_packet_flags, |