Version 5.5.2

Fix inaccurate test results on IPv6 when a temporary address is in use and no pinholes are created for it
Update GSv6Fwd with CET and CFG
2021-02-02 18:16:27 -06:00 · 2021-02-01 19:59:41 -06:00 · 2021-02-01 19:53:52 -06:00 · 2021-02-01 19:41:14 -06:00 · 2021-02-01 19:40:44 -06:00 · 2021-02-01 19:40:24 -06:00
40 changed files with 2051 additions and 459 deletions
@@ -0,0 +1,3 @@
+[submodule "GS-IPv6-Forwarder"]
+	path = GS-IPv6-Forwarder
+	url = https://github.com/moonlight-stream/GS-IPv6-Forwarder.git
@@ -1,4 +1,4 @@
-# Moonlight Internet Streaming Helper
+# Moonlight Internet Hosting Tool
 * Enable Moonlight streaming from your PC over the Internet with no configuration required
 * Troubleshoot streaming issues with the included testing tool

@@ -8,5 +8,6 @@

 # Technical Features
 - Supports all major port forwarding protocols (UPnP, NAT-PMP, and PCP) for the best possible router compatibility
+- Supports streaming on IPv4-only, IPv6-only, and dual-stack Internet connections
 - Supports successful forwarding in double-NAT environments by configuring port mappings on all NATs found on the way to the Internet
 - Supports forwarding on Carrier-Grade NATs (CGNs) by directly using PCP when the ISP doesn't implement UPnP-PCP interoperability
@@ -1,4 +1,4 @@
-/* $Id: miniupnpc.h,v 1.53 2018/05/07 11:05:16 nanard Exp $ */
+/* $Id: miniupnpc.h,v 1.55 2020/11/09 19:49:32 nanard Exp $ */
 /* vim: tabstop=4 shiftwidth=4 noexpandtab
 * Project: miniupnp
 * http://miniupnp.free.fr/
@@ -20,7 +20,7 @@
 #define UPNPDISCOVER_MEMORY_ERROR (-102)

 /* versions : */
-#define MINIUPNPC_VERSION	"2.1"
+#define MINIUPNPC_VERSION	"2.2.0"
 #define MINIUPNPC_API_VERSION	17

 /* Source port:
@@ -1,8 +1,8 @@
-/* $Id: upnpdev.h,v 1.1 2015/08/28 12:14:19 nanard Exp $ */
+/* $Id: upnpdev.h,v 1.3 2020/05/29 15:57:42 nanard Exp $ */
 /* Project : miniupnp
- * Web : http://miniupnp.free.fr/
+ * Web : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/
 * Author : Thomas BERNARD
- * copyright (c) 2005-2018 Thomas Bernard
+ * copyright (c) 2005-2020 Thomas Bernard
 * This software is subjet to the conditions detailed in the
 * provided LICENSE file. */
 #ifndef UPNPDEV_H_INCLUDED
@@ -20,7 +20,15 @@ struct UPNPDev {
 	char * st;
 	char * usn;
 	unsigned int scope_id;
-	char buffer[3];
+#if defined(__STDC_VERSION) && __STDC_VERSION__ >= 199901L
+	/* C99 flexible array member */
+	char buffer[];
+#elif defined(__GNUC__)
+	char buffer[0];
+#else
+	/* Fallback to a hack */
+	char buffer[1];
+#endif
 };

 /* freeUPNPDevlist()
@@ -51,6 +51,13 @@ typedef unsigned short uint16_t;
 #endif	/* _WIN32 */
 #include "natpmp_declspec.h"

+/* Set to 9 by https://tools.ietf.org/html/rfc6886#section-3.1 which leads to a
+ * maximum timeout of 127.75 seconds, due to the initial 250 ms timeout doubling
+ * each time, so we allow a compile-time modification here.*/
+#ifndef NATPMP_MAX_RETRIES
+#define NATPMP_MAX_RETRIES (9)
+#endif
+
 typedef struct {
 	int s;	/* socket */
 	in_addr_t gateway;	/* default gateway (IPv4) */
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?define VCREDIST_VER = "14.28.29334" ?>
+<?define VCREDIST_X86_SIZE = "14328440" ?>
+<?define VCREDIST_X86_SHA1 = "17674FCC6CF3A2FFDC391BDCDE082AA936E37A89" ?>
+<?define VCREDIST_X86_UPGRADE_CODE = "65E5BD06-6392-3027-8C26-853107D3CF1A" ?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+	<Bundle Name="Moonlight Internet Hosting Tool" Manufacturer="Moonlight Game Streaming Project" Version="!(bind.packageVersion.mish)" UpgradeCode="a2ce5056-1114-44b9-b79b-952ef46d3d50">
+    <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
+      <bal:WixStandardBootstrapperApplication
+            LicenseFile="license.rtf"
+            ShowVersion="yes"
+            SuppressOptionsUI="yes"
+            />
+    </BootstrapperApplicationRef>
+
+    <WixVariable Id="WixUILicenseRtf" Value="" />
+
+    <util:ProductSearch Id="VCREDIST_142_x86"
+                        UpgradeCode="$(var.VCREDIST_X86_UPGRADE_CODE)"
+                        Result="version"
+                        Variable="VCREDIST_142_x86" />
+      
+    <Chain>
+      <ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable - x86"
+                  Cache="no"
+                  Compressed="no"
+                  PerMachine="yes"
+                  Permanent="yes"
+                  Vital="yes"
+                  InstallCommand="/install /quiet /norestart"
+                  DownloadUrl="https://moonlight-stream.org/downloads/vcredist/$(var.VCREDIST_VER)/vcredist_x86.exe"
+                  DetectCondition="VCREDIST_142_x86 &gt;= v$(var.VCREDIST_VER)">
+        
+        <RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable - x86"
+                       ProductName="Microsoft Visual C++ 2015-2019 Redistributable - x86"
+                       Size="$(var.VCREDIST_X86_SIZE)"
+                       Version="$(var.VCREDIST_VER).0"
+                       Hash="$(var.VCREDIST_X86_SHA1)"/>
+
+        <!-- Newer version installed is fine -->
+        <ExitCode Value="1638" Behavior="success" />
+      </ExePackage>
+      <MsiPackage Id="mish" SourceFile="$(var.mish.TargetPath)" />
+      <MsiPackage SourceFile="$(var.GSv6FwdSetup.TargetPath)" />
+		</Chain>
+	</Bundle>
+</Wix>
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>a2ce5056-1114-44b9-b79b-952ef46d3d50</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>InternetHostingToolSetup</OutputName>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixBalExtension">
+      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
+      <Name>WixBalExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GS-IPv6-Forwarder\GSv6FwdSetup\GSv6FwdSetup.wixproj">
+      <Name>GSv6FwdSetup</Name>
+      <Project>{f8171b99-f5f9-4abf-9fe5-6753539611af}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\mish\mish.wixproj">
+      <Name>mish</Name>
+      <Project>{f0dee5f3-4b62-47a3-b00b-61c614c924fd}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2046
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miss", "miss\miss.vcxproj", "{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}"
 EndProject
@@ -9,36 +9,42 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mist", "mist\mist.vcxproj",
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "mish", "mish\mish.wixproj", "{F0DEE5F3-4B62-47A3-B00B-61C614C924FD}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "mish-setup", "mish-setup\mish-setup.wixproj", "{A2CE5056-1114-44B9-B79B-952EF46D3D50}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSv6Fwd", "GS-IPv6-Forwarder\GSv6Fwd\GSv6Fwd.vcxproj", "{87DEAE49-7638-4CDB-88EB-054B1F3CB0D2}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "GSv6FwdSetup", "GS-IPv6-Forwarder\GSv6FwdSetup\GSv6FwdSetup.wixproj", "{F8171B99-F5F9-4ABF-9FE5-6753539611AF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}.Debug|x64.ActiveCfg = Debug|x64
-		{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}.Debug|x64.Build.0 = Debug|x64
 		{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}.Debug|x86.ActiveCfg = Debug|Win32
 		{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}.Debug|x86.Build.0 = Debug|Win32
-		{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}.Release|x64.ActiveCfg = Release|x64
-		{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}.Release|x64.Build.0 = Release|x64
 		{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}.Release|x86.ActiveCfg = Release|Win32
 		{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}.Release|x86.Build.0 = Release|Win32
-		{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}.Debug|x64.ActiveCfg = Debug|x64
-		{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}.Debug|x64.Build.0 = Debug|x64
 		{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}.Debug|x86.ActiveCfg = Debug|Win32
 		{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}.Debug|x86.Build.0 = Debug|Win32
-		{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}.Release|x64.ActiveCfg = Release|x64
-		{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}.Release|x64.Build.0 = Release|x64
 		{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}.Release|x86.ActiveCfg = Release|Win32
 		{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}.Release|x86.Build.0 = Release|Win32
-		{F0DEE5F3-4B62-47A3-B00B-61C614C924FD}.Debug|x64.ActiveCfg = Debug|x86
 		{F0DEE5F3-4B62-47A3-B00B-61C614C924FD}.Debug|x86.ActiveCfg = Debug|x86
 		{F0DEE5F3-4B62-47A3-B00B-61C614C924FD}.Debug|x86.Build.0 = Debug|x86
-		{F0DEE5F3-4B62-47A3-B00B-61C614C924FD}.Release|x64.ActiveCfg = Release|x86
 		{F0DEE5F3-4B62-47A3-B00B-61C614C924FD}.Release|x86.ActiveCfg = Release|x86
 		{F0DEE5F3-4B62-47A3-B00B-61C614C924FD}.Release|x86.Build.0 = Release|x86
+		{A2CE5056-1114-44B9-B79B-952EF46D3D50}.Debug|x86.ActiveCfg = Debug|x86
+		{A2CE5056-1114-44B9-B79B-952EF46D3D50}.Debug|x86.Build.0 = Debug|x86
+		{A2CE5056-1114-44B9-B79B-952EF46D3D50}.Release|x86.ActiveCfg = Release|x86
+		{A2CE5056-1114-44B9-B79B-952EF46D3D50}.Release|x86.Build.0 = Release|x86
+		{87DEAE49-7638-4CDB-88EB-054B1F3CB0D2}.Debug|x86.ActiveCfg = Debug|Win32
+		{87DEAE49-7638-4CDB-88EB-054B1F3CB0D2}.Debug|x86.Build.0 = Debug|Win32
+		{87DEAE49-7638-4CDB-88EB-054B1F3CB0D2}.Release|x86.ActiveCfg = Release|Win32
+		{87DEAE49-7638-4CDB-88EB-054B1F3CB0D2}.Release|x86.Build.0 = Release|Win32
+		{F8171B99-F5F9-4ABF-9FE5-6753539611AF}.Debug|x86.ActiveCfg = Debug|x86
+		{F8171B99-F5F9-4ABF-9FE5-6753539611AF}.Debug|x86.Build.0 = Debug|x86
+		{F8171B99-F5F9-4ABF-9FE5-6753539611AF}.Release|x86.ActiveCfg = Release|x86
+		{F8171B99-F5F9-4ABF-9FE5-6753539611AF}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1,28 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
-  <Product Id="*" Name="Moonlight Internet Streaming Helper" Language="1033" Version="!(bind.fileVersion.MistExe)"
+     xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Product Id="*" Name="Moonlight Internet Hosting Tool" Language="1033" Version="!(bind.fileVersion.MistExe)"
           Manufacturer="Moonlight Game Streaming Project" UpgradeCode="cfc2fb53-88e2-4867-851d-9ed9fe7ab2a3">
    <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />

    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
    <MediaTemplate EmbedCab="yes" />

-    <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
-    <UIRef Id="WixUI_Minimal" />
-
    <Feature Id="ProductFeature" Title="MISHSetup" Level="1">
      <ComponentGroupRef Id="ProductComponents" />
    </Feature>
  </Product>

+  <!-- Enable the Windows Firewall service if it is disabled. Disabling the Windows Firewall service
+       will paradoxically block *all* incoming network traffic and prevent GameStream, MIST, MISS,
+       and other local servers from working at all. The proper way to disable Windows Firewall is via
+       the Windows Firewall control panel applet. -->
+  <Fragment>
+    <Property Id="MPSSVC_START">
+      <RegistrySearch Id="MpsSvcStart"
+                      Root="HKLM"
+                      Key="System\CurrentControlSet\Services\MpsSvc"
+                      Name="Start"
+                      Type="raw" />
+    </Property>
+
+    <SetProperty Id="EnableMpsSvc" Value='"[SystemFolder]sc.exe" config MpsSvc start= auto' Sequence="execute" Before="InstallInitialize"/>
+    <CustomAction Id="EnableMpsSvc" BinaryKey="WixCA" DllEntry="WixQuietExec"
+                  Execute="deferred" Return="ignore" Impersonate="no"/>
+
+    <SetProperty Id="StartMpsSvc" Value='"[SystemFolder]net.exe" start MpsSvc' Sequence="execute" Before="InstallInitialize"/>
+    <CustomAction Id="StartMpsSvc" BinaryKey="WixCA" DllEntry="WixQuietExec"
+                  Execute="deferred" Return="ignore" Impersonate="no"/>
+  </Fragment>
+  
  <Fragment>
    <Directory Id="TARGETDIR" Name="SourceDir">
      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="Moonlight Internet Streaming Helper" />
+        <Directory Id="INSTALLFOLDER" Name="Moonlight Internet Hosting Tool" />
      </Directory>
      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="Moonlight Internet Streaming Helper" />
+        <Directory Id="ApplicationProgramsFolder" Name="Moonlight Internet Hosting Tool" />
      </Directory>
      <Directory Id="CommonAppDataFolder">
        <Directory Name="MISS" Id="MISSLogFolder" />
@@ -32,22 +52,31 @@

  <Fragment>
    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component Id="MiniupnpcDll">
+        <File Source="$(var.miss.TargetDir)miniupnpc.dll" KeyPath="yes"/>
+      </Component>
+      <Component Id="LibnatpmpDll">
+        <File Source="$(var.miss.TargetDir)libnatpmp.dll" KeyPath="yes"/>
+      </Component>
      <Component Id="MISS">
        <File Source="$(var.miss.TargetPath)" KeyPath="yes">
          <fire:FirewallException Id="MISSFwException"
                                  Scope="any"
                                  Name="Moonlight Internet Streaming Service"/>
        </File>
-        <CreateFolder Directory="MISSLogFolder" />
+        <CreateFolder Directory="MISSLogFolder">
+          <util:PermissionEx User="NT SERVICE\MISS" GenericAll="yes" />
+        </CreateFolder>
        <ServiceInstall Type="ownProcess"
                        Name="MISS"
                        DisplayName="Moonlight Internet Streaming Service"
                        Description="Automatically manages router port forwarding rules required to use Moonlight over the Internet"
                        Start="auto"
-                        Account="LocalSystem"
+                        Account="NT AUTHORITY\LocalService"
                        ErrorControl="ignore"
                        Interactive="no">
-          <ServiceConfig DelayedAutoStart="no" OnInstall="yes" OnReinstall="yes" />
+          <ServiceConfig DelayedAutoStart="no" OnInstall="yes" OnReinstall="yes" ServiceSid="unrestricted"/>
+          <util:ServiceConfig FirstFailureActionType="restart" SecondFailureActionType="restart" ThirdFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="10"/>
        </ServiceInstall>
        <ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="MISS" Wait="yes" />
      </Component>
@@ -58,6 +87,48 @@
                                  Name="Moonlight Internet Streaming Tester"/>
        </File>
      </Component>
+      <Component Id="GameStreamFirewallRules" Guid="{16CA2511-B533-46F8-8882-F8AEEFDFD7DF}" KeyPath="yes">
+        <fire:FirewallException Id="HttpsFwException"
+                                Scope="any"
+                                Port="47984"
+                                Protocol="tcp"
+                                Name="Moonlight - HTTPS"/>
+        <fire:FirewallException Id="HttpFwException"
+                                Scope="any"
+                                Port="47989"
+                                Protocol="tcp"
+                                Name="Moonlight - HTTP"/>
+        <fire:FirewallException Id="RtspFwException"
+                                Scope="any"
+                                Port="48010"
+                                Protocol="tcp"
+                                Name="Moonlight - RTSP"/>
+        <fire:FirewallException Id="VideoFwException"
+                                Scope="any"
+                                Port="47998"
+                                Protocol="udp"
+                                Name="Moonlight - Video"/>
+        <fire:FirewallException Id="ControlFwException"
+                                Scope="any"
+                                Port="47999"
+                                Protocol="udp"
+                                Name="Moonlight - Control"/>
+        <fire:FirewallException Id="AudioFwException"
+                                Scope="any"
+                                Port="48000"
+                                Protocol="udp"
+                                Name="Moonlight - Audio"/>
+        <fire:FirewallException Id="RtspuFwException"
+                                Scope="any"
+                                Port="48010"
+                                Protocol="udp"
+                                Name="Moonlight - RTSPU"/>
+        <fire:FirewallException Id="MdnsFwException"
+                                Scope="any"
+                                Port="5353"
+                                Protocol="udp"
+                                Name="Moonlight - mDNS"/>
+      </Component>
      <Component Id="Shortcuts" Guid="*">
        <Shortcut Id="StartMenuShortcut"
                  Name="Moonlight Internet Streaming Tester"
@@ -69,5 +140,14 @@
        <RegistryValue Root="HKCU" Key="Software\Moonlight Internet Streaming Tester" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
      </Component>
    </ComponentGroup>
+
+    <InstallExecuteSequence>
+      <Custom Action="EnableMpsSvc" Before="StartMpsSvc">
+        <![CDATA[MPSSVC_START <> "#2"]]>
+      </Custom>
+      <Custom Action="StartMpsSvc" Before="StopServices">
+        <![CDATA[MPSSVC_START <> "#2"]]>
+      </Custom>
+    </InstallExecuteSequence>
  </Fragment>
 </Wix>
@@ -48,6 +48,10 @@
      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
      <Name>WixUIExtension</Name>
    </WixExtension>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
  </ItemGroup>
  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
@@ -12,6 +12,7 @@
 #include <assert.h>
 #include <stdlib.h>

+#include "relay.h"
 #include "..\version.h"

 #pragma comment(lib, "miniupnpc.lib")
@@ -38,6 +39,7 @@ bool PCPMapPort(PSOCKADDR_STORAGE localAddr, int localAddrLen, PSOCKADDR_STORAGE
 #define POLLING_DELAY_SEC 120
 #define PORT_MAPPING_DURATION_SEC 3600
 #define UPNP_DISCOVERY_DELAY_MS 5000
+#define GAA_INITIAL_SIZE 8192

 static struct port_entry {
    int proto;
@@ -53,9 +55,12 @@ static struct port_entry {
    {IPPROTO_UDP, 48010}
 };

-static const int k_WolPorts[] = { 9 };
+static const int k_WolPorts[] = { 9, 47009 };

-bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const char* myAddr, int port, bool enable, bool indefinite)
+static HANDLE s_StopEvent;
+static CRITICAL_SECTION s_PortMappingUpdateLock;
+
+bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const char* myAddr, int port, bool enable, bool indefinite, bool validationPass)
 {
    char intClient[16];
    char intPort[6];
@@ -95,14 +100,40 @@ bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const
    if (err == 714) {
        // NoSuchEntryInArray
        printf("NOT FOUND" NL);
+
+        if (validationPass) {
+            // On validation, we found a missing entry. Convert this entry to indefinite
+            // to see if it will stick.
+            indefinite = true;
+        }
+    }
+    else if (err == 606) {
+        printf("UNAUTHORIZED" NL);
+
+        // If we're just validating, we're done. We can't know if the entry was
+        // actually applied but we'll return true to avoid false errors if it was.
+        if (validationPass) {
+            return true;
+        }
    }
    else if (err == UPNPCOMMAND_SUCCESS) {
-        if (!strcmp(intClient, myAddr) && !strcmp(desc, myDesc)) {
+        // Some routers change the description, so we can't check that here
+        if (!strcmp(intClient, myAddr)) {
            if (atoi(leaseDuration) == 0) {
-                printf("OK (Permanent)" NL);
+                printf("OK (Static, Internal port: %s)" NL, intPort);
+
+                // If we have an existing permanent mapping, we can just leave it alone.
+                if (enable) {
+                    return true;
+                }
            }
            else {
-                printf("OK (%s seconds remaining)" NL, leaseDuration);
+                printf("OK (%s seconds remaining, Internal port: %s)" NL, leaseDuration, intPort);
+            }
+
+            // If we're just validating, we found an entry, so we're done.
+            if (validationPass) {
+                return true;
            }

            if (!enable) {
@@ -122,6 +153,11 @@ bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const
        else {
            printf("CONFLICT: %s %s" NL, intClient, desc);

+            // If we're just validating, we found an entry, so we're done.
+            if (validationPass) {
+                return true;
+            }
+
            // Some UPnP IGDs won't let unauthenticated clients delete other conflicting port mappings
            // for security reasons, but we will give it a try anyway. If GameStream is not enabled,
            // we will leave the conflicting entry alone to avoid disturbing another PC's port forwarding
@@ -145,6 +181,10 @@ bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const
    }
    else {
        printf("ERROR %d (%s)" NL, err, strupnperror(err));
+
+        // If we get a strange error from the router, we'll assume it's some old broken IGDv1
+        // device and only use indefinite lease durations to hopefully avoid confusing it.
+        indefinite = true;
    }

    // Bail if GameStream is disabled
@@ -159,11 +199,31 @@ bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const
    err = UPNP_AddPortMapping(
        urls->controlURL, data->first.servicetype, portStr,
        portStr, myAddr, myDesc, protoStr, nullptr, leaseDuration);
-    if (err == 725 && !indefinite) { // OnlyPermanentLeasesSupported
+    if (err != UPNPCOMMAND_SUCCESS && !indefinite) {
+        // This may be a broken IGD that doesn't like non-static mappings. Try a static
+        // mapping before finally giving up.
        err = UPNP_AddPortMapping(
            urls->controlURL, data->first.servicetype, portStr,
            portStr, myAddr, myDesc, protoStr, nullptr, "0");
-        printf("PERMANENT ");
+        printf("STATIC RETRY ");
+    }
+    else if (indefinite) {
+        printf("STATIC ");
+    }
+    if (err == 718 && proto == IPPROTO_UDP && port >= 47000) { // ConflictInMappingEntry
+        // Some UPnP implementations incorrectly deduplicate on the internal port instead
+        // of the external port, in violation of the UPnP IGD specification. Since GFE creates
+        // mappings on the same internal port as us, those routers break our mappings. To
+        // work around this issue, we run relays for each of the UDP ports on an alternate
+        // internal port. We'll try the alternate port if we get a conflict for a UDP entry.
+        // Given that these are already horribly non-spec compliant, we won't take any chances
+        // and we'll use an indefinite mapping too.
+        char altPortStr[6];
+        snprintf(altPortStr, sizeof(altPortStr), "%d", port + RELAY_PORT_OFFSET);
+        err = UPNP_AddPortMapping(
+            urls->controlURL, data->first.servicetype, portStr,
+            altPortStr, myAddr, myDesc, protoStr, nullptr, "0");
+        printf("ALTERNATE ");
    }
    if (err == UPNPCOMMAND_SUCCESS) {
        printf("OK" NL);
@@ -177,10 +237,7 @@ bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const

 bool GetIP4OnLinkPrefixLength(char* lanAddressString, int* prefixLength)
 {
-    union {
-        IP_ADAPTER_ADDRESSES addresses;
-        char buffer[8192];
-    };
+    PIP_ADAPTER_ADDRESSES addresses;
    ULONG error;
    ULONG length;
    PIP_ADAPTER_ADDRESSES currentAdapter;
@@ -189,22 +246,34 @@ bool GetIP4OnLinkPrefixLength(char* lanAddressString, int* prefixLength)

    inet_pton(AF_INET, lanAddressString, &targetAddress);

-    // Get a list of all interfaces with IPv4 addresses on the system
-    length = sizeof(buffer);
-    error = GetAdaptersAddresses(AF_INET,
-        GAA_FLAG_SKIP_ANYCAST |
-        GAA_FLAG_SKIP_MULTICAST |
-        GAA_FLAG_SKIP_DNS_SERVER |
-        GAA_FLAG_SKIP_FRIENDLY_NAME,
-        NULL,
-        &addresses,
-        &length);
+    addresses = NULL;
+    length = GAA_INITIAL_SIZE;
+    do {
+        free(addresses);
+        addresses = (PIP_ADAPTER_ADDRESSES)malloc(length);
+        if (addresses == NULL) {
+            printf("malloc(%u) failed" NL, length);
+            return false;
+        }
+
+        // Get a list of all interfaces with IPv4 addresses on the system
+        error = GetAdaptersAddresses(AF_INET,
+            GAA_FLAG_SKIP_ANYCAST |
+            GAA_FLAG_SKIP_MULTICAST |
+            GAA_FLAG_SKIP_DNS_SERVER |
+            GAA_FLAG_SKIP_FRIENDLY_NAME,
+            NULL,
+            addresses,
+            &length);
+    } while (error == ERROR_BUFFER_OVERFLOW);
+
    if (error != ERROR_SUCCESS) {
        printf("GetAdaptersAddresses() failed: %d" NL, error);
+        free(addresses);
        return false;
    }

-    currentAdapter = &addresses;
+    currentAdapter = addresses;
    currentAddress = nullptr;
    while (currentAdapter != nullptr) {
        currentAddress = currentAdapter->FirstUnicastAddress;
@@ -215,6 +284,7 @@ bool GetIP4OnLinkPrefixLength(char* lanAddressString, int* prefixLength)

            if (RtlEqualMemory(&currentAddrV4->sin_addr, &targetAddress, sizeof(targetAddress))) {
                *prefixLength = currentAddress->OnLinkPrefixLength;
+                free(addresses);
                return true;
            }

@@ -225,6 +295,7 @@ bool GetIP4OnLinkPrefixLength(char* lanAddressString, int* prefixLength)
    }

    printf("No adapter found with IPv4 address: %s" NL, lanAddressString);
+    free(addresses);
    return false;
 }

@@ -248,10 +319,10 @@ bool UPnPHandleDeviceList(struct UPNPDev* list, bool enable, char* lanAddrOverri
        return false;
    }
    else if (ret == 1) {
-        printf("Found a connected UPnP IGD" NL);
+        printf("Found a connected UPnP IGD (%s)" NL, urls.rootdescURL);
    }
    else if (ret == 2) {
-        printf("Found a disconnected UPnP IGD (!)" NL);
+        printf("Found a disconnected (!) UPnP IGD (%s)" NL, urls.rootdescURL);

        // Even if we are able to add forwarding entries, go ahead and try NAT-PMP
        success = false;
@@ -278,8 +349,9 @@ bool UPnPHandleDeviceList(struct UPNPDev* list, bool enable, char* lanAddrOverri
        portMappingInternalAddress = localAddress;
    }

+    // Create the port mappings
    for (int i = 0; i < ARRAYSIZE(k_Ports); i++) {
-        if (!UPnPMapPort(&urls, &data, k_Ports[i].proto, portMappingInternalAddress, k_Ports[i].port, enable, false)) {
+        if (!UPnPMapPort(&urls, &data, k_Ports[i].proto, portMappingInternalAddress, k_Ports[i].port, enable, false, false)) {
            success = false;
        }
    }
@@ -303,13 +375,32 @@ bool UPnPHandleDeviceList(struct UPNPDev* list, bool enable, char* lanAddrOverri
                char broadcastAddrStr[128];
                inet_ntop(AF_INET, &broadcastAddr, broadcastAddrStr, sizeof(broadcastAddrStr));

-                UPnPMapPort(&urls, &data, IPPROTO_UDP, broadcastAddrStr, k_WolPorts[i], enable, true);
+                UPnPMapPort(&urls, &data, IPPROTO_UDP, broadcastAddrStr, k_WolPorts[i], enable, true, false);
            }
        }
        else {
            // When we're mapping the WOL ports upstream of our router, we map directly to
            // the port on the upstream address (likely our router's WAN interface).
-            UPnPMapPort(&urls, &data, IPPROTO_UDP, lanAddrOverride, k_WolPorts[i], enable, true);
+            UPnPMapPort(&urls, &data, IPPROTO_UDP, lanAddrOverride, k_WolPorts[i], enable, true, false);
+        }
+    }
+
+    // Validate the rules are present and correct if they claimed to be added successfully
+    if (success && enable) {
+        // Wait 10 seconds for the router state to quiesce or the stop event to be set
+        printf("Waiting before UPnP port validation...");
+        if (WaitForSingleObject(s_StopEvent, 10000) == WAIT_TIMEOUT) {
+            printf("done" NL);
+
+            // Perform the validation pass (converting any now missing entries to permanent ones)
+            for (int i = 0; i < ARRAYSIZE(k_Ports); i++) {
+                if (!UPnPMapPort(&urls, &data, k_Ports[i].proto, portMappingInternalAddress, k_Ports[i].port, enable, false, true)) {
+                    success = false;
+                }
+            }
+        }
+        else {
+            printf("aborted" NL);
        }
    }

@@ -343,7 +434,7 @@ bool NATPMPMapPort(natpmp_t* natpmp, int proto, int port, bool enable, bool inde
        lifetime = 604800; // 1 week
    }
    else {
-        lifetime = 3600;
+        lifetime = PORT_MAPPING_DURATION_SEC;
    }

    printf("Updating NAT-PMP port mapping for %s %d...", proto == IPPROTO_TCP ? "TCP" : "UDP", port);
@@ -385,15 +476,6 @@ bool NATPMPMapPort(natpmp_t* natpmp, int proto, int port, bool enable, bool inde
    else if (response.pnu.newportmapping.mappedpublicport != port) {
        printf("CONFLICT" NL);

-        // Some buggy routers (Untangle) will change the *internal* port when
-        // adjusting a port mapping request that collides. This is why we also
-        // pass privateport back from the response and not from the port we originally
-        // asked for. Warn in this case.
-        if (response.pnu.newportmapping.privateport != port) {
-            printf("Buggy router changed the internal port when handling NAT-PMP conflict! (%d -> %d)" NL,
-                port, response.pnu.newportmapping.privateport);
-        }
-
        // It couldn't assign us the external port we requested and gave us an alternate external port.
        // We can't use this alternate mapping, so immediately release it.
        printf("Deleting unwanted NAT-PMP mapping for %s %d...", proto == IPPROTO_TCP ? "TCP" : "UDP", response.pnu.newportmapping.mappedpublicport);
@@ -458,14 +540,8 @@ bool IsGameStreamEnabled()
        printf("RegQueryValueExA() failed: %d" NL, error);
        return false;
    }
-    else if (!enabled) {
-        printf("GameStream is OFF!" NL);
-        return false;
-    }
-    else {
-        printf("GameStream is ON!" NL);
-        return true;
-    }
+
+    return enabled != 0;
 }

 void UpdatePortMappingsForTarget(bool enable, char* targetAddressIP4, char* internalAddressIP4, char* upstreamAddressIP4)
@@ -510,6 +586,12 @@ void UpdatePortMappingsForTarget(bool enable, char* targetAddressIP4, char* inte
            ipv4Devs = getUPnPDevicesByAddress(addr);
        }

+        // Abort if this is an add/update request and we're stopping
+        if (enable && WaitForSingleObject(s_StopEvent, 0) == WAIT_OBJECT_0) {
+            printf("Aborting port mapping update due to stop request" NL);
+            goto Exit;
+        }
+
        // Use the delay of discovery to also allow the NAT-PMP endpoint time to respond
        if (natPmpErr >= 0) {
            natpmpresp_t response;
@@ -742,60 +824,101 @@ void NETIOAPI_API_ IpInterfaceChangeNotificationCallback(PVOID context, PMIB_IPI
    SetEvent((HANDLE)context);
 }

-void ResetLogFile()
+void ResetLogFile(bool standaloneExe)
 {
-    char oldLogFilePath[MAX_PATH + 1];
-    char currentLogFilePath[MAX_PATH + 1];
+    char timeString[MAX_PATH + 1] = {};
+    SYSTEMTIME time;

-    ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-old.log", oldLogFilePath, sizeof(oldLogFilePath));
-    ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-current.log", currentLogFilePath, sizeof(currentLogFilePath));
+    if (!standaloneExe) {
+        char oldLogFilePath[MAX_PATH + 1];
+        char currentLogFilePath[MAX_PATH + 1];

-    // Delete the old log file
-    DeleteFileA(oldLogFilePath);
+        ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-old.log", oldLogFilePath, sizeof(oldLogFilePath));
+        ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-current.log", currentLogFilePath, sizeof(currentLogFilePath));

-    // Rotate the current to the old log file
-    MoveFileA(currentLogFilePath, oldLogFilePath);
+        // Close the existing stdout handle. This is important because otherwise
+        // it may still be open as stdout when we try to MoveFileEx below.
+        fclose(stdout);

-    // Redirect stdout to this new file
-    freopen(currentLogFilePath, "w", stdout);
+        // Rotate the current to the old log file
+        MoveFileExA(currentLogFilePath, oldLogFilePath, MOVEFILE_REPLACE_EXISTING);
+
+        // Redirect stdout to this new file
+        freopen(currentLogFilePath, "w", stdout);
+    }

    // Print a log header
    printf("Moonlight Internet Streaming Service v" VER_VERSION_STR NL);
+
+    // Print the current time
+    GetSystemTime(&time);
+    GetTimeFormatA(LOCALE_SYSTEM_DEFAULT, 0, &time, "hh':'mm':'ss tt", timeString, ARRAYSIZE(timeString));
+    printf("The current UTC time is: %s" NL, timeString);
 }

 DWORD WINAPI GameStreamStateChangeThread(PVOID Context)
 {
    HKEY key;
+    DWORD err;

-    // We're watching this key that way we can still detect GameStream turning on
-    // if GFE wasn't even installed when our service started
-    DWORD err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\NVIDIA Corporation", 0, KEY_READ | KEY_WOW64_64KEY, &key);
-    if (err != ERROR_SUCCESS) {
-        printf("RegOpenKeyExA() failed: %d" NL, err);
-        return err;
-    }
+    do {
+        // We're watching this key that way we can still detect GameStream turning on
+        // if GFE wasn't even installed when our service started
+        do {
+            err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\NVIDIA Corporation", 0, KEY_READ | KEY_WOW64_64KEY, &key);
+            if (err != ERROR_SUCCESS) {
+                // Wait 10 seconds and try again
+                Sleep(10000);
+            }
+        } while (err != ERROR_SUCCESS);

-    // Notify the main thread when the GameStream state changes
-    bool lastGameStreamState = IsGameStreamEnabled();
-    while ((err = RegNotifyChangeKeyValue(key, true, REG_NOTIFY_CHANGE_LAST_SET, nullptr, false)) == ERROR_SUCCESS) {
-        bool currentGameStreamState = IsGameStreamEnabled();
-        if (lastGameStreamState != currentGameStreamState) {
-            SetEvent((HANDLE)Context);
+        // Notify the main thread when the GameStream state changes
+        bool lastGameStreamState = IsGameStreamEnabled();
+        while ((err = RegNotifyChangeKeyValue(key, true, REG_NOTIFY_CHANGE_LAST_SET, nullptr, false)) == ERROR_SUCCESS) {
+            bool currentGameStreamState = IsGameStreamEnabled();
+            if (lastGameStreamState != currentGameStreamState) {
+                SetEvent((HANDLE)Context);
+            }
+            lastGameStreamState = currentGameStreamState;
        }
-        lastGameStreamState = currentGameStreamState;
-    }

-    printf("RegNotifyChangeKeyValue() failed: %d" NL, err);
+        // If the key is deleted (by DDU or similar), we will hit this code path and poll until it comes back.
+        RegCloseKey(key);
+    } while (err == ERROR_KEY_DELETED);
+
    return err;
 }

-int Run()
+int Initialize()
+{
+    // Create the stop event
+    s_StopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+    if (s_StopEvent == NULL) {
+        return GetLastError();
+    }
+
+    InitializeCriticalSection(&s_PortMappingUpdateLock);
+    return 0;
+}
+
+int Run(bool standaloneExe)
 {
    HANDLE ifaceChangeEvent = CreateEvent(nullptr, true, false, nullptr);
    HANDLE gsChangeEvent = CreateEvent(nullptr, true, false, nullptr);
-    HANDLE events[2] = { ifaceChangeEvent, gsChangeEvent };
+    HANDLE events[3] = { ifaceChangeEvent, gsChangeEvent, s_StopEvent };

-    ResetLogFile();
+    ResetLogFile(standaloneExe);
+
+    // Bump the process priority class to above normal. The UDP relay threads will
+    // further raise their own thread priorities to avoid preemption by other activity.
+    SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS);
+
+    // Create the UDP alternate port relays
+    for (int i = 0; i < ARRAYSIZE(k_Ports); i++) {
+        if (k_Ports[i].proto == IPPROTO_UDP) {
+            StartUdpRelay(k_Ports[i].port);
+        }
+    }

    // Create the thread to watch for GameStream state changes
    CreateThread(nullptr, 0, GameStreamStateChangeThread, gsChangeEvent, 0, nullptr);
@@ -807,7 +930,27 @@ int Run()
    for (;;) {
        ResetEvent(gsChangeEvent);
        ResetEvent(ifaceChangeEvent);
-        UpdatePortMappings(IsGameStreamEnabled());
+
+        bool gameStreamEnabled = IsGameStreamEnabled();
+
+        if (gameStreamEnabled) {
+            printf("GameStream is ON!" NL);
+        }
+        else {
+            printf("GameStream is OFF!" NL);
+        }
+
+        // Acquire the mapping lock and update port mappings
+        if (TryEnterCriticalSection(&s_PortMappingUpdateLock)) {
+            // If the stop event is set, bail out now
+            if (WaitForSingleObject(s_StopEvent, 0) == WAIT_OBJECT_0) {
+                LeaveCriticalSection(&s_PortMappingUpdateLock);
+                return 0;
+            }
+
+            UpdatePortMappings(gameStreamEnabled);
+            LeaveCriticalSection(&s_PortMappingUpdateLock);
+        }

        // Refresh when half the duration is expired or if an IP interface
        // change event occurs.
@@ -817,7 +960,7 @@ int Run()
        ULONGLONG beforeSleepTime = GetTickCount64();
        DWORD ret = WaitForMultipleObjects(ARRAYSIZE(events), events, false, POLLING_DELAY_SEC * 1000);
        if (ret == WAIT_OBJECT_0) {
-            ResetLogFile();
+            ResetLogFile(standaloneExe);

            printf("Woke up for interface change notification after %lld seconds" NL,
                (GetTickCount64() - beforeSleepTime) / 1000);
@@ -826,13 +969,17 @@ int Run()
            Sleep(10000);
        }
        else if (ret == WAIT_OBJECT_0 + 1) {
-            ResetLogFile();
+            ResetLogFile(standaloneExe);

            printf("Woke up for GameStream state change notification after %lld seconds" NL,
                (GetTickCount64() - beforeSleepTime) / 1000);
        }
+        else if (ret == WAIT_OBJECT_0 + 2) {
+            printf("Woke up for stop notification" NL);
+            return 0;
+        }
        else {
-            ResetLogFile();
+            ResetLogFile(standaloneExe);

            printf("Woke up for periodic refresh" NL);
        }
@@ -852,14 +999,21 @@ HandlerEx(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpConte
        return NO_ERROR;

    case SERVICE_CONTROL_STOP:
+        // Stop future port mapping updates
+        SetEvent(s_StopEvent);
+
        ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
        ServiceStatus.dwControlsAccepted = 0;
+        ServiceStatus.dwWaitHint = 120 * 1000; // 2 minutes
        SetServiceStatus(ServiceStatusHandle, &ServiceStatus);

+        // Remove existing port mappings
+        EnterCriticalSection(&s_PortMappingUpdateLock);
        printf("Removing UPnP/NAT-PMP/PCP rules after service stop request\n");
        UpdatePortMappings(false);
+        LeaveCriticalSection(&s_PortMappingUpdateLock);

-        printf("The service is stopping\n");
+        printf("The service is stopping now\n");
        ServiceStatus.dwCurrentState = SERVICE_STOPPED;
        SetServiceStatus(ServiceStatusHandle, &ServiceStatus);
        return NO_ERROR;
@@ -881,6 +1035,14 @@ ServiceMain(DWORD dwArgc, LPTSTR *lpszArgv)
        return;
    }

+    err = Initialize();
+    if (err != 0) {
+        ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+        ServiceStatus.dwWin32ExitCode = err;
+        SetServiceStatus(ServiceStatusHandle, &ServiceStatus);
+        return;
+    }
+
    ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
    ServiceStatus.dwServiceSpecificExitCode = 0;
    ServiceStatus.dwWin32ExitCode = NO_ERROR;
@@ -893,7 +1055,7 @@ ServiceMain(DWORD dwArgc, LPTSTR *lpszArgv)
    SetServiceStatus(ServiceStatusHandle, &ServiceStatus);

    // Start the service
-    err = Run();
+    err = Run(false);
    if (err != 0) {
        ServiceStatus.dwCurrentState = SERVICE_STOPPED;
        ServiceStatus.dwWin32ExitCode = err;
@@ -916,8 +1078,8 @@ int main(int argc, char* argv[])
    }

    if (argc == 2 && !strcmp(argv[1], "exe")) {
-        Run();
-        return 0;
+        Initialize();
+        return Run(true);
    }

    return StartServiceCtrlDispatcher(ServiceTable);
@@ -3,6 +3,7 @@

 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_VERSION
+PRODUCTVERSION  VER_VERSION
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
@@ -11,6 +12,8 @@ BEGIN
            VALUE "CompanyName",        VER_COMPANYNAME_STR
            VALUE "FileDescription",    "Moonlight Internet Streaming Service"
            VALUE "ProductName",        VER_PRODUCTNAME_STR
+            VALUE "FileVersion",        VER_VERSION_STR
+            VALUE "ProductVersion",     VER_VERSION_STR
        END
    END

@@ -23,32 +23,32 @@
    <ProjectGuid>{B71C4E7F-0D92-4E19-BBD2-D33F0EF879B1}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>miss</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
@@ -93,13 +93,19 @@
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <AdditionalIncludeDirectories>..\libs\include;..\libs\include\miniupnpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalLibraryDirectories>..\libs\x86\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <CETCompat>true</CETCompat>
    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Debug\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@@ -111,11 +117,17 @@
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CETCompat>true</CETCompat>
    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Debug\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -130,7 +142,8 @@
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <AdditionalIncludeDirectories>..\libs\include;..\libs\include\miniupnpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -138,7 +151,11 @@
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalLibraryDirectories>..\libs\x86\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <CETCompat>true</CETCompat>
    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Release\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@@ -152,17 +169,23 @@
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CETCompat>true</CETCompat>
    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Release\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="miss.cpp" />
    <ClCompile Include="pcp.cpp" />
+    <ClCompile Include="relay.cpp" />
    <ClCompile Include="tracer.cpp" />
  </ItemGroup>
  <ItemGroup>
@@ -170,6 +193,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\version.h" />
+    <ClInclude Include="relay.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
@@ -24,6 +24,9 @@
    <ClCompile Include="pcp.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="relay.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="miss.rc">
@@ -34,5 +37,8 @@
    <ClInclude Include="..\version.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="relay.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
@@ -118,7 +118,7 @@ bool PCPMapPort(PSOCKADDR_STORAGE localAddr, int localAddrLen, PSOCKADDR_STORAGE
    int bytesRead;
    union {
        PCP_MAP_RESPONSE hdr;
-        char buf[1024];
+        char buf[1100];
    } resp;
    int lifetime;

@@ -244,6 +244,10 @@ bool PCPMapPort(PSOCKADDR_STORAGE localAddr, int localAddrLen, PSOCKADDR_STORAGE
        printf("PCP message truncated: %d\n", bytesRead);
        goto fail;
    }
+    else if (resp.hdr.hdr.version != PCP_VERSION) {
+        printf("PCP version mismatch: %x\n", resp.hdr.hdr.version);
+        goto fail;
+    }
    else if (resp.hdr.hdr.opcode != OPCODE_MAP_RESPONSE) {
        printf("PCP message type mismatch: %x\n", resp.hdr.hdr.opcode);
        goto fail;
@@ -0,0 +1,110 @@
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <WinSock2.h>
+#include <Ws2ipdef.h>
+
+#include "relay.h"
+
+typedef struct _UDP_TUPLE {
+    SOCKET socket;
+    unsigned short port;
+} UDP_TUPLE, *PUDP_TUPLE;
+
+DWORD
+WINAPI
+UdpRelayThreadProc(LPVOID Context)
+{
+    PUDP_TUPLE tuple = (PUDP_TUPLE)Context;
+    USHORT nboPort = htons(tuple->port);
+    SOCKADDR_IN lastRemoteAddr;
+
+    // Ensure the relay threads aren't preempted by games or other CPU intensive activity
+    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST);
+
+    RtlZeroMemory(&lastRemoteAddr, sizeof(lastRemoteAddr));
+
+    for (;;) {
+        char buffer[4096];
+        SOCKADDR_IN sourceAddr;
+        int sourceAddrLen;
+        int recvLen;
+
+        sourceAddrLen = sizeof(sourceAddr);
+        recvLen = recvfrom(tuple->socket, buffer, sizeof(buffer), 0, (PSOCKADDR)&sourceAddr, &sourceAddrLen);
+        if (recvLen == SOCKET_ERROR) {
+            continue;
+        }
+        
+        SOCKADDR_IN destinationAddr;
+        if (RtlEqualMemory(&sourceAddr.sin_addr, &in4addr_loopback, sizeof(sourceAddr.sin_addr)) && sourceAddr.sin_port == nboPort) {
+            // Traffic incoming from loopback interface - send it to the last remote address
+            destinationAddr = lastRemoteAddr;
+        }
+        else {
+            // Traffic incoming from the remote host - remember the source
+            lastRemoteAddr = sourceAddr;
+
+            // Send it to the normal port via the loopback adapter
+            destinationAddr = sourceAddr;
+            destinationAddr.sin_addr = in4addr_loopback;
+            destinationAddr.sin_port = nboPort;
+        }
+
+        sendto(tuple->socket, buffer, recvLen, 0, (PSOCKADDR)&destinationAddr, sizeof(destinationAddr));
+    }
+
+    closesocket(tuple->socket);
+    free(tuple);
+    return 0;
+}
+
+int StartUdpRelay(unsigned short Port)
+{
+    SOCKET sock;
+    SOCKADDR_IN addr;
+    HANDLE thread;
+    PUDP_TUPLE tuple;
+    int error;
+
+    sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (sock == INVALID_SOCKET) {
+        error = WSAGetLastError();
+        printf("socket() failed: %d\n", error);
+        return error;
+    }
+
+    // Bind to the alternate port
+    RtlZeroMemory(&addr, sizeof(addr));
+    addr.sin_family = AF_INET;
+    addr.sin_port = htons(Port + RELAY_PORT_OFFSET);
+    if (bind(sock, (PSOCKADDR)&addr, sizeof(addr)) == SOCKET_ERROR) {
+        error = WSAGetLastError();
+        printf("bind() failed: %d\n", error);
+        closesocket(sock);
+        return error;
+    }
+
+    tuple = (PUDP_TUPLE)malloc(sizeof(*tuple));
+    if (tuple == NULL) {
+        return ERROR_OUTOFMEMORY;
+    }
+
+    tuple->socket = sock;
+    tuple->port = Port;
+
+    thread = CreateThread(NULL, 0, UdpRelayThreadProc, tuple, 0, NULL);
+    if (thread == NULL) {
+        error = GetLastError();
+        printf("CreateThread() failed: %d\n", error);
+        closesocket(sock);
+        return error;
+    }
+
+    CloseHandle(thread);
+
+    return 0;
+}
@@ -0,0 +1,5 @@
+#pragma once
+
+#define RELAY_PORT_OFFSET -10000
+
+int StartUdpRelay(unsigned short Port);
@@ -22,6 +22,55 @@ static const char* k_SsdpSearchFormatString =
    "MX: 5\r\n"
    "\r\n";

+// Based on logic in https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/minissdpc.c
+static void
+parseReply(const char* reply, int size,
+           const char** location, int *locationsize,
+           const char** st, int* stsize,
+           const char** usn, int* usnsize)
+{
+    int lineStartIdx = 0;
+    int headerEndIdx = 0;
+    for (int i = 0; i < size; i++) {
+        switch (reply[i])
+        {
+        case ':':
+            // Stop parsing the header at the first colon, but ignore subsequent colons
+            if (headerEndIdx == 0) {
+                headerEndIdx = i;
+            }
+            break;
+        case '\r':
+        case '\n':
+            if (headerEndIdx != 0) {
+                // Skip the colon and spaces
+                do { headerEndIdx++; } while (reply[headerEndIdx] == ' ');
+
+                // Check if it's one of the values we care about
+                if (!_strnicmp(reply + lineStartIdx, "location:", 9)) {
+                    *location = reply + headerEndIdx;
+                    *locationsize = i - headerEndIdx;
+                }
+                else if (!_strnicmp(reply + lineStartIdx, "st:", 3)) {
+                    *st = reply + headerEndIdx;
+                    *stsize = i - headerEndIdx;
+                }
+                else if (!_strnicmp(reply + lineStartIdx, "usn:", 4)) {
+                    *usn = reply + headerEndIdx;
+                    *usnsize = i - headerEndIdx;
+                }
+
+                // Move on to the next header value
+                headerEndIdx = 0;
+            }
+            lineStartIdx = i + 1;
+            break;
+        default:
+            break;
+        }
+    }
+}
+
 struct UPNPDev* getUPnPDevicesByAddress(IN_ADDR address)
 {
    SOCKET s;
@@ -47,6 +96,13 @@ struct UPNPDev* getUPnPDevicesByAddress(IN_ADDR address)
        return nullptr;
    }

+    // We will be reading all responses at the end, so ensure we have ample buffer space
+    // to allow responses to accumulate without loss.
+    int recvBufferSize = 65535;
+    if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char*)&recvBufferSize, sizeof(recvBufferSize)) == SOCKET_ERROR) {
+        printf("setsockopt() failed: %d\n", WSAGetLastError());
+    }
+
    // Send the first search message with HOST set properly
    chars = snprintf(searchBuffer, ARRAYSIZE(searchBuffer), k_SsdpSearchFormatString, inet_ntoa(address));
    if (send(s, searchBuffer, chars, 0) == SOCKET_ERROR) {
@@ -115,38 +171,37 @@ struct UPNPDev* getUPnPDevicesByAddress(IN_ADDR address)
        }

        // Parse the header options
-        // SERVER: FreeBSD/11.2-RELEASE-p2 UPnP/1.1 MiniUPnPd/2.0\r\n
-        char* location = nullptr;
-        char* st = nullptr;
-        while (char* headerName = strtok(nullptr, "\r\n:")) {
-            char* headerValue = strtok(nullptr, "\r");
-            if (headerValue == nullptr) {
-                printf("Unexpected end of SSDP header\n");
-                break;
-            }
+        char* remainder = strtok(nullptr, "");
+        const char* loc = nullptr;
+        const char* st = nullptr;
+        const char* usn = ""; // Initialize to empty since it's optional
+        int locSize = 0;
+        int stSize = 0;
+        int usnSize = 0;
+        parseReply(remainder, strlen(remainder),
+            &loc, &locSize, &st, &stSize, &usn, &usnSize);

-            // Skip leading spaces
-            while (*headerValue == ' ') headerValue++;
-
-            if (!_stricmp(headerName, "LOCATION")) {
-                location = headerValue;
-            }
-            else if (!_stricmp(headerName, "ST")) {
-                st = headerValue;
-            }
-        }
-
-        if (!location || location[0] == 0 || !st || st[0] == 0) {
-            printf("Required value missing: \"%s\" \"%s\"\n", location, st);
+        if (!loc || locSize == 0 || !st || stSize == 0) {
+            printf("Required value missing: %d %d\n", locSize, stSize);
            continue;
        }

-        struct UPNPDev* newDev = (struct UPNPDev*)malloc(sizeof(*newDev) + strlen(location) + strlen(st) + 2);
-        
+        struct UPNPDev* newDev = (struct UPNPDev*)malloc(sizeof(*newDev) + usnSize + locSize + stSize + 3);
+
        newDev->pNext = deviceList;
-        newDev->usn = &newDev->buffer[0]; newDev->buffer[0] = 0;
-        newDev->descURL = strcpy(newDev->usn + strlen(newDev->usn) + 1, location);
-        newDev->st = strcpy(newDev->descURL + strlen(newDev->descURL) + 1, st);
+
+        newDev->usn = &newDev->buffer[0];
+        memcpy(newDev->usn, usn, usnSize);
+        newDev->usn[usnSize] = 0;
+
+        newDev->descURL = newDev->usn + usnSize + 1;
+        memcpy(newDev->descURL, loc, locSize);
+        newDev->descURL[locSize] = 0;
+
+        newDev->st = newDev->descURL + locSize + 1;
+        memcpy(newDev->st, st, stSize);
+        newDev->st[stSize] = 0;
+
        newDev->scope_id = 0; // IPv6 only

        deviceList = newDev;
@@ -170,7 +225,7 @@ bool getHopsIP4(IN_ADDR* hopAddress, int* hopAddressCount)
        char replyBuffer[128];
    };

-    host = gethostbyname("google.com");
+    host = gethostbyname("moonlight-stream.org");
    if (host == nullptr) {
        printf("gethostbyname() failed: %d\n", WSAGetLastError());
        return false;
@@ -1,23 +1,23 @@
-#define _CRT_RAND_S
-#define _CRT_SECURE_NO_WARNINGS
-#include <stdlib.h>
+#include "mist.h"

-#define WIN32_LEAN_AND_MEAN
-#define _WINSOCK_DEPRECATED_NO_WARNINGS
-#include <Windows.h>
-#include <WinSock2.h>
 #include <Ws2tcpip.h>
 #include <stdio.h>
 #include <assert.h>
 #include <shellapi.h>
 #include <objbase.h>
-
-#include "..\version.h"
+#include <WinHttp.h>
+#include <wtsapi32.h>
+#include <powerbase.h>
+#include <VersionHelpers.h>
+#include <tlhelp32.h>

 #pragma comment(lib, "miniupnpc.lib")
 #pragma comment(lib, "libnatpmp.lib")
 #pragma comment(lib, "ws2_32.lib")
 #pragma comment(lib, "iphlpapi.lib")
+#pragma comment(lib, "winhttp.lib")
+#pragma comment(lib, "wtsapi32.lib")
+#pragma comment(lib, "powrprof.lib")

 #define MINIUPNP_STATICLIB
 #include <miniupnpc/miniupnpc.h>
@@ -27,7 +27,9 @@
 #define NATPMP_STATICLIB
 #include <natpmp.h>

-bool getExternalAddressPortIP4(int proto, unsigned short localPort, PSOCKADDR_IN wanAddr);
+#define LOOPBACK_SERVER_PORT_OFFSET -10000
+
+#define GAA_INITIAL_SIZE 8192

 static struct port_entry {
    int proto;
@@ -40,8 +42,13 @@ static struct port_entry {
    {IPPROTO_UDP, 47998, true},
    {IPPROTO_UDP, 47999, true},
    {IPPROTO_UDP, 48000, true},
+
+#if 0
+    // These are not currently used, so let's
+    // avoid testing them for now.
    {IPPROTO_UDP, 48002, true},
    {IPPROTO_UDP, 48010, true}
+#endif
 };

 char logFilePath[MAX_PATH + 1];
@@ -52,49 +59,124 @@ enum MessagePriority {
    MpError
 };

-void DisplayMessage(const char* message, MessagePriority priority = MpError, bool terminal = true)
+VOID CALLBACK MsgBoxHelpCallback(LPHELPINFO lpHelpInfo)
 {
-    printf("%s\n", message);
+    const char* helpUrl = (const char*)lpHelpInfo->dwContextId;
+
+    if (!helpUrl) {
+        return;
+    }
+
+    // It's recommended to initialize COM before calling ShellExecute()
+    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+    ShellExecuteA(nullptr, "open", helpUrl, nullptr, nullptr, SW_SHOWNORMAL);
+}
+
+void DisplayMessage(const char* message, const char* helpUrl = nullptr, MessagePriority priority = MpError, bool terminal = true)
+{
+    fprintf(CONSOLE_OUT, "%s\n", message);
+    fprintf(LOG_OUT, "%s\n", message);

    if (terminal) {
-        printf("--------------- MISS LOG -------------------\n");
+        char logPath[MAX_PATH + 1];
+        FILE* f;

-        char missPath[MAX_PATH + 1];
-        ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-current.log", missPath, sizeof(missPath));
-        FILE* f = fopen(missPath, "r");
+        fprintf(LOG_OUT, "--------------- CURRENT MISS LOG -------------------\n");
+
+        ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-current.log", logPath, sizeof(logPath));
+        f = fopen(logPath, "r");
        if (f != nullptr) {
            char buffer[1024];
            while (!feof(f)) {
                int bytesRead = fread(buffer, 1, ARRAYSIZE(buffer), f);
-                fwrite(buffer, 1, bytesRead, stdout);
+                fwrite(buffer, 1, bytesRead, LOG_OUT);
            }
            fclose(f);
        }
        else {
-            printf("Failed to find MISS log\n");
+            fprintf(LOG_OUT, "Failed to find current MISS log\n");
        }

-        fflush(stdout);
+        fprintf(LOG_OUT, "\n----------------- OLD MISS LOG ---------------------\n");
+
+        ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-old.log", logPath, sizeof(logPath));
+        f = fopen(logPath, "r");
+        if (f != nullptr) {
+            char buffer[1024];
+            while (!feof(f)) {
+                int bytesRead = fread(buffer, 1, ARRAYSIZE(buffer), f);
+                fwrite(buffer, 1, bytesRead, LOG_OUT);
+            }
+            fclose(f);
+        }
+        else {
+            fprintf(LOG_OUT, "Failed to find old MISS log\n");
+        }
+
+        fprintf(LOG_OUT, "--------------- CURRENT GSV6FWD LOG -------------------\n");
+
+        ExpandEnvironmentStringsA("%ProgramData%\\MISS\\GSv6Fwd-current.log", logPath, sizeof(logPath));
+        f = fopen(logPath, "r");
+        if (f != nullptr) {
+            char buffer[1024];
+            while (!feof(f)) {
+                int bytesRead = fread(buffer, 1, ARRAYSIZE(buffer), f);
+                fwrite(buffer, 1, bytesRead, LOG_OUT);
+            }
+            fclose(f);
+        }
+        else {
+            fprintf(LOG_OUT, "Failed to find current GSv6Fwd log\n");
+        }
+
+        fprintf(LOG_OUT, "\n----------------- OLD GSV6FWD LOG ---------------------\n");
+
+        ExpandEnvironmentStringsA("%ProgramData%\\MISS\\GSv6Fwd-old.log", logPath, sizeof(logPath));
+        f = fopen(logPath, "r");
+        if (f != nullptr) {
+            char buffer[1024];
+            while (!feof(f)) {
+                int bytesRead = fread(buffer, 1, ARRAYSIZE(buffer), f);
+                fwrite(buffer, 1, bytesRead, LOG_OUT);
+            }
+            fclose(f);
+        }
+        else {
+            fprintf(LOG_OUT, "Failed to find old GSv6Fwd log\n");
+        }
+
+        fflush(LOG_OUT);
    }

-
-    DWORD flags = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
+    MSGBOXPARAMSA msgParams;
+    msgParams.cbSize = sizeof(msgParams);
+    msgParams.hwndOwner = nullptr;
+    msgParams.hInstance = nullptr;
+    msgParams.lpszText = message;
+    msgParams.lpszCaption = "Moonlight Internet Streaming Tester";
+    msgParams.dwStyle = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
+    if (helpUrl) {
+        msgParams.dwStyle |= MB_HELP;
+    }
    switch (priority) {
    case MpInfo:
-        flags |= MB_ICONINFORMATION;
+        msgParams.dwStyle |= MB_ICONINFORMATION;
        break;
    case MpWarn:
-        flags |= MB_ICONWARNING;
+        msgParams.dwStyle |= MB_ICONWARNING;
        break;
    case MpError:
-        flags |= MB_ICONERROR;
+        msgParams.dwStyle |= MB_ICONERROR;
        break;
    }
-    MessageBoxA(nullptr, message, "Moonlight Internet Streaming Tester", flags);
+    msgParams.lpfnMsgBoxCallback = MsgBoxHelpCallback;
+    msgParams.dwContextHelpId = (DWORD_PTR)helpUrl;
+    msgParams.dwLanguageId = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT);
+    MessageBoxIndirectA(&msgParams);

    if (priority != MpInfo && terminal) {
-        flags = MB_YESNO | MB_TOPMOST | MB_SETFOREGROUND | MB_ICONINFORMATION;
-        switch (MessageBoxA(nullptr, "Would you like to view the troubleshooting log?",
+        UINT flags = MB_YESNO | MB_TOPMOST | MB_SETFOREGROUND | MB_ICONINFORMATION;
+        switch (MessageBoxA(nullptr, "Would you like to view the troubleshooting log?\n\nYou will need to provide this log if you ask for help on the Moonlight Discord server.",
            "Moonlight Internet Streaming Tester", flags))
        {
        case IDYES:
@@ -106,6 +188,56 @@ void DisplayMessage(const char* message, MessagePriority priority = MpError, boo
    }
 }

+bool ExecuteCommand(PCSTR command, PCHAR outputBuffer, DWORD outputBufferLength)
+{
+    SECURITY_ATTRIBUTES attribs;
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    HANDLE outReadHandle;
+    DWORD bytesRead = 0;
+
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+    si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
+    si.wShowWindow = SW_HIDE;
+
+    ZeroMemory(&attribs, sizeof(attribs));
+    attribs.nLength = sizeof(attribs);
+    attribs.bInheritHandle = TRUE;
+
+    if (!CreatePipe(&outReadHandle, &si.hStdOutput, &attribs, 0))
+    {
+        fprintf(LOG_OUT, "CreatePipe() failed: %d\n", GetLastError());
+        return false;
+    }
+
+    si.hStdError = si.hStdOutput;
+
+    if (!CreateProcess(NULL, (LPSTR)command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
+    {
+        fprintf(LOG_OUT, "CreateProcess() failed: %d\n", GetLastError());
+        CloseHandle(si.hStdOutput);
+        return false;
+    }
+
+    WaitForSingleObject(pi.hProcess, INFINITE);
+
+    CloseHandle(si.hStdOutput);
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+
+    if (!ReadFile(outReadHandle, outputBuffer, outputBufferLength, &bytesRead, NULL))
+    {
+        fprintf(LOG_OUT, "ReadFile() failed: %d\n", GetLastError());
+        CloseHandle(outReadHandle);
+        return false;
+    }
+
+    outputBuffer[bytesRead] = 0;
+    CloseHandle(outReadHandle);
+    return true;
+}
+
 bool IsGameStreamEnabled()
 {
    DWORD error;
@@ -115,8 +247,9 @@ bool IsGameStreamEnabled()

    error = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\NVIDIA Corporation\\NvStream", 0, KEY_READ | KEY_WOW64_64KEY, &key);
    if (error != ERROR_SUCCESS) {
-        printf("RegOpenKeyEx() failed: %d\n", error);
-        DisplayMessage("GeForce Experience was not detected on this PC. Make sure you're installing this utility on your GeForce GameStream-compatible PC, not the device running Moonlight.");
+        fprintf(LOG_OUT, "RegOpenKeyEx() failed: %d\n", error);
+        DisplayMessage("GeForce Experience was not detected on this PC. Make sure you're installing this utility on your GeForce GameStream-compatible PC, not the device running Moonlight.",
+            "https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide");
        return false;
    }

@@ -126,37 +259,201 @@ bool IsGameStreamEnabled()
    if (error != ERROR_SUCCESS || !enabled) {
        // GFE may not even write EnableStreaming until the user enables GameStream for the first time
        if (error != ERROR_SUCCESS) {
-            printf("RegQueryValueExA() failed: %d\n", error);
+            fprintf(LOG_OUT, "RegQueryValueExA() failed: %d\n", error);
        }
-        DisplayMessage("GameStream is not enabled in GeForce Experience. Please open GeForce Experience settings, navigate to the Shield tab, and turn GameStream on.");
+        DisplayMessage("GameStream is not enabled in GeForce Experience. Please open GeForce Experience settings, navigate to the Shield tab, and turn GameStream on.",
+            "https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide");
        return false;
    }
    else {
-        printf("GeForce Experience installed and GameStream is enabled\n");
+        fprintf(LOG_OUT, "GeForce Experience installed and GameStream is enabled\n");
        return true;
    }
 }

+bool IsCurrentlyStreaming()
+{
+    bool ret = false;
+    HANDLE processSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+
+    PROCESSENTRY32 procEntry;
+    procEntry.dwSize = sizeof(procEntry);
+    Process32First(processSnapshot, &procEntry);
+
+    do {
+        // If we find nvstreamer.exe running, we're currently streaming
+        if (_stricmp(procEntry.szExeFile, "nvstreamer.exe") == 0) {
+            ret = true;
+            break;
+        }
+    } while (Process32Next(processSnapshot, &procEntry));
+
+    CloseHandle(processSnapshot);
+
+    return ret;
+}
+
+bool IsConsoleSessionActive()
+{
+    PWTS_SESSION_INFO_1 sessionInfo;
+    DWORD sessionCount;
+    DWORD level;
+    bool ret;
+    DWORD activeSessionId = WTSGetActiveConsoleSessionId();
+
+    if (activeSessionId == 0xFFFFFFFF) {
+        fprintf(LOG_OUT, "No active console session detected\n");
+        return false;
+    }
+
+    level = 1;
+    if (!WTSEnumerateSessionsEx(WTS_CURRENT_SERVER_HANDLE, &level, 0, &sessionInfo, &sessionCount)) {
+        fprintf(LOG_OUT, "WTSEnumerateSessionsEx() failed: %d\n", GetLastError());
+        return false;
+    }
+
+    ret = false;
+    for (int i = 0; i < sessionCount; i++)
+    {
+        if (sessionInfo[i].SessionId == activeSessionId) {
+            if (sessionInfo[i].pUserName != nullptr) {
+                fprintf(LOG_OUT, "Session %d has active user\n", sessionInfo[i].SessionId);
+                ret = true;
+                break;
+            }
+        }
+    }
+
+    WTSFreeMemoryExW(WTSTypeSessionInfoLevel1, sessionInfo, sessionCount);
+    return ret;
+}
+
+bool IsSleepEnabled()
+{
+    SYSTEM_POWER_POLICY powerPolicy;
+
+    if (CallNtPowerInformation(SystemPowerPolicyAc, NULL, 0, &powerPolicy, sizeof(powerPolicy)) < 0) {
+        return false;
+    }
+
+    return powerPolicy.IdleTimeout != 0 && powerPolicy.Idle.Action == PowerActionSleep;
+}
+
+bool IsHibernationEnabled()
+{
+    SYSTEM_POWER_POLICY powerPolicy;
+
+    if (CallNtPowerInformation(SystemPowerPolicyAc, NULL, 0, &powerPolicy, sizeof(powerPolicy)) < 0) {
+        return false;
+    }
+
+    return powerPolicy.DozeS4Timeout != 0 || (powerPolicy.IdleTimeout != 0 && powerPolicy.Idle.Action == PowerActionHibernate);
+}
+
+bool IsLocalNetworkAccessBlocked()
+{
+    MIB_IPFORWARDROW route;
+    DWORD error;
+    SOCKADDR_IN sin;
+    SOCKET s;
+    
+    error = GetBestRoute(0, 0, &route);
+    if (error != NO_ERROR) {
+        fprintf(LOG_OUT, "GetBestRoute() failed: %d\n", error);
+        return false;
+    }
+
+    s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (s == INVALID_SOCKET) {
+        fprintf(LOG_OUT, "socket() failed: %d\n", error);
+        return false;
+    }
+
+    RtlZeroMemory(&sin, sizeof(sin));
+    sin.sin_family = AF_INET;
+    sin.sin_addr.S_un.S_addr = route.dwForwardNextHop;
+    sin.sin_port = htons(80);
+
+    if (connect(s, (PSOCKADDR)&sin, sizeof(sin)) == 0) {
+        error = NO_ERROR;
+        fprintf(LOG_OUT, "connect(%s, %d) successful\n", inet_ntoa(sin.sin_addr), ntohs(sin.sin_port));
+    }
+    else {
+        error = WSAGetLastError();
+        fprintf(LOG_OUT, "connect(%s, %d) failed: %d\n", inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), error);
+    }
+
+    closesocket(s);
+
+    return error == WSAEACCES;
+}
+
+bool IsZeroTierInstalled()
+{
+    DWORD error;
+    HKEY key;
+
+    error = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ZeroTier, Inc.\\ZeroTier One", 0, KEY_READ | KEY_WOW64_32KEY, &key);
+    if (error != ERROR_SUCCESS) {
+        return false;
+    }
+
+    RegCloseKey(key);
+    return true;
+}
+
+PIP_ADAPTER_ADDRESSES
+AllocAndGetAdaptersAddresses(ULONG Family, ULONG Flags)
+{
+    PIP_ADAPTER_ADDRESSES addresses;
+    ULONG length;
+    ULONG error;
+
+    addresses = NULL;
+    length = GAA_INITIAL_SIZE;
+    do {
+        free(addresses);
+        addresses = (PIP_ADAPTER_ADDRESSES)malloc(length);
+        if (addresses == NULL) {
+            fprintf(LOG_OUT, "malloc(%u) failed\n", length);
+            return NULL;
+        }
+
+        error = GetAdaptersAddresses(Family, Flags, NULL, addresses, &length);
+    } while (error == ERROR_BUFFER_OVERFLOW);
+
+    if (error != ERROR_SUCCESS) {
+        fprintf(LOG_OUT, "GetAdaptersAddresses() failed: %d\n", error);
+        free(addresses);
+        return NULL;
+    }
+
+    return addresses;
+}
+
+
 enum PortTestStatus {
    PortTestOk,
    PortTestError,
    PortTestUnknown
 };
-PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withServer)
+PortTestStatus TestPort(PSOCKADDR_STORAGE addr, PSOCKADDR_STORAGE localBindAddr, int proto, int port, bool withServer, bool isLoopbackRelay, bool mtuTest)
 {
    SOCKET clientSock = INVALID_SOCKET, serverSock = INVALID_SOCKET;
    int err;

    clientSock = socket(addr->ss_family, proto == IPPROTO_TCP ? SOCK_STREAM : SOCK_DGRAM, proto);
    if (clientSock == INVALID_SOCKET) {
-        printf("socket() failed: %d\n", WSAGetLastError());
+        fprintf(LOG_OUT, "socket() failed: %d\n", WSAGetLastError());
        return PortTestError;
    }

    if (withServer) {
-        serverSock = socket(addr->ss_family, proto == IPPROTO_TCP ? SOCK_STREAM : SOCK_DGRAM, proto);
+        // Even if we are testing IPv6, our server socket should still be on IPv4 to allow the
+        // IPv6 relay to do its job (since it's already bound to all GFE ports on v6)
+        serverSock = socket(AF_INET, proto == IPPROTO_TCP ? SOCK_STREAM : SOCK_DGRAM, proto);
        if (serverSock == INVALID_SOCKET) {
-            printf("socket() failed: %d\n", WSAGetLastError());
+            fprintf(LOG_OUT, "socket() failed: %d\n", WSAGetLastError());
            closesocket(clientSock);
            return PortTestError;
        }
@@ -168,21 +465,22 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
        if (err == SOCKET_ERROR) {
            if (WSAGetLastError() == WSAEADDRINUSE) {
                // If someone is already listening (perhaps GFE is currently streaming),
-                // we can proceed if it's a TCP connection.
-                if (proto == IPPROTO_TCP) {
+                // we can proceed if it's a TCP connection unless it's a loopback relay
+                // which would give us a false positive result.
+                if (proto == IPPROTO_TCP && !isLoopbackRelay) {
                    closesocket(serverSock);
                    serverSock = INVALID_SOCKET;
                }
                else {
                    // We can't continue to test for UDP ports.
-                    printf("Unknown (in use)\n");
+                    fprintf(LOG_OUT, "Unknown (in use)\n");
                    closesocket(clientSock);
                    closesocket(serverSock);
                    return PortTestUnknown;
                }
            }
            else {
-                printf("bind() failed: %d\n", WSAGetLastError());
+                fprintf(LOG_OUT, "bind() failed: %d\n", WSAGetLastError());
                closesocket(clientSock);
                closesocket(serverSock);
                return PortTestError;
@@ -192,7 +490,7 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
        if (proto == IPPROTO_TCP && serverSock != INVALID_SOCKET) {
            err = listen(serverSock, 1);
            if (err == SOCKET_ERROR) {
-                printf("listen() failed: %d\n", WSAGetLastError());
+                fprintf(LOG_OUT, "listen() failed: %d\n", WSAGetLastError());
                closesocket(clientSock);
                closesocket(serverSock);
                return PortTestError;
@@ -200,10 +498,25 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
        }
    }

+    // Perform the explicit bind if a local address was provided
+    if (localBindAddr != nullptr) {
+        SOCKADDR_IN6 bind6;
+        int addrLen = localBindAddr->ss_family == AF_INET ?
+            sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6);
+
+        RtlCopyMemory(&bind6, localBindAddr, addrLen);
+        bind6.sin6_port = 0;
+
+        err = bind(clientSock, (struct sockaddr*)&bind6, addrLen);
+        if (err == SOCKET_ERROR) {
+            fprintf(LOG_OUT, "bind() failed: %d\n", WSAGetLastError());
+        }
+    }
+
    ULONG nbIo = 1;
    err = ioctlsocket(clientSock, FIONBIO, &nbIo);
    if (err == SOCKET_ERROR) {
-        printf("ioctlsocket() failed: %d\n", WSAGetLastError());
+        fprintf(LOG_OUT, "ioctlsocket() failed: %d\n", WSAGetLastError());
        closesocket(clientSock);
        if (serverSock != INVALID_SOCKET) {
            closesocket(serverSock);
@@ -216,32 +529,43 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
        sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6);

    RtlCopyMemory(&sin6, addr, addrLen);
-    sin6.sin6_port = htons(port);
+    sin6.sin6_port = htons(port + (isLoopbackRelay ? LOOPBACK_SERVER_PORT_OFFSET : 0));

    if (proto == IPPROTO_TCP) {
        err = connect(clientSock, (struct sockaddr*)&sin6, addrLen);
        if (err == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) {
-            printf("connect() failed: %d\n", WSAGetLastError());
+            fprintf(LOG_OUT, "connect() failed: %d\n", WSAGetLastError());
        }
        else {
            struct timeval timeout = {};
            fd_set fds;

            FD_ZERO(&fds);
-            FD_SET(clientSock, &fds);

+            if (serverSock != INVALID_SOCKET) {
+                FD_SET(serverSock, &fds);
+            }
+            else {
+                FD_SET(clientSock, &fds);
+            }
+
+            // If we have a server socket, listen for the accept() instead of the
+            // connect() so we can be compatible with the loopback relay.
            timeout.tv_sec = 3;
-            err = select(0, nullptr, &fds, nullptr, &timeout);
+            err = select(0,
+                serverSock != INVALID_SOCKET ? &fds : nullptr,
+                serverSock == INVALID_SOCKET ? &fds : nullptr,
+                nullptr, &timeout);
            if (err == 1) {
-                // Our FD was signalled for connect() completion
-                printf("Success\n");
+                // Our FD was signalled for connect() or accept() completion
+                fprintf(LOG_OUT, "Success\n");
            }
            else if (err == 0) {
                // Timed out
-                printf("Timeout\n");
+                fprintf(LOG_OUT, "Timeout\n");
            }
            else {
-                printf("select() failed: %d\n", WSAGetLastError());
+                fprintf(LOG_OUT, "select() failed: %d\n", WSAGetLastError());
            }
        }

@@ -253,13 +577,22 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
        return err == 1 ? PortTestOk : PortTestError;
    }
    else {
-        const char testMsg[] = "moonlight-test";
-        err = sendto(clientSock, testMsg, sizeof(testMsg), 0, (struct sockaddr*)&sin6, addrLen);
-        if (err == SOCKET_ERROR) {
-            printf("sendto() failed: %d\n", WSAGetLastError());
-            closesocket(clientSock);
-            closesocket(serverSock);
-            return PortTestError;
+        // Video packets are up to 1040 bytes.
+        const char testMsg[1040] = "moonlight-test";
+
+        // Send several test packets to ensure a random lost packet doesn't make the test fail
+        for (int i = 0; i < 5; i++) {
+            // Send the full payload for MTU tests and the truncated payload for other tests.
+            err = sendto(clientSock, testMsg,
+                mtuTest ? sizeof(testMsg) : strlen(testMsg), 0, (struct sockaddr*)&sin6, addrLen);
+            if (err == SOCKET_ERROR) {
+                fprintf(LOG_OUT, "sendto() failed: %d\n", WSAGetLastError());
+                closesocket(clientSock);
+                closesocket(serverSock);
+                return PortTestError;
+            }
+
+            Sleep(200);
        }

        struct timeval timeout = {};
@@ -268,18 +601,18 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
        FD_ZERO(&fds);
        FD_SET(serverSock, &fds);

-        timeout.tv_sec = 3;
+        timeout.tv_sec = 2;
        err = select(0, &fds, nullptr, nullptr, &timeout);
        if (err == 1) {
            // Our FD was signalled for data available
-            printf("Success\n");
+            fprintf(LOG_OUT, "Success\n");
        }
        else if (err == 0) {
            // Timed out
-            printf("Timeout\n");
+            fprintf(LOG_OUT, "Timeout\n");
        }
        else {
-            printf("select() failed: %d\n", WSAGetLastError());
+            fprintf(LOG_OUT, "select() failed: %d\n", WSAGetLastError());
        }

        closesocket(clientSock);
@@ -289,80 +622,448 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
    }
 }

-bool TestAllPorts(PSOCKADDR_STORAGE addr, char* portMsg, int portMsgLen)
+PortTestStatus TestHttpPort(PSOCKADDR_STORAGE addr, int port, bool isLoopbackRelay)
+{
+    HINTERNET hSession = nullptr;
+    HINTERNET hConnection = nullptr;
+    HINTERNET hRequest = nullptr;
+    PortTestStatus result;
+
+    hSession = WinHttpOpen(L"MIST", WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);
+    if (hSession == nullptr) {
+        fprintf(LOG_OUT, "WinHttpOpen() failed: %d\n", GetLastError());
+        result = PortTestError;
+        goto Exit;
+    }
+
+    // WinHTTP's default timeouts are very long. Set them to something more reasonable.
+    if (!WinHttpSetTimeouts(hSession, 0, 3000, 5000, 5000)) {
+        fprintf(LOG_OUT, "WinHttpSetTimeouts() failed: %d\n", GetLastError());
+    }
+
+    // Windows 8.1 enabled TLSv1.2 for WinHTTP by default (8.0 enables it for Schannel but not WinHTTP)
+    // https://docs.microsoft.com/en-us/security/engineering/solving-tls1-problem
+    if (!IsWindows8Point1OrGreater()) {
+        DWORD protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 |
+                          WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 |
+                          WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2;
+
+        if (!WinHttpSetOption(hSession, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols))) {
+            fprintf(LOG_OUT, "WinHttpSetOption(WINHTTP_OPTION_SECURE_PROTOCOLS) failed: %d\n", GetLastError());
+        }
+    }
+
+    WCHAR urlEscapedAddr[INET6_ADDRSTRLEN + 2];
+    if (addr->ss_family == AF_INET) {
+        InetNtopW(AF_INET, &((struct sockaddr_in*)addr)->sin_addr, urlEscapedAddr, ARRAYSIZE(urlEscapedAddr));
+    }
+    else {
+        // The address string must be escaped for usage in URLs
+        urlEscapedAddr[0] = L'[';
+        InetNtopW(AF_INET6, &((struct sockaddr_in6*)addr)->sin6_addr, &urlEscapedAddr[1], INET6_ADDRSTRLEN);
+        wcscat_s(urlEscapedAddr, L"]");
+    }
+
+    hConnection = WinHttpConnect(hSession, urlEscapedAddr, port + (isLoopbackRelay ? LOOPBACK_SERVER_PORT_OFFSET : 0), NULL);
+    if (hConnection == nullptr) {
+        fprintf(LOG_OUT, "WinHttpConnect() failed: %d\n", GetLastError());
+        result = PortTestError;
+        goto Exit;
+    }
+
+    hRequest = WinHttpOpenRequest(hConnection, L"GET", L"/", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES,
+                                  port == 47984 ? WINHTTP_FLAG_SECURE : 0);
+    if (hConnection == nullptr) {
+        fprintf(LOG_OUT, "WinHttpOpenRequest() failed: %d\n", GetLastError());
+        result = PortTestError;
+        goto Exit;
+    }
+
+    if (!WinHttpSendRequest(hRequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0) || !WinHttpReceiveResponse(hRequest, NULL)) {
+        if (GetLastError() == ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED) {
+            // This is expected for our HTTPS connection
+            fprintf(LOG_OUT, "Success\n");
+            result = PortTestOk;
+        }
+        else {
+            // CANNOT_CONNECT is the "expected" error
+            if (GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) {
+                fprintf(LOG_OUT, "Failed\n");
+            }
+            else {
+                fprintf(LOG_OUT, "Failed: %d\n", GetLastError());
+            }
+
+            result = PortTestError;
+        }
+
+        goto Exit;
+    }
+    else {
+        fprintf(LOG_OUT, "Success\n");
+        result = PortTestOk;
+    }
+
+Exit:
+    if (hRequest != nullptr) {
+        WinHttpCloseHandle(hRequest);
+    }
+    if (hConnection != nullptr) {
+        WinHttpCloseHandle(hConnection);
+    }
+    if (hSession != nullptr) {
+        WinHttpCloseHandle(hSession);
+    }
+
+    return result;
+}
+
+bool TestAllPorts(PSOCKADDR_STORAGE addr, PSOCKADDR_STORAGE localBindAddr, char* portMsg, int portMsgLen, bool isLoopbackRelay, bool consolePrint, bool* allPortsFailed = nullptr)
 {
    bool ret = true;

+    if (allPortsFailed) {
+        *allPortsFailed = true;
+    }
+
    for (int i = 0; i < ARRAYSIZE(k_Ports); i++) {
-        printf("Testing %s %d...",
-            k_Ports[i].proto == IPPROTO_TCP ? "TCP" : "UDP",
-            k_Ports[i].port);
-        PortTestStatus status = TestPort(addr, k_Ports[i].proto, k_Ports[i].port, k_Ports[i].withServer);
+        PortTestStatus status;
+
+        if (consolePrint) {
+            fprintf(CONSOLE_OUT, "\tTesting %s %d...\n",
+                k_Ports[i].proto == IPPROTO_TCP ? "TCP" : "UDP",
+                k_Ports[i].port);
+        }
+
+        if (!k_Ports[i].withServer && (localBindAddr == nullptr || localBindAddr->ss_family == AF_INET)) {
+            // Test using a real HTTP client if the port wasn't totally dead.
+            // This is required to confirm functionality with the loopback relay.
+            // NB: We can't do this with IPv6 because we're not guaranteed that our outbound traffic
+            // will go out on the correct local IPv6 address, preventing a response from making
+            // it back.
+            assert(k_Ports[i].proto == IPPROTO_TCP);
+            fprintf(LOG_OUT, "Testing TCP %d with HTTP traffic...", k_Ports[i].port);
+            status = TestHttpPort(addr, k_Ports[i].port, isLoopbackRelay);
+        }
+        else {
+            fprintf(LOG_OUT, "Testing %s %d...",
+                k_Ports[i].proto == IPPROTO_TCP ? "TCP" : "UDP",
+                k_Ports[i].port);
+            status = TestPort(addr, localBindAddr, k_Ports[i].proto, k_Ports[i].port,
+                k_Ports[i].withServer, isLoopbackRelay, k_Ports[i].port == 47998);
+        }
+
        if (status != PortTestOk) {
            // If we got an unknown result, assume it matches with whatever
            // we've gotten so far.
            if (status == PortTestError || !ret) {
-                int msgLen = snprintf(portMsg, portMsgLen, "%s %d\n",
-                    k_Ports[i].proto == IPPROTO_TCP ? "TCP" : "UDP",
-                    k_Ports[i].port);
-                portMsg += msgLen;
-                portMsgLen -= msgLen;
+                if (portMsg != NULL && portMsgLen > 0) {
+                    int msgLen = snprintf(portMsg, portMsgLen, "%s %d\n",
+                        k_Ports[i].proto == IPPROTO_TCP ? "TCP" : "UDP",
+                        k_Ports[i].port);
+                    portMsg += msgLen;
+                    portMsgLen -= msgLen;
+                }

                // Keep going to check all ports and report the failing ones
                ret = false;
            }
        }
+        else if (allPortsFailed) {
+            *allPortsFailed = false;
+        }
    }

    return ret;
 }

-bool FindLocalInterfaceIP4Address(PSOCKADDR_IN addr)
+bool IsTestServerReachable(struct addrinfo* addrinfo, unsigned short port)
 {
    SOCKET s;
-    struct hostent* host;
+    FD_SET writeFds, exceptFds;
+    int err;
+    struct timeval tv = {};
+    SOCKADDR_STORAGE addr;
+    char testServerStr[INET6_ADDRSTRLEN];

-    printf("Finding local IP address...");
+    memcpy(&addr, addrinfo->ai_addr, addrinfo->ai_addrlen);
+    ((PSOCKADDR_IN6)&addr)->sin6_port = htons(port);

-    host = gethostbyname("google.com");
-    if (host == nullptr) {
-        printf("gethostbyname() failed: %d\n", WSAGetLastError());
-        return false;
+    if (addr.ss_family == AF_INET) {
+        inet_ntop(AF_INET, &((struct sockaddr_in*)&addr)->sin_addr, testServerStr, sizeof(testServerStr));
+    }
+    else {
+        inet_ntop(AF_INET6, &((struct sockaddr_in6*)&addr)->sin6_addr, testServerStr, sizeof(testServerStr));
    }

-    s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    fprintf(LOG_OUT, "Testing reachability of relay server %s...", testServerStr);
+
+    s = socket(addrinfo->ai_family, SOCK_STREAM, IPPROTO_TCP);
    if (s == INVALID_SOCKET) {
-        printf("socket() failed: %d\n", WSAGetLastError());
+        fprintf(LOG_OUT, "socket() failed: %d\n", WSAGetLastError());
        return false;
    }

-    SOCKADDR_IN sin = {};
-    sin.sin_family = AF_INET;
-    sin.sin_port = htons(443);
-    sin.sin_addr = *(struct in_addr*)host->h_addr;
-    int err = connect(s, (struct sockaddr*)&sin, sizeof(sin));
+    ULONG nbIo = 1;
+    err = ioctlsocket(s, FIONBIO, &nbIo);
    if (err == SOCKET_ERROR) {
-        printf("connect() failed: %d\n", WSAGetLastError());
+        fprintf(LOG_OUT, "ioctlsocket() failed: %d\n", WSAGetLastError());
        closesocket(s);
        return false;
    }

+    err = connect(s, (PSOCKADDR)&addr, addrinfo->ai_addrlen);
+    if (err == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) {
+        fprintf(LOG_OUT, "Unreachable (%d)\n", WSAGetLastError());
+        closesocket(s);
+        return false;
+    }
+
+    FD_ZERO(&writeFds);
+    FD_ZERO(&exceptFds);
+
+    FD_SET(s, &writeFds);
+    FD_SET(s, &exceptFds);
+
+    tv.tv_sec = 3;
+    err = select(0, nullptr, &writeFds, &exceptFds, &tv);
+    if (err == SOCKET_ERROR) {
+        fprintf(LOG_OUT, "select() failed: %d\n", WSAGetLastError());
+        closesocket(s);
+        return false;
+    }
+    else if (err == 0) {
+        fprintf(LOG_OUT, "Unreachable (timeout)\n");
+        closesocket(s);
+        return false;
+    }
+    else {
+        int optlen = sizeof(err);
+        getsockopt(s, SOL_SOCKET, SO_ERROR, (char*)&err, &optlen);
+        closesocket(s);
+
+        if (err != 0 || FD_ISSET(s, &exceptFds)) {
+            fprintf(LOG_OUT, "Unreachable (%d)\n", err);
+            return false;
+        }
+
+        fprintf(LOG_OUT, "Reachable\n");
+        return true;
+    }
+}
+
+bool FindLocalInterfaceIPAddress(int family, PSOCKADDR_STORAGE addr)
+{
+    SOCKET s;
+    struct addrinfo hint = {};
+    struct addrinfo* result;
+    int err;
+
+    fprintf(LOG_OUT, "Finding local %s address...", family == AF_INET ? "IPv4" : "IPv6");
+
+    hint.ai_family = family;
+    hint.ai_socktype = SOCK_STREAM;
+    hint.ai_protocol = IPPROTO_TCP;
+    hint.ai_flags = AI_ADDRCONFIG;
+    err = getaddrinfo("moonlight-stream.org", "443", &hint, &result);
+    if (err != 0 || result == NULL) {
+        // AI_ADDRCONFIG will mask unusable addresses, so we may get nothing
+        // We get WSANO_DATA or WSAHOST_NOT_FOUND depending on whether it's V4 or V6 :(
+        if (err == WSANO_DATA || err == WSAHOST_NOT_FOUND) {
+            fprintf(LOG_OUT, "NONE\n");
+        }
+        else {
+            fprintf(LOG_OUT, "getaddrinfo() failed: %d\n", err);
+        }
+        return false;
+    }
+
+    s = socket(result->ai_family, result->ai_socktype, result->ai_protocol);
+    if (s == INVALID_SOCKET) {
+        fprintf(LOG_OUT, "socket() failed: %d\n", WSAGetLastError());
+        freeaddrinfo(result);
+        return false;
+    }
+
+    err = connect(s, (struct sockaddr*)result->ai_addr, result->ai_addrlen);
+    if (err == SOCKET_ERROR) {
+        fprintf(LOG_OUT, "connect() failed: %d\n", WSAGetLastError());
+        closesocket(s);
+        freeaddrinfo(result);
+        return false;
+    }
+
+    freeaddrinfo(result);
+
    // Determine which local interface we bound to
    int nameLen = sizeof(*addr);
    err = getsockname(s, (struct sockaddr*)addr, &nameLen);
    if (err == SOCKET_ERROR) {
-        printf("getsockname() failed: %d\n", WSAGetLastError());
+        fprintf(LOG_OUT, "getsockname() failed: %d\n", WSAGetLastError());
        closesocket(s);
        return false;
    }

-    char addrStr[64];
-    inet_ntop(AF_INET, &addr->sin_addr, addrStr, sizeof(addrStr));
-    printf("%s\n", addrStr);
+    char addrStr[INET6_ADDRSTRLEN];
+    if (addr->ss_family == AF_INET) {
+        inet_ntop(AF_INET, &((struct sockaddr_in*)addr)->sin_addr, addrStr, sizeof(addrStr));
+    }
+    else {
+        // There may be multiple IPv6 addresses on this interface, and chances are that the
+        // outbound address is a temporary IPv6 address which is not meant to receive traffic.
+        // Let's look up a suitable address by finding the correct interface and looking for
+        // an address with a non-random suffix.
+
+        PIP_ADAPTER_ADDRESSES addresses;
+        PIP_ADAPTER_ADDRESSES currentAdapter;
+        PIP_ADAPTER_UNICAST_ADDRESS currentAddress;
+        
+        addresses = AllocAndGetAdaptersAddresses(AF_UNSPEC,
+            GAA_FLAG_SKIP_ANYCAST |
+            GAA_FLAG_SKIP_MULTICAST |
+            GAA_FLAG_SKIP_DNS_SERVER |
+            GAA_FLAG_SKIP_FRIENDLY_NAME);
+        if (addresses == NULL) {
+            return false;
+        }
+
+        // First, find the interface that owns the incoming address
+        currentAdapter = addresses;
+        while (currentAdapter != NULL) {
+            // Check if this interface has the IPv6 address we want
+            currentAddress = currentAdapter->FirstUnicastAddress;
+            while (currentAddress != NULL) {
+                if (currentAddress->Address.lpSockaddr->sa_family == AF_INET6) {
+                    PSOCKADDR_IN6 ifaceAddrV6 = (PSOCKADDR_IN6)currentAddress->Address.lpSockaddr;
+                    if (RtlEqualMemory(&((struct sockaddr_in6*)addr)->sin6_addr, &ifaceAddrV6->sin6_addr, sizeof(IN6_ADDR))) {
+                        break;
+                    }
+                }
+
+                currentAddress = currentAddress->Next;
+            }
+
+            if (currentAddress != NULL) {
+                // It does, bail out
+                break;
+            }
+
+            currentAdapter = currentAdapter->Next;
+        }
+
+        // Check if we found the incoming interface. If not, we'll
+        // just return the IP address as given from getsockname().
+        if (currentAdapter != NULL) {
+            // Now find a non-privacy/non-LL IPv6 address on this interface
+            currentAddress = currentAdapter->FirstUnicastAddress;
+            while (currentAddress != NULL) {
+                if (currentAddress->Address.lpSockaddr->sa_family == AF_INET6) {
+                    // Exclude link-local and privacy addresses and deprecated addresses
+                    PSOCKADDR_IN6 currentAddrV6 = (PSOCKADDR_IN6)currentAddress->Address.lpSockaddr;
+                    if (currentAddrV6->sin6_scope_id == 0 &&
+                        currentAddress->SuffixOrigin != IpSuffixOriginRandom &&
+                        currentAddress->DadState != IpDadStateDeprecated) {
+                        RtlCopyMemory(addr, currentAddress->Address.lpSockaddr, currentAddress->Address.iSockaddrLength);
+                        break;
+                    }
+                }
+
+                currentAddress = currentAddress->Next;
+            }
+        }
+
+        free(addresses);
+
+        inet_ntop(AF_INET6, &((struct sockaddr_in6*)addr)->sin6_addr, addrStr, sizeof(addrStr));
+    }
+    fprintf(LOG_OUT, "%s\n", addrStr);

    return true;
 }

+bool FindZeroTierInterfaceAddress(PSOCKADDR_STORAGE addr)
+{
+    PIP_ADAPTER_ADDRESSES addresses;
+    PIP_ADAPTER_ADDRESSES currentAdapter;
+    PIP_ADAPTER_UNICAST_ADDRESS currentAddress;
+
+    // Get all IPv4 interfaces
+    addresses = AllocAndGetAdaptersAddresses(AF_INET,
+        GAA_FLAG_SKIP_ANYCAST |
+        GAA_FLAG_SKIP_MULTICAST |
+        GAA_FLAG_SKIP_DNS_SERVER |
+        GAA_FLAG_SKIP_FRIENDLY_NAME);
+    if (addresses == nullptr) {
+        return false;
+    }
+
+    currentAdapter = addresses;
+    while (currentAdapter != NULL) {
+        // Look for ones that correspond to a ZeroTier device
+        if (wcsstr(currentAdapter->Description, L"ZeroTier")) {
+            // Check if this interface has the IP address we want
+            currentAddress = currentAdapter->FirstUnicastAddress;
+            while (currentAddress != NULL) {
+                if (currentAddress->Address.lpSockaddr->sa_family == AF_INET) {
+                    RtlCopyMemory(addr, currentAddress->Address.lpSockaddr, currentAddress->Address.iSockaddrLength);
+                    free(addresses);
+                    return true;
+                }
+
+                currentAddress = currentAddress->Next;
+            }
+        }
+
+        currentAdapter = currentAdapter->Next;
+    }
+
+    free(addresses);
+    return false;
+}
+
+bool FindDuplicateDefaultInterfaces(void)
+{
+    PIP_ADAPTER_ADDRESSES addresses;
+    ULONG error;
+    MIB_IPFORWARDROW defaultRoute;
+    PIP_ADAPTER_ADDRESSES currentAdapter;
+    DWORD matchingInterfaces = 0;
+
+    error = GetBestRoute(0, 0, &defaultRoute);
+    if (error != NO_ERROR) {
+        fprintf(LOG_OUT, "GetBestRoute() failed: %d\n", error);
+        return false;
+    }
+
+    // Get all IPv4 interfaces
+    addresses = AllocAndGetAdaptersAddresses(AF_INET,
+        GAA_FLAG_SKIP_UNICAST |
+        GAA_FLAG_SKIP_ANYCAST |
+        GAA_FLAG_SKIP_MULTICAST |
+        GAA_FLAG_SKIP_DNS_SERVER |
+        GAA_FLAG_INCLUDE_GATEWAYS |
+        GAA_FLAG_SKIP_FRIENDLY_NAME);
+    if (addresses == nullptr) {
+        return false;
+    }
+
+    currentAdapter = addresses;
+    while (currentAdapter != NULL) {
+        if (currentAdapter->OperStatus == IfOperStatusUp &&
+            currentAdapter->FirstGatewayAddress != NULL &&
+            currentAdapter->FirstGatewayAddress->Address.iSockaddrLength == sizeof(SOCKADDR_IN)) {
+            if (((PSOCKADDR_IN)currentAdapter->FirstGatewayAddress->Address.lpSockaddr)->sin_addr.S_un.S_addr == defaultRoute.dwForwardNextHop) {
+                matchingInterfaces++;
+            }
+        }
+
+        currentAdapter = currentAdapter->Next;
+    }
+
+    free(addresses);
+    return matchingInterfaces > 1;
+}
+
 enum UPnPPortStatus {
    NOT_FOUND,
    OK,
@@ -393,28 +1094,28 @@ UPnPPortStatus UPnPCheckPort(struct UPNPUrls* urls, struct IGDdatas* data, int p
        return ERRORED;
    }

-    printf("Checking for UPnP port mapping for %s %s -> %s...", protoStr, portStr, myAddr);
+    fprintf(LOG_OUT, "Checking for UPnP port mapping for %s %s -> %s...", protoStr, portStr, myAddr);
    int err = UPNP_GetSpecificPortMappingEntry(
        urls->controlURL, data->first.servicetype, portStr, protoStr, nullptr,
        intClient, intPort, desc, enabled, leaseDuration);
    if (err == 714) {
        // NoSuchEntryInArray
-        printf("NOT FOUND\n");
+        fprintf(LOG_OUT, "NOT FOUND\n");
        return NOT_FOUND;
    }
    else if (err == UPNPCOMMAND_SUCCESS) {
        if (!strcmp(myAddr, intClient)) {
-            printf("OK\n");
+            fprintf(LOG_OUT, "OK (Internal port: %s)\n", intPort);
            return OK;
        }
        else {
-            printf("CONFLICT - %s %s\n", desc, intClient);
+            fprintf(LOG_OUT, "CONFLICT - %s %s\n", desc, intClient);
            snprintf(conflictMessage, 128, "%s (%s)", desc, intClient);
            return CONFLICTED;
        }
    }
    else {
-        printf("ERROR %d\n", err);
+        fprintf(LOG_OUT, "ERROR %d\n", err);
        return ERRORED;
    }
 }
@@ -424,23 +1125,27 @@ bool CheckWANAccess(PSOCKADDR_IN wanAddr, PSOCKADDR_IN reportedWanAddr, bool* fo
    natpmp_t natpmp;
    bool foundUpnpIgd = false;

+    wanAddr->sin_family = AF_INET;
+    reportedWanAddr->sin_family = AF_INET;
    *foundPortForwardingRules = false;
    *igdDisconnected = false;

    bool gotReportedWanAddress = false;
    int natPmpErr = initnatpmp(&natpmp, 0, 0);
    if (natPmpErr != 0) {
-        printf("initnatpmp() failed: %d\n", natPmpErr);
+        fprintf(LOG_OUT, "initnatpmp() failed: %d\n", natPmpErr);
    }
    else {
        natPmpErr = sendpublicaddressrequest(&natpmp);
        if (natPmpErr < 0) {
-            printf("sendpublicaddressrequest() failed: %d\n", natPmpErr);
+            fprintf(LOG_OUT, "sendpublicaddressrequest() failed: %d\n", natPmpErr);
            closenatpmp(&natpmp);
        }
    }

    {
+        fprintf(CONSOLE_OUT, "\tTesting UPnP...\n");
+
        int upnpErr;
        struct UPNPDev* ipv4Devs = upnpDiscoverAll(5000, nullptr, nullptr, UPNP_LOCAL_PORT_ANY, 0, 2, &upnpErr);

@@ -456,19 +1161,19 @@ bool CheckWANAccess(PSOCKADDR_IN wanAddr, PSOCKADDR_IN reportedWanAddr, bool* fo
                if (ret == 2) {
                    *igdDisconnected = true;
                }
-                printf("Discovered UPnP IGD at: %s\n", urls.controlURL);
-                printf("Detecting WAN IP address via UPnP...");
+                fprintf(LOG_OUT, "Discovered UPnP IGD at: %s\n", urls.controlURL);
+                fprintf(LOG_OUT, "Detecting WAN IP address via UPnP...");
                ret = UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, wanAddrStr);
                if (ret == UPNPCOMMAND_SUCCESS && strlen(wanAddrStr) > 0) {
-                    reportedWanAddr->sin_addr.S_un.S_addr = wanAddr->sin_addr.S_un.S_addr = inet_addr(wanAddrStr);
-                    printf("%s\n", wanAddrStr);
+                    reportedWanAddr->sin_addr.S_un.S_addr = inet_addr(wanAddrStr);
+                    fprintf(LOG_OUT, "%s\n", wanAddrStr);

-                    if (wanAddr->sin_addr.S_un.S_addr != 0) {
+                    if (reportedWanAddr->sin_addr.S_un.S_addr != 0) {
                        gotReportedWanAddress = true;
                    }
                }
                else {
-                    printf("FAILED %d\n", ret);
+                    fprintf(LOG_OUT, "FAILED %d\n", ret);
                }

                char conflictMessage[512];
@@ -484,7 +1189,7 @@ bool CheckWANAccess(PSOCKADDR_IN wanAddr, PSOCKADDR_IN reportedWanAddr, bool* fo
                    case CONFLICTED:
                        snprintf(conflictMessage, sizeof(conflictMessage),
                            "Detected a port forwarding conflict with another PC on your network: %s\n\n"
-                            "Remove that PC from your network or uninstall the Moonlight Internet Streaming Service from it, then restart your router.",
+                            "Remove that PC from your network or uninstall the Moonlight Internet Streaming Helper from it, then restart your router.",
                            conflictEntry);
                        DisplayMessage(conflictMessage);
                        return false;
@@ -494,30 +1199,32 @@ bool CheckWANAccess(PSOCKADDR_IN wanAddr, PSOCKADDR_IN reportedWanAddr, bool* fo
                }
            }
            else {
-                printf("No UPnP IGD detected\n");
+                fprintf(LOG_OUT, "No UPnP IGD detected\n");
            }

            FreeUPNPUrls(&urls);
        }
        else {
-            printf("No UPnP devices detected\n");
+            fprintf(LOG_OUT, "No UPnP devices detected\n");
        }
    }

    // Use the delay of upnpDiscoverAll() to also allow the NAT-PMP endpoint time to respond
    if (natPmpErr >= 0) {
-        printf("Detecting WAN IP address via NAT-PMP...");
+        fprintf(CONSOLE_OUT, "\tTesting NAT-PMP...\n");
+
+        fprintf(LOG_OUT, "Detecting WAN IP address via NAT-PMP...");

        natpmpresp_t response;
        natPmpErr = readnatpmpresponseorretry(&natpmp, &response);
        closenatpmp(&natpmp);

        if (natPmpErr == 0) {
-            char addrStr[64];
-            reportedWanAddr->sin_addr = wanAddr->sin_addr = response.pnu.publicaddress.addr;
+            char addrStr[INET_ADDRSTRLEN];
+            reportedWanAddr->sin_addr = response.pnu.publicaddress.addr;
            inet_ntop(AF_INET, &response.pnu.publicaddress.addr, addrStr, sizeof(addrStr));
-            printf("%s\n", addrStr);
-            if (wanAddr->sin_addr.S_un.S_addr != 0) {
+            fprintf(LOG_OUT, "%s\n", addrStr);
+            if (reportedWanAddr->sin_addr.S_un.S_addr != 0) {
                gotReportedWanAddress = true;
                
                if (!foundUpnpIgd) {
@@ -528,21 +1235,21 @@ bool CheckWANAccess(PSOCKADDR_IN wanAddr, PSOCKADDR_IN reportedWanAddr, bool* fo
            }
        }
        else {
-            printf("FAILED %d\n", natPmpErr);
+            fprintf(LOG_OUT, "FAILED %d\n", natPmpErr);
        }
    }

-    printf("Detecting WAN IP address via STUN...");
-    if (!getExternalAddressPortIP4(IPPROTO_UDP, 0, wanAddr)) {
-        if (!gotReportedWanAddress) {
-            DisplayMessage("Unable to determine your public IP address. Please check your Internet connection.");
-            return false;
-        }
+    fprintf(LOG_OUT, "Detecting WAN IP address via STUN...");
+    fprintf(CONSOLE_OUT, "\tTesting STUN...\n");
+
+    if (!getExternalAddressPortIP4(0, wanAddr)) {
+        DisplayMessage("Unable to determine your public IP address. Please check your Internet connection or try again in a few minutes.");
+        return false;
    }
    else {
-        char addrStr[64];
+        char addrStr[INET_ADDRSTRLEN];
        inet_ntop(AF_INET, &wanAddr->sin_addr, addrStr, sizeof(addrStr));
-        printf("%s\n", addrStr);
+        fprintf(LOG_OUT, "%s\n", addrStr);

        if (!gotReportedWanAddress) {
            // If we didn't get anything from UPnP or NAT-PMP, just populate the reported
@@ -554,16 +1261,12 @@ bool CheckWANAccess(PSOCKADDR_IN wanAddr, PSOCKADDR_IN reportedWanAddr, bool* fo
    return true;
 }

-bool IsPossibleCGN(PSOCKADDR_IN wanAddr)
+bool IsCGN(PSOCKADDR_IN wanAddr)
 {
    DWORD addr = htonl(wanAddr->sin_addr.S_un.S_addr);

-    // 10.0.0.0/8 - ISPs used to use this
-    if ((addr & 0xFF000000) == 0x0A000000) {
-        return true;
-    }
    // 100.64.0.0/10 - RFC6598 official CGN address
-    else if ((addr & 0xFFC00000) == 0x64400000) {
+    if ((addr & 0xFFC00000) == 0x64400000) {
        return true;
    }

@@ -593,18 +1296,25 @@ bool IsDoubleNAT(PSOCKADDR_IN wanAddr)
 int main(int argc, char* argv[])
 {
    WSADATA wsaData;
+    SYSTEMTIME time;
+    char timeString[MAX_PATH + 1] = {};

    char tempPath[MAX_PATH + 1];
    GetTempPathA(sizeof(tempPath), tempPath);

    snprintf(logFilePath, sizeof(logFilePath), "%s\\%s", tempPath, "mis-test.log");
-    freopen(logFilePath, "w", stdout);
+    freopen(logFilePath, "w", LOG_OUT);

    // Print a log header
-    printf("Moonlight Internet Streaming Tester v" VER_VERSION_STR "\n");
+    fprintf(LOG_OUT, "Moonlight Internet Streaming Tester v" VER_VERSION_STR "\n");
+
+    // Print the current time
+    GetSystemTime(&time);
+    GetTimeFormatA(LOCALE_SYSTEM_DEFAULT, 0, &time, "hh':'mm':'ss tt", timeString, ARRAYSIZE(timeString));
+    fprintf(LOG_OUT, "The current UTC time is: %s\n", timeString);

    // Print a console header
-    fprintf(stderr, "Moonlight Internet Streaming Tester v" VER_VERSION_STR "\n\n");
+    fprintf(CONSOLE_OUT, "Moonlight Internet Streaming Tester v" VER_VERSION_STR "\n\n");

    int err = WSAStartup(MAKEWORD(2, 2), &wsaData);
    if (err != NO_ERROR) {
@@ -612,13 +1322,71 @@ int main(int argc, char* argv[])
        return err;
    }

-    fprintf(stderr, "Checking if GameStream is enabled...\n");
+    fprintf(CONSOLE_OUT, "Checking if GameStream is enabled...\n");

    // First check if GameStream is enabled
    if (!IsGameStreamEnabled()) {
        return -1;
    }

+    if (IsCurrentlyStreaming()) {
+        DisplayMessage("The test cannot proceed because a GameStream session is currently running on this PC.\n\n"
+            "Quit the currently running app on this host within Moonlight, or reboot your PC.");
+        return -1;
+    }
+
+    if (!IsConsoleSessionActive()) {
+        DisplayMessage("The system display is currently locked. You must sign in to your PC again to use GameStream.\n\n"
+            "This is most often due to Microsoft Remote Desktop locking the screen. Use an alternate GameStream-compatible remote desktop solution like Chrome Remote Desktop or TeamViewer to unlock the PC and prevent this error in the future.",
+            "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#display-locked-error");
+        return -1;
+    }
+
+    fprintf(CONSOLE_OUT, "Checking power settings...\n");
+
+    if (IsSleepEnabled()) {
+        DisplayMessage("This computer has sleep mode enabled. Sleep mode may prevent this PC from being available for streaming.\n\n"
+            "Please ensure sleep is disabled in Power Options so this PC is always ready for streaming. Click the Help button for more information.",
+            "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#sleep-mode-enabled-warning", MpWarn, false);
+    }
+
+    if (IsHibernationEnabled()) {
+        DisplayMessage("This computer has hibernation enabled. Hibernation may prevent this PC from being available for streaming.\n\n"
+            "Please ensure hibernation is disabled in Power Options so this PC is always ready for streaming. Click the Help button for more information.",
+            "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#hibernation-enabled-warning", MpWarn, false);
+    }
+
+    fprintf(CONSOLE_OUT, "Checking network connections...\n");
+
+    if (IsLocalNetworkAccessBlocked()) {
+        DisplayMessage("Local network access appears to be blocked by another application installed on this PC.\n\n"
+            "If you have firewall or VPN software installed, make sure it is configured to allow applications to access the local network. Click the Help button for guidance on fixing this issue.",
+            "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#local-network-access-blocked-error");
+        return -1;
+    }
+
+    if (FindDuplicateDefaultInterfaces()) {
+        DisplayMessage("This computer appears to have more than one connection to the same network (like both WiFi and Ethernet, for example).\n\n"
+            "Please disconnect the extra connection(s) to ensure hosting works reliably over the Internet. If you are connected via WiFi and Ethernet, try disabling your WiFi connection.",
+            "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#multiple-connections-error", MpWarn, false);
+    }
+
+    fprintf(CONSOLE_OUT, "Checking for anti-virus and firewall software...\n");
+
+    char wmicBuf[8192];
+    if (ExecuteCommand("WMIC /Node:localhost /Namespace:\\\\root\\SecurityCenter2 Path AntiVirusProduct Get displayName", wmicBuf, sizeof(wmicBuf))) {
+        fprintf(LOG_OUT, "AV products:\n%s", wmicBuf);
+    }
+    if (ExecuteCommand("WMIC /Node:localhost /Namespace:\\\\root\\SecurityCenter2 Path FirewallProduct Get displayName", wmicBuf, sizeof(wmicBuf))) {
+        fprintf(LOG_OUT, "Firewall products:\n%s", wmicBuf);
+        if (strstr(wmicBuf, "displayName")) {
+            DisplayMessage("Detected anti-virus and/or firewall software installed on this system. This software may interfere with NVIDIA GameStream.\n\n"
+                "Please try temporarily disabling your anti-virus or firewall software if you experience connection issues with Moonlight.",
+                "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting#known-application-compatibility-issues", MpInfo, false);
+        }
+    }
+
+
    union {
        SOCKADDR_STORAGE ss;
        SOCKADDR_IN sin;
@@ -627,92 +1395,240 @@ int main(int argc, char* argv[])
    char msgBuf[2048];
    char portMsgBuf[512];

-    fprintf(stderr, "Testing local GameStream connectivity...\n");
+    fprintf(CONSOLE_OUT, "Testing GameStream connectivity on this PC...\n");

    // Try to connect via IPv4 loopback
    ss = {};
    sin.sin_family = AF_INET;
    sin.sin_addr = in4addr_loopback;
-    printf("Testing GameStream ports via loopback\n");
-    if (!TestAllPorts(&ss, portMsgBuf, sizeof(portMsgBuf))) {
+    fprintf(LOG_OUT, "Testing GameStream ports via loopback\n");
+    if (!TestAllPorts(&ss, nullptr, portMsgBuf, sizeof(portMsgBuf), false, true)) {
        snprintf(msgBuf, sizeof(msgBuf),
-            "Local GameStream connectivity check failed. Please try reinstalling GeForce Experience.\n\nThe following ports were not working:\n%s",
-            portMsgBuf);
-        DisplayMessage(msgBuf);
+            "Local GameStream connectivity check failed.\n\nFirst, try reinstalling GeForce Experience. If that doesn't resolve the problem, try temporarily disabling your antivirus and firewall.");
+        DisplayMessage(msgBuf, "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting");
        return -1;
    }
+    
+    // We do a special limited test pass for ZeroTier
+    if (IsZeroTierInstalled()) {
+        fprintf(LOG_OUT, "Found ZeroTier installed\n");

-    if (!FindLocalInterfaceIP4Address(&sin)) {
-        DisplayMessage("Unable to perform GameStream connectivity check. Please check your Internet connection and try again.");
-        return -1;
-    }
-
-    fprintf(stderr, "Testing network GameStream connectivity...\n");
-
-    // Try to connect via LAN IPv4 address
-    printf("Testing GameStream ports via local network\n");
-    if (!TestAllPorts(&ss, portMsgBuf, sizeof(portMsgBuf))) {
-        snprintf(msgBuf, sizeof(msgBuf),
-            "Local network GameStream connectivity check failed. Try temporarily disabling your firewall software or adding firewall exceptions for the following ports:\n%s",
-            portMsgBuf);
-        DisplayMessage(msgBuf);
-        return -1;
-    }
-
-    fprintf(stderr, "Detecting public IP address...\n");
-
-    bool rulesFound, igdDisconnected;
-    SOCKADDR_IN locallyReportedWanAddr;
-    if (!CheckWANAccess(&sin, &locallyReportedWanAddr, &rulesFound, &igdDisconnected)) {
-        return -1;
-    }
-
-    // Detect a double NAT by detecting STUN and and UPnP mismatches
-    if (sin.sin_addr.S_un.S_addr != locallyReportedWanAddr.sin_addr.S_un.S_addr) {
-        printf("Testing GameStream ports via UPnP/NAT-PMP reported WAN address\n");
-
-        // We don't actually care about the outcome here but it's nice to have in logs
-        // to determine whether solving the double NAT will actually make Moonlight work.
-        TestAllPorts((PSOCKADDR_STORAGE)&locallyReportedWanAddr, portMsgBuf, sizeof(portMsgBuf));
-
-        printf("Detected inconsistency between UPnP/NAT-PMP and STUN reported WAN addresses!\n");
-    }
-
-    fprintf(stderr, "Testing Internet GameStream connectivity...\n");
-
-    char wanAddrStr[64];
-    inet_ntop(AF_INET, &sin.sin_addr, wanAddrStr, sizeof(wanAddrStr));
-
-    // Try to connect via WAN IPv4 address
-    printf("Testing GameStream ports via STUN-reported WAN address\n");
-    if (!TestAllPorts(&ss, portMsgBuf, sizeof(portMsgBuf))) {
-        if (IsDoubleNAT(&locallyReportedWanAddr)) {
-            snprintf(msgBuf, sizeof(msgBuf), "Your router appears be connected to the Internet through another router. Make sure both routers have UPnP or NAT-PMP enabled, or better yet, switch one of the routers into bridge/AP mode.");
-            DisplayMessage(msgBuf);
-        }
-        else if (IsPossibleCGN(&locallyReportedWanAddr)) {
-            snprintf(msgBuf, sizeof(msgBuf), "Your ISP is running a Carrier-Grade NAT that is preventing you from hosting services like Moonlight on the Internet. Contact your ISP and ask for a dedicated public IP address.");
-            DisplayMessage(msgBuf);
-        }
-        else if (igdDisconnected) {
-            snprintf(msgBuf, sizeof(msgBuf), "Internet GameStream connectivity check failed. Make sure you don't have two devices acting as routers connected together.");
-            DisplayMessage(msgBuf);
-        }
-        else if (rulesFound) {
-            snprintf(msgBuf, sizeof(msgBuf), "Manual Internet streaming test required!\n\n"
-                "Connect your client device to a different network or cellular data (it MUST NOT on be the same network as this PC for testing!). If Moonlight doesn't automatically connect, you can type the following address into Moonlight's Add PC dialog: %s\n\n"
-                "If that doesn't work, check your router settings for any existing Moonlight port forwarding entries and delete them or try restarting your router.", wanAddrStr);
-            DisplayMessage(msgBuf, MpWarn);
+        if (!FindZeroTierInterfaceAddress(&ss)) {
+            DisplayMessage("ZeroTier appears to be installed on this PC, but it's not connected to a network.\n\n"
+                "If you are trying to host with ZeroTier, connect to your ZeroTier network and restart this test.\n\n"
+                "If not, click OK and this test will continue assuming you aren't using ZeroTier.",
+                "https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide#zerotier", MpInfo, false);
        }
        else {
-            snprintf(msgBuf, sizeof(msgBuf), "Internet GameStream connectivity check failed. Make sure UPnP or NAT-PMP is enabled in your router settings.\n\nThe following ports were not forwarded properly:\n%s", portMsgBuf);
-            DisplayMessage(msgBuf);
+            char zeroTierAddrStr[INET_ADDRSTRLEN];
+
+            inet_ntop(AF_INET, &sin.sin_addr, zeroTierAddrStr, sizeof(zeroTierAddrStr));
+
+            fprintf(LOG_OUT, "Found ZeroTier connected with address: %s\n", zeroTierAddrStr);
+
+            if (strstr(zeroTierAddrStr, "169.254.")) {
+                DisplayMessage("ZeroTier is active, but this PC has not been authorized to connect to your ZeroTier network.\n\n"
+                    "Make sure you check the Auth checkbox for all network members on the ZeroTier Networks webpage.",
+                    "https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide#zerotier");
+                return -1;
+            }
+
+            // Try to connect via ZeroTier address
+            fprintf(CONSOLE_OUT, "Testing GameStream connectivity using ZeroTier...\n");
+            fprintf(LOG_OUT, "Testing GameStream ports via ZeroTier\n");
+            if (!TestAllPorts(&ss, nullptr, portMsgBuf, sizeof(portMsgBuf), false, true)) {
+                snprintf(msgBuf, sizeof(msgBuf),
+                    "ZeroTier connectivity check failed. This is almost always caused by a firewall on your computer blocking the connection.\n\nTry temporarily disabling your antivirus and firewall.");
+                DisplayMessage(msgBuf, "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting");
+                return -1;
+            }
+
+            // If we get here, our testing is complete for ZeroTier
+            snprintf(msgBuf, sizeof(msgBuf), "This PC is ready to host over the Internet with ZeroTier!\n\n"
+                "Don't forget to connect to your ZeroTier network on your client before streaming over the Internet.\n\n"
+                "After connecting ZeroTier, type following address into Moonlight's Add PC dialog: %s", zeroTierAddrStr);
+            DisplayMessage(msgBuf, nullptr, MpInfo);
+            return 0;
        }
+    }
+
+    bool hasV4Connectivity, hasV6Connectivity;
+    SOCKADDR_STORAGE v4, v6;
+    {
+        hasV4Connectivity = FindLocalInterfaceIPAddress(AF_INET, &v4);
+        hasV6Connectivity = FindLocalInterfaceIPAddress(AF_INET6, &v6);
+
+        // Prefer v4 connectivity because that's what GFE uses natively
+        if (hasV4Connectivity) {
+            ss = v4;
+        }
+        else if (hasV6Connectivity) {
+            ss = v6;
+        }
+        else {
+            DisplayMessage("Unable to perform GameStream connectivity check. Please check your Internet connection and try again.");
+            return -1;
+        }
+    }
+
+    fprintf(CONSOLE_OUT, "Testing GameStream connectivity on your local network...\n");
+
+    // Try to connect via LAN address
+    fprintf(LOG_OUT, "Testing GameStream ports via local network\n");
+    if (!TestAllPorts(&ss, nullptr, portMsgBuf, sizeof(portMsgBuf), false, true)) {
+        snprintf(msgBuf, sizeof(msgBuf),
+            "Local network GameStream connectivity check failed. This is almost always caused by a firewall on your computer blocking the connection.\n\nTry temporarily disabling your antivirus and firewall.");
+        DisplayMessage(msgBuf, "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting");
        return -1;
    }

-    snprintf(msgBuf, sizeof(msgBuf), "All tests passed! If Moonlight doesn't automatically connect outside your network, you can type the following address into Moonlight's Add PC dialog: %s", wanAddrStr);
-    DisplayMessage(msgBuf, MpInfo);
+    bool igdDisconnected;
+    SOCKADDR_IN locallyReportedWanAddr;
+    char wanAddrStr[INET6_ADDRSTRLEN];

-    return 0;
+    if (ss.ss_family == AF_INET) {
+        bool rulesFound;
+
+        fprintf(CONSOLE_OUT, "Detecting public IP address...\n");
+
+        if (!CheckWANAccess(&sin, &locallyReportedWanAddr, &rulesFound, &igdDisconnected)) {
+            return -1;
+        }
+
+        // Detect a double NAT by detecting STUN and and UPnP mismatches
+        if (sin.sin_addr.S_un.S_addr != locallyReportedWanAddr.sin_addr.S_un.S_addr) {
+            fprintf(LOG_OUT, "Testing GameStream ports via UPnP/NAT-PMP reported WAN address\n");
+
+            // We don't actually care about the outcome here but it's nice to have in logs
+            // to determine whether solving the double NAT will actually make Moonlight work.
+            TestAllPorts((PSOCKADDR_STORAGE)&locallyReportedWanAddr, &ss, portMsgBuf, sizeof(portMsgBuf), false, false);
+
+            fprintf(LOG_OUT, "Detected inconsistency between UPnP/NAT-PMP and STUN reported WAN addresses!\n");
+        }
+
+        inet_ntop(AF_INET, &sin.sin_addr, wanAddrStr, sizeof(wanAddrStr));
+    }
+    else {
+        // Go directly to the relay check if we have only IPv6 connectivity
+        igdDisconnected = false;
+        locallyReportedWanAddr = {};
+    }
+
+    struct addrinfo hint = {};
+    struct addrinfo* result;
+
+    hint.ai_family = AF_UNSPEC;
+    hint.ai_flags = AI_ADDRCONFIG;
+    err = getaddrinfo("loopback-v2.moonlight-stream.org", NULL, &hint, &result);
+    if (err != 0 || result == NULL) {
+        fprintf(LOG_OUT, "getaddrinfo() failed: %d\n", err);
+    }
+    else {
+        bool testServerWasReachable = false;
+        bool allPortsFailedOnV4 = true;
+
+        // First try the relay server over IPv4. If this passes, it's considered a full success
+        fprintf(LOG_OUT, "Testing GameStream ports via IPv4 loopback server\n");
+        for (struct addrinfo* current = result; current != NULL; current = current->ai_next) {
+            if (current->ai_family == AF_INET) {
+                fprintf(CONSOLE_OUT, "Testing GameStream connectivity over the Internet using a relay server...\n");
+
+                if (!IsTestServerReachable(current, 443)) {
+                    fprintf(CONSOLE_OUT, "Skipping unreachable relay server...\n");
+                    continue;
+                }
+
+                testServerWasReachable = true;
+
+                if (TestAllPorts((PSOCKADDR_STORAGE)current->ai_addr, &v4, portMsgBuf, sizeof(portMsgBuf), true, true, &allPortsFailedOnV4)) {
+                    freeaddrinfo(result);
+                    snprintf(msgBuf, sizeof(msgBuf), "This PC is ready to host over the Internet!\n\n"
+                        "Do not uninstall the Moonlight Internet Hosting Tool, unless you no longer want to stream over the Internet. It needs to remain installed on your PC to maintain the port forwarding entries on your router.\n\n"
+                        "For the easiest setup, you can simply pair Moonlight to your gaming PC while they are both on the same network and Internet streaming will work automatically.\n\n"
+                        "If your client is not connected to the same network as your gaming PC, you can type the following address into Moonlight's Add PC dialog: %s",
+                        wanAddrStr);
+                    DisplayMessage(msgBuf, nullptr, MpInfo);
+                    return 0;
+                }
+                else {
+                    // Tested against a working server and it failed
+                    break;
+                }
+            }
+        }
+
+        // If that fails, try the relay server over IPv6. If this passes, it will be a partial success
+        fprintf(LOG_OUT, "Testing GameStream ports via IPv6 loopback server\n");
+        for (struct addrinfo* current = result; current != NULL; current = current->ai_next) {
+            if (current->ai_family == AF_INET6) {
+                fprintf(CONSOLE_OUT, "Testing GameStream connectivity over the Internet using an IPv6 relay server...\n");
+
+                if (!IsTestServerReachable(current, 443)) {
+                    fprintf(CONSOLE_OUT, "Skipping unreachable IPv6 relay server...\n");
+                    continue;
+                }
+
+                testServerWasReachable = true;
+
+                // Pass the portMsgBuf only if we've detected an IPv6-only setup. Otherwise, we want to preserve
+                // the failing ports from the IPv4 to display in the error dialog.
+                if (TestAllPorts((PSOCKADDR_STORAGE)current->ai_addr, &v6,
+                                    ss.ss_family == AF_INET6 ? portMsgBuf : NULL,
+                                    ss.ss_family == AF_INET6 ? sizeof(portMsgBuf) : 0, true, true)) {
+                    // We will terminate the test at the IPv6 limited connectivity warning in the following cases:
+                    // 1) Double-NAT/CGN - indicates the connection is fundamentally limited to IPv6 for end-to-end connectivity
+                    // 2) IPv6-only - indicates the connection is fundamentally limited to IPv6 for all connectivity
+                    // 3) All ports failed the test with our IPv4 relay - This is one final heuristic to weed out IPv4 misconfigurations. If we have some ports open,
+                    //                                                    it clearly indicates IPv4 support is possible, just currently misconfigured.
+                    //
+                    // Our last (implicit) heuristic is that we actually managed to establish an IPv6 connection. This means that there was either
+                    // no IPv6 firewall (hopefully not) or that we were able to talk to a PCP/IGDv6 gateway to allow us through. Hopefully if we have
+                    // a gateway that is unresponsive to UPnP/NAT-PMP, we wouldn't even be able to establish this connection so we would inherently fall
+                    // to the checks below for IPv4 issues.
+                    if (IsDoubleNAT(&locallyReportedWanAddr) || igdDisconnected || IsCGN(&locallyReportedWanAddr) || ss.ss_family == AF_INET6 || allPortsFailedOnV4) {
+                        snprintf(msgBuf, sizeof(msgBuf), "This PC has limited connectivity for Internet hosting. It will work only for clients on certain networks.\n\n"
+                            "If you want to try streaming with this configuration, you must pair Moonlight to your gaming PC from your home network before trying to stream over the Internet.\n\n"
+                            "To get full connectivity, please contact your ISP and ask for a \"public IPv4 address\" which they may offer for free upon request. For more information and workarounds, click the Help button.");
+                        DisplayMessage(msgBuf, "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#limited-connectivity-for-hosting-error", MpWarn);
+                        freeaddrinfo(result);
+                        return 0;
+                    }
+                }
+
+                // Tested against a IPv6 working server
+                break;
+            }
+        }
+
+        freeaddrinfo(result);
+
+        if (!testServerWasReachable) {
+            snprintf(msgBuf, sizeof(msgBuf), "None of Moonlight's connection testing servers were reachable from your PC. Check your Internet connection and try again later.");
+            DisplayMessage(msgBuf);
+            return 0;
+        }
+    }
+    // Many UPnP devices report IGD disconnected when double-NATed. If it was really offline,
+    // we probably would not have even gotten past STUN.
+    //
+    // We try to tell double-NAT from CGN by checking if IPv6 connectivity is available. If it
+    // is, we assume we're in a DS-Lite or similar configuration. If not, we'll assume it's a
+    // real double-NAT setup.
+    if (IsCGN(&locallyReportedWanAddr) || ((IsDoubleNAT(&locallyReportedWanAddr) || igdDisconnected) && hasV6Connectivity)) {
+        snprintf(msgBuf, sizeof(msgBuf), "Your ISP is running a Carrier-Grade NAT that is preventing you from hosting services like Moonlight on the Internet.\n\n"
+            "Ask your ISP for a \"public IPv4 address\" which they may offer for free upon request. For more information and workarounds, click the Help button.");
+        DisplayMessage(msgBuf, "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#carrier-grade-nat-error");
+    }
+    else if ((IsDoubleNAT(&locallyReportedWanAddr) || igdDisconnected) /* && !hasV6Connectivity */) {
+        snprintf(msgBuf, sizeof(msgBuf), "Your router appears be connected to the Internet through another router. Click the Help button for guidance on fixing this issue.");
+        DisplayMessage(msgBuf, "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#connected-through-another-router-error");
+    }
+    else {
+        snprintf(msgBuf, sizeof(msgBuf), "Internet GameStream connectivity check failed.\n\n"
+            "First, try restarting your router. If that fails, check that UPnP is enabled in your router settings. For more information and workarounds, click the Help button.\n\n"
+            "The following ports were not forwarded properly:\n%s", portMsgBuf);
+        DisplayMessage(msgBuf, "https://github.com/moonlight-stream/moonlight-docs/wiki/Internet-Streaming-Errors#internet-gamestream-connectivity-check-error");
+    }
+
+    return -1;
 }
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0">
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!-- Windows Vista -->
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+        </application> 
+    </compatibility>
+</assembly>
@@ -0,0 +1,19 @@
+#pragma once
+
+#define _CRT_RAND_S
+#define _CRT_SECURE_NO_WARNINGS
+#include <stdlib.h>
+
+#define WIN32_LEAN_AND_MEAN
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
+#include <Windows.h>
+#include <ws2tcpip.h>
+#include <Iphlpapi.h>
+#include <WinSock2.h>
+
+#include "..\version.h"
+
+#define CONSOLE_OUT stdout
+#define LOG_OUT stderr
+
+bool getExternalAddressPortIP4(unsigned short localPort, PSOCKADDR_IN wanAddr);
@@ -3,6 +3,7 @@

 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_VERSION
+PRODUCTVERSION  VER_VERSION
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
@@ -11,6 +12,8 @@ BEGIN
            VALUE "CompanyName",        VER_COMPANYNAME_STR
            VALUE "FileDescription",    "Moonlight Internet Streaming Tester"
            VALUE "ProductName",        VER_PRODUCTNAME_STR
+            VALUE "FileVersion",        VER_VERSION_STR
+            VALUE "ProductVersion",     VER_VERSION_STR
        END
    END

@@ -23,32 +23,32 @@
    <ProjectGuid>{8F78D8D2-A837-489C-BAC5-81494C9CEF7A}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>mist</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -93,13 +93,22 @@
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <AdditionalIncludeDirectories>..\libs\include;..\libs\include\miniupnpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalLibraryDirectories>..\libs\x86\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <CETCompat>true</CETCompat>
    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>mist.exe.manifest</AdditionalManifestFiles>
+    </Manifest>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Debug\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@@ -110,11 +119,20 @@
      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CETCompat>true</CETCompat>
    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>mist.exe.manifest</AdditionalManifestFiles>
+    </Manifest>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Debug\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -129,7 +147,8 @@
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <AdditionalIncludeDirectories>..\libs\include;..\libs\include\miniupnpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -137,7 +156,14 @@
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalLibraryDirectories>..\libs\x86\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <CETCompat>true</CETCompat>
    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>mist.exe.manifest</AdditionalManifestFiles>
+    </Manifest>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Release\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@@ -150,13 +176,21 @@
      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CETCompat>true</CETCompat>
    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>mist.exe.manifest</AdditionalManifestFiles>
+    </Manifest>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Release\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="mist.cpp" />
@@ -167,6 +201,10 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\version.h" />
+    <ClInclude Include="mist.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="mist.exe.manifest" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
@@ -26,10 +26,18 @@
    <ClInclude Include="..\version.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="mist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="mist.rc">
      <Filter>Source Files</Filter>
    </ResourceCompile>
  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="mist.exe.manifest">
+      <Filter>Resource Files</Filter>
+    </Manifest>
+  </ItemGroup>
 </Project>
@@ -1,17 +1,10 @@
-#define _CRT_RAND_S
-#define _CRT_SECURE_NO_WARNINGS
-#include <stdlib.h>
-
-#define WIN32_LEAN_AND_MEAN
-#define _WINSOCK_DEPRECATED_NO_WARNINGS
-#include <Windows.h>
-#include <WinSock2.h>
+#include "mist.h"

 #include <stdio.h>

 #define STUN_PORT 3478

-#define STUN_RECV_TIMEOUT_SEC 3
+#define STUN_RECV_TIMEOUT_SEC 5

 #define STUN_MESSAGE_BINDING_REQUEST 0x0001
 #define STUN_MESSAGE_BINDING_SUCCESS 0x0101
@@ -45,41 +38,50 @@ typedef struct _STUN_MESSAGE {

 #pragma pack(pop)

-bool getExternalAddressPortIP4(int proto, unsigned short localPort, PSOCKADDR_IN wanAddr)
+bool getExternalAddressPortIP4(unsigned short localPort, PSOCKADDR_IN wanAddr)
 {
    SOCKET sock;
    STUN_MESSAGE reqMsg;
    int i;
    int bytesRead;
-    int tries;
-    int timeout;
+    int err;
+    bool ret;
    PSTUN_ATTRIBUTE_HEADER attribute;
    PSTUN_MAPPED_IPV4_ADDRESS_ATTRIBUTE ipv4Attrib;
-    struct hostent *host;
+    struct addrinfo* result;
+    struct addrinfo hints;
+    struct sockaddr_in bindAddr;
    union {
        STUN_MESSAGE hdr;
        char buf[1024];
    } resp;

-    host = gethostbyname("stun.stunprotocol.org");
-    if (host == nullptr) {
-        printf("gethostbyname() failed: %d\n", WSAGetLastError());
+    sock = INVALID_SOCKET;
+    ret = false;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_INET;
+    hints.ai_flags = AI_ADDRCONFIG;
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_protocol = IPPROTO_UDP;
+    err = getaddrinfo("stun.moonlight-stream.org", "3478", &hints, &result);
+    if (err != 0 || result == NULL) {
+        fprintf(LOG_OUT, "getaddrinfo() failed: %d\n", err);
        return false;
    }

-    sock = socket(AF_INET, proto == IPPROTO_TCP ? SOCK_STREAM : SOCK_DGRAM, proto);
+    sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
    if (sock == INVALID_SOCKET) {
-        printf("socket() failed: %d\n", WSAGetLastError());
-        return false;
+        fprintf(LOG_OUT, "socket() failed: %d\n", WSAGetLastError());
+        goto Exit;
    }

-    struct sockaddr_in bindAddr = {};
-    bindAddr.sin_family = AF_INET;
+    bindAddr = {};
+    bindAddr.sin_family = hints.ai_family;
    bindAddr.sin_port = htons(localPort);
    if (bind(sock, (struct sockaddr*)&bindAddr, sizeof(bindAddr)) == SOCKET_ERROR) {
-        printf("bind() failed: %d\n", WSAGetLastError());
-        closesocket(sock);
-        return false;
+        fprintf(LOG_OUT, "bind() failed: %d\n", WSAGetLastError());
+        goto Exit;
    }

    reqMsg.messageType = htons(STUN_MESSAGE_BINDING_REQUEST);
@@ -89,97 +91,80 @@ bool getExternalAddressPortIP4(int proto, unsigned short localPort, PSOCKADDR_IN
        reqMsg.transactionId[i] = rand();
    }

-    SOCKADDR_IN stunAddr = {};
-    stunAddr.sin_family = AF_INET;
-    stunAddr.sin_port = htons(STUN_PORT);
-    stunAddr.sin_addr = *(struct in_addr*)host->h_addr;
-
-    // We'll connect() even for UDP so we can use send()/recv() and share more code
-    if (connect(sock, (struct sockaddr*)&stunAddr, sizeof(stunAddr)) == SOCKET_ERROR) {
-        printf("connect() failed: %d\n", WSAGetLastError());
-        closesocket(sock);
-        return false;
-    }
-
-    // For UDP, we'll do 3 iterations of 1 second each. For TCP,
-    // we'll do one iteration with a 3 second wait.
-    if (proto == IPPROTO_TCP) {
-        tries = 1;
-        timeout = STUN_RECV_TIMEOUT_SEC;
-    }
-    else {
-        tries = STUN_RECV_TIMEOUT_SEC;
-        timeout = 1;
-    }
-
-    bytesRead = SOCKET_ERROR;
-    for (i = 0; i < tries; i++) {
-        // Retransmit the request every second until the timeout elapses
-        if (send(sock, (char *)&reqMsg, sizeof(reqMsg), 0) == SOCKET_ERROR) {
-            printf("send() failed: %d\n", WSAGetLastError());
-            closesocket(sock);
-            return false;
+    bytesRead = 0;
+    for (i = 0; i < STUN_RECV_TIMEOUT_SEC; i++) {
+        // Retransmit the request every second to all resolved IP addresses until the timeout elapses
+        for (struct addrinfo* current = result; current != NULL; current = current->ai_next) {
+            if (sendto(sock, (char*)&reqMsg, sizeof(reqMsg), 0, current->ai_addr, current->ai_addrlen) == SOCKET_ERROR) {
+                fprintf(LOG_OUT, "sendto() failed: %d\n", WSAGetLastError());
+            }
        }

-        fd_set fds;
-        FD_ZERO(&fds);
-        FD_SET(sock, &fds);
+        for (;;) {
+            fd_set fds;
+            FD_ZERO(&fds);
+            FD_SET(sock, &fds);

-        struct timeval tv;
-        tv.tv_sec = timeout;
-        tv.tv_usec = 0;
+            struct timeval tv;
+            tv.tv_sec = 1;
+            tv.tv_usec = 0;

-        int selectRes = select(0, &fds, nullptr, nullptr, &tv);
-        if (selectRes == 0) {
-            // Timeout - continue looping
-            continue;
+            int selectRes = select(0, &fds, nullptr, nullptr, &tv);
+            if (selectRes == 0) {
+                // Timeout - break to the enclosing loop
+                break;
+            }
+            else if (selectRes == SOCKET_ERROR) {
+                fprintf(LOG_OUT, "select() failed: %d\n", WSAGetLastError());
+                goto Exit;
+            }
+
+            // recvfrom() will return WSAECONNRESET if the socket has received an ICMP Port Unreachable
+            // message from one of the IP addresses we've attempted communication with. The socket is still
+            // operable (and may even contain queued messages to receive). We should ignore that error and
+            // continue reading, otherwise exit the loop.
+            bytesRead = recvfrom(sock, resp.buf, sizeof(resp.buf), 0, NULL, NULL);
+            if (bytesRead != SOCKET_ERROR || WSAGetLastError() != WSAECONNRESET) {
+                goto RecvDone;
+            }
        }
-        else if (selectRes == SOCKET_ERROR) {
-            printf("select() failed: %d\n", WSAGetLastError());
-            closesocket(sock);
-            return false;
-        }
-
-        // Error handling is below
-        bytesRead = recv(sock, resp.buf, sizeof(resp.buf), 0);
-        break;
    }

-    closesocket(sock);
-
+RecvDone:
    if (bytesRead == 0) {
-        printf("No response from STUN server\n");
-        return false;
+        fprintf(LOG_OUT, "No response from STUN server\n");
+        goto Exit;
    }
    else if (bytesRead == SOCKET_ERROR) {
-        printf("Failed to read STUN binding response: %d\n", WSAGetLastError());
-        return false;
+        fprintf(LOG_OUT, "Failed to read STUN binding response: %d\n", WSAGetLastError());
+        goto Exit;
    }
    else if (bytesRead < sizeof(resp.hdr)) {
-        printf("STUN message truncated: %d\n", bytesRead);
-        return false;
+        fprintf(LOG_OUT, "STUN message truncated: %d\n", bytesRead);
+        goto Exit;
    }
    else if (htonl(resp.hdr.magicCookie) != STUN_MESSAGE_COOKIE) {
-        printf("Bad STUN cookie value: %x\n", htonl(resp.hdr.magicCookie));
-        return false;
+        fprintf(LOG_OUT, "Bad STUN cookie value: %x\n", htonl(resp.hdr.magicCookie));
+        goto Exit;
    }
    else if (memcmp(reqMsg.transactionId, resp.hdr.transactionId, sizeof(reqMsg.transactionId))) {
-        printf("STUN transaction ID mismatch\n");
-        return false;
+        fprintf(LOG_OUT, "STUN transaction ID mismatch\n");
+        goto Exit;
    }
    else if (htons(resp.hdr.messageType) != STUN_MESSAGE_BINDING_SUCCESS) {
-        printf("STUN message type mismatch: %x\n", htons(resp.hdr.messageType));
-        return false;
+        fprintf(LOG_OUT, "STUN message type mismatch: %x\n", htons(resp.hdr.messageType));
+        goto Exit;
    }

    attribute = (PSTUN_ATTRIBUTE_HEADER)(&resp.hdr + 1);
    bytesRead -= sizeof(resp.hdr);
    while (bytesRead > sizeof(*attribute)) {
        if (bytesRead < sizeof(*attribute) + htons(attribute->length)) {
-            printf("STUN attribute out of bounds: %d\n", htons(attribute->length));
-            return false;
+            fprintf(LOG_OUT, "STUN attribute out of bounds: %d\n", htons(attribute->length));
+            goto Exit;
        }
-        else if (htons(attribute->type) != STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS) {
+        // Mask off the comprehension bit
+        else if ((htons(attribute->type) & 0x7FFF) != STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS) {
            // Continue searching if this wasn't our address
            bytesRead -= sizeof(*attribute) + htons(attribute->length);
            attribute = (PSTUN_ATTRIBUTE_HEADER)(((char*)attribute) + sizeof(*attribute) + htons(attribute->length));
@@ -188,12 +173,12 @@ bool getExternalAddressPortIP4(int proto, unsigned short localPort, PSOCKADDR_IN

        ipv4Attrib = (PSTUN_MAPPED_IPV4_ADDRESS_ATTRIBUTE)attribute;
        if (htons(ipv4Attrib->hdr.length) != 8) {
-            printf("STUN address length mismatch: %d\n", htons(ipv4Attrib->hdr.length));
-            return false;
+            fprintf(LOG_OUT, "STUN address length mismatch: %d\n", htons(ipv4Attrib->hdr.length));
+            goto Exit;
        }
        else if (ipv4Attrib->addressFamily != 1) {
-            printf("STUN address family mismatch: %x\n", ipv4Attrib->addressFamily);
-            return false;
+            fprintf(LOG_OUT, "STUN address family mismatch: %x\n", ipv4Attrib->addressFamily);
+            goto Exit;
        }

        *wanAddr = {};
@@ -203,9 +188,20 @@ bool getExternalAddressPortIP4(int proto, unsigned short localPort, PSOCKADDR_IN
        wanAddr->sin_port = ipv4Attrib->port ^ (short)resp.hdr.magicCookie;
        wanAddr->sin_addr.S_un.S_addr = ipv4Attrib->address ^ resp.hdr.magicCookie;

-        return true;
+        ret = true;
+        goto Exit;
    }

-    printf("No XOR mapped address found in STUN response!\n");
-    return false;
+    fprintf(LOG_OUT, "No XOR mapped address found in STUN response!\n");
+
+Exit:
+    if (sock != INVALID_SOCKET) {
+        closesocket(sock);
+    }
+
+    if (result != NULL) {
+        freeaddrinfo(result);
+    }
+
+    return ret;
 }
@@ -1,7 +1,7 @@
 #pragma once

-#define VER_VERSION                 2,1,0,0
-#define VER_VERSION_STR             "2.1.0.0"
+#define VER_VERSION                 5,5,2,0
+#define VER_VERSION_STR             "5.5.2.0"

 #define VER_COMPANYNAME_STR         "Moonlight Game Streaming Project"
-#define VER_PRODUCTNAME_STR         "Moonlight Internet Streaming Helper"
+#define VER_PRODUCTNAME_STR         "Moonlight Internet Hosting Tool"
Author	SHA1	Message	Date
Cameron Gutman	404af38d10	Version 5.5.2	2021-02-02 18:16:27 -06:00
Cameron Gutman	dd72f65ffb	Fix inaccurate test results on IPv6 when a temporary address is in use and no pinholes are created for it	2021-02-01 19:59:41 -06:00
Cameron Gutman	6589dc4853	Update GSv6Fwd with CET and CFG	2021-02-01 19:53:52 -06:00
Cameron Gutman	9772139229	Print UPnP root desc URL in logs	2021-02-01 19:41:14 -06:00
Cameron Gutman	03c89e4022	Update MiniUPnPc to 36cc66edda92093b24e051e38bd16a64900272e9 Built with CFG and CET enabled	2021-02-01 19:40:44 -06:00
Cameron Gutman	d1fe5f6a9b	Rebuilt libnatpmp with CET and CFG Commit 4536032ae32268a45c073a4d5e91bbab4534773a	2021-02-01 19:40:24 -06:00
Cameron Gutman	a88b8d0d04	Enable CFG and CET for MISS and MIST	2021-02-01 19:26:14 -06:00
Cameron Gutman	fa5ae73abb	Version 5.5.1	2020-11-29 23:38:14 -06:00
Cameron Gutman	4d197cae02	Improve performance and reliability when stopping MISS	2020-11-29 22:25:27 -06:00
Cameron Gutman	624af65b55	Fix minor installer build warnings	2020-11-29 22:06:02 -06:00
Cameron Gutman	6b1a0856cc	Update miniupnpc to ba130320f4180f8f9a54c48c0634e0ea0118fa38 This adds DLL version resources for Windows Installer	2020-11-29 22:05:43 -06:00
Cameron Gutman	01a1012e74	Use preprocessor variables to improve readability	2020-11-29 20:21:37 -06:00
Cameron Gutman	66b36684ec	Only download the CRT redistributable if it's newer than what is installed	2020-11-29 17:23:48 -06:00
Cameron Gutman	e7db5242c9	Update installer for new DLLs	2020-11-29 15:58:20 -06:00
Cameron Gutman	5e09217af4	Update GSv6Fwd to use DLLs instead of static build	2020-11-29 15:57:10 -06:00
Cameron Gutman	c21a64c874	Remove x64 solution target	2020-11-29 14:51:56 -06:00
Cameron Gutman	ebe91d6799	Update project build files for the new DLLs	2020-11-29 14:51:41 -06:00
Cameron Gutman	077c9814e0	Sign pre-built libraries	2020-11-29 14:49:37 -06:00
Cameron Gutman	393dfb70a7	Update miniupnpc to 677e0db63649ad2aeb536783eb745c651f2fd5c2 Rebuild as DLL to prevent MSVC version incompatibility	2020-11-29 14:35:02 -06:00
Cameron Gutman	88fb77083f	Update libnatpmp to 4536032ae32268a45c073a4d5e91bbab4534773a Rebuild as a DLL to prevent MSVC version compatibility issues	2020-11-29 14:27:53 -06:00
Cameron Gutman	38514d08c1	Version 5.5	2020-10-10 13:58:23 -05:00
Cameron Gutman	5d75b11a35	Fix success text typos	2020-10-10 13:56:10 -05:00
Cameron Gutman	f511b830ea	Handle deletion of the 'HKLM\Software\NVIDIA Corporation' key	2020-10-10 13:35:05 -05:00
Cameron Gutman	8a45ea2066	Test for MTU problems	2020-10-10 12:39:48 -05:00
Cameron Gutman	3844ea59de	Allow mDNS traffic through the firewall for autodiscovery	2020-10-10 12:07:42 -05:00
Cameron Gutman	a19b95f259	RFC6887 says PCP max packet size is 1100 bytes	2020-10-10 12:00:48 -05:00
Cameron Gutman	ae81d4305d	Improve success message with more information	2020-10-10 11:57:26 -05:00
Cameron Gutman	8066cf4be1	Avoid extra GameStream state prints when the state isn't changing	2020-10-10 11:37:42 -05:00
Cameron Gutman	021474cdd2	Version 5.4	2020-09-07 11:15:52 -07:00
Cameron Gutman	308cd0dd00	Use dynamically allocated buffer for GetAdaptersAddresses()	2020-09-07 10:14:54 -07:00
Cameron Gutman	83360d775b	Ignore ICMP Port Unreachable messages during STUN	2020-09-06 15:12:16 -07:00
Cameron Gutman	cdbaa0aff3	Version 5.3.1	2020-08-30 13:47:35 -07:00
Cameron Gutman	36ea86faaa	Configure SCM to restart our service if it crashes	2020-08-29 22:43:41 -07:00
Cameron Gutman	8590a0813b	Stop testing after the first IPv6 relay server	2020-08-28 18:46:56 -07:00
Cameron Gutman	51ae1c8770	Fix socket errors being clobbered by closesocket()	2020-08-28 18:46:36 -07:00
Cameron Gutman	f1ca6a71f0	Version 5.3	2020-08-14 18:35:19 -07:00
Cameron Gutman	ac92212464	Fix flip-flopped HTTP and HTTPS rule IDs	2020-08-14 17:57:45 -07:00
Cameron Gutman	dbf43ac7a1	Don't attempt to relocate WoL port 9	2020-08-14 17:54:48 -07:00
Cameron Gutman	893aa76c9c	Replace hardcoded constant with #define	2020-08-14 17:52:59 -07:00
Cameron Gutman	21d8c71a2c	Log the internal port for the UPnP mappings	2020-08-14 17:51:06 -07:00
Cameron Gutman	41ef072c9b	Validate the port number of loopback traffic	2020-08-14 17:48:55 -07:00
Cameron Gutman	53246bd4c5	Don't redirect stdout for standalone exe invocation	2020-08-14 17:48:14 -07:00
Cameron Gutman	ac850e79d8	Add firewall rules for GameStream just in case GFE didn't	2020-08-12 20:54:34 -07:00
Cameron Gutman	944c8993e8	Elevate priorities for the UDP relay threads	2020-08-11 01:12:48 -07:00
Cameron Gutman	b6508d9024	Remove superfluous select() call	2020-08-11 00:59:13 -07:00
Cameron Gutman	ef5bb72d5c	Version 5.2	2020-08-10 22:05:43 -07:00
Cameron Gutman	3343ebb225	Don't allow testing while a stream is active	2020-08-10 21:50:52 -07:00
Cameron Gutman	05413a554c	Work around IGDs that deduplicate entries based on the internal port This is a violation of the UPnP IGD specification but we can relay through an alternate port as a workaround.	2020-08-10 21:16:21 -07:00
Cameron Gutman	5f015acdaa	Improve robustness for broken UPnP IGDs	2020-08-09 16:01:39 -07:00
Cameron Gutman	df286ef56d	Use indefinite mappings if the IGD returns unexpected error codes	2020-08-09 15:30:48 -07:00
Cameron Gutman	47d60b9f24	Leave permanent mappings alone during the update cycle	2020-08-09 15:16:05 -07:00
Cameron Gutman	659d3aea23	Open UDP 47009 for WoL It may work where UDP 9 fails because it's an unprivileged port	2020-08-09 14:00:14 -07:00
Cameron Gutman	e4a4d42ece	Version 5.1	2020-08-08 16:57:06 -07:00
Cameron Gutman	189e861362	Fix systems where Windows Firewall has been improperly disabled	2020-08-08 16:37:38 -07:00
Cameron Gutman	fd022b67d3	Only test on the first reachable IPv4 and IPv6 relay servers	2020-08-07 21:58:36 -07:00
Cameron Gutman	14d27b4cf5	Use WinHTTP timeouts to avoid having to test HTTP ports twice	2020-08-04 02:03:14 -07:00
Cameron Gutman	17cb084968	Improve heuristic for distinguishing CGN vs double-NAT	2020-08-04 01:13:21 -07:00
Cameron Gutman	ad8ef228d5	Fix double-close of connection handle on failure	2020-07-19 10:08:26 -07:00
Cameron Gutman	8d2252c4ac	Version 5.0	2020-07-18 17:59:54 -07:00
Cameron Gutman	365b3ccd61	Remove redundant print	2020-07-18 17:55:45 -07:00
Cameron Gutman	74140a8511	Switch to the new loopback server protocol	2020-07-18 17:12:35 -07:00
Cameron Gutman	a9bf4ffd70	Always run the loopback server test It appears that in rare cases NAT reflection can work where real WAN traffic fails	2020-07-18 16:13:56 -07:00
Cameron Gutman	164d8b5467	Fix testing on Windows 7 with GFE 3.20.4	2020-07-18 15:53:47 -07:00
Cameron Gutman	f1ebefa59c	Add missing success print	2020-07-18 15:53:08 -07:00
Cameron Gutman	3e060fae54	Add supportedOS entries to the embedded manifest	2020-07-18 15:47:39 -07:00
Cameron Gutman	f97c04a8cc	Switch to WinHTTP instead of WinInet for HTTP testing	2020-07-18 13:27:52 -07:00
Cameron Gutman	85cd20005c	Pass the port number directly rather than "https" to getaddrinfo() Apparently, the services file in drivers\etc can be deleted and GFE still works.	2020-04-10 17:40:30 -07:00
Cameron Gutman	e3e4bf608f	Version 4.4	2020-02-21 18:03:38 -08:00
Cameron Gutman	0be2ca51e9	Send firewall/AV help to Known app compat issues section	2020-02-21 17:43:35 -08:00
Cameron Gutman	3e1ffce16f	Add a check for blocked LAN access	2020-02-21 17:33:06 -08:00
Cameron Gutman	c7813a7a0b	Add specific help text for power option warnings and RDP error	2020-02-21 16:49:28 -08:00
Cameron Gutman	87fd3ad8e2	Check sleep and hibernation settings	2020-02-21 16:48:22 -08:00
Cameron Gutman	9d3ef0a215	Update miniupnpc to 44366328661826603982d1e0d7ebb4062c5f2bfc	2020-02-21 16:05:26 -08:00
Cameron Gutman	ae83853a27	Rebuild libnatpmp with VC v16.4.5	2020-02-21 16:04:49 -08:00
Cameron Gutman	0b8b117cb2	Remove unused variables	2020-02-21 15:53:36 -08:00
Cameron Gutman	0050566124	Add a note to attempt restarting your router if UPnP is not detected	2020-02-21 15:52:21 -08:00
Cameron Gutman	cc24472193	Add a check for a screen lock due to RDP	2020-02-21 15:51:51 -08:00
Cameron Gutman	4a11ab0f7f	Fix firewall detection warning on non-English systems	2019-09-28 20:28:10 -07:00
Cameron Gutman	c1c16edf7d	Increase STUN retry limit	2019-09-28 20:26:01 -07:00
Cameron Gutman	ae2647f36e	Fix false firewall warning on Server SKUs	2019-09-28 16:36:40 -07:00
Cameron Gutman	8e40ef80bd	Version 4.3	2019-09-28 16:27:25 -07:00
Cameron Gutman	16bb727b99	Update GS-IPv6-Forwarder to 2.3.1	2019-09-28 16:27:14 -07:00
Cameron Gutman	9194b8e22b	Detect AV and firewall software that could interfere with GameStream	2019-09-28 16:06:03 -07:00
Cameron Gutman	2805464e86	Detect multiple connections to the same network	2019-09-28 15:24:53 -07:00
Cameron Gutman	20e7374480	Remove privilege restrictions due to app compat issues	2019-09-28 14:17:36 -07:00
Cameron Gutman	0fdbee831b	Revert to an unrestricted service SID to address some app-compat issues with 3rd party Winsock providers	2019-09-28 14:11:32 -07:00
Cameron Gutman	b37b99e9c3	Remove the "buggy router" warning that was actually caused by a libnatpmp bug	2019-09-28 14:03:32 -07:00
Cameron Gutman	29bbdc5319	Update libnatpmp to cgutman/libnatpmp eca208e3df44072d71bf3cd61753b4e77e1ddab0	2019-09-28 14:02:41 -07:00
Cameron Gutman	09cd50b12a	Version 4.2	2019-08-08 01:34:09 -07:00
Cameron Gutman	d60eda6fa8	Update GS IPv6 Forwarder for release	2019-08-08 01:33:45 -07:00
Cameron Gutman	cda9bc6be7	Add support for testing ZeroTier configurations	2019-08-08 01:31:09 -07:00
Cameron Gutman	0008fbbcdb	Try all resolved STUN servers	2019-08-08 00:02:53 -07:00
Cameron Gutman	620aa4b6d1	Version 4.1	2019-07-30 22:20:01 -07:00
Cameron Gutman	b93ef55b65	Fix displaying broken ports when running IPv6-only	2019-07-30 22:12:45 -07:00
Cameron Gutman	fdb033f550	Reduce wait time for UDP to offset retransmission delays	2019-07-30 21:48:48 -07:00
Cameron Gutman	efdcaed4c1	Don't proceed after WSAEADDRINUSE for the loopback relay to avoid false positives	2019-07-30 21:47:29 -07:00
Cameron Gutman	5a2edb9a36	Add note about log for Discord	2019-07-30 21:45:26 -07:00
Cameron Gutman	798be5fd0a	Implement heuristics for falling through to v4 detection even with working v6	2019-07-30 21:31:28 -07:00
Cameron Gutman	b0941fee90	Update README.md	2019-07-29 22:54:53 -07:00
Cameron Gutman	ebc7703bf2	Update error message text	2019-07-29 22:02:27 -07:00
Cameron Gutman	bbf16383f5	Fix uninitialized sin_family field returned from CheckWANAccess()	2019-07-29 21:59:18 -07:00
Cameron Gutman	dee2daac5a	Fix invalid free on getaddrinfo() failure	2019-07-29 21:58:16 -07:00
Cameron Gutman	51e953c092	Test using the relay even if we believe it may be a double-NAT configuration	2019-07-29 21:25:40 -07:00
Cameron Gutman	acb3f5a059	Add support for IPv6-only environments	2019-07-29 21:20:30 -07:00
Cameron Gutman	0bd212e6f1	Fix addrinfo leak	2019-07-29 21:06:18 -07:00
Cameron Gutman	d076f881eb	Print dialog text to the console	2019-07-29 21:04:17 -07:00
Cameron Gutman	46c2236342	Add support for getting local IPv6 address	2019-07-29 21:01:55 -07:00
Cameron Gutman	8158c85a23	Add support for IPv6 testing	2019-07-28 18:33:33 -07:00
Cameron Gutman	6f3898e4b4	Untabify source	2019-07-28 13:25:51 -07:00
Cameron Gutman	b1a1352bbf	Retransmit UDP test packets a few times to be safe	2019-07-28 13:16:22 -07:00
Cameron Gutman	069b0c7656	Add more periodic test output to avoid looking like the test is hung	2019-07-28 13:11:04 -07:00
Cameron Gutman	42df15c567	Switch stderr and stdout to prevent miniupnp warnings from appearing on the console	2019-07-28 13:09:48 -07:00
Cameron Gutman	96a88b55db	Prepare to swap stdout and stderr for console output	2019-07-28 12:46:45 -07:00
Cameron Gutman	2d31cd0420	Rename Internet Streaming Helper to Internet Hosting Tool	2019-07-28 12:33:05 -07:00
Cameron Gutman	ebb8c9fb68	Version 4.0	2019-07-13 15:21:23 -07:00
Cameron Gutman	b31d257566	Integrate GSv6Fwd into MISH	2019-07-13 15:04:20 -07:00
Cameron Gutman	51dc3142ca	Retarget to VS2019	2019-07-13 11:29:55 -07:00
Cameron Gutman	c8ab32812f	Version 3.0	2019-04-05 01:42:05 -07:00
Cameron Gutman	21802eac19	Improve messages to be less confusing	2019-04-05 01:41:55 -07:00
Cameron Gutman	dab033ee3b	Avoid testing UDP 48002 and UDP 48010 since they are currently unused	2019-04-05 00:39:51 -07:00
Cameron Gutman	204dde8a73	Avoid attempting to delete UPnP rules if the description doesn't match	2019-04-05 00:39:27 -07:00
Cameron Gutman	3d9e14fb56	Use a loopback relay if NAT reflection is unavailable	2019-04-05 00:38:47 -07:00
Cameron Gutman	771e09973f	Print both old and new MISS logs	2019-03-28 19:46:34 -07:00
Cameron Gutman	1bc6cc5634	Fix log rotation	2019-03-28 19:42:09 -07:00
Cameron Gutman	0941cc5bc1	Set additional version attributes	2019-03-28 19:41:14 -07:00
Cameron Gutman	a7e41d15f5	Add UTC time prefix to logs	2019-03-28 19:37:46 -07:00
Cameron Gutman	6916cfd0de	Version 2.3	2019-03-09 16:03:46 -08:00
Cameron Gutman	bae92c6c95	Allow the service access to its log folder	2019-03-09 16:00:10 -08:00
Cameron Gutman	c8de19a3b6	Reduce service permissions	2019-03-09 15:02:14 -08:00
Cameron Gutman	1da8f371aa	Update miniupnpc build to 4912dc37e30927eefd5d7bf0778d77172ef94803	2019-03-09 15:01:21 -08:00
Cameron Gutman	cb55a02599	Fix parsing XOR-MAPPED-ADDRESS if the optional comprehension bit is set	2019-01-22 17:42:09 -08:00
Cameron Gutman	dc820bdbf6	Version 2.2	2019-01-04 23:08:44 -08:00
Cameron Gutman	106960cbb5	Check for null help URL	2019-01-04 23:06:37 -08:00
Cameron Gutman	3c92a79fe2	Fix parsing bug handling empty SSDP headers	2019-01-04 23:02:07 -08:00
Cameron Gutman	2c2f275c3d	Add help button to error dialogs	2019-01-04 22:49:02 -08:00
Cameron Gutman	156940cc5b	Retry STUN over TCP on UDP failure	2019-01-04 20:46:48 -08:00
Cameron Gutman	a835cf43a5	Require STUN public IP address to proceed with testing	2019-01-04 20:39:20 -08:00
Cameron Gutman	18b704b85a	Use moonlight-stream.org instead of google.com to avoid issues in China	2019-01-04 19:22:46 -08:00
Cameron Gutman	cd4adae22b	Use stun.moonlight-stream.org for STUN	2019-01-04 19:17:31 -08:00
Cameron Gutman	ef59e2858b	Fix incorrect error message on STUN receive timeout	2018-11-30 00:33:48 -08:00
Cameron Gutman	218c0d7385	Increase SSDP UDP socket recv buffer size	2018-11-30 00:32:57 -08:00
Cameron Gutman	e7f03cfa93	Add missing check for PCP version	2018-11-29 23:57:14 -08:00