From 15bb91aabae62ab0f26b34ecf7ddf9ed1aeaf172 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Tue, 12 Aug 2008 23:34:11 -0700 Subject: Reverted bb74e8fd0041132379d525030ed277b49f972494, as I can no longer connect to my phone with that patch applied. --- src/ifuse.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ifuse.c b/src/ifuse.c index f0f93a9..6a24bad 100644 --- a/src/ifuse.c +++ b/src/ifuse.c @@ -184,14 +184,22 @@ void *ifuse_init(struct fuse_conn_info *conn) { iPhone *phone = get_iPhone(); if (!phone){ fprintf(stderr, "No iPhone found, is it connected?\n"); + return NULL; + } + + lockdownd_client *control = new_lockdownd_client(phone); + if (!lockdownd_hello(control)) { + fprintf(stderr, "Something went wrong in the lockdownd client.\n"); return NULL; } - lockdownd_client *control = NULL; - if (!lockdownd_init(phone, &control)) { - fprintf(stderr, "Something went wrong in the lockdownd client.\n"); + host_id = get_host_id(); + if ((host_id && !lockdownd_start_SSL_session(control, host_id)) || !host_id) { + fprintf(stderr, "Something went wrong in GnuTLS. Is your HostID configured in .config/libiphone/libiphonerc?\n"); return NULL; } + free(host_id); + host_id = NULL; port = lockdownd_start_service(control, "com.apple.afc"); if (!port) { -- cgit v1.1-32-gdbae