Adding network connectivity check for WinHttp stack (microsoft#454)

Adding network connectivity check for WinHttp stack

Author: rakhad

Include/httpClient/pal.h

@@ -438,6 +438,7 @@ typedef struct _LIST_ENTRY {
 #define E_HC_ALREADY_INITIALISED        MAKE_E_HC(0x5004)
 #define E_HC_CONNECT_ALREADY_CALLED     MAKE_E_HC(0x5005)
 #define E_HC_NO_NETWORK                 MAKE_E_HC(0x5006)
+#define E_HC_NETWORK_NOT_READY          MAKE_E_HC(0x5007)
 
 typedef uint32_t HCMemoryType;
 typedef struct HC_WEBSOCKET* HCWebsocketHandle;

Source/HTTP/WinHttp/winhttp_http_task.cpp

@@ -11,6 +11,12 @@
 #include "hcwebsocket.h"
 #endif
 
+#if HC_PLATFORM == HC_PLATFORM_GSDK
+#include "XGameRuntimeFeature.h"
+#include <winsock2.h>
+#include <iphlpapi.h>
+#endif
+
 #define CRLF L"\r\n"
 
 using namespace xbox::httpclient;
@@ -1030,11 +1036,45 @@ HRESULT winhttp_http_task::connect_and_send_async()
 
 NAMESPACE_XBOX_HTTP_CLIENT_END
 
+#if HC_PLATFORM == HC_PLATFORM_GSDK
+typedef DWORD(WINAPI *GetNetworkConnectivityHintProc)(NL_NETWORK_CONNECTIVITY_HINT*);
+#endif
+
 HRESULT Internal_InitializeHttpPlatform(HCInitArgs* args, PerformEnv& performEnv) noexcept
 {
     assert(args == nullptr);
     UNREFERENCED_PARAMETER(args);
 
+#if HC_PLATFORM == HC_PLATFORM_GSDK
+    if (XGameRuntimeIsFeatureAvailable(XGameRuntimeFeature::XNetworking))
+    {
+        HMODULE hModule = LoadLibrary(TEXT("iphlpapi.dll"));
+
+        if (hModule != nullptr)
+        {
+            GetNetworkConnectivityHintProc getNetworkConnectivityHint =
+                (GetNetworkConnectivityHintProc)GetProcAddress(hModule, "GetNetworkConnectivityHint");
+           
+            HRESULT hr = S_OK;
+            bool networkNotReady = false;
+
+            if (getNetworkConnectivityHint != nullptr)
+            {
+                NL_NETWORK_CONNECTIVITY_HINT connectivityHint{};
+                hr = HRESULT_FROM_WIN32(getNetworkConnectivityHint(&connectivityHint));
+                networkNotReady = connectivityHint.ConnectivityLevel == NetworkConnectivityLevelHintUnknown;
+            }
+
+            FreeLibrary(hModule);
+
+            if (SUCCEEDED(hr) && networkNotReady)
+            {
+                return E_HC_NETWORK_NOT_READY;
+            }
+        }
+    }
+#endif
+
     performEnv.reset(new (std::nothrow) HC_PERFORM_ENV());
     if (!performEnv) { return E_OUTOFMEMORY; }
 

libHttpClient.props

@@ -79,6 +79,8 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies Condition="'$(HCLibPlatformType)'=='Win32'">%(AdditionalDependencies);winhttp.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(HCLibPlatformType)'=='GXDK'">$(GameDKLatest)\GXDK\gameKit\lib\amd64</AdditionalLibraryDirectories>
+      <AdditionalDependencies Condition="'$(HCLibPlatformType)'=='GXDK'">%(AdditionalDependencies);XGamePlatform.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>