osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use the "no FCS" version of the Ethernet dissector. 

RFC 7348 Figures 1 and 2, in the Payload section, says

	"(Note that the original Ethernet Frame's FCS is not included)"

meaning that the inner Ethernet frame does *not* include an FCS.

Also, update the protocol references (the I-D is now RFC 7348) and add
the I-D for the group policy stuff.

Remove some extra blank lines while we're at it.

Change-Id: Ib94a43b95b0761e97d1406a1cca3687ee640e12d
Ping-Bug: 9933
Reviewed-on: https://code.wireshark.org/review/13343
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-01-16 18:41:07 -08:00
parent 25699b6758
commit 4b663db5aa
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-vxlan.c
View File

@ -1,6 +1,7 @@
/* packet-vxlan.c
*
* Routines for Virtual eXtensible Local Area Network (VXLAN) packet dissection
* RFC 7348 plus draft-smith-vxlan-group-policy-01
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -19,12 +20,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Protocol ref:
* http://tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-08
*/
#include "config.h"
#include <epan/packet.h>
@ -102,7 +99,6 @@ dissect_vxlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
proto_tree_add_item(vxlan_tree, hf_vxlan_vni, tvb, offset, 3, ENC_BIG_ENDIAN);
offset+=3;
proto_tree_add_item(vxlan_tree, hf_vxlan_reserved_8, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
@ -196,7 +192,15 @@ proto_reg_handoff_vxlan(void)
{
dissector_handle_t vxlan_handle;
eth_handle = find_dissector("eth");
/*
* RFC 7348 Figures 1 and 2, in the Payload section, say
*
* "(Note that the original Ethernet Frame's FCS is not included)"
*
* meaning that the inner Ethernet frame does *not* include an
* FCS.
*/
eth_handle = find_dissector("eth_withoutfcs");
vxlan_handle = create_dissector_handle(dissect_vxlan, proto_vxlan);
dissector_add_uint("udp.port", UDP_PORT_VXLAN, vxlan_handle);