diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-16 20:03:05 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-17 04:03:37 +0000 |
| commit | 2c3d3435922e5b7da2d3dd819ffb069ca8454664 (patch) | |
| tree | 58f2c8dbbc0170fa5053c26388d55e6f36444b01 | |
| parent | fe82323df04e5fb2aaa3875d69e4e1ffe122b1ef (diff) | |
| download | wireshark-2c3d3435922e5b7da2d3dd819ffb069ca8454664.tar.gz | |
Call the "no FCS present" version of the Ethernet dissector.
I haven't found an official spec for EoIB, but slide 10 of
http://downloads.openfabrics.org/Media/Sonoma2009/Sonoma_2009_Tues_converged-net-bridging.pdf
shows the "Eth Payload" following the "Eth Header" and optional "Vlan
tag", and doesn't show an FCS; "Payload" generally refers to the data
transported by the protocol, which wouldn't include the FCS.
In addition, the capture attached to bug 5061 includes no Ethernet FCS.
So we assume the Ethernet frames carried by EoIB don't include the
Ethernet FCS.
Bug: 9933
Change-Id: I310e5727c42e05498d1f1df08266a48fd6674388
Reviewed-on: https://code.wireshark.org/review/13351
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dissectors/packet-infiniband.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 6384f46722..89e7394c50 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -7456,7 +7456,25 @@ void proto_reg_handoff_infiniband(void) ipv6_handle = find_dissector("ipv6"); data_handle = find_dissector("data"); - eth_handle = find_dissector("eth"); + + /* + * I haven't found an official spec for EoIB, but slide 10 + * of + * + * http://downloads.openfabrics.org/Media/Sonoma2009/Sonoma_2009_Tues_converged-net-bridging.pdf + * + * shows the "Eth Payload" following the "Eth Header" and optional + * "Vlan tag", and doesn't show an FCS; "Payload" generally + * refers to the data transported by the protocol, which wouldn't + * include the FCS. + * + * In addition, the capture attached to bug 5061 includes no + * Ethernet FCS. + * + * So we assume the Ethernet frames carried by EoIB don't include + * the Ethernet FCS. + */ + eth_handle = find_dissector("eth_withoutfcs"); ethertype_dissector_table = find_dissector_table("ethertype"); /* announce an anonymous Infiniband dissector */ |