Commit Graph

14 Commits

Author SHA1 Message Date
Evan Huus 8ee8808876 First pass pinfo->pool conversion, part 2
Automated find/replace of wmem_packet_scope() with pinfo->pool in all
files where it didn't cause a build failure.
2021-07-21 09:54:57 -04:00
Guy Harris 20800366dd HTTPS (almost) everywhere.
Change all wireshark.org URLs to use https.

Fix some broken links while we're at it.

Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c
Reviewed-on: https://code.wireshark.org/review/34089
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:44:40 +00:00
Alexander Koeppe 367bb983ee cisco-fp-mim: Adding FabricPath FCS dissection and verification
FabricPath recalculates the FCS based on the whole packet (incl. the Ethernet
header) and overwrites the last four bytes of the packet, effectively stealing
the Ethernet FCS.

Since FabricPath FCS dissection and verification isn't available and falsely
attempted on the Ethernet layer, this commit implements the FCS treatment on
the FabricPath layer and treats the Ethernet layer explicitely as it would not
have a FCS.

It also adds a procotol option to enable FabricPath FCS validation which is
disabled by default though.

Bug: 15769
Change-Id: I382a4907bca158b549bcc8d77459b7829e60f94a
Reviewed-on: https://code.wireshark.org/review/33322
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10 22:20:13 +00:00
Alexander Koeppe d0bb4e64cc cisco-fp-mim: Properly handle FabricPath header variations (.1Q VLAN)
Under some circumstances, FabricPath frames may be generated during a monitor
(capture) session, that contains a modified FabricPath header format in order
to retain the ID of the original FabricPath VLAN.

To make wireshark capable to dissect such frames, this commit amends the
heuristic logic of the dissector and make it work as a heuristic-only dissector

Change-Id: I40f6f75a629585ececbc1ce4f94fa61065110d2c
Reviewed-on: https://code.wireshark.org/review/33321
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-28 06:49:40 +00:00
Alexis La Goutte b93ece3780 cisco-fp-min: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: If470ed91123b6a0a630d6e0a17bffd296759031a
Reviewed-on: https://code.wireshark.org/review/28604
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-22 05:00:17 +00:00
Alexis La Goutte 9c4d312822 cisco-fp-min: fix indent (use 4 spaces)
Change-Id: I0c485d33f17d21d76719394fd704c859eb9422e4
Reviewed-on: https://code.wireshark.org/review/28635
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-06 07:28:30 +00:00
Joerg Mayer 212e5bdaad packet-cisco-fp-mim.c: Add support for FP packets that contain an extra QinQ header
Also: Minor style cleanups (some still missing) and add two FP specific WKAs.

Change-Id: I908ec92ba4682caf8e9c9cc4fb44c2f9c336b4e3
Reviewed-on: https://code.wireshark.org/review/28535
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-06-30 05:55:12 +00:00
Dario Lombardo 692cef88c7 dissectors: more SPDX license convertions.
Change-Id: I96e1f1cdbaaf49d65705ecacc903f73cf0e47d7c
Reviewed-on: https://code.wireshark.org/review/26334
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-03-07 17:18:47 +00:00
Michael Mann 9bcac48403 Manually add protocol dependencies derived from find_dissector.
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector.  Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector.
"data" dissector was not considered to be a dependency.

Change-Id: I15d0d77301306587ef8e7af5876e74231816890d
Reviewed-on: https://code.wireshark.org/review/14509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 12:48:48 +00:00
Guy Harris eeff506f56 Separate "Ethernet in capture file" and "Ethernet maybe with FCS" dissectors.
Have a dissector that is passed a "struct eth_phdr" pointer, indicating
whether there is an FCS, there is no FCS, or there's maybe an FCS, and
an "eth_maybefcs" dissector, to be called from other dissectors.  The
latter takes no data argument.

That obviates the need for callers of the latter to fill in an
"eth_phdr" structure.

Note in a comment that setting the "assume an FCS" preference overrides
a file format handler in Wiretap saying "we have no FCS".  I seem to
remember that this might be intentional.

Ping-Bug: 9933
Change-Id: I600e1351d468ab31d48369edb96832d6da3e480c
Reviewed-on: https://code.wireshark.org/review/13432
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-20 09:57:29 +00:00
Guy Harris 8ec153f938 Have the "maybe an FCS" version of the Ethernet dissector take a data argument.
It's called from some places other than packet-frame.c, at least one of
which currently can't call anything else (the ATM dissector, for
VC-multiplexed bridged frames, where you don't know whether the frames
include the FCS or not), so the frame's pseudo-data doesn't necessarily
have the appropriate "FCS length" value.  Have it explicitly check the
data argument, and explicitly pass the appropriate value to it.

Ping-Bug: 9933
Change-Id: I0c75f921d25d1e2b75e476c15ff9625205036b25
Reviewed-on: https://code.wireshark.org/review/13382
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-18 04:15:16 +00:00
Guy Harris 9803870b2a More comments.
Including a URL for a Cisco page with diagrams of the encapsulation.

Change-Id: I4fb4356ea6071ca7efb596a8d35f982478bf4896
Reviewed-on: https://code.wireshark.org/review/13367
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17 20:57:09 +00:00
Michael Mann 443a7ed259 new_create_dissector_handle -> create_dissector_handle for dissector directory.
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now.

Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f
Reviewed-on: https://code.wireshark.org/review/12484
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:37:36 +00:00
Alexis La Goutte f1b3b32de9 Cisco FabricPath MiM: rename file name
packet-mim -> packet-cisco-fp-mim.c

Change-Id: Ife2414f8e74ec818720da1e80d6b8f87589d8150
Reviewed-on: https://code.wireshark.org/review/12008
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>
2015-11-22 08:43:16 +00:00