Re: [Bluez-devel] [PATCH] client.c cleanup

[Bastien Nocera <hadess@hadess.net>]

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


On Fri, 2008-02-01 at 10:46 +0000, Bastien Nocera wrote:
> On Thu, 2008-01-31 at 17:48 +0000, Bastien Nocera wrote:
> <snip>
> > About the hcid bug, should GetInfo fail when the bdaddr for the device
> > isn't available, or should it just give out empty information?
> 
> Patch to allow GetAddress to fail, and don't add the information that's
> not available to the GetInfo dict.

Updated patch.

This one allows GetInfo and GetAddress to fail if there's no valid
bdaddr, and fixes the discussed coding style issues.

[-- Attachment #2: bluez-utils-hcid-allow-getaddr-failure-2.patch --]
[-- Type: text/x-patch, Size: 2129 bytes --]

Index: adapter.c
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/adapter.c,v
retrieving revision 1.13
diff -u -p -r1.13 adapter.c
--- adapter.c	28 Jan 2008 10:38:40 -0000	1.13
+++ adapter.c	1 Feb 2008 12:09:25 -0000
@@ -283,7 +283,7 @@ static DBusHandlerResult adapter_get_inf
 						DBusMessage *msg, void *data)
 {
 	struct adapter *adapter = data;
-	const char *property = adapter->address;
+	const char *property;
 	DBusMessage *reply;
 	DBusMessageIter iter;
 	DBusMessageIter dict;
@@ -291,6 +291,9 @@ static DBusHandlerResult adapter_get_inf
 	char str[249];
 	uint8_t cls[3];
 
+	if (check_address(adapter->address) < 0)
+		return error_not_ready(conn, msg);
+
 	reply = dbus_message_new_method_return(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;
@@ -302,6 +305,7 @@ static DBusHandlerResult adapter_get_inf
 			DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
 			DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
 
+	property = adapter->address;
 	dbus_message_iter_append_dict_entry(&dict, "address",
 			DBUS_TYPE_STRING, &property);
 
@@ -368,6 +372,9 @@ static DBusHandlerResult adapter_get_add
 	if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))
 		return error_invalid_arguments(conn, msg, NULL);
 
+	if (check_address(paddr) < 0)
+		return error_not_ready(conn, msg);
+
 	reply = dbus_message_new_method_return(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;
Index: dbus-api.txt
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/dbus-api.txt,v
retrieving revision 1.135
diff -u -p -r1.135 dbus-api.txt
--- dbus-api.txt	28 Jan 2008 10:38:40 -0000	1.135
+++ dbus-api.txt	1 Feb 2008 12:09:25 -0000
@@ -329,13 +329,15 @@ Methods		dict GetInfo()
 
 			Returns the properties of the local adapter.
 
+			Possible errors: org.bluez.Error.NotReady
+
 		string GetAddress()
 
 			Returns the device address for a given path.
 
 			Example: "00:11:22:33:44:55"
 
-			Possible errors: none
+			Possible errors: org.bluez.Error.NotReady
 
 		string GetVersion()
 

[-- Attachment #3: Type: text/plain, Size: 228 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

[-- Attachment #4: Type: text/plain, Size: 164 bytes --]

_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel