aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mpls.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-11-08 21:08:52 -0500
committerEvan Huus <eapache@gmail.com>2014-11-09 13:56:37 +0000
commitf7ac077630689d917e61aa7972f708fd45ce267b (patch)
tree530eece6fe465428ab8f9c7cbc25f9db356242ff /epan/dissectors/packet-mpls.c
parent8153cbc56e0206f48c910c79b739e435a38e2b47 (diff)
Create a subdissector table for juniper payload protocols.
Change-Id: I60fd9c6c486b9b3b90e32fb9ccce3973569cc2ee Reviewed-on: https://code.wireshark.org/review/5204 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mpls.c')
-rw-r--r--epan/dissectors/packet-mpls.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index ebc10428b4..51b3190d0c 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -63,6 +63,7 @@
#include "packet-mpls.h"
#include "packet-pw-common.h"
#include "packet-bfd.h"
+#include "packet-juniper.h"
void proto_register_mpls(void);
void proto_reg_handoff_mpls(void);
@@ -833,6 +834,10 @@ proto_reg_handoff_mpls(void)
dissector_add_uint("gre.proto", ETHERTYPE_MPLS, mpls_handle);
dissector_add_uint("gre.proto", ETHERTYPE_MPLS_MULTI, mpls_handle);
dissector_add_uint("ip.proto", IP_PROTO_MPLS_IN_IP, mpls_handle);
+ dissector_add_uint("juniper.proto", JUNIPER_PROTO_MPLS, mpls_handle);
+ dissector_add_uint("juniper.proto", JUNIPER_PROTO_IP_MPLS, mpls_handle);
+ dissector_add_uint("juniper.proto", JUNIPER_PROTO_IP6_MPLS, mpls_handle);
+ dissector_add_uint("juniper.proto", JUNIPER_PROTO_CLNP_MPLS, mpls_handle);
mpls_handle = find_dissector("mplspwcw");
dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, mpls_handle );