aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcap-common.c8
-rw-r--r--pcap.c2
-rw-r--r--pcap/dlt.h7
3 files changed, 15 insertions, 2 deletions
diff --git a/pcap-common.c b/pcap-common.c
index e156aa7d..6c23bbbb 100644
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -1063,7 +1063,13 @@
*/
#define LINKTYPE_DOCSIS31_XRA31 273
-#define LINKTYPE_MATCHING_MAX 273 /* highest value in the "matching" range */
+/*
+ * mPackets, as specified by IEEE 802.3br Figure 99-4, starting
+ * with the preamble and always ending with a CRC field.
+ */
+#define LINKTYPE_ETHERNET_MPACKET 274
+
+#define LINKTYPE_MATCHING_MAX 274 /* highest value in the "matching" range */
static struct linktype_map {
int dlt;
diff --git a/pcap.c b/pcap.c
index a068c81c..663729bd 100644
--- a/pcap.c
+++ b/pcap.c
@@ -2909,6 +2909,8 @@ static struct dlt_choice dlt_choices[] = {
DLT_CHOICE(TI_LLN_SNIFFER, "TI LLN sniffer frames"),
DLT_CHOICE(VSOCK, "Linux vsock"),
DLT_CHOICE(NORDIC_BLE, "Nordic Semiconductor Bluetooth LE sniffer frames"),
+ DLT_CHOICE(DOCSIS31_XRA31, "Excentis XRA-31 DOCSIS 3.1 RF sniffer frames"),
+ DLT_CHOICE(ETHERNET_MPACKET, "802.3br mPackets"),
DLT_CHOICE_SENTINEL
};
diff --git a/pcap/dlt.h b/pcap/dlt.h
index 55aaffa0..609bcaf9 100644
--- a/pcap/dlt.h
+++ b/pcap/dlt.h
@@ -1349,6 +1349,11 @@
*/
#define DLT_DOCSIS31_XRA31 273
+/*
+ * mPackets, as specified by IEEE 802.3br Figure 99-4, starting
+ * with the preamble and always ending with a CRC field.
+ */
+#define DLT_ETHERNET_MPACKET 274
/*
* In case the code that includes this file (directly or indirectly)
@@ -1360,7 +1365,7 @@
#ifdef DLT_MATCHING_MAX
#undef DLT_MATCHING_MAX
#endif
-#define DLT_MATCHING_MAX 273 /* highest value in the "matching" range */
+#define DLT_MATCHING_MAX 274 /* highest value in the "matching" range */
/*
* DLT and savefile link type values are split into a class and