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-mp2t.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'epan/dissectors/packet-mp2t.c') diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index b8a5c8ba86..9f423418aa 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -35,6 +35,7 @@ #include #include #include +#include "packet-l2tp.h" #include /* XXX, for tvb_new_proxy() */ @@ -1537,6 +1538,7 @@ proto_reg_handoff_mp2t(void) dissector_add_for_decode_as("udp.port", mp2t_handle); heur_dissector_add("usb.bulk", heur_dissect_mp2t, proto_mp2t); dissector_add_uint("wtap_encap", WTAP_ENCAP_MPEG_2_TS, mp2t_handle); + dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_DOCSIS_DMPT, mp2t_handle); docsis_handle = find_dissector("docsis"); mpeg_pes_handle = find_dissector("mpeg-pes"); -- cgit v1.2.3