From: Guy Harris <guy@alum.mit.edu>
Date: Fri, 17 May 2019 21:02:26 +0000 (-0700)
Subject: Add DLT_ELEE and LINKTYPE_ELEE.
X-Git-Tag: libpcap-1.10-bp~486
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/90543970fd5fbed261d3637f5ec4811d7dde4e49

Add DLT_ELEE and LINKTYPE_ELEE.
---

diff --git a/pcap-common.c b/pcap-common.c
index 2ea15209..b6095e00 100644
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -558,7 +558,6 @@
  */
 #define LINKTYPE_LAPD		203
 
-
 /*
  * PPP, with a one-byte direction pseudo-header prepended - zero means
  * "received by this host", non-zero (any non-zero value) means "sent by
@@ -1170,7 +1169,14 @@
 #define LINKTYPE_DSA_TAG_DSA	284
 #define LINKTYPE_DSA_TAG_EDSA	285
 
-#define LINKTYPE_MATCHING_MAX	285		/* highest value in the "matching" range */
+/*
+ * Payload of lawful intercept packets using the ELEE protocol;
+ * http://socket.hr/draft-dfranusic-opsawg-elee-00.xml
+ * http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc.cgi?url=http://socket.hr/draft-dfranusic-opsawg-elee-00.xml&modeAsFormat=html/ascii
+ */
+#define LINKTYPE_ELEE		286
+
+#define LINKTYPE_MATCHING_MAX	286		/* highest value in the "matching" range */
 
 /*
  * The DLT_ and LINKTYPE_ values in the "matching" range should be the
diff --git a/pcap.c b/pcap.c
index a9ca2aaf..d9917a21 100644
--- a/pcap.c
+++ b/pcap.c
@@ -3132,6 +3132,7 @@ static struct dlt_choice dlt_choices[] = {
 	DLT_CHOICE(DSA_TAG_BRCM_PREPEND, "Broadcom tag (prepended)"),
 	DLT_CHOICE(DSA_TAG_DSA, "Marvell DSA"),
 	DLT_CHOICE(DSA_TAG_EDSA, "Marvell EDSA"),
+	DLT_CHOICE(ELEE, "ELEE lawful intercept packets"),
 	DLT_CHOICE_SENTINEL
 };
 
diff --git a/pcap/dlt.h b/pcap/dlt.h
index 2e323eed..3783b79b 100644
--- a/pcap/dlt.h
+++ b/pcap/dlt.h
@@ -1455,6 +1455,13 @@
 #define DLT_DSA_TAG_DSA		284
 #define DLT_DSA_TAG_EDSA	285
 
+/*
+ * Payload of lawful intercept packets using the ELEE protocol;
+ * http://socket.hr/draft-dfranusic-opsawg-elee-00.xml
+ * http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc.cgi?url=http://socket.hr/draft-dfranusic-opsawg-elee-00.xml&modeAsFormat=html/ascii
+ */
+#define DLT_ELEE		286
+
 /*
  * In case the code that includes this file (directly or indirectly)
  * has also included OS files that happen to define DLT_MATCHING_MAX,
@@ -1465,7 +1472,7 @@
 #ifdef DLT_MATCHING_MAX
 #undef DLT_MATCHING_MAX
 #endif
-#define DLT_MATCHING_MAX	285	/* highest value in the "matching" range */
+#define DLT_MATCHING_MAX	286	/* highest value in the "matching" range */
 
 /*
  * DLT and savefile link type values are split into a class and