Allow to use custom httpClient

cpp/src/Driver.cpp

@@ -156,6 +156,7 @@ Driver::Driver(string const& _controllerPath, ControllerInterface const& _interf
 	Options::Get()->GetOptionAsBool("IntervalBetweenPolls", &m_bIntervalBetweenPolls);
 
 	m_httpClient = new Internal::HttpClient(this);
+    m_httpClientIsExternal = false;
 
 	m_mfs = Internal::ManufacturerSpecificDB::Create();
 
@@ -295,7 +296,8 @@ Driver::~Driver()
 	m_eventMutex->Release();
 	delete this->AuthKey;
 	delete this->EncryptKey;
-	delete this->m_httpClient;
+    if(!m_httpClientIsExternal)
+    	delete this->m_httpClient;
 }
 
 //-----------------------------------------------------------------------------
@@ -6925,9 +6927,10 @@ void Driver::processConfigRevision(Internal::DNSLookup *result)
 
 bool Driver::setHttpClient(Internal::i_HttpClient *client)
 {
-	if (m_httpClient)
+	if (m_httpClient && !m_httpClientIsExternal)
 		delete m_httpClient;
 	m_httpClient = client;
+    m_httpClientIsExternal = true;
 	return true;
 }
 

cpp/src/Driver.h

@@ -994,7 +994,7 @@ namespace OpenZWave
 			bool refreshNodeConfig(uint8 node);
 			void processDownload(Internal::HttpDownload *);
 			Internal::i_HttpClient *m_httpClient;
-
+            bool m_httpClientIsExternal;
 			//-----------------------------------------------------------------------------
 			//	Metadata Related
 			//-----------------------------------------------------------------------------

cpp/src/Http.cpp

@@ -46,6 +46,12 @@ namespace OpenZWave
 				m_driver(driver)
 		{
 		}
+
+      i_HttpClient::i_HttpClient():
+         m_driver(NULL)
+		{
+
+		}
 		;
 
 		void i_HttpClient::FinishDownload(HttpDownload *transfer)
@@ -57,6 +63,11 @@ namespace OpenZWave
 			this->m_driver->SubmitEventMsg(event);
 		}
 
+      void i_HttpClient::SetDriver(Driver* driver)
+		{
+         m_driver = driver;
+		}
+
 		HttpClient::HttpClient(OpenZWave::Driver *drv) :
 				i_HttpClient(drv), m_exitEvent(new Internal::Platform::Event()), m_httpThread(new Internal::Platform::Thread("HttpThread")), m_httpThreadRunning(false), m_httpMutex(new Internal::Platform::Mutex()), m_httpDownloadEvent(new Internal::Platform::Event())
 		{

cpp/src/Http.h

@@ -73,12 +73,14 @@ namespace OpenZWave
 		{
 			public:
 				i_HttpClient(Driver *);
+				i_HttpClient();
 				virtual ~i_HttpClient()
 				{
 				}
 				;
 				virtual bool StartDownload(HttpDownload *transfer) = 0;
 				void FinishDownload(HttpDownload *transfer);
+            void SetDriver(Driver*);
 			private:
 				Driver* m_driver;
 		};

cpp/src/Manager.cpp

@@ -63,6 +63,7 @@
 #include "value_classes/ValueShort.h"
 #include "value_classes/ValueString.h"
 #include "value_classes/ValueBitSet.h"
+#include "Http.h"
 
 using namespace OpenZWave;
 
@@ -4898,3 +4899,13 @@ if (Driver *driver = GetDriver(_homeId))
 return false;
 }
 
+bool Manager::setHttpClient(uint32 const _homeId, OpenZWave::Internal::i_HttpClient* httpClient)
+{
+   if (Driver* driver = GetDriver(_homeId))
+   {
+      httpClient->SetDriver(driver);
+      driver->setHttpClient(httpClient);
+      return true;
+   }
+   return false;
+}

cpp/src/Manager.h

@@ -54,6 +54,7 @@ namespace OpenZWave
 			class ValueStore;
 		}
 		class Msg;
+      class i_HttpClient;
 	}
 	class Options;
 	class Node;
@@ -2720,6 +2721,8 @@ namespace OpenZWave
 			 */
 			bool downloadLatestMFSRevision(uint32 const _homeId);
 
+
+         bool setHttpClient(uint32 const _homeId, OpenZWave::Internal::i_HttpClient*);
 			/*@}*/
 
 	};