Feedback

.azure/obtemplates/build-linux.yml

@@ -29,10 +29,11 @@ jobs:
       target: ubuntu_2004_x86_64
     ${{ else }}:
       target: ubuntu_2204_x86_64
+      xdp: true
     inputs:
       pwsh: true
       filePath: scripts/build.ps1
-      arguments: -Tls ${{ parameters.tls }} -Config ${{ parameters.config }} -Platform ${{ parameters.platform }} -Arch x64 -CI -UseSystemOpenSSLCrypto -OneBranch -OfficialRelease
+      arguments: -Tls ${{ parameters.tls }} -Config ${{ parameters.config }} -Platform ${{ parameters.platform }} -EnableLinuxXDP ${{ xdp }} -Arch x64 -CI -UseSystemOpenSSLCrypto -OneBranch -OfficialRelease
   - task: PowerShell@2
     displayName: arm64
     ${{ if eq(parameters.tls, 'openssl') }}:

CMakeLists.txt

@@ -90,7 +90,7 @@ option(QUIC_STATIC_LINK_PARTIAL_CRT "Statically links the compiler-specific port
 option(QUIC_UWP_BUILD "Build for UWP" OFF)
 option(QUIC_GAMECORE_BUILD "Build for GameCore" OFF)
 option(QUIC_PGO "Enables profile guided optimizations" OFF)
-option(QUIC_XDP_ENABLED "Enables XDP support" OFF)
+option(QUIC_LINUX_XDP_ENABLED "Enables XDP support" OFF)
 option(QUIC_SOURCE_LINK "Enables source linking on MSVC" ON)
 option(QUIC_EMBED_GIT_HASH "Embed git commit hash in the binary" ON)
 option(QUIC_PDBALTPATH "Enable PDBALTPATH setting on MSVC" ON)

scripts/build.ps1

@@ -57,7 +57,7 @@ This script provides helpers for building msquic.
 .PARAMETER PGO
     Builds msquic with profile guided optimization support (Windows-only).
 
-.PARAMETER EnableXDP
+.PARAMETER EnableLinuxXDP
     Enables XDP support (Linux-only).
 
 .PARAMETER Generator
@@ -170,7 +170,7 @@ param (
     [switch]$PGO = $false,
 
     [Parameter(Mandatory = $false)]
-    [switch]$EnableXDP = $false,
+    [switch]$EnableLinuxXDP = $false,
 
     [Parameter(Mandatory = $false)]
     [string]$Generator = "",
@@ -271,9 +271,9 @@ if ($Arch -eq "arm64ec") {
     }
 }
 
-if (!$IsLinux -Or $Arch -ne "x64") {
-    if ($EnableXDP) {
-        Write-Error "XDP is supported only on Linux x64"
+if ($IsLinux -And $Arch -ne "x64") {
+    if ($EnableLinuxXDP) {
+        Write-Error "Linux XDP is supported only on x64 platforms"
     }
 }
 
@@ -469,8 +469,8 @@ function CMake-Generate {
     if ($PGO) {
         $Arguments += " -DQUIC_PGO=on"
     }
-    if ($EnableXDP) {
-        $Arguments += " -DQUIC_XDP_ENABLED=on"
+    if ($EnableLinuxXDP) {
+        $Arguments += " -DQUIC_LINUX_XDP_ENABLED=on"
     }
     if ($Platform -eq "uwp") {
         $Arguments += " -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 -DQUIC_UWP_BUILD=on"

scripts/build.rs

@@ -19,8 +19,7 @@ fn main() {
     config
         .define("QUIC_ENABLE_LOGGING", logging_enabled)
         .define("QUIC_TLS", "openssl")
-        .define("QUIC_OUTPUT_DIR", "../lib")
-        .define("QUIC_CARGO_BUILD", "on");
+        .define("QUIC_OUTPUT_DIR", "../lib");
 
     match target.as_str() {
         "x86_64-apple-darwin" => config

src/platform/CMakeLists.txt

@@ -26,7 +26,7 @@ else()
     set(SOURCES ${SOURCES} inline.c platform_posix.c storage_posix.c cgroup.c datapath_unix.c)
     if(CX_PLATFORM STREQUAL "linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
         set(SOURCES ${SOURCES} datapath_linux.c datapath_epoll.c)
-        if (QUIC_XDP_ENABLED)
+        if (QUIC_LINUX_XDP_ENABLED)
             set(SOURCES ${SOURCES} datapath_xplat.c datapath_raw.c datapath_raw_linux.c datapath_raw_socket.c datapath_raw_socket_linux.c datapath_raw_xdp_linux.c)
         else()
             set(SOURCES ${SOURCES} datapath_xplat.c datapath_raw_dummy.c)
@@ -61,7 +61,7 @@ if("${CX_PLATFORM}" STREQUAL "windows")
         PUBLIC
         wbemuuid)
     target_link_libraries(platform PUBLIC winmm)
-elseif(QUIC_XDP_ENABLED)
+elseif(QUIC_LINUX_XDP_ENABLED)
     find_library(NL_LIB nl-3)
     find_library(NL_ROUTE_LIB nl-route-3)
     find_library(XDP_LIB libxdp.so)
@@ -111,7 +111,7 @@ if ("${CX_PLATFORM}" STREQUAL "windows")
         PRIVATE
         ${EXTRA_PLATFORM_INCLUDE_DIRECTORIES}
         ${PROJECT_SOURCE_DIR}/submodules/xdp-for-windows/published/external)
-elseif(QUIC_XDP_ENABLED)
+elseif(QUIC_LINUX_XDP_ENABLED)
     include_directories(/usr/include/libnl3)
     target_include_directories(platform PRIVATE ${EXTRA_PLATFORM_INCLUDE_DIRECTORIES})
 endif()