Add link-layer type for ISO 14443 contactless smart card messages.

Fix up the LINKTYPE_ list while we're at it; no entry was added for
Wattstopper.

diff --git a/pcap-common.c b/pcap-common.c
index b4a25028aa8f61e0f8038633fe736b2adf3fe2a0..6e4f0e217e4dde10d48bdff0359ea8503c2f8e4a 100644 (file)
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -959,7 +959,6 @@
  */
 #define LINKTYPE_PROFIBUS_DL           257
 
-
 /*
  * Apple's DLT_PKTAP headers.
  *
@@ -1000,7 +999,18 @@
 #define LINKTYPE_ZWAVE_R1_R2   261
 #define LINKTYPE_ZWAVE_R3      262
 
-#define LINKTYPE_MATCHING_MAX  262             /* highest value in the "matching" range */
+/*
+ * per Steve Karg <[email protected]>, formats for Wattstopper
+ * Digital Lighting Management room bus serial protocol captures.
+ */
+#define LINKTYPE_WATTSTOPPER_DLM 263
+
+/*
+ * ISO 14443 contactless smart card messages.
+ */
+#define LINKTYPE_ISO_14443      264
+
+#define LINKTYPE_MATCHING_MAX  264             /* highest value in the "matching" range */
 
 static struct linktype_map {
        int     dlt;

diff --git a/pcap/dlt.h b/pcap/dlt.h
index 35b09d59f0bb696f1d92c103fb56130f528aef09..140185b80399624f3359d2f7a9377cf102a32d4d 100644 (file)
--- a/pcap/dlt.h
+++ b/pcap/dlt.h
@@ -1257,7 +1257,12 @@
  */
 #define DLT_WATTSTOPPER_DLM     263
 
-#define DLT_MATCHING_MAX       263     /* highest value in the "matching" range */
+/*
+ * ISO 14443 contactless smart card messages.
+ */
+#define DLT_ISO_14443           264
+
+#define DLT_MATCHING_MAX       264     /* highest value in the "matching" range */
 
 /*
  * DLT and savefile link type values are split into a class and