diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-04-02 23:11:51 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-25 16:42:28 +0000 |
| commit | 74e526f1965d8bfd573105e06986e41e97c1d781 (patch) | |
| tree | 8e77b744f290ee1eabb56ce7fed1e8e826c22b31 /epan/dissectors/packet-lapd.c | |
| parent | acc581081e84c93e878a678fbb3655aba253607a (diff) | |
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 <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-lapd.c')
| -rw-r--r-- | epan/dissectors/packet-lapd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index cb46863746..c8d165db36 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -45,6 +45,8 @@ #include <wiretap/wtap.h> #include <epan/lapd_sapi.h> #include <epan/expert.h> +#include "packet-l2tp.h" + void proto_register_lapd(void); static int proto_lapd = -1; @@ -740,6 +742,7 @@ proto_reg_handoff_lapd(void) lapd_handle = find_dissector("lapd"); dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_LAPD, lapd_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_LAPD, lapd_handle); + dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_LAPD, lapd_handle); register_dissector("lapd-bitstream", dissect_lapd_bitstream, proto_lapd); lapd_bitstream_handle = find_dissector("lapd-bitstream"); |