Commit 62bcedce authored by Matt Colyer's avatar Matt Colyer

Zack's C. rewrite of usbmux (with a few additions by Matt Colyer).

parent 294f6080
......@@ -34,7 +34,6 @@ AFClient *afc_connect(iPhone *phone, int s_port, int d_port) {
else {
client->afc_packet = (AFCPacket*)malloc(sizeof(AFCPacket));
if (client->afc_packet) {
client->phone = phone;
client->afc_packet->packet_num = 0;
client->afc_packet->unknown1 = client->afc_packet->unknown2 = client->afc_packet->unknown3 = client->afc_packet->unknown4 = client->afc_packet->entire_length = client->afc_packet->this_length = 0;
client->afc_packet->header1 = 0x36414643;
......@@ -42,7 +41,7 @@ AFClient *afc_connect(iPhone *phone, int s_port, int d_port) {
client->file_handle = 0;
return client;
} else {
mux_close_connection(client->phone, client->connection);
mux_close_connection(client->connection);
free(client);
return NULL;
}
......@@ -53,8 +52,8 @@ AFClient *afc_connect(iPhone *phone, int s_port, int d_port) {
void afc_disconnect(AFClient *client) {
// client and its members should never be NULL is assumed here.
if (!client || !client->connection || !client->phone || !client->afc_packet) return;
mux_close_connection(client->phone, client->connection);
if (!client || !client->connection || !client->afc_packet) return;
mux_close_connection(client->connection);
free(client->afc_packet);
free(client);
}
......@@ -67,10 +66,10 @@ int count_nullspaces(char *string, int number) {
return nulls;
}
int dispatch_AFC_packet(AFClient *client, char *data, int length) {
int dispatch_AFC_packet(AFClient *client, const char *data, int length) {
char *buffer;
int bytes = 0, offset = 0;
if (!client || !client->connection || !client->phone || !client->afc_packet) return 0;
if (!client || !client->connection || !client->afc_packet) return 0;
if (!data || !length) length = 0;
client->afc_packet->packet_num++;
......@@ -91,7 +90,7 @@ int dispatch_AFC_packet(AFClient *client, char *data, int length) {
}
if (debug) printf("dispatch_AFC_packet: fucked-up packet method (probably a write)\n");
memcpy(buffer+sizeof(AFCPacket), data, offset);
bytes = mux_send(client->phone, client->connection, buffer, client->afc_packet->this_length);
bytes = mux_send(client->connection, buffer, client->afc_packet->this_length);
free(buffer);
if (bytes <= 0) { return 0; }
if (debug) {
......@@ -102,7 +101,7 @@ int dispatch_AFC_packet(AFClient *client, char *data, int length) {
}
bytes = mux_send(client->phone, client->connection, data+offset, length-offset);
bytes = mux_send(client->connection, data+offset, length-offset);
if (bytes <= 0) { return 0; }
else { return bytes; }
} else {
......@@ -114,7 +113,7 @@ int dispatch_AFC_packet(AFClient *client, char *data, int length) {
if (length > 0) { memcpy(buffer+sizeof(AFCPacket), data, length); buffer[sizeof(AFCPacket)+length] = '\0'; }
if (debug) fwrite(buffer, 1, client->afc_packet->this_length, stdout);
if (debug) printf("\n");
bytes = mux_send(client->phone, client->connection, buffer, client->afc_packet->this_length);
bytes = mux_send(client->connection, buffer, client->afc_packet->this_length);
if (bytes <= 0) return 0;
else return bytes;
}
......@@ -126,9 +125,9 @@ int receive_AFC_data(AFClient *client, char **dump_here) {
char *buffer = (char*)malloc(sizeof(AFCPacket) * 4);
char *final_buffer = NULL;
int bytes = 0, recv_len = 0, current_count=0;
int retval = 0;
int retval = 0;
bytes = mux_recv(client->phone, client->connection, buffer, sizeof(AFCPacket) * 4);
bytes = mux_recv(client->connection, buffer, sizeof(AFCPacket) * 4);
if (bytes <= 0) {
free(buffer);
printf("Just didn't get enough.\n");
......@@ -151,10 +150,17 @@ int receive_AFC_data(AFClient *client, char **dump_here) {
uint32 param1 = buffer[sizeof(AFCPacket)];
free(buffer);
if (r_packet->operation == 0x01 && !((client->afc_packet->operation == AFC_DELETE && param1 == 7))) {
if (debug) printf("Oops? Bad operation code received: 0x%0X\n", r_packet->operation);
if (param1 == 0) {
if (r_packet->operation == AFC_ERROR
&& !(client->afc_packet->operation == AFC_DELETE && param1 == 7)
)
{
if (debug) printf("Oops? Bad operation code received: 0x%X, operation=0x%X, param1=%d\n",
r_packet->operation, client->afc_packet->operation, param1);
recv_len = r_packet->entire_length - r_packet->this_length;
if (debug) printf("recv_len=%d\n", recv_len);
if(param1 == 0) {
if (debug) printf("... false alarm, but still\n");
*dump_here = NULL;
return 1;
}
else { if (debug) printf("Errno %i\n", param1); }
......@@ -167,13 +173,17 @@ int receive_AFC_data(AFClient *client, char **dump_here) {
recv_len = r_packet->entire_length - r_packet->this_length;
free(r_packet);
if (!recv_len) return bytes;
if (!recv_len)
{
*dump_here = NULL;
return 0;
}
// Keep collecting packets until we have received the entire file.
buffer = (char*)malloc(sizeof(char) * (recv_len < MAXIMUM_PACKET_SIZE) ? recv_len : MAXIMUM_PACKET_SIZE);
final_buffer = (char*)malloc(sizeof(char) * recv_len);
while(current_count < recv_len){
bytes = mux_recv(client->phone, client->connection, buffer, recv_len-current_count);
bytes = mux_recv(client->connection, buffer, recv_len-current_count);
if (bytes < 0)
{
if(debug) printf("receive_AFC_data: mux_recv failed: %d\n", bytes);
......@@ -200,7 +210,7 @@ int receive_AFC_data(AFClient *client, char **dump_here) {
return current_count;
}
char **afc_get_dir_list(AFClient *client, char *dir) {
char **afc_get_dir_list(AFClient *client, const char *dir) {
client->afc_packet->operation = AFC_LIST_DIR;
int bytes = 0;
char *blah = NULL, **list = NULL;
......@@ -232,7 +242,7 @@ char **make_strings_list(char *tokens, int true_length) {
}
int afc_delete_file(AFClient *client, const char *path) {
if (!client || !path || !client->afc_packet || !client->phone ||!client->connection) return 0;
if (!client || !path || !client->afc_packet || !client->connection) return 0;
char *receive = NULL;
client->afc_packet->this_length = client->afc_packet->entire_length = 0;
......@@ -248,7 +258,7 @@ int afc_delete_file(AFClient *client, const char *path) {
}
int afc_rename_file(AFClient *client, const char *from, const char *to) {
if (!client || !from || !to || !client->afc_packet || !client->phone || !client->connection) return 0;
if (!client || !from || !to || !client->afc_packet || !client->connection) return 0;
char *receive = NULL;
char *send = (char*)malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32)));
......@@ -271,7 +281,7 @@ int afc_rename_file(AFClient *client, const char *from, const char *to) {
AFCFile *afc_get_file_info(AFClient *client, char *path) {
AFCFile *afc_get_file_info(AFClient *client, const char *path) {
client->afc_packet->operation = AFC_GET_INFO;
client->afc_packet->entire_length = client->afc_packet->this_length = 0;
dispatch_AFC_packet(client, path, strlen(path));
......@@ -312,7 +322,7 @@ AFCFile *afc_get_file_info(AFClient *client, char *path) {
AFCFile *afc_open_file(AFClient *client, const char *filename, uint32 file_mode) {
if (file_mode != AFC_FILE_READ && file_mode != AFC_FILE_WRITE) return NULL;
if (!client ||!client->connection || !client->phone ||!client->afc_packet) return NULL;
if (!client ||!client->connection || !client->afc_packet) return NULL;
char *further_data = (char*)malloc(sizeof(char) * (8 + strlen(filename) + 1));
AFCFile *file_infos = NULL;
memcpy(further_data, &file_mode, 4);
......@@ -345,7 +355,7 @@ AFCFile *afc_open_file(AFClient *client, const char *filename, uint32 file_mode)
}
int afc_read_file(AFClient *client, AFCFile *file, char *data, int length) {
if (!client || !client->afc_packet || !client->phone || !client->connection || !file) return -1;
if (!client || !client->afc_packet || !client->connection || !file) return -1;
AFCFilePacket *packet = (AFCFilePacket*)malloc(sizeof(AFCFilePacket));
char *input = NULL;
packet->unknown1 = packet->unknown2 = 0;
......@@ -359,11 +369,15 @@ int afc_read_file(AFClient *client, AFCFile *file, char *data, int length) {
if (bytes > 0) {
bytes = receive_AFC_data(client, &input);
if (bytes <= 0) {
if (bytes < 0) {
if (input) free(input);
return -1;
} else if (bytes == 0) {
if (input) free(input);
return 0;
} else {
memcpy(data, input, (bytes > length) ? length : bytes);
if (input)
memcpy(data, input, (bytes > length) ? length : bytes);
free(input);
return (bytes > length) ? length : bytes;
}
......@@ -373,9 +387,9 @@ int afc_read_file(AFClient *client, AFCFile *file, char *data, int length) {
return 0;
}
int afc_write_file(AFClient *client, AFCFile *file, char *data, int length) {
int afc_write_file(AFClient *client, AFCFile *file, const char *data, int length) {
char *acknowledgement = NULL;
if (!client ||!client->afc_packet ||!client->phone || !client->connection || !file) return -1;
if (!client ||!client->afc_packet || !client->connection || !file) return -1;
client->afc_packet->this_length = sizeof(AFCPacket) + 8;
client->afc_packet->entire_length = client->afc_packet->this_length + length;
client->afc_packet->operation = AFC_WRITE;
......
......@@ -35,8 +35,7 @@ typedef struct {
} AFCPacket;
typedef struct {
usbmux_tcp_header *connection;
iPhone *phone;
usbmux_connection *connection;
AFCPacket *afc_packet;
int file_handle;
} AFClient;
......@@ -79,14 +78,14 @@ AFClient *afc_connect(iPhone *phone, int s_port, int d_port);
void afc_disconnect(AFClient *client);
int count_nullspaces(char *string, int number);
char **make_strings_list(char *tokens, int true_length);
int dispatch_AFC_packet(AFClient *client, char *data, int length);
int dispatch_AFC_packet(AFClient *client, const char *data, int length);
int receive_AFC_data(AFClient *client, char **dump_here);
char **afc_get_dir_list(AFClient *client, char *dir);
AFCFile *afc_get_file_info(AFClient *client, char *path);
char **afc_get_dir_list(AFClient *client, const char *dir);
AFCFile *afc_get_file_info(AFClient *client, const char *path);
AFCFile *afc_open_file(AFClient *client, const char *filename, uint32 file_mode);
void afc_close_file(AFClient *client, AFCFile *file);
int afc_read_file(AFClient *client, AFCFile *file, char *data, int length);
int afc_write_file(AFClient *client, AFCFile *file, char *data, int length);
int afc_write_file(AFClient *client, AFCFile *file, const char *data, int length);
int afc_delete_file(AFClient *client, const char *path);
int afc_rename_file(AFClient *client, const char *from, const char *to);
......@@ -155,9 +155,10 @@ void *ifuse_init(struct fuse_conn_info *conn) {
return afc;
}
void ifuse_cleanup(AFClient *afc) {
void ifuse_cleanup(void *data) {
AFClient *afc = (AFClient *)data;
if (afc) {
iPhone *phone = afc->phone;
iPhone *phone = afc->connection->phone;
afc_disconnect(afc);
free_iPhone(phone);
}
......
......@@ -171,10 +171,11 @@ int send_to_phone(iPhone *phone, char *data, int datalen) {
int recv_from_phone(iPhone *phone, char *data, int datalen) {
if (!phone) return -1;
int bytes = 0;
if (debug) printf("recv_from_phone(): attempting to receive %i bytes\n", datalen);
bytes = usb_bulk_read(phone->device, BULKIN, data, datalen, 3500);
if(bytes < 0)
{
if(debug) printf("recv_from_iphone(): libusb gave me the error %d: %s (%s)\n", bytes, usb_strerror(), strerror(-bytes));
if(debug) printf("recv_from_phone(): libusb gave me the error %d: %s (%s)\n", bytes, usb_strerror(), strerror(-bytes));
return -1;
}
return bytes;
......
......@@ -39,7 +39,6 @@ lockdownd_client *new_lockdownd_client(iPhone *phone) {
control->ssl_session = (gnutls_session_t*)malloc(sizeof(gnutls_session_t));
control->in_SSL = 0;
control->iphone = phone;
control->gtls_buffer_hack_len = 0;
return control;
}
......@@ -47,7 +46,7 @@ lockdownd_client *new_lockdownd_client(iPhone *phone) {
void lockdown_close(lockdownd_client *control) {
if (!control) return;
if (control->connection) {
mux_close_connection(control->iphone, control->connection);
mux_close_connection(control->connection);
}
if (control->ssl_session) free(control->ssl_session);
......@@ -56,21 +55,23 @@ void lockdown_close(lockdownd_client *control) {
int lockdownd_recv(lockdownd_client *control, char **dump_data) {
if (!control) return 0;
char *receive;
uint32 datalen = 0, bytes = 0;
if (!control->in_SSL) bytes = mux_recv(control->iphone, control->connection, &datalen, sizeof(datalen));
if (!control->in_SSL) bytes = mux_recv(control->connection, (char *)&datalen, sizeof(datalen));
else bytes = gnutls_record_recv(*control->ssl_session, &datalen, sizeof(datalen));
datalen = ntohl(datalen);
receive = (char*)malloc(sizeof(char) * datalen);
if (!control->in_SSL) bytes = mux_recv(control->iphone, control->connection, receive, datalen);
if (!control->in_SSL) bytes = mux_recv(control->connection, receive, datalen);
else bytes = gnutls_record_recv(*control->ssl_session, receive, datalen);
*dump_data = receive;
return bytes;
}
int lockdownd_send(lockdownd_client *control, char *raw_data, uint32 length) {
if (!control) return 0;
char *real_query;
int bytes;
......@@ -78,29 +79,39 @@ int lockdownd_send(lockdownd_client *control, char *raw_data, uint32 length) {
length = htonl(length);
memcpy(real_query, &length, sizeof(length));
memcpy(real_query+4, raw_data, ntohl(length));
if (!control->in_SSL) bytes = mux_send(control->iphone, control->connection, real_query, ntohl(length)+sizeof(length));
if (debug) {
printf("lockdownd_send(): made the query, sending it along\n");
FILE *packet = fopen("grpkt", "w");
fwrite(real_query, 1, ntohl(length)+4, packet);
fclose(packet);
packet = NULL;
}
if (!control->in_SSL) bytes = mux_send(control->connection, real_query, ntohl(length)+sizeof(length));
else gnutls_record_send(*control->ssl_session, real_query, ntohl(length)+sizeof(length));
if (debug) printf("lockdownd_send(): sent it!\n");
free(real_query);
return bytes;
}
int lockdownd_hello(lockdownd_client *control) {
if (!control) return 0;
xmlDocPtr plist = new_plist();
xmlNode *dict, *key;
char **dictionary;
int bytes = 0, i = 0;
if (debug) printf("lockdownd_hello() called\n");
dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
key = add_key_str_dict_element(plist, dict, "Request", "QueryType", 1);
char *XML_content;
uint32 length;
xmlDocDumpMemory(plist, &XML_content, &length);
xmlDocDumpMemory(plist, (xmlChar **)&XML_content, &length);
bytes = lockdownd_send(control, XML_content, length);
xmlFree(XML_content);
xmlFreeDoc(plist); plist = NULL;
bytes = lockdownd_recv(control, &XML_content);
plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
......@@ -118,6 +129,7 @@ int lockdownd_hello(lockdownd_client *control) {
for (i = 0; strcmp(dictionary[i], ""); i+=2) {
if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i+1], "Success")) {
free_dictionary(dictionary);
if (debug) printf("lockdownd_hello(): success\n");
return 1;
}
}
......@@ -147,7 +159,7 @@ int lockdownd_start_SSL_session(lockdownd_client *control, const char *HostID) {
return 0;
}
xmlDocDumpMemory(plist, &what2send, &len);
xmlDocDumpMemory(plist, (xmlChar **)&what2send, &len);
bytes = lockdownd_send(control, what2send, len);
xmlFree(what2send);
......@@ -239,7 +251,7 @@ ssize_t lockdownd_secuwrite(gnutls_transport_ptr_t transport, char *buffer, size
control = (lockdownd_client*)transport;
if (debug) printf("lockdownd_secuwrite() called\n");
if (debug) printf("pre-send\nlength = %i\n", length);
bytes = mux_send(control->iphone, control->connection, buffer, length);
bytes = mux_send(control->connection, buffer, length);
if (debug) printf("post-send\nsent %i bytes\n", bytes);
if (debug) {
FILE *my_ssl_packet = fopen("sslpacketwrite.out", "w+");
......@@ -289,7 +301,7 @@ ssize_t lockdownd_securead(gnutls_transport_ptr_t transport, char *buffer, size_
char *recv_buffer = (char*)malloc(sizeof(char) * (length * 1000)); // ensuring nothing stupid happens
if (debug) printf("pre-read\nclient wants %i bytes\n", length);
bytes = mux_recv(control->iphone, control->connection, recv_buffer, (length * 1000));
bytes = mux_recv(control->connection, recv_buffer, (length * 1000));
if (debug) printf("post-read\nwe got %i bytes\n", bytes);
if (debug && bytes < 0) {
printf("lockdownd_securead(): uh oh\n");
......@@ -339,7 +351,7 @@ int lockdownd_start_service(lockdownd_client *control, const char *service) {
key = add_key_str_dict_element(plist, dict, "Service", service, 1);
if (!key) { xmlFreeDoc(plist); return 0; }
xmlDocDumpMemory(plist, &XML_query, &length);
xmlDocDumpMemory(plist, (xmlChar **)&XML_query, &length);
lockdownd_send(control, XML_query, length);
free(XML_query);
......
......@@ -28,9 +28,8 @@
#include <string.h>
typedef struct {
usbmux_tcp_header *connection;
usbmux_connection *connection;
gnutls_session_t *ssl_session;
iPhone *iphone;
int in_SSL;
char *gtls_buffer_hack;
int gtls_buffer_hack_len;
......
......@@ -29,5 +29,6 @@ xmlNode *add_key_str_dict_element(xmlDocPtr plist, xmlNode *dict, const char *ke
xmlNode *add_child_to_plist(xmlDocPtr plist, const char *name, const char *content, xmlNode *to_node, int depth);
void free_plist(xmlDocPtr plist);
xmlDocPtr new_plist();
char **read_dict_element_strings(xmlNode *dict);
void free_dictionary(char **dictionary);
#endif
This diff is collapsed.
......@@ -43,6 +43,13 @@ typedef struct {
uint16 window, nullnull, length16;
} usbmux_tcp_header;
typedef struct {
usbmux_tcp_header *header;
iPhone *phone;
char *recv_buffer;
int r_len;
} usbmux_connection;
usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port);
typedef struct {
......@@ -51,8 +58,10 @@ typedef struct {
usbmux_version_header *version_header();
usbmux_tcp_header *mux_connect(iPhone *phone, uint16 s_port, uint16 d_port);
void mux_close_connection(iPhone *phone, usbmux_tcp_header *connection);
int mux_send(iPhone *phone, usbmux_tcp_header *connection, char *data, uint32 datalen);
int mux_recv(iPhone *phone, usbmux_tcp_header *connection, char *data, uint32 datalen);
usbmux_connection *mux_connect(iPhone *phone, uint16 s_port, uint16 d_port);
void mux_close_connection(usbmux_connection *connection);
int mux_send(usbmux_connection *connection, const char *data, uint32 datalen);
int mux_recv(usbmux_connection *connection, char *data, uint32 datalen);
#endif
......@@ -20,6 +20,8 @@
*/
#include <glib.h>
#include <stdio.h>
#include <string.h>
#include "userpref.h"
#define LIBIPHONE_CONF_DIR "libiphone"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment