WIP

WIP: support peer MAC addresses in --allow/--block
To enable cross-VM communication.
2026-10-09 16:25:44 +02:00 · 2026-05-28 00:56:08 +01:00 · 2026-05-28 00:49:26 +01:00
17 changed files with 1121 additions and 1967 deletions
@@ -0,0 +1,68 @@
+use_compute_credits: true
+
+macos_instance:
+  image: ghcr.io/cirruslabs/macos-runner:tahoe
+
+env:
+  PATH: "$PATH:$HOME/.cargo/bin"
+
+task:
+  name: Lint
+  install_rust_script: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+  rustfmt_script: cargo fmt --check
+  clippy_script: cargo clippy --all-targets --all-features -- -D warnings
+
+task:
+  alias: Test
+  matrix:
+    - name: Test on macOS Sequoia
+      macos_instance:
+        image: ghcr.io/cirruslabs/macos-runner:sequoia
+    - name: Test on macOS Tahoe
+      macos_instance:
+        image: ghcr.io/cirruslabs/macos-runner:tahoe
+  install_rust_script: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+  test_script: cargo test
+
+task:
+  name: Release (Dry Run)
+  only_if: $CIRRUS_TAG == ''
+  depends_on:
+    - Lint
+    - Test
+  install_rust_script: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+  install_script: brew install go
+  install_goreleaser_script: brew install --cask goreleaser/tap/goreleaser-pro
+  build_script: goreleaser build --snapshot
+  goreleaser_artifacts:
+    path: "dist/**"
+
+task:
+  name: Release
+  only_if: $CIRRUS_TAG != ''
+  depends_on:
+    - Lint
+    - Test
+  env:
+    GITHUB_TOKEN: ENCRYPTED[!98ace8259c6024da912c14d5a3c5c6aac186890a8d4819fad78f3e0c41a4e0cd3a2537dd6e91493952fb056fa434be7c!]
+    GORELEASER_KEY: ENCRYPTED[!9b80b6ef684ceaf40edd4c7af93014ee156c8aba7e6e5795f41c482729887b5c31f36b651491d790f1f668670888d9fd!]
+    SENTRY_ORG: cirrus-labs
+    SENTRY_PROJECT: persistent-workers
+    SENTRY_AUTH_TOKEN: ENCRYPTED[!c16a5cf7da5f856b4bc2f21fe8cb7aa2a6c981f851c094ed4d3025fd02ea59a58a86cee8b193a69a1fc20fa217e56ac3!]
+  install_rust_script: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+  install_script: brew install go getsentry/tools/sentry-cli
+  install_goreleaser_script: brew install --cask goreleaser/tap/goreleaser-pro
+  release_script: goreleaser
+  upload_sentry_debug_files_script:
+    - cd target/aarch64-apple-darwin/release/
+    # Generate and upload symbols
+    - dsymutil softnet
+    - sentry-cli debug-files upload -o $SENTRY_ORG -p $SENTRY_PROJECT softnet.dSYM/
+    # Bundle and upload sources
+    - sentry-cli debug-files bundle-sources softnet.dSYM/
+    - sentry-cli debug-files upload -o $SENTRY_ORG -p $SENTRY_PROJECT softnet.src.zip
+  create_sentry_release_script:
+    - export SENTRY_RELEASE="softnet@$CIRRUS_TAG"
+    - sentry-cli releases new $SENTRY_RELEASE
+    - sentry-cli releases set-commits $SENTRY_RELEASE --auto
+    - sentry-cli releases finalize $SENTRY_RELEASE
@@ -1,43 +0,0 @@
-name: CI
-
-on:
-  merge_group:
-  pull_request:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: macos-26
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v6
-      - name: Install Rust
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-      - name: Install lint components
-        run: rustup component add clippy rustfmt
-      - name: Check formatting
-        run: cargo fmt --check
-      - name: Run Clippy
-        run: cargo clippy --all-targets --all-features -- -D warnings
-
-  test:
-    name: Test on macOS 26
-    runs-on: macos-26
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v6
-      - name: Install Rust
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-      - name: Run tests
-        run: cargo test
@@ -1,84 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - "*"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  release:
-    name: Release
-    if: github.event_name == 'push' && github.ref_type == 'tag'
-    runs-on: macos-26
-    environment: publish
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Install Rust
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-      - name: Install release targets
-        run: rustup target add aarch64-apple-darwin x86_64-apple-darwin
-      - name: Create release app token for this repo
-        id: app-token
-        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
-        with:
-          app-id: ${{ secrets.RELEASE_APP_ID }}
-          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-          permission-contents: write
-      - name: Create release app token for homebrew-tools
-        id: tap-token
-        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
-        with:
-          app-id: ${{ secrets.RELEASE_APP_ID }}
-          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-          owner: openai
-          repositories: homebrew-tools
-          permission-contents: write
-          permission-pull-requests: write
-      - name: Release
-        uses: goreleaser/goreleaser-action@v7
-        with:
-          distribution: goreleaser-pro
-          version: "~> v2"
-          args: release --clean
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-          HOMEBREW_TAP_GITHUB_TOKEN: ${{ steps.tap-token.outputs.token }}
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-
-  snapshot:
-    name: Release (Dry Run)
-    if: github.event_name == 'workflow_dispatch'
-    runs-on: macos-26
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Install Rust
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-      - name: Install release targets
-        run: rustup target add aarch64-apple-darwin x86_64-apple-darwin
-      - name: Release dry run
-        uses: goreleaser/goreleaser-action@v7
-        with:
-          distribution: goreleaser-pro
-          version: "~> v2"
-          args: release --skip=publish --snapshot --clean
-      - name: Upload dry-run artifacts
-        uses: actions/upload-artifact@v6
-        with:
-          name: softnet-snapshot
-          path: dist/**
@@ -23,18 +23,11 @@ release:
 brews:
  - name: "{{ .ProjectName }}"
    repository:
-      owner: openai
-      name: homebrew-tools
-      token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
-      branch: "softnet-{{ .Version }}"
-      pull_request:
-        enabled: true
-    directory: Formula
+      owner: cirruslabs
+      name: homebrew-cli
    caveats: See the Github repository for more information
-    homepage: https://github.com/openai/softnet
+    homepage: https://github.com/cirruslabs/softnet
    description: Software networking with isolation for Tart
    skip_upload: auto
    custom_block: |
-      on_macos do
-        depends_on :macos => :sequoia
-      end
+      depends_on :macos => :sequoia
@@ -230,15 +230,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.104"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
-
-[[package]]
-name = "array-const-fn-init"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bcb85e548c05d407fa6faff46b750ba287714ef32afc0f5e15b4641ffd6affb"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"

 [[package]]
 name = "arrayvec"
@@ -374,9 +368,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.6.3"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fb99565819980999fb7b4a1796046a5c949e6d4ff132cf5fadf5a641e20d776"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -384,9 +378,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.6.2"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
 "anstream",
 "anstyle",
@@ -396,9 +390,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.6.3"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f2392eae7f16557a3d727ef3a12e57b2b2ca6f98566a5f4fb41ffe305df077"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -638,20 +632,20 @@ dependencies = [

 [[package]]
 name = "dhcproto"
-version = "0.16.0"
-source = "git+https://github.com/bluecatengineering/dhcproto.git?branch=master#60719e5df11359b12bf74e743b3c7e0831351c2d"
+version = "0.14.0"
+source = "git+https://github.com/bluecatengineering/dhcproto.git?branch=master#eece41c9a13b0e4912fb9a8f08401ab01b4123d4"
 dependencies = [
 "dhcproto-macros",
 "hickory-proto",
 "ipnet",
- "rand 0.10.1",
- "thiserror 2.0.19",
+ "rand 0.9.4",
+ "thiserror 2.0.12",
 ]

 [[package]]
 name = "dhcproto-macros"
 version = "0.2.0"
-source = "git+https://github.com/bluecatengineering/dhcproto.git?branch=master#60719e5df11359b12bf74e743b3c7e0831351c2d"
+source = "git+https://github.com/bluecatengineering/dhcproto.git?branch=master#eece41c9a13b0e4912fb9a8f08401ab01b4123d4"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -999,7 +993,7 @@ dependencies = [
 "jni",
 "once_cell",
 "rand 0.10.1",
- "thiserror 2.0.19",
+ "thiserror 2.0.12",
 "tinyvec",
 "tracing",
 "url",
@@ -1339,6 +1333,15 @@ version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"

+[[package]]
+name = "ipnetwork"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "iri-string"
 version = "0.7.10"
@@ -1373,7 +1376,7 @@ dependencies = [
 "jni-sys",
 "log",
 "simd_cesu8",
- "thiserror 2.0.19",
+ "thiserror 2.0.12",
 "walkdir",
 "windows-link",
 ]
@@ -1420,18 +1423,6 @@ dependencies = [
 "wasm-bindgen",
 ]

-[[package]]
-name = "jsonrpsee-types"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc88ff4688e43cc3fa9883a8a95c6fa27aa2e76c96e610b737b6554d650d7fd5"
-dependencies = [
- "http 1.1.0",
- "serde",
- "serde_json",
- "thiserror 2.0.19",
-]
-
 [[package]]
 name = "language-tags"
 version = "0.3.2"
@@ -1452,9 +1443,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"

 [[package]]
 name = "libc"
-version = "0.2.188"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22053b6a34f84abc97f9129e61334f40174659a1b9bd18c970b83db6a9a6348b"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"

 [[package]]
 name = "linux-raw-sys"
@@ -1503,9 +1494,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.33"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "mac_address"
@@ -1610,9 +1601,9 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.31.3"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
+checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
 dependencies = [
 "bitflags 2.9.4",
 "cfg-if",
@@ -1621,6 +1612,12 @@ dependencies = [
 "memoffset",
 ]

+[[package]]
+name = "no-std-net"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
+
 [[package]]
 name = "num-conv"
 version = "0.2.0"
@@ -1825,6 +1822,38 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"

+[[package]]
+name = "pnet_base"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7"
+dependencies = [
+ "no-std-net",
+]
+
+[[package]]
+name = "pnet_datalink"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7"
+dependencies = [
+ "ipnetwork",
+ "libc",
+ "pnet_base",
+ "pnet_sys",
+ "winapi",
+]
+
+[[package]]
+name = "pnet_sys"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "polling"
 version = "3.11.0"
@@ -1862,11 +1891,10 @@ dependencies = [

 [[package]]
 name = "prefix-trie"
-version = "0.9.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeb97a96d43f215f842f6ab81e8c7b5f6e9b912495c3178127f54f9dce28e32"
+checksum = "90f561214012d3fc240a1f9c817cc4d57f5310910d066069c1b093f766bb5966"
 dependencies = [
- "array-const-fn-init",
 "either",
 "ipnet",
 "num-traits",
@@ -2212,6 +2240,15 @@ dependencies = [
 "winapi-util",
 ]

+[[package]]
+name = "scc"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"
+dependencies = [
+ "sdd",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.24"
@@ -2227,6 +2264,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

+[[package]]
+name = "sdd"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
+
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -2258,9 +2301,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"

 [[package]]
 name = "sentry"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d631477761f57c76148456e55e80e9a479ff3fa4c65b2b4a0c3acf1167fd4638"
+checksum = "b93b3e19f45495ddd41d8222a152c48c84f6ba45abe9c69e2527e9cdea29bb5b"
 dependencies = [
 "cfg_aliases",
 "httpdate",
@@ -2279,9 +2322,9 @@ dependencies = [

 [[package]]
 name = "sentry-actix"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "119ede4e37790ec04e8a14073c8414f0a4b2648402856c0563495a9a5cf54d57"
+checksum = "168d0312e1b1741d8295a16c7b2c62c10c76302f7476a1749d6ccc14cb40663a"
 dependencies = [
 "actix-http",
 "actix-web",
@@ -2292,9 +2335,9 @@ dependencies = [

 [[package]]
 name = "sentry-anyhow"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f73466a403f4da78c7e576049d6044b31d2b16dfcc26b51705f318ed74b804"
+checksum = "0fafe70e622ded2d3b75dc7889ecb5391b4c22d850b5a36e81af4615cbe687f2"
 dependencies = [
 "anyhow",
 "sentry-backtrace",
@@ -2303,9 +2346,9 @@ dependencies = [

 [[package]]
 name = "sentry-backtrace"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "448b0981fbde6cdc9eb087ba3dc01035a253fef9a0d9e79aaf198fc26acb2e64"
+checksum = "dc84c325ace9ca2388e510fe7d6672b5d60cd8b3bd0eb4bb4ee8314c323cd686"
 dependencies = [
 "backtrace",
 "regex",
@@ -2314,9 +2357,9 @@ dependencies = [

 [[package]]
 name = "sentry-contexts"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5e909d02170ba6d1dc5ebd05bef7999280f5d960e3eaee5d1a18d88d41b334"
+checksum = "896c1ab62dbfe1746fb262bbf72e6feb2fb9dfb2c14709077bf71beb532e44b2"
 dependencies = [
 "hostname",
 "libc",
@@ -2328,9 +2371,9 @@ dependencies = [

 [[package]]
 name = "sentry-core"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecf0b1a4a4e9ec88395b52e6fa4868b95564c1fa96b26a0606f5f6288a0f7149"
+checksum = "d5f5abf20c42cb1593ec1638976e2647da55f79bccac956444c1707b6cce259a"
 dependencies = [
 "rand 0.9.4",
 "sentry-types",
@@ -2341,9 +2384,9 @@ dependencies = [

 [[package]]
 name = "sentry-debug-images"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81d7749c57fc78ed52134889e8121da874065bc40da788d5798cce0f8c19f15"
+checksum = "4b88bbe6a760d5724bb40689827e82e8db1e275947df2c59abe171bfc30bb671"
 dependencies = [
 "findshlibs",
 "sentry-core",
@@ -2351,9 +2394,9 @@ dependencies = [

 [[package]]
 name = "sentry-panic"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7d93d6ecb55d2251c5fc084c55c03a2bc68904918d76117e602c999e92f00f"
+checksum = "0260dcb52562b6a79ae7702312a26dba94b79fb5baee7301087529e5ca4e872e"
 dependencies = [
 "sentry-backtrace",
 "sentry-core",
@@ -2361,9 +2404,9 @@ dependencies = [

 [[package]]
 name = "sentry-tracing"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58d26379236c4ef97eaf081bca3c7bf0ef6f06b3aa881eca2ee8e8dbc923e5b8"
+checksum = "a1c035f3a0a8671ae1a231c5b457abb68b71acba2bf3054dab2a09a9d4ea487e"
 dependencies = [
 "bitflags 2.9.4",
 "sentry-backtrace",
@@ -2374,16 +2417,16 @@ dependencies = [

 [[package]]
 name = "sentry-types"
-version = "0.48.5"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2239099d47e76857b0825a182ecdb90159add7aa1097b60247c6e7ca6bf49c6a"
+checksum = "82d8e81058ec155992191f61c7b29bfa7b2cf12012131e7cdc0678020898a7c9"
 dependencies = [
 "debugid",
 "hex",
 "rand 0.9.4",
 "serde",
 "serde_json",
- "thiserror 2.0.19",
+ "thiserror 2.0.12",
 "time",
 "url",
 "uuid",
@@ -2391,9 +2434,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.229"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
 "serde_core",
 "serde_derive",
@@ -2401,35 +2444,34 @@ dependencies = [

 [[package]]
 name = "serde_core"
-version = "1.0.229"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.229"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 3.0.2",
+ "syn 2.0.117",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
 "itoa",
 "memchr",
+ "ryu",
 "serde",
- "serde_core",
- "zmij",
 ]

 [[package]]
@@ -2446,23 +2488,24 @@ dependencies = [

 [[package]]
 name = "serial_test"
-version = "3.5.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "699f4197115b8a7e7ff19c9a315a4bd6fffec26cc4626ef45ecaea389e081c6d"
+checksum = "911bd979bf1070a3f3aa7b691a3b3e9968f339ceeec89e08c280a8a22207a32f"
 dependencies = [
 "futures-executor",
 "futures-util",
 "log",
 "once_cell",
 "parking_lot",
+ "scc",
 "serial_test_derive",
 ]

 [[package]]
 name = "serial_test_derive"
-version = "3.5.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94e153fc76e1c6a068703d6d29c508a0b15c061c4b7e43da59cc097bc342673c"
+checksum = "0a7d91949b85b0d2fb687445e448b40d322b6b3e4af6b44a29b21d9a5f33e6d9"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2572,20 +2615,18 @@ dependencies = [
 "dhcproto",
 "ip_network",
 "ipnet",
- "jsonrpsee-types",
 "libc",
 "log",
 "mac_address",
- "nix 0.31.3",
+ "nix 0.31.2",
 "num_enum 0.7.6",
 "oslog",
+ "pnet_datalink",
 "polling",
 "prefix-trie",
 "privdrop",
 "sentry",
 "sentry-anyhow",
- "serde",
- "serde_json",
 "serial_test",
 "smoltcp",
 "system-configuration",
@@ -2639,17 +2680,6 @@ dependencies = [
 "unicode-ident",
 ]

-[[package]]
-name = "syn"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a207d6d6a2b7fc470b80443726053f18a2481b7e1eee970597051596567987a3"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.1"
@@ -2715,11 +2745,11 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.19"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.19",
+ "thiserror-impl 2.0.12",
 ]

 [[package]]
@@ -2735,13 +2765,13 @@ dependencies = [

 [[package]]
 name = "thiserror-impl"
-version = "2.0.19"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 3.0.2",
+ "syn 2.0.117",
 ]

 [[package]]
@@ -3765,9 +3795,3 @@ dependencies = [
 "quote",
 "syn 2.0.117",
 ]
-
-[[package]]
-name = "zmij"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
@@ -34,9 +34,7 @@ oslog = "0.2.0"
 log = "0.4.29"
 serial_test = "3"
 coarsetime = "0.1.37"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-jsonrpsee-types = "0.26"
+pnet_datalink = "0.35.0"

 [profile.release]
 debug = true
@@ -1,105 +1,661 @@
-# Functional Source License, Version 1.1, ALv2 Future License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007

-## Abbreviation
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-FSL-1.1-ALv2
+                            Preamble

-## Notice
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.

-Copyright 2022-2026 OpenAI
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.

-## Terms and Conditions
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.

-### Licensor ("We")
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.

-The party offering the Software under these Terms and Conditions.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.

-### The Software
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.

-The "Software" is each version of the software that we make available under
-these Terms and Conditions, as indicated by our inclusion of these Terms and
-Conditions with the Software.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.

-### License Grant
+  The precise terms and conditions for copying, distribution and
+modification follow.

-Subject to your compliance with this License Grant and the Patents,
-Redistribution and Trademark clauses below, we hereby grant you the right to
-use, copy, modify, create derivative works, publicly perform, publicly display
-and redistribute the Software for any Permitted Purpose identified below.
+                       TERMS AND CONDITIONS

-### Permitted Purpose
+  0. Definitions.

-A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
-means making the Software available to others in a commercial product or
-service that:
+  "This License" refers to version 3 of the GNU Affero General Public License.

-1. substitutes for the Software;
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.

-2. substitutes for any other product or service we offer using the Software
-   that exists as of the date we make the Software available; or
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.

-3. offers the same or substantially similar functionality as the Software.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.

-Permitted Purposes specifically include using the Software:
+  A "covered work" means either the unmodified Program or a work based
+on the Program.

-1. for your internal use and access;
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.

-2. for non-commercial education;
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.

-3. for non-commercial research; and
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.

-4. in connection with professional services that you provide to a licensee
-   using the Software in accordance with these Terms and Conditions.
+  1. Source Code.

-### Patents
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.

-To the extent your use for a Permitted Purpose would necessarily infringe our
-patents, the license grant above includes a license under our patents. If you
-make a claim against any party that the Software infringes or contributes to
-the infringement of any patent, then your patent license to the Software ends
-immediately.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.

-### Redistribution
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.

-The Terms and Conditions apply to all copies, modifications and derivatives of
-the Software.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.

-If you redistribute any copies, modifications or derivatives of the Software,
-you must include a copy of or a link to these Terms and Conditions and not
-remove any copyright notices provided in or with the Software.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.

-### Disclaimer
+  The Corresponding Source for a work in source code form is that
+same work.

-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
-PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+  2. Basic Permissions.

-IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
-SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.

-### Trademarks
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.

-Except for displaying the License Details and identifying us as the origin of
-the Software, you have no right under these Terms and Conditions to use our
-trademarks, trade names, service marks or product names.
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.

-## Grant of Future License
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.

-We hereby irrevocably grant you an additional license to use the Software under
-the Apache License, Version 2.0 that is effective on the second anniversary of
-the date we make the Software available. On or after that date, you may use the
-Software under the Apache License, Version 2.0, in which case the following
-will apply:
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.

-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.

-You may obtain a copy of the License at
+  4. Conveying Verbatim Copies.

-http://www.apache.org/licenses/LICENSE-2.0
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.

-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
@@ -43,18 +43,3 @@ For proper functioning, Softnet binary requires two things:
 ## Running

 Softnet is started and managed automatically by Tart if `--net-softnet` flag is provided when calling `tart run`.
-
-### Dynamic network policy
-
-Softnet can update the running VM's IPv4 egress policy without restarting the VM. Pass a connected Unix stream socket as `--control-fd` to enable a newline-delimited [JSON-RPC 2.0](https://www.jsonrpc.org/specification) control channel. The socket is duplex and must be separate from `--vm-fd`, which carries VM packets.
-
-The supported methods are `softnet.policy.get` and `softnet.policy.set`. A complete policy update looks like this (each request and response occupies one line):
-
-```json
-{"jsonrpc":"2.0","id":"42","method":"softnet.policy.set","params":{"allow":["@host","10.0.0.0/8"],"block":["0.0.0.0/0"]}}
-{"jsonrpc":"2.0","id":"42","result":{"allow":["10.0.0.0/8","@host"],"block":["0.0.0.0/0"],"ruleCount":3}}
-```
-
-Every request must include a non-null string (at most 256 bytes) or non-negative integer `id`; notifications are rejected so policy changes always have an acknowledgment. Policy updates are atomic: all targets are parsed and a new prefix map is built before the active policy changes. Longest-prefix matching and block precedence for identical prefixes are preserved. Targets are normalized and deduplicated. A policy update may contain at most 4096 combined allow/block targets, and a request frame may not exceed 1 MiB.
-
-Use `block=["0.0.0.0/0"]` with specific allow targets for a default-deny policy. Closing the control socket leaves the last accepted policy active.
@@ -1,6 +1,8 @@
 use anyhow::{Context, Result, anyhow};
 use clap::ValueEnum;
 use log::info;
+use smoltcp::wire::EthernetAddress;
+use std::net::IpAddr;
 use std::net::Ipv4Addr;
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::os::unix::net::UnixDatagram;
@@ -28,6 +30,7 @@ pub struct Host {
    new_packets_rx: UnixDatagram,
    callback_can_continue_tx: SyncSender<()>,
    pub gateway_ip: smoltcp::wire::Ipv4Address,
+    pub gateway_mac: EthernetAddress,
    pub max_packet_size: u64,
    pub read_max_packets: u64,
    finalized: bool,
@@ -49,16 +52,43 @@ impl Host {
        .context("failed to initialize vmnet interface")?;

        // Retrieve first IP (gateway) used for this interface
-        let Some(Parameter::StartAddress(gateway_ip)) =
+        let Some(Parameter::StartAddress(start_address)) =
            interface.parameters().get(ParameterKind::StartAddress)
        else {
            return Err(anyhow!(
                "failed to retrieve vmnet's interface start address"
            ));
        };
-        let gateway_ip = Ipv4Addr::from_str(&gateway_ip)
+        let start_address = Ipv4Addr::from_str(&start_address)
            .context("failed to parse vmnet's interface start address")?;

+        // Retrieve last IP used for this interface and calculate the prefix
+        let Some(Parameter::EndAddress(end_address)) =
+            interface.parameters().get(ParameterKind::EndAddress)
+        else {
+            return Err(anyhow!("failed to retrieve vmnet's interface end address"));
+        };
+        let end_address = Ipv4Addr::from_str(&end_address)
+            .context("failed to parse vmnet's interface end address")?;
+
+        let Some(prefix) = Self::ipv4_range_prefix(start_address, end_address) else {
+            return Err(anyhow!(
+                "failed to resolve vmnet's interface: prefix ambiguity for {}–{}",
+                start_address,
+                end_address
+            ));
+        };
+
+        // Figure out the gateway's interface MAC address
+        let Some(gateway_mac) = Self::interface_mac_for_ip(start_address, prefix) else {
+            return Err(anyhow!(
+                "failed to resolve vmnet's interface: no interface found with {}/{} CIDR",
+                start_address,
+                prefix
+            ));
+        };
+        let gateway_mac = EthernetAddress(gateway_mac.octets());
+
        // Retrieve max packet size for this interface
        let Some(Parameter::MaxPacketSize(max_packet_size)) =
            interface.parameters().get(ParameterKind::MaxPacketSize)
@@ -104,12 +134,39 @@ impl Host {
            interface,
            new_packets_rx,
            callback_can_continue_tx,
-            gateway_ip,
+            gateway_ip: start_address,
+            gateway_mac,
            max_packet_size,
            read_max_packets,
            finalized: false,
        })
    }
+
+    fn interface_mac_for_ip(ip: Ipv4Addr, prefix: u8) -> Option<pnet_datalink::MacAddr> {
+        for iface in pnet_datalink::interfaces() {
+            if iface
+                .ips
+                .iter()
+                .any(|network| network.ip() == IpAddr::V4(ip) && network.prefix() == prefix)
+                && let Some(mac) = iface.mac
+            {
+                return Some(mac);
+            }
+        }
+
+        None
+    }
+
+    fn ipv4_range_prefix(start_address: Ipv4Addr, end_address: Ipv4Addr) -> Option<u8> {
+        let start_address = start_address.to_bits();
+        let end_address = end_address.to_bits();
+
+        if start_address > end_address {
+            return None;
+        }
+
+        Some((start_address ^ end_address).leading_zeros() as u8)
+    }
 }

 impl Host {
@@ -198,3 +255,58 @@ impl AsRawFd for Host {
        self.new_packets_rx.as_raw_fd()
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::Host;
+    use std::net::Ipv4Addr;
+
+    #[test]
+    fn ipv4_range_prefix_for_class_c_subnet() {
+        assert_eq!(
+            Host::ipv4_range_prefix(
+                Ipv4Addr::new(192, 168, 64, 0),
+                Ipv4Addr::new(192, 168, 64, 255),
+            ),
+            Some(24)
+        );
+    }
+
+    #[test]
+    fn ipv4_range_prefix_for_single_address() {
+        assert_eq!(
+            Host::ipv4_range_prefix(Ipv4Addr::new(10, 0, 0, 1), Ipv4Addr::new(10, 0, 0, 1)),
+            Some(32)
+        );
+    }
+
+    #[test]
+    fn ipv4_range_prefix_for_class_c_usable_range() {
+        assert_eq!(
+            Host::ipv4_range_prefix(
+                Ipv4Addr::new(192, 168, 64, 1),
+                Ipv4Addr::new(192, 168, 64, 254),
+            ),
+            Some(24)
+        );
+    }
+
+    #[test]
+    fn ipv4_range_prefix_for_containing_class_c_subnet() {
+        assert_eq!(
+            Host::ipv4_range_prefix(
+                Ipv4Addr::new(192, 168, 64, 2),
+                Ipv4Addr::new(192, 168, 64, 254),
+            ),
+            Some(24)
+        );
+    }
+
+    #[test]
+    fn ipv4_range_prefix_rejects_inverted_range() {
+        assert_eq!(
+            Host::ipv4_range_prefix(Ipv4Addr::new(10, 0, 0, 2), Ipv4Addr::new(10, 0, 0, 1)),
+            None
+        );
+    }
+}
@@ -12,7 +12,6 @@ pub struct Poller<'poller> {
    timeout: Duration,
    vm_fd: BorrowedFd<'poller>,
    host_fd: BorrowedFd<'poller>,
-    control_fd: Option<BorrowedFd<'poller>>,
 }

 #[derive(IntoPrimitive)]
@@ -20,7 +19,6 @@ pub struct Poller<'poller> {
 enum EventKey {
    VM,
    Host,
-    Control,
    Interrupt,
 }

@@ -28,7 +26,6 @@ impl Poller<'_> {
    pub fn new<'poller>(
        vm_fd: RawFd,
        host_fd: RawFd,
-        control_fd: Option<RawFd>,
        timeout: Duration,
    ) -> Result<Poller<'poller>> {
        let poller = polling::Poller::new()?;
@@ -39,7 +36,6 @@ impl Poller<'_> {
            timeout,
            vm_fd: unsafe { BorrowedFd::borrow_raw(vm_fd) },
            host_fd: unsafe { BorrowedFd::borrow_raw(host_fd) },
-            control_fd: control_fd.map(|fd| unsafe { BorrowedFd::borrow_raw(fd) }),
        })
    }

@@ -50,14 +46,6 @@ impl Poller<'_> {
                self.vm_interest(),
                PollMode::Edge,
            )?;
-
-            if let Some(control_fd) = self.control_fd {
-                self.poller.add_with_mode(
-                    control_fd.as_raw_fd(),
-                    polling::Event::all(EventKey::Control.into()),
-                    PollMode::Edge,
-                )?;
-            }
            self.poller.add_with_mode(
                self.host_fd.as_raw_fd(),
                self.host_interest(),
@@ -91,17 +79,10 @@ impl Poller<'_> {
            .events
            .iter()
            .any(|ev| ev.key == Into::<usize>::into(EventKey::Interrupt));
+
        Ok((vm_readable, host_readable, interrupt))
    }

-    pub fn remove_control(&mut self) -> Result<()> {
-        if let Some(control_fd) = self.control_fd.take() {
-            self.poller.delete(control_fd)?;
-        }
-
-        Ok(())
-    }
-
    fn vm_interest(&self) -> polling::Event {
        polling::Event::readable(EventKey::VM.into())
    }
@@ -37,6 +37,14 @@ impl Proxy<'_> {
    }

    fn allowed_from_host(&mut self, frame: &EthernetFrame<&[u8]>) -> Option<()> {
+        let from_gateway = frame.src_addr() == self.host.gateway_mac;
+        let peer_action = self.rules_mac.get(frame.src_addr().as_bytes());
+        let from_allowed_peer = peer_action == Some(&crate::proxy::Action::Allow);
+
+        if !from_gateway && !from_allowed_peer {
+            return None;
+        }
+
        match frame.ethertype() {
            EthernetProtocol::Arp => Some(()),
            EthernetProtocol::Ipv4 => Some(()),
@@ -1,4 +1,3 @@
-mod control;
 mod exposed_port;
 mod host;
 mod port_forwarder;
@@ -11,13 +10,13 @@ use crate::host::NetType;
 use crate::poller::Poller;
 use crate::vm::VM;
 use anyhow::Result;
-use control::Control;
 pub use exposed_port::ExposedPort;
 use ipnet::Ipv4Net;
 use mac_address::MacAddress;
 use port_forwarder::PortForwarder;
-use prefix_trie::PrefixMap;
+use prefix_trie::{Prefix, PrefixMap};
 use smoltcp::wire::EthernetFrame;
+use std::collections::HashMap;
 use std::io::ErrorKind;
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::str::FromStr;
@@ -31,7 +30,7 @@ pub struct Proxy<'proxy> {
    vm_mac_address: smoltcp::wire::EthernetAddress,
    dhcp_snooper: DhcpSnooper,
    rules: PrefixMap<Ipv4Net, Action>,
-    control: Option<Control>,
+    rules_mac: HashMap<[u8; 6], Action>,
    enobufs_encountered: bool,
    port_forwarder: PortForwarder,
 }
@@ -39,9 +38,20 @@ pub struct Proxy<'proxy> {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Target {
    Prefix(Ipv4Net),
+    MacAddress(MacAddress),
    Host,
 }

+impl Target {
+    pub fn is_ipv4_default_route(&self) -> bool {
+        matches!(self, Target::Prefix(prefix) if *prefix == Ipv4Net::zero())
+    }
+
+    pub fn is_mac_address(&self) -> bool {
+        matches!(self, Target::MacAddress(_))
+    }
+}
+
 impl FromStr for Target {
    type Err = ipnet::AddrParseError;

@@ -50,6 +60,10 @@ impl FromStr for Target {
            return Ok(Target::Host);
        }

+        if let Ok(mac_address) = MacAddress::from_str(s) {
+            return Ok(Target::MacAddress(mac_address));
+        }
+
        Ipv4Net::from_str(s).map(Target::Prefix)
    }
 }
@@ -65,39 +79,32 @@ impl Proxy<'_> {
        vm_fd: RawFd,
        vm_mac_address: MacAddress,
        vm_net_type: NetType,
+        enable_isolation: bool,
        allow: Vec<Target>,
        block: Vec<Target>,
        exposed_ports: Vec<ExposedPort>,
-        control_fd: Option<RawFd>,
    ) -> Result<Proxy<'proxy>> {
        let vm = VM::new(vm_fd)?;
-        let host = Host::new(
-            vm_net_type,
-            !allow.contains(&Target::Prefix(Ipv4Net::default())),
-        )?;
+        let host = Host::new(vm_net_type, enable_isolation)?;
        let poller_timeout = Duration::from_millis(100);
-        let control = control_fd
-            .map(|control_fd| {
-                Control::new(control_fd, host.gateway_ip, allow.clone(), block.clone())
-            })
-            .transpose()?;
-        let poller = Poller::new(
-            vm.as_raw_fd(),
-            host.as_raw_fd(),
-            control.as_ref().map(AsRawFd::as_raw_fd),
-            poller_timeout,
-        )?;
+        let poller = Poller::new(vm.as_raw_fd(), host.as_raw_fd(), poller_timeout)?;

        // Craft packet filter rules
        //
        // SECURITY: blocking rules must always take precedence
        // over allowing rules when prefixes are identical.
        let mut rules = PrefixMap::new();
+        let mut rules_mac = HashMap::new();

        for allow_target in allow {
            let allow_prefix = match allow_target {
                Target::Prefix(prefix) => prefix,
                Target::Host => host.gateway_ip.into(),
+                Target::MacAddress(mac_address) => {
+                    rules_mac.insert(mac_address.bytes(), Action::Allow);
+
+                    continue;
+                }
            };

            rules.insert(allow_prefix, Action::Allow);
@@ -107,6 +114,11 @@ impl Proxy<'_> {
            let block_prefix = match block_target {
                Target::Prefix(prefix) => prefix,
                Target::Host => host.gateway_ip.into(),
+                Target::MacAddress(mac_address) => {
+                    rules_mac.insert(mac_address.bytes(), Action::Block);
+
+                    continue;
+                }
            };

            rules.insert(block_prefix, Action::Block);
@@ -119,7 +131,7 @@ impl Proxy<'_> {
            vm_mac_address: smoltcp::wire::EthernetAddress(vm_mac_address.bytes()),
            dhcp_snooper: DhcpSnooper::new(poller_timeout),
            rules,
-            control,
+            rules_mac,
            enobufs_encountered: false,
            port_forwarder: PortForwarder::new(exposed_ports),
        })
@@ -144,10 +156,6 @@ impl Proxy<'_> {
            // Update coarse time for the DHCP snooper
            coarsetime::Instant::update();

-            // Service control on every wake (including timeouts) so a bounded read or a pending
-            // response continues making progress even when no new edge is generated.
-            self.service_control();
-
            if vm_readable {
                self.read_from_vm(buf.as_mut_slice())?;
            }
@@ -172,8 +180,6 @@ impl Proxy<'_> {
    }

    fn read_from_vm(&mut self, buf: &mut [u8]) -> Result<()> {
-        let mut packets_read = 0;
-
        loop {
            match self.vm.read(buf) {
                Ok(n) => {
@@ -183,12 +189,6 @@ impl Proxy<'_> {
                    if let Ok(frame) = EthernetFrame::new_checked(&buf[..n]) {
                        self.process_frame_from_vm(frame)?;
                    }
-
-                    packets_read += 1;
-                    if packets_read == 128 {
-                        self.service_control();
-                        packets_read = 0;
-                    }
                }
                Err(err) => {
                    if err.kind() == ErrorKind::WouldBlock {
@@ -213,8 +213,6 @@ impl Proxy<'_> {
                            self.process_frame_from_host(&pkt)?;
                        }
                    }
-
-                    self.service_control();
                }
                Err(err) => {
                    if let vmnet::Error::VmnetReadNothing = err {
@@ -226,47 +224,19 @@ impl Proxy<'_> {
            }
        }
    }
-
-    fn service_control(&mut self) {
-        let Some(control) = self.control.as_mut() else {
-            return;
-        };
-
-        let keep_open = match control.service(&mut self.rules) {
-            Ok(keep_open) => keep_open,
-            Err(err) => {
-                log::warn!("disabling Softnet control socket: {err:#}");
-                false
-            }
-        };
-
-        if keep_open {
-            return;
-        }
-
-        if let Err(err) = self.poller.remove_control() {
-            log::warn!("failed to remove Softnet control socket from the poller: {err:#}");
-        }
-
-        if let Some(control) = self.control.take()
-            && let Err(err) = control.shutdown()
-        {
-            log::warn!("failed to shut down Softnet control socket: {err:#}");
-        }
-    }
 }

 #[cfg(test)]
 mod tests {
    use crate::NetType;
    use crate::dhcp_snooper::Lease;
-    use crate::proxy::{Action, Proxy};
+    use crate::proxy::{Action, Proxy, Target};
    use ipnet::Ipv4Net;
    use mac_address::MacAddress;
    use nix::sys::socket::{AddressFamily, SockFlag, SockType, socketpair};
    use prefix_trie::PrefixMap;
    use serial_test::serial;
-    use smoltcp::wire::{Ipv4Address, Ipv4Packet};
+    use smoltcp::wire::{EthernetAddress, Ipv4Address, Ipv4Packet};
    use std::collections::HashSet;
    use std::os::fd::AsRawFd;
    use std::str::FromStr;
@@ -329,6 +299,30 @@ mod tests {
        assert!(allowed_from_vm_ipv4(&proxy, vm_ip, &proxy.host.gateway_ip.to_string()).is_some());
    }

+    #[test]
+    #[serial]
+    fn test_allow_mac_takes_precedence_over_blocked_prefix() {
+        let vm_ip = Ipv4Address::from_str("192.168.0.2").unwrap();
+        let peer_mac = EthernetAddress([0x02, 0, 0, 0, 0, 0x02]);
+        let proxy = create_proxy(vm_ip, vec!["02:00:00:00:00:02"], vec!["0.0.0.0/0"]);
+
+        assert!(allowed_from_vm_ipv4_to_mac(&proxy, vm_ip, "192.168.0.3", peer_mac).is_some());
+    }
+
+    #[test]
+    #[serial]
+    fn test_block_mac_takes_precedence_over_allowed_prefix() {
+        let vm_ip = Ipv4Address::from_str("192.168.0.2").unwrap();
+        let peer_mac = EthernetAddress([0x02, 0, 0, 0, 0, 0x02]);
+        let proxy = create_proxy(
+            vm_ip,
+            vec!["192.168.0.0/24", "02:00:00:00:00:02"],
+            vec!["02:00:00:00:00:02"],
+        );
+
+        assert!(allowed_from_vm_ipv4_to_mac(&proxy, vm_ip, "192.168.0.3", peer_mac).is_none());
+    }
+
    fn create_proxy<'test>(vm_ip: Ipv4Address, allow: Vec<&str>, block: Vec<&str>) -> Proxy<'test> {
        let (vm_fd, _) = socketpair(
            AddressFamily::Unix,
@@ -339,20 +333,25 @@ mod tests {
        .unwrap();
        let vm_fd = Box::leak(Box::new(vm_fd));

+        let allow: Vec<Target> = allow
+            .into_iter()
+            .map(|cidr| cidr.parse().unwrap())
+            .collect();
+        let block: Vec<Target> = block
+            .into_iter()
+            .map(|cidr| cidr.parse().unwrap())
+            .collect();
+        let enable_isolation = !allow.iter().any(Target::is_ipv4_default_route)
+            && !allow.iter().chain(block.iter()).any(Target::is_mac_address);
+
        let mut proxy = Proxy::new(
            vm_fd.as_raw_fd(),
            MacAddress::from_str("02:00:00:00:00:01").unwrap(),
            NetType::Nat,
-            allow
-                .into_iter()
-                .map(|cidr| cidr.parse().unwrap())
-                .collect(),
-            block
-                .into_iter()
-                .map(|cidr| cidr.parse().unwrap())
-                .collect(),
+            enable_isolation,
+            allow,
+            block,
            Vec::default(),
-            None,
        )
        .unwrap();

@@ -366,6 +365,15 @@ mod tests {
    }

    fn allowed_from_vm_ipv4(proxy: &Proxy, src: Ipv4Address, dst: &str) -> Option<()> {
+        allowed_from_vm_ipv4_to_mac(proxy, src, dst, EthernetAddress([0x02, 0, 0, 0, 0, 0x03]))
+    }
+
+    fn allowed_from_vm_ipv4_to_mac(
+        proxy: &Proxy,
+        src: Ipv4Address,
+        dst: &str,
+        dst_mac: EthernetAddress,
+    ) -> Option<()> {
        let mut buf = vec![0; 1500];

        let mut ipv4_pkt_mut = Ipv4Packet::new_unchecked(&mut buf[..]);
@@ -374,6 +382,6 @@ mod tests {

        let ipv4_pkt = Ipv4Packet::new_unchecked(buf.as_slice());

-        proxy.allowed_from_vm_ipv4(ipv4_pkt)
+        proxy.allowed_from_vm_ipv4(ipv4_pkt, dst_mac)
    }
 }
@@ -17,50 +17,10 @@ impl UdpPacketHelper for UdpPacket<&[u8]> {
    }

    fn is_dhcp_request(&self) -> bool {
-        self.src_port() == Self::BOOTPC_PORT && self.dst_port() == Self::BOOTPS_PORT
+        self.src_port() == Self::BOOTPC_PORT || self.dst_port() == Self::BOOTPS_PORT
    }

    fn is_dhcp_response(&self) -> bool {
-        self.src_port() == Self::BOOTPS_PORT && self.dst_port() == Self::BOOTPC_PORT
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::UdpPacketHelper;
-    use smoltcp::wire::UdpPacket;
-
-    #[test]
-    fn test_is_dhcp_request_requires_both_standard_ports() {
-        assert!(is_dhcp_request(68, 67));
-        assert!(!is_dhcp_request(68, 9999));
-        assert!(!is_dhcp_request(9999, 67));
-    }
-
-    #[test]
-    fn test_is_dhcp_response_requires_both_standard_ports() {
-        assert!(is_dhcp_response(67, 68));
-        assert!(!is_dhcp_response(67, 9999));
-        assert!(!is_dhcp_response(9999, 68));
-    }
-
-    fn is_dhcp_request(src_port: u16, dst_port: u16) -> bool {
-        let buffer = udp_packet_buffer(src_port, dst_port);
-        let udp_pkt = UdpPacket::new_unchecked(&buffer[..]);
-        udp_pkt.is_dhcp_request()
-    }
-
-    fn is_dhcp_response(src_port: u16, dst_port: u16) -> bool {
-        let buffer = udp_packet_buffer(src_port, dst_port);
-        let udp_pkt = UdpPacket::new_unchecked(&buffer[..]);
-        udp_pkt.is_dhcp_response()
-    }
-
-    fn udp_packet_buffer(src_port: u16, dst_port: u16) -> [u8; 8] {
-        let mut buffer = [0; 8];
-        let mut udp_pkt = UdpPacket::new_unchecked(&mut buffer[..]);
-        udp_pkt.set_src_port(src_port);
-        udp_pkt.set_dst_port(dst_port);
-        buffer
+        self.src_port() == Self::BOOTPS_PORT || self.dst_port() == Self::BOOTPC_PORT
    }
 }
@@ -1,13 +1,12 @@
-use crate::dhcp_snooper::Lease;
 use crate::proxy::udp_packet_helper::UdpPacketHelper;
 use crate::proxy::{Action, Proxy};
 use anyhow::Context;
 use anyhow::Result;
 use ipnet::Ipv4Net;
 use smoltcp::wire::{
-    ArpOperation, ArpPacket, ArpRepr, EthernetFrame, EthernetProtocol, IpProtocol, Ipv4Packet,
-    UdpPacket,
+    ArpPacket, EthernetAddress, EthernetFrame, EthernetProtocol, IpProtocol, Ipv4Packet, UdpPacket,
 };
+use std::net::Ipv4Addr;

 impl Proxy<'_> {
    pub(crate) fn process_frame_from_vm(&mut self, frame: EthernetFrame<&[u8]>) -> Result<()> {
@@ -30,27 +29,60 @@ impl Proxy<'_> {
        match frame.ethertype() {
            EthernetProtocol::Arp => {
                let arp_pkt = ArpPacket::new_checked(frame.payload()).ok()?;
-                self.allowed_from_vm_arp(arp_pkt)
+                self.allowed_from_vm_arp(arp_pkt, frame.dst_addr())
            }
            EthernetProtocol::Ipv4 => {
                let ipv4_pkt = Ipv4Packet::new_checked(frame.payload()).ok()?;
-                self.allowed_from_vm_ipv4(ipv4_pkt)
+                self.allowed_from_vm_ipv4(ipv4_pkt, frame.dst_addr())
            }
            _ => None,
        }
    }

-    fn allowed_from_vm_arp(&self, arp_pkt: ArpPacket<&[u8]>) -> Option<()> {
-        vm_arp_allowed(arp_pkt, self.vm_mac_address, self.dhcp_snooper.lease())
+    fn allowed_from_vm_arp(
+        &self,
+        arp_pkt: ArpPacket<&[u8]>,
+        dst_mac: EthernetAddress,
+    ) -> Option<()> {
+        if arp_pkt.source_hardware_addr() != self.vm_mac_address.0 {
+            return None;
+        }
+
+        if self.rules_mac.get(dst_mac.as_bytes()) == Some(&Action::Block) {
+            return None;
+        }
+
+        let source_protocol_addr: [u8; 4] = arp_pkt.source_protocol_addr().try_into().unwrap();
+        let source_protocol_addr = Ipv4Addr::from(source_protocol_addr);
+
+        if let Some(lease) = self.dhcp_snooper.lease() {
+            if lease.valid_ip_source(source_protocol_addr) {
+                return Some(());
+            }
+        } else if source_protocol_addr.is_unspecified() {
+            return Some(());
+        }
+
+        None
    }

-    pub(crate) fn allowed_from_vm_ipv4(&self, ipv4_pkt: Ipv4Packet<&[u8]>) -> Option<()> {
+    pub(crate) fn allowed_from_vm_ipv4(
+        &self,
+        ipv4_pkt: Ipv4Packet<&[u8]>,
+        dst_mac: EthernetAddress,
+    ) -> Option<()> {
        // Is this packet coming from VM's IP address that we've learned from DHCP snooping?
        if let Some(lease) = &self.dhcp_snooper.lease()
            && lease.valid_ip_source(ipv4_pkt.src_addr())
        {
            let dst_addr = ipv4_pkt.dst_addr();

+            match self.rules_mac.get(dst_mac.as_bytes()) {
+                Some(Action::Block) => return None,
+                Some(Action::Allow) => return Some(()),
+                None => {}
+            }
+
            // Filter traffic based on user-specified rules first
            if !self.rules.is_empty() {
                let dst_net = Ipv4Net::from(dst_addr);
@@ -101,147 +133,3 @@ impl Proxy<'_> {
        None
    }
 }
-
-fn vm_arp_allowed(
-    arp_pkt: ArpPacket<&[u8]>,
-    vm_mac_address: smoltcp::wire::EthernetAddress,
-    lease: &Option<Lease>,
-) -> Option<()> {
-    let (operation, source_hardware_addr, source_protocol_addr) =
-        match ArpRepr::parse(&arp_pkt).ok()? {
-            ArpRepr::EthernetIpv4 {
-                operation,
-                source_hardware_addr,
-                source_protocol_addr,
-                ..
-            } => (operation, source_hardware_addr, source_protocol_addr),
-            _ => return None,
-        };
-
-    if !matches!(operation, ArpOperation::Request | ArpOperation::Reply) {
-        return None;
-    }
-
-    if source_hardware_addr != vm_mac_address {
-        return None;
-    }
-
-    if let Some(lease) = lease {
-        if lease.valid_ip_source(source_protocol_addr) {
-            return Some(());
-        }
-    } else if source_protocol_addr.is_unspecified() {
-        return Some(());
-    }
-
-    None
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::dhcp_snooper::Lease;
-    use smoltcp::wire::{
-        ArpHardware, ArpOperation, ArpPacket, EthernetAddress, EthernetProtocol, Ipv4Address,
-    };
-    use std::collections::HashSet;
-    use std::time::Duration;
-
-    #[test]
-    fn test_allowed_from_vm_arp_allows_unspecified_request_without_lease() {
-        let vm_mac_address = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x01]);
-        let buf = arp_packet(vm_mac_address.0, [0, 0, 0, 0], ArpOperation::Request, 6, 4);
-        let arp_pkt = ArpPacket::new_checked(buf.as_slice()).unwrap();
-
-        assert!(super::vm_arp_allowed(arp_pkt, vm_mac_address, &None).is_some());
-    }
-
-    #[test]
-    fn test_allowed_from_vm_arp_allows_reply_for_leased_ip() {
-        let vm_mac_address = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x01]);
-        let lease_ip = Ipv4Address::new(192, 168, 0, 2);
-        let lease = Some(Lease::new(
-            lease_ip,
-            Duration::from_secs(600),
-            HashSet::new(),
-        ));
-        let buf = arp_packet(
-            vm_mac_address.0,
-            lease_ip.octets(),
-            ArpOperation::Reply,
-            6,
-            4,
-        );
-        let arp_pkt = ArpPacket::new_checked(buf.as_slice()).unwrap();
-
-        assert!(super::vm_arp_allowed(arp_pkt, vm_mac_address, &lease).is_some());
-    }
-
-    #[test]
-    fn test_allowed_from_vm_arp_rejects_unknown_operation() {
-        let vm_mac_address = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x01]);
-        let buf = arp_packet(
-            vm_mac_address.0,
-            [0, 0, 0, 0],
-            ArpOperation::Unknown(3),
-            6,
-            4,
-        );
-        let arp_pkt = ArpPacket::new_checked(buf.as_slice()).unwrap();
-
-        assert!(super::vm_arp_allowed(arp_pkt, vm_mac_address, &None).is_none());
-    }
-
-    #[test]
-    fn test_allowed_from_vm_arp_rejects_non_ethernet_hardware_type() {
-        let vm_mac_address = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x01]);
-        let mut buf = arp_packet(vm_mac_address.0, [0, 0, 0, 0], ArpOperation::Request, 6, 4);
-        let mut arp_pkt = ArpPacket::new_unchecked(buf.as_mut_slice());
-        arp_pkt.set_hardware_type(ArpHardware::Unknown(2));
-        let arp_pkt = ArpPacket::new_checked(buf.as_slice()).unwrap();
-
-        assert!(super::vm_arp_allowed(arp_pkt, vm_mac_address, &None).is_none());
-    }
-
-    #[test]
-    fn test_allowed_from_vm_arp_rejects_non_ipv4_protocol_type() {
-        let vm_mac_address = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x01]);
-        let mut buf = arp_packet(vm_mac_address.0, [0, 0, 0, 0], ArpOperation::Request, 6, 4);
-        let mut arp_pkt = ArpPacket::new_unchecked(buf.as_mut_slice());
-        arp_pkt.set_protocol_type(EthernetProtocol::Ipv6);
-        let arp_pkt = ArpPacket::new_checked(buf.as_slice()).unwrap();
-
-        assert!(super::vm_arp_allowed(arp_pkt, vm_mac_address, &None).is_none());
-    }
-
-    #[test]
-    fn test_allowed_from_vm_arp_rejects_non_ipv4_protocol_length() {
-        let vm_mac_address = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x01]);
-        let buf = arp_packet(vm_mac_address.0, [0, 0, 0], ArpOperation::Request, 6, 3);
-        let arp_pkt = ArpPacket::new_checked(buf.as_slice()).unwrap();
-
-        assert!(super::vm_arp_allowed(arp_pkt, vm_mac_address, &None).is_none());
-    }
-
-    fn arp_packet(
-        source_hardware_addr: [u8; 6],
-        source_protocol_addr: impl AsRef<[u8]>,
-        operation: ArpOperation,
-        hardware_len: u8,
-        protocol_len: u8,
-    ) -> Vec<u8> {
-        let source_protocol_addr = source_protocol_addr.as_ref();
-        let payload_len = 8 + 2 * (hardware_len as usize + protocol_len as usize);
-        let mut buf = vec![0; payload_len];
-        let mut arp_pkt = ArpPacket::new_unchecked(buf.as_mut_slice());
-        arp_pkt.set_hardware_type(ArpHardware::Ethernet);
-        arp_pkt.set_protocol_type(EthernetProtocol::Ipv4);
-        arp_pkt.set_hardware_len(hardware_len);
-        arp_pkt.set_protocol_len(protocol_len);
-        arp_pkt.set_operation(operation);
-        arp_pkt.set_source_hardware_addr(&source_hardware_addr[..hardware_len as usize]);
-        arp_pkt.set_source_protocol_addr(source_protocol_addr);
-        arp_pkt.set_target_hardware_addr(&[0; 6][..hardware_len as usize]);
-        arp_pkt.set_target_protocol_addr(&vec![0; protocol_len as usize]);
-        buf
-    }
-}
@@ -1,7 +1,5 @@
-use anyhow::{Context, Result, bail};
-use std::io;
-use std::mem::{size_of, zeroed};
-use std::os::fd::{AsRawFd, FromRawFd, RawFd};
+use anyhow::Result;
+use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 use std::os::unix::net::UnixDatagram;

 pub struct VM {
@@ -10,9 +8,6 @@ pub struct VM {

 impl VM {
    pub fn new(vm_fd: RawFd) -> Result<VM> {
-        let vm_fd = duplicate_vm_fd(vm_fd)?;
-
-        // SAFETY: duplicate_vm_fd only returns a valid descriptor that it owns.
        let sock = unsafe { UnixDatagram::from_raw_fd(vm_fd) };
        sock.set_nonblocking(true)?;

@@ -28,163 +23,8 @@ impl VM {
    }
 }

-fn duplicate_vm_fd(vm_fd: RawFd) -> Result<RawFd> {
-    if vm_fd < 0 {
-        bail!("invalid VM file descriptor {vm_fd}: value must be non-negative");
-    }
-
-    // SAFETY: fcntl duplicates the descriptor without transferring ownership of vm_fd.
-    let duplicated_fd = unsafe { libc::fcntl(vm_fd, libc::F_DUPFD_CLOEXEC, 0) };
-    if duplicated_fd == -1 {
-        return Err(io::Error::last_os_error())
-            .with_context(|| format!("failed to duplicate VM file descriptor {vm_fd}"));
-    }
-
-    if let Err(error) = validate_vm_fd(duplicated_fd) {
-        // SAFETY: duplicated_fd is an open descriptor owned by this function.
-        unsafe { libc::close(duplicated_fd) };
-        return Err(error);
-    }
-
-    Ok(duplicated_fd)
-}
-
-fn validate_vm_fd(vm_fd: RawFd) -> Result<()> {
-    // SAFETY: fcntl only reads descriptor state and does not take ownership.
-    if unsafe { libc::fcntl(vm_fd, libc::F_GETFD) } == -1 {
-        return Err(io::Error::last_os_error())
-            .with_context(|| format!("failed to inspect VM file descriptor {vm_fd}"));
-    }
-
-    let mut socket_type = 0;
-    let mut socket_type_len = size_of::<libc::c_int>() as libc::socklen_t;
-
-    // SAFETY: socket_type and socket_type_len are valid writable buffers of the sizes given.
-    if unsafe {
-        libc::getsockopt(
-            vm_fd,
-            libc::SOL_SOCKET,
-            libc::SO_TYPE,
-            (&mut socket_type as *mut libc::c_int).cast(),
-            &mut socket_type_len,
-        )
-    } == -1
-    {
-        return Err(io::Error::last_os_error())
-            .with_context(|| format!("VM file descriptor {vm_fd} is not a socket"));
-    }
-
-    if socket_type != libc::SOCK_DGRAM {
-        bail!("VM file descriptor {vm_fd} is not a Unix datagram socket");
-    }
-
-    let mut address: libc::sockaddr_storage = unsafe { zeroed() };
-    let mut address_len = size_of::<libc::sockaddr_storage>() as libc::socklen_t;
-
-    // SAFETY: address and address_len are valid writable buffers of the sizes given.
-    if unsafe {
-        libc::getsockname(
-            vm_fd,
-            (&mut address as *mut libc::sockaddr_storage).cast(),
-            &mut address_len,
-        )
-    } == -1
-    {
-        return Err(io::Error::last_os_error()).with_context(|| {
-            format!("failed to inspect the address family of VM file descriptor {vm_fd}")
-        });
-    }
-
-    // macOS returns a zero-length address for unnamed UNIX-domain sockets,
-    // including socketpair descriptors. Other socket families return their
-    // address family when getsockname succeeds.
-    let is_unix_socket = address_len == 0 || address.ss_family as libc::c_int == libc::AF_UNIX;
-    if !is_unix_socket {
-        bail!("VM file descriptor {vm_fd} is not a Unix socket");
-    }
-
-    Ok(())
-}
-
 impl AsRawFd for VM {
    fn as_raw_fd(&self) -> RawFd {
        self.sock.as_raw_fd()
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::VM;
-    use std::fs::File;
-    use std::net::UdpSocket;
-    use std::os::fd::AsRawFd;
-    use std::os::unix::net::{UnixDatagram, UnixStream};
-
-    #[test]
-    fn test_new_rejects_negative_fd() {
-        let error = VM::new(-1).err().unwrap();
-
-        assert_eq!(
-            error.to_string(),
-            "invalid VM file descriptor -1: value must be non-negative"
-        );
-    }
-
-    #[test]
-    fn test_new_rejects_non_socket_fd_without_taking_ownership() {
-        let file = File::open("/dev/null").unwrap();
-        let error = VM::new(file.as_raw_fd()).err().unwrap();
-
-        assert!(error.to_string().contains("is not a socket"));
-        assert!(file.metadata().is_ok());
-    }
-
-    #[test]
-    fn test_new_rejects_closed_fd() {
-        let (socket, _peer) = UnixDatagram::pair().unwrap();
-        let vm_fd = socket.as_raw_fd();
-        drop(socket);
-
-        let error = VM::new(vm_fd).err().unwrap();
-
-        assert!(
-            error
-                .to_string()
-                .contains("failed to duplicate VM file descriptor")
-        );
-    }
-
-    #[test]
-    fn test_new_rejects_non_datagram_socket() {
-        let (stream, _peer) = UnixStream::pair().unwrap();
-        let error = VM::new(stream.as_raw_fd()).err().unwrap();
-
-        assert!(error.to_string().contains("not a Unix datagram socket"));
-    }
-
-    #[test]
-    fn test_new_rejects_internet_datagram_socket() {
-        let socket = UdpSocket::bind("127.0.0.1:0").unwrap();
-        let error = VM::new(socket.as_raw_fd()).err().unwrap();
-
-        assert!(error.to_string().contains("not a Unix socket"));
-    }
-
-    #[test]
-    fn test_new_does_not_close_original_fd_when_vm_is_dropped() {
-        let (socket, _peer) = UnixDatagram::pair().unwrap();
-        let vm = VM::new(socket.as_raw_fd()).unwrap();
-        drop(vm);
-
-        let socket_fd_is_open = unsafe { libc::fcntl(socket.as_raw_fd(), libc::F_GETFD) != -1 };
-
-        if socket_fd_is_open {
-            drop(socket);
-        } else {
-            // Avoid double-closing the descriptor if this test catches an unsafe implementation.
-            std::mem::forget(socket);
-        }
-
-        assert!(socket_fd_is_open);
-    }
-}
@@ -26,18 +26,10 @@ use uzers::{get_current_groupname, get_current_username, get_effective_uid};
 struct Args {
    #[clap(
        long,
-        value_parser = parse_vm_fd,
        help = "FD number to use for communicating with the VM's networking stack"
    )]
    vm_fd: c_int,

-    #[clap(
-        long,
-        value_parser = parse_vm_fd,
-        help = "connected Unix stream FD for newline-delimited JSON-RPC policy control"
-    )]
-    control_fd: Option<c_int>,
-
    #[clap(long, help = "MAC address to enforce for the VM")]
    vm_mac_address: mac_address::MacAddress,

@@ -67,7 +59,7 @@ struct Args {
        In case an identical prefix is both --allow'ed and --block'ed, \
        blocking will take precedence. --allow=0.0.0.0/0 is a special case, \
        it additionally disables bridge isolation (even when --block=0.0.0.0/0 is specified).",
-        value_name = "comma-separated CIDRs or @-alias",
+        value_name = "comma-separated CIDRs, MAC addresses or @-aliases",
        use_value_delimiter = true,
        action = clap::ArgAction::Set
    )]
@@ -82,7 +74,7 @@ struct Args {
        When used with --allow, the longest prefix match always wins. \
        In case an identical prefix is both --allow'ed and --block'ed, \
        blocking will take precedence.",
-        value_name = "comma-separated CIDRs or @-alias",
+        value_name = "comma-separated CIDRs, MAC addresses or @-aliases",
        use_value_delimiter = true,
        action = clap::ArgAction::Set
    )]
@@ -202,15 +194,17 @@ fn try_main() -> anyhow::Result<()> {
    // Set bootpd(8) min/max lease time while still having the root privileges
    set_bootpd_lease_time(args.bootpd_lease_time);

+    let enable_isolation = bridge_isolation_enabled(&args.allow, &args.block);
+
    // Initialize the proxy while still having the root privileges
    let mut proxy = Proxy::new(
        args.vm_fd as RawFd,
        args.vm_mac_address,
        args.vm_net_type,
+        enable_isolation,
        args.allow,
        args.block,
        args.expose,
-        args.control_fd.map(|fd| fd as RawFd),
    )
    .context("failed to initialize proxy")?;

@@ -226,18 +220,6 @@ fn try_main() -> anyhow::Result<()> {
    proxy.run()
 }

-fn parse_vm_fd(value: &str) -> Result<c_int, String> {
-    let vm_fd = value
-        .parse::<c_int>()
-        .map_err(|err| format!("invalid file descriptor: {err}"))?;
-
-    if vm_fd < 0 {
-        return Err("file descriptor must be non-negative".to_string());
-    }
-
-    Ok(vm_fd)
-}
-
 fn sudo_escalation_works() -> bool {
    let exe = std::env::current_exe().unwrap();
    let args = std::env::args().skip(1);
@@ -252,6 +234,14 @@ fn sudo_escalation_works() -> bool {
        .unwrap_or(false)
 }

+fn bridge_isolation_enabled(allow: &[Target], block: &[Target]) -> bool {
+    let disables_isolation_for_compat = allow.iter().any(Target::is_ipv4_default_route);
+    let disables_isolation_for_mac_filtering =
+        allow.iter().chain(block.iter()).any(Target::is_mac_address);
+
+    !(disables_isolation_for_compat || disables_isolation_for_mac_filtering)
+}
+
 fn set_bootpd_lease_time(lease_time: u32) {
    let prefs = SCPreferences::group(
        &CFString::new("softnet"),
@@ -276,39 +266,41 @@ fn set_bootpd_lease_time(lease_time: u32) {

 #[cfg(test)]
 mod tests {
-    use super::Args;
-    use clap::Parser;
+    use super::*;

-    #[test]
-    fn test_cli_rejects_negative_vm_fd_before_startup() {
-        let error = Args::try_parse_from([
-            "softnet",
-            "--vm-fd=-1",
-            "--vm-mac-address=02:00:00:00:00:01",
-        ])
-        .unwrap_err();
-
-        assert!(
-            error
-                .to_string()
-                .contains("file descriptor must be non-negative")
-        );
+    fn targets(values: &[&str]) -> Vec<Target> {
+        values.iter().map(|value| value.parse().unwrap()).collect()
    }

    #[test]
-    fn test_cli_rejects_negative_control_fd_before_startup() {
-        let error = Args::try_parse_from([
-            "softnet",
-            "--vm-fd=0",
-            "--control-fd=-1",
-            "--vm-mac-address=02:00:00:00:00:01",
-        ])
-        .unwrap_err();
+    fn bridge_isolation_disabled_for_legacy_allow_default_route() {
+        assert!(!bridge_isolation_enabled(
+            &targets(&["0.0.0.0/0"]),
+            &targets(&[])
+        ));
+    }

-        assert!(
-            error
-                .to_string()
-                .contains("file descriptor must be non-negative")
-        );
+    #[test]
+    fn bridge_isolation_disabled_for_legacy_allow_default_route_even_when_blocked() {
+        assert!(!bridge_isolation_enabled(
+            &targets(&["0.0.0.0/0"]),
+            &targets(&["0.0.0.0/0"])
+        ));
+    }
+
+    #[test]
+    fn bridge_isolation_kept_for_block_default_route_only() {
+        assert!(bridge_isolation_enabled(
+            &targets(&[]),
+            &targets(&["0.0.0.0/0"])
+        ));
+    }
+
+    #[test]
+    fn bridge_isolation_disabled_for_mac_filtering() {
+        assert!(!bridge_isolation_enabled(
+            &targets(&[]),
+            &targets(&["02:00:00:00:00:02"])
+        ));
    }
 }
Author	SHA1	Message	Date
Nikolay Edigaryev	97e7da22fb	WIP	2026-05-28 00:56:08 +01:00
Nikolay Edigaryev	2947383d1a	WIP: support peer MAC addresses in --allow/--block To enable cross-VM communication.	2026-05-28 00:49:26 +01:00