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-fr.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-fr.c')
| -rw-r--r-- | epan/dissectors/packet-fr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 084564a406..234d59dd7f 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -48,6 +48,7 @@ #include "packet-fr.h" #include "packet-juniper.h" #include "packet-sflow.h" +#include "packet-l2tp.h" #include <epan/xdlc.h> #include <epan/etypes.h> #include <epan/oui.h> @@ -1010,6 +1011,7 @@ proto_reg_handoff_fr(void) dissector_add_uint("juniper.proto", JUNIPER_PROTO_FRELAY, fr_handle); dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_FRAME_RELAY, fr_handle); dissector_add_uint("atm.aal5.type", TRAF_FR, fr_handle); + dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_FR, fr_handle); fr_phdr_handle = create_dissector_handle(dissect_fr_phdr, proto_fr); dissector_add_uint("wtap_encap", WTAP_ENCAP_FRELAY_WITH_PHDR, fr_phdr_handle); |