From 74e526f1965d8bfd573105e06986e41e97c1d781 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 2 Apr 2015 23:11:51 -0400 Subject: Add proper "Decode As" mechanism for L2TPv3 subdissectors instead of preference. Change-Id: I87f6f9f40e1c33148de43b53a8881d51416f5d2c Reviewed-on: https://code.wireshark.org/review/7898 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman --- epan/dissectors/packet-eth.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'epan/dissectors/packet-eth.c') diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 8fbe22caa0..36d7eb5558 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -39,6 +39,7 @@ #include "packet-sll.h" #include "packet-juniper.h" #include "packet-sflow.h" +#include "packet-l2tp.h" #include #include @@ -1039,6 +1040,7 @@ proto_reg_handoff_eth(void) dissector_add_uint("gre.proto", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); dissector_add_uint("juniper.proto", JUNIPER_PROTO_ETHER, eth_withoutfcs_handle); dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_ETHERNET, eth_withoutfcs_handle); + dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_ETH, eth_withoutfcs_handle); dissector_add_uint("sll.ltype", LINUX_SLL_P_ETHERNET, eth_withoutfcs_handle); -- cgit v1.2.3