OSDN Git Service
Johan Hedberg [Tue, 18 Dec 2012 10:34:37 +0000 (12:34 +0200)]
doc: Bump AVRCP version from 1.4 to 1.5 in supported-features
Johan Hedberg [Tue, 18 Dec 2012 10:33:25 +0000 (12:33 +0200)]
doc: Add Cycling Speed to supported-features document
Johan Hedberg [Tue, 18 Dec 2012 10:28:09 +0000 (12:28 +0200)]
core: Remove DisconnectRequested signal
This signal is not needed anymore thanks to the RequestDisconnect
callback of the Profile interface.
Johan Hedberg [Tue, 18 Dec 2012 10:26:41 +0000 (12:26 +0200)]
doc: Fix minor formatting issue in device API
Johan Hedberg [Tue, 18 Dec 2012 10:24:58 +0000 (12:24 +0200)]
doc: Remove left-over mentions of adapter-based agent methods
Johan Hedberg [Tue, 18 Dec 2012 09:38:09 +0000 (11:38 +0200)]
audio: Remove unused a2dp_sep_is_playing function
Johan Hedberg [Tue, 18 Dec 2012 09:37:21 +0000 (11:37 +0200)]
audio: Remove unnecessary a2dp_sep_get_lock function
Johan Hedberg [Tue, 18 Dec 2012 09:36:15 +0000 (11:36 +0200)]
audio: Remove unused a2dp_get_sep function
Johan Hedberg [Tue, 18 Dec 2012 09:33:51 +0000 (11:33 +0200)]
core: Make sdp-xml encoding defines private
Johan Hedberg [Tue, 18 Dec 2012 09:31:30 +0000 (11:31 +0200)]
core: Make sdp-xml functions private that aren't used publically
Johan Hedberg [Tue, 18 Dec 2012 09:20:01 +0000 (11:20 +0200)]
neard: Fix agent reference leak
Johan Hedberg [Tue, 18 Dec 2012 08:14:48 +0000 (10:14 +0200)]
core: Fix initiating pairing without a registered agent
Marcel Holtmann [Tue, 18 Dec 2012 04:29:11 +0000 (05:29 +0100)]
client: Restore command prompt when agent finishes
Marcel Holtmann [Tue, 18 Dec 2012 04:27:09 +0000 (05:27 +0100)]
gdbus: Increase the method call timeout to 5 minutes
Marcel Holtmann [Tue, 18 Dec 2012 04:18:40 +0000 (05:18 +0100)]
client: Handle accepting/rejecting confirmation requests
Marcel Holtmann [Tue, 18 Dec 2012 04:09:59 +0000 (05:09 +0100)]
gdbus: Add helper for sending async error replies
Marcel Holtmann [Tue, 18 Dec 2012 03:24:11 +0000 (04:24 +0100)]
client: Replace certain messages with printing helper
Marcel Holtmann [Tue, 18 Dec 2012 03:22:00 +0000 (04:22 +0100)]
client: Forward input to agent handling if needed
Marcel Holtmann [Tue, 18 Dec 2012 03:20:40 +0000 (04:20 +0100)]
client: Add support for handling passkey confirmation
Marcel Holtmann [Tue, 18 Dec 2012 03:20:02 +0000 (04:20 +0100)]
client: Use printing helper for agent messages
Marcel Holtmann [Tue, 18 Dec 2012 03:17:45 +0000 (04:17 +0100)]
client: Add helper function for readline async printing
Marcel Holtmann [Tue, 18 Dec 2012 00:11:57 +0000 (01:11 +0100)]
emulator: Add support for Bluetooth host abstraction
Marcel Holtmann [Mon, 17 Dec 2012 23:26:44 +0000 (00:26 +0100)]
monitor: Fix whitespace damage
João Paulo Rechi Vita [Mon, 17 Dec 2012 22:48:20 +0000 (19:48 -0300)]
test: Update simple-agent to new API
The method org.bluez.Device.Pair() doesn't have arguments anymore. This
commit fixes the following error:
$ test/simple-agent hci0 4C:B1:99:F1:BC:E9
Agent registered
ERROR:dbus.connection:Unable to set arguments (u'/test/agent', u'Keybo
ardDisplay') according to signature '': <type 'exceptions.TypeError'>:
Fewer items found in D-Bus signature than in Python arguments
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/dbus/connection.py", line 586
, in msg_reply_handler
reply_handler(*message.get_args_list(**get_args_opts))
File "/usr/lib/python2.7/site-packages/dbus/proxies.py", line 391, i
n _introspect_reply_handler
self._introspect_execute_queue()
File "/usr/lib/python2.7/site-packages/dbus/proxies.py", line 378, i
n _introspect_execute_queue
proxy_method(*args, **keywords)
File "/usr/lib/python2.7/site-packages/dbus/proxies.py", line 132, i
n __call__
**keywords)
File "/usr/lib/python2.7/site-packages/dbus/connection.py", line 566
, in call_async
message.append(signature=signature, *args)
TypeError: Fewer items found in D-Bus signature than in Python argumen
ts
Marcel Holtmann [Mon, 17 Dec 2012 23:12:35 +0000 (00:12 +0100)]
unit: Fix issue with D-Bus client unit test when building packages
Marcel Holtmann [Mon, 17 Dec 2012 23:12:10 +0000 (00:12 +0100)]
build: Add support for building hcidump utility
Marcel Holtmann [Mon, 17 Dec 2012 23:00:39 +0000 (00:00 +0100)]
hcidump: Add private header for L2CAP structures
Marcel Holtmann [Mon, 17 Dec 2012 22:58:24 +0000 (23:58 +0100)]
hcidump: Add missing declaration of amp_assoc_dump
Marcel Holtmann [Mon, 17 Dec 2012 22:57:52 +0000 (23:57 +0100)]
hcidump: Fix includes for parser functions
Marcel Holtmann [Wed, 31 Oct 2012 03:34:37 +0000 (20:34 -0700)]
hcidump: Add support for reading new data link btsnoop files
Johan Hedberg [Tue, 9 Oct 2012 13:05:34 +0000 (16:05 +0300)]
hcidump: Print all HCI_LE_Create_Connection parameters
Andrei Emeltchenko [Thu, 30 Aug 2012 13:06:19 +0000 (16:06 +0300)]
hcidump: Decode Read Data Block Size HCI cmd
Decode Read Data Block Size HCI command and command status.
< HCI Command: Read Data Block Size (0x04|0x000a) plen 0
> HCI Event: Command Complete (0x0e) plen 10
Read Data Block Size (0x04|0x000a) ncmd 1
status 0x00
Max ACL 1492 Block len 1492 Num blocks 4
Andrei Emeltchenko [Fri, 31 Aug 2012 07:37:20 +0000 (10:37 +0300)]
hcidump: Decode Num Completed Data Blocks
Adds decoding Number Of Completed Data Blocks Event
> HCI Event: Number Of Completed Data Blocks (0x48) plen 9
Total num blocks 4 Num handles 1
Handle 0x0001: Num complt pkts 1 Num complt blks 1
Luiz Augusto von Dentz [Mon, 24 Sep 2012 14:30:59 +0000 (17:30 +0300)]
hcidump: Add parsing for GeneralReject PDU
Luiz Augusto von Dentz [Wed, 15 Aug 2012 11:34:27 +0000 (14:34 +0300)]
hcidump: Add parsing for AddToNowPlaying PDU
Luiz Augusto von Dentz [Wed, 15 Aug 2012 11:17:33 +0000 (14:17 +0300)]
hcidump: Add parsing for Search PDU
Luiz Augusto von Dentz [Wed, 15 Aug 2012 09:48:01 +0000 (12:48 +0300)]
hcidump: Add parsing for PlayItem PDU
Luiz Augusto von Dentz [Wed, 15 Aug 2012 08:21:59 +0000 (11:21 +0300)]
hcidump: Add parsing for GetItemAttributes PDU
Luiz Augusto von Dentz [Wed, 15 Aug 2012 07:47:49 +0000 (10:47 +0300)]
hcidump: Add parsing for ChangePath PDU
Luiz Augusto von Dentz [Mon, 13 Aug 2012 13:50:55 +0000 (16:50 +0300)]
hcidump: Add parsing for GetFolderItems PDU
Luiz Augusto von Dentz [Mon, 13 Aug 2012 13:05:40 +0000 (16:05 +0300)]
hcidump: Fix parsing SetBrowsedPlayer as AV/C pdu
As per AVRCP specification 1.4 page 32 the command type of
SetBrowsedPlayer is Browsing, so move it to browsing channel.
In addition to that pass the avctp header to avrcp_dump as it is
required to identify if the frame is a command or response.
Luiz Augusto von Dentz [Mon, 13 Aug 2012 11:11:31 +0000 (14:11 +0300)]
hcidump: Add initial support for browsing channel
Luiz Augusto von Dentz [Mon, 24 Sep 2012 14:34:44 +0000 (17:34 +0300)]
hcidump: Fix parsing of SetAddressedPlayer PDU
Andrei Emeltchenko [Fri, 17 Aug 2012 13:46:19 +0000 (16:46 +0300)]
hcidump: clean l2cap chan create/move dump
Print psm as hex, add "chan" to create, move req/rsp.
Andrei Emeltchenko [Fri, 17 Aug 2012 13:46:18 +0000 (16:46 +0300)]
hcidump: Fix printing link handle
Print logical link handle as 0x%4.4x and physical link handle
as 0x%2.2x
Luiz Augusto von Dentz [Tue, 14 Aug 2012 13:12:33 +0000 (16:12 +0300)]
hcidump: Fix not printing new line when parsing AddressedPlayerChanged
Andrzej Kaczmarek [Sun, 29 Jul 2012 09:30:25 +0000 (11:30 +0200)]
hcidump: Fix EIR data parsing
Data passed to ext_inquiry_data_dump are expected to start with length
octet which was consumed by get_u8.
Andrei Emeltchenko [Thu, 19 Jul 2012 09:08:25 +0000 (12:08 +0300)]
hcidump: Add decoding AMP Assoc data in write_remote_amp_assoc
Use amp_assoc_dump in write_remote_amp_assoc HCI command
Luiz Augusto von Dentz [Wed, 18 Jul 2012 11:11:03 +0000 (14:11 +0300)]
hcidump: Add parsing for SetBrowsedPlayer PDU
Luiz Augusto von Dentz [Tue, 19 Jun 2012 11:40:30 +0000 (14:40 +0300)]
hcidump: Add support for Addressed Player Changed event
Luiz Augusto von Dentz [Tue, 19 Jun 2012 11:40:29 +0000 (14:40 +0300)]
hcidump: Add parsing for SetAddressedPlayer PDU
Andrei Emeltchenko [Thu, 28 Jun 2012 13:09:22 +0000 (16:09 +0300)]
hcidump: Add decoding AMP Assoc data in HCI parser
Andrei Emeltchenko [Thu, 28 Jun 2012 13:09:21 +0000 (16:09 +0300)]
hcidump: Make assoc dump function available for HCI parser
AMP Assoc dump will be used also for HCI dump functions
Andrei Emeltchenko [Thu, 28 Jun 2012 13:09:20 +0000 (16:09 +0300)]
hcidump: Fix number of triplet calculation
Country code is also included in the TLV size.
Andrei Emeltchenko [Wed, 16 May 2012 08:26:52 +0000 (11:26 +0300)]
hcidump: Decode A2MP Get AMP Assoc rsp
Adds decoding Assoc data:
...
> ACL data: handle 11 flags 0x02 dlen 53
A2MP: Get AMP Assoc rsp: id 1 status (0) Success
Assoc data [len 39]:
MAC: <address>
Preferred Chan List number of triplets 4
Country code: XXX
Reg ext id 201 reg class 254 coverage class 0
Channel 1 max power 20
Channels 2 - 12 max power 20
Channels 4 - 8 max power 0
PAL CAP: 00 00 00 00
PAL VER: 01 Comp ID: <id> SubVer: 0001
...
Andrei Emeltchenko [Mon, 7 May 2012 13:49:26 +0000 (16:49 +0300)]
hcidump: Fix "length" name for A2MP Assoc log
Andrzej Kaczmarek [Fri, 30 Mar 2012 12:24:38 +0000 (14:24 +0200)]
hcidump: Add support for passing RFCOMM channel for SAP
Andrzej Kaczmarek [Fri, 30 Mar 2012 12:24:37 +0000 (14:24 +0200)]
hcidump: Add parameters parsing support for SAP PDU
Andrzej Kaczmarek [Fri, 30 Mar 2012 12:24:36 +0000 (14:24 +0200)]
hcidump: Add basic SAP parsing
Luiz Augusto von Dentz [Thu, 22 Mar 2012 19:04:43 +0000 (16:04 -0300)]
hcidump: Add parsing support for Volume Change notification
Luiz Augusto von Dentz [Thu, 22 Mar 2012 19:04:42 +0000 (16:04 -0300)]
hcidump: Add parsing for SetAbsoluteVolume PDU
Peter Krystad [Tue, 6 Mar 2012 00:14:52 +0000 (16:14 -0800)]
hcidump: Minor indentation cleanup and fix display of physical link key
Peter Krystad [Tue, 6 Mar 2012 00:14:51 +0000 (16:14 -0800)]
hcidump: Add parsing of A2MP signals
Peter Krystad [Tue, 6 Mar 2012 00:14:50 +0000 (16:14 -0800)]
hcidump: Add parsing of L2CAP Create/Move Channel signals
Luiz Augusto von Dentz [Fri, 17 Feb 2012 09:48:55 +0000 (11:48 +0200)]
hcidump: Add support for passing PSM as OBEX port
As OBEX can now use L2CAP as transport, -O/--obex option should accept
values other than RFCOMM channel, so values over 31 are now interpreted
as PSM.
Luiz Augusto von Dentz [Fri, 17 Feb 2012 09:48:54 +0000 (11:48 +0200)]
hcidump: add L2CAP OBEX support
Johan Hedberg [Wed, 1 Feb 2012 06:05:26 +0000 (08:05 +0200)]
hcidump: Fix UUID-128 parsing
ATT UUIDs are in little-endian format (in contrast to e.g. SDP).
Andrei Emeltchenko [Mon, 24 Oct 2011 09:22:34 +0000 (12:22 +0300)]
hcidump: Decode fixed channel list info rsp
Decode fixed channels in information response
< ACL data: handle 1 flags 0x00 dlen 10
L2CAP(s): Info req: type 3
> ACL data: handle 1 flags 0x02 dlen 20
L2CAP(s): Info rsp: type 3 result 0
Fixed channel list 0x0000000a
L2CAP Signalling Channel
AMP Manager Protocol
Martin Xu [Mon, 10 Oct 2011 09:21:57 +0000 (02:21 -0700)]
hcidump: Fix HCI event string lookup table
According to Core_v4.0 LE Meta Event Event Code is 0x3E, While Physical
Link Complete Event Code is 0x40 So add Unknown after LE Meta Event.
Andre Guedes [Tue, 4 Oct 2011 22:55:07 +0000 (19:55 -0300)]
hcidump: Fix EIR parsing in evt_le_advertising_report_dump
Only the first EIR data structure from the LE advertising report
event is dumped. This patch fix this, so all EIR data structure
present in that event is dumped.
Johan Hedberg [Thu, 6 Oct 2011 09:36:49 +0000 (12:36 +0300)]
hcidump: Fix crash with invalid L2CAP frame sizes
Reported by Jukka Taimisto <jukka.taimisto@codenomicon.com>
Johan Hedberg [Tue, 4 Oct 2011 10:14:56 +0000 (13:14 +0300)]
hcidump: fix format for 16-bit values
Andrei Emeltchenko [Tue, 27 Sep 2011 12:45:29 +0000 (15:45 +0300)]
hcidump: Parse extended control field in L2CAP
Adds support for parsing extended control field. Extended control field
may be used for ERTM and streaming mode (if EWS specified). ext_ctrl
flag resides in cid table. This also fixes P-bit decoding.
Andrei Emeltchenko [Tue, 27 Sep 2011 11:30:55 +0000 (14:30 +0300)]
hcidump: Remove magic numbers in L2CAP decoding
Andre Guedes [Tue, 30 Aug 2011 17:47:48 +0000 (14:47 -0300)]
hcidump: LE Connection Complete Event dump
Print Peer Address and Peer Address Type parameters from LE
Connection Complete Event.
Lucas De Marchi [Fri, 9 Sep 2011 17:40:36 +0000 (14:40 -0300)]
hcidump: Fix parser of AVRCP continuing messages
If packet_type is not START or SINGLE, we have to continue where we
stopped from previous packet. Therefore we must store where we left on
previous packet due to packet size limit. We store both the number of
attributes missing and the lenght of the last attribute that is missing.
An example interaction for this implementation, obtained with PTS test
TC_TG_MDI_BV_04_C (I reduced the MTU in order to reproduce it here and
values between brackets I added now):
> AVCTP: Command : pt 0x00 transaction 2 pid 0x110e
AV/C: Status: address 0x48 opcode 0x00
Subunit: Panel
Opcode: Vendor Dependent
Company ID: 0x001958
AVRCP: GetElementAttributes: pt Single len 0x0009
Identifier: 0x0 (PLAYING)
AttributeCount: 0x00
< AVCTP: Response : pt 0x00 transaction 2 pid 0x110e
AV/C: Stable: address 0x48 opcode 0x00
Subunit: Panel
Opcode: Vendor Dependent
Company ID: 0x001958
AVRCP: GetElementAttributes: pt Start len 0x0118
AttributeCount: 0x04
Attribute: 0x00000001 (Title)
CharsetID: 0x006a (UTF-8)
AttributeValueLength: 0x001b
AttributeValue: isso eh um titulo mei longo
Attribute: 0x00000003 (Album)
CharsetID: 0x006a (UTF-8)
AttributeValueLength: 0x00fe
AttributeValue: super-long-album-name super-long-album-name
super-long-album-name super-long-album-name super-long-album
super-long-album-name [... snip... ] super-long-album-name-1234
> AVCTP: Command : pt 0x00 transaction 2 pid 0x110e
AV/C: Control: address 0x48 opcode 0x00
Subunit: Panel
Opcode: Vendor Dependent
Company ID: 0x001958
AVRCP: RequestContinuingResponse: pt Single len 0x0001
< AVCTP: Response : pt 0x00 transaction 2 pid 0x110e
AV/C: Stable: address 0x48 opcode 0x00
Subunit: Panel
Opcode: Vendor Dependent
Company ID: 0x001958
AVRCP: GetElementAttributes: pt End len 0x002a
ContinuingAttributeValue:
678900000000000000
Attribute: 0x00000005 (Track Total)
CharsetID: 0x006a (UTF-8)
AttributeValueLength: 0x0002
AttributeValue: 30
Attribute: 0x00000006 (Genre)
CharsetID: 0x006a (UTF-8)
AttributeValueLength: 0x0006
AttributeValue: Gospel
Lucas De Marchi [Thu, 8 Sep 2011 23:32:50 +0000 (20:32 -0300)]
hcidump: fix name of metadata field
Metadata field number 0x7 should be the track duration and not the
progress of the track playback. Thus rename it to a better description.
Andrei Emeltchenko [Fri, 26 Aug 2011 12:05:36 +0000 (15:05 +0300)]
hcidump: Decode extended window size option
Marcel Holtmann [Wed, 31 Aug 2011 07:57:30 +0000 (00:57 -0700)]
hcidump: Change includes to use local copy of Bluetooth library
Johan Hedberg [Mon, 22 Aug 2011 08:02:34 +0000 (11:02 +0300)]
hcidump: Fix whitespace in l2cap.c
Peter Hurley [Sat, 13 Aug 2011 16:53:06 +0000 (12:53 -0400)]
hcidump: Fix L2CAP cid matching
If multiple ACL connections are using identical cid values, the L2CAP
parser will match the first avail cid found in the cid table. This
error often leads to incorrect psm determination, and thus incorrect
parsing of higher-layer frames.
When searching the cid table, a matching cid value must match by
ACL handle as well.
Syam Sidhardhan [Wed, 10 Aug 2011 18:45:49 +0000 (00:15 +0530)]
hcidump: Add support for parsing SRM headers
Lucas De Marchi [Mon, 8 Aug 2011 14:48:47 +0000 (11:48 -0300)]
hcidump: Fix response for GetCurrentPlayerApplicationSettingValue
According to AVRCP spec there's no player id in response.
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:18 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP RegisterNotification PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:17 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP GetPlayStatus PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:16 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP GetElementAttributes PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:15 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP InformBatteryStatusOfCT PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:14 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP InformDisplayableCharacterSet PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:13 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP GetPlayerApplicationSettingValueText PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:12 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP GetPlayerApplicationSettingAttributeText PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:11 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP SetPlayerApplicationSettingValue PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:10 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP GetCurrentPlayerApplicationSettingValue PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:09 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP ListPlayerApplicationSettingValues PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 08:42:08 +0000 (11:42 +0300)]
hcidump: Add parsing for AVRCP ListPlayerApplicationSettingAttributes PDU
Luiz Augusto von Dentz [Mon, 1 Aug 2011 15:43:52 +0000 (18:43 +0300)]
hcidump: Add parsing for command type rejected AVRCP responses
Luiz Augusto von Dentz [Mon, 1 Aug 2011 15:43:51 +0000 (18:43 +0300)]
hcidump: Don't parse response AVRCP PDU if ctype is NOT_IMPLETED
Andrei Emeltchenko [Wed, 27 Jul 2011 09:23:38 +0000 (12:23 +0300)]
hcidump: Decode extended flow spec option
Decode EFS option in L2CAP configuration packets
Andrei Emeltchenko [Wed, 6 Jul 2011 09:21:23 +0000 (12:21 +0300)]
hcidump: Add parsing of L2CAP Info response
Adds parsing L2CAP extended feature mask.
before:
hcidump -r /tmp/info-rsp.cap
HCI sniffer - Bluetooth packet analyzer ver 2.1
btsnoop version: 1 datalink type: 1002
> ACL data: handle 11 flags 0x02 dlen 16
L2CAP(s): Info rsp: type 2 result 0
Extended feature mask 0x00b8
after:
src/hcidump -r /tmp/info-rsp.cap
HCI sniffer - Bluetooth packet analyzer ver 2.1
btsnoop version: 1 datalink type: 1002
> ACL data: handle 11 flags 0x02 dlen 16
L2CAP(s): Info rsp: type 2 result 0
Extended feature mask 0x00b8
Enhanced Retransmission mode
Streaming mode
FCS Option
Fixed Channels
Luiz Augusto von Dentz [Tue, 12 Jul 2011 14:50:45 +0000 (17:50 +0300)]
hcidump: Add parsing for AVRCP GetCapabilities
Luiz Augusto von Dentz [Tue, 12 Jul 2011 08:07:53 +0000 (11:07 +0300)]
hcidump: Add check to verify AVRCP pdu length matches frame length