Misc tweaks.

gartnera · May 19, 2016 · 93726ce · 93726ce
1 parent d1efafb
commit 93726ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git 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
@@ -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;
 }