linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jose Antonio Santos Cadenas <santoscadenas@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Jose Antonio Santos Cadenas <santoscadenas@gmail.com>
Subject: [PATCH 24/32] Disconnect health link petition
Date: Wed,  2 Jun 2010 15:19:20 +0200	[thread overview]
Message-ID: <1275484768-25838-25-git-send-email-santoscadenas@gmail.com> (raw)
In-Reply-To: <1275484768-25838-24-git-send-email-santoscadenas@gmail.com>

---
 health/hdp.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/health/hdp.c b/health/hdp.c
index 25a644c..a38cbe0 100644
--- a/health/hdp.c
+++ b/health/hdp.c
@@ -401,13 +401,10 @@ static void health_link_free(struct hdp_link *hdpl)
 	if (hdpl->mcl) {
 		mcap_close_mcl(hdpl->mcl, FALSE);
 		mcap_mcl_unref(hdpl->mcl);
-		hdpl->mcl = NULL;
 	}
 
-	if (hdpl->path) {
+	if (hdpl->path)
 		g_free(hdpl->path);
-		hdpl->path = NULL;
-	}
 
 	hdpl->hdpi->hlink = g_slist_remove(hdpl->hdpi->hlink, hdpl);
 	g_free(hdpl);
@@ -623,32 +620,37 @@ static DBusMessage *hdp_disconnect(DBusConnection *conn,
 					DBusMessage *msg, void *user_data)
 {
 	struct hdp_device *device = user_data;
-	struct hdp_link *hlink;
+	struct hdp_link *hdpl;
 	const char *path;
-	const gboolean *del;
+	gboolean cache;
 
 	if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
-							DBUS_TYPE_BOOLEAN, &del,
-							DBUS_TYPE_INVALID)){
+						DBUS_TYPE_BOOLEAN, &cache,
+						DBUS_TYPE_INVALID)){
 		return g_dbus_create_error(msg,
 					ERROR_INTERFACE ".InvalidArguments",
 					"Invalid arguments in method call");
 	}
 
-	hlink = find_health_link(device->hdp_adapter, path);
-	if (!hlink)
+	hdpl = find_health_link(device->hdp_adapter, path);
+	if (!hdpl)
 		return g_dbus_create_error(msg, ERROR_INTERFACE ".HealthError",
 						"Health link does not found");
 
-	return g_dbus_create_error(msg, ERROR_INTERFACE ".HealthError",
-							"Not yet implemented");
+	if (cache) {
+		mcap_close_mcl(hdpl->mcl, cache);
+		hdpl->closed = TRUE;
+	} else
+		g_dbus_unregister_interface(conn, hdpl->path, HEALTH_LINK);
+
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
 static GDBusMethodTable device_methods[] = {
 	{ "GetHealthInstances", "", "aa{sv}", get_health_instances,
 						G_DBUS_METHOD_FLAG_ASYNC },
 	{ "Connect", "uu", "o", hdp_connect, G_DBUS_METHOD_FLAG_ASYNC },
-	{ "Diconnect", "ob", "", hdp_disconnect },
+	{ "Disconnect", "ob", "", hdp_disconnect },
 	{ NULL }
 };
 
-- 
1.6.3.3


  reply	other threads:[~2010-06-02 13:19 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-02 13:18 [PATCH 00/32] Health device profile (HDP) Jose Antonio Santos Cadenas
2010-06-02 13:18 ` [PATCH 01/32] Add Health api description Jose Antonio Santos Cadenas
2010-06-02 13:18   ` [PATCH 02/32] Initial support for HDP Jose Antonio Santos Cadenas
2010-06-02 13:18     ` [PATCH 03/32] Add functions to resiger health instances in SDP Jose Antonio Santos Cadenas
2010-06-02 13:19       ` [PATCH 04/32] Initial support for hdp_device_drivers Jose Antonio Santos Cadenas
2010-06-02 13:19         ` [PATCH 05/32] Register healt_driver interfaces in d-bus Jose Antonio Santos Cadenas
2010-06-02 13:19           ` [PATCH 06/32] Add delete instance petition Jose Antonio Santos Cadenas
2010-06-02 13:19             ` [PATCH 07/32] Add watcher to control client disconections to delete hdp instance Jose Antonio Santos Cadenas
2010-06-02 13:19               ` [PATCH 08/32] Work in getting remote SDP records Jose Antonio Santos Cadenas
2010-06-02 13:19                 ` [PATCH 09/32] Adds functions to get remote suported features from its SDP record Jose Antonio Santos Cadenas
2010-06-02 13:19                   ` [PATCH 10/32] Insert end_point in array returned by get_health_instances Jose Antonio Santos Cadenas
2010-06-02 13:19                     ` [PATCH 11/32] Initial support for connecting instances Jose Antonio Santos Cadenas
2010-06-02 13:19                       ` [PATCH 12/32] Complete the response dictionary in GetHealthInstances response Jose Antonio Santos Cadenas
2010-06-02 13:19                         ` [PATCH 13/32] Implement connection of health instances Jose Antonio Santos Cadenas
2010-06-02 13:19                           ` [PATCH 14/32] Manage mcap instances Jose Antonio Santos Cadenas
2010-06-02 13:19                             ` [PATCH 15/32] Implement connect MCL callback in health instances connection Jose Antonio Santos Cadenas
2010-06-02 13:19                               ` [PATCH 16/32] Register Health link int the bus when MCL is connected Jose Antonio Santos Cadenas
2010-06-02 13:19                                 ` [PATCH 17/32] Analize remote record looking for psm Jose Antonio Santos Cadenas
2010-06-02 13:19                                   ` [PATCH 18/32] Unify the creation of health links Jose Antonio Santos Cadenas
2010-06-02 13:19                                     ` [PATCH 19/32] Remove hdp_device pointer from health link struct Jose Antonio Santos Cadenas
2010-06-02 13:19                                       ` [PATCH 20/32] Release health link resources Jose Antonio Santos Cadenas
2010-06-02 13:19                                         ` [PATCH 21/32] Manage mcap disconnections and reconnections Jose Antonio Santos Cadenas
2010-06-02 13:19                                           ` [PATCH 22/32] Initial work for disconnecting health links Jose Antonio Santos Cadenas
2010-06-02 13:19                                             ` [PATCH 23/32] Avoid multiple links with the same device Jose Antonio Santos Cadenas
2010-06-02 13:19                                               ` Jose Antonio Santos Cadenas [this message]
2010-06-02 13:19                                                 ` [PATCH 25/32] Create new structure to manage data channels in HDP Jose Antonio Santos Cadenas
2010-06-02 13:19                                                   ` [PATCH 26/32] Implement connect data channel callback Jose Antonio Santos Cadenas
2010-06-02 13:19                                                     ` [PATCH 27/32] Change function name when retreiving remote SDP records Jose Antonio Santos Cadenas
2010-06-02 13:19                                                       ` [PATCH 28/32] Changed HEALTH_MANAGER_INTERFACE to HEALTH_MANAGER Jose Antonio Santos Cadenas
2010-06-02 13:19                                                         ` [PATCH 29/32] Call the agent when a new Health Link is created Jose Antonio Santos Cadenas
2010-06-02 13:19                                                           ` [PATCH 30/32] Add a test that creates a simple health agent Jose Antonio Santos Cadenas
2010-06-02 13:19                                                             ` [PATCH 31/32] Send MCL disconnect callback to agents Jose Antonio Santos Cadenas
2010-06-02 13:19                                                               ` [PATCH 32/32] Add support for mcl reconnections Jose Antonio Santos Cadenas
2010-06-02 13:51 ` [PATCH 00/32] Health device profile (HDP) Johan Hedberg
2010-06-02 14:44   ` José Antonio Santos Cadenas
2010-06-02 20:48 ` Gustavo F. Padovan
  -- strict thread matches above, loose matches on Subject: below --
2010-06-04  8:29 [PATCH 00/32] Health Device Prifile (HDP) -- updated Jose Antonio Santos Cadenas
2010-06-04  8:29 ` [PATCH 01/32] Add Health api description Jose Antonio Santos Cadenas
2010-06-04  8:29   ` [PATCH 02/32] Initial support for HDP Jose Antonio Santos Cadenas
2010-06-04  8:29     ` [PATCH 03/32] Add functions to resiger health instances in SDP Jose Antonio Santos Cadenas
2010-06-04  8:29       ` [PATCH 04/32] Initial support for hdp_device_drivers Jose Antonio Santos Cadenas
2010-06-04  8:29         ` [PATCH 05/32] Register healt_driver interfaces in d-bus Jose Antonio Santos Cadenas
2010-06-04  8:29           ` [PATCH 06/32] Add delete instance petition Jose Antonio Santos Cadenas
2010-06-04  8:30             ` [PATCH 07/32] Add watcher to control client disconections to delete hdp instance Jose Antonio Santos Cadenas
2010-06-04  8:30               ` [PATCH 08/32] Work in getting remote SDP records Jose Antonio Santos Cadenas
2010-06-04  8:30                 ` [PATCH 09/32] Adds functions to get remote suported features from its SDP record Jose Antonio Santos Cadenas
2010-06-04  8:30                   ` [PATCH 10/32] Insert end_point in array returned by get_health_instances Jose Antonio Santos Cadenas
2010-06-04  8:30                     ` [PATCH 11/32] Initial support for connecting instances Jose Antonio Santos Cadenas
2010-06-04  8:30                       ` [PATCH 12/32] Complete the response dictionary in GetHealthInstances response Jose Antonio Santos Cadenas
2010-06-04  8:30                         ` [PATCH 13/32] Implement connection of health instances Jose Antonio Santos Cadenas
2010-06-04  8:30                           ` [PATCH 14/32] Manage mcap instances Jose Antonio Santos Cadenas
2010-06-04  8:30                             ` [PATCH 15/32] Implement connect MCL callback in health instances connection Jose Antonio Santos Cadenas
2010-06-04  8:30                               ` [PATCH 16/32] Register Health link int the bus when MCL is connected Jose Antonio Santos Cadenas
2010-06-04  8:30                                 ` [PATCH 17/32] Analize remote record looking for psm Jose Antonio Santos Cadenas
2010-06-04  8:30                                   ` [PATCH 18/32] Unify the creation of health links Jose Antonio Santos Cadenas
2010-06-04  8:30                                     ` [PATCH 19/32] Remove hdp_device pointer from health link struct Jose Antonio Santos Cadenas
2010-06-04  8:30                                       ` [PATCH 20/32] Release health link resources Jose Antonio Santos Cadenas
2010-06-04  8:30                                         ` [PATCH 21/32] Manage mcap disconnections and reconnections Jose Antonio Santos Cadenas
2010-06-04  8:30                                           ` [PATCH 22/32] Initial work for disconnecting health links Jose Antonio Santos Cadenas
2010-06-04  8:30                                             ` [PATCH 23/32] Avoid multiple links with the same device Jose Antonio Santos Cadenas
2010-06-04  8:30                                               ` [PATCH 24/32] Disconnect health link petition Jose Antonio Santos Cadenas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1275484768-25838-25-git-send-email-santoscadenas@gmail.com \
    --to=santoscadenas@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).