summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/libirecovery.h37
-rw-r--r--src/irecovery.c92
-rw-r--r--src/libirecovery.c76
3 files changed, 133 insertions, 72 deletions
diff --git a/include/libirecovery.h b/include/libirecovery.h
index 7c424f6..e3360f0 100644
--- a/include/libirecovery.h
+++ b/include/libirecovery.h
@@ -35,18 +35,31 @@ enum {
kDfuMode = 0x1227
};
-typedef struct {
+struct irecv_device;
+typedef struct irecv_device irecv_device_t;
+
+typedef int(*irecv_send_callback)(irecv_device_t* device, unsigned char* data, unsigned int size);
+typedef int(*irecv_receive_callback)(irecv_device_t* device, unsigned char* data, unsigned int size);
+
+struct irecv_device {
unsigned int mode;
+ unsigned int debug;
struct libusb_context* context;
struct libusb_device_handle* handle;
-} irecv_device;
-
-void irecv_set_debug(int level);
-int irecv_open(irecv_device* device);
-int irecv_exit(irecv_device* device);
-int irecv_init(irecv_device** device);
-int irecv_reset(irecv_device* device);
-int irecv_close(irecv_device* device);
-int irecv_send_file(irecv_device* device, const char* filename);
-int irecv_send_command(irecv_device* device, const char* command);
-int irecv_send_buffer(irecv_device* device, unsigned char* buffer, int length);
+ irecv_receive_callback receive_callback;
+ irecv_send_callback send_callback;
+};
+
+irecv_device_t* irecv_init();
+int irecv_open(irecv_device_t* device);
+int irecv_exit(irecv_device_t* device);
+int irecv_reset(irecv_device_t* device);
+int irecv_close(irecv_device_t* device);
+void irecv_update(irecv_device_t* device);
+void irecv_set_debug(irecv_device_t* device, int level);
+int irecv_send_file(irecv_device_t* device, const char* filename);
+int irecv_send_command(irecv_device_t* device, unsigned char* command);
+int irecv_send_buffer(irecv_device_t* device, unsigned char* buffer, int length);
+int irecv_set_sender(irecv_device_t* device, irecv_send_callback callback);
+int irecv_set_receiver(irecv_device_t* device, irecv_receive_callback callback);
+
diff --git a/src/irecovery.c b/src/irecovery.c
index ae828af..2ab0aaa 100644
--- a/src/irecovery.c
+++ b/src/irecovery.c
@@ -23,44 +23,76 @@
#include <readline/readline.h>
#include <readline/history.h>
+#define FILE_HISTORY_PATH "~/.irecovery/history"
+
enum {
kResetDevice, kStartShell, kSendCommand, kSendFile
};
+static unsigned int exit_shell = 0;
+
void print_shell_usage() {
printf("Usage:\n");
- printf("\t:f <file>\tSend file to device.\n");
- printf("\t:h\t\tShow this help.\n");
- printf("\t:q\t\tQuit interactive shell.\n");
+ printf("\t/upload <file>\tSend file to device.\n");
+ printf("\t/help\t\tShow this help.\n");
+ printf("\t/exit\t\tExit interactive shell.\n");
}
-void init_shell(irecv_device* device) {
- int ret;
+void parse_command(irecv_device_t* device, unsigned char* command, unsigned int size) {
+ char* cmd = strtok(command, " ");
+ if(!strcmp(command, "/exit")) {
+ exit_shell = 1;
+ } else
+
+ if(!strcmp(command, "/help")) {
+ print_shell_usage();
+ } else
+
+ if(!strcmp(command, "/upload")) {
+ char* filename = strtok(0, " ");
+ if(filename != NULL) {
+ irecv_send_file(device, filename);
+ }
+ }
+}
- for(;;) {
- char* cmd = readline("iRecovery> ");
- if(cmd && *cmd) {
- add_history(cmd);
- if(cmd[0] == ':') {
- strtok(cmd, " ");
- char* arg = strtok(0, " ");
-
- if(cmd[1] == 'q') {
- free(cmd);
- break;
- } else if(cmd[1] == 'h') {
- print_shell_usage();
- } else if(cmd[1] == 'f') {
- ret = irecv_send_file(device, arg);
- // TODO: error messages
- }
- } else {
- ret = irecv_send_command(device, cmd);
- // TODO: error messages
- }
+int recv_callback(irecv_device_t* device, unsigned char* data, unsigned int size) {
+ int i = 0;
+ for(i = 0; i < size; i++) {
+ printf("%c", data[i]);
+ }
+ return size;
+}
+int send_callback(irecv_device_t* device, unsigned char* command, unsigned int size) {
+ if(command[0] == '/') {
+ parse_command(device, command, size);
+ return 0;
+ }
+ return size;
+}
+
+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_device_t* device) {
+ load_command_history();
+ irecv_set_sender(device, &send_callback);
+ irecv_set_receiver(device, &recv_callback);
+ while(!exit_shell) {
+ char* cmd = readline("> ");
+ if(cmd && *cmd) {
+ irecv_send_command(device, cmd);
+ append_command_to_history(cmd);
free(cmd);
}
+ irecv_update(device);
}
}
@@ -78,13 +110,14 @@ void print_usage() {
int main(int argc, char** argv) {
int opt = 0;
+ int debug = 0;
int action = 0;
char* argument = NULL;
if(argc == 1) print_usage();
while ((opt = getopt(argc, argv, "dhrsc:f:")) > 0) {
switch (opt) {
case 'd':
- irecv_set_debug(1);
+ debug = 1;
break;
case 'h':
@@ -115,11 +148,12 @@ int main(int argc, char** argv) {
}
}
- irecv_device* device = NULL;
- if(irecv_init(&device) < 0) {
+ irecv_device_t* device = irecv_init();
+ if(device == NULL) {
fprintf(stderr, "Unable to initialize libirecovery\n");
return -1;
}
+ if(debug) irecv_set_debug(device, 1);
if(irecv_open(device) < 0) {
fprintf(stderr, "Unable to open device\n");
diff --git a/src/libirecovery.c b/src/libirecovery.c
index 630a9b7..c31a424 100644
--- a/src/libirecovery.c
+++ b/src/libirecovery.c
@@ -23,27 +23,21 @@
#include "libirecovery.h"
-static unsigned int irecv_debug = 0;
-
-int irecv_init(irecv_device** p_device) {
+irecv_device_t* irecv_init() {
struct libusb_context* usb_context = NULL;
libusb_init(&usb_context);
- if (irecv_debug) libusb_set_debug(usb_context, 3);
-
- irecv_device* device = (irecv_device*) malloc(sizeof(irecv_device));
+ irecv_device_t* device = (irecv_device_t*) malloc(sizeof(irecv_device_t));
if (device == NULL) {
- *p_device = NULL;
- return IRECV_ERROR_OUT_OF_MEMORY;
+ return NULL;
}
- memset(device, '\0', sizeof(irecv_device));
+ memset(device, '\0', sizeof(irecv_device_t));
device->context = usb_context;
- *p_device = device;
- return IRECV_SUCCESS;
+ return device;
}
-int irecv_open(irecv_device* device) {
+int irecv_open(irecv_device_t* device) {
int i = 0;
int usb_device_count = 0;
struct libusb_device* usb_device = NULL;
@@ -77,7 +71,7 @@ int irecv_open(irecv_device* device) {
return IRECV_ERROR_NO_DEVICE;
}
-int irecv_reset(irecv_device* device) {
+int irecv_reset(irecv_device_t* device) {
if (device == NULL || device->handle != NULL) {
return IRECV_ERROR_NO_DEVICE;
}
@@ -86,7 +80,7 @@ int irecv_reset(irecv_device* device) {
return IRECV_SUCCESS;
}
-int irecv_close(irecv_device* device) {
+int irecv_close(irecv_device_t* device) {
if (device == NULL || device->handle != NULL) {
return IRECV_ERROR_NO_DEVICE;
}
@@ -96,7 +90,7 @@ int irecv_close(irecv_device* device) {
return IRECV_SUCCESS;
}
-int irecv_exit(irecv_device* device) {
+int irecv_exit(irecv_device_t* device) {
if (device != NULL) {
if (device->handle != NULL) {
libusb_close(device->handle);
@@ -115,12 +109,12 @@ int irecv_exit(irecv_device* device) {
return IRECV_SUCCESS;
}
-void irecv_set_debug(int level) {
- printf("Debug has been set to %d\n", level);
- irecv_debug = level;
+void irecv_set_debug(irecv_device_t* device, int level) {
+ libusb_set_debug(device->context, level);
+ device->debug = level;
}
-int irecv_send_command(irecv_device* device, const char* command) {
+int irecv_send_command(irecv_device_t* device, unsigned char* command) {
if(device == NULL || device->handle == NULL) {
return IRECV_ERROR_NO_DEVICE;
}
@@ -129,16 +123,23 @@ int irecv_send_command(irecv_device* device, const char* command) {
if(length >= 0x100) {
return IRECV_ERROR_INVALID_INPUT;
}
-
- int ret = libusb_control_transfer(device->handle, 0x40, 0, 0, 0, (unsigned char*) command, length+1, 100);
- if(ret < 0) {
- return IRECV_ERROR_UNKNOWN;
+
+ if(device->send_callback != NULL) {
+ // Call our user defined callback first, this must return a number of bytes to send
+ // or zero to abort send.
+ length = device->send_callback(device, command, length);
+ if(length > 0) {
+ int ret = libusb_control_transfer(device->handle, 0x40, 0, 0, 0, (unsigned char*) command, length+1, 100);
+ if(ret < 0) {
+ return IRECV_ERROR_UNKNOWN;
+ }
+ }
}
return IRECV_SUCCESS;
}
-int irecv_send_file(irecv_device* device, const char* filename) {
+int irecv_send_file(irecv_device_t* device, const char* filename) {
FILE* file = fopen(filename, "rb");
if (file == NULL) {
return IRECV_ERROR_FILE_NOT_FOUND;
@@ -165,7 +166,7 @@ int irecv_send_file(irecv_device* device, const char* filename) {
return irecv_send_buffer(device, buffer, length);
}
-unsigned int irecv_get_status(irecv_device* device) {
+unsigned int irecv_get_status(irecv_device_t* device) {
unsigned char status[6];
memset(status, '\0', 6);
if(libusb_control_transfer(device->handle, 0xA1, 3, 0, 0, status, 6, 500) != 6) {
@@ -174,7 +175,7 @@ unsigned int irecv_get_status(irecv_device* device) {
return (unsigned int) status[4];
}
-int irecv_send_buffer(irecv_device* device, unsigned char* buffer, int length) {
+int irecv_send_buffer(irecv_device_t* device, unsigned char* buffer, int length) {
int last = length % 0x800;
int packets = length / 0x800;
if (last != 0) {
@@ -200,13 +201,26 @@ int irecv_send_buffer(irecv_device* device, unsigned char* buffer, int length) {
}
libusb_control_transfer(device->handle, 0x21, 1, i, 0, buffer, 0, 1000);
- for (i = 6; i <= 8; i++) {
- if (irecv_get_status(device) != i) {
- free(buffer);
- return IRECV_ERROR_USB_STATUS;
- }
+ for (i = 0; i < 3; i++) {
+ irecv_get_status(device);
}
free(buffer);
return IRECV_SUCCESS;
}
+
+void irecv_update(irecv_device_t* device) {
+ if(device->receive_callback == NULL) {
+ return;
+ }
+}
+
+int irecv_set_receiver(irecv_device_t* device, irecv_receive_callback callback) {
+ device->receive_callback = callback;
+ return IRECV_SUCCESS;
+}
+
+int irecv_set_sender(irecv_device_t* device, irecv_send_callback callback) {
+ device->send_callback = callback;
+ return IRECV_SUCCESS;
+}
© 2009-2020 libimobiledevice.org - All rights reserved - Generated by cgit - Icons from Tango - Uses Google Analytics