From 30b64de8f30f90875dc78fc2305a6b0fbe209614 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Fri, 13 Dec 2013 12:01:45 +0100 Subject: implemented usbmuxd_read/save/delete_pair_record() --- include/usbmuxd.h | 33 ++++++++++++++ src/libusbmuxd.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/include/usbmuxd.h b/include/usbmuxd.h index ad0b126..75a42f5 100644 --- a/include/usbmuxd.h +++ b/include/usbmuxd.h @@ -184,6 +184,39 @@ int usbmuxd_recv(int sfd, char *data, uint32_t len, uint32_t *recv_bytes); */ int usbmuxd_read_buid(char** buid); +/** + * Read a pairing record + * + * @param record_id the record identifier of the pairing record to retrieve + * @param record_data pointer to a variable that will be set to point to a + * newly allocated buffer containing the pairing record data + * @param record_size pointer to a variable that will be set to the size of + * the buffer returned in record_data + * + * @return 0 on success, a negative error value otherwise. + */ +int usbmuxd_read_pair_record(const char* record_id, char **record_data, uint32_t *record_size); + +/** + * Save a pairing record + * + * @param record_id the record identifier of the pairing record to save + * @param record_data buffer containing the pairing record data + * @param record_size size of the buffer passed in record_data + * + * @return 0 on success, a negative error value otherwise. + */ +int usbmuxd_save_pair_record(const char* record_id, const char *record_data, uint32_t record_size); + +/** + * Delete a pairing record + * + * @param record_id the record identifier of the pairing record to delete. + * + * @return 0 on success, a negative errno value otherwise. + */ +int usbmuxd_delete_pair_record(const char* record_id); + /** * Enable or disable the use of inotify extension. Enabled by default. * Use 0 to disable and 1 to enable inotify support. diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c index 909851c..97662bf 100644 --- a/src/libusbmuxd.c +++ b/src/libusbmuxd.c @@ -452,6 +452,23 @@ static int send_read_buid_packet(int sfd, uint32_t tag) return res; } +static int send_pair_record_packet(int sfd, uint32_t tag, const char* msgtype, const char* pair_record_id, plist_t data) +{ + int res = -1; + + /* construct message plist */ + plist_t plist = create_plist_message(msgtype); + plist_dict_insert_item(plist, "PairRecordID", plist_new_string(pair_record_id)); + if (data) { + plist_dict_insert_item(plist, "PairRecordData", plist_copy(data)); + } + + res = send_plist_packet(sfd, tag, plist); + plist_free(plist); + + return res; +} + /** * Generates an event, i.e. calls the callback function. * A reference to a populated usbmuxd_event_t with information about the event @@ -1103,6 +1120,122 @@ int usbmuxd_read_buid(char **buid) return ret; } +int usbmuxd_read_pair_record(const char* record_id, char **record_data, uint32_t *record_size) +{ + int sfd; + int ret = -1; + + if (!record_id || !record_data || !record_size) { + return -EINVAL; + } + *record_data = NULL; + *record_size = 0; + + sfd = connect_usbmuxd_socket(); + if (sfd < 0) { + DEBUG(1, "%s: Error: Connection to usbmuxd failed: %s\n", + __func__, strerror(errno)); + return sfd; + } + + proto_version = 1; + use_tag++; + + if (send_pair_record_packet(sfd, use_tag, "ReadPairRecord", record_id, NULL) <= 0) { + DEBUG(1, "%s: Error sending connect message!\n", __func__); + } else { + uint32_t rc = 0; + plist_t pl = NULL; + if (usbmuxd_get_result(sfd, use_tag, &rc, &pl)) { + plist_t node = plist_dict_get_item(pl, "PairRecordData"); + if (node && plist_get_node_type(node) == PLIST_DATA) { + uint64_t int64val = 0; + plist_get_data_val(node, record_data, &int64val); + if (record_data && int64val > 0) { + *record_size = (uint32_t)int64val; + ret = 0; + } + } + } else { + ret = -(int)rc; + } + if (pl) + plist_free(pl); + } + + return ret; +} + +int usbmuxd_save_pair_record(const char* record_id, const char *record_data, uint32_t record_size) +{ + int sfd; + int ret = -1; + + if (!record_id || !record_data || !record_size) { + return -EINVAL; + } + + sfd = connect_usbmuxd_socket(); + if (sfd < 0) { + DEBUG(1, "%s: Error: Connection to usbmuxd failed: %s\n", + __func__, strerror(errno)); + return sfd; + } + + proto_version = 1; + use_tag++; + + plist_t data = plist_new_data(record_data, record_size); + if (send_pair_record_packet(sfd, use_tag, "SavePairRecord", record_id, data) <= 0) { + DEBUG(1, "%s: Error sending connect message!\n", __func__); + } else { + uint32_t rc = 0; + if (usbmuxd_get_result(sfd, use_tag, &rc, NULL)) { + ret = 0; + } else { + ret = -(int)rc; + DEBUG(1, "%s: Error: saving pair record failed: %d\n", __func__, ret); + } + } + plist_free(data); + + return ret; +} + +int usbmuxd_delete_pair_record(const char* record_id) +{ + int sfd; + int ret = -1; + + if (!record_id) { + return -EINVAL; + } + + sfd = connect_usbmuxd_socket(); + if (sfd < 0) { + DEBUG(1, "%s: Error: Connection to usbmuxd failed: %s\n", + __func__, strerror(errno)); + return sfd; + } + + proto_version = 1; + use_tag++; + + if (send_pair_record_packet(sfd, use_tag, "DeletePairRecord", record_id, NULL) <= 0) { + DEBUG(1, "%s: Error sending connect message!\n", __func__); + } else { + uint32_t rc = 0; + if (usbmuxd_get_result(sfd, use_tag, &rc, NULL)) { + ret = 0; + } else { + ret = -(int)rc; + DEBUG(1, "%s: Error: deleting pair record failed: %d\n", __func__, ret); + } + } + + return ret; +} + void libusbmuxd_set_use_inotify(int set) { #ifdef HAVE_INOTIFY -- cgit v1.1-32-gdbae