1 files changed, 22 insertions, 48 deletions

diff --git a/src/asr.c b/src/asr.c
index a1aba76..bf15dc2 100644
--- a/src/asr.c
+++ b/src/asr.c
@@ -43,6 +43,7 @@
 #include "asr.h"
 #include "idevicerestore.h"
 #include "common.h"
+#include "ipsw.h"
 
 #define ASR_VERSION 1
 #define ASR_STREAM_ID 1
@@ -205,9 +206,8 @@ void asr_free(asr_client_t asr)
 	}
 }
 
-int asr_perform_validation(asr_client_t asr, const char* filesystem)
+int asr_perform_validation(asr_client_t asr, ipsw_file_handle_t file)
 {
-	FILE* file = NULL;
 	uint64_t length = 0;
 	char* command = NULL;
 	plist_t node = NULL;
@@ -216,20 +216,7 @@ int asr_perform_validation(asr_client_t asr, const char* filesystem)
 	plist_t payload_info = NULL;
 	int attempts = 0;
 
-	file = fopen(filesystem, "rb");
-	if (file == NULL) {
-		return -1;
-	}
-
-#ifdef WIN32
-	length = _lseeki64(fileno(file), 0, SEEK_END);
-	_lseeki64(fileno(file), 0, SEEK_SET);
-	rewind(file);
-#else
-	fseeko(file, 0, SEEK_END);
-	length = ftello(file);
-	fseeko(file, 0, SEEK_SET);
-#endif
+	length = ipsw_file_size(file);
 
 	payload_info = plist_new_dict();
 	plist_dict_set_item(payload_info, "Port", plist_new_uint(1));
@@ -296,7 +283,7 @@ int asr_perform_validation(asr_client_t asr, const char* filesystem)
 	return 0;
 }
 
-int asr_handle_oob_data_request(asr_client_t asr, plist_t packet, FILE* file)
+int asr_handle_oob_data_request(asr_client_t asr, plist_t packet, ipsw_file_handle_t file)
 {
 	char* oob_data = NULL;
 	uint64_t oob_offset = 0;
@@ -324,14 +311,14 @@ int asr_handle_oob_data_request(asr_client_t asr, plist_t packet, FILE* file)
 		return -1;
 	}
 
-#ifdef WIN32
-	rewind(file);
-	_lseeki64(fileno(file), oob_offset, SEEK_SET);
-#else
-	fseeko(file, oob_offset, SEEK_SET);
-#endif
-	if (fread(oob_data, 1, oob_length, file) != oob_length) {
-		error("ERROR: Unable to read OOB data from filesystem offset: %s\n", strerror(errno));
+	if (ipsw_file_seek(file, oob_offset, SEEK_SET) < 0) {
+		error("ERROR: Unable to seek to OOB offset 0x%" PRIx64 "\n", oob_offset);
+		free(oob_data);
+		return -1;
+	}
+	int64_t ir = ipsw_file_read(file, oob_data, oob_length);
+	if (ir != oob_length) {
+		error("ERROR: Unable to read OOB data from filesystem offset 0x%" PRIx64 ", oob_length %" PRIu64 ", read returned %" PRIi64"\n", oob_offset, oob_length, ir);
 		free(oob_data);
 		return -1;
 	}
@@ -345,28 +332,14 @@ int asr_handle_oob_data_request(asr_client_t asr, plist_t packet, FILE* file)
 	return 0;
 }
 
-int asr_send_payload(asr_client_t asr, const char* filesystem)
+int asr_send_payload(asr_client_t asr, ipsw_file_handle_t file)
 {
 	char *data = NULL;
-	FILE* file = NULL;
 	uint64_t i, length, bytes = 0;
 	double progress = 0;
 
-	file = fopen(filesystem, "rb");
-	if (file == NULL) {
-		error("ERROR: Unable to open filesystem image %s: %s\n", filesystem, strerror(errno));
-		return -1;
-	}
-
-#ifdef WIN32
-	length = _lseeki64(fileno(file), 0, SEEK_END);
-	_lseeki64(fileno(file), 0, SEEK_SET);
-	rewind(file);
-#else
-	fseeko(file, 0, SEEK_END);
-	length = ftello(file);
-	fseeko(file, 0, SEEK_SET);
-#endif
+	length = ipsw_file_size(file);
+	ipsw_file_seek(file, 0, SEEK_SET);
 
 	data = (char*)malloc(ASR_PAYLOAD_CHUNK_SIZE + 20);
 
@@ -376,26 +349,28 @@ int asr_send_payload(asr_client_t asr, const char* filesystem)
 		SHA1_Init(&sha1);
 	}
 
-	int size = 0;
 	i = length;
 	int retry = 3;
 	while(i > 0 && retry >= 0) {
-		size = ASR_PAYLOAD_CHUNK_SIZE;
+		uint32_t size = ASR_PAYLOAD_CHUNK_SIZE;
+		uint32_t sendsize = 0;
+
 		if (i < ASR_PAYLOAD_CHUNK_SIZE) {
 			size = i;
 		}
 
-		if (fread(data, 1, size, file) != (size_t)size) {
+		if (ipsw_file_read(file, data, size) != (int64_t)size) {
 			error("Error reading filesystem\n");
 			retry--;
 			continue;
 		}
 
+		sendsize = size;
 		if (asr->checksum_chunks) {
 			SHA1((unsigned char*)data, size, (unsigned char*)(data+size));
+			sendsize += 20;
 		}
-
-		if (asr_send_buffer(asr, data, size+20) < 0) {
+		if (asr_send_buffer(asr, data, sendsize) < 0) {
 			error("ERROR: Unable to send filesystem payload\n");
 			retry--;
 			continue;
@@ -412,6 +387,5 @@ int asr_send_payload(asr_client_t asr, const char* filesystem)
 	}
 
 	free(data);
-	fclose(file);
 	return 0;
 }