summaryrefslogtreecommitdiff
path: root/pcap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-03-22 19:33:49 -0700
committerGuy Harris <guy@alum.mit.edu>2019-03-22 19:34:03 -0700
commit08dc0344b20dfd44958168d75c3a94ca960eb029 (patch)
tree6d275d7632b485456d927efe98f54165439671ed /pcap
parent00612a3603b1a3726dd5be96f94966f6d35b4b04 (diff)
downloadlibpcap-08dc0344b20dfd44958168d75c3a94ca960eb029.tar.gz
Rename DLT_IPMB to DLT_IPMB_KONTRON.
Apparently the Kontron person who said that the packets begin with the I2C slave address didn't understand the question, because the Kontron code adds a 2-byte pseudo-header before the I2C slave address. Rename the DLT_ and LINKTYPE_ values to reflect this, and update the comments. Add support for the Linux/Pigeon Point pseudo-header in some places where it was missing.
Diffstat (limited to 'pcap')
-rw-r--r--pcap/dlt.h19
1 files changed, 14 insertions, 5 deletions
diff --git a/pcap/dlt.h b/pcap/dlt.h
index 4c8b1178..de8089b2 100644
--- a/pcap/dlt.h
+++ b/pcap/dlt.h
@@ -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>.
- */
-#define DLT_IPMB 199
+ * 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_KONTRON 199
/*
* Juniper-private data link type, as per request from