From 93726cef9628ae09ce70bfd7a2a8204465bea894 Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Sun, 1 May 2016 16:23:15 -0500 Subject: [PATCH] Misc tweaks. --- jni/hu_ssl.c | 1 + mazda/main.c | 17 ++++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/jni/hu_ssl.c b/jni/hu_ssl.c index 762154f9..b1bfe506 100644 --- a/jni/hu_ssl.c +++ b/jni/hu_ssl.c @@ -63,6 +63,7 @@ void thread_cleanup(void) fprintf(stderr,"%8ld:%s\n",lock_count[i], CRYPTO_get_lock_name(i)); } + SSL_shutdown(hu_ssl_ssl); OPENSSL_free(lock_cs); OPENSSL_free(lock_count); diff --git a/mazda/main.c b/mazda/main.c index fdaaf43c..2c5851c3 100644 --- a/mazda/main.c +++ b/mazda/main.c @@ -1024,21 +1024,12 @@ int main (int argc, char *argv[]) ret = hu_aap_start (ep_in_addr, ep_out_addr); } - if (ret == -1) - { - hu_aap_stop (); - ret = hu_aap_start (ep_in_addr, ep_out_addr); - if (ret == -1) - { - printf("Phone switched to accessory mode. Attempting once more.\n"); - sleep(1); - ret = hu_aap_start (ep_in_addr, ep_out_addr); - } - } - if (ret < 0) { if (ret == -2) + { printf("Phone is not connected. Connect a supported phone and restart.\n"); + return 0; + } else if (ret == -1) printf("Phone switched to accessory mode. Restart to enter AA mode.\n"); else @@ -1103,5 +1094,5 @@ int main (int argc, char *argv[]) printf("END \n"); - return (ret); + return 0; }