network: Fix user data handling on unregister
PATCH 1/1 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(-)
profiles/network/server.c +5 -2
@@ -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);
Signature · 1 line
1.7.10.4
Johan Hedberg
AppliedHi Patrik,
Quoted 5 lines · On Fri, Feb 01, 2013, [email protected] wrote:
User data in
unregister_server()is anetwork_adapterstruct. Unregistering using full UUID will now also work.--- profiles/network/server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Applied. Thanks.
Johan