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 #endif +#define _GNU_SOURCE #include #include #include #include +#include #include #include #include @@ -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, ¶m); + + /* Add Last Used devices to the list */ + create_name(filename, PATH_MAX, STORAGEDIR, adapter->address, "lastused"); + textfile_foreach(filename, list_remote_devices_do_append, ¶m); + + /* Add Last Seen devices to the list */ + create_name(filename, PATH_MAX, STORAGEDIR, adapter->address, "lastseen"); + textfile_foreach(filename, list_remote_devices_do_append, ¶m); + + 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, ¶m); + + /* Add Last Used devices to the list */ + create_name(filename, PATH_MAX, STORAGEDIR, adapter->address, "lastused"); + textfile_foreach(filename, list_remote_devices_do_append, ¶m); + + 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 ListRecentRemoteDevices date' % self.name else: # FIXME: remove at future version print 'Script Error: Method %s not found. Maybe a mispelled word.' % (self.cmd_args)