From 0e4fb99549e0a1b4f5330598ec30a222e0fb75cc Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Mon, 16 Jul 2012 23:41:02 +0200
Subject: moved *.c to src/ subdirectory

---
 Makefile           |    8 +-
 irecovery.c        |  397 -------------
 libirecovery.c     | 1684 ----------------------------------------------------
 src/irecovery.c    |  397 +++++++++++++
 src/libirecovery.c | 1684 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 2085 insertions(+), 2085 deletions(-)
 delete mode 100644 irecovery.c
 delete mode 100644 libirecovery.c
 create mode 100644 src/irecovery.c
 create mode 100644 src/libirecovery.c

diff --git a/Makefile b/Makefile
index a564b1d..05fd4ef 100644
--- a/Makefile
+++ b/Makefile
@@ -56,11 +56,11 @@ ifdef WIN32
 	LIBIRECOVERY_SHARED_LIBS = $(LIBS)
 endif
 
-LIBIRECOVERY_OBJECTS = libirecovery.o
-IRECOVERY_OBJECTS = irecovery.o libirecovery.a
+LIBIRECOVERY_OBJECTS = src/libirecovery.o
+IRECOVERY_OBJECTS = src/irecovery.o libirecovery.a
 
 TARGETS = $(LIBIRECOVERY_SHARED_TARGET) $(LIBIRECOVERY_STATIC_TARGET) $(IRECOVERY_TARGET)
-OBJECTS = libirecovery.o irecovery.o
+OBJECTS = src/libirecovery.o src/irecovery.o
 
 all: $(TARGETS)
 
@@ -80,5 +80,5 @@ $(IRECOVERY_TARGET): $(IRECOVERY_OBJECTS)
 	$(CC) -o $@ $^ $(IRECOVERY_LDFLAGS) $(IRECOVERY_LIBS)
 		
 clean:
-	$(RM) $(LIBIRECOVERY_STATIC_TARGET) $(LIBIRECOVERY_SHARED_TARGET) $(IRECOVERY_TARGET) *.o 
+	$(RM) $(LIBIRECOVERY_STATIC_TARGET) $(LIBIRECOVERY_SHARED_TARGET) $(IRECOVERY_TARGET) src/*.o 
 
diff --git a/irecovery.c b/irecovery.c
deleted file mode 100644
index 89f30a6..0000000
--- a/irecovery.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/**
-  * GreenPois0n iRecovery - irecovery.c
-  * Copyright (C) 2010-2011 Chronic-Dev Team
-  * Copyright (C) 2010-2011 Joshua Hill
-  * Copyright (C) 2008-2011 Nicolas Haunold
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- **/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <libirecovery.h>
-#include <readline/readline.h>
-#include <readline/history.h>
-
-#define FILE_HISTORY_PATH ".irecovery"
-#define debug(...) if(verbose) fprintf(stderr, __VA_ARGS__)
-
-enum {
-	kResetDevice, kStartShell, kSendCommand, kSendFile, kSendExploit, kSendScript
-};
-
-static unsigned int quit = 0;
-static unsigned int verbose = 0;
-
-void print_progress_bar(double progress);
-int received_cb(irecv_client_t client, const irecv_event_t* event);
-int progress_cb(irecv_client_t client, const irecv_event_t* event);
-int precommand_cb(irecv_client_t client, const irecv_event_t* event);
-int postcommand_cb(irecv_client_t client, const irecv_event_t* event);
-
-void shell_usage() {
-	printf("Usage:\n");
-	printf("\t/upload <file>\tSend file to client.\n");
-	printf("\t/exploit [file]\tSend usb exploit with optional payload\n");
-	printf("\t/deviceinfo\tShow device information (ECID, IMEI, etc.)\n");
-	printf("\t/help\t\tShow this help.\n");
-	printf("\t/exit\t\tExit interactive shell.\n");
-}
-
-void parse_command(irecv_client_t client, unsigned char* command, unsigned int size) {
-	char* cmd = strdup(command);
-	char* action = strtok(cmd, " ");
-	debug("Executing %s\n", action);
-	if (!strcmp(cmd, "/exit")) {
-		quit = 1;
-	} else
-
-	if (!strcmp(cmd, "/help")) {
-		shell_usage();
-	} else
-
-	if (!strcmp(cmd, "/upload")) {
-		char* filename = strtok(NULL, " ");
-		debug("Uploading files %s\n", filename);
-		if (filename != NULL) {
-			irecv_send_file(client, filename, 0);
-		}
-	} else
-
-	if (!strcmp(cmd, "/deviceinfo")) {
-		int ret;
-		unsigned int cpid, bdid;
-		unsigned long long ecid;
-		unsigned char srnm[12], imei[15], bt[15];
-
-		ret = irecv_get_cpid(client, &cpid);
-		if(ret == IRECV_E_SUCCESS) {
-			printf("CPID: %d\n", cpid);
-		}
-
-		ret = irecv_get_bdid(client, &bdid);
-		if(ret == IRECV_E_SUCCESS) {
-			printf("BDID: %d\n", bdid);
-		}
-
-		ret = irecv_get_ecid(client, &ecid);
-		if(ret == IRECV_E_SUCCESS) {
-			printf("ECID: %lld\n", ecid);
-		}
-
-		ret = irecv_get_srnm(client, srnm);
-		if(ret == IRECV_E_SUCCESS) {
-			printf("SRNM: %s\n", srnm);
-		}
-
-		ret = irecv_get_imei(client, imei);
-		if(ret == IRECV_E_SUCCESS) {
-			printf("IMEI: %s\n", imei);
-		}
-	} else
-
-	if (!strcmp(cmd, "/exploit")) {
-		char* filename = strtok(NULL, " ");
-		debug("Sending exploit %s\n", filename);
-		if (filename != NULL) {
-			irecv_send_file(client, filename, 0);
-		}
-		irecv_send_exploit(client);
-	} else
-
-		if (!strcmp(cmd, "/execute")) {
-			char* filename = strtok(NULL, " ");
-			debug("Executing script %s\n", filename);
-			if (filename != NULL) {
-				irecv_execute_script(client, filename);
-			}
-		}
-
-
-	free(action);
-}
-
-void load_command_history() {
-	read_history(FILE_HISTORY_PATH);
-}
-
-void append_command_to_history(char* cmd) {
-	add_history(cmd);
-	write_history(FILE_HISTORY_PATH);
-}
-
-void init_shell(irecv_client_t client) {
-	irecv_error_t error = 0;
-	load_command_history();
-	irecv_event_subscribe(client, IRECV_PROGRESS, &progress_cb, NULL);
-	irecv_event_subscribe(client, IRECV_RECEIVED, &received_cb, NULL);
-	irecv_event_subscribe(client, IRECV_PRECOMMAND, &precommand_cb, NULL);
-	irecv_event_subscribe(client, IRECV_POSTCOMMAND, &postcommand_cb, NULL);
-	while (!quit) {
-		error = irecv_receive(client);
-
-		if (error != IRECV_E_SUCCESS) {
-			debug("%s\n", irecv_strerror(error));
-			break;
-		}
-
-		char* cmd = readline("> ");
-		if (cmd && *cmd) {
-			error = irecv_send_command(client, cmd);
-			if (error != IRECV_E_SUCCESS) {
-				quit = 1;
-			}
-
-			append_command_to_history(cmd);
-			free(cmd);
-		}
-	}
-}
-
-int received_cb(irecv_client_t client, const irecv_event_t* event) {
-	if (event->type == IRECV_RECEIVED) {
-		int i = 0;
-		int size = event->size;
-		char* data = event->data;
-		for (i = 0; i < size; i++) {
-			printf("%c", data[i]);
-		}
-	}
-	return 0;
-}
-
-int precommand_cb(irecv_client_t client, const irecv_event_t* event) {
-	if (event->type == IRECV_PRECOMMAND) {
-		irecv_error_t error = 0;
-		if (event->data[0] == '/') {
-			parse_command(client, event->data, event->size);
-			return -1;
-		}
-	}
-	return 0;
-}
-
-int postcommand_cb(irecv_client_t client, const irecv_event_t* event) {
-	char* value = NULL;
-	char* action = NULL;
-	char* command = NULL;
-	char* argument = NULL;
-	irecv_error_t error = IRECV_E_SUCCESS;
-
-	if (event->type == IRECV_POSTCOMMAND) {
-		command = strdup(event->data);
-		action = strtok(command, " ");
-		if (!strcmp(action, "getenv")) {
-			argument = strtok(NULL, " ");
-			error = irecv_getenv(client, argument, &value);
-			if (error != IRECV_E_SUCCESS) {
-				debug("%s\n", irecv_strerror(error));
-				free(command);
-				return error;
-			}
-			printf("%s\n", value);
-			free(value);
-		}
-
-		if (!strcmp(action, "reboot")) {
-			quit = 1;
-		}
-	}
-
-	if (command) free(command);
-	return 0;
-}
-
-int progress_cb(irecv_client_t client, const irecv_event_t* event) {
-	if (event->type == IRECV_PROGRESS) {
-		print_progress_bar(event->progress);
-	}
-	return 0;
-}
-
-void print_progress_bar(double progress) {
-	int i = 0;
-	if(progress < 0) {
-		return;
-	}
-
-	if(progress > 100) {
-		progress = 100;
-	}
-
-	printf("\r[");
-	for(i = 0; i < 50; i++) {
-		if(i < progress / 2) {
-			printf("=");
-		} else {
-			printf(" ");
-		}
-	}
-
-	printf("] %3.1f%%", progress);
-	fflush(stdout);
-	if(progress == 100) {
-		printf("\n");
-	}
-}
-
-void print_usage() {
-	printf("iRecovery - iDevice Recovery Utility\n");
-	printf("Usage: irecovery [args]\n");
-	printf("\t-i <ecid>\tTarget specific device by its hexadecimal ECID\n");
-	printf("\t-v\t\tStart irecovery in verbose mode.\n");
-	printf("\t-c <cmd>\tSend command to client.\n");
-	printf("\t-f <file>\tSend file to client.\n");
-	printf("\t-k [payload]\tSend usb exploit to client.\n");
-	printf("\t-h\t\tShow this help.\n");
-	printf("\t-r\t\tReset client.\n");
-	printf("\t-s\t\tStart interactive shell.\n");
-	printf("\t-e <script>\tExecutes recovery shell script.\n");
-	exit(1);
-}
-
-int main(int argc, char* argv[]) {
-	int i = 0;
-	int opt = 0;
-	int action = 0;
-	unsigned long long ecid = 0;
-	char* argument = NULL;
-	irecv_error_t error = 0;
-	if (argc == 1) print_usage();
-	while ((opt = getopt(argc, argv, "i:vhrsc:f:e:k::")) > 0) {
-		switch (opt) {
-		case 'i':
-			if (optarg) {
-				char* tail = NULL;
-                                ecid = strtoull(optarg, &tail, 16);
-                                if (tail && (tail[0] != '\0')) {
-                                        ecid = 0;
-                                }
-                                if (ecid == 0) {
-                                        fprintf(stderr, "ERROR: Could not parse ECID from argument '%s'\n", optarg);
-                                        return -1;
-                                }
-			}
-			break;
-
-		case 'v':
-			verbose += 1;
-			break;
-
-		case 'h':
-			print_usage();
-			break;
-
-		case 'r':
-			action = kResetDevice;
-			break;
-
-		case 's':
-			action = kStartShell;
-			break;
-
-		case 'f':
-			action = kSendFile;
-			argument = optarg;
-			break;
-
-		case 'c':
-			action = kSendCommand;
-			argument = optarg;
-			break;
-
-		case 'k':
-			action = kSendExploit;
-			argument = optarg;
-			break;
-
-		case 'e':
-			action = kSendScript;
-			argument = optarg;
-			break;
-
-		default:
-			fprintf(stderr, "Unknown argument\n");
-			return -1;
-		}
-	}
-
-	if (verbose) irecv_set_debug_level(verbose);
-
-	irecv_init();
-	irecv_client_t client = NULL;
-	for (i = 0; i <= 5; i++) {
-		debug("Attempting to connect... \n");
-
-		if (irecv_open(&client, ecid) != IRECV_E_SUCCESS)
-			sleep(1);
-		else
-			break;
-
-		if (i == 5) {
-			return -1;
-		}
-	}
-
-	switch (action) {
-	case kResetDevice:
-		irecv_reset(client);
-		break;
-
-	case kSendFile:
-		irecv_event_subscribe(client, IRECV_PROGRESS, &progress_cb, NULL);
-		error = irecv_send_file(client, argument, 1);
-		debug("%s\n", irecv_strerror(error));
-		break;
-
-	case kSendCommand:
-		error = irecv_send_command(client, argument);
-		debug("%s\n", irecv_strerror(error));
-		break;
-
-	case kSendExploit:
-		if (argument != NULL) {
-			irecv_event_subscribe(client, IRECV_PROGRESS, &progress_cb, NULL);
-			error = irecv_send_file(client, argument, 0);
-			if (error != IRECV_E_SUCCESS) {
-				debug("%s\n", irecv_strerror(error));
-				break;
-			}
-		}
-		error = irecv_send_exploit(client);
-		debug("%s\n", irecv_strerror(error));
-		break;
-
-	case kStartShell:
-		init_shell(client);
-		break;
-
-	case kSendScript:
-		error = irecv_execute_script(client, argument);
-		if(error != IRECV_E_SUCCESS) {
-			debug("%s\n", irecv_strerror(error));
-		}
-		break;
-
-	default:
-		fprintf(stderr, "Unknown action\n");
-		break;
-	}
-
-	irecv_close(client);
-	return 0;
-}
-
diff --git a/libirecovery.c b/libirecovery.c
deleted file mode 100644
index 4419b50..0000000
--- a/libirecovery.c
+++ /dev/null
@@ -1,1684 +0,0 @@
-/**
-  * GreenPois0n iRecovery - libirecovery.c
-  * Copyright (C) 2010 Chronic-Dev Team
-  * Copyright (C) 2010 Joshua Hill
-  * Copyright (C) 2008-2011 Nicolas Haunold
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- **/
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifndef WIN32
-#include <libusb-1.0/libusb.h>
-#define _FMT_qX "%qX"
-#define _FMT_016llx "%016llx"
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <setupapi.h>
-#define _FMT_qX "%I64X"
-#define _FMT_016llx "%016I64x"
-#endif
-
-#include "libirecovery.h"
-
-#define USB_TIMEOUT 10000
-
-#define BUFFER_SIZE 0x1000
-#define debug(...) if(libirecovery_debug) fprintf(stderr, __VA_ARGS__)
-
-static int libirecovery_debug = 0;
-#ifndef WIN32
-static libusb_context* libirecovery_context = NULL;
-#endif
-
-int irecv_write_file(const char* filename, const void* data, size_t size);
-int irecv_read_file(const char* filename, char** data, uint32_t* size);
-
-static unsigned int dfu_hash_t1[256] = {
-	0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-	0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-	0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-	0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-	0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-	0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-	0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-	0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-	0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-	0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-	0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-	0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-	0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-	0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-	0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-	0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-	0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-	0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-	0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-	0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-	0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-	0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-	0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-	0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-	0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-	0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-	0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-	0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-	0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-	0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-	0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-	0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-	0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-	0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-	0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-	0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-	0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-	0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-	0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-	0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-	0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-	0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-	0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-	0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-	0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-	0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-	0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-	0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-	0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-	0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-	0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-	0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-	0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-	0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-	0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-	0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-	0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-	0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-	0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-	0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-	0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-	0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-	0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-	0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D,
-};
-
-#define dfu_hash_step(a,b) \
-	a = (dfu_hash_t1[(a & 0xFF) ^ ((unsigned char)b)] ^ (a >> 8))
-
-#ifdef WIN32
-static const GUID GUID_DEVINTERFACE_IBOOT = {0xED82A167L, 0xD61A, 0x4AF6, {0x9A, 0xB6, 0x11, 0xE5, 0x22, 0x36, 0xC5, 0x76}};
-static const GUID GUID_DEVINTERFACE_DFU = {0xB8085869L, 0xFEB9, 0x404B, {0x8C, 0xB1, 0x1E, 0x5C, 0x14, 0xFA, 0x8C, 0x54}};
-
-typedef struct usb_control_request {
-	uint8_t bmRequestType;
-	uint8_t bRequest;
-	uint16_t wValue;
-	uint16_t wIndex;
-	uint16_t wLength;
-
-	char data[];
-} usb_control_request;
-
-int irecv_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc_index, unsigned char * buffer, int size);
-
-irecv_error_t mobiledevice_openpipes(irecv_client_t client);
-void mobiledevice_closepipes(irecv_client_t client);
-
-irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ecid) {
-	irecv_error_t ret;
-	int found = 0;
-	SP_DEVICE_INTERFACE_DATA currentInterface;
-	HDEVINFO usbDevices;
-	DWORD i;
-	irecv_client_t _client = (irecv_client_t) malloc(sizeof(struct irecv_client));
-	memset(_client, 0, sizeof(struct irecv_client));
-
-	// Get DFU paths
-	usbDevices = SetupDiGetClassDevs(&GUID_DEVINTERFACE_DFU, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-	memset(&currentInterface, '\0', sizeof(SP_DEVICE_INTERFACE_DATA));
-	currentInterface.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
-	for(i = 0; usbDevices && SetupDiEnumDeviceInterfaces(usbDevices, NULL, &GUID_DEVINTERFACE_DFU, i, &currentInterface); i++) {
-		if (_client->DfuPath) {
-			free(_client->DfuPath);
-			_client->DfuPath = NULL;
-		}
-		_client->handle = NULL;
-		DWORD requiredSize = 0;
-		PSP_DEVICE_INTERFACE_DETAIL_DATA details;
-		SetupDiGetDeviceInterfaceDetail(usbDevices, &currentInterface, NULL, 0, &requiredSize, NULL);
-		details = (PSP_DEVICE_INTERFACE_DETAIL_DATA) malloc(requiredSize);
-		details->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
-		if(!SetupDiGetDeviceInterfaceDetail(usbDevices, &currentInterface, details, requiredSize, NULL, NULL)) {
-			free(details);
-			continue;
-		} else {
-			LPSTR result = (LPSTR) malloc(requiredSize - sizeof(DWORD));
-			memcpy((void*) result, details->DevicePath, requiredSize - sizeof(DWORD));
-			free(details);
-
-			_client->DfuPath = result;
-			if (mobiledevice_openpipes(_client) != IRECV_E_SUCCESS) {
-				mobiledevice_closepipes(_client);
-				continue;
-			}
-
-			if (ecid == kWTFMode) {
-				if (_client->mode != kWTFMode) {
-					// special ecid case, ignore !kWTFMode
-					continue;
-				} else {
-					ecid = 0;
-				}
-			}
-
-			if ((ecid != 0) && (_client->mode == kWTFMode)) {
-				// we can't get ecid in WTF mode
-				mobiledevice_closepipes(_client);
-				continue;
-			}
-
-			_client->serial[0] = '\0';
-			if ((sscanf(result, "\\\\?\\usb#vid_%*04x&pid_%*04x#%s#", _client->serial) != 1) || (_client->serial[0] == '\0')) {
-				mobiledevice_closepipes(_client);
-				continue;
-			}
-
-			char* p = strchr(_client->serial, '#');
-			if (p) {
-				*p = '\0';
-			}
-
-			int j;
-			for (j = 0; j < strlen(_client->serial); j++) {
-				if (_client->serial[j] == '_') {
-					_client->serial[j] = ' ';
-				} else {
-					_client->serial[j] = toupper(_client->serial[j]);	
-				}
-			}
-
-			if (ecid != 0) {
-				char* ecid_string = strstr(_client->serial, "ECID:");
-				if (ecid_string == NULL) {
-					debug("%s: could not get ECID for device\n", __func__);
-					mobiledevice_closepipes(_client);
-					continue;
-				}
-
-				unsigned long long this_ecid = 0;
-				sscanf(ecid_string, "ECID:" _FMT_qX, (unsigned long long*)&this_ecid);
-				if (this_ecid != ecid) {
-					mobiledevice_closepipes(_client);
-					continue;
-				}
-				debug("found device with ECID " _FMT_016llx "\n", (unsigned long long)ecid);
-			}
-			found = 1;
-			break;
-		}
-	}
-	SetupDiDestroyDeviceInfoList(usbDevices);
-
-	if (found) {
-		*client = _client;
-		return IRECV_E_SUCCESS;
-	}
-
-	// Get iBoot path
-	usbDevices = SetupDiGetClassDevs(&GUID_DEVINTERFACE_IBOOT, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-	memset(&currentInterface, '\0', sizeof(SP_DEVICE_INTERFACE_DATA));
-	currentInterface.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
-	for(i = 0; usbDevices && SetupDiEnumDeviceInterfaces(usbDevices, NULL, &GUID_DEVINTERFACE_IBOOT, i, &currentInterface); i++) {
-		if (_client->iBootPath) {
-			free(_client->iBootPath);
-			_client->iBootPath = NULL;
-		}
-		_client->handle = NULL;
-		DWORD requiredSize = 0;
-		PSP_DEVICE_INTERFACE_DETAIL_DATA details;
-		SetupDiGetDeviceInterfaceDetail(usbDevices, &currentInterface, NULL, 0, &requiredSize, NULL);
-		details = (PSP_DEVICE_INTERFACE_DETAIL_DATA) malloc(requiredSize);
-		details->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
-		if(!SetupDiGetDeviceInterfaceDetail(usbDevices, &currentInterface, details, requiredSize, NULL, NULL)) {
-			free(details);
-			continue;
-		} else {
-			LPSTR result = (LPSTR) malloc(requiredSize - sizeof(DWORD));
-			memcpy((void*) result, details->DevicePath, requiredSize - sizeof(DWORD));
-			free(details);
-
-			_client->iBootPath = result;
-			if (mobiledevice_openpipes(_client) != IRECV_E_SUCCESS) {
-				mobiledevice_closepipes(_client);
-				continue;
-			}
-
-			if ((ecid != 0) && (_client->mode == kWTFMode)) {
-				// we can't get ecid in WTF mode
-				mobiledevice_closepipes(_client);
-				continue;
-			}
-
-			_client->serial[0] = '\0';
-			if ((sscanf(result, "\\\\?\\usb#vid_%*04x&pid_%*04x#%s#", _client->serial) != 1) || (_client->serial[0] == '\0')) {
-				mobiledevice_closepipes(_client);
-				continue;
-			}
-
-			char* p = strchr(_client->serial, '#');
-			if (p) {
-				*p = '\0';
-			}
-
-			int j;
-			for (j = 0; j < strlen(_client->serial); j++) {
-				if (_client->serial[j] == '_') {
-					_client->serial[j] = ' ';
-				} else {
-					_client->serial[j] = toupper(_client->serial[j]);	
-				}
-			}
-
-			if (ecid != 0) {
-				char* ecid_string = strstr(_client->serial, "ECID:");
-				if (ecid_string == NULL) {
-					debug("%s: could not get ECID for device\n", __func__);
-					mobiledevice_closepipes(_client);
-					continue;
-				}
-
-				unsigned long long this_ecid = 0;
-				sscanf(ecid_string, "ECID:" _FMT_qX, (unsigned long long*)&this_ecid);
-				if (this_ecid != ecid) {
-					mobiledevice_closepipes(_client);
-					continue;
-				}
-				debug("found device with ECID " _FMT_016llx" \n", (unsigned long long)ecid);
-			}
-			found = 1;
-			break;
-		}
-	}
-	SetupDiDestroyDeviceInfoList(usbDevices);
-
-	if (!found) {
-		irecv_close(_client);
-		return IRECV_E_UNABLE_TO_CONNECT;
-	}
-	
-	*client = _client;
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t mobiledevice_openpipes(irecv_client_t client) {
-	if (client->iBootPath && !(client->hIB = CreateFile(client->iBootPath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL))) {
-		irecv_close(client);
-		return IRECV_E_UNABLE_TO_CONNECT;
-	}
-	if (client->DfuPath && !(client->hDFU = CreateFile(client->DfuPath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL))) {
-		irecv_close(client);
-		return IRECV_E_UNABLE_TO_CONNECT;
-	}
-
-	client->mode = 0;
-	if (client->iBootPath == NULL) {
-		if (strncmp(client->DfuPath, "\\\\?\\usb#vid_05ac&pid_", 21) == 0) {
-			sscanf(client->DfuPath+21, "%x#", &client->mode);
-		}
-		client->handle = client->hDFU;
-	} else {
-		if (strncmp(client->iBootPath, "\\\\?\\usb#vid_05ac&pid_", 21) == 0) {
-			sscanf(client->iBootPath+21, "%x#", &client->mode);
-		}
-		client->handle = client->hIB;
-	}
-	
-	if (client->mode == 0) {
-		irecv_close(client);
-		return IRECV_E_UNABLE_TO_CONNECT;
-	}
-	
-	return IRECV_E_SUCCESS;
-}
-
-void mobiledevice_closepipes(irecv_client_t client) {
-	if (client->hDFU!=NULL) {
-		CloseHandle(client->hDFU);
-		client->hDFU = NULL;
-	}
-	if (client->hIB!=NULL) {
-		CloseHandle(client->hIB);
-		client->hIB = NULL;
-	}
-}
-#endif
-
-int check_context(irecv_client_t client) {
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-void irecv_init() {
-#ifndef WIN32
-	libusb_init(&libirecovery_context);
-#endif
-}
-
-void irecv_exit() {
-#ifndef WIN32
-	if (libirecovery_context != NULL) {
-		libusb_exit(libirecovery_context);
-		libirecovery_context = NULL;
-	}
-#endif
-}
-
-#ifdef __APPLE__
-	void dummy_callback() { }
-#endif
-
-int irecv_control_transfer( irecv_client_t client,
-							uint8_t bmRequestType,
-							uint8_t bRequest,
-							uint16_t wValue,
-							uint16_t wIndex,
-							unsigned char *data,
-							uint16_t wLength,
-							unsigned int timeout) {
-#ifndef WIN32
-	return libusb_control_transfer(client->handle, bmRequestType, bRequest, wValue, wIndex, data, wLength, timeout);
-#else
-	DWORD count = 0;
-	DWORD ret;
-	BOOL bRet;
-	OVERLAPPED overlapped;
-	
-	if (data == NULL) wLength = 0;
-	
-	usb_control_request* packet = (usb_control_request*) malloc(sizeof(usb_control_request) + wLength);
-	packet->bmRequestType = bmRequestType;
-	packet->bRequest = bRequest;
-	packet->wValue = wValue;
-	packet->wIndex = wIndex;
-	packet->wLength = wLength;
-	
-	if (bmRequestType < 0x80 && wLength > 0) {
-		memcpy(packet->data, data, wLength);
-	}
-	
-	memset(&overlapped, 0, sizeof(overlapped));
-	overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-	DeviceIoControl(client->handle, 0x2200A0, packet, sizeof(usb_control_request) + wLength, packet, sizeof(usb_control_request) + wLength, NULL, &overlapped);
-	ret = WaitForSingleObject(overlapped.hEvent, timeout);
-	bRet = GetOverlappedResult(client->handle, &overlapped, &count, FALSE);
-	CloseHandle(overlapped.hEvent);
-	if (!bRet) {
-		CancelIo(client->handle);
-		free(packet);
-		return -1;
-	}
-	
-	count -= sizeof(usb_control_request);
-	if (count > 0) {
-		if (bmRequestType >= 0x80) {
-			memcpy(data, packet->data, count);
-		}
-	}
-	free(packet);
-	return count;
-#endif
-}
-
-int irecv_bulk_transfer(irecv_client_t client,
-							unsigned char endpoint,
-							unsigned char *data,
-							int length,
-							int *transferred,
-							unsigned int timeout) {
-	int ret;
-
-#ifndef WIN32
-	ret = libusb_bulk_transfer(client->handle, endpoint, data, length, transferred, timeout);
-	if (ret < 0) {
-		libusb_clear_halt(client->handle, endpoint);
-	}
-#else
-	if (endpoint==0x4) {
-		ret = DeviceIoControl(client->handle, 0x220195, data, length, data, length, (PDWORD) transferred, NULL);
-	} else {
-		ret = 0;
-	}
-	ret = (ret==0) ? -1 : 0;
-#endif
-
-	return ret;
-}
-
-int irecv_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc_index, unsigned char * buffer, int size) {
-#ifndef WIN32
-	return libusb_get_string_descriptor_ascii(client->handle, desc_index, buffer, size);
-#else
-	irecv_error_t ret;
-	unsigned short langid = 0;
-	unsigned char data[255];
-	int di, si;
-	memset(data, 0, sizeof(data));
-	memset(buffer, 0, size);
-
-	ret = irecv_control_transfer(client, 0x80, 0x06, (0x03 << 8) | desc_index, langid, data, sizeof(data), USB_TIMEOUT);
-	
-	if (ret < 0) return ret;
-	if (data[1] != 0x03) return IRECV_E_UNKNOWN_ERROR;
-	if (data[0] > ret) return IRECV_E_UNKNOWN_ERROR; 
-
-	for (di = 0, si = 2; si < data[0]; si += 2) {
-		if (di >= (size - 1)) break;
-		if (data[si + 1]) {
-			/* high byte */
-			buffer[di++] = '?';
-        } else {
-            buffer[di++] = data[si];
-		}
-	}
-	buffer[di] = 0;
-	
-	return di;
-#endif
-}
-
-irecv_error_t irecv_open(irecv_client_t* pclient, unsigned long long ecid) {
-	if(libirecovery_debug) {
-		irecv_set_debug_level(libirecovery_debug);
-	}
-#ifndef WIN32
-	int i = 0;
-	struct libusb_device* usb_device = NULL;
-	struct libusb_device** usb_device_list = NULL;
-	struct libusb_device_handle* usb_handle = NULL;
-	struct libusb_device_descriptor usb_descriptor;
-
-	*pclient = NULL;
-	irecv_error_t error = IRECV_E_SUCCESS;
-	int usb_device_count = libusb_get_device_list(libirecovery_context, &usb_device_list);
-	for (i = 0; i < usb_device_count; i++) {
-		usb_device = usb_device_list[i];
-		libusb_get_device_descriptor(usb_device, &usb_descriptor);
-		if (usb_descriptor.idVendor == APPLE_VENDOR_ID) {
-			/* verify this device is in a mode we understand */
-			if (usb_descriptor.idProduct == kRecoveryMode1 ||
-				usb_descriptor.idProduct == kRecoveryMode2 ||
-				usb_descriptor.idProduct == kRecoveryMode3 ||
-				usb_descriptor.idProduct == kRecoveryMode4 ||
-				usb_descriptor.idProduct == kWTFMode ||
-				usb_descriptor.idProduct == kDfuMode) {
-
-				if (ecid == kWTFMode) {
-					if (usb_descriptor.idProduct != kWTFMode) {
-						// special ecid case, ignore !kWTFMode
-						continue;
-					} else {
-						ecid = 0;
-					}
-				}
-
-				if ((ecid != 0) && (usb_descriptor.idProduct == kWTFMode)) {
-					// we can't get ecid in WTF mode
-					continue;
-				}
-
-				debug("opening device %04x:%04x...\n", usb_descriptor.idVendor, usb_descriptor.idProduct);
-
-				libusb_open(usb_device, &usb_handle);
-				if (usb_handle == NULL) {
-					debug("%s: can't connect to device...\n", __func__);
-					libusb_close(usb_handle);
-					if (ecid != 0) {
-						continue;
-					}
-					libusb_free_device_list(usb_device_list, 1);
-					libusb_exit(libirecovery_context);
-					return IRECV_E_UNABLE_TO_CONNECT;
-				}
-
-				irecv_client_t client = (irecv_client_t) malloc(sizeof(struct irecv_client));
-				if (client == NULL) {
-					libusb_free_device_list(usb_device_list, 1);
-					libusb_close(usb_handle);
-					libusb_exit(libirecovery_context);
-					return IRECV_E_OUT_OF_MEMORY;
-				}
-
-				memset(client, '\0', sizeof(struct irecv_client));
-				client->interface = 0;
-				client->handle = usb_handle;
-				client->mode = usb_descriptor.idProduct;
-
-				/* cache usb serial */
-				irecv_get_string_descriptor_ascii(client, usb_descriptor.iSerialNumber, (unsigned char*) client->serial, 255);
-
-				if (ecid != 0) {
-					char* ecid_string = strstr(client->serial, "ECID:");
-					if (ecid_string == NULL) {
-						debug("%s: could not get ECID for device\n", __func__);
-						irecv_close(client);
-						continue;
-					}
-
-					unsigned long long this_ecid = 0;
-					sscanf(ecid_string, "ECID:" _FMT_qX, (unsigned long long*)&this_ecid);
-					if (this_ecid != ecid) {
-						irecv_close(client);
-						continue;
-					}
-					debug("found device with ECID " _FMT_016llx "\n", (unsigned long long)ecid);
-				}
-
-				error = irecv_set_configuration(client, 1);
-				if (error != IRECV_E_SUCCESS) {
-					return error;
-				}
-
-				if ((client->mode != kDfuMode) && (client->mode != kWTFMode)) {
-					error = irecv_set_interface(client, 0, 0);
-					if (client->mode > kRecoveryMode2) {
-						error = irecv_set_interface(client, 1, 1);
-					}
-				} else {
-					error = irecv_set_interface(client, 0, 0);
-				}
-
-				if (error != IRECV_E_SUCCESS) {
-					return error;
-				}
-
-				*pclient = client;
-				return IRECV_E_SUCCESS;
-			}
-		}
-	}
-
-	return IRECV_E_UNABLE_TO_CONNECT;
-#else
-	int ret = mobiledevice_connect(pclient, ecid);
-	if (ret == IRECV_E_SUCCESS) {
-		irecv_client_t client = *pclient;
-		int error = IRECV_E_SUCCESS;
-		if ((client->mode != kDfuMode) && (client->mode != kWTFMode)) {
-			error = irecv_set_interface(client, 0, 0);
-			if (client->mode > kRecoveryMode2) {
-				error = irecv_set_interface(client, 1, 1);
-			}
-		} else {
-			error = irecv_set_interface(client, 0, 0);
-		}
-		if (error != IRECV_E_SUCCESS) {
-			debug("WARNING: set interface failed, error %d\n", error);
-		}
-	}
-	return ret;
-#endif
-}
-
-irecv_error_t irecv_set_configuration(irecv_client_t client, int configuration) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-	
-#ifndef WIN32
-	debug("Setting to configuration %d\n", configuration);
-
-	int current = 0;
-	libusb_get_configuration(client->handle, &current);
-	if (current != configuration) {
-		if (libusb_set_configuration(client->handle, configuration) < 0) {
-			return IRECV_E_USB_CONFIGURATION;
-		}
-	}
-
-	client->config = configuration;
-#endif
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_set_interface(irecv_client_t client, int interface, int alt_interface) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	debug("Setting to interface %d:%d\n", interface, alt_interface);
-#ifndef WIN32
-	// pod2g 2011-01-07: we may want to claim multiple interfaces
-	//libusb_release_interface(client->handle, client->interface);
-
-	if (libusb_claim_interface(client->handle, interface) < 0) {
-		return IRECV_E_USB_INTERFACE;
-	}
-
-	if (libusb_set_interface_alt_setting(client->handle, interface, alt_interface) < 0) {
-		return IRECV_E_USB_INTERFACE;
-	}
-#else
-	if (irecv_control_transfer(client, 0, 0x0B, alt_interface, interface, NULL, 0, USB_TIMEOUT) < 0) {
-		return IRECV_E_USB_INTERFACE;
-	}
-#endif
-	client->interface = interface;
-	client->alt_interface = alt_interface;
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_reset(irecv_client_t client) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-	
-#ifndef WIN32
-	libusb_reset_device(client->handle);
-#else
-	int ret;
-	DWORD count;
-	ret = DeviceIoControl(client->handle, 0x22000C, NULL, 0, NULL, 0, &count, NULL);
-#endif
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_open_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts) {
-	int i;
-
-	for (i = 0; i < attempts; i++) {
-		if(*pclient) {
-			irecv_close(*pclient);
-			*pclient = NULL;
-		}
-		if (irecv_open(pclient, ecid) != IRECV_E_SUCCESS) {
-			debug("Connection failed. Waiting 1 sec before retry.\n");
-			sleep(1);
-		} else {
-			return IRECV_E_SUCCESS;
-		}		
-	}
-
-	return IRECV_E_UNABLE_TO_CONNECT;       
-}
-
-irecv_error_t irecv_event_subscribe(irecv_client_t client, irecv_event_type type, irecv_event_cb_t callback, void* user_data) {
-	switch(type) {
-	case IRECV_RECEIVED:
-		client->received_callback = callback;
-		break;
-
-	case IRECV_PROGRESS:
-		client->progress_callback = callback;
-
-	case IRECV_CONNECTED:
-		client->connected_callback = callback;
-
-	case IRECV_PRECOMMAND:
-		client->precommand_callback = callback;
-		break;
-
-	case IRECV_POSTCOMMAND:
-		client->postcommand_callback = callback;
-		break;
-
-	case IRECV_DISCONNECTED:
-		client->disconnected_callback = callback;
-
-	default:
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_event_unsubscribe(irecv_client_t client, irecv_event_type type) {
-	switch(type) {
-	case IRECV_RECEIVED:
-		client->received_callback = NULL;
-		break;
-
-	case IRECV_PROGRESS:
-		client->progress_callback = NULL;
-
-	case IRECV_CONNECTED:
-		client->connected_callback = NULL;
-
-	case IRECV_PRECOMMAND:
-		client->precommand_callback = NULL;
-		break;
-
-	case IRECV_POSTCOMMAND:
-		client->postcommand_callback = NULL;
-		break;
-
-	case IRECV_DISCONNECTED:
-		client->disconnected_callback = NULL;
-
-	default:
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_close(irecv_client_t client) {
-	if (client != NULL) {
-		if(client->disconnected_callback != NULL) {
-			irecv_event_t event;
-			event.size = 0;
-			event.data = NULL;
-			event.progress = 0;
-			event.type = IRECV_DISCONNECTED;
-			client->disconnected_callback(client, &event);
-		}
-#ifndef WIN32
-		if (client->handle != NULL) {
-			if ((client->mode != kDfuMode) && (client->mode != kWTFMode)) {
-				libusb_release_interface(client->handle, client->interface);
-			}
-			libusb_close(client->handle);
-			client->handle = NULL;
-		}
-#else
-		if (client->iBootPath!=NULL) {
-			free(client->iBootPath);
-			client->iBootPath = NULL;
-		}
-		if (client->DfuPath!=NULL) {
-			free(client->DfuPath);
-			client->DfuPath = NULL;
-		}
-		mobiledevice_closepipes(client);
-#endif
-		free(client);
-		client = NULL;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-void irecv_set_debug_level(int level) {
-	libirecovery_debug = level;
-#ifndef WIN32
-	if(libirecovery_context) {
-		libusb_set_debug(libirecovery_context, libirecovery_debug);
-	}
-#endif
-}
-
-static irecv_error_t irecv_send_command_raw(irecv_client_t client, char* command) {
-	unsigned int length = strlen(command);
-	if (length >= 0x100) {
-		length = 0xFF;
-	}
-
-	if (length > 0) {
-		int ret = irecv_control_transfer(client, 0x40, 0, 0, 0, (unsigned char*) command, length + 1, USB_TIMEOUT);
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_send_command(irecv_client_t client, char* command) {
-	irecv_error_t error = 0;
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	unsigned int length = strlen(command);
-	if (length >= 0x100) {
-		length = 0xFF;
-	}
-
-	irecv_event_t event;
-	if(client->precommand_callback != NULL) {
-		event.size = length;
-		event.data = command;
-		event.type = IRECV_PRECOMMAND;
-		if(client->precommand_callback(client, &event)) {
-			return IRECV_E_SUCCESS;
-		}
-	}
-
-	error = irecv_send_command_raw(client, command);
-	if (error != IRECV_E_SUCCESS) {
-		debug("Failed to send command %s\n", command);
-		if (error != IRECV_E_PIPE)
-			return error;
-	}
-
-	if(client->postcommand_callback != NULL) {
-		event.size = length;
-		event.data = command;
-		event.type = IRECV_POSTCOMMAND;
-		if(client->postcommand_callback(client, &event)) {
-			return IRECV_E_SUCCESS;
-		}
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_send_file(irecv_client_t client, const char* filename, int dfuNotifyFinished) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	FILE* file = fopen(filename, "rb");
-	if (file == NULL) {
-		return IRECV_E_FILE_NOT_FOUND;
-	}
-
-	fseek(file, 0, SEEK_END);
-	long length = ftell(file);
-	fseek(file, 0, SEEK_SET);
-
-	char* buffer = (char*) malloc(length);
-	if (buffer == NULL) {
-		fclose(file);
-		return IRECV_E_OUT_OF_MEMORY;
-	}
-
-	long bytes = fread(buffer, 1, length, file);
-	fclose(file);
-
-	if (bytes != length) {
-		free(buffer);
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	irecv_error_t error = irecv_send_buffer(client, buffer, length, dfuNotifyFinished);
-	free(buffer);
-	return error;
-}
-
-irecv_error_t irecv_get_status(irecv_client_t client, unsigned int* status) {
-	if (check_context(client) != IRECV_E_SUCCESS) {
-		*status = 0;
-		return IRECV_E_NO_DEVICE;
-	}
-
-	unsigned char buffer[6];
-	memset(buffer, '\0', 6);
-	if (irecv_control_transfer(client, 0xA1, 3, 0, 0, buffer, 6, USB_TIMEOUT) != 6) {
-		*status = 0;
-		return IRECV_E_USB_STATUS;
-	}
-
-	*status = (unsigned int) buffer[4];
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_send_buffer(irecv_client_t client, unsigned char* buffer, unsigned long length, int dfuNotifyFinished) {
-	irecv_error_t error = 0;
-	int recovery_mode = ((client->mode != kDfuMode) && (client->mode != kWTFMode));
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	unsigned int h1 = 0xFFFFFFFF;
-	unsigned char dfu_xbuf[12] = {0xff, 0xff, 0xff, 0xff, 0xac, 0x05, 0x00, 0x01, 0x55, 0x46, 0x44, 0x10};
-	int packet_size = recovery_mode ? 0x8000 : 0x800;
-	int last = length % packet_size;
-	int packets = length / packet_size;
-	if (last != 0) {
-		packets++;
-	} else {
-		last = packet_size;
-	}
-
-	/* initiate transfer */
-	if (recovery_mode) {
-		error = irecv_control_transfer(client, 0x41, 0, 0, 0, NULL, 0, USB_TIMEOUT);
-	} else {
-		char dump[4];
-		if (irecv_control_transfer(client, 0xa1, 5, 0, 0, dump, 1, USB_TIMEOUT) == 1) {
-			error = IRECV_E_SUCCESS;
-		} else {
-			error = IRECV_E_USB_UPLOAD;
-		}
-	}
-	if (error != IRECV_E_SUCCESS) {
-		return error;
-	}
-
-	int i = 0;
-	double progress = 0;
-	unsigned long count = 0;
-	unsigned int status = 0;
-	int bytes = 0;
-	for (i = 0; i < packets; i++) {
-		int size = (i + 1) < packets ? packet_size : last;
-
-		/* Use bulk transfer for recovery mode and control transfer for DFU and WTF mode */
-		if (recovery_mode) {
-			error = irecv_bulk_transfer(client, 0x04, &buffer[i * packet_size], size, &bytes, USB_TIMEOUT);
-		} else {
-			int j;
-			for (j = 0; j < size; j++) {
-				dfu_hash_step(h1, buffer[i*packet_size + j]);
-			}
-			if (i+1 == packets) {
-				for (j = 0; j < 2; j++) {
-					dfu_hash_step(h1, dfu_xbuf[j*6 + 0]);
-					dfu_hash_step(h1, dfu_xbuf[j*6 + 1]);
-					dfu_hash_step(h1, dfu_xbuf[j*6 + 2]);
-					dfu_hash_step(h1, dfu_xbuf[j*6 + 3]);
-					dfu_hash_step(h1, dfu_xbuf[j*6 + 4]);
-					dfu_hash_step(h1, dfu_xbuf[j*6 + 5]);
-				}
-
-				char* newbuf = (char*)malloc(size + 16);
-				memcpy(newbuf, &buffer[i * packet_size], size);
-				memcpy(newbuf+size, dfu_xbuf, 12);
-				newbuf[size+12] = h1 & 0xFF;
-				newbuf[size+13] = (h1 >> 8) & 0xFF;
-				newbuf[size+14] = (h1 >> 16) & 0xFF;
-				newbuf[size+15] = (h1 >> 24) & 0xFF;
-				size += 16;
-				bytes = irecv_control_transfer(client, 0x21, 1, i, 0, newbuf, size, USB_TIMEOUT);
-				free(newbuf);
-			} else {
-				bytes = irecv_control_transfer(client, 0x21, 1, i, 0, &buffer[i * packet_size], size, USB_TIMEOUT);
-			}
-		}
-
-		if (bytes != size) {
-			return IRECV_E_USB_UPLOAD;
-		}
-
-		if (!recovery_mode) {
-			error = irecv_get_status(client, &status);
-		}
-
-		if (error != IRECV_E_SUCCESS) {
-			return error;
-		}
-
-		if (!recovery_mode && status != 5) {
-			int retry = 0;
-			while (retry < 20) {
-				irecv_get_status(client, &status);
-				if (status == 5) {
-					break;
-				}
-				sleep(1);
-			}
-			if (status != 5) {
-				return IRECV_E_USB_UPLOAD;
-			}
-		}
-
-		count += size;
-		if(client->progress_callback != NULL) {
-			irecv_event_t event;
-			event.progress = ((double) count/ (double) length) * 100.0;
-			event.type = IRECV_PROGRESS;
-			event.data = "Uploading";
-			event.size = count;
-			client->progress_callback(client, &event);
-		} else {
-			debug("Sent: %d bytes - %lu of %lu\n", bytes, count, length);
-		}
-	}
-
-	if (dfuNotifyFinished && !recovery_mode) {
-		irecv_control_transfer(client, 0x21, 1, packets, 0, (unsigned char*) buffer, 0, USB_TIMEOUT);
-
-		for (i = 0; i < 2; i++) {
-			error = irecv_get_status(client, &status);
-			if (error != IRECV_E_SUCCESS) {
-				return error;
-			}
-		}
-
-		if (dfuNotifyFinished == 2) {
-			// we send a pseudo ZLP here just in case
-			irecv_control_transfer(client, 0x21, 1, 0, 0, 0, 0, USB_TIMEOUT);
-		}
-
-		irecv_reset(client);
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_receive(irecv_client_t client) {
-	char buffer[BUFFER_SIZE];
-	memset(buffer, '\0', BUFFER_SIZE);
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	int bytes = 0;
-	while (irecv_bulk_transfer(client, 0x81, (unsigned char*) buffer, BUFFER_SIZE, &bytes, 1000) == 0) {
-		if (bytes > 0) {
-			if (client->received_callback != NULL) {
-				irecv_event_t event;
-				event.size = bytes;
-				event.data = buffer;
-				event.type = IRECV_RECEIVED;
-				if (client->received_callback(client, &event) != 0) {
-					return IRECV_E_SUCCESS;
-				}
-			}
-		} else break;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_getenv(irecv_client_t client, const char* variable, char** value) {
-	int ret = 0;
-	char command[256];
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-	*value = NULL;
-
-	if(variable == NULL) {
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	memset(command, '\0', sizeof(command));
-	snprintf(command, sizeof(command)-1, "getenv %s", variable);
-	irecv_error_t error = irecv_send_command_raw(client, command);
-	if(error == IRECV_E_PIPE) {
-		return IRECV_E_SUCCESS;
-	}
-	if(error != IRECV_E_SUCCESS) {
-		return error;
-	}
-
-	char* response = (char*) malloc(256);
-	if (response == NULL) {
-		return IRECV_E_OUT_OF_MEMORY;
-	}
-
-	memset(response, '\0', 256);
-	ret = irecv_control_transfer(client, 0xC0, 0, 0, 0, (unsigned char*) response, 255, USB_TIMEOUT);
-
-	*value = response;
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_getret(irecv_client_t client, unsigned int* value) {
-	int ret = 0;
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-	*value = 0;
-
-	char* response = (char*) malloc(256);
-	if (response == NULL) {
-		return IRECV_E_OUT_OF_MEMORY;
-	}
-
-	memset(response, '\0', 256);
-	ret = irecv_control_transfer(client, 0xC0, 0, 0, 0, (unsigned char*) response, 255, USB_TIMEOUT);
-
-	*value = (unsigned int) *response;
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_cpid(irecv_client_t client, unsigned int* cpid) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	if (client->mode == kWTFMode) {
-		char s_cpid[8] = {0,};
-		strncpy(s_cpid, client->serial, 4);
-		if (sscanf(s_cpid, "%x", cpid) != 1) {
-			*cpid = 0;
-			return IRECV_E_UNKNOWN_ERROR;
-		}
-		return IRECV_E_SUCCESS;
-	}
-
-	char* cpid_string = strstr(client->serial, "CPID:");
-	if (cpid_string == NULL) {
-		*cpid = 0;
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-	sscanf(cpid_string, "CPID:%x", cpid);
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_bdid(irecv_client_t client, unsigned int* bdid) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	char* bdid_string = strstr(client->serial, "BDID:");
-	if (bdid_string == NULL) {
-		*bdid = 0;
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-	sscanf(bdid_string, "BDID:%x", bdid);
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_ecid(irecv_client_t client, unsigned long long* ecid) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	char* ecid_string = strstr(client->serial, "ECID:");
-	if (ecid_string == NULL) {
-		*ecid = 0;
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-	sscanf(ecid_string, "ECID:" _FMT_qX, ecid);
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_srnm(irecv_client_t client, unsigned char* srnm) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	char* srnmp;
-	char* srnm_string = strstr(client->serial, "SRNM:[");
-	if(srnm_string == NULL) {
-		srnm = NULL;
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	sscanf(srnm_string, "SRNM:[%s]", srnm);
-	srnmp = strrchr(srnm, ']');
-	if(srnmp != NULL) {
-		*srnmp = '\0';
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_imei(irecv_client_t client, unsigned char* imei) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	char* imeip;
-	char* imei_string = strstr(client->serial, "IMEI:[");
-	if (imei_string == NULL) {
-		*imei = 0;
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-
-	sscanf(imei_string, "IMEI:[%s]", imei);
-	imeip = strrchr(imei, ']');
-	if(imeip != NULL) {
-		*imeip = '\0';
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_nonce(irecv_client_t client, unsigned char** nonce, int* nonce_size) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	unsigned char buf[255];
-	int len;
-
-	*nonce = NULL;
-	*nonce_size = 0;
-
-	len = irecv_get_string_descriptor_ascii(client, 1, (unsigned char*) buf, 255);
-	debug("%s: got length: %d\n", __func__, len);
-	if (len < 0) {
-		return len;
-	}
-
-	buf[len] = 0;
-	debug("%s: buf='%s'\n", __func__, buf);
-
-	char* nonce_string = strstr(buf, "NONC:");
-	if (nonce_string == NULL) {
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-	nonce_string+=5;
-
-	int nlen = (len - ((unsigned char*)nonce_string - &buf[0])) / 2;
-	unsigned char *nn = malloc(nlen);
-	if (!nn) {
-		return IRECV_E_OUT_OF_MEMORY;
-	}
-
-	int i = 0;
-	for (i = 0; i < nlen; i++) {
-		int val = 0;
-		if (sscanf(nonce_string+(i*2), "%02X", &val) == 1) {
-			nn[i] = (unsigned char)val;
-		} else {
-			debug("%s: ERROR: unexpected data in nonce result (%2s)\n", __func__, nonce_string+(i*2));
-			break;
-		}
-	}
-
-	if (i != nlen) {
-		debug("%s: ERROR: unable to parse nonce\n", __func__);
-		free(nn);
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	*nonce = nn;
-	*nonce_size = nlen;
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_send_exploit(irecv_client_t client) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-	irecv_control_transfer(client, 0x21, 2, 0, 0, NULL, 0, USB_TIMEOUT);
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_execute_script(irecv_client_t client, const char* filename) {
-	irecv_error_t error = IRECV_E_SUCCESS;
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	char* file_data = NULL;
-	unsigned int file_size = 0;
-	if(irecv_read_file(filename, &file_data, &file_size) < 0) {
-		return IRECV_E_FILE_NOT_FOUND;
-	}
-
-	char* line = strtok(file_data, "\n");
-	while(line != NULL) {
-		if(line[0] != '#') {
-			error = irecv_send_command(client, line);
-			if(error != IRECV_E_SUCCESS) {
-				return error;
-			}
-
-			error = irecv_receive(client);
-			if(error != IRECV_E_SUCCESS) {
-				return error;
-			}
-		}
-		line = strtok(NULL, "\n");
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_saveenv(irecv_client_t client) {
-	irecv_error_t error = irecv_send_command_raw(client, "saveenv");
-	if(error != IRECV_E_SUCCESS) {
-		return error;
-	}
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_setenv(irecv_client_t client, const char* variable, const char* value) {
-	char command[256];
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	if(variable == NULL || value == NULL) {
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	memset(command, '\0', sizeof(command));
-	snprintf(command, sizeof(command)-1, "setenv %s %s", variable, value);
-	irecv_error_t error = irecv_send_command_raw(client, command);
-	if(error != IRECV_E_SUCCESS) {
-		return error;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-const char* irecv_strerror(irecv_error_t error) {
-	switch (error) {
-	case IRECV_E_SUCCESS:
-		return "Command completed successfully";
-
-	case IRECV_E_NO_DEVICE:
-		return "Unable to find device";
-
-	case IRECV_E_OUT_OF_MEMORY:
-		return "Out of memory";
-
-	case IRECV_E_UNABLE_TO_CONNECT:
-		return "Unable to connect to device";
-
-	case IRECV_E_INVALID_INPUT:
-		return "Invalid input";
-
-	case IRECV_E_FILE_NOT_FOUND:
-		return "File not found";
-
-	case IRECV_E_USB_UPLOAD:
-		return "Unable to upload data to device";
-
-	case IRECV_E_USB_STATUS:
-		return "Unable to get device status";
-
-	case IRECV_E_USB_INTERFACE:
-		return "Unable to set device interface";
-
-	case IRECV_E_USB_CONFIGURATION:
-		return "Unable to set device configuration";
-
-	case IRECV_E_PIPE:
-		return "Broken pipe";
-
-	case IRECV_E_TIMEOUT:
-		return "Timeout talking to device";
-
-	default:
-		return "Unknown error";
-	}
-
-	return NULL;
-}
-
-int irecv_write_file(const char* filename, const void* data, size_t size) {
-	size_t bytes = 0;
-	FILE* file = NULL;
-
-	debug("Writing data to %s\n", filename);
-	file = fopen(filename, "wb");
-	if (file == NULL) {
-		//error("read_file: Unable to open file %s\n", filename);
-		return -1;
-	}
-
-	bytes = fwrite(data, 1, size, file);
-	fclose(file);
-
-	if (bytes != size) {
-		//error("ERROR: Unable to write entire file: %s: %d of %d\n", filename, bytes, size);
-		return -1;
-	}
-
-	return size;
-}
-
-int irecv_read_file(const char* filename, char** data, uint32_t* size) {
-	size_t bytes = 0;
-	size_t length = 0;
-	FILE* file = NULL;
-	char* buffer = NULL;
-	debug("Reading data from %s\n", filename);
-
-	*size = 0;
-	*data = NULL;
-
-	file = fopen(filename, "rb");
-	if (file == NULL) {
-		//error("read_file: File %s not found\n", filename);
-		return -1;
-	}
-
-	fseek(file, 0, SEEK_END);
-	length = ftell(file);
-	rewind(file);
-
-	buffer = (char*) malloc(length);
-	if(buffer == NULL) {
-		//error("ERROR: Out of memory\n");
-		fclose(file);
-		return -1;
-	}
-	bytes = fread(buffer, 1, length, file);
-	fclose(file);
-
-	if(bytes != length) {
-		//error("ERROR: Unable to read entire file\n");
-		free(buffer);
-		return -1;
-	}
-
-	*size = length;
-	*data = buffer;
-	return 0;
-}
-
-irecv_error_t irecv_reset_counters(irecv_client_t client) {
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-	if ((client->mode == kDfuMode) || (client->mode == kWTFMode)) {
-		irecv_control_transfer(client, 0x21, 4, 0, 0, 0, 0, USB_TIMEOUT);
-	}
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_recv_buffer(irecv_client_t client, char* buffer, unsigned long length) {
-	irecv_error_t error = 0;
-	int recovery_mode = ((client->mode != kDfuMode) && (client->mode != kWTFMode));
-
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	int packet_size = recovery_mode ? 0x2000: 0x800;
-	int last = length % packet_size;
-	int packets = length / packet_size;
-	if (last != 0) {
-		packets++;
-	} else {
-		last = packet_size;
-	}
-
-	int i = 0;
-	int bytes = 0;
-	double progress = 0;
-	unsigned long count = 0;
-	unsigned int status = 0;
-	for (i = 0; i < packets; i++) {
-		unsigned short size = (i+1) < packets ? packet_size : last;
-		bytes = irecv_control_transfer(client, 0xA1, 2, 0, 0, &buffer[i * packet_size], size, USB_TIMEOUT);
-		
-		if (bytes != size) {
-			return IRECV_E_USB_UPLOAD;
-		}
-
-		count += size;
-		if(client->progress_callback != NULL) {
-			irecv_event_t event;
-			event.progress = ((double) count/ (double) length) * 100.0;
-			event.type = IRECV_PROGRESS;
-			event.data = "Downloading";
-			event.size = count;
-			client->progress_callback(client, &event);
-		} else {
-			debug("Sent: %d bytes - %lu of %lu\n", bytes, count, length);
-		}
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_finish_transfer(irecv_client_t client) {
-	int i = 0;
-	unsigned int status = 0;
-
-	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
-
-	irecv_control_transfer(client, 0x21, 1, 0, 0, 0, 0, USB_TIMEOUT);
-
-	for(i = 0; i < 3; i++){
-		irecv_get_status(client, &status);
-	}
-	irecv_reset(client);
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_device(irecv_client_t client, irecv_device_t* device) {
-	int device_id = DEVICE_UNKNOWN;
-	uint32_t bdid = 0;
-	uint32_t cpid = 0;
-
-	if (irecv_get_cpid(client, &cpid) < 0) {
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	switch (cpid) {
-	case CPID_IPHONE2G:
-		// iPhone1,1 iPhone1,2 and iPod1,1 all share the same ChipID
-		//   so we need to check the BoardID
-		if (irecv_get_bdid(client, &bdid) < 0) {
-			break;
-		}
-
-		switch (bdid) {
-		case BDID_IPHONE2G:
-			device_id = DEVICE_IPHONE2G;
-			break;
-
-		case BDID_IPHONE3G:
-			device_id = DEVICE_IPHONE3G;
-			break;
-
-		case BDID_IPOD1G:
-			device_id = DEVICE_IPOD1G;
-			break;
-
-		default:
-			device_id = DEVICE_UNKNOWN;
-			break;
-		}
-		break;
-
-	case CPID_IPHONE3GS:
-		device_id = DEVICE_IPHONE3GS;
-		break;
-
-	case CPID_IPOD2G:
-		device_id = DEVICE_IPOD2G;
-		break;
-
-	case CPID_IPOD3G:
-		device_id = DEVICE_IPOD3G;
-		break;
-
-	case CPID_IPAD1G:
-		// iPhone3,1 iPhone3,3 iPad4,1 and iPad1,1 all share the same ChipID
-		//   so we need to check the BoardID
-		if (irecv_get_bdid(client, &bdid) < 0) {
-			break;
-		}
-
-		switch (bdid) {
-		case BDID_IPAD1G:
-			device_id = DEVICE_IPAD1G;
-			break;
-
-		case BDID_IPHONE4:
-			device_id = DEVICE_IPHONE4;
-			break;
-
-		case BDID_IPOD4G:
-			device_id = DEVICE_IPOD4G;
-			break;
-
-		case BDID_APPLETV2:
-			device_id = DEVICE_APPLETV2;
-			break;
-
-		case BDID_IPHONE42:
-			device_id = DEVICE_IPHONE42;
-			break;
-
-		default:
-			device_id = DEVICE_UNKNOWN;
-			break;
-		}
-		break;
-
-	case CPID_IPAD21:
-		// iPad2,1 iPad2,2 iPad2,3 and iPhone4,1 share the same ChipID, so we need to check the BoardID
-		if (irecv_get_bdid(client, &bdid) < 0) {
-			break;
-		}
-
-		switch (bdid) {
-		case BDID_IPAD21:
-			device_id = DEVICE_IPAD21;
-			break;
-
-		case BDID_IPAD22:
-			device_id = DEVICE_IPAD22;
-			break;
-
-		case BDID_IPAD23:
-			device_id = DEVICE_IPAD23;
-			break;
-
-		case BDID_IPHONE4S:
-			device_id = DEVICE_IPHONE4S;
-			break;
-
-		default:
-			device_id = DEVICE_UNKNOWN;
-			break;
-		}
-		break;
-
-	default:
-		device_id = DEVICE_UNKNOWN;
-		break;
-	}
-
-	*device = &irecv_devices[device_id];
-	return IRECV_E_SUCCESS;
-}
-
-irecv_client_t irecv_reconnect(irecv_client_t client, int initial_pause) {
-	irecv_error_t error = 0;
-	irecv_client_t new_client = NULL;
-	irecv_event_cb_t progress_callback = client->progress_callback;
-
-	unsigned long long ecid = 0;
-	irecv_get_ecid(client, &ecid);
-
-	if (check_context(client) == IRECV_E_SUCCESS) {
-		irecv_close(client);
-	}
-
-	if (initial_pause > 0) {
-		debug("Waiting %d seconds for the device to pop up...\n", initial_pause);
-		sleep(initial_pause);
-	}
-	
-	error = irecv_open_attempts(&new_client, ecid, 10);
-	if(error != IRECV_E_SUCCESS) {
-		return NULL;
-	}
-
-	new_client->progress_callback = progress_callback;
-	return new_client;
-}
-
-void irecv_hexdump(unsigned char* buf, unsigned int len, unsigned int addr) {
-	int i, j;
-	printf("0x%08x: ", addr);
-	for (i = 0; i < len; i++) {
-		if (i % 16 == 0 && i != 0) {
-			for (j=i-16; j < i; j++) {
-	unsigned char car = buf[j];
-	if (car < 0x20 || car > 0x7f) car = '.';
-	printf("%c", car);
-			}
-			printf("\n");
-			addr += 0x10;
-			printf("0x%08x: ", addr);
-		}
-		printf("%02x ", buf[i]);
-	}
-
-	int done = (i % 16);
-	int remains = 16 - done;
-	if (done > 0) {
-		for (j = 0; j < remains; j++) {
-			printf("	 ");
-		}
-	}
-
-	if ((i - done) >= 0) {
-		if (done == 0 && i > 0) done = 16;
-		for (j = (i - done); j < i; j++) {
-			unsigned char car = buf[j];
-			if (car < 0x20 || car > 0x7f) car = '.';
-			printf("%c", car);
-		}
-	}
-	printf("\n");
-}
diff --git a/src/irecovery.c b/src/irecovery.c
new file mode 100644
index 0000000..89f30a6
--- /dev/null
+++ b/src/irecovery.c
@@ -0,0 +1,397 @@
+/**
+  * GreenPois0n iRecovery - irecovery.c
+  * Copyright (C) 2010-2011 Chronic-Dev Team
+  * Copyright (C) 2010-2011 Joshua Hill
+  * Copyright (C) 2008-2011 Nicolas Haunold
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <libirecovery.h>
+#include <readline/readline.h>
+#include <readline/history.h>
+
+#define FILE_HISTORY_PATH ".irecovery"
+#define debug(...) if(verbose) fprintf(stderr, __VA_ARGS__)
+
+enum {
+	kResetDevice, kStartShell, kSendCommand, kSendFile, kSendExploit, kSendScript
+};
+
+static unsigned int quit = 0;
+static unsigned int verbose = 0;
+
+void print_progress_bar(double progress);
+int received_cb(irecv_client_t client, const irecv_event_t* event);
+int progress_cb(irecv_client_t client, const irecv_event_t* event);
+int precommand_cb(irecv_client_t client, const irecv_event_t* event);
+int postcommand_cb(irecv_client_t client, const irecv_event_t* event);
+
+void shell_usage() {
+	printf("Usage:\n");
+	printf("\t/upload <file>\tSend file to client.\n");
+	printf("\t/exploit [file]\tSend usb exploit with optional payload\n");
+	printf("\t/deviceinfo\tShow device information (ECID, IMEI, etc.)\n");
+	printf("\t/help\t\tShow this help.\n");
+	printf("\t/exit\t\tExit interactive shell.\n");
+}
+
+void parse_command(irecv_client_t client, unsigned char* command, unsigned int size) {
+	char* cmd = strdup(command);
+	char* action = strtok(cmd, " ");
+	debug("Executing %s\n", action);
+	if (!strcmp(cmd, "/exit")) {
+		quit = 1;
+	} else
+
+	if (!strcmp(cmd, "/help")) {
+		shell_usage();
+	} else
+
+	if (!strcmp(cmd, "/upload")) {
+		char* filename = strtok(NULL, " ");
+		debug("Uploading files %s\n", filename);
+		if (filename != NULL) {
+			irecv_send_file(client, filename, 0);
+		}
+	} else
+
+	if (!strcmp(cmd, "/deviceinfo")) {
+		int ret;
+		unsigned int cpid, bdid;
+		unsigned long long ecid;
+		unsigned char srnm[12], imei[15], bt[15];
+
+		ret = irecv_get_cpid(client, &cpid);
+		if(ret == IRECV_E_SUCCESS) {
+			printf("CPID: %d\n", cpid);
+		}
+
+		ret = irecv_get_bdid(client, &bdid);
+		if(ret == IRECV_E_SUCCESS) {
+			printf("BDID: %d\n", bdid);
+		}
+
+		ret = irecv_get_ecid(client, &ecid);
+		if(ret == IRECV_E_SUCCESS) {
+			printf("ECID: %lld\n", ecid);
+		}
+
+		ret = irecv_get_srnm(client, srnm);
+		if(ret == IRECV_E_SUCCESS) {
+			printf("SRNM: %s\n", srnm);
+		}
+
+		ret = irecv_get_imei(client, imei);
+		if(ret == IRECV_E_SUCCESS) {
+			printf("IMEI: %s\n", imei);
+		}
+	} else
+
+	if (!strcmp(cmd, "/exploit")) {
+		char* filename = strtok(NULL, " ");
+		debug("Sending exploit %s\n", filename);
+		if (filename != NULL) {
+			irecv_send_file(client, filename, 0);
+		}
+		irecv_send_exploit(client);
+	} else
+
+		if (!strcmp(cmd, "/execute")) {
+			char* filename = strtok(NULL, " ");
+			debug("Executing script %s\n", filename);
+			if (filename != NULL) {
+				irecv_execute_script(client, filename);
+			}
+		}
+
+
+	free(action);
+}
+
+void load_command_history() {
+	read_history(FILE_HISTORY_PATH);
+}
+
+void append_command_to_history(char* cmd) {
+	add_history(cmd);
+	write_history(FILE_HISTORY_PATH);
+}
+
+void init_shell(irecv_client_t client) {
+	irecv_error_t error = 0;
+	load_command_history();
+	irecv_event_subscribe(client, IRECV_PROGRESS, &progress_cb, NULL);
+	irecv_event_subscribe(client, IRECV_RECEIVED, &received_cb, NULL);
+	irecv_event_subscribe(client, IRECV_PRECOMMAND, &precommand_cb, NULL);
+	irecv_event_subscribe(client, IRECV_POSTCOMMAND, &postcommand_cb, NULL);
+	while (!quit) {
+		error = irecv_receive(client);
+
+		if (error != IRECV_E_SUCCESS) {
+			debug("%s\n", irecv_strerror(error));
+			break;
+		}
+
+		char* cmd = readline("> ");
+		if (cmd && *cmd) {
+			error = irecv_send_command(client, cmd);
+			if (error != IRECV_E_SUCCESS) {
+				quit = 1;
+			}
+
+			append_command_to_history(cmd);
+			free(cmd);
+		}
+	}
+}
+
+int received_cb(irecv_client_t client, const irecv_event_t* event) {
+	if (event->type == IRECV_RECEIVED) {
+		int i = 0;
+		int size = event->size;
+		char* data = event->data;
+		for (i = 0; i < size; i++) {
+			printf("%c", data[i]);
+		}
+	}
+	return 0;
+}
+
+int precommand_cb(irecv_client_t client, const irecv_event_t* event) {
+	if (event->type == IRECV_PRECOMMAND) {
+		irecv_error_t error = 0;
+		if (event->data[0] == '/') {
+			parse_command(client, event->data, event->size);
+			return -1;
+		}
+	}
+	return 0;
+}
+
+int postcommand_cb(irecv_client_t client, const irecv_event_t* event) {
+	char* value = NULL;
+	char* action = NULL;
+	char* command = NULL;
+	char* argument = NULL;
+	irecv_error_t error = IRECV_E_SUCCESS;
+
+	if (event->type == IRECV_POSTCOMMAND) {
+		command = strdup(event->data);
+		action = strtok(command, " ");
+		if (!strcmp(action, "getenv")) {
+			argument = strtok(NULL, " ");
+			error = irecv_getenv(client, argument, &value);
+			if (error != IRECV_E_SUCCESS) {
+				debug("%s\n", irecv_strerror(error));
+				free(command);
+				return error;
+			}
+			printf("%s\n", value);
+			free(value);
+		}
+
+		if (!strcmp(action, "reboot")) {
+			quit = 1;
+		}
+	}
+
+	if (command) free(command);
+	return 0;
+}
+
+int progress_cb(irecv_client_t client, const irecv_event_t* event) {
+	if (event->type == IRECV_PROGRESS) {
+		print_progress_bar(event->progress);
+	}
+	return 0;
+}
+
+void print_progress_bar(double progress) {
+	int i = 0;
+	if(progress < 0) {
+		return;
+	}
+
+	if(progress > 100) {
+		progress = 100;
+	}
+
+	printf("\r[");
+	for(i = 0; i < 50; i++) {
+		if(i < progress / 2) {
+			printf("=");
+		} else {
+			printf(" ");
+		}
+	}
+
+	printf("] %3.1f%%", progress);
+	fflush(stdout);
+	if(progress == 100) {
+		printf("\n");
+	}
+}
+
+void print_usage() {
+	printf("iRecovery - iDevice Recovery Utility\n");
+	printf("Usage: irecovery [args]\n");
+	printf("\t-i <ecid>\tTarget specific device by its hexadecimal ECID\n");
+	printf("\t-v\t\tStart irecovery in verbose mode.\n");
+	printf("\t-c <cmd>\tSend command to client.\n");
+	printf("\t-f <file>\tSend file to client.\n");
+	printf("\t-k [payload]\tSend usb exploit to client.\n");
+	printf("\t-h\t\tShow this help.\n");
+	printf("\t-r\t\tReset client.\n");
+	printf("\t-s\t\tStart interactive shell.\n");
+	printf("\t-e <script>\tExecutes recovery shell script.\n");
+	exit(1);
+}
+
+int main(int argc, char* argv[]) {
+	int i = 0;
+	int opt = 0;
+	int action = 0;
+	unsigned long long ecid = 0;
+	char* argument = NULL;
+	irecv_error_t error = 0;
+	if (argc == 1) print_usage();
+	while ((opt = getopt(argc, argv, "i:vhrsc:f:e:k::")) > 0) {
+		switch (opt) {
+		case 'i':
+			if (optarg) {
+				char* tail = NULL;
+                                ecid = strtoull(optarg, &tail, 16);
+                                if (tail && (tail[0] != '\0')) {
+                                        ecid = 0;
+                                }
+                                if (ecid == 0) {
+                                        fprintf(stderr, "ERROR: Could not parse ECID from argument '%s'\n", optarg);
+                                        return -1;
+                                }
+			}
+			break;
+
+		case 'v':
+			verbose += 1;
+			break;
+
+		case 'h':
+			print_usage();
+			break;
+
+		case 'r':
+			action = kResetDevice;
+			break;
+
+		case 's':
+			action = kStartShell;
+			break;
+
+		case 'f':
+			action = kSendFile;
+			argument = optarg;
+			break;
+
+		case 'c':
+			action = kSendCommand;
+			argument = optarg;
+			break;
+
+		case 'k':
+			action = kSendExploit;
+			argument = optarg;
+			break;
+
+		case 'e':
+			action = kSendScript;
+			argument = optarg;
+			break;
+
+		default:
+			fprintf(stderr, "Unknown argument\n");
+			return -1;
+		}
+	}
+
+	if (verbose) irecv_set_debug_level(verbose);
+
+	irecv_init();
+	irecv_client_t client = NULL;
+	for (i = 0; i <= 5; i++) {
+		debug("Attempting to connect... \n");
+
+		if (irecv_open(&client, ecid) != IRECV_E_SUCCESS)
+			sleep(1);
+		else
+			break;
+
+		if (i == 5) {
+			return -1;
+		}
+	}
+
+	switch (action) {
+	case kResetDevice:
+		irecv_reset(client);
+		break;
+
+	case kSendFile:
+		irecv_event_subscribe(client, IRECV_PROGRESS, &progress_cb, NULL);
+		error = irecv_send_file(client, argument, 1);
+		debug("%s\n", irecv_strerror(error));
+		break;
+
+	case kSendCommand:
+		error = irecv_send_command(client, argument);
+		debug("%s\n", irecv_strerror(error));
+		break;
+
+	case kSendExploit:
+		if (argument != NULL) {
+			irecv_event_subscribe(client, IRECV_PROGRESS, &progress_cb, NULL);
+			error = irecv_send_file(client, argument, 0);
+			if (error != IRECV_E_SUCCESS) {
+				debug("%s\n", irecv_strerror(error));
+				break;
+			}
+		}
+		error = irecv_send_exploit(client);
+		debug("%s\n", irecv_strerror(error));
+		break;
+
+	case kStartShell:
+		init_shell(client);
+		break;
+
+	case kSendScript:
+		error = irecv_execute_script(client, argument);
+		if(error != IRECV_E_SUCCESS) {
+			debug("%s\n", irecv_strerror(error));
+		}
+		break;
+
+	default:
+		fprintf(stderr, "Unknown action\n");
+		break;
+	}
+
+	irecv_close(client);
+	return 0;
+}
+
diff --git a/src/libirecovery.c b/src/libirecovery.c
new file mode 100644
index 0000000..4419b50
--- /dev/null
+++ b/src/libirecovery.c
@@ -0,0 +1,1684 @@
+/**
+  * GreenPois0n iRecovery - libirecovery.c
+  * Copyright (C) 2010 Chronic-Dev Team
+  * Copyright (C) 2010 Joshua Hill
+  * Copyright (C) 2008-2011 Nicolas Haunold
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifndef WIN32
+#include <libusb-1.0/libusb.h>
+#define _FMT_qX "%qX"
+#define _FMT_016llx "%016llx"
+#else
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <setupapi.h>
+#define _FMT_qX "%I64X"
+#define _FMT_016llx "%016I64x"
+#endif
+
+#include "libirecovery.h"
+
+#define USB_TIMEOUT 10000
+
+#define BUFFER_SIZE 0x1000
+#define debug(...) if(libirecovery_debug) fprintf(stderr, __VA_ARGS__)
+
+static int libirecovery_debug = 0;
+#ifndef WIN32
+static libusb_context* libirecovery_context = NULL;
+#endif
+
+int irecv_write_file(const char* filename, const void* data, size_t size);
+int irecv_read_file(const char* filename, char** data, uint32_t* size);
+
+static unsigned int dfu_hash_t1[256] = {
+	0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+	0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+	0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+	0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+	0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+	0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+	0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+	0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+	0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+	0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+	0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+	0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+	0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+	0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+	0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+	0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+	0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+	0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+	0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+	0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+	0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+	0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+	0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+	0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+	0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+	0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+	0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+	0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+	0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+	0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+	0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+	0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+	0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+	0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+	0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+	0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+	0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+	0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+	0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+	0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+	0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+	0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+	0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+	0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+	0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+	0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+	0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+	0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+	0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+	0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+	0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+	0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+	0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+	0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+	0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+	0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+	0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+	0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+	0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+	0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+	0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+	0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+	0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+	0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D,
+};
+
+#define dfu_hash_step(a,b) \
+	a = (dfu_hash_t1[(a & 0xFF) ^ ((unsigned char)b)] ^ (a >> 8))
+
+#ifdef WIN32
+static const GUID GUID_DEVINTERFACE_IBOOT = {0xED82A167L, 0xD61A, 0x4AF6, {0x9A, 0xB6, 0x11, 0xE5, 0x22, 0x36, 0xC5, 0x76}};
+static const GUID GUID_DEVINTERFACE_DFU = {0xB8085869L, 0xFEB9, 0x404B, {0x8C, 0xB1, 0x1E, 0x5C, 0x14, 0xFA, 0x8C, 0x54}};
+
+typedef struct usb_control_request {
+	uint8_t bmRequestType;
+	uint8_t bRequest;
+	uint16_t wValue;
+	uint16_t wIndex;
+	uint16_t wLength;
+
+	char data[];
+} usb_control_request;
+
+int irecv_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc_index, unsigned char * buffer, int size);
+
+irecv_error_t mobiledevice_openpipes(irecv_client_t client);
+void mobiledevice_closepipes(irecv_client_t client);
+
+irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ecid) {
+	irecv_error_t ret;
+	int found = 0;
+	SP_DEVICE_INTERFACE_DATA currentInterface;
+	HDEVINFO usbDevices;
+	DWORD i;
+	irecv_client_t _client = (irecv_client_t) malloc(sizeof(struct irecv_client));
+	memset(_client, 0, sizeof(struct irecv_client));
+
+	// Get DFU paths
+	usbDevices = SetupDiGetClassDevs(&GUID_DEVINTERFACE_DFU, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+	memset(&currentInterface, '\0', sizeof(SP_DEVICE_INTERFACE_DATA));
+	currentInterface.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+	for(i = 0; usbDevices && SetupDiEnumDeviceInterfaces(usbDevices, NULL, &GUID_DEVINTERFACE_DFU, i, &currentInterface); i++) {
+		if (_client->DfuPath) {
+			free(_client->DfuPath);
+			_client->DfuPath = NULL;
+		}
+		_client->handle = NULL;
+		DWORD requiredSize = 0;
+		PSP_DEVICE_INTERFACE_DETAIL_DATA details;
+		SetupDiGetDeviceInterfaceDetail(usbDevices, &currentInterface, NULL, 0, &requiredSize, NULL);
+		details = (PSP_DEVICE_INTERFACE_DETAIL_DATA) malloc(requiredSize);
+		details->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
+		if(!SetupDiGetDeviceInterfaceDetail(usbDevices, &currentInterface, details, requiredSize, NULL, NULL)) {
+			free(details);
+			continue;
+		} else {
+			LPSTR result = (LPSTR) malloc(requiredSize - sizeof(DWORD));
+			memcpy((void*) result, details->DevicePath, requiredSize - sizeof(DWORD));
+			free(details);
+
+			_client->DfuPath = result;
+			if (mobiledevice_openpipes(_client) != IRECV_E_SUCCESS) {
+				mobiledevice_closepipes(_client);
+				continue;
+			}
+
+			if (ecid == kWTFMode) {
+				if (_client->mode != kWTFMode) {
+					// special ecid case, ignore !kWTFMode
+					continue;
+				} else {
+					ecid = 0;
+				}
+			}
+
+			if ((ecid != 0) && (_client->mode == kWTFMode)) {
+				// we can't get ecid in WTF mode
+				mobiledevice_closepipes(_client);
+				continue;
+			}
+
+			_client->serial[0] = '\0';
+			if ((sscanf(result, "\\\\?\\usb#vid_%*04x&pid_%*04x#%s#", _client->serial) != 1) || (_client->serial[0] == '\0')) {
+				mobiledevice_closepipes(_client);
+				continue;
+			}
+
+			char* p = strchr(_client->serial, '#');
+			if (p) {
+				*p = '\0';
+			}
+
+			int j;
+			for (j = 0; j < strlen(_client->serial); j++) {
+				if (_client->serial[j] == '_') {
+					_client->serial[j] = ' ';
+				} else {
+					_client->serial[j] = toupper(_client->serial[j]);	
+				}
+			}
+
+			if (ecid != 0) {
+				char* ecid_string = strstr(_client->serial, "ECID:");
+				if (ecid_string == NULL) {
+					debug("%s: could not get ECID for device\n", __func__);
+					mobiledevice_closepipes(_client);
+					continue;
+				}
+
+				unsigned long long this_ecid = 0;
+				sscanf(ecid_string, "ECID:" _FMT_qX, (unsigned long long*)&this_ecid);
+				if (this_ecid != ecid) {
+					mobiledevice_closepipes(_client);
+					continue;
+				}
+				debug("found device with ECID " _FMT_016llx "\n", (unsigned long long)ecid);
+			}
+			found = 1;
+			break;
+		}
+	}
+	SetupDiDestroyDeviceInfoList(usbDevices);
+
+	if (found) {
+		*client = _client;
+		return IRECV_E_SUCCESS;
+	}
+
+	// Get iBoot path
+	usbDevices = SetupDiGetClassDevs(&GUID_DEVINTERFACE_IBOOT, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+	memset(&currentInterface, '\0', sizeof(SP_DEVICE_INTERFACE_DATA));
+	currentInterface.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+	for(i = 0; usbDevices && SetupDiEnumDeviceInterfaces(usbDevices, NULL, &GUID_DEVINTERFACE_IBOOT, i, &currentInterface); i++) {
+		if (_client->iBootPath) {
+			free(_client->iBootPath);
+			_client->iBootPath = NULL;
+		}
+		_client->handle = NULL;
+		DWORD requiredSize = 0;
+		PSP_DEVICE_INTERFACE_DETAIL_DATA details;
+		SetupDiGetDeviceInterfaceDetail(usbDevices, &currentInterface, NULL, 0, &requiredSize, NULL);
+		details = (PSP_DEVICE_INTERFACE_DETAIL_DATA) malloc(requiredSize);
+		details->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
+		if(!SetupDiGetDeviceInterfaceDetail(usbDevices, &currentInterface, details, requiredSize, NULL, NULL)) {
+			free(details);
+			continue;
+		} else {
+			LPSTR result = (LPSTR) malloc(requiredSize - sizeof(DWORD));
+			memcpy((void*) result, details->DevicePath, requiredSize - sizeof(DWORD));
+			free(details);
+
+			_client->iBootPath = result;
+			if (mobiledevice_openpipes(_client) != IRECV_E_SUCCESS) {
+				mobiledevice_closepipes(_client);
+				continue;
+			}
+
+			if ((ecid != 0) && (_client->mode == kWTFMode)) {
+				// we can't get ecid in WTF mode
+				mobiledevice_closepipes(_client);
+				continue;
+			}
+
+			_client->serial[0] = '\0';
+			if ((sscanf(result, "\\\\?\\usb#vid_%*04x&pid_%*04x#%s#", _client->serial) != 1) || (_client->serial[0] == '\0')) {
+				mobiledevice_closepipes(_client);
+				continue;
+			}
+
+			char* p = strchr(_client->serial, '#');
+			if (p) {
+				*p = '\0';
+			}
+
+			int j;
+			for (j = 0; j < strlen(_client->serial); j++) {
+				if (_client->serial[j] == '_') {
+					_client->serial[j] = ' ';
+				} else {
+					_client->serial[j] = toupper(_client->serial[j]);	
+				}
+			}
+
+			if (ecid != 0) {
+				char* ecid_string = strstr(_client->serial, "ECID:");
+				if (ecid_string == NULL) {
+					debug("%s: could not get ECID for device\n", __func__);
+					mobiledevice_closepipes(_client);
+					continue;
+				}
+
+				unsigned long long this_ecid = 0;
+				sscanf(ecid_string, "ECID:" _FMT_qX, (unsigned long long*)&this_ecid);
+				if (this_ecid != ecid) {
+					mobiledevice_closepipes(_client);
+					continue;
+				}
+				debug("found device with ECID " _FMT_016llx" \n", (unsigned long long)ecid);
+			}
+			found = 1;
+			break;
+		}
+	}
+	SetupDiDestroyDeviceInfoList(usbDevices);
+
+	if (!found) {
+		irecv_close(_client);
+		return IRECV_E_UNABLE_TO_CONNECT;
+	}
+	
+	*client = _client;
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t mobiledevice_openpipes(irecv_client_t client) {
+	if (client->iBootPath && !(client->hIB = CreateFile(client->iBootPath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL))) {
+		irecv_close(client);
+		return IRECV_E_UNABLE_TO_CONNECT;
+	}
+	if (client->DfuPath && !(client->hDFU = CreateFile(client->DfuPath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL))) {
+		irecv_close(client);
+		return IRECV_E_UNABLE_TO_CONNECT;
+	}
+
+	client->mode = 0;
+	if (client->iBootPath == NULL) {
+		if (strncmp(client->DfuPath, "\\\\?\\usb#vid_05ac&pid_", 21) == 0) {
+			sscanf(client->DfuPath+21, "%x#", &client->mode);
+		}
+		client->handle = client->hDFU;
+	} else {
+		if (strncmp(client->iBootPath, "\\\\?\\usb#vid_05ac&pid_", 21) == 0) {
+			sscanf(client->iBootPath+21, "%x#", &client->mode);
+		}
+		client->handle = client->hIB;
+	}
+	
+	if (client->mode == 0) {
+		irecv_close(client);
+		return IRECV_E_UNABLE_TO_CONNECT;
+	}
+	
+	return IRECV_E_SUCCESS;
+}
+
+void mobiledevice_closepipes(irecv_client_t client) {
+	if (client->hDFU!=NULL) {
+		CloseHandle(client->hDFU);
+		client->hDFU = NULL;
+	}
+	if (client->hIB!=NULL) {
+		CloseHandle(client->hIB);
+		client->hIB = NULL;
+	}
+}
+#endif
+
+int check_context(irecv_client_t client) {
+	if (client == NULL || client->handle == NULL) {
+		return IRECV_E_NO_DEVICE;
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+void irecv_init() {
+#ifndef WIN32
+	libusb_init(&libirecovery_context);
+#endif
+}
+
+void irecv_exit() {
+#ifndef WIN32
+	if (libirecovery_context != NULL) {
+		libusb_exit(libirecovery_context);
+		libirecovery_context = NULL;
+	}
+#endif
+}
+
+#ifdef __APPLE__
+	void dummy_callback() { }
+#endif
+
+int irecv_control_transfer( irecv_client_t client,
+							uint8_t bmRequestType,
+							uint8_t bRequest,
+							uint16_t wValue,
+							uint16_t wIndex,
+							unsigned char *data,
+							uint16_t wLength,
+							unsigned int timeout) {
+#ifndef WIN32
+	return libusb_control_transfer(client->handle, bmRequestType, bRequest, wValue, wIndex, data, wLength, timeout);
+#else
+	DWORD count = 0;
+	DWORD ret;
+	BOOL bRet;
+	OVERLAPPED overlapped;
+	
+	if (data == NULL) wLength = 0;
+	
+	usb_control_request* packet = (usb_control_request*) malloc(sizeof(usb_control_request) + wLength);
+	packet->bmRequestType = bmRequestType;
+	packet->bRequest = bRequest;
+	packet->wValue = wValue;
+	packet->wIndex = wIndex;
+	packet->wLength = wLength;
+	
+	if (bmRequestType < 0x80 && wLength > 0) {
+		memcpy(packet->data, data, wLength);
+	}
+	
+	memset(&overlapped, 0, sizeof(overlapped));
+	overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+	DeviceIoControl(client->handle, 0x2200A0, packet, sizeof(usb_control_request) + wLength, packet, sizeof(usb_control_request) + wLength, NULL, &overlapped);
+	ret = WaitForSingleObject(overlapped.hEvent, timeout);
+	bRet = GetOverlappedResult(client->handle, &overlapped, &count, FALSE);
+	CloseHandle(overlapped.hEvent);
+	if (!bRet) {
+		CancelIo(client->handle);
+		free(packet);
+		return -1;
+	}
+	
+	count -= sizeof(usb_control_request);
+	if (count > 0) {
+		if (bmRequestType >= 0x80) {
+			memcpy(data, packet->data, count);
+		}
+	}
+	free(packet);
+	return count;
+#endif
+}
+
+int irecv_bulk_transfer(irecv_client_t client,
+							unsigned char endpoint,
+							unsigned char *data,
+							int length,
+							int *transferred,
+							unsigned int timeout) {
+	int ret;
+
+#ifndef WIN32
+	ret = libusb_bulk_transfer(client->handle, endpoint, data, length, transferred, timeout);
+	if (ret < 0) {
+		libusb_clear_halt(client->handle, endpoint);
+	}
+#else
+	if (endpoint==0x4) {
+		ret = DeviceIoControl(client->handle, 0x220195, data, length, data, length, (PDWORD) transferred, NULL);
+	} else {
+		ret = 0;
+	}
+	ret = (ret==0) ? -1 : 0;
+#endif
+
+	return ret;
+}
+
+int irecv_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc_index, unsigned char * buffer, int size) {
+#ifndef WIN32
+	return libusb_get_string_descriptor_ascii(client->handle, desc_index, buffer, size);
+#else
+	irecv_error_t ret;
+	unsigned short langid = 0;
+	unsigned char data[255];
+	int di, si;
+	memset(data, 0, sizeof(data));
+	memset(buffer, 0, size);
+
+	ret = irecv_control_transfer(client, 0x80, 0x06, (0x03 << 8) | desc_index, langid, data, sizeof(data), USB_TIMEOUT);
+	
+	if (ret < 0) return ret;
+	if (data[1] != 0x03) return IRECV_E_UNKNOWN_ERROR;
+	if (data[0] > ret) return IRECV_E_UNKNOWN_ERROR; 
+
+	for (di = 0, si = 2; si < data[0]; si += 2) {
+		if (di >= (size - 1)) break;
+		if (data[si + 1]) {
+			/* high byte */
+			buffer[di++] = '?';
+        } else {
+            buffer[di++] = data[si];
+		}
+	}
+	buffer[di] = 0;
+	
+	return di;
+#endif
+}
+
+irecv_error_t irecv_open(irecv_client_t* pclient, unsigned long long ecid) {
+	if(libirecovery_debug) {
+		irecv_set_debug_level(libirecovery_debug);
+	}
+#ifndef WIN32
+	int i = 0;
+	struct libusb_device* usb_device = NULL;
+	struct libusb_device** usb_device_list = NULL;
+	struct libusb_device_handle* usb_handle = NULL;
+	struct libusb_device_descriptor usb_descriptor;
+
+	*pclient = NULL;
+	irecv_error_t error = IRECV_E_SUCCESS;
+	int usb_device_count = libusb_get_device_list(libirecovery_context, &usb_device_list);
+	for (i = 0; i < usb_device_count; i++) {
+		usb_device = usb_device_list[i];
+		libusb_get_device_descriptor(usb_device, &usb_descriptor);
+		if (usb_descriptor.idVendor == APPLE_VENDOR_ID) {
+			/* verify this device is in a mode we understand */
+			if (usb_descriptor.idProduct == kRecoveryMode1 ||
+				usb_descriptor.idProduct == kRecoveryMode2 ||
+				usb_descriptor.idProduct == kRecoveryMode3 ||
+				usb_descriptor.idProduct == kRecoveryMode4 ||
+				usb_descriptor.idProduct == kWTFMode ||
+				usb_descriptor.idProduct == kDfuMode) {
+
+				if (ecid == kWTFMode) {
+					if (usb_descriptor.idProduct != kWTFMode) {
+						// special ecid case, ignore !kWTFMode
+						continue;
+					} else {
+						ecid = 0;
+					}
+				}
+
+				if ((ecid != 0) && (usb_descriptor.idProduct == kWTFMode)) {
+					// we can't get ecid in WTF mode
+					continue;
+				}
+
+				debug("opening device %04x:%04x...\n", usb_descriptor.idVendor, usb_descriptor.idProduct);
+
+				libusb_open(usb_device, &usb_handle);
+				if (usb_handle == NULL) {
+					debug("%s: can't connect to device...\n", __func__);
+					libusb_close(usb_handle);
+					if (ecid != 0) {
+						continue;
+					}
+					libusb_free_device_list(usb_device_list, 1);
+					libusb_exit(libirecovery_context);
+					return IRECV_E_UNABLE_TO_CONNECT;
+				}
+
+				irecv_client_t client = (irecv_client_t) malloc(sizeof(struct irecv_client));
+				if (client == NULL) {
+					libusb_free_device_list(usb_device_list, 1);
+					libusb_close(usb_handle);
+					libusb_exit(libirecovery_context);
+					return IRECV_E_OUT_OF_MEMORY;
+				}
+
+				memset(client, '\0', sizeof(struct irecv_client));
+				client->interface = 0;
+				client->handle = usb_handle;
+				client->mode = usb_descriptor.idProduct;
+
+				/* cache usb serial */
+				irecv_get_string_descriptor_ascii(client, usb_descriptor.iSerialNumber, (unsigned char*) client->serial, 255);
+
+				if (ecid != 0) {
+					char* ecid_string = strstr(client->serial, "ECID:");
+					if (ecid_string == NULL) {
+						debug("%s: could not get ECID for device\n", __func__);
+						irecv_close(client);
+						continue;
+					}
+
+					unsigned long long this_ecid = 0;
+					sscanf(ecid_string, "ECID:" _FMT_qX, (unsigned long long*)&this_ecid);
+					if (this_ecid != ecid) {
+						irecv_close(client);
+						continue;
+					}
+					debug("found device with ECID " _FMT_016llx "\n", (unsigned long long)ecid);
+				}
+
+				error = irecv_set_configuration(client, 1);
+				if (error != IRECV_E_SUCCESS) {
+					return error;
+				}
+
+				if ((client->mode != kDfuMode) && (client->mode != kWTFMode)) {
+					error = irecv_set_interface(client, 0, 0);
+					if (client->mode > kRecoveryMode2) {
+						error = irecv_set_interface(client, 1, 1);
+					}
+				} else {
+					error = irecv_set_interface(client, 0, 0);
+				}
+
+				if (error != IRECV_E_SUCCESS) {
+					return error;
+				}
+
+				*pclient = client;
+				return IRECV_E_SUCCESS;
+			}
+		}
+	}
+
+	return IRECV_E_UNABLE_TO_CONNECT;
+#else
+	int ret = mobiledevice_connect(pclient, ecid);
+	if (ret == IRECV_E_SUCCESS) {
+		irecv_client_t client = *pclient;
+		int error = IRECV_E_SUCCESS;
+		if ((client->mode != kDfuMode) && (client->mode != kWTFMode)) {
+			error = irecv_set_interface(client, 0, 0);
+			if (client->mode > kRecoveryMode2) {
+				error = irecv_set_interface(client, 1, 1);
+			}
+		} else {
+			error = irecv_set_interface(client, 0, 0);
+		}
+		if (error != IRECV_E_SUCCESS) {
+			debug("WARNING: set interface failed, error %d\n", error);
+		}
+	}
+	return ret;
+#endif
+}
+
+irecv_error_t irecv_set_configuration(irecv_client_t client, int configuration) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+	
+#ifndef WIN32
+	debug("Setting to configuration %d\n", configuration);
+
+	int current = 0;
+	libusb_get_configuration(client->handle, &current);
+	if (current != configuration) {
+		if (libusb_set_configuration(client->handle, configuration) < 0) {
+			return IRECV_E_USB_CONFIGURATION;
+		}
+	}
+
+	client->config = configuration;
+#endif
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_set_interface(irecv_client_t client, int interface, int alt_interface) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	debug("Setting to interface %d:%d\n", interface, alt_interface);
+#ifndef WIN32
+	// pod2g 2011-01-07: we may want to claim multiple interfaces
+	//libusb_release_interface(client->handle, client->interface);
+
+	if (libusb_claim_interface(client->handle, interface) < 0) {
+		return IRECV_E_USB_INTERFACE;
+	}
+
+	if (libusb_set_interface_alt_setting(client->handle, interface, alt_interface) < 0) {
+		return IRECV_E_USB_INTERFACE;
+	}
+#else
+	if (irecv_control_transfer(client, 0, 0x0B, alt_interface, interface, NULL, 0, USB_TIMEOUT) < 0) {
+		return IRECV_E_USB_INTERFACE;
+	}
+#endif
+	client->interface = interface;
+	client->alt_interface = alt_interface;
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_reset(irecv_client_t client) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+	
+#ifndef WIN32
+	libusb_reset_device(client->handle);
+#else
+	int ret;
+	DWORD count;
+	ret = DeviceIoControl(client->handle, 0x22000C, NULL, 0, NULL, 0, &count, NULL);
+#endif
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_open_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts) {
+	int i;
+
+	for (i = 0; i < attempts; i++) {
+		if(*pclient) {
+			irecv_close(*pclient);
+			*pclient = NULL;
+		}
+		if (irecv_open(pclient, ecid) != IRECV_E_SUCCESS) {
+			debug("Connection failed. Waiting 1 sec before retry.\n");
+			sleep(1);
+		} else {
+			return IRECV_E_SUCCESS;
+		}		
+	}
+
+	return IRECV_E_UNABLE_TO_CONNECT;       
+}
+
+irecv_error_t irecv_event_subscribe(irecv_client_t client, irecv_event_type type, irecv_event_cb_t callback, void* user_data) {
+	switch(type) {
+	case IRECV_RECEIVED:
+		client->received_callback = callback;
+		break;
+
+	case IRECV_PROGRESS:
+		client->progress_callback = callback;
+
+	case IRECV_CONNECTED:
+		client->connected_callback = callback;
+
+	case IRECV_PRECOMMAND:
+		client->precommand_callback = callback;
+		break;
+
+	case IRECV_POSTCOMMAND:
+		client->postcommand_callback = callback;
+		break;
+
+	case IRECV_DISCONNECTED:
+		client->disconnected_callback = callback;
+
+	default:
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_event_unsubscribe(irecv_client_t client, irecv_event_type type) {
+	switch(type) {
+	case IRECV_RECEIVED:
+		client->received_callback = NULL;
+		break;
+
+	case IRECV_PROGRESS:
+		client->progress_callback = NULL;
+
+	case IRECV_CONNECTED:
+		client->connected_callback = NULL;
+
+	case IRECV_PRECOMMAND:
+		client->precommand_callback = NULL;
+		break;
+
+	case IRECV_POSTCOMMAND:
+		client->postcommand_callback = NULL;
+		break;
+
+	case IRECV_DISCONNECTED:
+		client->disconnected_callback = NULL;
+
+	default:
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_close(irecv_client_t client) {
+	if (client != NULL) {
+		if(client->disconnected_callback != NULL) {
+			irecv_event_t event;
+			event.size = 0;
+			event.data = NULL;
+			event.progress = 0;
+			event.type = IRECV_DISCONNECTED;
+			client->disconnected_callback(client, &event);
+		}
+#ifndef WIN32
+		if (client->handle != NULL) {
+			if ((client->mode != kDfuMode) && (client->mode != kWTFMode)) {
+				libusb_release_interface(client->handle, client->interface);
+			}
+			libusb_close(client->handle);
+			client->handle = NULL;
+		}
+#else
+		if (client->iBootPath!=NULL) {
+			free(client->iBootPath);
+			client->iBootPath = NULL;
+		}
+		if (client->DfuPath!=NULL) {
+			free(client->DfuPath);
+			client->DfuPath = NULL;
+		}
+		mobiledevice_closepipes(client);
+#endif
+		free(client);
+		client = NULL;
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+void irecv_set_debug_level(int level) {
+	libirecovery_debug = level;
+#ifndef WIN32
+	if(libirecovery_context) {
+		libusb_set_debug(libirecovery_context, libirecovery_debug);
+	}
+#endif
+}
+
+static irecv_error_t irecv_send_command_raw(irecv_client_t client, char* command) {
+	unsigned int length = strlen(command);
+	if (length >= 0x100) {
+		length = 0xFF;
+	}
+
+	if (length > 0) {
+		int ret = irecv_control_transfer(client, 0x40, 0, 0, 0, (unsigned char*) command, length + 1, USB_TIMEOUT);
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_send_command(irecv_client_t client, char* command) {
+	irecv_error_t error = 0;
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	unsigned int length = strlen(command);
+	if (length >= 0x100) {
+		length = 0xFF;
+	}
+
+	irecv_event_t event;
+	if(client->precommand_callback != NULL) {
+		event.size = length;
+		event.data = command;
+		event.type = IRECV_PRECOMMAND;
+		if(client->precommand_callback(client, &event)) {
+			return IRECV_E_SUCCESS;
+		}
+	}
+
+	error = irecv_send_command_raw(client, command);
+	if (error != IRECV_E_SUCCESS) {
+		debug("Failed to send command %s\n", command);
+		if (error != IRECV_E_PIPE)
+			return error;
+	}
+
+	if(client->postcommand_callback != NULL) {
+		event.size = length;
+		event.data = command;
+		event.type = IRECV_POSTCOMMAND;
+		if(client->postcommand_callback(client, &event)) {
+			return IRECV_E_SUCCESS;
+		}
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_send_file(irecv_client_t client, const char* filename, int dfuNotifyFinished) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	FILE* file = fopen(filename, "rb");
+	if (file == NULL) {
+		return IRECV_E_FILE_NOT_FOUND;
+	}
+
+	fseek(file, 0, SEEK_END);
+	long length = ftell(file);
+	fseek(file, 0, SEEK_SET);
+
+	char* buffer = (char*) malloc(length);
+	if (buffer == NULL) {
+		fclose(file);
+		return IRECV_E_OUT_OF_MEMORY;
+	}
+
+	long bytes = fread(buffer, 1, length, file);
+	fclose(file);
+
+	if (bytes != length) {
+		free(buffer);
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+	irecv_error_t error = irecv_send_buffer(client, buffer, length, dfuNotifyFinished);
+	free(buffer);
+	return error;
+}
+
+irecv_error_t irecv_get_status(irecv_client_t client, unsigned int* status) {
+	if (check_context(client) != IRECV_E_SUCCESS) {
+		*status = 0;
+		return IRECV_E_NO_DEVICE;
+	}
+
+	unsigned char buffer[6];
+	memset(buffer, '\0', 6);
+	if (irecv_control_transfer(client, 0xA1, 3, 0, 0, buffer, 6, USB_TIMEOUT) != 6) {
+		*status = 0;
+		return IRECV_E_USB_STATUS;
+	}
+
+	*status = (unsigned int) buffer[4];
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_send_buffer(irecv_client_t client, unsigned char* buffer, unsigned long length, int dfuNotifyFinished) {
+	irecv_error_t error = 0;
+	int recovery_mode = ((client->mode != kDfuMode) && (client->mode != kWTFMode));
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	unsigned int h1 = 0xFFFFFFFF;
+	unsigned char dfu_xbuf[12] = {0xff, 0xff, 0xff, 0xff, 0xac, 0x05, 0x00, 0x01, 0x55, 0x46, 0x44, 0x10};
+	int packet_size = recovery_mode ? 0x8000 : 0x800;
+	int last = length % packet_size;
+	int packets = length / packet_size;
+	if (last != 0) {
+		packets++;
+	} else {
+		last = packet_size;
+	}
+
+	/* initiate transfer */
+	if (recovery_mode) {
+		error = irecv_control_transfer(client, 0x41, 0, 0, 0, NULL, 0, USB_TIMEOUT);
+	} else {
+		char dump[4];
+		if (irecv_control_transfer(client, 0xa1, 5, 0, 0, dump, 1, USB_TIMEOUT) == 1) {
+			error = IRECV_E_SUCCESS;
+		} else {
+			error = IRECV_E_USB_UPLOAD;
+		}
+	}
+	if (error != IRECV_E_SUCCESS) {
+		return error;
+	}
+
+	int i = 0;
+	double progress = 0;
+	unsigned long count = 0;
+	unsigned int status = 0;
+	int bytes = 0;
+	for (i = 0; i < packets; i++) {
+		int size = (i + 1) < packets ? packet_size : last;
+
+		/* Use bulk transfer for recovery mode and control transfer for DFU and WTF mode */
+		if (recovery_mode) {
+			error = irecv_bulk_transfer(client, 0x04, &buffer[i * packet_size], size, &bytes, USB_TIMEOUT);
+		} else {
+			int j;
+			for (j = 0; j < size; j++) {
+				dfu_hash_step(h1, buffer[i*packet_size + j]);
+			}
+			if (i+1 == packets) {
+				for (j = 0; j < 2; j++) {
+					dfu_hash_step(h1, dfu_xbuf[j*6 + 0]);
+					dfu_hash_step(h1, dfu_xbuf[j*6 + 1]);
+					dfu_hash_step(h1, dfu_xbuf[j*6 + 2]);
+					dfu_hash_step(h1, dfu_xbuf[j*6 + 3]);
+					dfu_hash_step(h1, dfu_xbuf[j*6 + 4]);
+					dfu_hash_step(h1, dfu_xbuf[j*6 + 5]);
+				}
+
+				char* newbuf = (char*)malloc(size + 16);
+				memcpy(newbuf, &buffer[i * packet_size], size);
+				memcpy(newbuf+size, dfu_xbuf, 12);
+				newbuf[size+12] = h1 & 0xFF;
+				newbuf[size+13] = (h1 >> 8) & 0xFF;
+				newbuf[size+14] = (h1 >> 16) & 0xFF;
+				newbuf[size+15] = (h1 >> 24) & 0xFF;
+				size += 16;
+				bytes = irecv_control_transfer(client, 0x21, 1, i, 0, newbuf, size, USB_TIMEOUT);
+				free(newbuf);
+			} else {
+				bytes = irecv_control_transfer(client, 0x21, 1, i, 0, &buffer[i * packet_size], size, USB_TIMEOUT);
+			}
+		}
+
+		if (bytes != size) {
+			return IRECV_E_USB_UPLOAD;
+		}
+
+		if (!recovery_mode) {
+			error = irecv_get_status(client, &status);
+		}
+
+		if (error != IRECV_E_SUCCESS) {
+			return error;
+		}
+
+		if (!recovery_mode && status != 5) {
+			int retry = 0;
+			while (retry < 20) {
+				irecv_get_status(client, &status);
+				if (status == 5) {
+					break;
+				}
+				sleep(1);
+			}
+			if (status != 5) {
+				return IRECV_E_USB_UPLOAD;
+			}
+		}
+
+		count += size;
+		if(client->progress_callback != NULL) {
+			irecv_event_t event;
+			event.progress = ((double) count/ (double) length) * 100.0;
+			event.type = IRECV_PROGRESS;
+			event.data = "Uploading";
+			event.size = count;
+			client->progress_callback(client, &event);
+		} else {
+			debug("Sent: %d bytes - %lu of %lu\n", bytes, count, length);
+		}
+	}
+
+	if (dfuNotifyFinished && !recovery_mode) {
+		irecv_control_transfer(client, 0x21, 1, packets, 0, (unsigned char*) buffer, 0, USB_TIMEOUT);
+
+		for (i = 0; i < 2; i++) {
+			error = irecv_get_status(client, &status);
+			if (error != IRECV_E_SUCCESS) {
+				return error;
+			}
+		}
+
+		if (dfuNotifyFinished == 2) {
+			// we send a pseudo ZLP here just in case
+			irecv_control_transfer(client, 0x21, 1, 0, 0, 0, 0, USB_TIMEOUT);
+		}
+
+		irecv_reset(client);
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_receive(irecv_client_t client) {
+	char buffer[BUFFER_SIZE];
+	memset(buffer, '\0', BUFFER_SIZE);
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	int bytes = 0;
+	while (irecv_bulk_transfer(client, 0x81, (unsigned char*) buffer, BUFFER_SIZE, &bytes, 1000) == 0) {
+		if (bytes > 0) {
+			if (client->received_callback != NULL) {
+				irecv_event_t event;
+				event.size = bytes;
+				event.data = buffer;
+				event.type = IRECV_RECEIVED;
+				if (client->received_callback(client, &event) != 0) {
+					return IRECV_E_SUCCESS;
+				}
+			}
+		} else break;
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_getenv(irecv_client_t client, const char* variable, char** value) {
+	int ret = 0;
+	char command[256];
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+	*value = NULL;
+
+	if(variable == NULL) {
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+	memset(command, '\0', sizeof(command));
+	snprintf(command, sizeof(command)-1, "getenv %s", variable);
+	irecv_error_t error = irecv_send_command_raw(client, command);
+	if(error == IRECV_E_PIPE) {
+		return IRECV_E_SUCCESS;
+	}
+	if(error != IRECV_E_SUCCESS) {
+		return error;
+	}
+
+	char* response = (char*) malloc(256);
+	if (response == NULL) {
+		return IRECV_E_OUT_OF_MEMORY;
+	}
+
+	memset(response, '\0', 256);
+	ret = irecv_control_transfer(client, 0xC0, 0, 0, 0, (unsigned char*) response, 255, USB_TIMEOUT);
+
+	*value = response;
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_getret(irecv_client_t client, unsigned int* value) {
+	int ret = 0;
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+	*value = 0;
+
+	char* response = (char*) malloc(256);
+	if (response == NULL) {
+		return IRECV_E_OUT_OF_MEMORY;
+	}
+
+	memset(response, '\0', 256);
+	ret = irecv_control_transfer(client, 0xC0, 0, 0, 0, (unsigned char*) response, 255, USB_TIMEOUT);
+
+	*value = (unsigned int) *response;
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_get_cpid(irecv_client_t client, unsigned int* cpid) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	if (client->mode == kWTFMode) {
+		char s_cpid[8] = {0,};
+		strncpy(s_cpid, client->serial, 4);
+		if (sscanf(s_cpid, "%x", cpid) != 1) {
+			*cpid = 0;
+			return IRECV_E_UNKNOWN_ERROR;
+		}
+		return IRECV_E_SUCCESS;
+	}
+
+	char* cpid_string = strstr(client->serial, "CPID:");
+	if (cpid_string == NULL) {
+		*cpid = 0;
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+	sscanf(cpid_string, "CPID:%x", cpid);
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_get_bdid(irecv_client_t client, unsigned int* bdid) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	char* bdid_string = strstr(client->serial, "BDID:");
+	if (bdid_string == NULL) {
+		*bdid = 0;
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+	sscanf(bdid_string, "BDID:%x", bdid);
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_get_ecid(irecv_client_t client, unsigned long long* ecid) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	char* ecid_string = strstr(client->serial, "ECID:");
+	if (ecid_string == NULL) {
+		*ecid = 0;
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+	sscanf(ecid_string, "ECID:" _FMT_qX, ecid);
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_get_srnm(irecv_client_t client, unsigned char* srnm) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	char* srnmp;
+	char* srnm_string = strstr(client->serial, "SRNM:[");
+	if(srnm_string == NULL) {
+		srnm = NULL;
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+	sscanf(srnm_string, "SRNM:[%s]", srnm);
+	srnmp = strrchr(srnm, ']');
+	if(srnmp != NULL) {
+		*srnmp = '\0';
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_get_imei(irecv_client_t client, unsigned char* imei) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	char* imeip;
+	char* imei_string = strstr(client->serial, "IMEI:[");
+	if (imei_string == NULL) {
+		*imei = 0;
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+
+	sscanf(imei_string, "IMEI:[%s]", imei);
+	imeip = strrchr(imei, ']');
+	if(imeip != NULL) {
+		*imeip = '\0';
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_get_nonce(irecv_client_t client, unsigned char** nonce, int* nonce_size) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	unsigned char buf[255];
+	int len;
+
+	*nonce = NULL;
+	*nonce_size = 0;
+
+	len = irecv_get_string_descriptor_ascii(client, 1, (unsigned char*) buf, 255);
+	debug("%s: got length: %d\n", __func__, len);
+	if (len < 0) {
+		return len;
+	}
+
+	buf[len] = 0;
+	debug("%s: buf='%s'\n", __func__, buf);
+
+	char* nonce_string = strstr(buf, "NONC:");
+	if (nonce_string == NULL) {
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+	nonce_string+=5;
+
+	int nlen = (len - ((unsigned char*)nonce_string - &buf[0])) / 2;
+	unsigned char *nn = malloc(nlen);
+	if (!nn) {
+		return IRECV_E_OUT_OF_MEMORY;
+	}
+
+	int i = 0;
+	for (i = 0; i < nlen; i++) {
+		int val = 0;
+		if (sscanf(nonce_string+(i*2), "%02X", &val) == 1) {
+			nn[i] = (unsigned char)val;
+		} else {
+			debug("%s: ERROR: unexpected data in nonce result (%2s)\n", __func__, nonce_string+(i*2));
+			break;
+		}
+	}
+
+	if (i != nlen) {
+		debug("%s: ERROR: unable to parse nonce\n", __func__);
+		free(nn);
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+	*nonce = nn;
+	*nonce_size = nlen;
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_send_exploit(irecv_client_t client) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+	irecv_control_transfer(client, 0x21, 2, 0, 0, NULL, 0, USB_TIMEOUT);
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_execute_script(irecv_client_t client, const char* filename) {
+	irecv_error_t error = IRECV_E_SUCCESS;
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	char* file_data = NULL;
+	unsigned int file_size = 0;
+	if(irecv_read_file(filename, &file_data, &file_size) < 0) {
+		return IRECV_E_FILE_NOT_FOUND;
+	}
+
+	char* line = strtok(file_data, "\n");
+	while(line != NULL) {
+		if(line[0] != '#') {
+			error = irecv_send_command(client, line);
+			if(error != IRECV_E_SUCCESS) {
+				return error;
+			}
+
+			error = irecv_receive(client);
+			if(error != IRECV_E_SUCCESS) {
+				return error;
+			}
+		}
+		line = strtok(NULL, "\n");
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_saveenv(irecv_client_t client) {
+	irecv_error_t error = irecv_send_command_raw(client, "saveenv");
+	if(error != IRECV_E_SUCCESS) {
+		return error;
+	}
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_setenv(irecv_client_t client, const char* variable, const char* value) {
+	char command[256];
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	if(variable == NULL || value == NULL) {
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+	memset(command, '\0', sizeof(command));
+	snprintf(command, sizeof(command)-1, "setenv %s %s", variable, value);
+	irecv_error_t error = irecv_send_command_raw(client, command);
+	if(error != IRECV_E_SUCCESS) {
+		return error;
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+const char* irecv_strerror(irecv_error_t error) {
+	switch (error) {
+	case IRECV_E_SUCCESS:
+		return "Command completed successfully";
+
+	case IRECV_E_NO_DEVICE:
+		return "Unable to find device";
+
+	case IRECV_E_OUT_OF_MEMORY:
+		return "Out of memory";
+
+	case IRECV_E_UNABLE_TO_CONNECT:
+		return "Unable to connect to device";
+
+	case IRECV_E_INVALID_INPUT:
+		return "Invalid input";
+
+	case IRECV_E_FILE_NOT_FOUND:
+		return "File not found";
+
+	case IRECV_E_USB_UPLOAD:
+		return "Unable to upload data to device";
+
+	case IRECV_E_USB_STATUS:
+		return "Unable to get device status";
+
+	case IRECV_E_USB_INTERFACE:
+		return "Unable to set device interface";
+
+	case IRECV_E_USB_CONFIGURATION:
+		return "Unable to set device configuration";
+
+	case IRECV_E_PIPE:
+		return "Broken pipe";
+
+	case IRECV_E_TIMEOUT:
+		return "Timeout talking to device";
+
+	default:
+		return "Unknown error";
+	}
+
+	return NULL;
+}
+
+int irecv_write_file(const char* filename, const void* data, size_t size) {
+	size_t bytes = 0;
+	FILE* file = NULL;
+
+	debug("Writing data to %s\n", filename);
+	file = fopen(filename, "wb");
+	if (file == NULL) {
+		//error("read_file: Unable to open file %s\n", filename);
+		return -1;
+	}
+
+	bytes = fwrite(data, 1, size, file);
+	fclose(file);
+
+	if (bytes != size) {
+		//error("ERROR: Unable to write entire file: %s: %d of %d\n", filename, bytes, size);
+		return -1;
+	}
+
+	return size;
+}
+
+int irecv_read_file(const char* filename, char** data, uint32_t* size) {
+	size_t bytes = 0;
+	size_t length = 0;
+	FILE* file = NULL;
+	char* buffer = NULL;
+	debug("Reading data from %s\n", filename);
+
+	*size = 0;
+	*data = NULL;
+
+	file = fopen(filename, "rb");
+	if (file == NULL) {
+		//error("read_file: File %s not found\n", filename);
+		return -1;
+	}
+
+	fseek(file, 0, SEEK_END);
+	length = ftell(file);
+	rewind(file);
+
+	buffer = (char*) malloc(length);
+	if(buffer == NULL) {
+		//error("ERROR: Out of memory\n");
+		fclose(file);
+		return -1;
+	}
+	bytes = fread(buffer, 1, length, file);
+	fclose(file);
+
+	if(bytes != length) {
+		//error("ERROR: Unable to read entire file\n");
+		free(buffer);
+		return -1;
+	}
+
+	*size = length;
+	*data = buffer;
+	return 0;
+}
+
+irecv_error_t irecv_reset_counters(irecv_client_t client) {
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+	if ((client->mode == kDfuMode) || (client->mode == kWTFMode)) {
+		irecv_control_transfer(client, 0x21, 4, 0, 0, 0, 0, USB_TIMEOUT);
+	}
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_recv_buffer(irecv_client_t client, char* buffer, unsigned long length) {
+	irecv_error_t error = 0;
+	int recovery_mode = ((client->mode != kDfuMode) && (client->mode != kWTFMode));
+
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	int packet_size = recovery_mode ? 0x2000: 0x800;
+	int last = length % packet_size;
+	int packets = length / packet_size;
+	if (last != 0) {
+		packets++;
+	} else {
+		last = packet_size;
+	}
+
+	int i = 0;
+	int bytes = 0;
+	double progress = 0;
+	unsigned long count = 0;
+	unsigned int status = 0;
+	for (i = 0; i < packets; i++) {
+		unsigned short size = (i+1) < packets ? packet_size : last;
+		bytes = irecv_control_transfer(client, 0xA1, 2, 0, 0, &buffer[i * packet_size], size, USB_TIMEOUT);
+		
+		if (bytes != size) {
+			return IRECV_E_USB_UPLOAD;
+		}
+
+		count += size;
+		if(client->progress_callback != NULL) {
+			irecv_event_t event;
+			event.progress = ((double) count/ (double) length) * 100.0;
+			event.type = IRECV_PROGRESS;
+			event.data = "Downloading";
+			event.size = count;
+			client->progress_callback(client, &event);
+		} else {
+			debug("Sent: %d bytes - %lu of %lu\n", bytes, count, length);
+		}
+	}
+
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_finish_transfer(irecv_client_t client) {
+	int i = 0;
+	unsigned int status = 0;
+
+	if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE;
+
+	irecv_control_transfer(client, 0x21, 1, 0, 0, 0, 0, USB_TIMEOUT);
+
+	for(i = 0; i < 3; i++){
+		irecv_get_status(client, &status);
+	}
+	irecv_reset(client);
+	return IRECV_E_SUCCESS;
+}
+
+irecv_error_t irecv_get_device(irecv_client_t client, irecv_device_t* device) {
+	int device_id = DEVICE_UNKNOWN;
+	uint32_t bdid = 0;
+	uint32_t cpid = 0;
+
+	if (irecv_get_cpid(client, &cpid) < 0) {
+		return IRECV_E_UNKNOWN_ERROR;
+	}
+
+	switch (cpid) {
+	case CPID_IPHONE2G:
+		// iPhone1,1 iPhone1,2 and iPod1,1 all share the same ChipID
+		//   so we need to check the BoardID
+		if (irecv_get_bdid(client, &bdid) < 0) {
+			break;
+		}
+
+		switch (bdid) {
+		case BDID_IPHONE2G:
+			device_id = DEVICE_IPHONE2G;
+			break;
+
+		case BDID_IPHONE3G:
+			device_id = DEVICE_IPHONE3G;
+			break;
+
+		case BDID_IPOD1G:
+			device_id = DEVICE_IPOD1G;
+			break;
+
+		default:
+			device_id = DEVICE_UNKNOWN;
+			break;
+		}
+		break;
+
+	case CPID_IPHONE3GS:
+		device_id = DEVICE_IPHONE3GS;
+		break;
+
+	case CPID_IPOD2G:
+		device_id = DEVICE_IPOD2G;
+		break;
+
+	case CPID_IPOD3G:
+		device_id = DEVICE_IPOD3G;
+		break;
+
+	case CPID_IPAD1G:
+		// iPhone3,1 iPhone3,3 iPad4,1 and iPad1,1 all share the same ChipID
+		//   so we need to check the BoardID
+		if (irecv_get_bdid(client, &bdid) < 0) {
+			break;
+		}
+
+		switch (bdid) {
+		case BDID_IPAD1G:
+			device_id = DEVICE_IPAD1G;
+			break;
+
+		case BDID_IPHONE4:
+			device_id = DEVICE_IPHONE4;
+			break;
+
+		case BDID_IPOD4G:
+			device_id = DEVICE_IPOD4G;
+			break;
+
+		case BDID_APPLETV2:
+			device_id = DEVICE_APPLETV2;
+			break;
+
+		case BDID_IPHONE42:
+			device_id = DEVICE_IPHONE42;
+			break;
+
+		default:
+			device_id = DEVICE_UNKNOWN;
+			break;
+		}
+		break;
+
+	case CPID_IPAD21:
+		// iPad2,1 iPad2,2 iPad2,3 and iPhone4,1 share the same ChipID, so we need to check the BoardID
+		if (irecv_get_bdid(client, &bdid) < 0) {
+			break;
+		}
+
+		switch (bdid) {
+		case BDID_IPAD21:
+			device_id = DEVICE_IPAD21;
+			break;
+
+		case BDID_IPAD22:
+			device_id = DEVICE_IPAD22;
+			break;
+
+		case BDID_IPAD23:
+			device_id = DEVICE_IPAD23;
+			break;
+
+		case BDID_IPHONE4S:
+			device_id = DEVICE_IPHONE4S;
+			break;
+
+		default:
+			device_id = DEVICE_UNKNOWN;
+			break;
+		}
+		break;
+
+	default:
+		device_id = DEVICE_UNKNOWN;
+		break;
+	}
+
+	*device = &irecv_devices[device_id];
+	return IRECV_E_SUCCESS;
+}
+
+irecv_client_t irecv_reconnect(irecv_client_t client, int initial_pause) {
+	irecv_error_t error = 0;
+	irecv_client_t new_client = NULL;
+	irecv_event_cb_t progress_callback = client->progress_callback;
+
+	unsigned long long ecid = 0;
+	irecv_get_ecid(client, &ecid);
+
+	if (check_context(client) == IRECV_E_SUCCESS) {
+		irecv_close(client);
+	}
+
+	if (initial_pause > 0) {
+		debug("Waiting %d seconds for the device to pop up...\n", initial_pause);
+		sleep(initial_pause);
+	}
+	
+	error = irecv_open_attempts(&new_client, ecid, 10);
+	if(error != IRECV_E_SUCCESS) {
+		return NULL;
+	}
+
+	new_client->progress_callback = progress_callback;
+	return new_client;
+}
+
+void irecv_hexdump(unsigned char* buf, unsigned int len, unsigned int addr) {
+	int i, j;
+	printf("0x%08x: ", addr);
+	for (i = 0; i < len; i++) {
+		if (i % 16 == 0 && i != 0) {
+			for (j=i-16; j < i; j++) {
+	unsigned char car = buf[j];
+	if (car < 0x20 || car > 0x7f) car = '.';
+	printf("%c", car);
+			}
+			printf("\n");
+			addr += 0x10;
+			printf("0x%08x: ", addr);
+		}
+		printf("%02x ", buf[i]);
+	}
+
+	int done = (i % 16);
+	int remains = 16 - done;
+	if (done > 0) {
+		for (j = 0; j < remains; j++) {
+			printf("	 ");
+		}
+	}
+
+	if ((i - done) >= 0) {
+		if (done == 0 && i > 0) done = 16;
+		for (j = (i - done); j < i; j++) {
+			unsigned char car = buf[j];
+			if (car < 0x20 || car > 0x7f) car = '.';
+			printf("%c", car);
+		}
+	}
+	printf("\n");
+}
-- 
cgit v1.1-32-gdbae