pcap_create_interface() needs the interface name on Linux.

[libpcap] / pcap-bt-linux.c

diff --git a/pcap-bt-linux.c b/pcap-bt-linux.c
index 597aa6bbd9389279f3b10c6c437f1c14f320dcde..4452fe44e3796da9ceb02b5918abaa4a1ad344e2 100644 (file)
--- a/pcap-bt-linux.c
+++ b/pcap-bt-linux.c
@@ -11,8 +11,8 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.

- * 3. The name of the author may not be used to endorse or promote 
- * products derived from this software without specific prior written 
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written

  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS


@@ -31,11 +31,7 @@
  * By Paolo Abeni <[email protected]>
  *
  */
  * By Paolo Abeni <[email protected]>
  *
  */

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.c,v 1.15 2008-07-01 07:05:54 guy Exp $ (LBL)";
-#endif
- 
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -70,10 +66,16 @@ static int bt_inject_linux(pcap_t *, const void *, size_t);
 static int bt_setdirection_linux(pcap_t *, pcap_direction_t);
 static int bt_stats_linux(pcap_t *, struct pcap_stat *);
 
 static int bt_setdirection_linux(pcap_t *, pcap_direction_t);
 static int bt_stats_linux(pcap_t *, struct pcap_stat *);
 

-int 
+/*
+ * Private data for capturing on Linux Bluetooth devices.
+ */
+struct pcap_bt {
+       int dev_id;             /* device ID of device we're bound to */
+};
+
+int

 bt_findalldevs(pcap_if_t **alldevsp, char *err_str)
 {
 bt_findalldevs(pcap_if_t **alldevsp, char *err_str)
 {

-       pcap_if_t *found_dev = *alldevsp;

        struct hci_dev_list_req *dev_list;
        struct hci_dev_req *dev_req;
        int i, sock;
        struct hci_dev_list_req *dev_list;
        struct hci_dev_req *dev_req;
        int i, sock;


@@ -82,18 +84,18 @@ bt_findalldevs(pcap_if_t **alldevsp, char *err_str)
        sock  = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
        if (sock < 0)
        {
        sock  = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
        if (sock < 0)
        {

-               /* if bluetooth is not supported this this is not fatal*/ 
+               /* if bluetooth is not supported this this is not fatal*/

                if (errno == EAFNOSUPPORT)
                        return 0;
                if (errno == EAFNOSUPPORT)
                        return 0;

-               snprintf(err_str, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(err_str, PCAP_ERRBUF_SIZE,

                    "Can't open raw Bluetooth socket: %s", strerror(errno));
                return -1;
        }
 
        dev_list = malloc(HCI_MAX_DEV * sizeof(*dev_req) + sizeof(*dev_list));
                    "Can't open raw Bluetooth socket: %s", strerror(errno));
                return -1;
        }
 
        dev_list = malloc(HCI_MAX_DEV * sizeof(*dev_req) + sizeof(*dev_list));

-       if (!dev_list) 
+       if (!dev_list)

        {
        {

-               snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't allocate %zu bytes for Bluetooth device list",
+               pcap_snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't allocate %zu bytes for Bluetooth device list",

                        HCI_MAX_DEV * sizeof(*dev_req) + sizeof(*dev_list));
                ret = -1;
                goto done;
                        HCI_MAX_DEV * sizeof(*dev_req) + sizeof(*dev_list));
                ret = -1;
                goto done;


@@ -101,9 +103,9 @@ bt_findalldevs(pcap_if_t **alldevsp, char *err_str)
 
        dev_list->dev_num = HCI_MAX_DEV;
 
 
        dev_list->dev_num = HCI_MAX_DEV;
 

-       if (ioctl(sock, HCIGETDEVLIST, (void *) dev_list) < 0) 
+       if (ioctl(sock, HCIGETDEVLIST, (void *) dev_list) < 0)

        {
        {

-               snprintf(err_str, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(err_str, PCAP_ERRBUF_SIZE,

                    "Can't get Bluetooth device list via ioctl: %s",
                    strerror(errno));
                ret = -1;
                    "Can't get Bluetooth device list via ioctl: %s",
                    strerror(errno));
                ret = -1;


@@ -113,11 +115,11 @@ bt_findalldevs(pcap_if_t **alldevsp, char *err_str)
        dev_req = dev_list->dev_req;
        for (i = 0; i < dev_list->dev_num; i++, dev_req++) {
                char dev_name[20], dev_descr[30];
        dev_req = dev_list->dev_req;
        for (i = 0; i < dev_list->dev_num; i++, dev_req++) {
                char dev_name[20], dev_descr[30];

-               
-               snprintf(dev_name, 20, BT_IFACE"%d", dev_req->dev_id);
-               snprintf(dev_descr, 30, "Bluetooth adapter number %d", i);
-                       
-               if (pcap_add_if(&found_dev, dev_name, 0, 
+
+               pcap_snprintf(dev_name, 20, BT_IFACE"%d", dev_req->dev_id);
+               pcap_snprintf(dev_descr, 30, "Bluetooth adapter number %d", i);
+
+               if (pcap_add_if(alldevsp, dev_name, 0,

                       dev_descr, err_str) < 0)
                {
                        ret = -1;
                       dev_descr, err_str) < 0)
                {
                        ret = -1;


@@ -169,7 +171,7 @@ bt_create(const char *device, char *ebuf, int *is_ours)
        /* OK, it's probably ours. */
        *is_ours = 1;
 
        /* OK, it's probably ours. */
        *is_ours = 1;
 

-       p = pcap_create_common(device, ebuf);
+       p = pcap_create_common(ebuf, sizeof (struct pcap_bt));

        if (p == NULL)
                return (NULL);
 
        if (p == NULL)
                return (NULL);
 


@@ -180,6 +182,7 @@ bt_create(const char *device, char *ebuf, int *is_ours)
 static int
 bt_activate(pcap_t* handle)
 {
 static int
 bt_activate(pcap_t* handle)
 {

+       struct pcap_bt *handlep = handle->priv;

        struct sockaddr_hci addr;
        int opt;
        int             dev_id;
        struct sockaddr_hci addr;
        int opt;
        int             dev_id;


@@ -187,17 +190,16 @@ bt_activate(pcap_t* handle)
        int err = PCAP_ERROR;
 
        /* get bt interface id */
        int err = PCAP_ERROR;
 
        /* get bt interface id */

-       if (sscanf(handle->opt.source, BT_IFACE"%d", &dev_id) != 1)
+       if (sscanf(handle->opt.device, BT_IFACE"%d", &dev_id) != 1)

        {
        {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-                       "Can't get Bluetooth device index from %s", 
-                        handle->opt.source);
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+                       "Can't get Bluetooth device index from %s",
+                        handle->opt.device);

                return PCAP_ERROR;
        }
 
        /* Initialize some components of the pcap structure. */
                return PCAP_ERROR;
        }
 
        /* Initialize some components of the pcap structure. */

-       handle->bufsize = handle->snapshot+BT_CTRL_SIZE+sizeof(pcap_bluetooth_h4_header);
-       handle->offset = BT_CTRL_SIZE;
+       handle->bufsize = BT_CTRL_SIZE+sizeof(pcap_bluetooth_h4_header)+handle->snapshot;

        handle->linktype = DLT_BLUETOOTH_HCI_H4_WITH_PHDR;
 
        handle->read_op = bt_read_linux;
        handle->linktype = DLT_BLUETOOTH_HCI_H4_WITH_PHDR;
 
        handle->read_op = bt_read_linux;


@@ -208,44 +210,44 @@ bt_activate(pcap_t* handle)
        handle->getnonblock_op = pcap_getnonblock_fd;
        handle->setnonblock_op = pcap_setnonblock_fd;
        handle->stats_op = bt_stats_linux;
        handle->getnonblock_op = pcap_getnonblock_fd;
        handle->setnonblock_op = pcap_setnonblock_fd;
        handle->stats_op = bt_stats_linux;

-       handle->md.ifindex = dev_id;
-       
+       handlep->dev_id = dev_id;
+

        /* Create HCI socket */
        handle->fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
        if (handle->fd < 0) {
        /* Create HCI socket */
        handle->fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
        if (handle->fd < 0) {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,

                    "Can't create raw socket: %s", strerror(errno));
                return PCAP_ERROR;
        }
 
        handle->buffer = malloc(handle->bufsize);
        if (!handle->buffer) {
                    "Can't create raw socket: %s", strerror(errno));
                return PCAP_ERROR;
        }
 
        handle->buffer = malloc(handle->bufsize);
        if (!handle->buffer) {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate dump buffer: %s",
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate dump buffer: %s",

                        pcap_strerror(errno));
                goto close_fail;
        }
 
        opt = 1;
        if (setsockopt(handle->fd, SOL_HCI, HCI_DATA_DIR, &opt, sizeof(opt)) < 0) {
                        pcap_strerror(errno));
                goto close_fail;
        }
 
        opt = 1;
        if (setsockopt(handle->fd, SOL_HCI, HCI_DATA_DIR, &opt, sizeof(opt)) < 0) {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,

                    "Can't enable data direction info: %s", strerror(errno));
                goto close_fail;
        }
 
        opt = 1;
        if (setsockopt(handle->fd, SOL_HCI, HCI_TIME_STAMP, &opt, sizeof(opt)) < 0) {
                    "Can't enable data direction info: %s", strerror(errno));
                goto close_fail;
        }
 
        opt = 1;
        if (setsockopt(handle->fd, SOL_HCI, HCI_TIME_STAMP, &opt, sizeof(opt)) < 0) {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,

                    "Can't enable time stamp: %s", strerror(errno));
                goto close_fail;
        }
 
                    "Can't enable time stamp: %s", strerror(errno));
                goto close_fail;
        }
 

-       /* Setup filter, do not call hci function to avoid dependence on 
+       /* Setup filter, do not call hci function to avoid dependence on

         * external libs        */
        memset(&flt, 0, sizeof(flt));
         * external libs        */
        memset(&flt, 0, sizeof(flt));

-       memset((void *) &flt.type_mask, 0xff, sizeof(flt.type_mask));   
+       memset((void *) &flt.type_mask, 0xff, sizeof(flt.type_mask));

        memset((void *) &flt.event_mask, 0xff, sizeof(flt.event_mask));
        if (setsockopt(handle->fd, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) {
        memset((void *) &flt.event_mask, 0xff, sizeof(flt.event_mask));
        if (setsockopt(handle->fd, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,

                    "Can't set filter: %s", strerror(errno));
                goto close_fail;
        }
                    "Can't set filter: %s", strerror(errno));
                goto close_fail;
        }


@@ -253,11 +255,13 @@ bt_activate(pcap_t* handle)
 
        /* Bind socket to the HCI device */
        addr.hci_family = AF_BLUETOOTH;
 
        /* Bind socket to the HCI device */
        addr.hci_family = AF_BLUETOOTH;

-       addr.hci_dev = handle->md.ifindex;
+       addr.hci_dev = handlep->dev_id;
+#ifdef SOCKADDR_HCI_HAS_HCI_CHANNEL

        addr.hci_channel = HCI_CHANNEL_RAW;
        addr.hci_channel = HCI_CHANNEL_RAW;

+#endif

        if (bind(handle->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
        if (bind(handle->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-                   "Can't attach to device %d: %s", handle->md.ifindex,
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+                   "Can't attach to device %d: %s", handlep->dev_id,

                    strerror(errno));
                goto close_fail;
        }
                    strerror(errno));
                goto close_fail;
        }


@@ -277,7 +281,7 @@ bt_activate(pcap_t* handle)
                if (setsockopt(handle->fd, SOL_SOCKET, SO_RCVBUF,
                    &handle->opt.buffer_size,
                    sizeof(handle->opt.buffer_size)) == -1) {
                if (setsockopt(handle->fd, SOL_SOCKET, SO_RCVBUF,
                    &handle->opt.buffer_size,
                    sizeof(handle->opt.buffer_size)) == -1) {

-                       snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+                       pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,

                                 "SO_RCVBUF: %s", pcap_strerror(errno));
                        goto close_fail;
                }
                                 "SO_RCVBUF: %s", pcap_strerror(errno));
                        goto close_fail;
                }


@@ -300,16 +304,19 @@ bt_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *us
        ssize_t ret;
        struct pcap_pkthdr pkth;
        pcap_bluetooth_h4_header* bthdr;
        ssize_t ret;
        struct pcap_pkthdr pkth;
        pcap_bluetooth_h4_header* bthdr;

+       u_char *pktd;
+       int in = 0;

 
 

-       bthdr = (pcap_bluetooth_h4_header*) &handle->buffer[handle->offset];
-       iv.iov_base = &handle->buffer[handle->offset+sizeof(pcap_bluetooth_h4_header)];
+       pktd = (u_char *)handle->buffer + BT_CTRL_SIZE;
+       bthdr = (pcap_bluetooth_h4_header*)(void *)pktd;
+       iv.iov_base = pktd + sizeof(pcap_bluetooth_h4_header);

        iv.iov_len  = handle->snapshot;
        iv.iov_len  = handle->snapshot;

-       
+

        memset(&msg, 0, sizeof(msg));
        msg.msg_iov = &iv;
        msg.msg_iovlen = 1;
        msg.msg_control = handle->buffer;
        memset(&msg, 0, sizeof(msg));
        msg.msg_iov = &iv;
        msg.msg_iovlen = 1;
        msg.msg_control = handle->buffer;

-       msg.msg_controllen = handle->offset;
+       msg.msg_controllen = BT_CTRL_SIZE;

 
        /* ignore interrupt system call error */
        do {
 
        /* ignore interrupt system call error */
        do {


@@ -322,16 +329,15 @@ bt_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *us
        } while ((ret == -1) && (errno == EINTR));
 
        if (ret < 0) {
        } while ((ret == -1) && (errno == EINTR));
 
        if (ret < 0) {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,

                    "Can't receive packet: %s", strerror(errno));
                return -1;
        }
 
        pkth.caplen = ret;
 
                    "Can't receive packet: %s", strerror(errno));
                return -1;
        }
 
        pkth.caplen = ret;
 

-       /* get direction and timestamp*/ 
+       /* get direction and timestamp*/

        cmsg = CMSG_FIRSTHDR(&msg);
        cmsg = CMSG_FIRSTHDR(&msg);

-       int in=0;

        while (cmsg) {
                switch (cmsg->cmsg_type) {
                        case HCI_CMSG_DIR:
        while (cmsg) {
                switch (cmsg->cmsg_type) {
                        case HCI_CMSG_DIR:


@@ -344,7 +350,7 @@ bt_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *us
                }
                cmsg = CMSG_NXTHDR(&msg, cmsg);
        }
                }
                cmsg = CMSG_NXTHDR(&msg, cmsg);
        }

-       if ((in && (handle->direction == PCAP_D_OUT)) || 
+       if ((in && (handle->direction == PCAP_D_OUT)) ||

                                ((!in) && (handle->direction == PCAP_D_IN)))
                return 0;
 
                                ((!in) && (handle->direction == PCAP_D_IN)))
                return 0;
 


@@ -352,9 +358,8 @@ bt_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *us
        pkth.caplen+=sizeof(pcap_bluetooth_h4_header);
        pkth.len = pkth.caplen;
        if (handle->fcode.bf_insns == NULL ||
        pkth.caplen+=sizeof(pcap_bluetooth_h4_header);
        pkth.len = pkth.caplen;
        if (handle->fcode.bf_insns == NULL ||

-           bpf_filter(handle->fcode.bf_insns, &handle->buffer[handle->offset],
-             pkth.len, pkth.caplen)) {
-               callback(user, &pkth, &handle->buffer[handle->offset]);
+           bpf_filter(handle->fcode.bf_insns, pktd, pkth.len, pkth.caplen)) {
+               callback(user, &pkth, pktd);

                return 1;
        }
        return 0;       /* didn't pass filter */
                return 1;
        }
        return 0;       /* didn't pass filter */


@@ -363,41 +368,42 @@ bt_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *us
 static int
 bt_inject_linux(pcap_t *handle, const void *buf, size_t size)
 {
 static int
 bt_inject_linux(pcap_t *handle, const void *buf, size_t size)
 {

-       snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on "
+       pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on "

                "bluetooth devices");
        return (-1);
                "bluetooth devices");
        return (-1);

-}                           
+}

 
 
 
 

-static int 
+static int

 bt_stats_linux(pcap_t *handle, struct pcap_stat *stats)
 {
 bt_stats_linux(pcap_t *handle, struct pcap_stat *stats)
 {

+       struct pcap_bt *handlep = handle->priv;

        int ret;
        struct hci_dev_info dev_info;
        struct hci_dev_stats * s = &dev_info.stat;
        int ret;
        struct hci_dev_info dev_info;
        struct hci_dev_stats * s = &dev_info.stat;

-       dev_info.dev_id = handle->md.ifindex;
-       
+       dev_info.dev_id = handlep->dev_id;
+

        /* ignore eintr */
        do {
                ret = ioctl(handle->fd, HCIGETDEVINFO, (void *)&dev_info);
        } while ((ret == -1) && (errno == EINTR));
        /* ignore eintr */
        do {
                ret = ioctl(handle->fd, HCIGETDEVINFO, (void *)&dev_info);
        } while ((ret == -1) && (errno == EINTR));

-           
+

        if (ret < 0) {
        if (ret < 0) {

-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,

                    "Can't get stats via ioctl: %s", strerror(errno));
                return (-1);
                    "Can't get stats via ioctl: %s", strerror(errno));
                return (-1);

-               
+

        }
 
        }
 

-       /* we receive both rx and tx frames, so comulate all stats */   
-       stats->ps_recv = s->evt_rx + s->acl_rx + s->sco_rx + s->cmd_tx + 
+       /* we receive both rx and tx frames, so comulate all stats */
+       stats->ps_recv = s->evt_rx + s->acl_rx + s->sco_rx + s->cmd_tx +

                s->acl_tx +s->sco_tx;
        stats->ps_drop = s->err_rx + s->err_tx;
        stats->ps_ifdrop = 0;
        return 0;
 }
 
                s->acl_tx +s->sco_tx;
        stats->ps_drop = s->err_rx + s->err_tx;
        stats->ps_ifdrop = 0;
        return 0;
 }
 

-static int 
+static int

 bt_setdirection_linux(pcap_t *p, pcap_direction_t d)
 {
        p->direction = d;
 bt_setdirection_linux(pcap_t *p, pcap_direction_t d)
 {
        p->direction = d;