From 365cbb27c1f50f4c4cc6e1e651275ef8b7fe3747 Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Fri, 1 Feb 2013 13:19:51 +0200 Subject: [PATCH] network: Fix user data handling on unregister User data in unregister_server() is a network_adapter struct. Unregistering using full UUID will now also work. --- profiles/network/server.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/profiles/network/server.c b/profiles/network/server.c index 864b49c1a..de48bec76 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,8 @@ 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) return btd_error_failed(msg, "Invalid UUID"); reply = dbus_message_new_method_return(msg); -- 2.47.3