diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-11-20 14:58:55 +0200 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-12-02 11:36:00 +0200 |
commit | 5ee26d43c65c2b3341ed14764361add49fa6ae2b (patch) | |
tree | 37823e31bc4c5d6dbc2abb1b8cdf1f21ebd2066f /obexd | |
parent | f7a8cbd2a3164b6e2e7c517fa53d5549874c1da1 (diff) | |
download | bluez-5ee26d43c65c2b3341ed14764361add49fa6ae2b.tar.gz |
obexd/client: Add DatabaseIdentifier property
This adds DatabaseIdentifier property to PhonebookAccess interface.
Diffstat (limited to 'obexd')
-rw-r--r-- | obexd/client/pbap.c | 71 |
1 files changed, 69 insertions, 2 deletions
diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c index 57f58eed2..97c7cb9c0 100644 --- a/obexd/client/pbap.c +++ b/obexd/client/pbap.c @@ -73,6 +73,7 @@ #define FORMAT_TAG 0X07 #define PHONEBOOKSIZE_TAG 0X08 #define NEWMISSEDCALLS_TAG 0X09 +#define DATABASEID_TAG 0X0D #define DOWNLOAD_FEATURE 0x00000001 #define BROWSE_FEATURE 0x00000002 @@ -133,6 +134,7 @@ struct pbap_data { char *path; uint16_t version; uint32_t supported_features; + uint8_t databaseid[16]; }; struct pending_request { @@ -272,8 +274,33 @@ static void pbap_setpath_cb(struct obc_session *session, pending_request_free(request); } +static void read_databaseid(struct pbap_data *pbap, GObexApparam *apparam) +{ + const guint8 *data; + guint8 value[16]; + gsize len; + + if (!(pbap->supported_features & DATABASEID_FEATURE)) + return; + + if (!g_obex_apparam_get_bytes(apparam, DATABASEID_TAG, &data, &len)) { + len = sizeof(value); + memset(value, 0, len); + data = value; + } + + if (memcmp(data, pbap->databaseid, len)) { + memcpy(pbap->databaseid, data, len); + g_dbus_emit_property_changed(conn, + obc_session_get_path(pbap->session), + PBAP_INTERFACE, "DatabaseIdentifier"); + } +} + static void read_return_apparam(struct obc_transfer *transfer, - guint16 *phone_book_size, guint8 *new_missed_calls) + struct pbap_data *pbap, + guint16 *phone_book_size, + guint8 *new_missed_calls) { GObexApparam *apparam; @@ -288,6 +315,8 @@ static void read_return_apparam(struct obc_transfer *transfer, phone_book_size); g_obex_apparam_get_uint8(apparam, NEWMISSEDCALLS_TAG, new_missed_calls); + + read_databaseid(pbap, apparam); } static void phonebook_size_callback(struct obc_session *session, @@ -308,7 +337,8 @@ static void phonebook_size_callback(struct obc_session *session, reply = dbus_message_new_method_return(request->msg); - read_return_apparam(transfer, &phone_book_size, &new_missed_calls); + read_return_apparam(transfer, request->pbap, &phone_book_size, + &new_missed_calls); dbus_message_append_args(reply, DBUS_TYPE_UINT16, &phone_book_size, @@ -995,8 +1025,45 @@ static gboolean get_folder(const GDBusPropertyTable *property, return TRUE; } +static gboolean databaseid_exists(const GDBusPropertyTable *property, + void *data) +{ + struct pbap_data *pbap = data; + + return pbap->supported_features & DATABASEID_FEATURE; +} + +static int u128_to_string(uint8_t *data, char *str, size_t len) +{ + return snprintf(str, len, "%02X%02X%02X%02X%02X%02X%02X%02X" + "%02X%02X%02X%02X%02X%02X%02X%02X", + data[0], data[1], data[2], data[3], + data[3], data[5], data[6], data[7], + data[8], data[9], data[10], data[11], + data[12], data[13], data[14], data[15]); +} + +static gboolean get_databaseid(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct pbap_data *pbap = data; + char value[33]; + const char *pvalue = value; + + if (!pbap->databaseid) + return FALSE; + + if (u128_to_string(pbap->databaseid, value, sizeof(value)) < 0) + return FALSE; + + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &pvalue); + + return TRUE; +} + static const GDBusPropertyTable pbap_properties[] = { { "Folder", "s", get_folder, NULL, folder_exists }, + { "DatabaseIdentifier", "s", get_databaseid, NULL, databaseid_exists }, { } }; |