aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ppp.c
diff options
context:
space:
mode:
authorrbalint <rbalint@f5534014-38df-0310-8fa8-9805f1628bb7>2010-09-12 01:13:42 +0000
committerrbalint <rbalint@f5534014-38df-0310-8fa8-9805f1628bb7>2010-09-12 01:13:42 +0000
commiteac412473d98f446febe71f1b89c7cdd50409d10 (patch)
treeb1df9b5bf0c0e110dae312676a517a79798e6e91 /epan/dissectors/packet-ppp.c
parentefcb2b50d4f55890310daadbb688a74768bdaef9 (diff)
Decode SLL payloads using a dissector table based on sll.ltype.
The idea and the original patch came from Sebastian Reichel <elektranox@gmail.com> in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594390 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34101 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ppp.c')
-rw-r--r--epan/dissectors/packet-ppp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 448814198c..4c09a283b2 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -47,6 +47,7 @@
#include <epan/crc32.h>
#include <epan/ipproto.h>
#include "packet-usb.h"
+#include "packet-sll.h"
#define ppp_min(a, b) (((a)<(b)) ? (a) : (b))
@@ -4757,6 +4758,7 @@ proto_reg_handoff_ppp(void)
ppp_hdlc_handle = find_dissector("ppp_hdlc");
dissector_add("wtap_encap", WTAP_ENCAP_PPP, ppp_hdlc_handle);
dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, ppp_hdlc_handle);
+ dissector_add("sll.ltype", LINUX_SLL_P_PPPHDLC, ppp_hdlc_handle);
dissector_add("osinl.excl", NLPID_PPP, ppp_handle);
dissector_add("gre.proto", ETHERTYPE_PPP, ppp_hdlc_handle);
}