btmon: Fix decoding truncated data

Some platforms use different filtering and for this purpose,
some of the ACL/SCO/ISO/SDP data is truncated.

In such a case, included length is smaller than the original size.
Without this fix, btmon stops working after first truncated packet.

diff --git a/src/shared/btsnoop.c b/src/shared/btsnoop.c
index 086c17a..daeab0b 100755 (executable)
--- a/src/shared/btsnoop.c
+++ b/src/shared/btsnoop.c
@@ -705,7 +705,7 @@ bool btsnoop_read_hci(struct btsnoop *btsnoop, struct timeval *tv,
                return false;
        }
 
-       toread = be32toh(pkt.size);
+       toread = be32toh(pkt.len);
        if (toread > BTSNOOP_MAX_PACKET_SIZE) {
                btsnoop->aborted = true;
                return false;

diff --git a/tools/btsnoop.c b/tools/btsnoop.c
index 3fa54ba..707f24d 100644 (file)
--- a/tools/btsnoop.c
+++ b/tools/btsnoop.c
@@ -398,7 +398,7 @@ next_packet:
        if (len < 0 || len != BTSNOOP_PKT_SIZE)
                goto close_input;
 
-       toread = be32toh(pkt.size);
+       toread = be32toh(pkt.len);
        flags = be32toh(pkt.flags);
 
        opcode = flags & 0x00ff;
@@ -471,7 +471,7 @@ next_packet:
        if (len < 0 || len != BTSNOOP_PKT_SIZE)
                goto close_input;
 
-       toread = be32toh(pkt.size);
+       toread = be32toh(pkt.len);
        flags = be32toh(pkt.flags);
 
        opcode = flags & 0x00ff;
@@ -548,7 +548,7 @@ next_packet:
        if (len < 0 || len != BTSNOOP_PKT_SIZE)
                goto close_input;
 
-       toread = be32toh(pkt.size);
+       toread = be32toh(pkt.len);
 
        len = read(fd, buf, toread);
        if (len < 0 || len != (ssize_t) toread) {