aboutsummaryrefslogtreecommitdiffstats
path: root/savefile.c
diff options
context:
space:
mode:
authorguy <guy>2008-09-22 20:14:19 +0000
committerguy <guy>2008-09-22 20:14:19 +0000
commitf4af9ed692a301b28b1fb4ee7db745a9470dd423 (patch)
tree704703420ba5bb13ea4e3a5671c8ac3b0db6ab4a /savefile.c
parentff2ebcf09a7eda892e261f5899b88225a2b80a11 (diff)
Link-layer type for 802.15.4 with PHY-level preamble, SFD, and frame
length, as requested by Max Filippov <jcmvbkbc@gmail.com>.
Diffstat (limited to 'savefile.c')
-rw-r--r--savefile.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/savefile.c b/savefile.c
index 2cd9c34..db9ed54 100644
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.176 2008-05-30 01:35:33 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.177 2008-09-22 20:14:19 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -636,6 +636,17 @@ static const char rcsid[] _U_ =
*/
#define LINKTYPE_X2E_XORAYA 214
+/*
+ * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
+ * nothing), but with the PHY-level data for non-ASK PHYs (4 octets
+ * of 0 as preamble, one octet of SFD, one octet of frame length+
+ * reserved bit, and then the MAC-layer data, starting with the
+ * frame control field).
+ *
+ * Requested by Max Filippov <jcmvbkbc@gmail.com>.
+ */
+#define LINKTYPE_IEEE802_15_4_NONASK_PHY 215
+
static struct linktype_map {
int dlt;
@@ -938,6 +949,9 @@ static struct linktype_map {
/* X2E-private for Xoraya data logger family */
{ DLT_X2E_XORAYA, LINKTYPE_X2E_XORAYA },
+ /* IEEE 802.15.4 with PHY data for non-ASK PHYs */
+ { DLT_IEEE802_15_4_NONASK_PHY, LINKTYPE_IEEE802_15_4_NONASK_PHY },
+
{ -1, -1 }
};