Remove common code in favor of libimobiledevice-glue

8 files changed, 12 insertions, 10 deletions

diff --git a/README.md b/README.md
index beea757..ea8c517 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ sudo apt-get install \
 	libusb-1.0-0-dev \
 	libplist-dev \
 	libimobiledevice-dev \
+	libimobiledevice-glue-dev \
 	libcurl4-openssl-dev \
 	libssl-dev \
 	libzip-dev \
@@ -162,4 +163,4 @@ iPadOS, tvOS, watchOS, and macOS are trademarks of Apple Inc.
 This project is an independent software application and has not been
 authorized, sponsored, or otherwise approved by Apple Inc.
 
-README Updated on: 2020-06-12
+README Updated on: 2021-08-30
diff --git a/configure.ac b/configure.ac
index 2e12bae..67e1f4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
 LIBIRECOVERY_VERSION=1.0.1
 LIBIMOBILEDEVICE_VERSION=1.3.0
 LIBPLIST_VERSION=2.2.0
+LIMD_GLUE_VERSION=1.0.0
 LIBZIP_VERSION=0.8
 LIBCURL_VERSION=7.0
 OPENSSL_VERSION=0.9.8
@@ -25,6 +26,7 @@ OPENSSL_VERSION=0.9.8
 AC_SUBST(LIBIRECOVERY_VERSION)
 AC_SUBST(LIBIMOBILEDEVICE_VERSION)
 AC_SUBST(LIBPLIST_VERSION)
+AC_SUBST(LIMD_GLUE_VERSION)
 AC_SUBST(LIBZIP_VERSION)
 AC_SUBST(LIBCURL_VERSION)
 AC_SUBST(OPENSSL_VERSION)
@@ -38,6 +40,7 @@ AC_PROG_LIBTOOL
 PKG_CHECK_MODULES(libirecovery, libirecovery-1.0 >= $LIBIRECOVERY_VERSION)
 PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= $LIBIMOBILEDEVICE_VERSION)
 PKG_CHECK_MODULES(libplist, libplist-2.0 >= $LIBPLIST_VERSION)
+PKG_CHECK_MODULES(limd_glue, libimobiledevice-glue-1.0 >= $LIMD_GLUE_VERSION)
 PKG_CHECK_MODULES(libzip, libzip >= $LIBZIP_VERSION)
 PKG_CHECK_MODULES(libcurl, libcurl >= $LIBCURL_VERSION)
 PKG_CHECK_MODULES(zlib, zlib)
diff --git a/src/Makefile.am b/src/Makefile.am
index 0cfae21..4a99dec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS = \
 	$(libirecovery_CFLAGS) \
 	$(libimobiledevice_CFLAGS) \
 	$(libplist_CFLAGS) \
+	$(limd_glue_CFLAGS) \
 	$(libzip_CFLAGS) \
 	$(zlib_CFLAGS) \
 	$(openssl_CFLAGS) \
@@ -14,6 +15,7 @@ AM_LDFLAGS = \
 	$(libirecovery_LIBS) \
 	$(libimobiledevice_LIBS) \
 	$(libplist_LIBS) \
+	$(limd_glue_LIBS) \
 	$(libzip_LIBS) \
 	$(zlib_LIBS) \
 	$(openssl_LIBS) \
@@ -44,8 +46,6 @@ idevicerestore_SOURCES = \
 	limera1n.c limera1n.h \
 	download.c download.h \
 	locking.c locking.h \
-	socket.c socket.h \
-	thread.c thread.h \
 	jsmn.c jsmn.h \
 	json_plist.c json_plist.h
 if USE_INTERNAL_SHA
diff --git a/src/common.h b/src/common.h
index 3a4c069..40112dc 100644
--- a/src/common.h
+++ b/src/common.h
@@ -37,9 +37,9 @@ extern "C" {
 
 #include <plist/plist.h>
 #include <libirecovery.h>
+#include <libimobiledevice-glue/thread.h>
 
 #include "idevicerestore.h"
-#include "thread.h"
 
 #define _MODE_UNKNOWN         0
 #define _MODE_WTF             1
diff --git a/src/fdr.c b/src/fdr.c
index 5459130..ff7b56e 100644
--- a/src/fdr.c
+++ b/src/fdr.c
@@ -28,8 +28,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <libimobiledevice/libimobiledevice.h>
+#include <libimobiledevice-glue/socket.h>
 
-#include "socket.h" /* from libimobiledevice/common */
 #include "common.h"
 #include "idevicerestore.h"
 #include "fdr.h"
@@ -415,7 +415,7 @@ static int fdr_handle_sync_cmd(fdr_client_t fdr_ctrl)
 {
 	idevice_error_t device_error = IDEVICE_E_SUCCESS;
 	fdr_client_t fdr;
-	thread_t fdr_thread = (thread_t)NULL;
+	THREAD_T fdr_thread = THREAD_T_NULL;
 	int res = 0;
 	uint32_t bytes = 0;
 	char buf[4096];
diff --git a/src/fdr.h b/src/fdr.h
index 9822efc..c10fd6c 100644
--- a/src/fdr.h
+++ b/src/fdr.h
@@ -27,7 +27,6 @@ extern "C" {
 #endif
 
 #include <libimobiledevice/libimobiledevice.h>
-#include "thread.h" /* from libimobiledevice/common */
 
 typedef enum {
 	FDR_CTRL,
diff --git a/src/normal.c b/src/normal.c
index 301dbbe..15d3e29 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -33,7 +33,6 @@
 #include "common.h"
 #include "normal.h"
 #include "recovery.h"
-#include "thread.h"
 
 static int normal_idevice_new(struct idevicerestore_client_t* client, idevice_t* device)
 {
diff --git a/src/restore.c b/src/restore.c
index d5d1463..69e5191 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -3372,7 +3372,7 @@ int restore_device(struct idevicerestore_client_t* client, plist_t build_identit
 	idevice_t device = NULL;
 	restored_client_t restore = NULL;
 	restored_error_t restore_error = RESTORE_E_SUCCESS;
-	thread_t fdr_thread = (thread_t)NULL;
+	THREAD_T fdr_thread = THREAD_T_NULL;
 
 	restore_finished = 0;
 
@@ -3458,7 +3458,7 @@ int restore_device(struct idevicerestore_client_t* client, plist_t build_identit
 	if (!fdr_connect(device, FDR_CTRL, &fdr_control_channel)) {
 		if(thread_new(&fdr_thread, fdr_listener_thread, fdr_control_channel)) {
 			error("ERROR: Failed to start FDR listener thread\n");
-			fdr_thread = (thread_t)NULL; /* undefined after failure */
+			fdr_thread = THREAD_T_NULL; /* undefined after failure */
 		}
 	} else {
 		error("ERROR: Failed to start FDR Ctrl channel\n");