1 files changed, 154 insertions, 184 deletions

diff --git a/tools/idevicedebugserverproxy.c b/tools/idevicedebugserverproxy.c
index 5b42473..9fe7051 100644
--- a/tools/idevicedebugserverproxy.c
+++ b/tools/idevicedebugserverproxy.c
@@ -2,6 +2,7 @@
  * idevicedebugserverproxy.c
  * Proxy a debugserver connection from device for remote debugging
  *
+ * Copyright (c) 2021 Nikias Bassen, All Rights Reserved.
  * Copyright (c) 2012 Martin Szulecki All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -28,31 +29,43 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <getopt.h>
 #include <errno.h>
 #include <signal.h>
+#ifdef WIN32
+#include <winsock2.h>
+#include <windows.h>
+#else
+#include <sys/select.h>
+#endif
 
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/debugserver.h>
 
-#include "common/socket.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/socket.h>
+#include <libimobiledevice-glue/thread.h>
+
+#ifndef ETIMEDOUT
+#define ETIMEDOUT 138
+#endif
 
 #define info(...) fprintf(stdout, __VA_ARGS__); fflush(stdout)
 #define debug(...) if(debug_mode) fprintf(stdout, __VA_ARGS__)
 
+static int support_lldb = 0;
 static int debug_mode = 0;
 static int quit_flag = 0;
+static uint16_t local_port = 0;
 
 typedef struct {
 	int client_fd;
 	idevice_t device;
 	debugserver_client_t debugserver_client;
-	volatile int stop_ctod;
-	volatile int stop_dtoc;
 } socket_info_t;
 
 struct thread_info {
 	THREAD_T th;
+	int client_fd;
 	struct thread_info *next;
 };
 
@@ -65,173 +78,114 @@ static void clean_exit(int sig)
 	quit_flag++;
 }
 
-static void print_usage(int argc, char **argv)
+static void print_usage(int argc, char **argv, int is_error)
 {
-	char *name = NULL;
-
-	name = strrchr(argv[0], '/');
-	printf("Usage: %s [OPTIONS] <PORT>\n", (name ? name + 1: argv[0]));
-	printf("\n");
-	printf("Proxy debugserver connection from device to a local socket at PORT.\n");
-	printf("\n");
-	printf("OPTIONS:\n");
-	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
-	printf("  -n, --network\t\tconnect to network device\n");
-	printf("  -d, --debug\t\tenable communication debugging\n");
-	printf("  -h, --help\t\tprints usage information\n");
-	printf("  -v, --version\t\tprints version information\n");
-	printf("\n");
-	printf("Homepage:    <" PACKAGE_URL ">\n");
-	printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
+	char *name = strrchr(argv[0], '/');
+	fprintf(is_error ? stderr : stdout, "Usage: %s [OPTIONS] [PORT]\n", (name ? name + 1: argv[0]));
+	fprintf(is_error ? stderr : stdout,
+		"\n"
+		"Proxy debugserver connection from device to a local socket at PORT.\n"
+		"If PORT is omitted, the next available port will be used and printed\n"
+		"to stdout.\n"
+		"\n"
+		"OPTIONS:\n"
+		"  -u, --udid UDID       target specific device by UDID\n"
+		"  -n, --network         connect to network device\n"
+		"  -d, --debug           enable communication debugging\n"
+		"  -l, --lldb            enable lldb support\n"
+		"  -h, --help            prints usage information\n"
+		"  -v, --version         prints version information\n"
+		"\n"
+		"Homepage:    <" PACKAGE_URL ">\n"
+		"Bug Reports: <" PACKAGE_BUGREPORT ">\n"
+	);
 }
 
-static void *thread_device_to_client(void *data)
-{
-	socket_info_t* socket_info = (socket_info_t*)data;
-	debugserver_error_t res = DEBUGSERVER_E_UNKNOWN_ERROR;
-
-	int recv_len;
-	int sent;
-	char buffer[131072];
-
-	debug("%s: started thread...\n", __func__);
-
-	debug("%s: client_fd = %d\n", __func__, socket_info->client_fd);
-
-	while (!quit_flag && !socket_info->stop_dtoc && socket_info->client_fd > 0) {
-		debug("%s: receiving data from device...\n", __func__);
-
-		res = debugserver_client_receive_with_timeout(socket_info->debugserver_client, buffer, sizeof(buffer), (uint32_t*)&recv_len, 5000);
+static int intercept_packet(char *packet, ssize_t *packet_len) {
+	static const char kReqLaunchServer[] = "$qLaunchGDBServer;#4b";
 
-		if (recv_len <= 0) {
-			if (recv_len == 0 && res == DEBUGSERVER_E_SUCCESS) {
-				// try again
-				continue;
-			} else {
-				fprintf(stderr, "recv failed: %s\n", strerror(errno));
-				break;
-			}
-		} else {
-			/* send to device */
-			debug("%s: sending data to client...\n", __func__);
-			sent = socket_send(socket_info->client_fd, buffer, recv_len);
-			if (sent < recv_len) {
-				if (sent <= 0) {
-					fprintf(stderr, "send failed: %s\n", strerror(errno));
-					break;
-				} else {
-					fprintf(stderr, "only sent %d from %d bytes\n", sent, recv_len);
-				}
-			} else {
-				// sending succeeded, receive from device
-				debug("%s: pushed %d bytes to client\n", __func__, sent);
-			}
-		}
+	char buffer[64] = {0};
+	if (*packet_len == (ssize_t)(sizeof(kReqLaunchServer) - 1)
+		&& memcmp(packet, kReqLaunchServer, sizeof(kReqLaunchServer) - 1) == 0) {
+		sprintf(buffer, "port:%d;", local_port);
+	} else {
+		return 0;
 	}
-
-	debug("%s: shutting down...\n", __func__);
-
-	socket_shutdown(socket_info->client_fd, SHUT_RDWR);
-	socket_close(socket_info->client_fd);
-
-	socket_info->client_fd = -1;
-	socket_info->stop_ctod = 1;
-
-	return NULL;
+	int sum = 0;
+	for (size_t i = 0; i < strlen(buffer); i++) {
+		sum += buffer[i];
+	}
+	sum = sum & 255;
+	sprintf(packet, "$%s#%02x", buffer, sum);
+	*packet_len = strlen(packet);
+	return 1;
 }
 
-static void *thread_client_to_device(void *data)
+static void* connection_handler(void* data)
 {
+	debugserver_error_t derr = DEBUGSERVER_E_SUCCESS;
 	socket_info_t* socket_info = (socket_info_t*)data;
-	debugserver_error_t res = DEBUGSERVER_E_UNKNOWN_ERROR;
+	const int bufsize = 65536;
+	char* buf;
 
-	int recv_len;
-	int sent;
-	char buffer[131072];
-	THREAD_T dtoc;
+	int client_fd = socket_info->client_fd;
 
-	debug("%s: started thread...\n", __func__);
+	debug("%s: client_fd = %d\n", __func__, client_fd);
 
-	debug("%s: client_fd = %d\n", __func__, socket_info->client_fd);
+	derr = debugserver_client_start_service(socket_info->device, &socket_info->debugserver_client, TOOL_NAME);
+	if (derr != DEBUGSERVER_E_SUCCESS) {
+		fprintf(stderr, "Could not start debugserver on device!\nPlease make sure to mount a developer disk image first.\n");
+		return NULL;
+	}
 
-	/* spawn server to client thread */
-	socket_info->stop_dtoc = 0;
-	if (thread_new(&dtoc, thread_device_to_client, data) != 0) {
-		fprintf(stderr, "Failed to start device to client thread...\n");
+	buf = malloc(bufsize);
+	if (!buf) {
+		fprintf(stderr, "Failed to allocate buffer\n");
+		return NULL;
 	}
 
-	while (!quit_flag && !socket_info->stop_ctod && socket_info->client_fd > 0) {
-		debug("%s: receiving data from client...\n", __func__);
+	fd_set fds;
+	FD_ZERO(&fds);
+	FD_SET(client_fd, &fds);
 
-		/* attempt to read incoming data from client */
-		recv_len = socket_receive_timeout(socket_info->client_fd, buffer, sizeof(buffer), 0, 5000);
+	int dtimeout = 1;
 
-		/* any data received? */
-		if (recv_len <= 0) {
-			if (recv_len == 0) {
-				/* try again */
-				continue;
-			} else {
-				fprintf(stderr, "Receive failed: %s\n", strerror(errno));
+	while (!quit_flag) {
+		ssize_t n = socket_receive_timeout(client_fd, buf, bufsize, 0, 1);
+		if (n != -ETIMEDOUT) {
+			if (n < 0) {
+				fprintf(stderr, "Failed to read from client fd: %s\n", strerror(-n));
+				break;
+			} else if (n == 0) {
+				fprintf(stderr, "connection closed\n");
 				break;
 			}
-		} else {
-			/* forward data to device */
-			debug("%s: sending data to device...\n", __func__);
-			res = debugserver_client_send(socket_info->debugserver_client, buffer, recv_len, (uint32_t*)&sent);
-
-			if (sent < recv_len || res != DEBUGSERVER_E_SUCCESS) {
-				if (sent <= 0) {
-					fprintf(stderr, "send failed: %s\n", strerror(errno));
-					break;
-				} else {
-					fprintf(stderr, "only sent %d from %d bytes\n", sent, recv_len);
-				}
+			if (support_lldb && intercept_packet(buf, &n)) {
+				socket_send(client_fd, buf, n);
+				continue;
+			}
+			uint32_t sent = 0;
+			debugserver_client_send(socket_info->debugserver_client, buf, n, &sent);
+		}
+		do {
+			uint32_t r = 0;
+			derr = debugserver_client_receive_with_timeout(socket_info->debugserver_client, buf, bufsize, &r, dtimeout);
+			if (r > 0) {
+				socket_send(client_fd, buf, r);
+				dtimeout = 1;
+			} else if (derr == DEBUGSERVER_E_TIMEOUT) {
+				dtimeout = 5;
+				break;
 			} else {
-				// sending succeeded, receive from device
-				debug("%s: sent %d bytes to device\n", __func__, sent);
+				fprintf(stderr, "debugserver connection closed\n");
+				break;
 			}
+		} while (derr == DEBUGSERVER_E_SUCCESS);
+		if (derr != DEBUGSERVER_E_TIMEOUT && derr != DEBUGSERVER_E_SUCCESS) {
+			break;
 		}
 	}
-
-	debug("%s: shutting down...\n", __func__);
-
-	socket_shutdown(socket_info->client_fd, SHUT_RDWR);
-	socket_close(socket_info->client_fd);
-
-	socket_info->client_fd = -1;
-	socket_info->stop_dtoc = 1;
-
-	/* join other thread to allow it to stop */
-	thread_join(dtoc);
-	thread_free(dtoc);
-
-	return NULL;
-}
-
-static void* connection_handler(void* data)
-{
-	debugserver_error_t derr = DEBUGSERVER_E_SUCCESS;
-	socket_info_t* socket_info = (socket_info_t*)data;
-	THREAD_T ctod;
-
-	debug("%s: client_fd = %d\n", __func__, socket_info->client_fd);
-
-	derr = debugserver_client_start_service(socket_info->device, &socket_info->debugserver_client, TOOL_NAME);
-	if (derr != DEBUGSERVER_E_SUCCESS) {
-		fprintf(stderr, "Could not start debugserver on device!\nPlease make sure to mount a developer disk image first.\n");
-		return NULL;
-	}
-
-	/* spawn client to device thread */
-	socket_info->stop_ctod = 0;
-	if (thread_new(&ctod, thread_client_to_device, data) != 0) {
-		fprintf(stderr, "Failed to start client to device thread...\n");
-	}
-
-	/* join the fun */
-	thread_join(ctod);
-	thread_free(ctod);
+	free(buf);
 
 	debug("%s: shutting down...\n", __func__);
 
@@ -252,10 +206,18 @@ int main(int argc, char *argv[])
 	thread_info_t *thread_list = NULL;
 	const char* udid = NULL;
 	int use_network = 0;
-	uint16_t local_port = 0;
 	int server_fd;
 	int result = EXIT_SUCCESS;
-	int i;
+	int c = 0;
+	const struct option longopts[] = {
+		{ "debug", no_argument, NULL, 'd' },
+		{ "help", no_argument, NULL, 'h' },
+		{ "udid", required_argument, NULL, 'u' },
+		{ "network", no_argument, NULL, 'n' },
+		{ "lldb", no_argument, NULL, 'l' },
+		{ "version", no_argument, NULL, 'v' },
+		{ NULL, 0, NULL, 0}
+	};
 
 #ifndef WIN32
 	struct sigaction sa;
@@ -280,49 +242,43 @@ int main(int argc, char *argv[])
 #endif
 
 	/* parse cmdline arguments */
-	for (i = 1; i < argc; i++) {
-		if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")) {
+	while ((c = getopt_long(argc, argv, "dhu:nv", longopts, NULL)) != -1) {
+		switch (c) {
+		case 'd':
 			debug_mode = 1;
 			idevice_set_debug_level(1);
 			socket_set_verbose(3);
-			continue;
-		}
-		else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--udid")) {
-			i++;
-			if (!argv[i] || !*argv[i]) {
-				print_usage(argc, argv);
-				return 0;
+			break;
+		case 'u':
+			if (!*optarg) {
+				fprintf(stderr, "ERROR: UDID argument must not be empty!\n");
+				print_usage(argc, argv, 1);
+				return 2;
 			}
-			udid = argv[i];
-			continue;
-		}
-		else if (!strcmp(argv[i], "-n") || !strcmp(argv[i], "--network")) {
+			udid = optarg;
+			break;
+		case 'n':
 			use_network = 1;
-			continue;
-		}
-		else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
-			print_usage(argc, argv);
-			return EXIT_SUCCESS;
-		}
-		else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) {
+			break;
+		case 'l':
+			support_lldb = 1;
+			break;
+		case 'h':
+			print_usage(argc, argv, 0);
+			return 0;
+		case 'v':
 			printf("%s %s\n", TOOL_NAME, PACKAGE_VERSION);
-			return EXIT_SUCCESS;
-		}
-		else if (atoi(argv[i]) > 0) {
-			local_port = atoi(argv[i]);
-			continue;
-		}
-		else {
-			print_usage(argc, argv);
-			return EXIT_SUCCESS;
+			return 0;
+		default:
+			print_usage(argc, argv, 1);
+			return 2;
 		}
 	}
+	argc -= optind;
+	argv += optind;
 
-	/* a PORT is mandatory */
-	if (!local_port) {
-		fprintf(stderr, "Please specify a PORT.\n");
-		print_usage(argc, argv);
-		goto leave_cleanup;
+	if (argv[0] && (atoi(argv[0]) > 0)) {
+		local_port = atoi(argv[0]);
 	}
 
 	/* start services and connect to device */
@@ -345,6 +301,17 @@ int main(int argc, char *argv[])
 		goto leave_cleanup;
 	}
 
+	if (local_port == 0) {
+		/* The user asked for any available port. Report the actual port. */
+		uint16_t port;
+		if (0 > socket_get_socket_port(server_fd, &port)) {
+			fprintf(stderr, "Could not determine socket port\n");
+			result = EXIT_FAILURE;
+			goto leave_cleanup;
+		}
+		printf("Listening on port %d\n", port);
+	}
+
 	while (!quit_flag) {
 		debug("%s: Waiting for connection on local port %d\n", __func__, local_port);
 
@@ -361,6 +328,7 @@ int main(int argc, char *argv[])
 			fprintf(stderr, "Out of memory\n");
 			exit(EXIT_FAILURE);
 		}
+		el->client_fd = client_fd;
 		el->next = NULL;
 
 		if (thread_list) {
@@ -390,6 +358,8 @@ int main(int argc, char *argv[])
 	/* join and clean up threads */
 	while (thread_list) {
 		thread_info_t *el = thread_list;
+		socket_shutdown(el->client_fd, SHUT_RDWR);
+		socket_close(el->client_fd);
 		thread_join(el->th);
 		thread_free(el->th);
 		thread_list = el->next;