Commit Graph

15030 Commits

Author SHA1 Message Date
Johan Hedberg
e8353af327 core: Fix incorrectly restarting service discovery after pairing
If services are already discovered through a Device1.Connect() call we
should not retry discovering them when Device1.Pair() is called.
2013-07-10 13:56:12 +03:00
Luiz Augusto von Dentz
5da7617e7f core/device: Don't call btd_service_disconnect on device_remove
device_remove is called to cleanup/free the device objects so the
services should be disconnected before hand.
2013-07-10 12:55:14 +03:00
Luiz Augusto von Dentz
e726230d3b core/device: Fix crash while freeing services list
btd_service do alter its state on service_remove which can cause
plugins to attempt to access services list which may have freed some
services already.

To fix this the code now updates the list in place so the services are
first removed from services list before calling service_remove.
2013-07-10 12:55:14 +03:00
Luiz Augusto von Dentz
b72673c608 core/service: Rename service_shutdown to service_remove
This rename service_shutdown to service_remove to make it more similar to
other internal APIs such as device_remove which only do object
cleanup/free and do not have any disconnect logic.
2013-07-10 12:55:14 +03:00
Szymon Janc
a727297039 lib: Add range check for SDP_SVC_ATTR_RSP/SDP_SVC_SEARCH_ATTR_RSP
This is an improved version of recently reverted commit 1796f00e84.
Response size is verified against minimal allowed value only if it is
complete response. If response is partial it is allowed by spec that
it will be split in arbitrary manner.

Verified against Nokia BH217 on which original commit caused
regression.
2013-07-10 12:36:34 +03:00
Martin
ae672c6f3e obexd/client: Add Target property to Session interface
Target property is already documented property but it was not
implemented.
2013-07-08 18:48:53 +03:00
Luiz Augusto von Dentz
5e8b5ce9fc audio/source: Fix not notifying service about connection state
btd_service_connecting_complete should be called whenever the service
is connected otherwise the service state will not be consistent.
2013-07-05 13:19:48 +03:00
Luiz Augusto von Dentz
745a7e2b0c audio/sink: Fix not notifying service about connection state
btd_service_connecting_complete should be called whenever the service
is connected otherwise the service state will not be consistent.
2013-07-05 13:19:34 +03:00
Jefferson Delfes
328231416b emulator: Implement LE advertising report
When a virtual device starts a LE advertising, emulator searches for
other virtual devices that are in scan mode, in order to send adv data
to these devices.
Inverse goes when LE scan is enabled. Emulator searches virtual devices
that are in advertising mode and copy adv data to them.
2013-07-05 11:56:48 +03:00
Jefferson Delfes
2aab109f42 emulator: Dummy LE set advertising parameters
Implement basic LE set adv parameters command.
2013-07-05 11:56:25 +03:00
Jefferson Delfes
8d3386453a emulator: Disallow LE set scan params command when scan is enabled
When LE scan is enabled, the command LE set scan parameters should
return a command disallowed in status of command complete event.
2013-07-05 11:56:13 +03:00
Jefferson Delfes
5616bb9686 emulator: Store LE scan state of virtual controller
The LE command set scan enable can change the scan state of virtual
controller.
2013-07-05 11:55:57 +03:00
Jefferson Delfes
ba6460907a emulator: Implement basic LE set adv enable command
Store advertising state of virtual controller in btdev struct.
2013-07-05 11:55:33 +03:00
Jefferson Delfes
f1877f83b2 emulator: Store LE advertising data length in btdev
LE advertising data length will be used for emulating reports in other
virtual devices.
2013-07-05 11:55:09 +03:00
Christian Fetzer
831221dc5b obexd: Re-add D-Bus session properties
This got lost when switching to org.freedesktop.DBus.Properties.
2013-06-30 22:11:54 +03:00
Marcel Holtmann
ce04a4c18d monitor: Print UUID-32 and UUID-128 strings 2013-06-28 12:07:20 -07:00
Marcel Holtmann
18e70719ec monitor: Add stub for UUID-128 to string conversion 2013-06-28 12:06:06 -07:00
Marcel Holtmann
78a6366af4 Release 5.7 2013-06-26 10:10:50 -07:00
Marcel Holtmann
7aca3faac6 build: Update library version 2013-06-26 10:03:17 -07:00
Luiz Augusto von Dentz
6132e6eee0 obexd/MAP: Fix assigning pointer not value to 0
The fix introduced by 455fb131f0 would
leave err value uninitialized and set the pointer to 0 which doesn't
make any sense.
2013-06-26 16:19:30 +03:00
Johan Hedberg
c71e098d2e lib: Update company identifiers 2013-06-26 14:30:11 +03:00
Luiz Augusto von Dentz
c6b9a502a0 audio/player: Fix crash when current item UID is set to 0
Apparently some stacks set the current UID to 0 when paused/stopped
which causes the following:

bluetoothd[23185]: profiles/audio/player.c:media_player_set_playlist_item() 0
bluetoothd[23185]: profiles/audio/player.c:media_folder_create_item() (null) type audio uid 0
process 23185: arguments to dbus_message_iter_append_basic() were incorrect, assertion "_dbus_check_is_valid_path (*string_p)" failed in file dbus-message.c line 2531.
This is normally a bug in some application using the D-Bus library.
  D-Bus not built with -rdynamic so unable to print a backtrace

UID 0 is not a valid UID according to the spec so the code should not
attempt to create any object to represent it.
2013-06-26 13:40:09 +03:00
Johan Hedberg
550dab5ce2 Revert "lib: Add range check for SDP_SVC_ATTR_RSP/SDP_SVC_SEARCH_ATTR_RSP"
This reverts commit 1796f00e84.

This patch causes a regression with the Nokia BH217 headset. A correct
patch must take into account fragmented responses.
2013-06-25 21:44:17 +03:00
Luiz Augusto von Dentz
8dbf886484 core: Fix not adding UUID found during pairing
This is a regression introduce by de63199f0c
where the list of UUID found is always empty thus causing no driver to be
probed.
2013-06-25 19:53:16 +03:00
Luiz Augusto von Dentz
455fb131f0 obexd/MAP: Fix crash when receiving an event report
Conditional jump or move depends on uninitialised value(s)
   at 0x42C1AF: obex_put_stream_start (obex.c:869)
   by 0x428D1A: mns_put (mns.c:148)
   by 0x42B521: cmd_put (obex.c:982)
   by 0x419FB5: incoming_data (gobex.c:1022)
   by 0x3F31A47A54: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3400.2)
   by 0x3F31A47D87: ??? (in /usr/lib64/libglib-2.0.so.0.3400.2)
   by 0x3F31A48181: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3400.2)
   by 0x40DEE2: main (main.c:319)
 Uninitialised value was created by a stack allocation
   at 0x42C160: obex_put_stream_start (obex.c:862)
2013-06-25 16:44:57 +03:00
Christian Fetzer
c743b7830a obexd: Notify registered notification handlers in MNS 2013-06-25 16:12:47 +03:00
Christian Fetzer
cc68717c10 obexd: Register notification handler in the MAP client 2013-06-25 16:12:47 +03:00
Christian Fetzer
24e5a587e4 build: Add support for building MAP notification dispatcher 2013-06-25 16:12:47 +03:00
Christian Fetzer
5a8f019229 obexd: Add MAP notification dispatching
The MAP specification allows to reuse one MNS server instance for all
local MAS client instances. This dispatching of event reports to the
correct MAS client instance is done by the MAS instance id and the
device address.

The dispatcher component allows MAS client instances to register a
notification handler. Events reports are forwarded by the MNS server using
map_dispatch_event.
2013-06-25 15:58:29 +03:00
Christian Fetzer
56de7139da obexd: Add function to get the destination from the obc_session 2013-06-25 15:04:42 +03:00
Luiz Augusto von Dentz
1259936bba core: Add mode option to external profile default configuration
Some external profiles, FTP and OPP, require a different L2CAP mode such
as ERTM to interoperate properly.
2013-06-24 15:14:04 +03:00
Mikel Astiz
b6e8a47778 input: Use btd_service userdata pointer
Avoid maintaining an internal list of probed input_device instances by
making use of btd_service's userdata pointer.
2013-06-24 11:16:53 +03:00
Mikel Astiz
0173540c1c scanparam: Use btd_service userdata pointer
Avoid maintaining an internal list of probed struct scan instances by
making use of btd_service's userdata pointer.
2013-06-24 11:16:51 +03:00
Mikel Astiz
13093c8a70 deviceinfo: Use btd_service userdata pointer
Avoid maintaining an internal list of probed deviceinfo instances by
making use of btd_service's userdata pointer.
2013-06-24 11:16:49 +03:00
Mikel Astiz
bae1167b90 network: Remove find_connection()
The userdata pointer in btd_service provides the necessary information
to find which service should be connected. This makes possible to remove
the restriction of having one single UUID instance per profile.
2013-06-24 11:16:45 +03:00
Mikel Astiz
394a1f9aa7 network: Fix missing NULL check for given UUID
The code dereferences a NULL pointer if find_connection() doesn't find
an existing connection, which will be the case if the input UUID is
invalid or not supported.
2013-06-24 11:16:43 +03:00
Mikel Astiz
18bdb1234d network: Remove duplicated search
Commit 0624791ea6 seems to accidentally
have introduced this duplicated search as part of a non-trivial revert.
2013-06-24 11:16:40 +03:00
Lucas De Marchi
9d2e019fe3 client: prettify help table
cmd + options have a maximum length of 25. Align the description
after this value. In order not to reach 80 chars so easily change the
first \t to 2 spaces, like is done in udev, kmod, systemd, etc.
2013-06-24 11:12:59 +03:00
Lucas De Marchi
e9150410ec client: Add description for default-agent command 2013-06-24 11:12:53 +03:00
Lucas De Marchi
c608aa5570 adapter: Remove never used parameter
adapter_remove_device() is always called with remove_storage set to
TRUE, so remove it.
2013-06-24 11:12:46 +03:00
Lucas De Marchi
782dc8cebb gitignore: Add missing tools 2013-06-24 11:12:40 +03:00
Szymon Janc
d82a3f679e lib: Cleanup SDP logs to not include double new lines
SDPERR and SDPDBG already add new line to prints.
2013-06-24 11:08:03 +03:00
Marcel Holtmann
70f8ef74f2 Release 5.6 2013-06-19 08:22:52 +02:00
Marcel Holtmann
82671d8b7e build: Update library version 2013-06-19 08:04:14 +02:00
Christian Fetzer
7a8aeaf09c obexd: Fix crash when retrieving multiple MAP event reports
The remote address used for dispatching the MAP notifications is
initialized when the MNS is connected. Therefore it needs to be freed
when the session is destroyed and not after receiving an event report.

Trace:

  0  0x00007ffff6a6a1c9 in raise () from /usr/lib/libc.so.6
  1  0x00007ffff6a6b5c8 in abort () from /usr/lib/libc.so.6
  2  0x00007ffff6aa8037 in __libc_message () from /usr/lib/libc.so.6
  3  0x00007ffff6aad8ae in malloc_printerr () from /usr/lib/libc.so.6
  4  0x00007ffff6aae587 in _int_free () from /usr/lib/libc.so.6
  5  0x00000000004273b0 in event_report_close (obj=0x69a5b0)
     at obexd/client/mns.c:295
  6  0x0000000000429549 in os_reset_session (os=0x69c210)
     at obexd/src/obex.c:199
  7  0x000000000041bec6 in transfer_complete (transfer=0x69a9d0, err=0x0)
     at gobex/gobex-transfer.c:103
  8  0x000000000041c20c in transfer_put_req (obex=0x69b470,
     req=<optimized out>, user_data=0x69a9d0) at
       gobex/gobex-transfer.c:407
  9  0x000000000041988d in handle_request (req=0x69f3d0, obex=0x69b470)
     at gobex/gobex.c:1022
  10 incoming_data (io=<optimized out>, cond=<optimized out>,
     user_data=0x69b470) at gobex/gobex.c:1194
  11 0x00007ffff702de46 in g_main_context_dispatch ()
     from /usr/lib/libglib-2.0.so.0
  12 0x00007ffff702e198 in ?? () from /usr/lib/libglib-2.0.so.0
  13 0x00007ffff702e59a in g_main_loop_run () from
       /usr/lib/libglib-2.0.so.0
  14 0x000000000040dead in main (argc=1, argv=0x7fffffffddc8)
     at obexd/src/main.c:319
2013-06-18 14:45:09 +03:00
Christian Fetzer
2237294c8d obexd: Use correct callback in obc_session_mkdir
The function obc_session_mkdir needs to use file_op_complete as
callback.

  0  0x00007ffff72f7553 in ?? () from /usr/lib/libdbus-1.so.3
  1  0x00007ffff72f7dff in ?? () from /usr/lib/libdbus-1.so.3
  2  0x00007ffff72fef9a in dbus_message_get_sender ()
     from /usr/lib/libdbus-1.so.3
  3  0x00007ffff72feff9 in dbus_message_new_method_return ()
     from /usr/lib/libdbus-1.so.3
  4  0x000000000043c93f in async_cb (session=0x6a9d30, transfer=0x0,
       err=0x0,
     user_data=0x675660) at obexd/client/ftp.c:65
  5  0x0000000000438c7c in async_cb (obex=0x6aa980, err=0x0,
       rsp=0x67a690,
     user_data=0x67ced0) at obexd/client/session.c:1035
  6  0x000000000041cbcc in handle_response (obex=0x6aa980, err=0x0,
     rsp=0x67a690) at gobex/gobex.c:949
  7  0x000000000041d49f in incoming_data (io=0x67d0f0, cond=G_IO_IN,
     user_data=0x6aa980) at gobex/gobex.c:1192
  8  0x00007ffff702de46 in g_main_context_dispatch ()
     from /usr/lib/libglib-2.0.so.0
  9  0x00007ffff702e198 in ?? () from /usr/lib/libglib-2.0.so.0
  10 0x00007ffff702e59a in g_main_loop_run () from
       /usr/lib/libglib-2.0.so.0
  11 0x0000000000430a09 in main (argc=1, argv=0x7fffffffddc8)
     at obexd/src/main.c:319
2013-06-18 13:43:01 +03:00
Christian Fetzer
b402f99241 obexd: Fix file_op_complete callback
The file_op_complete callback added for the OBEX session command queuing
is called with a file_data parameter and not with a pending_request.

This fixes a crash when calling one of the file commands (like delete).

  0  0x0000000000438cd6 in file_op_complete (session=0x6a9d30,
       transfer=0x0,
     err=0x0, user_data=0x6762e0) at obexd/client/session.c:1054
  1  0x0000000000438c64 in async_cb (obex=0x6aa980, err=0x0,
       rsp=0x67a710,
     user_data=0x6ac2c0) at obexd/client/session.c:1035
  2  0x000000000041cbcc in handle_response (obex=0x6aa980, err=0x0,
     rsp=0x67a710) at gobex/gobex.c:949
  3  0x000000000041d49f in incoming_data (io=0x67d0f0, cond=G_IO_IN,
     user_data=0x6aa980) at gobex/gobex.c:1192
  4  0x00007ffff702de46 in g_main_context_dispatch ()
     from /usr/lib/libglib-2.0.so.0
  5  0x00007ffff702e198 in ?? () from /usr/lib/libglib-2.0.so.0
  6  0x00007ffff702e59a in g_main_loop_run () from
       /usr/lib/libglib-2.0.so.0
  7  0x00000000004309f0 in main (argc=1, argv=0x7fffffffddc8)
     at obexd/src/main.c:319
2013-06-18 13:43:00 +03:00
Christian Fetzer
4e16c256ed obexd: Call setpath_complete with the correct parameter
The function setpath_complete has to be called with a pending_request as
user_data. In one possible error case, the current code calls it
incorrectly with setpath_data.
2013-06-18 13:43:00 +03:00
Christian Fetzer
8be70369bd obexd: Fix handling error cases in setpath
This adds a setpath_op_complete callback, that unpacks the user data and
finally calls the user callback. The callback is now used for success and error
cases.

The previous implementation was using setpath_complete which did not
work for error cases, because it was called with incorrect user data.
This was leading to a crash, that can be reproduced by disconnecting PBAP
after trying to select a non existing phone book.

  0  setpath_complete (session=0x66bd90, transfer=0x0, err=0x69b370,
     user_data=0x69a810) at obexd/client/session.c:912
  1  0x000000000042d100 in obc_session_shutdown (session=0x66bd90)
     at obexd/client/session.c:537
  2  0x000000000040f227 in service_filter (connection=0x664b20,
     message=<optimized out>, user_data=0x66bed0) at gdbus/watch.c:486
  3  0x000000000040f49b in message_filter (connection=0x664b20,
     message=0x66ba30, user_data=<optimized out>) at gdbus/watch.c:554
  4  0x00007ffff72f40a6 in dbus_connection_dispatch ()
     from /usr/lib/libdbus-1.so.3
  5  0x000000000040e148 in message_dispatch (data=0x664b20)
     at gdbus/mainloop.c:76
  6  0x00007ffff702e9a3 in ?? () from /usr/lib/libglib-2.0.so.0
  7  0x00007ffff702de46 in g_main_context_dispatch ()
     from /usr/lib/libglib-2.0.so.0
  8  0x00007ffff702e198 in ?? () from /usr/lib/libglib-2.0.so.0
  9  0x00007ffff702e59a in g_main_loop_run () from
     /usr/lib/libglib-2.0.so.0
  10 0x000000000040dd72 in main (argc=1, argv=0x7fffffffddc8)
     at obexd/src/main.c:319
2013-06-18 13:43:00 +03:00
Luiz Augusto von Dentz
e8f899bceb audio/media: Fix setting player settings
The value has to be converted to MPRIS setting otherwise the player won't
recognize it and will probably discard the change.
2013-06-18 13:28:39 +03:00