Hello community,
here is the log from the commit of package bluez-hcidump
checked in at Tue Oct 31 14:56:43 CET 2006.
--------
--- bluez-hcidump/bluez-hcidump.changes 2006-09-03 19:19:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/bluez-hcidump/bluez-hcidump.changes 2006-10-31 12:24:28.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Oct 31 12:24:02 CET 2006 - seife@suse.de
+
+- update to v1.33:
+ * Add support for IPv6 decoding.
+ * Add IPv6 connection support.
+
+-------------------------------------------------------------------
Old:
----
bluez-hcidump-1.32.tar.gz
New:
----
bluez-hcidump-1.33.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-hcidump.spec ++++++
--- /var/tmp/diff_new_pack.TQ8iEh/_old 2006-10-31 14:55:55.000000000 +0100
+++ /var/tmp/diff_new_pack.TQ8iEh/_new 2006-10-31 14:55:55.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package bluez-hcidump (Version 1.32)
+# spec file for package bluez-hcidump (Version 1.33)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,10 +13,10 @@
Name: bluez-hcidump
BuildRequires: bluez-libs pkgconfig
URL: http://bluez.sourceforge.net
-Version: 1.32
+Version: 1.33
Release: 1
Summary: HCI Dumper for Debugging Bluetooth Connections
-License: GPL
+License: GNU General Public License (GPL) - all versions
PreReq: %insserv_prereq
Group: Development/Tools/Debuggers
Autoreqprov: on
@@ -66,6 +66,10 @@
%doc AUTHORS COPYING INSTALL ChangeLog NEWS README
%changelog -n bluez-hcidump
+* Tue Oct 31 2006 - seife@suse.de
+- update to v1.33:
+ * Add support for IPv6 decoding.
+ * Add IPv6 connection support.
* Sun Sep 03 2006 - seife@suse.de
- update to v1.32:
* Add decoding for link supervision timeout change event.
++++++ bluez-hcidump-1.32.tar.gz -> bluez-hcidump-1.33.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.32/ChangeLog new/bluez-hcidump-1.33/ChangeLog
--- old/bluez-hcidump-1.32/ChangeLog 2006-08-23 11:12:05.000000000 +0200
+++ new/bluez-hcidump-1.33/ChangeLog 2006-10-21 15:50:14.000000000 +0200
@@ -1,3 +1,7 @@
+ver 1.33:
+ Add support for IPv6 decoding.
+ Add IPv6 connection support.
+
ver 1.32:
Add decoding for link supervision timeout change event.
Add decoding for host controller to host flow control setting.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.32/configure new/bluez-hcidump-1.33/configure
--- old/bluez-hcidump-1.32/configure 2006-08-23 11:16:05.000000000 +0200
+++ new/bluez-hcidump-1.33/configure 2006-10-21 15:50:36.000000000 +0200
@@ -927,7 +927,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
@@ -1582,7 +1582,7 @@
# Define the identity of the package.
PACKAGE=bluez-hcidump
- VERSION=1.32
+ VERSION=1.33
cat >>confdefs.h <<_ACEOF
@@ -2353,7 +2353,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2411,7 +2412,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2527,7 +2529,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2581,7 +2584,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2626,7 +2630,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2670,7 +2675,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4150,6 +4156,11 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -4188,12 +4199,6 @@
fi;;
esac
done` || { (exit 1); exit 1; }
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.32/configure.in new/bluez-hcidump-1.33/configure.in
--- old/bluez-hcidump-1.32/configure.in 2006-08-23 11:12:05.000000000 +0200
+++ new/bluez-hcidump-1.33/configure.in 2006-10-21 15:50:14.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ(2.50)
AC_INIT()
-AM_INIT_AUTOMAKE(bluez-hcidump, 1.32)
+AM_INIT_AUTOMAKE(bluez-hcidump, 1.33)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.32/parser/bnep.c new/bluez-hcidump-1.33/parser/bnep.c
--- old/bluez-hcidump-1.32/parser/bnep.c 2006-01-21 16:19:33.000000000 +0100
+++ new/bluez-hcidump-1.33/parser/bnep.c 2006-10-21 15:47:13.000000000 +0200
@@ -56,6 +56,10 @@
/* BNEP Extension Type */
#define BNEP_EXTENSION_CONTROL 0x00
+#ifndef ETHERTYPE_IPV6
+#define ETHERTYPE_IPV6 ETH_P_IPV6
+#endif
+
static char *get_macaddr(struct frame *frm)
{
static char str[20];
@@ -63,8 +67,10 @@
sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x",
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
+
frm->ptr += 6;
frm->len -= 6;
+
return str;
}
@@ -131,12 +137,14 @@
break;
case BNEP_SETUP_CONNECTION_RESPONSE_MSG:
- printf("Setup Rsp(0x%02x) res 0x%04x\n", type, get_u16(frm));
+ printf("Setup Rsp(0x%02x) res 0x%04x\n",
+ type, get_u16(frm));
break;
case BNEP_FILTER_NET_TYPE_SET_MSG:
length = get_u16(frm);
- printf("Filter NetType Set(0x%02x) len 0x%04x\n", type, length);
+ printf("Filter NetType Set(0x%02x) len 0x%04x\n",
+ type, length);
for (i = 0; i < length / 4; i++) {
p_indent(level + 1, frm);
printf("0x%04x - ", get_u16(frm));
@@ -145,12 +153,14 @@
break;
case BNEP_FILTER_NET_TYPE_RESPONSE_MSG:
- printf("Filter NetType Rsp(0x%02x) res 0x%04x\n", type, get_u16(frm));
+ printf("Filter NetType Rsp(0x%02x) res 0x%04x\n",
+ type, get_u16(frm));
break;
case BNEP_FILTER_MULT_ADDR_SET_MSG:
length = get_u16(frm);
- printf("Filter MultAddr Set(0x%02x) len 0x%04x\n", type, length);
+ printf("Filter MultAddr Set(0x%02x) len 0x%04x\n",
+ type, length);
for (i = 0; i < length / 12; i++) {
p_indent(level + 1, frm);
printf("%s - ", get_macaddr(frm));
@@ -159,7 +169,8 @@
break;
case BNEP_FILTER_MULT_ADDR_RESPONSE_MSG:
- printf("Filter MultAddr Rsp(0x%02x) res 0x%04x\n", type, get_u16(frm));
+ printf("Filter MultAddr Rsp(0x%02x) res 0x%04x\n",
+ type, get_u16(frm));
break;
default:
@@ -174,26 +185,28 @@
static void bnep_eval_extension(int level, struct frame *frm)
{
uint8_t type = get_u8(frm);
- int extension = type & 0x80;
uint8_t length = get_u8(frm);
+ int extension = type & 0x80;
p_indent(level, frm);
+
switch (type & 0x7f) {
case BNEP_EXTENSION_CONTROL:
- printf("Ext Control(0x%02x|%s) len 0x%02x\n", type & 0x7f, extension ? "1" : "0", length);
+ printf("Ext Control(0x%02x|%s) len 0x%02x\n",
+ type & 0x7f, extension ? "1" : "0", length);
bnep_control(level, frm, length);
break;
default:
- printf("Ext Unknown(0x%02x|%s) len 0x%02x\n", type & 0x7f, extension ? "1" : "0", length);
+ printf("Ext Unknown(0x%02x|%s) len 0x%02x\n",
+ type & 0x7f, extension ? "1" : "0", length);
raw_ndump(level + 1, frm, length);
frm->ptr += length;
frm->len -= length;
}
- if (extension) {
+ if (extension)
bnep_eval_extension(level, frm);
- }
}
void bnep_dump(int level, struct frame *frm)
@@ -206,19 +219,22 @@
switch (type & 0x7f) {
case BNEP_CONTROL:
- printf("BNEP: Control(0x%02x|%s)\n", type & 0x7f, extension ? "1" : "0");
+ printf("BNEP: Control(0x%02x|%s)\n",
+ type & 0x7f, extension ? "1" : "0");
bnep_control(level, frm, -1);
break;
case BNEP_COMPRESSED_ETHERNET:
- printf("BNEP: Compressed(0x%02x|%s)\n", type & 0x7f, extension ? "1" : "0");
+ printf("BNEP: Compressed(0x%02x|%s)\n",
+ type & 0x7f, extension ? "1" : "0");
p_indent(++level, frm);
proto = get_u16(frm);
printf("[proto 0x%04x]\n", proto);
break;
case BNEP_GENERAL_ETHERNET:
- printf("BNEP: General ethernet(0x%02x|%s)\n", type & 0x7f, extension ? "1" : "0");
+ printf("BNEP: General ethernet(0x%02x|%s)\n",
+ type & 0x7f, extension ? "1" : "0");
p_indent(++level, frm);
printf("dst %s ", get_macaddr(frm));
printf("src %s ", get_macaddr(frm));
@@ -227,7 +243,8 @@
break;
case BNEP_COMPRESSED_ETHERNET_DEST_ONLY:
- printf("BNEP: Compressed DestOnly(0x%02x|%s)\n", type & 0x7f, extension ? "1" : "0");
+ printf("BNEP: Compressed DestOnly(0x%02x|%s)\n",
+ type & 0x7f, extension ? "1" : "0");
p_indent(++level, frm);
printf("dst %s ", get_macaddr(frm));
proto = get_u16(frm);
@@ -235,7 +252,8 @@
break;
case BNEP_COMPRESSED_ETHERNET_SOURCE_ONLY:
- printf("BNEP: Compressed SrcOnly(0x%02x|%s)\n", type & 0x7f, extension ? "1" : "0");
+ printf("BNEP: Compressed SrcOnly(0x%02x|%s)\n",
+ type & 0x7f, extension ? "1" : "0");
p_indent(++level, frm);
printf("src %s ", get_macaddr(frm));
proto = get_u16(frm);
@@ -287,6 +305,12 @@
ip_dump(level, frm);
break;
+ case ETHERTYPE_IPV6:
+ p_indent(++level, frm);
+ printf("IPV6: ");
+ ip_dump(level, frm);
+ break;
+
default:
raw_dump(level, frm);
break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.32/parser/obex.c new/bluez-hcidump-1.33/parser/obex.c
--- old/bluez-hcidump-1.32/parser/obex.c 2006-08-22 08:26:05.000000000 +0200
+++ new/bluez-hcidump-1.33/parser/obex.c 2006-09-03 11:23:54.000000000 +0200
@@ -269,8 +269,10 @@
set_status(frm->handle, frm->dlci, status);
- if (frm->len == 0)
+ if (frm->len == 0) {
+ printf("\n");
break;
+ }
switch (opcode & 0x7f) {
case 0x00: /* Connect */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.32/parser/tcpip.c new/bluez-hcidump-1.33/parser/tcpip.c
--- old/bluez-hcidump-1.32/parser/tcpip.c 2006-01-21 16:19:33.000000000 +0100
+++ new/bluez-hcidump-1.33/parser/tcpip.c 2006-10-21 15:50:14.000000000 +0200
@@ -35,26 +35,37 @@
#include