diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..adda40e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "GS-IPv6-Forwarder"] + path = GS-IPv6-Forwarder + url = https://github.com/moonlight-stream/GS-IPv6-Forwarder.git diff --git a/GS-IPv6-Forwarder b/GS-IPv6-Forwarder new file mode 160000 index 0000000..c721a93 --- /dev/null +++ b/GS-IPv6-Forwarder @@ -0,0 +1 @@ +Subproject commit c721a93d0af34979139a0a877f61ce8c66171c9c diff --git a/mish-setup/Bundle.wxs b/mish-setup/Bundle.wxs new file mode 100644 index 0000000..aaa2095 --- /dev/null +++ b/mish-setup/Bundle.wxs @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/mish/license.rtf b/mish-setup/license.rtf similarity index 100% rename from mish/license.rtf rename to mish-setup/license.rtf diff --git a/mish-setup/mish-setup.wixproj b/mish-setup/mish-setup.wixproj new file mode 100644 index 0000000..63aef67 --- /dev/null +++ b/mish-setup/mish-setup.wixproj @@ -0,0 +1,61 @@ + + + + Debug + x86 + 3.10 + a2ce5056-1114-44b9-b79b-952ef46d3d50 + 2.0 + mish_setup + Bundle + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + $(WixExtDir)\WixBalExtension.dll + WixBalExtension + + + + + GSv6FwdSetup + {f8171b99-f5f9-4abf-9fe5-6753539611af} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mish + {f0dee5f3-4b62-47a3-b00b-61c614c924fd} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + + + + + + + \ No newline at end of file diff --git a/mish.sln b/mish.sln index ca7a9e5..66fa87e 100644 --- a/mish.sln +++ b/mish.sln @@ -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,6 +9,12 @@ 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 @@ -39,6 +45,26 @@ Global {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|x64.ActiveCfg = Debug|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|x64.ActiveCfg = Release|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|x64.ActiveCfg = Debug|x64 + {87DEAE49-7638-4CDB-88EB-054B1F3CB0D2}.Debug|x64.Build.0 = Debug|x64 + {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|x64.ActiveCfg = Release|x64 + {87DEAE49-7638-4CDB-88EB-054B1F3CB0D2}.Release|x64.Build.0 = Release|x64 + {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|x64.ActiveCfg = Debug|x86 + {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|x64.ActiveCfg = Release|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 diff --git a/mish/Product.wxs b/mish/Product.wxs index 586b705..d12d9f5 100644 --- a/mish/Product.wxs +++ b/mish/Product.wxs @@ -9,9 +9,6 @@ - - - diff --git a/mist/mist.cpp b/mist/mist.cpp index 156d401..c72d428 100644 --- a/mist/mist.cpp +++ b/mist/mist.cpp @@ -77,13 +77,13 @@ void DisplayMessage(const char* message, const char* helpUrl = nullptr, MessageP printf("%s\n", message); if (terminal) { - char missPath[MAX_PATH + 1]; + char logPath[MAX_PATH + 1]; FILE* f; printf("--------------- CURRENT MISS LOG -------------------\n"); - ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-current.log", missPath, sizeof(missPath)); - f = fopen(missPath, "r"); + ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-current.log", logPath, sizeof(logPath)); + f = fopen(logPath, "r"); if (f != nullptr) { char buffer[1024]; while (!feof(f)) { @@ -98,8 +98,8 @@ void DisplayMessage(const char* message, const char* helpUrl = nullptr, MessageP printf("\n----------------- OLD MISS LOG ---------------------\n"); - ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-old.log", missPath, sizeof(missPath)); - f = fopen(missPath, "r"); + ExpandEnvironmentStringsA("%ProgramData%\\MISS\\miss-old.log", logPath, sizeof(logPath)); + f = fopen(logPath, "r"); if (f != nullptr) { char buffer[1024]; while (!feof(f)) { @@ -112,6 +112,38 @@ void DisplayMessage(const char* message, const char* helpUrl = nullptr, MessageP printf("Failed to find old MISS log\n"); } + printf("--------------- 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, stdout); + } + fclose(f); + } + else { + printf("Failed to find current GSv6Fwd log\n"); + } + + printf("\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, stdout); + } + fclose(f); + } + else { + printf("Failed to find old GSv6Fwd log\n"); + } + fflush(stdout); }