[windows] update flag on connectivity state changes, CRLF > LF

Signed-off-by: R4SAS <r4sas@i2pmail.org>

Win32/Win32NetState.cpp

@@ -3,11 +3,11 @@
 #include <windows.h>
 #include "Log.h"
 
-IUnknown *pUnknown = NULL;
+IUnknown *pUnknown = nullptr;
-INetworkListManager *pNetworkListManager = NULL;
+INetworkListManager *pNetworkListManager = nullptr;
-IConnectionPointContainer *pCPContainer = NULL;
+IConnectionPointContainer *pCPContainer = nullptr;
+IConnectionPoint *pConnectPoint = nullptr;
 DWORD Cookie = 0;
-IConnectionPoint *pConnectPoint = NULL;
 
 void SubscribeToEvents()
 {
@@ -20,10 +20,12 @@ void SubscribeToEvents()
 		Result = pUnknown->QueryInterface(IID_INetworkListManager, (void **)&pNetworkListManager);
 		if (SUCCEEDED(Result))
 		{
-			/* VARIANT_BOOL IsConnect = VARIANT_FALSE;
+			VARIANT_BOOL IsConnect = VARIANT_FALSE;
 			Result = pNetworkListManager->IsConnectedToInternet(&IsConnect);
-			if (SUCCEEDED(Result))
+			if (SUCCEEDED(Result)) {
-				LogPrint(eLogInfo, "NetState: IsConnect Result:", IsConnect == VARIANT_TRUE ? "TRUE" : "FALSE"); */
+				i2p::transport::transports.SetOnline (true);
+				LogPrint(eLogInfo, "NetState: current state: ", IsConnect == VARIANT_TRUE ? "connected" : "disconnected");
+			}
 
 			Result = pNetworkListManager->QueryInterface(IID_IConnectionPointContainer, (void **)&pCPContainer);
 			if (SUCCEEDED(Result))
@@ -35,7 +37,9 @@ void SubscribeToEvents()
 					Result = pConnectPoint->Advise((IUnknown *)NetEvent, &Cookie);
 					if (SUCCEEDED(Result))
 						LogPrint(eLogInfo, "NetState: Successfully subscribed to NetworkListManagerEvent messages");
-						} else
+					else
+						LogPrint(eLogError, "NetState: Unable to subscribe to NetworkListManagerEvent messages");
+				} else
 					LogPrint(eLogError, "NetState: Unable to find interface connection point");
 			} else
 				LogPrint(eLogError, "NetState: Unable to query NetworkListManager interface");
@@ -47,13 +51,28 @@ void SubscribeToEvents()
 
 void UnSubscribeFromEvents()
 {
-	// TODO - DETECT EVERY STAGE STATE and call functions depending it !!!
+	try
-	pConnectPoint->Unadvise(Cookie);
+	{
-	pConnectPoint->Release();
+		if (pConnectPoint) {
-	pCPContainer->Release();
+			pConnectPoint->Unadvise(Cookie);
-	pNetworkListManager->Release();
+			pConnectPoint->Release();
-	pUnknown->Release();
+		}
-	CoUninitialize();
+
+		if (pCPContainer)
+			pCPContainer->Release();
+
+		if (pNetworkListManager)
+			pNetworkListManager->Release();
+
+		if (pUnknown)
+			pUnknown->Release();
+
+		CoUninitialize();
+	}
+	catch (std::exception& ex)
+	{
+		LogPrint (eLogError, "NetState: received exception: ", ex.what ());
+	}
 }
 
 #endif // WINVER

Win32/Win32NetState.h

@@ -42,20 +42,28 @@ public:
 
 	virtual HRESULT STDMETHODCALLTYPE ConnectivityChanged(NLM_CONNECTIVITY newConnectivity)
 	{
-		if (newConnectivity == NLM_CONNECTIVITY_DISCONNECTED)
+		if (newConnectivity == NLM_CONNECTIVITY_DISCONNECTED) {
+			i2p::transport::transports.SetOnline (false);
 			LogPrint(eLogInfo, "NetState: disconnected from network");
+		}
 
-		if (((int)newConnectivity & (int)NLM_CONNECTIVITY_IPV4_INTERNET) != 0)
+		if (((int)newConnectivity & (int)NLM_CONNECTIVITY_IPV4_INTERNET) != 0) {
+			i2p::transport::transports.SetOnline (true);
 			LogPrint(eLogInfo, "NetState: connected to internet with IPv4 capability");
+		}
 
-		if (((int)newConnectivity & (int)NLM_CONNECTIVITY_IPV6_INTERNET) != 0)
+		if (((int)newConnectivity & (int)NLM_CONNECTIVITY_IPV6_INTERNET) != 0) {
+			i2p::transport::transports.SetOnline (true);
 			LogPrint(eLogInfo, "NetState: connected to internet with IPv6 capability");
+		}
 
 		if (
 			(((int)newConnectivity & (int)NLM_CONNECTIVITY_IPV4_INTERNET) == 0) &&
 			(((int)newConnectivity & (int)NLM_CONNECTIVITY_IPV6_INTERNET) == 0)
-		)
+		) {
+			i2p::transport::transports.SetOnline (false);
 			LogPrint(eLogInfo, "NetState: connected without internet access");
+		}
 
 		return S_OK;
 	}