Add new Bluetooth link-layer header types.

2 files changed, 24 insertions, 2 deletions

diff --git a/pcap-common.c b/pcap-common.c
index aaa22c75..2b415dbc 100644
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -943,7 +943,18 @@
  */
 #define LINKTYPE_BLUETOOTH_LINUX_MONITOR	254
 
-#define LINKTYPE_MATCHING_MAX	254		/* highest value in the "matching" range */
+/*
+ * Bluetooth Basic Rate/Enhanced Data Rate baseband packets, as
+ * captured by Ubertooth.
+ */
+#define LINKTYPE_BLUETOOTH_BREDR_BB	255
+
+/*
+ * Bluetooth Low Energy link layer packets, as captured by Ubertooth.
+ */
+#define LINKTYPE_BLUETOOTH_LE_LL_WITH_PHDR	256
+
+#define LINKTYPE_MATCHING_MAX	256		/* highest value in the "matching" range */
 
 static struct linktype_map {
 	int	dlt;
diff --git a/pcap/bpf.h b/pcap/bpf.h
index e2efecad..d63057ac 100644
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -1232,7 +1232,18 @@ struct bpf_program {
  */
 #define DLT_BLUETOOTH_LINUX_MONITOR	254
 
-#define DLT_MATCHING_MAX	254	/* highest value in the "matching" range */
+/*
+ * Bluetooth Basic Rate/Enhanced Data Rate baseband packets, as
+ * captured by Ubertooth.
+ */
+#define DLT_BLUETOOTH_BREDR_BB	255
+
+/*
+ * Bluetooth Low Energy link layer packets, as captured by Ubertooth.
+ */
+#define DLT_BLUETOOTH_LE_LL_WITH_PHDR	256
+
+#define DLT_MATCHING_MAX	256	/* highest value in the "matching" range */
 
 /*
  * DLT and savefile link type values are split into a class and