diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2016-02-29 23:06:38 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-03-01 05:46:45 +0000 |
| commit | 2858871aacd13120cedc9ef93474d06a50a79cff (patch) | |
| tree | 965559e7cb37bed66f2762fd8f23fefc8e7e7ec9 | |
| parent | c3b84afa1e9656db2d50f975da5f4d18b021b865 (diff) | |
| download | wireshark-2858871aacd13120cedc9ef93474d06a50a79cff.tar.gz wireshark-2858871aacd13120cedc9ef93474d06a50a79cff.tar.bz2 wireshark-2858871aacd13120cedc9ef93474d06a50a79cff.zip | |
FC: Forget about MDS when dealing with ETHERTYPE_BRDWALK (CID 280012)
Since the MDS trailer is smaller anyway, no need to copy that code.
Change-Id: Ie3931cda3ef2386526cd81daee535d106e522875
Reviewed-on: https://code.wireshark.org/review/14253
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-fc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 45288d8bd8..277c739652 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -1046,9 +1046,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean } frag_size -= MDSHDR_TRAILER_SIZE; } else if (fc_data->ethertype == ETHERTYPE_BRDWALK) { - if ((frag_size <= 8) || - ((frag_size == MDSHDR_TRAILER_SIZE) && (ftype != FC_FTYPE_LINKCTL) && - (ftype != FC_FTYPE_BLS) && (ftype != FC_FTYPE_OHMS))) { + if (frag_size <= 8) { proto_tree_add_expert(fc_tree, pinfo, &ei_short_hdr, tvb, FC_HEADER_SIZE, frag_size); return; |