unify datapath_raw_winXXX

microsoft · Nov 27, 2024 · 945d71f · 945d71f
1 parent f6bc45c
commit 945d71f
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 300 deletions.
diff --git a/scripts/clog.inputs b/scripts/clog.inputs
@@ -25,8 +25,7 @@
 ../src/platform/datapath_raw_xdp_winuser.c
 ../src/platform/datapath_raw_xdp_winkernel.c
 ../src/platform/datapath_raw_xdp_linux.c
-../src/platform/datapath_raw_winuser.c
-../src/platform/datapath_raw_winkernel.c
+../src/platform/datapath_raw_win.c
 ../src/platform/datapath_raw_linux.c
 ../src/platform/datapath_raw.c
 ../src/platform/crypt_bcrypt.c

diff --git a/src/generated/linux/datapath_raw_winkernel.c.clog.h b/src/generated/linux/datapath_raw_winkernel.c.clog.h
diff --git a/src/generated/linux/datapath_raw_winuser.c.clog.h b/src/generated/linux/datapath_raw_winuser.c.clog.h
diff --git a/src/generated/linux/datapath_raw_winuser.c.clog.h.lttng.h b/src/generated/linux/datapath_raw_winuser.c.clog.h.lttng.h
diff --git a/src/generated/linux/quic.clog_datapath_raw_winkernel.c.clog.h.c b/src/generated/linux/quic.clog_datapath_raw_winkernel.c.clog.h.c
diff --git a/src/generated/linux/quic.clog_datapath_raw_winuser.c.clog.h.c b/src/generated/linux/quic.clog_datapath_raw_winuser.c.clog.h.c
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
@@ -20,7 +20,7 @@ if("${CX_PLATFORM}" STREQUAL "windows")
        ${SYSTEM_PROCESSOR} STREQUAL "arm64ec")
         set(SOURCES ${SOURCES} datapath_raw_dummy.c)
     else()
-        set(SOURCES ${SOURCES} datapath_raw.c datapath_raw_winuser.c datapath_raw_socket.c datapath_raw_socket_win.c datapath_raw_socket_common.c datapath_raw_xdp_winuser.c)
+        set(SOURCES ${SOURCES} datapath_raw.c datapath_raw_win.c datapath_raw_socket.c datapath_raw_socket_win.c datapath_raw_socket_common.c datapath_raw_xdp_winuser.c)
     endif()
 else()
     set(SOURCES ${SOURCES} inline.c platform_posix.c storage_posix.c cgroup.c datapath_unix.c)

diff --git a/src/platform/datapath_raw_winuser.c → src/platform/datapath_raw_win.c b/src/platform/datapath_raw_winuser.c → src/platform/datapath_raw_win.c
@@ -11,7 +11,7 @@
 
 #include "datapath_raw_win.h"
 #ifdef QUIC_CLOG
-#include "datapath_raw_winuser.c.clog.h"
+#include "datapath_raw_win.c.clog.h"
 #endif
 
 #pragma warning(disable:4116) // unnamed type definition in parentheses
@@ -241,5 +241,7 @@ CXPLAT_THREAD_CALLBACK(CxPlatRouteResolutionWorkerThread, Context)
         CXPLAT_FREE(Operation, QUIC_POOL_ROUTE_RESOLUTION_OPER);
     }
 
+#ifndef _KERNEL_MODE
     return 0;
+#endif
 }
diff --git a/src/platform/datapath_raw_winkernel.c b/src/platform/datapath_raw_winkernel.c
diff --git a/src/platform/platform.kernel.vcxproj b/src/platform/platform.kernel.vcxproj
@@ -25,7 +25,7 @@
     <ClCompile Include="datapath_xplat.c" />
     <ClCompile Include="datapath_win.c" />
     <ClCompile Include="datapath_raw.c" />
-    <ClCompile Include="datapath_raw_winkernel.c" />
+    <ClCompile Include="datapath_raw_win.c" />
     <ClCompile Include="datapath_raw_socket.c" />
     <ClCompile Include="datapath_raw_socket_common.c" />
     <ClCompile Include="datapath_raw_socket_win.c" />