diff options
Diffstat (limited to 'hcid')
-rw-r--r-- | hcid/dbus-api.txt | 8 | ||||
-rw-r--r-- | hcid/dbus-common.c | 17 | ||||
-rw-r--r-- | hcid/dbus-common.h | 1 | ||||
-rw-r--r-- | hcid/dbus-database.c | 76 |
4 files changed, 95 insertions, 7 deletions
diff --git a/hcid/dbus-api.txt b/hcid/dbus-api.txt index bca8a2c8..ea5a22d3 100644 --- a/hcid/dbus-api.txt +++ b/hcid/dbus-api.txt @@ -243,6 +243,14 @@ Methods void RegisterService(string identifier, string name, string description Possible errors: org.bluez.Error.InvalidArguments org.bluez.Error.Failed + void UpdateServiceRecord(uint32 handle, array{byte}) + + Updates a given service record. + + Possible errors: org.bluez.Error.InvalidArguments + org.bluez.Error.NotAvailable + org.bluez.Error.Failed + void RemoveServiceRecord(uint32 handle) Remove a service record identified by its handle. diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c index 7ea19ba9..cccf8da4 100644 --- a/hcid/dbus-common.c +++ b/hcid/dbus-common.c @@ -451,6 +451,23 @@ int register_sdp_record(sdp_record_t *rec) return err; } +int update_sdp_record(uint32_t handle, sdp_record_t *rec) +{ + if (!get_sdp_session()) + return -1; + + /* Update on the server */ + rec->handle = handle; + if (sdp_device_record_update(sess, BDADDR_ANY, rec)) { + cleanup_sdp_session(); + error("Service Record update failed: %s(%d).\n", + strerror(errno), errno); + return -1; + } + + return 0; +} + int unregister_sdp_record(uint32_t handle) { int err; diff --git a/hcid/dbus-common.h b/hcid/dbus-common.h index 54e7b58d..98513ea0 100644 --- a/hcid/dbus-common.h +++ b/hcid/dbus-common.h @@ -59,6 +59,7 @@ int hcid_dbus_init(void); int register_sdp_binary(uint8_t *data, uint32_t size, uint32_t *handle); int register_sdp_record(sdp_record_t *rec); int unregister_sdp_record(uint32_t handle); +int update_sdp_record(uint32_t handle, sdp_record_t *rec); void cleanup_sdp_session(void); #endif /* __BLUEZ_DBUS_COMMON_H */ diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c index 413fcffa..3e65b02d 100644 --- a/hcid/dbus-database.c +++ b/hcid/dbus-database.c @@ -222,6 +222,67 @@ static DBusHandlerResult add_service_record_from_xml(DBusConnection *conn, return send_message_and_unref(conn, reply); } +static DBusHandlerResult update_service_record(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + struct record_data *user_record; + DBusMessage *reply; + DBusMessageIter iter, array; + sdp_record_t *sdp_record; + dbus_uint32_t handle; + const uint8_t *bin_record; + int err, scanned, size = -1; + + dbus_message_iter_init(msg, &iter); + dbus_message_iter_get_basic(&iter, &handle); + dbus_message_iter_next(&iter); + dbus_message_iter_recurse(&iter, &array); + + dbus_message_iter_get_fixed_array(&array, &bin_record, &size); + if (size <= 0) + return error_invalid_arguments(conn, msg); + + user_record = find_record(handle, dbus_message_get_sender(msg)); + if (!user_record) + return error_not_available(conn, msg); + + reply = dbus_message_new_method_return(msg); + if (!reply) + return DBUS_HANDLER_RESULT_NEED_MEMORY; + + sdp_record = sdp_extract_pdu(bin_record, &scanned); + if (!sdp_record) { + error("Parsing of service record failed"); + dbus_message_unref(reply); + return error_invalid_arguments(conn, msg); + } + + if (scanned != size) { + error("Size mismatch of service record"); + dbus_message_unref(reply); + sdp_record_free(sdp_record); + return error_invalid_arguments(conn, msg); + } + + if (sdp_server_enable) { + if (remove_record_from_server(handle) < 0) + return error_not_available(conn, msg); + + sdp_record->handle = handle; + err = add_record_to_server(sdp_record); + } else + err = update_sdp_record(handle, sdp_record); + + if (err < 0) { + error("Failed to update the service record"); + dbus_message_unref(reply); + sdp_record_free(sdp_record); + return error_failed(conn, msg, EIO); + } + + return send_message_and_unref(conn, reply); +} + static DBusHandlerResult remove_service_record(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -391,13 +452,14 @@ static DBusHandlerResult cancel_authorization_request(DBusConnection *conn, } static struct service_data database_services[] = { - { "AddServiceRecord", add_service_record }, - { "AddServiceRecordFromXML", add_service_record_from_xml }, - { "RemoveServiceRecord", remove_service_record }, - { "RegisterService", register_service }, - { "UnregisterService", unregister_service }, - { "RequestAuthorization", request_authorization }, - { "CancelAuthorizationRequest", cancel_authorization_request }, + { "AddServiceRecord", add_service_record }, + { "AddServiceRecordFromXML", add_service_record_from_xml }, + { "UpdateServiceRecord", update_service_record }, + { "RemoveServiceRecord", remove_service_record }, + { "RegisterService", register_service }, + { "UnregisterService", unregister_service }, + { "RequestAuthorization", request_authorization }, + { "CancelAuthorizationRequest", cancel_authorization_request }, { NULL, NULL } }; |