korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-28 22:54:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools: Use btsnoop constants in conversion utility

Browse Source
This commit is contained in:
Marcel Holtmann 2013-08-23 09:52:49 -07:00
parent 3a5c84b3d0
commit d815cc4adf
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.tools
View File

@ -194,6 +194,8 @@ tools_btmgmt_SOURCES = tools/btmgmt.c src/glib-helper.c src/eir.c \
src/shared/mgmt.h src/shared/mgmt.c
tools_btmgmt_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
tools_btsnoop_SOURCES = tools/btsnoop.c monitor/btsnoop.h monitor/btsnoop.c
tools_btiotest_SOURCES = tools/btiotest.c btio/btio.h btio/btio.c
tools_btiotest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@

39
tools/btsnoop.c
View File

@ -38,14 +38,7 @@
#include <arpa/inet.h>
#include <sys/stat.h>
#define MONITOR_NEW_INDEX 0
#define MONITOR_DEL_INDEX 1
#define MONITOR_COMMAND_PKT 2
#define MONITOR_EVENT_PKT 3
#define MONITOR_ACL_TX_PKT 4
#define MONITOR_ACL_RX_PKT 5
#define MONITOR_SCO_TX_PKT 6
#define MONITOR_SCO_RX_PKT 7
#include "monitor/btsnoop.h"
static inline uint64_t ntoh64(uint64_t n)
{
@ -82,7 +75,7 @@ static const uint8_t btsnoop_id[] = { 0x62, 0x74, 0x73, 0x6e,
static const uint32_t btsnoop_version = 1;
static int btsnoop_create(const char *path)
static int create_btsnoop(const char *path)
{
struct btsnoop_hdr hdr;
ssize_t written;
@ -109,7 +102,7 @@ static int btsnoop_create(const char *path)
return fd;
}
static int btsnoop_open(const char *path, uint32_t *type)
static int open_btsnoop(const char *path, uint32_t *type)
{
struct btsnoop_hdr hdr;
ssize_t len;
@ -167,7 +160,7 @@ static void command_merge(const char *output, int argc, char *argv[])
uint32_t type;
int fd;
fd = btsnoop_open(argv[i], &type);
fd = open_btsnoop(argv[i], &type);
if (fd < 0)
break;
@ -186,7 +179,7 @@ static void command_merge(const char *output, int argc, char *argv[])
goto close_input;
}
output_fd = btsnoop_create(output);
output_fd = create_btsnoop(output);
if (output_fd < 0)
goto close_input;
@ -236,22 +229,22 @@ next_packet:
switch (buf[0]) {
case 0x01:
opcode = MONITOR_COMMAND_PKT;
opcode = BTSNOOP_OPCODE_COMMAND_PKT;
break;
case 0x02:
if (flags & 0x01)
opcode = MONITOR_ACL_RX_PKT;
opcode = BTSNOOP_OPCODE_ACL_RX_PKT;
else
opcode = MONITOR_ACL_TX_PKT;
opcode = BTSNOOP_OPCODE_ACL_TX_PKT;
break;
case 0x03:
if (flags & 0x01)
opcode = MONITOR_SCO_RX_PKT;
opcode = BTSNOOP_OPCODE_SCO_RX_PKT;
else
opcode = MONITOR_ACL_TX_PKT;
opcode = BTSNOOP_OPCODE_ACL_TX_PKT;
break;
case 0x04:
opcode = MONITOR_EVENT_PKT;
opcode = BTSNOOP_OPCODE_EVENT_PKT;
break;
default:
goto skip_write;
@ -299,7 +292,7 @@ static void command_extract_eir(const char *input)
uint16_t opcode;
int fd, count = 0;
fd = btsnoop_open(input, &type);
fd = open_btsnoop(input, &type);
if (fd < 0)
return;
@ -326,7 +319,7 @@ next_packet:
}
switch (opcode) {
case MONITOR_EVENT_PKT:
case BTSNOOP_OPCODE_EVENT_PKT:
/* extended inquiry result event */
if (buf[0] == 0x2f) {
uint8_t *eir_ptr, eir_len, i;
@ -372,7 +365,7 @@ static void command_extract_ad(const char *input)
uint16_t opcode;
int fd, count = 0;
fd = btsnoop_open(input, &type);
fd = open_btsnoop(input, &type);
if (fd < 0)
return;
@ -399,7 +392,7 @@ next_packet:
}
switch (opcode) {
case MONITOR_EVENT_PKT:
case BTSNOOP_OPCODE_EVENT_PKT:
/* advertising report */
if (buf[0] == 0x3e && buf[2] == 0x02) {
uint8_t *ad_ptr, ad_len, i;
@ -449,7 +442,7 @@ static void command_extract_sdp(const char *input)
bool pdu_first = false;
int fd, count = 0;
fd = btsnoop_open(input, &type);
fd = open_btsnoop(input, &type);
if (fd < 0)
return;