diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2013-02-13 07:16:14 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2013-02-13 07:16:14 +0000 |
| commit | d2dcf56c94a9c8ff600ff4faca541dc6249fd6d7 (patch) | |
| tree | ac637b4a2a3e61ae28f54b4b0870f89b40a41558 /epan/dissectors | |
| parent | 222a190373a0e94c800c6dd45b595b7930b0cce4 (diff) | |
From Sascha Herrmann:
Patch registering ieee802154 dissector to Linux SLL frames.
svn path=/trunk/; revision=47649
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-sll.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-sll.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 3c0f8e881f..b999b00f06 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -83,6 +83,7 @@ #include "packet-ieee802154.h" #include "packet-frame.h" /* For Exception Handling */ +#include "packet-sll.h" /* Dissection Options for dissect_ieee802154_common */ #define DISSECT_IEEE802154_OPTION_CC24xx 0x00000001 /* FCS field contains a TI CC24xx style FCS. */ @@ -2798,6 +2799,7 @@ void proto_reg_handoff_ieee802154(void) dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4, ieee802154_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NONASK_PHY, ieee802154_nonask_phy_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NOFCS, ieee802154_nofcs_handle); + dissector_add_uint("sll.ltype", LINUX_SLL_P_IEEE802154, ieee802154_handle); prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 741c6faf24..ed2436015d 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -82,6 +82,7 @@ static const value_string ltype_vals[] = { { LINUX_SLL_P_PPPHDLC, "PPP (HDLC)" }, { LINUX_SLL_P_CAN, "CAN" }, { LINUX_SLL_P_IRDA_LAP, "IrDA LAP" }, + { LINUX_SLL_P_IEEE802154, "IEEE 802.15.4" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-sll.h b/epan/dissectors/packet-sll.h index b0944de8e8..3951431d5e 100644 --- a/epan/dissectors/packet-sll.h +++ b/epan/dissectors/packet-sll.h @@ -33,6 +33,7 @@ #define LINUX_SLL_P_PPPHDLC 0x0007 /* PPP HDLC frames */ #define LINUX_SLL_P_CAN 0x000C /* Controller Area Network */ #define LINUX_SLL_P_IRDA_LAP 0x0017 /* IrDA Link Access Protocol */ +#define LINUX_SLL_P_IEEE802154 0x00f6 /* 802.15.4 on monitor inteface */ void capture_sll(const guchar *, int, packet_counts *); |