Hello community, here is the log from the commit of package bluez-hcidump checked in at Sun Sep 3 20:52:20 CEST 2006. -------- --- bluez-hcidump/bluez-hcidump.changes 2006-07-06 16:17:41.000000000 +0200 +++ bluez-hcidump/bluez-hcidump.changes 2006-09-03 19:19:42.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Sep 3 19:18:37 CEST 2006 - seife@suse.de + +- update to v1.32: + * Add decoding for link supervision timeout change event. + * Add decoding for host controller to host flow control setting. + * Add decoding for host number of completed packets. + * Add decoding for host buffer size command. + * Fix OBEX header parsing. + + This version needs at least bluez-libs-3.3 + +------------------------------------------------------------------- Old: ---- bluez-hcidump-1.31.tar.gz New: ---- bluez-hcidump-1.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-hcidump.spec ++++++ --- /var/tmp/diff_new_pack.hC9PRh/_old 2006-09-03 20:52:07.000000000 +0200 +++ /var/tmp/diff_new_pack.hC9PRh/_new 2006-09-03 20:52:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bluez-hcidump (Version 1.31) +# spec file for package bluez-hcidump (Version 1.32) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: bluez-hcidump BuildRequires: bluez-libs pkgconfig URL: http://bluez.sourceforge.net -Version: 1.31 +Version: 1.32 Release: 1 Summary: HCI Dumper for Debugging Bluetooth Connections License: GPL @@ -66,6 +66,14 @@ %doc AUTHORS COPYING INSTALL ChangeLog NEWS README %changelog -n bluez-hcidump +* Sun Sep 03 2006 - seife@suse.de +- update to v1.32: + * Add decoding for link supervision timeout change event. + * Add decoding for host controller to host flow control setting. + * Add decoding for host number of completed packets. + * Add decoding for host buffer size command. + * Fix OBEX header parsing. + This version needs at least bluez-libs-3.3 * Thu Jul 06 2006 - seife@suse.de - update to v1.31 * Add Ericsson LMP decoding support. ++++++ bluez-hcidump-1.31.tar.gz -> bluez-hcidump-1.32.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.31/ChangeLog new/bluez-hcidump-1.32/ChangeLog --- old/bluez-hcidump-1.31/ChangeLog 2006-06-11 00:59:08.000000000 +0200 +++ new/bluez-hcidump-1.32/ChangeLog 2006-08-23 11:12:05.000000000 +0200 @@ -1,3 +1,13 @@ +ver 1.32: + Add decoding for link supervision timeout change event. + Add decoding for host controller to host flow control setting. + Add decoding for host number of completed packets. + Add decoding for host buffer size command. + Fix OBEX header parsing. + + Note: + This version needs at least bluez-libs-3.3 + ver 1.31: Add Ericsson LMP decoding support. Update sniff subrating decoding. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.31/configure new/bluez-hcidump-1.32/configure --- old/bluez-hcidump-1.31/configure 2006-06-11 00:59:20.000000000 +0200 +++ new/bluez-hcidump-1.32/configure 2006-08-23 11:16:05.000000000 +0200 @@ -1582,7 +1582,7 @@ # Define the identity of the package. PACKAGE=bluez-hcidump - VERSION=1.31 + VERSION=1.32 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.31/configure.in new/bluez-hcidump-1.32/configure.in --- old/bluez-hcidump-1.31/configure.in 2006-06-11 00:59:08.000000000 +0200 +++ new/bluez-hcidump-1.32/configure.in 2006-08-23 11:12:05.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT() -AM_INIT_AUTOMAKE(bluez-hcidump, 1.31) +AM_INIT_AUTOMAKE(bluez-hcidump, 1.32) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.31/parser/hci.c new/bluez-hcidump-1.32/parser/hci.c --- old/bluez-hcidump-1.31/parser/hci.c 2006-05-31 17:20:08.000000000 +0200 +++ new/bluez-hcidump-1.32/parser/hci.c 2006-08-22 08:26:04.000000000 +0200 @@ -50,7 +50,7 @@ return (manufacturer == DEFAULT_COMPID ? parser.defcompid : manufacturer); } -#define EVENT_NUM 47 +#define EVENT_NUM 55 static char *event_str[EVENT_NUM + 1] = { "Unknown", "Inquiry Complete", @@ -100,6 +100,14 @@ "Synchronous Connect Changed", "Sniff Subrate", "Extended Inquiry Result", + "Unknown", + "Unknown", + "Unknown", + "Unknown", + "Unknown", + "Unknown", + "Unknown", + "Link Supervision Timeout Change", }; #define CMD_LINKCTL_NUM 41 @@ -962,7 +970,7 @@ p_indent(level, frm); printf("handle %d timeout %d\n", - btohs(cp->handle), btohs(cp->link_sup_to)); + btohs(cp->handle), btohs(cp->timeout)); } static inline void write_ext_inquiry_response_dump(int level, struct frame *frm) @@ -1006,6 +1014,31 @@ cp->which_clock ? "piconet" : "local"); } +static inline void host_buffer_size_dump(int level, struct frame *frm) +{ + host_buffer_size_cp *cp = frm->ptr; + + p_indent(level, frm); + printf("ACL MTU %d:%d SCO MTU %d:%d\n", + btohs(cp->acl_mtu), btohs(cp->acl_max_pkt), + cp->sco_mtu, btohs(cp->sco_max_pkt)); +} + +static inline void num_comp_pkts_dump(int level, struct frame *frm) +{ + uint8_t num = get_u8(frm); + uint16_t handle, packets; + int i; + + for (i = 0; i < num; i++) { + handle = btohs(htons(get_u16(frm))); + packets = btohs(htons(get_u16(frm))); + + p_indent(level, frm); + printf("handle %d packets %d\n", handle, packets); + } +} + static inline void command_dump(int level, struct frame *frm) { hci_command_hdr *hdr = frm->ptr; @@ -1168,6 +1201,7 @@ return; case OCF_WRITE_SCAN_ENABLE: case OCF_WRITE_AUTH_ENABLE: + case OCF_SET_CONTROLLER_TO_HOST_FC: write_scan_enable_dump(level + 1, frm); return; case OCF_WRITE_CONN_ACCEPT_TIMEOUT: @@ -1189,6 +1223,12 @@ case OCF_READ_TRANSMIT_POWER_LEVEL: request_transmit_power_level_dump(level + 1, frm); return; + case OCF_HOST_BUFFER_SIZE: + host_buffer_size_dump(level + 1, frm); + return; + case OCF_HOST_NUM_COMP_PKTS: + num_comp_pkts_dump(level + 1, frm); + return; case OCF_FLUSH: case OCF_READ_LINK_SUPERVISION_TIMEOUT: generic_command_dump(level + 1, frm); @@ -1487,7 +1527,7 @@ p_indent(level, frm); printf("status 0x%2.2x handle %d timeout %d\n", - rp->status, btohs(rp->handle), btohs(rp->link_sup_to)); + rp->status, btohs(rp->handle), btohs(rp->timeout)); if (rp->status > 0) { p_indent(level, frm); @@ -1734,6 +1774,7 @@ case OCF_INQUIRY_CANCEL: case OCF_PERIODIC_INQUIRY: case OCF_EXIT_PERIODIC_INQUIRY: + case OCF_READ_REMOTE_EXT_FEATURES: status_response_dump(level, frm); return; case OCF_CREATE_CONN_CANCEL: @@ -1836,6 +1877,8 @@ case OCF_WRITE_AFH_MODE: case OCF_SET_AFH_CLASSIFICATION: case OCF_WRITE_EXT_INQUIRY_RESPONSE: + case OCF_SET_CONTROLLER_TO_HOST_FC: + case OCF_HOST_BUFFER_SIZE: status_response_dump(level, frm); return; } @@ -2124,21 +2167,6 @@ } } -static inline void num_comp_pkts_dump(int level, struct frame *frm) -{ - uint8_t num = get_u8(frm); - uint16_t handle, packets; - int i; - - for (i = 0; i < num; i++) { - handle = btohs(htons(get_u16(frm))); - packets = btohs(htons(get_u16(frm))); - - p_indent(level, frm); - printf("handle %d packets %d\n", handle, packets); - } -} - static inline void mode_change_dump(int level, struct frame *frm) { evt_mode_change *evt = frm->ptr; @@ -2414,6 +2442,15 @@ } } +static inline void link_supervision_timeout_change_dump(int level, struct frame *frm) +{ + evt_link_supervision_timeout_change *evt = frm->ptr; + + p_indent(level, frm); + printf("handle %d timeout %d\n", + btohs(evt->handle), btohs(evt->timeout)); +} + static inline void event_dump(int level, struct frame *frm) { hci_event_hdr *hdr = frm->ptr; @@ -2588,6 +2625,9 @@ case EVT_EXTENDED_INQUIRY_RESULT: extended_inq_result_dump(level + 1, frm); break; + case EVT_LINK_SUPERVISION_TIMEOUT_CHANGE: + link_supervision_timeout_change_dump(level + 1, frm); + break; default: raw_dump(level, frm); break; @@ -2623,9 +2663,10 @@ { hci_sco_hdr *hdr = (void *) frm->ptr; uint16_t handle = btohs(hdr->handle); + int len; if (frm->audio_fd > fileno(stderr)) - write(frm->audio_fd, frm->ptr + HCI_SCO_HDR_SIZE, hdr->dlen); + len = write(frm->audio_fd, frm->ptr + HCI_SCO_HDR_SIZE, hdr->dlen); if (!p_filter(FILT_SCO)) { p_indent(level, frm); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.31/parser/obex.c new/bluez-hcidump-1.32/parser/obex.c --- old/bluez-hcidump-1.31/parser/obex.c 2006-01-17 18:18:48.000000000 +0100 +++ new/bluez-hcidump-1.32/parser/obex.c 2006-08-22 08:26:05.000000000 +0200 @@ -269,6 +269,9 @@ set_status(frm->handle, frm->dlci, status); + if (frm->len == 0) + break; + switch (opcode & 0x7f) { case 0x00: /* Connect */ version = get_u8(frm); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.31/parser/ppp.c new/bluez-hcidump-1.32/parser/ppp.c --- old/bluez-hcidump-1.31/parser/ppp.c 2006-01-21 16:19:33.000000000 +0100 +++ new/bluez-hcidump-1.32/parser/ppp.c 2006-07-27 06:36:58.000000000 +0200 @@ -167,7 +167,7 @@ void ppp_dump(int level, struct frame *frm) { void *ptr, *end; - int len, pos = 0; + int err, len, pos = 0; if (frm->pppdump_fd > fileno(stderr)) { unsigned char id; @@ -175,13 +175,13 @@ uint32_t ts = htonl(frm->ts.tv_sec & 0xffffffff); id = 0x07; - write(frm->pppdump_fd, &id, 1); - write(frm->pppdump_fd, &ts, 4); + err = write(frm->pppdump_fd, &id, 1); + err = write(frm->pppdump_fd, &ts, 4); id = frm->in ? 0x02 : 0x01; - write(frm->pppdump_fd, &id, 1); - write(frm->pppdump_fd, &len, 2); - write(frm->pppdump_fd, frm->ptr, frm->len); + err = write(frm->pppdump_fd, &id, 1); + err = write(frm->pppdump_fd, &len, 2); + err = write(frm->pppdump_fd, frm->ptr, frm->len); } if (!ppp_traffic) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.31/src/csrsniff.c new/bluez-hcidump-1.32/src/csrsniff.c --- old/bluez-hcidump-1.31/src/csrsniff.c 2006-01-03 14:00:01.000000000 +0100 +++ new/bluez-hcidump-1.32/src/csrsniff.c 2006-06-17 16:31:35.000000000 +0200 @@ -118,6 +118,12 @@ { 2388, 46, "2005-08-17" }, { 2389, 46, "2005-08-17" }, { 2390, 46, "2005-08-17" }, + { 2869, 47, "2006-02-15" }, + { 2870, 47, "2006-02-15" }, + { 2871, 47, "2006-02-15" }, + { 3214, 48, "2006-02-16" }, + { 3215, 48, "2006-02-16" }, + { 3216, 48, "2006-02-16" }, { 0, } }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org