diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2006-04-24 19:13:15 +0000 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2006-04-24 19:13:15 +0000 |
| commit | 14c47b9e49311149a56553c71286aaabd6bd2992 (patch) | |
| tree | 3cc641577a01538b9d8d0f0d80723ef838a2c049 /hcid/dbus-manager.c | |
| parent | 40448f0abe91bdbf79ac52a1293251f66ee0f84c (diff) | |
Changed object path hierarchy
Diffstat (limited to 'hcid/dbus-manager.c')
| -rw-r--r-- | hcid/dbus-manager.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hcid/dbus-manager.c b/hcid/dbus-manager.c index 1fc24e39..84d08361 100644 --- a/hcid/dbus-manager.c +++ b/hcid/dbus-manager.c @@ -106,7 +106,7 @@ static DBusHandlerResult handle_mgr_list_devices_req(DBusConnection *conn, DBusM if (ioctl(sk, HCIGETDEVINFO, &di) < 0) continue; - snprintf(path, sizeof(path), "%s/%s", ADAPTER_PATH, di.name); + snprintf(path, sizeof(path), "%s/%s", BASE_PATH, di.name); dbus_message_iter_append_basic(&array_iter, DBUS_TYPE_STRING, &path_ptr); @@ -134,7 +134,7 @@ static DBusHandlerResult handle_mgr_default_adapter_req(DBusConnection *conn, DB if (!reply) return DBUS_HANDLER_RESULT_NEED_MEMORY; - snprintf(path, sizeof(path), "%s/hci%d", ADAPTER_PATH, default_dev); + snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, default_dev); dbus_message_append_args(reply, DBUS_TYPE_STRING, &path_ptr, DBUS_TYPE_INVALID); @@ -164,9 +164,13 @@ static DBusHandlerResult handle_manager_method(DBusConnection *conn, DBusHandlerResult msg_func_manager(DBusConnection *conn, DBusMessage *msg, void *data) { - const char *iface; + const char *iface, *path; iface = dbus_message_get_interface(msg); + path = dbus_message_get_path(msg); + + if (strcmp(BASE_PATH, path)) + return error_no_such_adapter(conn, msg); if (!strcmp(iface, MANAGER_INTERFACE)) return handle_manager_method(conn, msg, data); @@ -174,5 +178,5 @@ DBusHandlerResult msg_func_manager(DBusConnection *conn, DBusMessage *msg, void if (!strcmp(iface, SECURITY_INTERFACE)) return handle_security_method(conn, msg, data); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + return error_unknown_method(conn, msg); } |