Hello community,
here is the log from the commit of package bluez-hcidump
checked in at Thu Mar 1 20:39:13 CET 2007.
--------
--- bluez-hcidump/bluez-hcidump.changes 2006-10-31 12:24:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/bluez-hcidump/bluez-hcidump.changes 2007-02-27 19:51:45.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Feb 27 19:51:14 CET 2007 - seife@suse.de
+
+- update to v1.34:
+ * Add reading support for MacOS X packet logger format.
+ * Add decoding for AFH host channel classification command.
+ * Add decoding for QoS setup command.
+
+-------------------------------------------------------------------
Old:
----
bluez-hcidump-1.33.tar.gz
New:
----
bluez-hcidump-1.34.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-hcidump.spec ++++++
--- /var/tmp/diff_new_pack.Fu3267/_old 2007-03-01 20:39:05.000000000 +0100
+++ /var/tmp/diff_new_pack.Fu3267/_new 2007-03-01 20:39:05.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package bluez-hcidump (Version 1.33)
+# spec file for package bluez-hcidump (Version 1.34)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,10 +13,10 @@
Name: bluez-hcidump
BuildRequires: bluez-libs pkgconfig
URL: http://bluez.sourceforge.net
-Version: 1.33
+Version: 1.34
Release: 1
Summary: HCI Dumper for Debugging Bluetooth Connections
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
PreReq: %insserv_prereq
Group: Development/Tools/Debuggers
Autoreqprov: on
@@ -65,7 +65,12 @@
%{_mandir}/man8/hcidump.8.gz
%doc AUTHORS COPYING INSTALL ChangeLog NEWS README
-%changelog -n bluez-hcidump
+%changelog
+* Tue Feb 27 2007 - seife@suse.de
+- update to v1.34:
+ * Add reading support for MacOS X packet logger format.
+ * Add decoding for AFH host channel classification command.
+ * Add decoding for QoS setup command.
* Tue Oct 31 2006 - seife@suse.de
- update to v1.33:
* Add support for IPv6 decoding.
++++++ bluez-hcidump-1.33.tar.gz -> bluez-hcidump-1.34.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/aclocal.m4 new/bluez-hcidump-1.34/aclocal.m4
--- old/bluez-hcidump-1.33/aclocal.m4 2006-10-21 15:50:31.000000000 +0200
+++ new/bluez-hcidump-1.34/aclocal.m4 2007-02-18 04:39:58.000000000 +0100
@@ -149,7 +149,8 @@
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/ChangeLog new/bluez-hcidump-1.34/ChangeLog
--- old/bluez-hcidump-1.33/ChangeLog 2006-10-21 15:50:14.000000000 +0200
+++ new/bluez-hcidump-1.34/ChangeLog 2007-02-18 04:39:02.000000000 +0100
@@ -1,3 +1,8 @@
+ver 1.34:
+ Add reading support for MacOS X packet logger format.
+ Add decoding for AFH host channel classification command.
+ Add decoding for QoS setup command.
+
ver 1.33:
Add support for IPv6 decoding.
Add IPv6 connection support.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/configure new/bluez-hcidump-1.34/configure
--- old/bluez-hcidump-1.33/configure 2006-10-21 15:50:36.000000000 +0200
+++ new/bluez-hcidump-1.34/configure 2007-02-18 04:40:04.000000000 +0100
@@ -1582,7 +1582,7 @@
# Define the identity of the package.
PACKAGE=bluez-hcidump
- VERSION=1.33
+ VERSION=1.34
cat >>confdefs.h <<_ACEOF
@@ -3233,7 +3233,9 @@
# Put the nasty error message in config.log where it belongs
echo "$BLUEZ_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Bluetooth library is required" >&5
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ { { echo "$as_me:$LINENO: error: Bluetooth library is required" >&5
echo "$as_me: error: Bluetooth library is required" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/configure.in new/bluez-hcidump-1.34/configure.in
--- old/bluez-hcidump-1.33/configure.in 2006-10-21 15:50:14.000000000 +0200
+++ new/bluez-hcidump-1.34/configure.in 2007-02-18 04:39:02.000000000 +0100
@@ -1,7 +1,7 @@
AC_PREREQ(2.50)
AC_INIT()
-AM_INIT_AUTOMAKE(bluez-hcidump, 1.33)
+AM_INIT_AUTOMAKE(bluez-hcidump, 1.34)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/avctp.c new/bluez-hcidump-1.34/parser/avctp.c
--- old/bluez-hcidump-1.33/parser/avctp.c 2006-01-03 13:59:54.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/avctp.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/avdtp.c new/bluez-hcidump-1.34/parser/avdtp.c
--- old/bluez-hcidump-1.33/parser/avdtp.c 2006-01-03 13:59:54.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/avdtp.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/bnep.c new/bluez-hcidump-1.34/parser/bnep.c
--- old/bluez-hcidump-1.33/parser/bnep.c 2006-10-21 15:47:13.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/bnep.c 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2002-2003 Takashi Sasai
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/bpa.c new/bluez-hcidump-1.34/parser/bpa.c
--- old/bluez-hcidump-1.33/parser/bpa.c 2006-01-03 13:59:54.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/bpa.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/capi.c new/bluez-hcidump-1.34/parser/capi.c
--- old/bluez-hcidump-1.33/parser/capi.c 2006-01-03 13:59:54.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/capi.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/cmtp.c new/bluez-hcidump-1.34/parser/cmtp.c
--- old/bluez-hcidump-1.33/parser/cmtp.c 2006-01-03 13:59:54.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/cmtp.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2002-2006 Marcel Holtmann
+ * Copyright (C) 2002-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/csr.c new/bluez-hcidump-1.34/parser/csr.c
--- old/bluez-hcidump-1.33/parser/csr.c 2006-02-13 12:56:03.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/csr.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/ericsson.c new/bluez-hcidump-1.34/parser/ericsson.c
--- old/bluez-hcidump-1.33/parser/ericsson.c 2006-04-17 02:41:15.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/ericsson.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/hci.c new/bluez-hcidump-1.34/parser/hci.c
--- old/bluez-hcidump-1.33/parser/hci.c 2006-08-22 06:22:07.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/hci.c 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2000-2002 Maxim Krasnyansky
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
@@ -728,6 +728,25 @@
btohs(cp->min_interval), btohs(cp->attempt), btohs(cp->timeout));
}
+static inline void qos_setup_dump(int level, struct frame *frm)
+{
+ qos_setup_cp *cp = frm->ptr;
+
+ p_indent(level, frm);
+ printf("handle %d flags 0x%2.2x\n", btohs(cp->handle), cp->flags);
+
+ p_indent(level, frm);
+ printf("Service type: %d\n", cp->qos.service_type);
+ p_indent(level, frm);
+ printf("Token rate: %d\n", btohl(cp->qos.token_rate));
+ p_indent(level, frm);
+ printf("Peak bandwith: %d\n", btohl(cp->qos.peak_bandwidth));
+ p_indent(level, frm);
+ printf("Latency: %d\n", btohl(cp->qos.latency));
+ p_indent(level, frm);
+ printf("Delay variation: %d\n", btohl(cp->qos.delay_variation));
+}
+
static inline void write_link_policy_dump(int level, struct frame *frm)
{
write_link_policy_cp *cp = frm->ptr;
@@ -964,6 +983,18 @@
printf("mode %d\n", cp->mode);
}
+static inline void set_afh_classification_dump(int level, struct frame *frm)
+{
+ set_afh_classification_cp *cp = frm->ptr;
+ int i;
+
+ p_indent(level, frm);
+ printf("map 0x");
+ for (i = 0; i < 10; i++)
+ printf("%02x", cp->map[i]);
+ printf("\n");
+}
+
static inline void write_link_supervision_timeout_dump(int level, struct frame *frm)
{
write_link_supervision_timeout_cp *cp = frm->ptr;
@@ -1157,6 +1188,9 @@
case OCF_SWITCH_ROLE:
accept_conn_req_dump(level + 1, frm);
return;
+ case OCF_QOS_SETUP:
+ qos_setup_dump(level + 1, frm);
+ return;
case OCF_WRITE_LINK_POLICY:
write_link_policy_dump(level + 1, frm);
return;
@@ -1220,6 +1254,9 @@
case OCF_WRITE_AFH_MODE:
write_inquiry_mode_dump(level + 1, frm);
return;
+ case OCF_SET_AFH_CLASSIFICATION:
+ set_afh_classification_dump(level + 1, frm);
+ return;
case OCF_READ_TRANSMIT_POWER_LEVEL:
request_transmit_power_level_dump(level + 1, frm);
return;
@@ -2479,6 +2516,7 @@
switch (manufacturer) {
case 0:
+ case 37:
case 48:
frm->ptr += HCI_EVENT_HDR_SIZE;
frm->len -= HCI_EVENT_HDR_SIZE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/hcrp.c new/bluez-hcidump-1.34/parser/hcrp.c
--- old/bluez-hcidump-1.33/parser/hcrp.c 2006-01-03 13:59:54.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/hcrp.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/hidp.c new/bluez-hcidump-1.34/parser/hidp.c
--- old/bluez-hcidump-1.33/parser/hidp.c 2006-01-03 13:59:54.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/hidp.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/l2cap.c new/bluez-hcidump-1.34/parser/l2cap.c
--- old/bluez-hcidump-1.33/parser/l2cap.c 2006-02-09 17:04:25.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/l2cap.c 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2000-2002 Maxim Krasnyansky
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/lmp.c new/bluez-hcidump-1.34/parser/lmp.c
--- old/bluez-hcidump-1.33/parser/lmp.c 2006-05-31 17:20:08.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/lmp.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/obex.c new/bluez-hcidump-1.34/parser/obex.c
--- old/bluez-hcidump-1.33/parser/obex.c 2006-09-03 11:23:54.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/obex.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/parser.c new/bluez-hcidump-1.34/parser/parser.c
--- old/bluez-hcidump-1.33/parser/parser.c 2006-01-17 19:28:55.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/parser.c 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2000-2002 Maxim Krasnyansky
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/parser.h new/bluez-hcidump-1.34/parser/parser.h
--- old/bluez-hcidump-1.33/parser/parser.h 2006-04-17 01:22:36.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/parser.h 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2000-2002 Maxim Krasnyansky
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
@@ -60,7 +60,8 @@
#define DUMP_TSTAMP 0x0100
#define DUMP_VERBOSE 0x0200
#define DUMP_BTSNOOP 0x1000
-#define DUMP_NOVENDOR 0x2000
+#define DUMP_PKTLOG 0x2000
+#define DUMP_NOVENDOR 0x4000
#define DUMP_TYPE_MASK (DUMP_ASCII | DUMP_HEX | DUMP_EXT)
/* Parser filter */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/ppp.c new/bluez-hcidump-1.34/parser/ppp.c
--- old/bluez-hcidump-1.33/parser/ppp.c 2006-07-26 15:19:06.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/ppp.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/rfcomm.c new/bluez-hcidump-1.34/parser/rfcomm.c
--- old/bluez-hcidump-1.33/parser/rfcomm.c 2006-01-17 18:18:48.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/rfcomm.c 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2001-2002 Wayne Lee
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/rfcomm.h new/bluez-hcidump-1.34/parser/rfcomm.h
--- old/bluez-hcidump-1.33/parser/rfcomm.h 2006-01-03 13:59:54.000000000 +0100
+++ new/bluez-hcidump-1.34/parser/rfcomm.h 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2001-2002 Wayne Lee
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/sdp.c new/bluez-hcidump-1.34/parser/sdp.c
--- old/bluez-hcidump-1.33/parser/sdp.c 2006-06-03 12:46:59.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/sdp.c 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2001-2002 Ricky Yuen
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/sdp.h new/bluez-hcidump-1.34/parser/sdp.h
--- old/bluez-hcidump-1.33/parser/sdp.h 2006-06-03 12:46:59.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/sdp.h 2007-02-18 04:39:02.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2001-2002 Ricky Yuen
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/tcpip.c new/bluez-hcidump-1.34/parser/tcpip.c
--- old/bluez-hcidump-1.33/parser/tcpip.c 2006-10-21 15:50:14.000000000 +0200
+++ new/bluez-hcidump-1.34/parser/tcpip.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/README new/bluez-hcidump-1.34/README
--- old/bluez-hcidump-1.33/README 2006-01-03 13:59:53.000000000 +0100
+++ new/bluez-hcidump-1.34/README 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
******************************************
Copyright (C) 2000-2002 Maxim Krasnyansky
-Copyright (C) 2003-2006 Marcel Holtmann
+Copyright (C) 2003-2007 Marcel Holtmann
Bluetooth packet analyzer
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/src/bpasniff.c new/bluez-hcidump-1.34/src/bpasniff.c
--- old/bluez-hcidump-1.33/src/bpasniff.c 2006-01-17 19:28:58.000000000 +0100
+++ new/bluez-hcidump-1.34/src/bpasniff.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/src/csrsniff.c new/bluez-hcidump-1.34/src/csrsniff.c
--- old/bluez-hcidump-1.33/src/csrsniff.c 2006-06-17 13:16:16.000000000 +0200
+++ new/bluez-hcidump-1.34/src/csrsniff.c 2007-02-18 04:39:02.000000000 +0100
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2006 Marcel Holtmann
+ * Copyright (C) 2004-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/src/hcidump.c new/bluez-hcidump-1.34/src/hcidump.c
--- old/bluez-hcidump-1.33/src/hcidump.c 2006-10-21 15:47:13.000000000 +0200
+++ new/bluez-hcidump-1.34/src/hcidump.c 2007-02-18 04:39:03.000000000 +0100
@@ -3,7 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2000-2002 Maxim Krasnyansky
- * Copyright (C) 2003-2006 Marcel Holtmann
+ * Copyright (C) 2003-2007 Marcel Holtmann
*
*
* This program is free software; you can redistribute it and/or modify
@@ -127,6 +127,13 @@
static uint32_t btsnoop_version = 0;
static uint32_t btsnoop_type = 0;
+struct pktlog_hdr {
+ uint32_t len;
+ uint64_t ts;
+ uint8_t type;
+} __attribute__ ((packed));
+#define PKTLOG_HDR_SIZE (sizeof(struct pktlog_hdr))
+
static inline int read_n(int fd, char *buf, int len)
{
register int t = 0, w;
@@ -282,6 +289,7 @@
{
struct hcidump_hdr dh;
struct btsnoop_pkt dp;
+ struct pktlog_hdr ph;
struct frame frm;
uint8_t pkt_type;
int err;
@@ -293,7 +301,9 @@
}
while (1) {
- if (parser.flags & DUMP_BTSNOOP)
+ if (parser.flags & DUMP_PKTLOG)
+ err = read_n(fd, (void *) &ph, PKTLOG_HDR_SIZE);
+ else if (parser.flags & DUMP_BTSNOOP)
err = read_n(fd, (void *) &dp, BTSNOOP_PKT_SIZE);
else
err = read_n(fd, (void *) &dh, HCIDUMP_HDR_SIZE);
@@ -303,7 +313,32 @@
if (!err)
return;
- if (parser.flags & DUMP_BTSNOOP) {
+ if (parser.flags & DUMP_PKTLOG) {
+ switch (ph.type) {
+ case 0x00:
+ ((uint8_t *) frm.data)[0] = HCI_COMMAND_PKT;
+ frm.in = 0;
+ break;
+ case 0x01:
+ ((uint8_t *) frm.data)[0] = HCI_EVENT_PKT;
+ frm.in = 1;
+ break;
+ case 0x02:
+ ((uint8_t *) frm.data)[0] = HCI_ACLDATA_PKT;
+ frm.in = 0;
+ break;
+ case 0x03:
+ ((uint8_t *) frm.data)[0] = HCI_ACLDATA_PKT;
+ frm.in = 1;
+ break;
+ default:
+ lseek(fd, ntohl(ph.len) - 9, SEEK_CUR);
+ continue;
+ }
+
+ frm.data_len = ntohl(ph.len) - 8;
+ err = read_n(fd, frm.data + 1, frm.data_len - 1);
+ } else if (parser.flags & DUMP_BTSNOOP) {
switch (btsnoop_type) {
case 1001:
if (ntohl(dp.flags) & 0x02) {
@@ -338,12 +373,17 @@
frm.ptr = frm.data;
frm.len = frm.data_len;
- if (parser.flags & DUMP_BTSNOOP) {
+ if (parser.flags & DUMP_PKTLOG) {
+ uint64_t ts;
+ ts = ntoh64(ph.ts);
+ frm.ts.tv_sec = ts >> 32;
+ frm.ts.tv_usec = ts & 0xffffffff;
+ } else if (parser.flags & DUMP_BTSNOOP) {
uint64_t ts;
frm.in = ntohl(dp.flags) & 0x01;
ts = ntoh64(dp.ts) - 0x00E03AB44A676000ll;
frm.ts.tv_sec = (ts / 1000000ll) + 946684800ll;
- frm.ts.tv_usec = ts % 1000000ll;
+ frm.ts.tv_usec = ts % 1000000ll;
} else {
frm.in = dh.in;
frm.ts.tv_sec = btohl(dh.ts_sec);
@@ -360,7 +400,8 @@
static int open_file(char *file, int mode, unsigned long flags)
{
- struct btsnoop_hdr hdr;
+ unsigned char buf[BTSNOOP_HDR_SIZE];
+ struct btsnoop_hdr *hdr = (struct btsnoop_hdr *) buf;
int fd, len, open_flags;
if (mode == WRITE || mode == PPPDUMP || mode == AUDIO) {
@@ -378,17 +419,17 @@
}
if (mode == READ) {
- len = read(fd, &hdr, BTSNOOP_HDR_SIZE);
+ len = read(fd, buf, BTSNOOP_HDR_SIZE);
if (len != BTSNOOP_HDR_SIZE) {
lseek(fd, 0, SEEK_SET);
return fd;
}
- if (!memcmp(hdr.id, btsnoop_id, sizeof(btsnoop_id))) {
+ if (!memcmp(hdr->id, btsnoop_id, sizeof(btsnoop_id))) {
parser.flags |= DUMP_BTSNOOP;
- btsnoop_version = ntohl(hdr.version);
- btsnoop_type = ntohl(hdr.type);
+ btsnoop_version = ntohl(hdr->version);
+ btsnoop_type = ntohl(hdr->type);
printf("btsnoop version: %d datalink type: %d\n",
btsnoop_version, btsnoop_type);
@@ -403,6 +444,11 @@
exit(1);
}
} else {
+ if (buf[0] == 0x00 && buf[1] == 0x00) {
+ parser.flags |= DUMP_PKTLOG;
+ printf("packet logger data format\n");
+ }
+
parser.flags &= ~DUMP_BTSNOOP;
lseek(fd, 0, SEEK_SET);
return fd;
@@ -412,14 +458,14 @@
btsnoop_version = 1;
btsnoop_type = 1002;
- memcpy(hdr.id, btsnoop_id, sizeof(btsnoop_id));
- hdr.version = htonl(btsnoop_version);
- hdr.type = htonl(btsnoop_type);
+ memcpy(hdr->id, btsnoop_id, sizeof(btsnoop_id));
+ hdr->version = htonl(btsnoop_version);
+ hdr->type = htonl(btsnoop_type);
printf("btsnoop version: %d datalink type: %d\n",
btsnoop_version, btsnoop_type);
- len = write(fd, &hdr, BTSNOOP_HDR_SIZE);
+ len = write(fd, buf, BTSNOOP_HDR_SIZE);
if (len < 0) {
perror("Can't create dump header");
exit(1);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org