Re: [Bluez-devel] DBus interface - determining whether a device exists

Frederic Danis
2006-11-10T16:39:21Z

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

Hi Marcel,
> Hi Johan,
>
>
>>> Are you OK with this patch ?
>>>
>> I'm fine with it (although I don't have a good use case for it). However,
>> it'll still need Marcel's blessing before being included.
>>
>
> looks okay to me. Except there are two or three minor whitespace issues
> in the patch. One in a function call and others for the casts. Please
> fix them and then I am okay with that patch. I would prefer that apitest
> also gets updated to use these two new methods.
>
>
Here is a new version of the patch updated. apitest is updated.
Hope it is OK.

Regards

Fred

[-- Attachment #2: hcid.patch --]
[-- Type: text/x-patch, Size: 7038 bytes --]

Index: hcid/dbus-adapter.c
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/dbus-adapter.c,v
retrieving revision 1.135
diff -u -r1.135 dbus-adapter.c
--- hcid/dbus-adapter.c 7 Nov 2006 20:36:10 -0000 1.135
+++ hcid/dbus-adapter.c 10 Nov 2006 16:40:07 -0000
@@ -25,10 +25,12 @@
#include <config.h>
#endif

+#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
+#include <time.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
@@ -2644,6 +2646,126 @@
return DBUS_HANDLER_RESULT_HANDLED;
}

+struct remote_device_list_t {
+ struct slist *list;
+ time_t time;
+};
+
+static void list_remote_devices_do_append(char *key, char *value, void *data)
+{
+ struct remote_device_list_t *param = data;
+ char *address;
+ struct tm date;
+
+ if (slist_find(param->list, key, (cmp_func_t) strcasecmp))
+ return;
+
+ if (param->time){
+ strptime(value, "%Y-%m-%d %H:%M:%S %Z", &date);
+ if (difftime(mktime(&date), param->time) < 0)
+ return;
+ }
+
+ address = strdup(key);
+ if (!address)
+ return;
+
+ param->list = slist_append(param->list, address);
+}
+
+static void remote_devices_do_append(void *data, void *user_data)
+{
+ DBusMessageIter *iter = user_data;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &data);
+}
+
+static DBusHandlerResult adapter_list_remote_devices(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+ struct adapter *adapter = data;
+ DBusMessageIter iter;
+ DBusMessageIter array_iter;
+ DBusMessage *reply;
+ char filename[PATH_MAX + 1];
+ struct remote_device_list_t param = {NULL, 0};
+
+ if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))
+ return error_invalid_arguments(conn, msg);
+
+ /* Add Bonded devices to the list */
+ create_name(filename, PATH_MAX, STORAGEDIR, adapter->address, "linkkeys");
+ textfile_foreach(filename, list_remote_devices_do_append, &param);
+
+ /* Add Last Used devices to the list */
+ create_name(filename, PATH_MAX, STORAGEDIR, adapter->address, "lastused");
+ textfile_foreach(filename, list_remote_devices_do_append, &param);
+
+ /* Add Last Seen devices to the list */
+ create_name(filename, PATH_MAX, STORAGEDIR, adapter->address, "lastseen");
+ textfile_foreach(filename, list_remote_devices_do_append, &param);
+
+ reply = dbus_message_new_method_return(msg);
+
+ dbus_message_iter_init_append(reply, &iter);
+
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING, &array_iter);
+
+ slist_foreach(param.list, remote_devices_do_append, &array_iter);
+
+ slist_foreach(param.list, (slist_func_t) free, NULL);
+ slist_free(param.list);
+
+ dbus_message_iter_close_container(&iter, &array_iter);
+
+ return send_message_and_unref(conn, reply);
+}
+
+static DBusHandlerResult adapter_list_recent_remote_devices(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+ struct adapter *adapter = data;
+ const char *string;
+ struct tm date;
+ DBusMessageIter iter;
+ DBusMessageIter array_iter;
+ DBusMessage *reply;
+ char filename[PATH_MAX + 1];
+ struct remote_device_list_t param = {NULL, 0};
+
+ if (!dbus_message_get_args(msg, NULL,
+ DBUS_TYPE_STRING, &string,
+ DBUS_TYPE_INVALID))
+ return error_invalid_arguments(conn, msg);
+
+ if (strptime(string, "%Y-%m-%d %H:%M:%S", &date) == NULL)
+ return error_invalid_arguments(conn, msg);
+ param.time = mktime(&date);
+
+ /* Add Bonded devices to the list */
+ create_name(filename, PATH_MAX, STORAGEDIR, adapter->address, "linkkeys");
+ textfile_foreach(filename, list_remote_devices_do_append, &param);
+
+ /* Add Last Used devices to the list */
+ create_name(filename, PATH_MAX, STORAGEDIR, adapter->address, "lastused");
+ textfile_foreach(filename, list_remote_devices_do_append, &param);
+
+ reply = dbus_message_new_method_return(msg);
+
+ dbus_message_iter_init_append(reply, &iter);
+
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING, &array_iter);
+
+ slist_foreach(param.list, remote_devices_do_append, &array_iter);
+
+ slist_foreach(param.list, (slist_func_t) free, NULL);
+ slist_free(param.list);
+
+ dbus_message_iter_close_container(&iter, &array_iter);
+
+ return send_message_and_unref(conn, reply);
+}
+
const char *major_class_str(uint32_t class)
{
uint8_t index = (class >> 8) & 0x1F;
@@ -2776,6 +2898,9 @@
{ "DiscoverDevicesWithoutNameResolving", adapter_discover_devices },
{ "CancelDiscovery", adapter_cancel_discovery },

+ { "ListRemoteDevices", adapter_list_remote_devices },
+ { "ListRecentRemoteDevices", adapter_list_recent_remote_devices },
+
{ NULL, NULL }
};

Index: hcid/dbus-api.txt
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/dbus-api.txt,v
retrieving revision 1.82
diff -u -r1.82 dbus-api.txt
--- hcid/dbus-api.txt 8 Nov 2006 18:55:39 -0000 1.82
+++ hcid/dbus-api.txt 10 Nov 2006 16:40:07 -0000
@@ -947,6 +947,20 @@

Signals that a bonding was removed.

+ array{string} ListRemoteDevices()
+
+ List device addresses of all known adapters (seen, used or bonded).
+
+ Possible errors: none
+
+ array{string} ListRecentRemoteDevices(string date)
+
+ List device addresses of all used or bonded adapters since date.
+
+ date format is "YYYY-MM-DD HH:MM:SS GMT"
+
+ Possible errors: none
+

Security hierarchy
==================
Index: test/apitest
===================================================================
RCS file: /cvsroot/bluez/utils/test/apitest,v
retrieving revision 1.2
diff -u -r1.2 apitest
--- test/apitest 19 Oct 2006 12:48:59 -0000 1.2
+++ test/apitest 10 Nov 2006 16:40:07 -0000
@@ -55,7 +55,9 @@
"GetEncryptionKeySize",
"DiscoverDevices",
"DiscoverDevicesWithoutNameResolving",
- "CancelDiscovery" ]
+ "CancelDiscovery",
+ "ListRemoteDevices",
+ "ListRecentRemoteDevices" ]
dev_signals = [ "ModeChanged",
"NameChanged",
"MinorClassChanged",
@@ -386,6 +388,17 @@
print self.device.DiscoverDevices()
elif self.cmd == 'DiscoverDevicesWithoutNameResolving':
print self.device.DiscoverDevicesWithoutNameResolving()
+ elif self.cmd == 'ListRemoteDevices':
+ devices = self.device.ListRemoteDevices()
+ for device in devices:
+ print device,
+ elif self.cmd == 'ListRecentRemoteDevices':
+ if len(self.cmd_args) == 1:
+ devices = self.device.ListRecentRemoteDevices(self.cmd_args[0])
+ for device in devices:
+ print device,
+ else:
+ print 'Usage: %s -i <dev> ListRecentRemoteDevices date' % self.name
else:
# FIXME: remove at future version
print 'Script Error: Method %s not found. Maybe a mispelled word.' % (self.cmd_args)

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

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

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