Merge pull request #55 from micolous/remove-user0

Use `DLT_BLUETOOTH_LE_LL` for PPI rather than `DLT_USER0`.
greatscottgadgets · Dec 12, 2020 · 41dc705 · 41dc705
2 parents 48fe012 + 75e6dc7
commit 41dc705
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/src/pcap-common.h b/lib/src/pcap-common.h
@@ -25,7 +25,6 @@
 // since we no longer rely on or assume the existence of libpcap,
 // hardcode these DLTs
 #define DLT_PPI 192
-#define DLT_USER0 147
 
 #if defined( __APPLE__ )
 #include <CoreServices/CoreServices.h>
@@ -99,6 +98,10 @@ typedef struct __attribute__((packed)) _pcap_bluetooth_bredr_bb_header {
 
 /* --------------------------------- Low Energy ---------------------------- */
 
+#if !defined( DLT_BLUETOOTH_LE_LL )
+#define DLT_BLUETOOTH_LE_LL 251
+#endif
+
 #if !defined( DLT_BLUETOOTH_LE_LL_WITH_PHDR )
 #define DLT_BLUETOOTH_LE_LL_WITH_PHDR 256
 #endif

diff --git a/lib/src/pcap.c b/lib/src/pcap.c
@@ -396,7 +396,7 @@ lell_pcap_append_ppi_packet(lell_pcap_handle * h, const uint64_t ns,
 		pcap_pkt.ppi_packet_header.pph_version = 0;
 		pcap_pkt.ppi_packet_header.pph_flags = 0;
 		pcap_pkt.ppi_packet_header.pph_len = htole16(pcap_headerlen);
-		pcap_pkt.ppi_packet_header.pph_dlt = htole32(DLT_USER0);
+		pcap_pkt.ppi_packet_header.pph_dlt = htole32(DLT_BLUETOOTH_LE_LL);
 
 		pcap_pkt.ppi_fieldheader.pfh_type = htole16(PPI_BTLE);
 		pcap_pkt.ppi_fieldheader.pfh_datalen = htole16(sizeof(ppi_btle_t));