[Bluez-devel] D-BUS fixes for hcid

[Johan Hedberg <johan.hedberg@nokia.com>]

[-- Attachment #1: Type: text/plain, Size: 625 bytes --]

Hi,

There are some problems with the current D-BUS pin-request handling in
hcid. The attached patch tries to address those.

Also, the bluez-pin package will need to provide a D-BUS service file
(bluez.service) so that the D-BUS daemon can activate it when needed.
This file goes usually in /usr/lib/dbus-1.0/services and it's contents
should be something like the following:

[D-BUS Service]
Name=org.bluez.PinAgent
Exec=/usr/bin/bluez-pin

You'll also need the following line in /etc/dbus-1/system.conf (at least
the debian package of D-BUS doesn't have it):
<servicedir>/usr/lib/dbus-1.0/services</servicedir>

br,
Johan

[-- Attachment #2: hcid-dbus.diff --]
[-- Type: text/plain, Size: 687 bytes --]

--- dbus.c.orig	2004-06-16 13:57:51.000000000 +0300
+++ dbus.c	2004-06-16 14:05:51.000000000 +0300
@@ -75,7 +75,8 @@
 
 	message = dbus_pending_call_get_reply(call);
 
-	if (dbus_message_is_error(message, WRONG_ARGS_ERROR))
+	if (message == NULL ||
+	    dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_ERROR)
 		goto error;
 
 	dbus_message_iter_init(message, &iter);
@@ -131,6 +132,8 @@
 	dbus_message_iter_append_byte_array(&iter,
 			(unsigned char *) &ci->bdaddr, sizeof(ci->bdaddr));
 
+	dbus_message_set_auto_activation(message, TRUE);
+
 	if (dbus_connection_send_with_reply(connection, message,
 						&pending, TIMEOUT) == FALSE) {
 		syslog(LOG_ERR, "D-BUS send failed");