aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-fr.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-fr.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-fr.c')
-rw-r--r--epan/dissectors/packet-fr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 6ca9e58dbc..c30de44990 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -48,6 +48,7 @@
#include "packet-ipv6.h"
#include "packet-ppp.h"
#include "packet-fr.h"
+#include "packet-juniper.h"
#include <epan/xdlc.h>
#include <epan/etypes.h>
#include <epan/oui.h>
@@ -1008,6 +1009,7 @@ proto_reg_handoff_fr(void)
fr_handle = find_dissector("fr");
dissector_add_uint("gre.proto", ETHERTYPE_RAW_FR, fr_handle);
dissector_add_uint("wtap_encap", WTAP_ENCAP_FRELAY, fr_handle);
+ dissector_add_uint("juniper.proto", JUNIPER_PROTO_FRELAY, 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);