summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-mpls.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-12-01 13:47:11 +0000
committerMichael Mann <mmann78@netscape.net>2013-12-01 13:47:11 +0000
commit7ee8d486703fcf8820291e4df92762ea84c7bc99 (patch)
treeba71f79c56e77ce6995ec876a7220f92575188fe /epan/dissectors/packet-mpls.c
parentc0f974f9d14dde45c34f0e0c4db7ff702bd1036d (diff)
downloadwireshark-7ee8d486703fcf8820291e4df92762ea84c7bc99.tar.gz
Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492)
From Peter Paluch svn path=/trunk/; revision=53694
Diffstat (limited to 'epan/dissectors/packet-mpls.c')
-rw-r--r--epan/dissectors/packet-mpls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index c32c51681f..33049d097d 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -825,6 +825,8 @@ proto_reg_handoff_mpls(void)
mpls_handle = find_dissector("mpls");
dissector_add_uint("ethertype", ETHERTYPE_MPLS, mpls_handle);
dissector_add_uint("ethertype", ETHERTYPE_MPLS_MULTI, mpls_handle);
+ dissector_add_uint("ppp.protocol", PPP_MPLS_UNI, mpls_handle);
+ dissector_add_uint("ppp.protocol", PPP_MPLS_MULTI, mpls_handle);
dissector_add_uint("chdlc.protocol", ETHERTYPE_MPLS, mpls_handle);
dissector_add_uint("chdlc.protocol", ETHERTYPE_MPLS_MULTI, mpls_handle);
dissector_add_uint("gre.proto", ETHERTYPE_MPLS, mpls_handle);