2013-02-01 11:19:51

by Patrik Flykt

Subject: [PATCH] network: Fix user data handling on unregister

From: Patrik Flykt <[email protected]>

User data in unregister_server() is a network_adapter struct. Unregistering
using full UUID will now also work.
---
profiles/network/server.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/profiles/network/server.c b/profiles/network/server.c
index 864b49c..c8bfed5 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -676,7 +676,8 @@ static DBusMessage *register_server(DBusConnection *conn,
static DBusMessage *unregister_server(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct network_server *ns = data;
+ struct network_adapter *na = data;
+ struct network_server *ns;
DBusMessage *reply;
const char *uuid;

@@ -684,7 +685,9 @@ static DBusMessage *unregister_server(DBusConnection *conn,
DBUS_TYPE_INVALID))
return btd_error_invalid_args(msg);

- if (g_strcmp0(uuid, "nap"))
+ ns = find_server_by_uuid(na->servers, uuid);
+
+ if (ns == NULL)
return btd_error_failed(msg, "Invalid UUID");

reply = dbus_message_new_method_return(msg);
--
1.7.10.4

2013-02-01 15:57:37

by Johan Hedberg

Subject: Re: [PATCH] network: Fix user data handling on unregister

Hi Patrik,

On Fri, Feb 01, 2013, [email protected] wrote:
> User data in unregister_server() is a network_adapter struct. Unregistering
> using full UUID will now also work.
> ---
> profiles/network/server.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)

Applied. Thanks.

Johan