debugging output fixed

'libusbmuxd' added to simplify use of usbmuxd in external tools
testclient removed
setting of configuration 3 disabled (to be handled by udev)

1 files changed, 170 insertions, 0 deletions

diff --git a/libusbmuxd.c b/libusbmuxd.c
new file mode 100644
index 0000000..4e4ec10
--- /dev/null
+++ b/libusbmuxd.c
@@ -0,0 +1,170 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
+#include <usbmuxd.h>
+#include "sock_stuff.h"
+
+static int usbmuxd_get_result(int sfd, uint32_t tag, uint32_t *result)
+{
+    struct usbmuxd_result res;
+    int recv_len;
+
+    if (!result) {
+	return -EINVAL;
+    }
+
+    if ((recv_len = recv_buf(sfd, &res, sizeof(res))) <= 0) {
+	perror("recv");
+	return -errno;
+    } else {
+	if ((recv_len == sizeof(res))
+	    && (res.header.length == recv_len)
+	    && (res.header.reserved == 0)
+	    && (res.header.type == USBMUXD_RESULT)
+	   ) {
+	    *result = res.result;
+	    if (res.header.tag == tag) {
+		return 1;
+	    } else {
+		return 0;
+	    }
+        }
+    }
+
+    return -1;
+}
+
+int usbmuxd_scan(usbmuxd_device_t **devices)
+{
+	struct usbmuxd_scan_request s_req;
+	int sfd;
+	int scan_success = 0;
+	uint32_t res;
+	uint32_t pktlen;
+	int recv_len;
+	usbmuxd_device_t *newlist = NULL;
+	struct usbmuxd_device_info_record dev_info_pkt;
+	int dev_cnt = 0;
+
+	sfd = connect_unix_socket(USBMUXD_SOCKET_FILE);
+	if (sfd < 0) {
+		fprintf(stderr, "%s: error opening socket!\n", __func__);
+		return sfd;
+	}
+
+	s_req.header.length = sizeof(struct usbmuxd_scan_request);
+	s_req.header.reserved = 0;
+	s_req.header.type = USBMUXD_SCAN;
+	s_req.header.tag = 2;
+
+	// send scan request packet
+	if (send_buf(sfd, &s_req, s_req.header.length) == s_req.header.length) {
+		res = -1;
+		// get response
+		if (usbmuxd_get_result(sfd, s_req.header.tag, &res) && (res == 0)) {
+			scan_success = 1;
+		} else {
+			fprintf(stderr, "%s: Did not get response to scan request (with result=0)...\n", __func__);
+			close(sfd);
+			return res;
+		}
+	}
+
+	if (!scan_success) {
+		fprintf(stderr, "%s: Could not send scan request!\n", __func__);
+		return -1;
+	}
+
+	*devices = NULL;
+	// receive device list
+	while (1) {
+		if (recv_buf_timeout(sfd, &pktlen, 4, MSG_PEEK, 500) == 4) {
+			if (pktlen != sizeof(dev_info_pkt)) {
+				// invalid packet size received!
+				fprintf(stderr, "%s: Invalid packet size (%d) received when expecting a device info record.\n", __func__, pktlen);
+				break;
+			}
+
+			recv_len = recv_buf(sfd, &dev_info_pkt, pktlen);
+			if (recv_len <= 0) {
+				fprintf(stderr, "%s: Error when receiving device info record\n", __func__);
+				break;
+			} else if (recv_len < pktlen) {
+				fprintf(stderr, "%s: received less data than specified in header!\n", __func__);
+			} else {
+				//fprintf(stderr, "%s: got device record with id %d, UUID=%s\n", __func__, dev_info_pkt.device_info.device_id, dev_info_pkt.device_info.serial_number);
+				newlist = (usbmuxd_device_t*)realloc(*devices, sizeof(usbmuxd_device_t) * (dev_cnt+1));
+				if (newlist) {
+					memcpy(newlist+dev_cnt, &dev_info_pkt.device, sizeof(usbmuxd_device_t));
+					*devices = newlist;
+					dev_cnt++;
+				} else {
+					fprintf(stderr, "%s: ERROR: out of memory when trying to realloc!\n", __func__);
+					break;
+				}
+			}
+		} else {
+			// we _should_ have all of them now.
+			// or perhaps an error occured.
+			break;
+		}
+	}
+
+	// terminating zero record
+	newlist = (usbmuxd_device_t*)realloc(*devices, sizeof(usbmuxd_device_t) * (dev_cnt+1));
+	memset(newlist+dev_cnt, 0, sizeof(usbmuxd_device_t));
+	*devices = newlist;
+
+	return 0;
+}
+
+int usbmuxd_connect(uint32_t device_id, uint16_t port)
+{
+	int sfd;
+	struct usbmuxd_connect_request c_req;
+	int connected = 0;
+	uint32_t res = -1;
+
+	sfd = connect_unix_socket(USBMUXD_SOCKET_FILE);
+	if (sfd < 0) {
+	    fprintf(stderr, "%s: Error: Connection to usbmuxd failed: %s\n", __func__, strerror(errno));
+	    return sfd;
+	}
+
+	c_req.header.length = sizeof(c_req);
+	c_req.header.reserved = 0;
+	c_req.header.type = USBMUXD_CONNECT;
+	c_req.header.tag = 3;
+	c_req.device_id = device_id;
+	c_req.tcp_dport = htons(port);
+	c_req.reserved = 0;
+
+	if (send_buf(sfd, &c_req, sizeof(c_req)) < 0) {
+	    perror("send");
+	} else {
+	    // read ACK
+	    fprintf(stderr, "%s: Reading connect result...\n", __func__);
+	    if (usbmuxd_get_result(sfd, c_req.header.tag, &res)) {
+		if (res == 0) {
+		    fprintf(stderr, "%s: Connect success!\n", __func__);
+		    connected = 1;
+		} else {
+		    fprintf(stderr, "%s: Connect failed, Error code=%d\n", __func__, res);
+		}
+	    }
+	}
+
+	if (connected) {
+		return sfd;
+	}
+
+	close(sfd);
+	
+	return -1;
+}