diff options
Diffstat (limited to 'pcap/dlt.h')
| -rw-r--r-- | pcap/dlt.h | 63 |
1 files changed, 48 insertions, 15 deletions
diff --git a/pcap/dlt.h b/pcap/dlt.h index 44c36ef8a569..8dacf024044c 100644 --- a/pcap/dlt.h +++ b/pcap/dlt.h @@ -50,7 +50,7 @@ * * See * - * http://www.tcpdump.org/linktypes.html + * https://www.tcpdump.org/linktypes.html * * for detailed descriptions of some of these link-layer header types. */ @@ -246,7 +246,7 @@ */ /* - * This is for Linux cooked sockets. + * Linux cooked sockets. */ #define DLT_LINUX_SLL 113 @@ -769,11 +769,20 @@ #define DLT_RAIF1 198 /* - * IPMB packet for IPMI, beginning with the I2C slave address, followed - * by the netFn and LUN, etc.. Requested by Chanthy Toeung - * <chanthy.toeung@ca.kontron.com>. + * IPMB packet for IPMI, beginning with a 2-byte header, followed by + * the I2C slave address, followed by the netFn and LUN, etc.. + * Requested by Chanthy Toeung <chanthy.toeung@ca.kontron.com>. + * + * XXX - this used to be called DLT_IPMB, back when we got the + * impression from the email thread requesting it that the packet + * had no extra 2-byte header. We've renamed it; if anybody used + * DLT_IPMB and assumed no 2-byte header, this will cause the compile + * to fail, at which point we'll have to figure out what to do about + * the two header types using the same DLT_/LINKTYPE_ value. If that + * doesn't happen, we'll assume nobody used it and that the redefinition + * is safe. */ -#define DLT_IPMB 199 +#define DLT_IPMB_KONTRON 199 /* * Juniper-private data link type, as per request from @@ -805,15 +814,34 @@ #define DLT_LAPD 203 /* - * Variants of various link-layer headers, with a one-byte direction - * pseudo-header prepended - zero means "received by this host", - * non-zero (any non-zero value) means "sent by this host" - as per - * Will Barker <w.barker@zen.co.uk>. + * PPP, with a one-byte direction pseudo-header prepended - zero means + * "received by this host", non-zero (any non-zero value) means "sent by + * this host" - as per Will Barker <w.barker@zen.co.uk>. + */ +#define DLT_PPP_WITH_DIR 204 /* Don't confuse with DLT_PPP_WITH_DIRECTION */ + +/* + * Cisco HDLC, with a one-byte direction pseudo-header prepended - zero + * means "received by this host", non-zero (any non-zero value) means + * "sent by this host" - as per Will Barker <w.barker@zen.co.uk>. + */ +#define DLT_C_HDLC_WITH_DIR 205 + +/* + * Frame Relay, with a one-byte direction pseudo-header prepended - zero + * means "received by this host" (DCE -> DTE), non-zero (any non-zero + * value) means "sent by this host" (DTE -> DCE) - as per Will Barker + * <w.barker@zen.co.uk>. */ -#define DLT_PPP_WITH_DIR 204 /* PPP - don't confuse with DLT_PPP_WITH_DIRECTION */ -#define DLT_C_HDLC_WITH_DIR 205 /* Cisco HDLC */ -#define DLT_FRELAY_WITH_DIR 206 /* Frame Relay */ -#define DLT_LAPB_WITH_DIR 207 /* LAPB */ +#define DLT_FRELAY_WITH_DIR 206 + +/* + * LAPB, with a one-byte direction pseudo-header prepended - zero means + * "received by this host" (DCE -> DTE), non-zero (any non-zero value) + * means "sent by this host" (DTE -> DCE)- as per Will Barker + * <w.barker@zen.co.uk>. + */ +#define DLT_LAPB_WITH_DIR 207 /* * 208 is reserved for an as-yet-unspecified proprietary link-layer @@ -1368,6 +1396,11 @@ #define DLT_DISPLAYPORT_AUX 275 /* + * Linux cooked sockets v2. + */ +#define DLT_LINUX_SLL2 276 + +/* * In case the code that includes this file (directly or indirectly) * has also included OS files that happen to define DLT_MATCHING_MAX, * with a different value (perhaps because that OS hasn't picked up @@ -1377,7 +1410,7 @@ #ifdef DLT_MATCHING_MAX #undef DLT_MATCHING_MAX #endif -#define DLT_MATCHING_MAX 275 /* highest value in the "matching" range */ +#define DLT_MATCHING_MAX 276 /* highest value in the "matching" range */ /* * DLT and savefile link type values are split into a class and |