Attachment 1007117 Details for Bug 1178297 – Minimal fix needed to build libpcap 1.6.2 against BlueZ 5

[patch] Minimal fix needed to build libpcap 1.6.2 against BlueZ 5

0001-Fix-building-Bluetooth-Linux-Monitor-support-with-Bl.patch (text/plain), 2.42 KB, created by Jakub Sitnicki on 2015-03-27 07:47:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Sitnicki

Created: 2015-03-27 07:47:49 UTC

Size: 2.42 KB

patch

obsolete

>From 4815c48924621ca13081917001ce65228df298b0 Mon Sep 17 00:00:00 2001
>From: Jakub Sitnicki <jsitnicki@gmail.com>
>Date: Thu, 26 Mar 2015 22:35:29 +0100
>Subject: [PATCH] Fix building Bluetooth Linux Monitor support with BlueZ 5.1+
>
>Starting from version 5.1 BlueZ no longer exports the mgmt.h header
>or any other header that declares the structure of packets passed
>over HCI sockets set to use the HCI monitor channel.
>
>Declare the structure locally and give it the same name as in the
>Linux kernel 3.4+.
>---
> pcap-bt-monitor-linux.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
>diff --git a/pcap-bt-monitor-linux.c b/pcap-bt-monitor-linux.c
>index 76c9ee3..70d530a 100644
>--- a/pcap-bt-monitor-linux.c
>+++ b/pcap-bt-monitor-linux.c
>@@ -34,12 +34,12 @@
> #endif
> 
> #include <errno.h>
>+#include <stdint.h>
> #include <stdlib.h>
> #include <string.h>
> 
> #include <bluetooth/bluetooth.h>
> #include <bluetooth/hci.h>
>-#include <bluetooth/mgmt.h>
> 
> #include "pcap/bluetooth.h"
> #include "pcap-int.h"
>@@ -47,6 +47,16 @@
> #define BT_CONTROL_SIZE 32
> #define INTERFACE_NAME "bluetooth-monitor"
> 
>+/*
>+ * Fields and alignment must match the declaration in the Linux kernel 3.4+.
>+ * See struct hci_mon_hdr in include/net/bluetooth/hci_mon.h.
>+ */
>+struct hci_mon_hdr {
>+    uint16_t opcode;
>+    uint16_t index;
>+    uint16_t len;
>+} __attribute__((packed));
>+
> int
> bt_monitor_findalldevs(pcap_if_t **alldevsp, char *err_str)
> {
>@@ -70,13 +80,13 @@ bt_monitor_read(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_ch
>     ssize_t ret;
>     struct pcap_pkthdr pkth;
>     pcap_bluetooth_linux_monitor_header *bthdr;
>-    struct mgmt_hdr hdr;
>+    struct hci_mon_hdr hdr;
>     int in = 0;
> 
>     bthdr = (pcap_bluetooth_linux_monitor_header*) &handle->buffer[handle->offset];
> 
>     iv[0].iov_base = &hdr;
>-    iv[0].iov_len = MGMT_HDR_SIZE;
>+    iv[0].iov_len = sizeof(hdr);
>     iv[1].iov_base = &handle->buffer[handle->offset + sizeof(pcap_bluetooth_linux_monitor_header)];
>     iv[1].iov_len = handle->snapshot;
> 
>@@ -102,7 +112,7 @@ bt_monitor_read(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_ch
>         return -1;
>     }
> 
>-    pkth.caplen = ret - MGMT_HDR_SIZE + sizeof(pcap_bluetooth_linux_monitor_header);
>+    pkth.caplen = ret - sizeof(hdr) + sizeof(pcap_bluetooth_linux_monitor_header);
>     pkth.len = pkth.caplen;
> 
>     for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1178297: 1007117