Add daita as a Cargo cfg variable

.github/workflows/android-app.yml

@@ -118,6 +118,8 @@ jobs:
       - name: Checkout repository
         if: steps.cache-relay-list.outputs.cache-hit != 'true'
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Generate
         if: steps.cache-relay-list.outputs.cache-hit != 'true'
@@ -164,6 +166,8 @@ jobs:
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Calculate native lib cache hash
         id: native-lib-cache-hash
@@ -232,6 +236,8 @@ jobs:
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Run gradle task
         uses: burrunan/gradle-cache-action@v1
@@ -259,6 +265,8 @@ jobs:
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: actions/download-artifact@v4
         with:
@@ -363,6 +371,8 @@ jobs:
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: actions/download-artifact@v4
         with:

.github/workflows/cargo-vendor.yml

@@ -16,7 +16,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install Rust
         uses: actions-rs/[email protected]

.github/workflows/clippy.yml

@@ -1,6 +1,6 @@
 ---
 name: Rust - Run Clippy to check lints
 on:
   pull_request:
     paths:
       - .github/workflows/clippy.yml
@@ -37,15 +37,14 @@
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+        with:
+          submodules: true
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Checkout binaries submodule
-        run: git submodule update --init --depth=1 dist-assets/binaries
-
       - uses: actions-rs/[email protected]
         with:
           toolchain: stable
@@ -58,6 +57,12 @@
           sudo apt-get update
           sudo apt-get install libdbus-1-dev
 
+      - name: Install Go
+        if: matrix.os == 'linux-latest' || matrix.os == 'macos-latest'
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.21.3
+
       - name: Clippy check
         shell: bash
         env:
@@ -83,6 +88,11 @@
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Checkout wireguard-go submodule
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go
+
       - name: Clippy check
         env:
           RUSTFLAGS: --deny warnings

.github/workflows/daemon.yml

@@ -1,6 +1,6 @@
 ---
 name: Daemon+CLI - Build and test
 on:
   pull_request:
     paths:
       - '**'
@@ -68,10 +68,10 @@
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Checkout binaries submodule
+      - name: Checkout submodules
         run: |
           git config --global --add safe.directory '*'
-          git submodule update --init --depth=1 dist-assets/binaries
+          git submodule update --init --depth=1 dist-assets/binaries wireguard-go-rs/libwg/wireguard-go
 
       # The container image already has rustup and Rust, but only the stable toolchain
       - name: Install Rust toolchain
@@ -86,6 +86,11 @@
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Checkout wireguard-go submodule
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go
+
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:

.github/workflows/desktop-e2e.yml

@@ -103,10 +103,10 @@ jobs:
         run: echo "HOME=/root" >> $GITHUB_ENV
       - name: Checkout repository
         uses: actions/checkout@v3
-      - name: Checkout binaries submodule
+      - name: Checkout submodules
         run: |
           git config --global --add safe.directory '*'
-          git submodule update --init --depth=1 dist-assets/binaries
+          git submodule update --init --depth=1 dist-assets/binaries wireguard-go-rs/libwg/wireguard-go
       - name: Build app
         env:
           USE_MOLD: false
@@ -159,9 +159,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --depth=1
+        uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
         with:
@@ -231,9 +231,9 @@ jobs:
     runs-on: [self-hosted, desktop-test, macOS] # app-test-macos-arm
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --depth=1
+        uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Install Go
         uses: actions/setup-go@v3
         with:

.github/workflows/frontend.yml

@@ -19,6 +19,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Checkout wireguard-go submodule
+        run: git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go
+
       - name: Install Rust
         uses: actions-rs/[email protected]
         with:

.github/workflows/rust-supply-chain.yml

@@ -1,6 +1,6 @@
 ---
 name: Rust - Supply chain
 on:
   pull_request:
     paths:
       - .github/workflows/rust-supply-chain.yml
@@ -16,6 +16,9 @@
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Checkout wireguard-go submodule
+        run: git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go
+
       - name: Run cargo deny
         uses: EmbarkStudios/cargo-deny-action@v1
         with:

.github/workflows/rust-unused-dependencies.yml

@@ -1,6 +1,6 @@
 ---
 name: Rust - Unused dependencies
 on:
   pull_request:
     paths:
       - .github/workflows/rust-unused-dependencies.yml
@@ -10,7 +10,7 @@
   workflow_dispatch:
 env:
   # Pinning nightly just to avoid random breakage. It's fine to bump this at any time
-  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-02-06
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-07
 jobs:
   prepare-containers:
     runs-on: ubuntu-latest
@@ -41,17 +41,17 @@
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Checkout binaries submodule
+      - name: Checkout submodules
         run: |
           git config --global --add safe.directory '*'
-          git submodule update --init --depth=1 dist-assets/binaries
+          git submodule update --init --depth=1 dist-assets/binaries wireguard-go-rs/libwg/wireguard-go
 
       - name: Install nightly Rust toolchain
         run: rustup default $RUST_NIGHTLY_TOOLCHAIN
 
       - uses: taiki-e/install-action@v2
         with:
-          tool: cargo-udeps
+          tool: cargo-udeps@0.1.48
 
       - name: Check for unused dependencies
         shell: bash
@@ -72,27 +72,36 @@
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Checkout wireguard-go submodule
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go
+
       - name: Install nightly Rust toolchain
         run: |
           rustup default $RUST_NIGHTLY_TOOLCHAIN
           rustup target add aarch64-linux-android
 
       - uses: taiki-e/install-action@v2
         with:
-          tool: cargo-udeps
+          tool: cargo-udeps@0.1.48
 
       - name: Check for unused dependencies
         run: cargo udeps --target aarch64-linux-android --package mullvad-jni
 
+  cargo-udeps-windows:
+    runs-on: windows-latest
+
   cargo-udeps:
     strategy:
       matrix:
-        os: [macos-latest, windows-latest]
+        os: [windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -108,7 +117,13 @@
 
       - uses: taiki-e/install-action@v2
         with:
-          tool: cargo-udeps
+          tool: [email protected]
+
+      - name: Install Go
+        if: matrix.os == 'macos-latest'
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.21.3
 
       - name: Check for unused dependencies
         shell: bash

.github/workflows/rustfmt.yml

@@ -14,6 +14,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Checkout wireguard-go submodule
+        run: git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go
+
       - name: Install nightly Rust
         uses: actions-rs/[email protected]
         with:

.github/workflows/translations.yml

@@ -1,6 +1,6 @@
 ---
 name: Translation check
 on:
   pull_request:
     paths:
       - .github/workflows/translations.yml
@@ -16,6 +16,9 @@
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Checkout wireguard-go submodule
+        run: git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go
+
       - name: Read volta info
         id: volta
         uses: zoexx/[email protected]

.github/workflows/unicode-check.yml

@@ -1,6 +1,6 @@
 ---
 name: Bidirectional Unicode scan
 on: [pull_request, workflow_dispatch]
 jobs:
   build-linux:
     runs-on: ubuntu-latest
@@ -9,7 +9,7 @@
         uses: actions/checkout@v3
 
       - name: Checkout submodules
-        run: git submodule update --init
+        run: git submodule update --init --depth=1 dist-assets/binaries wireguard-go-rs/libwg/wireguard-go
 
       - name: Scan for code points
         run: ./ci/check-trojan-source.sh .

.gitignore

@@ -37,6 +37,7 @@
 /android/play-api-key.json
 /wireguard/libwg/libwg.exp
 /wireguard/libwg/exports.def
+/wireguard-go-rs/libwg/libwg.a
 **/.vs/
 *.bak
 android/.idea

build.sh

@@ -162,11 +162,6 @@ else
     CARGO_ARGS+=(--features api-override)
 fi
 
-# Enable DAITA on supported platforms
-if [[ "$(uname -s)" == "MINGW"* || "$(uname -s)" == "Linux" ]]; then
-    CARGO_ARGS+=(--features daita)
-fi
-
 # Make Windows builds include a manifest in the daemon binary declaring it must
 # be run as admin.
 if [[ "$(uname -s)" == "MINGW"* ]]; then

mullvad-cli/Cargo.toml

@@ -10,9 +10,6 @@ rust-version.workspace = true
 [lints]
 workspace = true
 
-[features]
-daita = ["mullvad-management-interface/daita", "mullvad-types/daita", "talpid-types/daita"]
-
 [[bin]]
 name = "mullvad"
 path = "src/main.rs"

mullvad-cli/build.rs

@@ -15,4 +15,11 @@ fn main() {
         ));
         res.compile().expect("Unable to generate windows resources");
     }
+    let target_os = std::env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
+
+    // Enable Daita by default on Linux and Windows.
+    println!("cargo::rustc-check-cfg=cfg(daita)");
+    if let "linux" | "windows" = target_os.as_str() {
+        println!(r#"cargo::rustc-cfg=daita"#);
+    }
 }

mullvad-cli/src/cmds/relay.rs

@@ -542,7 +542,7 @@ impl Relay {
                     allowed_ips: all_of_the_internet(),
                     endpoint: SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), port),
                     psk: None,
-                    #[cfg(feature = "daita")]
+                    #[cfg(daita)]
                     constant_packet_size: false,
                 },
                 exit_peer: None,