Fixed disconnecting the client breaking the pipe permanently

arcturus-prime · Jul 9, 2024 · 7962d05 · 7962d05
1 parent 86f0510
commit 7962d05
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "studio-packet-dumper-client"
+name = "client"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/client/src/packet.rs b/client/src/packet.rs
@@ -1,5 +1,5 @@
 pub enum Packet {
-	Test {
+	RemoteEvent {
 		hello: u8,
 	}
 }
diff --git a/dumper/CMakeLists.txt b/dumper/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
 project(StudioPacketDumper LANGUAGES CXX C)
 
-add_library(StudioPacketDumper SHARED "src/main.cpp")
+add_library(dumper SHARED "src/main.cpp")
 
 if(MSVC)
-  target_compile_options(StudioPacketDumper PRIVATE /W4 /WX)
+  target_compile_options(dumper PRIVATE /W4 /WX)
 else()
-  target_compile_options(StudioPacketDumper PRIVATE -Wall -Wextra -Wpedantic -Werror)
+  target_compile_options(dumper PRIVATE -Wall -Wextra -Wpedantic -Werror)
 endif()
 
-target_compile_features(StudioPacketDumper PRIVATE cxx_std_17)
+target_compile_features(dumper PRIVATE cxx_std_17)
diff --git a/dumper/src/main.cpp b/dumper/src/main.cpp
@@ -4,20 +4,19 @@
 
 #include <cstdint>
 #include <cstdio>
-#include <fileapi.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <windows.h>
-#include <winsock.h>
 
 constexpr size_t PIPE_BUFFER_SIZE = 512 * 1024; // 512 KB
 
 CRITICAL_SECTION g_receiveLock;
 StudioDumper::VFTable g_vftable;
-HANDLE g_pipe;
+HANDLE g_pipe = INVALID_HANDLE_VALUE;
 
-HANDLE CreatePipe() {
-    return CreateNamedPipe(TEXT("\\\\.\\pipe\\StudioDumper"), PIPE_ACCESS_DUPLEX,
+void MakePipe()
+{
+    g_pipe = CreateNamedPipe(TEXT("\\\\.\\pipe\\StudioDumper"), PIPE_ACCESS_DUPLEX,
                              PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_NOWAIT, 1, PIPE_BUFFER_SIZE,
                              PIPE_BUFFER_SIZE, 500, NULL);
 }
@@ -30,11 +29,17 @@ void hook_24(RakNet::RakPeer* rakPeer, char _1)
     {
         auto packet = rakPeer->queue_2.array[i];
 
-        if (g_pipe == INVALID_HANDLE_VALUE)
-            break; 
-
         DWORD num;
-        WriteFile(g_pipe, packet->data, packet->size, &num, NULL);
+        auto result = WriteFile(g_pipe, packet->data, packet->size, &num, NULL);
+
+        if (result)
+            continue;
+
+        if (GetLastError() == ERROR_NO_DATA)
+        {
+            CloseHandle(g_pipe);
+            MakePipe();
+        }
     }
 
     LeaveCriticalSection(&g_receiveLock);
@@ -64,7 +69,7 @@ void Attach()
     g_vftable = vftable_optional.value();
     printf("Found RakPeer VFTable at 0x%llx with length %llu!\n", g_vftable.get_address(), g_vftable.get_size());
 
-    g_pipe = CreatePipe();
+    MakePipe();
 
     if (g_pipe == INVALID_HANDLE_VALUE)
     {