From 5921e6ea4812778c8d0ff72bbdb1275b7854670a Mon Sep 17 00:00:00 2001
From: Michael Kuc <michaelkuc6@gmail.com>
Date: Fri, 6 Sep 2019 13:03:13 +0100
Subject: [PATCH] Fix host-descriptor deleter specialisation.

---
 Streams.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/Streams.cpp b/Streams.cpp
index 1706482..a7d0584 100644
--- a/Streams.cpp
+++ b/Streams.cpp
@@ -36,7 +36,7 @@ using std::runtime_error;
 using std::shared_ptr;
 using std::string;
 
-int initialiseHostDescriptor();
+shared_ptr<int> initialiseHostDescriptor();
 
 #ifdef DEBUG_STREAMS
 
@@ -47,11 +47,7 @@ void closeHTML(FILE* fPtr);
 #endif
 
 shared_ptr<int> getHostDescriptor() {
-	static shared_ptr<int> descriptor{ new int{ initialiseHostDescriptor() }, [](const int* fd) {
-		                                  close(*fd);
-		                                  delete fd;
-		                              } };
-
+	static shared_ptr<int> descriptor{ initialiseHostDescriptor() };
 	return descriptor;
 }
 
@@ -195,7 +191,7 @@ void closeHTML(FILE* fPtr) {
 
 #endif
 
-int initialiseHostDescriptor() {
+shared_ptr<int> initialiseHostDescriptor() {
 	int descriptor;
 
 #ifdef HID_SOCKET
@@ -229,12 +225,21 @@ int initialiseHostDescriptor() {
 		throw runtime_error{ "Unable to connect to server socket: " + string{ HID_DEV } };
 
 	__android_log_print(ANDROID_LOG_DEBUG, "U2FDevice", "Connected to server");
+
+	return shared_ptr<int>{ new int{ descriptor }, [](const int* fd) {
+		                  close(*fd);
+		                  remove(clientSocket.c_str());
+		                  delete fd;
+		              } };
 #else
 	descriptor = open(HID_DEV, O_RDWR | O_NONBLOCK | O_APPEND);
 
 	if (descriptor == -1)
 		throw runtime_error{ "Descriptor is unavailable" };
-#endif
 
-	return descriptor;
+	return shared_ptr<int>{ new int{ descriptor }, [](const int* fd) {
+		                  close(*fd);
+		                  delete fd;
+		              } };
+#endif
 }