move mux_tunnels functions to new files; improve keep alive cycles

cnbatch · Nov 16, 2023 · 4531d38 · 4531d38
1 parent c1eef3b
commit 4531d38
Show file tree

Hide file tree

Showing 12 changed files with 941 additions and 1,182 deletions.
diff --git a/sln/kcptube/kcptube.vcxproj b/sln/kcptube/kcptube.vcxproj
@@ -33,6 +33,7 @@
     <ClCompile Include="..\..\src\networks\connections.cpp" />
     <ClCompile Include="..\..\src\networks\kcp.cpp" />
     <ClCompile Include="..\..\src\networks\kcp_updater.cpp" />
+    <ClCompile Include="..\..\src\networks\mux_tunnel.cpp" />
     <ClCompile Include="..\..\src\networks\relay.cpp" />
     <ClCompile Include="..\..\src\networks\server.cpp" />
     <ClCompile Include="..\..\src\networks\stun.cpp" />
@@ -47,6 +48,7 @@
     <ClInclude Include="..\..\src\networks\connections.hpp" />
     <ClInclude Include="..\..\src\networks\kcp.hpp" />
     <ClInclude Include="..\..\src\networks\kcp_updater.hpp" />
+    <ClInclude Include="..\..\src\networks\mux_tunnel.hpp" />
     <ClInclude Include="..\..\src\networks\relay.hpp" />
     <ClInclude Include="..\..\src\networks\server.hpp" />
     <ClInclude Include="..\..\src\networks\stun.hpp" />

diff --git a/sln/kcptube/kcptube.vcxproj.filters b/sln/kcptube/kcptube.vcxproj.filters
@@ -69,6 +69,9 @@
     <ClCompile Include="..\..\src\networks\kcp_updater.cpp">
       <Filter>Source Files\networks</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\networks\mux_tunnel.cpp">
+      <Filter>Source Files\networks</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\shares\share_defines.hpp">
@@ -116,5 +119,8 @@
     <ClInclude Include="..\..\src\networks\kcp_updater.hpp">
       <Filter>Header Files\networks</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\networks\mux_tunnel.hpp">
+      <Filter>Header Files\networks</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/src/main.cpp b/src/main.cpp
@@ -19,7 +19,7 @@
 int main(int argc, char *argv[])
 {
 	char app_name[] = "kcptube";
-	printf("%s version 20231112\n", app_name);
+	printf("%s version 20231116\n", app_name);
 
 	if (argc <= 1)
 	{

diff --git a/src/networks/CMakeLists.txt b/src/networks/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(THISLIB_NAME NETCONNECTIONS)
 
-add_library(${THISLIB_NAME} STATIC "connections.cpp" "client.cpp" "kcp.cpp" "kcp_updater.cpp" "server.cpp" "stun.cpp" "relay.cpp")
+add_library(${THISLIB_NAME} STATIC "connections.cpp" "client.cpp" "kcp.cpp" "kcp_updater.cpp" "mux_tunnel.cpp" "server.cpp" "stun.cpp" "relay.cpp")
 target_link_libraries(${THISLIB_NAME} PRIVATE SHAREDEFINES)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)