chore: bump version to 0.7.2

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.SRCINFO

@@ -1,19 +0,0 @@
-pkgbase = numa-git
-	pkgdesc = Portable DNS resolver in Rust — .numa local domains, ad blocking, developer overrides, DNS-over-HTTPS
-	pkgver = 0.10.1.r0.g0000000
-	pkgrel = 1
-	url = https://github.com/razvandimescu/numa
-	arch = x86_64
-	license = MIT
-	options = !lto
-	makedepends = cargo
-	makedepends = git
-	depends = gcc-libs
-	depends = glibc
-	provides = numa
-	conflicts = numa
-	backup = etc/numa.toml
-	source = numa::git+https://github.com/razvandimescu/numa.git
-	sha256sums = SKIP
-
-pkgname = numa-git

.github/dependabot.yml

@@ -1,34 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "chore(deps)"
-    groups:
-      minor-and-patch:
-        patterns: ["*"]
-        update-types: ["minor", "patch"]
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "chore(deps)"
-    groups:
-      minor-and-patch:
-        patterns: ["*"]
-        update-types: ["minor", "patch"]
-
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "chore(deps)"
-    groups:
-      minor-and-patch:
-        patterns: ["*"]
-        update-types: ["minor", "patch"]

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
@@ -27,31 +27,13 @@ jobs:
       - name: audit
         run: cargo install cargo-audit && cargo audit
 
-  check-macos:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-      - name: clippy
-        run: cargo clippy -- -D warnings
-      - name: test
-        run: cargo test
-
   check-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - name: build
         run: cargo build
       - name: clippy
         run: cargo clippy -- -D warnings
-      - name: test
-        run: cargo test
-      - name: Upload binary
-        uses: actions/upload-artifact@v7
-        with:
-          name: numa-windows-x86_64
-          path: target/debug/numa.exe

.github/workflows/homebrew-bump.yml

@@ -1,77 +0,0 @@
-name: Bump Homebrew Tap
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        description: 'Version to bump (e.g. 0.10.0 or v0.10.0)'
-        type: string
-        required: true
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to bump (e.g. 0.10.0 or v0.10.0)'
-        required: true
-
-permissions:
-  contents: read
-
-jobs:
-  bump:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Determine version
-        id: ver
-        env:
-          INPUT_VERSION: ${{ inputs.version }}
-        run: |
-          V="${INPUT_VERSION#v}"
-          echo "version=$V" >> "$GITHUB_OUTPUT"
-
-      - name: Fetch sha256 checksums from release assets
-        id: shas
-        env:
-          V: ${{ steps.ver.outputs.version }}
-        run: |
-          set -euo pipefail
-          base="https://github.com/razvandimescu/numa/releases/download/v${V}"
-          for t in macos-aarch64 macos-x86_64 linux-aarch64 linux-x86_64; do
-            sha=$(curl -fsSL "${base}/numa-${t}.tar.gz.sha256" | awk '{print $1}')
-            if [ -z "$sha" ]; then
-              echo "ERROR: failed to fetch sha256 for $t" >&2
-              exit 1
-            fi
-            key=$(echo "$t" | tr '[:lower:]-' '[:upper:]_')
-            echo "SHA_${key}=${sha}" >> "$GITHUB_ENV"
-          done
-
-      - name: Clone homebrew-tap
-        env:
-          HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
-        run: |
-          git clone "https://x-access-token:${HOMEBREW_TAP_GITHUB_TOKEN}@github.com/razvandimescu/homebrew-tap.git" tap
-
-      - name: Update formula
-        env:
-          VERSION: ${{ steps.ver.outputs.version }}
-        run: |
-          python3 scripts/update-homebrew-formula.py tap/numa.rb
-          echo "--- updated numa.rb ---"
-          cat tap/numa.rb
-
-      - name: Commit and push
-        working-directory: tap
-        env:
-          V: ${{ steps.ver.outputs.version }}
-        run: |
-          if git diff --quiet; then
-            echo "numa.rb already at v${V}, nothing to commit"
-            exit 0
-          fi
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add numa.rb
-          git commit -m "chore: bump numa to v${V}"
-          git push origin main

.github/workflows/publish-aur.yml

@@ -1,159 +0,0 @@
-# `publish-aur.yml` - Arch Linux AUR Package Workflow
-# --------------------
-# This workflow automates the validation and publishing of the 'numa-git' package to the
-# Arch User Repository (AUR). The AUR is a community-driven repository for Arch Linux users.
-#
-# Workflow Overview:
-# 1. Validate: Builds and tests the package for Arch Linux x86_64 using a clean
-#    Arch Linux container.
-# 2. Audit: Checks Rust dependencies for known security vulnerabilities using
-#    'cargo-audit'.
-# 3. Publish: If on the 'main' branch, it pushes the updated PKGBUILD and
-#    .SRCINFO to the AUR.
-#
-# Security Best Practices:
-# - SHA Pinning: All GitHub Actions are pinned to a full-length commit SHA (e.g., v6.0.2 @ SHA)
-#   to ensure the code is immutable and protects against supply-chain attacks where a tag
-#   might be maliciously moved to a compromised commit.
-# - SSH Hygiene: Uses ssh-agent to keep the private key in memory rather than on disk.
-# - Audit: Runs 'cargo audit' to prevent publishing known vulnerable dependencies.
-
-name: Publish - Arch Linux AUR Package
-
-on:
-  push:
-    branches: [main]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  # The 'validate' job ensures that the PKGBUILD is correct and the software builds/tests
-  # successfully on Arch Linux before we attempt to publish it.
-  validate:
-    name: Validate PKGBUILD (${{ matrix.arch }})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [x86_64]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Build and Test Package
-        timeout-minutes: 60
-        env:
-          AUR_PKGNAME: ${{ secrets.AUR_PACKAGE_NAME }}
-        run: |
-          # We use a temporary directory to avoid Docker permission issues with the workspace.
-          mkdir -p build-dir
-          cp PKGBUILD build-dir/
-
-          docker run --rm -v $PWD/build-dir:/pkg -w /pkg archlinux:latest /bin/bash -c "
-            # ARCH LINUX SECURITY REQUIREMENT:
-            # 'makepkg' (the tool that builds Arch packages) refuses to run as root for safety.
-            # We must create a standard user and give them sudo access.
-
-            # Install build-time dependencies.
-            # 'base-devel' includes essential tools like gcc, make, and binutils.
-            # Install 'rust' directly to avoid the interactive virtual-package
-            # prompt for 'cargo' on current Arch images.
-            pacman -Syu --noconfirm --needed base-devel rust git sudo cargo-audit
-
-            useradd -m builduser
-            chown -R builduser:builduser /pkg
-
-            # Allow the build user to install dependencies during the build process.
-            echo 'builduser ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/builduser
-
-            # Fetch the source tree first so pkgver() and cargo-audit have a
-            # real Cargo.lock to inspect.
-            sudo -u builduser makepkg -o --nobuild --nocheck --nodeps --noprepare
-
-            # SECURITY AUDIT:
-            # Fail early if any dependencies have known security vulnerabilities.
-            sudo -u builduser sh -lc 'cd /pkg/src/numa && cargo audit'
-
-            # BUILD & TEST:
-            # 'makepkg -s' will:
-            # 1. Download source files (cloning this repo)
-            # 2. Run prepare(), build(), and check() (running cargo test)
-            # 3. Create the final .pkg.tar.zst package
-            sudo -u builduser makepkg -s --noconfirm
-          "
-
-  # The 'publish' job updates the AUR repository with our latest PKGBUILD and .SRCINFO.
-  publish:
-    name: Publish to AUR
-    needs: validate
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      # Securely configure SSH for AUR access.
-      - name: Configure SSH
-        run: |
-          mkdir -p ~/.ssh
-          # Official AUR Ed25519 fingerprint (prevents Man-in-the-Middle attacks).
-          echo "aur.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuBKrPzbawxA/k2g6NcyV5jmqwJ2s+zpgZGZ7tpLIcN" >> ~/.ssh/known_hosts
-
-          # Use ssh-agent to keep the private key in memory rather than writing it to disk.
-          eval $(ssh-agent -s)
-          echo "${{ secrets.AUR_SSH_PRIVATE_KEY }}" | tr -d '\r' | ssh-add -
-
-          # Export the agent socket so subsequent 'git' commands can use it.
-          echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
-          echo "SSH_AGENT_PID=$SSH_AGENT_PID" >> $GITHUB_ENV
-
-      - name: Push to AUR
-        env:
-          AUR_PKGNAME: ${{ secrets.AUR_PACKAGE_NAME }}
-          AUR_EMAIL: ${{ secrets.AUR_EMAIL }}
-          AUR_USER: ${{ secrets.AUR_USERNAME }}
-        run: |
-          # AUR repos are managed via Git. Each package has its own repo at:
-          # ssh://aur@aur.archlinux.org/<package-name>.git
-          git clone ssh://aur@aur.archlinux.org/$AUR_PKGNAME.git aur-repo
-
-          cp PKGBUILD aur-repo/
-          cd aur-repo
-
-          # METADATA GENERATION:
-          # '.SRCINFO' is a machine-readable version of the PKGBUILD.
-          # We must run this as a non-root user ('builduser') inside the container.
-          docker run --rm -v $(pwd):/pkg archlinux:latest /bin/bash -c "
-            pacman -Syu --noconfirm --needed binutils git sudo
-            useradd -m builduser
-            chown -R builduser:builduser /pkg
-            cd /pkg
-            sudo -u builduser git config --global --add safe.directory '*'
-            # makepkg -od fetches the source first so pkgver() can calculate the version.
-            # --noprepare skips the prepare() function, which invokes cargo and would
-            # otherwise require a full rust toolchain in this metadata-only container.
-            # pkgver() runs before prepare(), so .SRCINFO still gets the correct version.
-            sudo -u builduser makepkg -od --noprepare && sudo -u builduser makepkg --printsrcinfo > .SRCINFO
-          "
-
-          # Reclaim ownership: the in-container 'chown -R builduser:builduser /pkg'
-          # propagates through the bind mount, leaving .git/ owned by the container's
-          # builduser UID. Without this, subsequent 'git config' on the host fails with
-          # "could not lock config file .git/config: Permission denied".
-          sudo chown -R "$(id -u):$(id -g)" .
-
-          # Set the commit identity using secrets for security and auditability.
-          git config user.name "$AUR_USER"
-          git config user.email "$AUR_EMAIL"
-
-          # Stage and commit both the human-readable PKGBUILD and machine-readable .SRCINFO.
-          git add PKGBUILD .SRCINFO
-
-          if ! git diff --cached --quiet; then
-            git commit -m "chore: update PKGBUILD to ${{ github.sha }}"
-            git push origin master
-          else
-            echo "No changes to commit (metadata and PKGBUILD are already up-to-date)."
-          fi

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -70,7 +70,7 @@ jobs:
           (Get-FileHash "${{ matrix.name }}.zip" -Algorithm SHA256).Hash.ToLower() + "  ${{ matrix.name }}.zip" | Out-File "${{ matrix.name }}.zip.sha256" -Encoding ascii
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }}
           path: |
@@ -82,7 +82,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -96,7 +96,7 @@ jobs:
     needs: [build, publish]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v4
         with:
           merge-multiple: true
 
@@ -108,10 +108,3 @@ jobs:
             *.tar.gz
             *.zip
             *.sha256
-
-  bump-homebrew:
-    needs: release
-    uses: ./.github/workflows/homebrew-bump.yml
-    with:
-      version: ${{ github.ref_name }}
-    secrets: inherit

.github/workflows/static.yml

@@ -30,18 +30,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: Install pandoc
-        uses: pandoc/actions/setup@v1
+        run: sudo apt-get install -y pandoc
       - name: Generate blog HTML
         run: make blog
       - name: Setup Pages
-        uses: actions/configure-pages@v6
+        uses: actions/configure-pages@v5
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v3
         with:
           # Upload entire repository
           path: './site'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v5
+        uses: actions/deploy-pages@v4

.gitignore

@@ -1,6 +1,4 @@
 /target
-/build-dir
 CLAUDE.md
 docs/
 site/blog/posts/
-ios/

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "numa"
-version = "0.13.0"
+version = "0.7.2"
 authors = ["razvandimescu <razvan@dimescu.com>"]
 edition = "2021"
 description = "Portable DNS resolver in Rust — .numa local domains, ad blocking, developer overrides, DNS-over-HTTPS"
@@ -10,11 +10,11 @@ keywords = ["dns", "dns-server", "ad-blocking", "reverse-proxy", "developer-tool
 categories = ["network-programming", "development-tools"]
 
 [dependencies]
-tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "time", "sync", "signal"] }
+tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "time", "sync"] }
 axum = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-toml = "1.1"
+toml = "0.8"
 log = "0.4"
 env_logger = "0.11"
 reqwest = { version = "0.12", features = ["rustls-tls", "gzip", "http2"], default-features = false }
@@ -22,24 +22,18 @@ hyper = { version = "1", features = ["client", "http1", "server"] }
 hyper-util = { version = "0.1", features = ["client-legacy", "http1", "tokio"] }
 http-body-util = "0.1"
 futures = "0.3"
-socket2 = { version = "0.6", features = ["all"] }
+socket2 = { version = "0.5", features = ["all"] }
-rcgen = { version = "0.14", features = ["pem", "x509-parser"] }
+rcgen = { version = "0.13", features = ["pem", "x509-parser"] }
 time = "0.3"
 rustls = "0.23"
 tokio-rustls = "0.26"
 arc-swap = "1"
 ring = "0.17"
-rustls-pemfile = "2.2.0"
-qrcode = { version = "0.14", default-features = false, features = ["svg"] }
-webpki-roots = "1"
 
 [dev-dependencies]
-criterion = { version = "0.8", features = ["html_reports"] }
+criterion = { version = "0.5", features = ["html_reports"] }
 tower = { version = "0.5", features = ["util"] }
 http = "1"
-hickory-resolver = { version = "0.25", features = ["https-ring", "webpki-roots"] }
-hickory-proto = "0.25"
-x509-parser = "0.18"
 
 [[bench]]
 name = "hot_path"
@@ -52,7 +46,3 @@ harness = false
 [[bench]]
 name = "dnssec"
 harness = false
-
-[[bench]]
-name = "recursive_compare"
-harness = false

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.94-alpine AS builder
+FROM rust:1.88-alpine AS builder
 RUN apk add --no-cache musl-dev cmake make perl
 WORKDIR /app
 COPY Cargo.toml Cargo.lock ./
@@ -11,7 +11,7 @@ COPY numa.toml com.numa.dns.plist numa.service ./
 RUN touch src/main.rs src/lib.rs
 RUN cargo build --release
 
-FROM alpine:3.23
+FROM alpine:3.20
 COPY --from=builder /app/target/release/numa /usr/local/bin/numa
-EXPOSE 53/udp 80/tcp 443/tcp 853/tcp 5380/tcp
+EXPOSE 53/udp 80/tcp 443/tcp 5380/tcp
 ENTRYPOINT ["numa"]

PKGBUILD

@@ -1,62 +0,0 @@
-# Maintainer: razvandimescu <razvan@dimescu.com>
-pkgname=numa-git
-_pkgname=numa
-pkgver=0.10.1.r0.g0000000 # Placeholder — pkgver() rewrites this on each makepkg run
-pkgrel=1
-pkgdesc="Portable DNS resolver in Rust — .numa local domains, ad blocking, developer overrides, DNS-over-HTTPS"
-arch=('x86_64')
-url="https://github.com/razvandimescu/numa"
-license=('MIT')
-options=('!lto')
-depends=('gcc-libs' 'glibc')
-makedepends=('cargo' 'git')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-backup=('etc/numa.toml')
-source=("$_pkgname::git+$url.git")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/$_pkgname"
-  ( set -o pipefail
-    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  ) | sed 's/^v//'
-}
-
-prepare() {
-  cd "$srcdir/$_pkgname"
-  # numa v0.10.1+ uses FHS-compliant paths on Linux by default
-  # (/var/lib/numa for data, journalctl for logs), so no source
-  # patching is needed. The earlier sed targeted /usr/local/bin/numa,
-  # which only appears in a comment in current main.
-  export RUSTUP_TOOLCHAIN=stable
-  cargo fetch --locked
-}
-
-build() {
-  cd "$srcdir/$_pkgname"
-  export RUSTUP_TOOLCHAIN=stable
-  cargo build --frozen --release
-}
-
-check() {
-  cd "$srcdir/$_pkgname"
-  export RUSTUP_TOOLCHAIN=stable
-  cargo test --frozen
-}
-
-package() {
-  cd "$srcdir/$_pkgname"
-  install -Dm755 "target/release/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-
-  # numa.service uses {{exe_path}} as a placeholder substituted by
-  # `numa install` at runtime via replace_exe_path(). For an AUR
-  # package install (no `numa install` step), we substitute it
-  # statically here so systemd gets a real ExecStart path.
-  sed 's|{{exe_path}}|/usr/bin/numa /etc/numa.toml|g' numa.service > numa.service.patched
-  install -Dm644 "numa.service.patched" "$pkgdir/usr/lib/systemd/system/numa.service"
-
-  install -Dm644 "numa.toml" "$pkgdir/etc/numa.toml"
-  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

README.md

@@ -8,42 +8,20 @@
 
 A portable DNS resolver in a single binary. Block ads on any network, name your local services (`frontend.numa`), and override any hostname with auto-revert — all from your laptop, no cloud account or Raspberry Pi required.
 
-Built from scratch in Rust. Zero DNS libraries. RFC 1035 wire protocol parsed by hand. Caching, ad blocking, and local service domains out of the box. Optional recursive resolution from root nameservers with full DNSSEC chain-of-trust validation, plus a DNS-over-TLS listener for encrypted client connections (iOS Private DNS, systemd-resolved, etc.). One ~8MB binary, everything embedded.
+Built from scratch in Rust. Zero DNS libraries. RFC 1035 wire protocol parsed by hand. Recursive resolution from root nameservers with full DNSSEC chain-of-trust validation. One ~8MB binary, everything embedded.
 
 ![Numa dashboard](assets/hero-demo.gif)
 
 ## Quick Start
 
 ```bash
-# macOS
+brew install razvandimescu/tap/numa    # or: cargo install numa
-brew install razvandimescu/tap/numa
+sudo numa                              # port 53 requires root
-
-# Linux
-curl -fsSL https://raw.githubusercontent.com/razvandimescu/numa/main/install.sh | sh
-
-# Arch Linux (AUR)
-yay -S numa-git
-
-# Windows — download from GitHub Releases
-# All platforms
-cargo install numa
-```
-
-```bash
-sudo numa                              # run in foreground (port 53 requires root/admin)
 ```
 
 Open the dashboard: **http://numa.numa** (or `http://localhost:5380`)
 
-Set as system DNS:
+Set as system DNS: `sudo numa install && sudo numa service start`
-
-| Platform | Install | Uninstall |
-|----------|---------|-----------|
-| macOS | `sudo numa install` | `sudo numa uninstall` |
-| Linux | `sudo numa install` | `sudo numa uninstall` |
-| Windows | `numa install` (admin) + reboot | `numa uninstall` (admin) + reboot |
-
-On macOS and Linux, numa runs as a system service (launchd/systemd). On Windows, numa auto-starts on login via registry.
 
 ## Local Services
 
@@ -62,28 +40,7 @@ Add path-based routing (`app.numa/api → :5001`), share services across machine
 
 385K+ domains blocked via [Hagezi Pro](https://github.com/hagezi/dns-blocklists). Works on any network — coffee shops, hotels, airports. Travels with your laptop.
 
-Three resolution modes:
+Two resolution modes: **forward** (relay to Quad9/Cloudflare via encrypted DoH) or **recursive** (resolve from root nameservers — no upstream dependency, no single entity sees your full query pattern). DNSSEC validates the full chain of trust: RRSIG signatures, DNSKEY verification, DS delegation, NSEC/NSEC3 denial proofs. [Read how it works →](https://numa.rs/blog/posts/dnssec-from-scratch.html)
-
-- **`forward`** (default) — transparent proxy to your existing system DNS. Everything works as before, just with caching and ad blocking on top. Captive portals, VPNs, corporate DNS — all respected.
-- **`recursive`** — resolve directly from root nameservers. No upstream dependency, no single entity sees your full query pattern. Add `[dnssec] enabled = true` for full chain-of-trust validation.
-- **`auto`** — probe root servers on startup, recursive if reachable, encrypted DoH fallback if blocked.
-
-DNSSEC validates the full chain of trust: RRSIG signatures, DNSKEY verification, DS delegation, NSEC/NSEC3 denial proofs. [Read how it works →](https://numa.rs/blog/posts/dnssec-from-scratch.html)
-
-**DNS-over-TLS listener** (RFC 7858) — accept encrypted queries on port 853 from strict clients like iOS Private DNS, systemd-resolved, or stubby. Two modes:
-
-- **Self-signed** (default) — numa generates a local CA automatically. `numa install` adds it to the system trust store on macOS, Linux (Debian/Ubuntu, Fedora/RHEL/SUSE, Arch), and Windows. On iOS, install the `.mobileconfig` from `numa setup-phone`. Firefox keeps its own NSS store and ignores the system one — trust the CA there manually if you need HTTPS for `.numa` services in Firefox.
-- **Bring-your-own cert** — point `[dot] cert_path` / `key_path` at a publicly-trusted cert (e.g., Let's Encrypt via DNS-01 challenge on a domain pointing at your numa instance). Clients connect without any trust-store setup — same UX as AdGuard Home or Cloudflare `1.1.1.1`.
-
-ALPN `"dot"` is advertised and enforced in both modes; a handshake with mismatched ALPN is rejected as a cross-protocol confusion defense.
-
-**Phone setup** — point your iPhone or Android at Numa in one step:
-
-```bash
-numa setup-phone
-```
-
-Prints a QR code. Scan it, install the profile, toggle certificate trust — your phone's DNS now routes through Numa over TLS. Requires `[mobile] enabled = true` in `numa.toml`.
 
 ## LAN Discovery
 
@@ -113,22 +70,16 @@ From Machine B: `curl http://api.numa` → proxied to Machine A's port 8000. Ena
 | DNSSEC validation | — | — | Yes | Yes (RSA, ECDSA, Ed25519) |
 | Ad blocking | Yes | Yes | — | 385K+ domains |
 | Web admin UI | Full | Full | — | Dashboard |
-| Encrypted upstream (DoH/DoT) | Needs cloudflared | DoH only | DoT only | DoH + DoT (`tls://`) |
+| Encrypted upstream (DoH) | Needs cloudflared | Yes | — | Native |
-| Encrypted clients (DoT listener) | Needs stunnel sidecar | Yes | Yes | Native (RFC 7858) |
+| Portable (laptop) | No (appliance) | No (appliance) | Server | Single binary |
-| DoH server endpoint | — | Yes | — | Yes (RFC 8484) |
-| Request hedging | — | — | — | All protocols (UDP, DoH, DoT) |
-| Serve-stale + prefetch | — | — | Prefetch at 90% TTL | RFC 8767, prefetch at 90% TTL |
-| Conditional forwarding | — | Yes | Yes | Yes (per-suffix rules) |
-| Portable (laptop) | No (appliance) | No (appliance) | Server | Single binary, macOS/Linux/Windows |
 | Community maturity | 56K stars, 10 years | 33K stars | 20 years | New |
 
 ## Performance
 
-0.1ms cached queries — matches Unbound and AdGuard Home. Wire-level cache stores raw bytes with in-place TTL patching. Request hedging eliminates p99 spikes: cold recursive p99 538ms vs Unbound 748ms (−28%), σ 4× tighter. [Benchmarks →](benches/)
+691ns cached round-trip. ~2.0M qps throughput. Zero heap allocations in the hot path. Recursive queries average 237ms after SRTT warmup (12x improvement over round-robin). ECDSA P-256 DNSSEC verification: 174ns. [Benchmarks →](bench/)
 
 ## Learn More
 
-- [Blog: DNS-over-TLS from Scratch in Rust](https://numa.rs/blog/posts/dot-from-scratch.html)
 - [Blog: Implementing DNSSEC from Scratch in Rust](https://numa.rs/blog/posts/dnssec-from-scratch.html)
 - [Blog: I Built a DNS Resolver from Scratch](https://numa.rs/blog/posts/dns-from-scratch.html)
 - [Configuration reference](numa.toml) — all options documented inline
@@ -139,16 +90,9 @@ From Machine B: `curl http://api.numa` → proxied to Machine A's port 8000. Ena
 - [x] DNS forwarding, caching, ad blocking, developer overrides
 - [x] `.numa` local domains — auto TLS, path routing, WebSocket proxy
 - [x] LAN service discovery — mDNS, cross-machine DNS + proxy
-- [x] DNS-over-HTTPS — encrypted upstream + server endpoint (RFC 8484)
+- [x] DNS-over-HTTPS — encrypted upstream
-- [x] DNS-over-TLS — encrypted client listener (RFC 7858) + upstream forwarding (`tls://`)
 - [x] Recursive resolution + DNSSEC — chain-of-trust, NSEC/NSEC3
 - [x] SRTT-based nameserver selection
-- [x] Multi-forwarder failover — multiple upstreams with SRTT ranking, fallback pool
-- [x] Request hedging — parallel requests rescue packet loss and tail latency (all protocols)
-- [x] Serve-stale + prefetch — RFC 8767, background refresh at <10% TTL and on stale serve
-- [x] Conditional forwarding — per-suffix rules for split-horizon DNS (Tailscale, VPNs)
-- [x] Cache warming — proactive resolution for configured domains
-- [x] Mobile onboarding — `setup-phone` QR flow, mobile API, mobileconfig profiles
 - [ ] pkarr integration — self-sovereign DNS via Mainline DHT
 - [ ] Global `.numa` names — DHT-backed, no registrar
 

benches/numa-bench-recursive.toml

@@ -1,30 +0,0 @@
-[server]
-bind_addr = "127.0.0.1:5454"
-api_port = 5381
-api_bind_addr = "127.0.0.1"
-data_dir = "/tmp/numa-bench"
-
-[upstream]
-mode = "recursive"
-timeout_ms = 10000
-
-[cache]
-min_ttl = 60
-max_ttl = 3600
-
-[blocking]
-enabled = false
-
-[proxy]
-port = 8080
-tls_port = 8443
-
-[dot]
-enabled = true
-port = 8530
-
-[mobile]
-enabled = false
-
-[lan]
-enabled = false

benches/numa-bench.toml

@@ -1,31 +0,0 @@
-[server]
-bind_addr = "127.0.0.1:5454"
-api_port = 5381
-api_bind_addr = "127.0.0.1"
-data_dir = "/tmp/numa-bench"
-
-[upstream]
-mode = "forward"
-address = ["https://9.9.9.9/dns-query"]
-timeout_ms = 10000
-
-[cache]
-min_ttl = 60
-max_ttl = 3600
-
-[blocking]
-enabled = false
-
-[proxy]
-port = 8080
-tls_port = 8443
-
-[dot]
-enabled = true
-port = 8530
-
-[mobile]
-enabled = false
-
-[lan]
-enabled = false

blog/dnssec-from-scratch.md

@@ -163,12 +163,12 @@ The fix has three parts:
 
 **TCP fallback.** Every outbound query tries UDP first (800ms timeout). If UDP fails or the response is truncated, retry immediately over TCP. TCP uses a 2-byte length prefix before the DNS message — trivial to implement, and it handles DNSSEC responses that exceed the UDP payload limit.
 
-**UDP auto-disable.** After 3 consecutive UDP failures, flip a global `AtomicBool` and skip UDP entirely — go TCP-first for all queries. The flag resets when the network changes (detected via LAN IP monitoring).
+**UDP auto-disable.** After 3 consecutive UDP failures, flip a global `AtomicBool` and skip UDP entirely — go TCP-first for all queries. This avoids burning 800ms per hop on a network where UDP will never work. The flag resets when the network changes (detected via LAN IP monitoring).
-
-<img src="../hostile-network.svg" alt="Latency profile on a hostile network: queries 1-3 each spend 800ms waiting for a UDP timeout before retrying over TCP, taking 1,100ms total per query. After 3 consecutive failures the UDP auto-disable flag flips, and queries 4+ go TCP-first and complete in 300ms each — 3.7× faster.">
 
 **Query minimization (RFC 7816).** When querying root servers, send only the TLD — `com` instead of `secret-project.example.com`. Root servers handle trillions of queries and are operated by 12 organizations. Minimization reduces what they learn from yours.
 
+The result: on a network that blocks UDP:53, Numa detects the block within the first 3 queries, switches to TCP, and resolves normally at 300-500ms per cold query. Cached queries remain 0ms. No manual config change needed — switch networks and it adapts.
+
 I wouldn't have found this without dogfooding. The code worked perfectly on my home network. It took a real hostile network to expose the assumption that UDP always works.
 
 ## What I learned

blog/dot-from-scratch.md

@@ -1,176 +0,0 @@
----
-title: DNS-over-TLS from Scratch in Rust
-description: Building RFC 7858 on top of rustls — length-prefix framing, ALPN cross-protocol defense, and two bugs that only the strict clients caught.
-date: April 2026
----
-
-The [previous post](/blog/posts/dnssec-from-scratch.html) ended with "DoT — the last encrypted transport we don't support." This post is about building it.
-
-Numa now runs a DoT listener on port 853. My iPhone uses it as its system resolver, so ad blocking, DNSSEC validation, and recursive resolution follow my phone through the day. No cloud, no account, no companion app — a self-signed cert, a `.mobileconfig` profile, and a QR code in the terminal.
-
-RFC 7858 is ten pages. The hard parts weren't in the RFC. They were in cross-protocol confusion defenses, a crypto-provider init gotcha that only triggered in one specific config combination, and a certificate SAN bug iOS was happy to accept and `kdig` immediately rejected. This post is about those parts.
-
-## Why DoT when you already have DoH?
-
-Numa has shipped DoH since v0.1. Both protocols tunnel DNS over TLS; DoH wraps queries in HTTP/2, DoT is DNS-over-TCP with TLS in front. Same privacy guarantees, different wrapper.
-
-The answer to "why both" is that **phones ask for DoT by name.** iOS system DNS configures it with two fields (IP + server name) instead of a URL template. Android 9+ "Private DNS" speaks DoT natively. Linux stubs default to DoT. I wanted my phone on Numa without installing anything on the phone itself, and DoT is the protocol iOS and Android already speak for that.
-
-## The wire format is refreshingly small
-
-RFC 7858 is one sentence of wire protocol: *DNS-over-TCP (RFC 1035 §4.2.2) with TLS in front, on port 853.* DNS-over-TCP has existed since 1987 — a 2-byte length prefix followed by the DNS message. DoT is that, wrapped in a TLS session. The entire framing code is seven lines:
-
-```rust
-async fn write_framed<S>(stream: &mut S, msg: &[u8]) -> io::Result<()>
-where S: AsyncWriteExt + Unpin {
-    let mut out = Vec::with_capacity(2 + msg.len());
-    out.extend_from_slice(&(msg.len() as u16).to_be_bytes());
-    out.extend_from_slice(msg);
-    stream.write_all(&out).await?;
-    stream.flush().await
-}
-```
-
-Reads are symmetric: `read_exact` two bytes, convert to `u16`, `read_exact` that many bytes. No HTTP headers, no chunked encoding, no framing layer.
-
-## Persistent connections
-
-A fresh TCP+TLS handshake is at least 3 RTTs — about 300ms on a 100ms connection, 60× the cost of a UDP query. RFC 7858 §3.4 says clients SHOULD reuse the TCP connection for multiple queries, and every real DoT client does: iOS, Android, systemd, stubby. A single connection often carries hundreds of queries.
-
-<img src="../dot-handshake.svg" alt="Timing diagram comparing a DNS lookup over plain UDP (1 RTT), over DoT on a fresh connection (3 RTTs — TCP handshake, TLS 1.3 handshake, then the query), and over a reused DoT session (1 RTT, same as UDP).">
-
-The amortization point is the whole game. If you only ever do one query per connection, DoT is roughly 3× slower than UDP and you should not use it. If you reuse the same TLS session for a browsing session's worth of queries, the handshake is paid once and every subsequent query is effectively free.
-
-The server is a loop that reads a length-prefixed message, resolves it, writes the response framed the same way, waits for the next one. Three timeouts keep it honest:
-
-- **Handshake timeout (10s)** — a slowloris that opens TCP but never sends a ClientHello can't pin a worker.
-- **Idle timeout (30s)** — a connected client with nothing to say gets dropped.
-- **Write timeout (10s)** — a stalled reader can't hold a response buffer indefinitely.
-
-A semaphore caps concurrent connections at 512 so a burst of handshakes can't exhaust the tokio runtime.
-
-## ALPN, the cross-protocol defense that matters
-
-If DoT lives on port 853 and HTTPS on 443, what stops an HTTP/2 client from hitting 853 and getting confused replies? [Cross-protocol attacks](https://alpaca-attack.com/) exist and have had real CVEs. The defense is ALPN: during the TLS handshake the client advertises protocols, the server picks one it supports or fails. A DoT server advertises `"dot"`; a client offering only `"h2"` gets a `no_application_protocol` fatal alert before any frames are exchanged.
-
-rustls enforces this by default when you set `alpn_protocols`:
-
-```rust
-let mut config = ServerConfig::builder()
-    .with_no_client_auth()
-    .with_single_cert(certs, key)?;
-config.alpn_protocols = vec![b"dot".to_vec()];
-```
-
-"The library enforces it by default" has a latent risk: a future rustls upgrade could change the default, and the defense would quietly evaporate. I wrote a test that pins the behavior so any regression in a dependency update fails loudly:
-
-```rust
-#[tokio::test]
-async fn dot_rejects_non_dot_alpn() {
-    let (addr, cert_der) = spawn_dot_server().await;
-    let client_config = dot_client(&cert_der, vec![b"h2".to_vec()]);
-    let connector = tokio_rustls::TlsConnector::from(client_config);
-    let tcp = tokio::net::TcpStream::connect(addr).await.unwrap();
-    let result = connector
-        .connect(ServerName::try_from("numa.numa").unwrap(), tcp)
-        .await;
-    assert!(result.is_err(),
-        "DoT server must reject ALPN that doesn't include \"dot\"");
-}
-```
-
-When you're leaning on a library's default for a security-critical invariant, the test is the contract.
-
-## Two bugs that hid for days
-
-Both were fixed before v0.10 shipped. Both stayed hidden because my initial tests used *permissive* clients.
-
-### The rustls crypto provider panic
-
-rustls 0.23 requires a `CryptoProvider` installed before you can build a `ServerConfig`. Numa's HTTPS proxy calls `install_default` as a side effect when it builds its own config, so DoT "just worked" for users who enabled both — the proxy had already initialized the provider before DoT's first handshake.
-
-Then I added support for user-provided DoT certificates. Someone running DoT with their own Let's Encrypt cert, with the HTTPS proxy disabled, would hit:
-
-```
-thread 'dot' panicked at rustls-0.23.25/src/crypto/mod.rs:185:14:
-no process-level CryptoProvider available -- call
-CryptoProvider::install_default() before this point
-```
-
-The panic happened on the first client connection, not at startup. While writing the integration suite for "DoT with BYO cert, proxy disabled" — the one combination nobody had ever actually exercised — the first run panicked. Fix is two lines: call `install_default` inside `load_tls_config` so DoT can stand alone. If a side effect initializes something and you have a path that skips that side effect, you have a bug waiting for a specific deployment.
-
-### The SAN bug iOS was happy to accept
-
-Numa's self-signed DoT cert is generated on first run from a local CA alongside the data directory. It needs to match whatever `ServerName` the client sends as SNI. For the HTTPS proxy, that's the wildcard domain pattern `*.numa` (matching `frontend.numa`, `api.numa`, etc.). I initially reused the same SAN list for DoT: a wildcard `*.numa` and nothing else.
-
-On an iPhone this worked perfectly. Full browsing session, persistent connections in the log, ad blocking active. I was about to merge when I ran one last smoke test with `kdig` (GnuTLS-backed, from [Knot DNS](https://www.knot-dns.cz/)):
-
-```
-$ kdig @192.168.1.16 -p 853 +tls \
-    +tls-ca=/usr/local/var/numa/ca.pem \
-    +tls-hostname=numa.numa example.com A
-
-;; TLS, handshake failed (Error in the certificate.)
-```
-
-Huh.
-
-[RFC 6125 §6.4.3](https://datatracker.ietf.org/doc/html/rfc6125#section-6.4.3): a wildcard in a certificate's DNS-ID matches exactly one label. `*.numa` matches `frontend.numa`, but not `numa.numa`, because the wildcard wants at least one label to substitute and strict clients reject wildcards in the leftmost label under single-label TLDs as ambiguous.
-
-iOS's TLS stack is lenient and accepts it. GnuTLS, NSS (Firefox), and most non-Apple validators don't. The fix is five lines — add an explicit `numa.numa` SAN alongside the wildcard. But the lesson is the one that stuck: I wrote a commit message saying "fix an iOS bug" and had to rewrite it, because iOS was fine. The real bug was that every GnuTLS/NSS-based client on the planet would have rejected the cert, and I only found it by running one more test with a stricter tool.
-
-> Test with the strict client. The permissive client hides your bugs.
-
-## Getting your phone onto it
-
-A DoT server is useless without a way to point a phone at it. iOS won't let you type an IP and a server name into Settings directly — you install a `.mobileconfig` profile that bundles the CA as a trust anchor and the DNS settings in a single payload.
-
-Numa ships a subcommand that builds one on the fly and serves it over a QR code in the terminal:
-
-```
-$ numa setup-phone
-
-  Numa Phone Setup
-
-  Profile URL: http://192.168.1.10:8765/mobileconfig
-
-  ██████████████████████████████
-  ██                          ██
-  ██   [QR code rendered in   ██
-  ██    your terminal]        ██
-  ██                          ██
-  ██████████████████████████████
-
-  On your iPhone:
-    1. Open Camera, point at the QR code, tap the yellow banner
-    2. Allow the download when Safari asks
-    3. Open Settings — tap "Profile Downloaded" near the top
-       (or: Settings → General → VPN & Device Management → Numa DNS)
-    4. Tap Install (top right), enter passcode, Install again
-    5. Settings → General → About → Certificate Trust Settings
-       Toggle ON "Numa Local CA" — required for DoT to work
-```
-
-The same QR is available in the dashboard — click "Phone Setup" in the header and the popover renders an SVG QR code pointing at the mobileconfig URL. On mobile viewports it shows a direct download link instead.
-
-<img src="../phone-setup-dashboard.png" alt="Numa dashboard with Phone Setup popover showing QR code and install instructions">
-
-Step 4 is non-negotiable. Even though the CA is bundled in the same profile that installs the DNS settings, iOS still requires the user to explicitly toggle trust in Certificate Trust Settings. It's a deliberate iOS policy to prevent profile-based trust injection — annoying, and correct.
-
-I've been dogfooding this since v0.10 shipped in early April. The phone resolves through Numa over DoT whenever I'm home; persistent connections are visible in the log as a single source port living through dozens of queries. The one real caveat: if the laptop's LAN IP changes, the profile breaks. [RFC 9462 DDR](https://datatracker.ietf.org/doc/html/rfc9462) fixes that — Numa can respond to `_dns.resolver.arpa IN SVCB` with its current IP and iOS picks it up on each network join. Next piece of work.
-
-## What I learned
-
-**RFC-level small, API-level hard.** RFC 7858 is ten pages. The framing is trivial. But the subtle stuff — ALPN, timeouts, connection caps, handshake vs idle vs write deadlines, backoff on accept errors — isn't in the RFC. Miss any of it and you leak a DoS vector or a protocol confusion hole.
-
-**Your test matrix is your security matrix.** Both bugs in this post were hidden by lenient clients. In both cases the strict client — kdig, or a specific config combination — surfaced the bug instantly. Pick test tools for strictness, not convenience. The moment you find yourself thinking "but iOS accepts it," stop and run kdig.
-
-**Don't initialize global state via side effects.** "Module A installs a global, module B silently depends on it, disabling A breaks B" is a bug pattern that keeps coming back. Fix: have module B initialize its dependency explicitly, even if it means calling an idempotent `install_default` twice. The dependency graph should be local and obvious.
-
-## What's next
-
-- ~~**DoH server**~~ — shipped in v0.12.0. `POST /dns-query` accepts [RFC 8484](https://datatracker.ietf.org/doc/html/rfc8484) wire-format queries, so Firefox/Chrome can point their built-in DoH at Numa.
-- **DoQ server (RFC 9250)** — DNS over QUIC. Android 14+ supports it natively.
-- **DDR (RFC 9462)** — auto-discovery via `_dns.resolver.arpa IN SVCB`, so phones pick up a moved Numa instance without the installed profile going stale.
-
-The code is at [github.com/razvandimescu/numa](https://github.com/razvandimescu/numa) — the DoT listener is in [`src/dot.rs`](https://github.com/razvandimescu/numa/blob/main/src/dot.rs) and the phone onboarding flow is in [`src/setup_phone.rs`](https://github.com/razvandimescu/numa/blob/main/src/setup_phone.rs) and [`src/mobileconfig.rs`](https://github.com/razvandimescu/numa/blob/main/src/mobileconfig.rs). MIT license.

com.numa.dns.plist

@@ -6,7 +6,7 @@
     <string>com.numa.dns</string>
     <key>ProgramArguments</key>
     <array>
-        <string>{{exe_path}}</string>
+        <string>/usr/local/bin/numa</string>
     </array>
     <key>RunAtLoad</key>
     <true/>

install.sh

@@ -70,10 +70,8 @@ echo ""
 echo "  \033[38;2;107;124;78mInstalled:\033[0m $INSTALL_DIR/numa ($TAG)"
 echo ""
 echo "  Get started:"
-echo "    sudo numa install            # install service + set as system DNS"
+echo "    sudo numa                    # start the DNS server"
-echo "    open http://localhost:5380   # dashboard"
+echo "    sudo numa install            # set as system DNS"
-echo ""
+echo "    sudo numa service start      # run as persistent service"
-echo "  Other commands:"
+echo "    open http://localhost:5380    # dashboard"
-echo "    sudo numa                    # run in foreground (no service)"
-echo "    sudo numa uninstall          # restore original DNS"
 echo ""

numa.service

@@ -5,7 +5,7 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-ExecStart={{exe_path}}
+ExecStart=/usr/local/bin/numa
 Restart=always
 RestartSec=2
 StandardOutput=journal

numa.toml

@@ -2,28 +2,15 @@
 bind_addr = "0.0.0.0:53"
 api_port = 5380
 # api_bind_addr = "127.0.0.1"  # default; set to "0.0.0.0" for LAN dashboard access
-# data_dir = "/var/lib/numa"  # where numa stores TLS CA and cert material
-                              # Defaults: /var/lib/numa on linux (FHS),
-                              # /usr/local/var/numa on macos (homebrew prefix),
-                              # %PROGRAMDATA%\numa on windows. Override for
-                              # containerized deploys or tests that can't
-                              # write to the system path.
 
 # [upstream]
 # mode = "forward"                              # "forward" (default) — relay to upstream
 #                                               # "recursive" — resolve from root hints (no address needed)
-# address = "9.9.9.9"                           # single upstream (plain UDP)
-# address = ["192.168.1.1", "9.9.9.9:5353"]    # multiple upstreams — SRTT picks fastest
 # address = "https://dns.quad9.net/dns-query"   # DNS-over-HTTPS (encrypted)
-# address = "tls://9.9.9.9#dns.quad9.net"       # DNS-over-TLS (encrypted, port 853)
+# address = "https://cloudflare-dns.com/dns-query"  # Cloudflare DoH
-# fallback = ["8.8.8.8", "1.1.1.1"]            # tried only when all primaries fail
+# address = "9.9.9.9"                           # plain UDP
-# port = 53                                     # default port for addresses without :port
+# port = 53                                     # only for forward mode, plain UDP
 # timeout_ms = 3000
-# hedge_ms = 10                                  # request hedging delay (ms). After this delay
-#                                                # without a response, fires a parallel request
-#                                                # to the same upstream. Rescues packet loss (UDP),
-#                                                # dispatch spikes (DoH), TLS stalls (DoT).
-#                                                # Set to 0 to disable. Default: 10
 # root_hints = [                                # only used in recursive mode
 #     "198.41.0.4",      # a.root-servers.net (Verisign)
 #     "199.9.14.201",    # b.root-servers.net (USC-ISI)
@@ -51,14 +38,6 @@ api_port = 5380
 #     "co", "br", "au", "ca", "jp",             # other major ccTLDs
 # ]
 
-# [[forwarding]]                                  # per-suffix conditional forwarding rules
-# suffix = "168.192.in-addr.arpa"                  # single suffix → one upstream
-# upstream = "100.90.1.63:5361"
-#
-# [[forwarding]]
-# suffix = ["home.local", "home.arpa"]             # multiple suffixes → same upstream
-# upstream = "10.0.0.1"                            # port 53 default
-
 # [blocking]
 # enabled = true               # set to false to disable ad blocking
 # refresh_hours = 24
@@ -66,17 +45,16 @@ api_port = 5380
 # allowlist = ["example.com"]  # domains to never block
 
 [cache]
-max_entries = 100000
+max_entries = 10000
 min_ttl = 60
 max_ttl = 86400
-# warm = ["google.com", "github.com"]  # resolve at startup, refresh before TTL expiry
 
 [proxy]
 enabled = true
 port = 80
 tls_port = 443
 tld = "numa"
-# bind_addr = "127.0.0.1"  # default; set to "0.0.0.0" for LAN access to .numa services
+# bind_addr = "127.0.0.1"  # default; auto 0.0.0.0 when [lan] enabled
 
 # Pre-configured services (numa.numa is always added automatically)
 # [[services]]
@@ -105,35 +83,8 @@ tld = "numa"
 # enabled = false             # opt-in: verify chain of trust from root KSK
 # strict = false              # true = SERVFAIL on bogus signatures
 
-# DNS-over-TLS listener (RFC 7858) — encrypted DNS on port 853
-# [dot]
-# enabled = true              # on by default; set false to disable
-# port = 853                  # standard DoT port
-# bind_addr = "0.0.0.0"       # IPv4 or IPv6; unspecified binds all interfaces
-# cert_path = "/etc/numa/dot.crt"  # PEM cert; omit to use self-signed (proxy CA if available)
-# key_path = "/etc/numa/dot.key"   # PEM private key; must be set together with cert_path
-
 # LAN service discovery via mDNS (disabled by default — no network traffic unless enabled)
 # [lan]
 # enabled = true              # discover other Numa instances via mDNS (_numa._tcp.local)
 # broadcast_interval_secs = 30
 # peer_timeout_secs = 90
-
-# Mobile API — persistent HTTP listener serving read-only routes
-# (/health, /ca.pem, /mobileconfig, /ca.mobileconfig) on a LAN-reachable
-# port. Consumed by the iOS/Android companion apps for discovery and
-# profile fetching, and by `numa setup-phone` for QR-based onboarding.
-#
-# Opt-in because the listener binds to the LAN by default. None of the
-# exposed routes are cryptographically sensitive (no private keys, no
-# state mutations, all idempotent GETs), but enabling it does add a new
-# listener to any device on the LAN that scans port 8765.
-#
-# Safe for home LANs. Think twice before enabling on untrusted LANs
-# (office Wi-Fi, coffee shops, etc.) — an attacker on the same network
-# could run a competing Numa instance that shadows yours via mDNS and
-# trick companion apps into installing their profile instead of yours.
-[mobile]
-enabled = true                # opt-in to the mobile API listener
-# port = 8765                 # default; matches Discovery.swift defaultAPIPort
-# bind_addr = "0.0.0.0"       # default; set to "127.0.0.1" for localhost-only

scripts/record-demo.sh

@@ -7,19 +7,18 @@
 # The script:
 #   1. Opens the dashboard in Chrome --app mode (clean, no address bar)
 #   2. Generates DNS traffic (forward, cache hit, blocked)
-#   3. Opens Phone Setup QR popover
+#   3. Types "peekm" / "6419" into the Local Services form on camera
-#   4. Types "peekm" / "6419" into the Local Services form on camera
+#   4. Shows LAN accessibility badge ("local only" / "LAN")
-#   5. Shows LAN accessibility badge ("local only" / "LAN")
+#   5. Checks a blocked domain
-#   6. Checks a blocked domain
+#   6. Opens peekm.numa to show the proxy working
-#   7. Opens peekm.numa to show the proxy working
+#   7. Records via ffmpeg and converts to optimized GIF
-#   8. Records via ffmpeg and converts to optimized GIF
 
 set -euo pipefail
 
 # --------------- Configuration ---------------
 OUTPUT="${1:-assets/hero-demo.gif}"
 PORT=5380
-RECORD_SECONDS=24
+RECORD_SECONDS=20
 VIEWPORT_W=1800
 VIEWPORT_H=1100
 FPS=12
@@ -231,16 +230,8 @@ dig @127.0.0.1 github.com +short > /dev/null 2>&1
 dig @127.0.0.1 ad.doubleclick.net +short > /dev/null 2>&1
 sleep 3
 
-# --------------- Scene 2: Phone Setup popover (3-7s) ---------------
+# --------------- Scene 2: Add peekm service via UI (3-7s) ---------------
-log "Scene 2: Phone Setup QR popover..."
+log "Scene 2: Adding peekm.numa service..."
-run_js "document.querySelector('#phoneSetup button').click();"
-sleep 3
-# Dismiss popover
-run_js "document.getElementById('phoneSetupPopover').style.display = 'none';"
-sleep 1
-
-# --------------- Scene 3: Add peekm service via UI (7-11s) ---------------
-log "Scene 3: Adding peekm.numa service..."
 
 # Services panel is now first — scroll to it
 run_js "
@@ -258,18 +249,18 @@ sleep 0.3
 run_js "document.querySelector('#serviceForm .btn-add').click();"
 sleep 2
 
-# --------------- Scene 4: Open peekm.numa (11-15s) ---------------
+# --------------- Scene 3: Open peekm.numa (7-11s) ---------------
-log "Scene 4: Opening peekm.numa in browser..."
+log "Scene 3: Opening peekm.numa in browser..."
 open "http://peekm.numa/view/peekm/README.md" 2>/dev/null || true
 sleep 4
 
-# --------------- Scene 5: Back to dashboard (15-18s) ---------------
+# --------------- Scene 4: Back to dashboard (11-14s) ---------------
-log "Scene 5: Back to dashboard — LAN badges + LOCAL queries visible..."
+log "Scene 4: Back to dashboard — LAN badges + LOCAL queries visible..."
 osascript -e "tell application \"System Events\" to set frontmost of (first process whose unix id is $CHROME_PID) to true" 2>/dev/null || true
 sleep 3
 
-# --------------- Scene 6: Check Domain blocker (18-21s) ---------------
+# --------------- Scene 5: Check Domain blocker (14-17s) ---------------
-log "Scene 6: Check Domain — blocked tracker..."
+log "Scene 5: Check Domain — blocked tracker..."
 # Scroll down to blocking panel
 run_js "
     var blockPanel = document.getElementById('blockingPanel');
@@ -282,8 +273,8 @@ sleep 0.3
 run_js "document.querySelector('#checkDomainInput').closest('form').querySelector('.btn').click();"
 sleep 2
 
-# --------------- Scene 7: Terminal-style dig overlay (21-24s) ---------------
+# --------------- Scene 6: Terminal-style dig overlay (17-20s) ---------------
-log "Scene 7: dig proof overlay..."
+log "Scene 6: dig proof overlay..."
 DIG_RESULT=$(dig @127.0.0.1 peekm.numa +short 2>/dev/null | head -1)
 run_js "
     var overlay = document.createElement('div');

scripts/release.sh

@@ -37,7 +37,7 @@ cargo update --workspace
 git add Cargo.toml Cargo.lock
 git commit -m "chore: bump version to $VERSION"
 git tag "$TAG"
-git push origin main "$TAG"
+git push origin main --tags
 
 echo
 echo "Released $TAG — GitHub Actions will build, publish to crates.io, and create the release."

scripts/update-homebrew-formula.py

@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-"""Rewrite a Homebrew formula in place: bump version, URL paths, and sha256 lines.
-
-Reads the formula path from argv[1], and the following env vars:
-  VERSION              e.g. "0.10.0" (no leading v)
-  SHA_MACOS_AARCH64
-  SHA_MACOS_X86_64
-  SHA_LINUX_AARCH64
-  SHA_LINUX_X86_64
-
-Assumptions about the formula:
-  - Has `version "X.Y.Z"` somewhere
-  - Has `url "...releases/download/vX.Y.Z/numa-<target>.tar.gz"` lines
-  - May or may not already have `sha256 "..."` lines immediately after each url
-"""
-import os
-import re
-import sys
-
-formula_path = sys.argv[1]
-version = os.environ["VERSION"].lstrip("v")
-shas = {
-    "macos-aarch64": os.environ["SHA_MACOS_AARCH64"],
-    "macos-x86_64": os.environ["SHA_MACOS_X86_64"],
-    "linux-aarch64": os.environ["SHA_LINUX_AARCH64"],
-    "linux-x86_64": os.environ["SHA_LINUX_X86_64"],
-}
-
-with open(formula_path) as f:
-    content = f.read()
-
-content = re.sub(r'version "[^"]*"', f'version "{version}"', content)
-content = re.sub(
-    r"releases/download/v[\d.]+/numa-",
-    f"releases/download/v{version}/numa-",
-    content,
-)
-content = re.sub(r'\n[ \t]*sha256 "[^"]*"', "", content)
-
-
-def add_sha(match: re.Match) -> str:
-    indent = match.group(1)
-    target = match.group(2)
-    if target not in shas:
-        return match.group(0)
-    return f'{match.group(0)}\n{indent}sha256 "{shas[target]}"'
-
-
-content = re.sub(
-    r'^([ \t]+)url "[^"]*numa-([\w-]+)\.tar\.gz"',
-    add_sha,
-    content,
-    flags=re.MULTILINE,
-)
-
-with open(formula_path, "w") as f:
-    f.write(content)

site/blog-template.html

@@ -74,7 +74,6 @@ body::before {
   font-weight: 400;
   color: var(--text-primary);
   text-decoration: none;
-  text-transform: none;
   letter-spacing: -0.02em;
 }
 .blog-nav .wordmark:hover { color: var(--amber); }

site/blog/dot-handshake.svg

@@ -1,129 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 720 360" font-family="'DM Sans', system-ui, sans-serif" font-size="12">
-  <defs>
-    <marker id="arr-amber" viewBox="0 0 10 10" refX="9" refY="5" markerWidth="6" markerHeight="6" orient="auto">
-      <path d="M 0 0 L 10 5 L 0 10 z" fill="#c0623a"/>
-    </marker>
-    <marker id="arr-dim" viewBox="0 0 10 10" refX="9" refY="5" markerWidth="6" markerHeight="6" orient="auto">
-      <path d="M 0 0 L 10 5 L 0 10 z" fill="#a39888"/>
-    </marker>
-    <filter id="shadow" x="-3%" y="-3%" width="106%" height="106%">
-      <feDropShadow dx="0" dy="1" stdDeviation="2" flood-opacity="0.06"/>
-    </filter>
-  </defs>
-
-  <!-- Background -->
-  <rect width="720" height="360" rx="8" fill="#faf7f2"/>
-
-  <!-- Title -->
-  <text x="360" y="32" text-anchor="middle" font-size="15" font-weight="600" fill="#2c2418" font-family="'Instrument Serif', Georgia, serif" letter-spacing="-0.02em">UDP vs DoT — one lookup, three scenarios</text>
-  <text x="360" y="50" text-anchor="middle" font-size="11" fill="#a39888">Time flows downward. Amber = DNS work. Gray = TCP/TLS handshake overhead.</text>
-
-  <!-- ==================== Column 1: Plain UDP ==================== -->
-  <g transform="translate(20, 0)">
-    <!-- Column header -->
-    <text x="90" y="84" text-anchor="middle" font-size="13" font-weight="600" fill="#2c2418">Plain UDP DNS</text>
-    <text x="90" y="101" text-anchor="middle" font-size="10" fill="#a39888" letter-spacing="0.06em">PORT 53 · CLEARTEXT</text>
-
-    <!-- Lane labels -->
-    <text x="25" y="128" font-size="10" fill="#6b5e4f">client</text>
-    <text x="133" y="128" font-size="10" fill="#6b5e4f">server</text>
-
-    <!-- Lanes -->
-    <line x1="35" y1="138" x2="35" y2="198" stroke="#d4cbba" stroke-width="1" stroke-dasharray="2 3"/>
-    <line x1="145" y1="138" x2="145" y2="198" stroke="#d4cbba" stroke-width="1" stroke-dasharray="2 3"/>
-
-    <!-- query -->
-    <line x1="37" y1="148" x2="143" y2="160" stroke="#c0623a" stroke-width="2" marker-end="url(#arr-amber)"/>
-    <text x="90" y="143" text-anchor="middle" font-size="10" fill="#9e4e2d" font-weight="500">query</text>
-
-    <!-- response -->
-    <line x1="143" y1="178" x2="37" y2="190" stroke="#c0623a" stroke-width="2" marker-end="url(#arr-amber)"/>
-    <text x="90" y="205" text-anchor="middle" font-size="10" fill="#9e4e2d" font-weight="500">response</text>
-
-    <!-- Total cost badge -->
-    <rect x="20" y="225" width="140" height="32" rx="4" fill="#faf7f2" stroke="#d4cbba" stroke-width="1" filter="url(#shadow)"/>
-    <text x="90" y="241" text-anchor="middle" font-size="9" fill="#a39888" letter-spacing="0.04em">TOTAL LATENCY</text>
-    <text x="90" y="253" text-anchor="middle" font-size="11" font-weight="600" fill="#c0623a" font-family="'JetBrains Mono', monospace">1 × RTT</text>
-  </g>
-
-  <!-- ==================== Column 2: DoT cold ==================== -->
-  <g transform="translate(270, 0)">
-    <!-- Column header -->
-    <text x="90" y="84" text-anchor="middle" font-size="13" font-weight="600" fill="#2c2418">DoT — first query</text>
-    <text x="90" y="101" text-anchor="middle" font-size="10" fill="#a39888" letter-spacing="0.06em">PORT 853 · NEW CONNECTION</text>
-
-    <!-- Lane labels -->
-    <text x="25" y="128" font-size="10" fill="#6b5e4f">client</text>
-    <text x="133" y="128" font-size="10" fill="#6b5e4f">server</text>
-
-    <!-- Lanes -->
-    <line x1="35" y1="138" x2="35" y2="308" stroke="#d4cbba" stroke-width="1" stroke-dasharray="2 3"/>
-    <line x1="145" y1="138" x2="145" y2="308" stroke="#d4cbba" stroke-width="1" stroke-dasharray="2 3"/>
-
-    <!-- === RTT 1: TCP handshake === -->
-    <!-- SYN -->
-    <line x1="37" y1="145" x2="143" y2="153" stroke="#a39888" stroke-width="1.5" marker-end="url(#arr-dim)"/>
-    <!-- SYN-ACK -->
-    <line x1="143" y1="163" x2="37" y2="171" stroke="#a39888" stroke-width="1.5" marker-end="url(#arr-dim)"/>
-    <!-- ACK -->
-    <line x1="37" y1="181" x2="143" y2="189" stroke="#a39888" stroke-width="1.5" marker-end="url(#arr-dim)"/>
-    <!-- Label + RTT marker -->
-    <text x="168" y="170" font-size="9" fill="#a39888" font-family="'JetBrains Mono', monospace">1 rtt</text>
-    <text x="90" y="143" text-anchor="middle" font-size="9" fill="#6b5e4f" font-style="italic">TCP handshake</text>
-
-    <!-- === RTT 2: TLS 1.3 handshake === -->
-    <!-- ClientHello -->
-    <line x1="37" y1="208" x2="143" y2="216" stroke="#a39888" stroke-width="1.5" marker-end="url(#arr-dim)"/>
-    <!-- ServerHello + Cert + Finished -->
-    <line x1="143" y1="226" x2="37" y2="234" stroke="#a39888" stroke-width="1.5" marker-end="url(#arr-dim)"/>
-    <!-- Label + RTT marker -->
-    <text x="168" y="222" font-size="9" fill="#a39888" font-family="'JetBrains Mono', monospace">2 rtt</text>
-    <text x="90" y="205" text-anchor="middle" font-size="9" fill="#6b5e4f" font-style="italic">TLS 1.3 handshake</text>
-
-    <!-- === RTT 3: DNS exchange === -->
-    <!-- query (piggybacked on ClientFinished) -->
-    <line x1="37" y1="253" x2="143" y2="261" stroke="#c0623a" stroke-width="2" marker-end="url(#arr-amber)"/>
-    <!-- response -->
-    <line x1="143" y1="271" x2="37" y2="279" stroke="#c0623a" stroke-width="2" marker-end="url(#arr-amber)"/>
-    <!-- Label + RTT marker -->
-    <text x="168" y="267" font-size="9" fill="#a39888" font-family="'JetBrains Mono', monospace">3 rtt</text>
-    <text x="90" y="250" text-anchor="middle" font-size="10" fill="#9e4e2d" font-weight="500">query + response</text>
-
-    <!-- Total cost badge -->
-    <rect x="20" y="295" width="140" height="32" rx="4" fill="#faf7f2" stroke="#d4cbba" stroke-width="1" filter="url(#shadow)"/>
-    <text x="90" y="311" text-anchor="middle" font-size="9" fill="#a39888" letter-spacing="0.04em">TOTAL LATENCY</text>
-    <text x="90" y="323" text-anchor="middle" font-size="11" font-weight="600" fill="#c0623a" font-family="'JetBrains Mono', monospace">3 × RTT</text>
-  </g>
-
-  <!-- ==================== Column 3: DoT reused ==================== -->
-  <g transform="translate(520, 0)">
-    <!-- Column header -->
-    <text x="90" y="84" text-anchor="middle" font-size="13" font-weight="600" fill="#2c2418">DoT — reused session</text>
-    <text x="90" y="101" text-anchor="middle" font-size="10" fill="#a39888" letter-spacing="0.06em">PORT 853 · PERSISTENT TCP/TLS</text>
-
-    <!-- Lane labels -->
-    <text x="25" y="128" font-size="10" fill="#6b5e4f">client</text>
-    <text x="133" y="128" font-size="10" fill="#6b5e4f">server</text>
-
-    <!-- Lanes -->
-    <line x1="35" y1="138" x2="35" y2="198" stroke="#d4cbba" stroke-width="1" stroke-dasharray="2 3"/>
-    <line x1="145" y1="138" x2="145" y2="198" stroke="#d4cbba" stroke-width="1" stroke-dasharray="2 3"/>
-
-    <!-- query -->
-    <line x1="37" y1="148" x2="143" y2="160" stroke="#c0623a" stroke-width="2" marker-end="url(#arr-amber)"/>
-    <text x="90" y="143" text-anchor="middle" font-size="10" fill="#9e4e2d" font-weight="500">query</text>
-
-    <!-- response -->
-    <line x1="143" y1="178" x2="37" y2="190" stroke="#c0623a" stroke-width="2" marker-end="url(#arr-amber)"/>
-    <text x="90" y="205" text-anchor="middle" font-size="10" fill="#9e4e2d" font-weight="500">response</text>
-
-    <!-- Total cost badge -->
-    <rect x="20" y="225" width="140" height="32" rx="4" fill="#faf7f2" stroke="#d4cbba" stroke-width="1" filter="url(#shadow)"/>
-    <text x="90" y="241" text-anchor="middle" font-size="9" fill="#a39888" letter-spacing="0.04em">TOTAL LATENCY</text>
-    <text x="90" y="253" text-anchor="middle" font-size="11" font-weight="600" fill="#c0623a" font-family="'JetBrains Mono', monospace">1 × RTT</text>
-
-    <!-- Tiny caption -->
-    <text x="90" y="280" text-anchor="middle" font-size="9" fill="#a39888" font-style="italic">(handshake amortized</text>
-    <text x="90" y="292" text-anchor="middle" font-size="9" fill="#a39888" font-style="italic">across the session)</text>
-  </g>
-</svg>

site/blog/hostile-network.svg

@@ -1,92 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 720 330" font-family="'DM Sans', system-ui, sans-serif" font-size="12">
-  <defs>
-    <filter id="shadow" x="-3%" y="-3%" width="106%" height="106%">
-      <feDropShadow dx="0" dy="1" stdDeviation="2" flood-opacity="0.06"/>
-    </filter>
-    <!-- Diagonal hatch for "wasted" UDP timeout regions. Darker warm gray
-         base + slightly darker diagonal stripes at 45°. The stripe pattern
-         is the Gantt convention for "dead/blocked time" — it reads as
-         "this time was thrown away" without needing the legend. -->
-    <pattern id="wasted-hatch" patternUnits="userSpaceOnUse" width="7" height="7" patternTransform="rotate(-45)">
-      <rect width="7" height="7" fill="#8b7f6f"/>
-      <line x1="0" y1="0" x2="0" y2="7" stroke="#3d3427" stroke-width="1.6" opacity="0.38"/>
-    </pattern>
-  </defs>
-
-  <!-- Background -->
-  <rect width="720" height="330" rx="8" fill="#faf7f2"/>
-
-  <!-- Title -->
-  <text x="360" y="32" text-anchor="middle" font-size="15" font-weight="600" fill="#2c2418" font-family="'Instrument Serif', Georgia, serif" letter-spacing="-0.02em">TCP fallback with UDP auto-disable</text>
-  <text x="360" y="50" text-anchor="middle" font-size="11" fill="#a39888">Latency profile on an ISP that blocks outbound UDP:53</text>
-
-  <!-- Legend -->
-  <g transform="translate(160, 70)">
-    <rect width="14" height="12" rx="2" fill="url(#wasted-hatch)"/>
-    <text x="22" y="10" font-size="11" fill="#6b5e4f">UDP timeout — 800 ms wasted</text>
-    <rect x="220" width="14" height="12" rx="2" fill="#c0623a"/>
-    <text x="242" y="10" font-size="11" fill="#6b5e4f">TCP — successful exchange</text>
-  </g>
-
-  <!-- Time axis -->
-  <!-- bar area: x=90 to x=570 (480px), representing 0-1200ms, scale 0.4 px/ms -->
-  <line x1="90" y1="108" x2="570" y2="108" stroke="#d4cbba" stroke-width="1"/>
-  <!-- tick marks -->
-  <line x1="90" y1="106" x2="90" y2="112" stroke="#a39888" stroke-width="1"/>
-  <line x1="210" y1="106" x2="210" y2="112" stroke="#a39888" stroke-width="1"/>
-  <line x1="330" y1="106" x2="330" y2="112" stroke="#a39888" stroke-width="1"/>
-  <line x1="410" y1="106" x2="410" y2="112" stroke="#a39888" stroke-width="1"/>
-  <line x1="530" y1="106" x2="530" y2="112" stroke="#a39888" stroke-width="1"/>
-  <!-- tick labels -->
-  <text x="90" y="102" text-anchor="middle" font-size="9" fill="#a39888" font-family="'JetBrains Mono', monospace">0</text>
-  <text x="210" y="102" text-anchor="middle" font-size="9" fill="#a39888" font-family="'JetBrains Mono', monospace">300</text>
-  <text x="330" y="102" text-anchor="middle" font-size="9" fill="#a39888" font-family="'JetBrains Mono', monospace">600</text>
-  <text x="410" y="102" text-anchor="middle" font-size="9" fill="#a39888" font-family="'JetBrains Mono', monospace">800</text>
-  <text x="530" y="102" text-anchor="middle" font-size="9" fill="#a39888" font-family="'JetBrains Mono', monospace">1100 ms</text>
-
-  <!-- ============ Phase 1: UDP-first (wasted 800ms per query) ============ -->
-
-  <!-- Query 1 -->
-  <text x="82" y="135" text-anchor="end" font-size="11" fill="#6b5e4f">query 1</text>
-  <rect x="90" y="125" width="320" height="16" rx="2" fill="url(#wasted-hatch)"/>
-  <rect x="410" y="125" width="120" height="16" rx="2" fill="#c0623a"/>
-  <text x="540" y="137" font-size="10" fill="#6b5e4f" font-family="'JetBrains Mono', monospace">1,100 ms</text>
-
-  <!-- Query 2 -->
-  <text x="82" y="159" text-anchor="end" font-size="11" fill="#6b5e4f">query 2</text>
-  <rect x="90" y="149" width="320" height="16" rx="2" fill="url(#wasted-hatch)"/>
-  <rect x="410" y="149" width="120" height="16" rx="2" fill="#c0623a"/>
-  <text x="540" y="161" font-size="10" fill="#6b5e4f" font-family="'JetBrains Mono', monospace">1,100 ms</text>
-
-  <!-- Query 3 -->
-  <text x="82" y="183" text-anchor="end" font-size="11" fill="#6b5e4f">query 3</text>
-  <rect x="90" y="173" width="320" height="16" rx="2" fill="url(#wasted-hatch)"/>
-  <rect x="410" y="173" width="120" height="16" rx="2" fill="#c0623a"/>
-  <text x="540" y="185" font-size="10" fill="#6b5e4f" font-family="'JetBrains Mono', monospace">1,100 ms</text>
-
-  <!-- State-change divider -->
-  <line x1="90" y1="206" x2="570" y2="206" stroke="#6b7c4e" stroke-width="1" stroke-dasharray="4 3"/>
-  <rect x="200" y="198" width="260" height="18" rx="9" fill="#faf7f2" stroke="#6b7c4e" stroke-width="1" filter="url(#shadow)"/>
-  <text x="330" y="210" text-anchor="middle" font-size="10" fill="#566540" font-weight="500">3 consecutive failures → UDP auto-disabled</text>
-
-  <!-- ============ Phase 2: TCP-first (UDP skipped) ============ -->
-
-  <!-- Query 4 -->
-  <text x="82" y="235" text-anchor="end" font-size="11" fill="#6b5e4f">query 4</text>
-  <rect x="90" y="225" width="120" height="16" rx="2" fill="#c0623a"/>
-  <text x="220" y="237" font-size="10" fill="#6b5e4f" font-family="'JetBrains Mono', monospace">300 ms</text>
-
-  <!-- Query 5 -->
-  <text x="82" y="259" text-anchor="end" font-size="11" fill="#6b5e4f">query 5</text>
-  <rect x="90" y="249" width="120" height="16" rx="2" fill="#c0623a"/>
-  <text x="220" y="261" font-size="10" fill="#6b5e4f" font-family="'JetBrains Mono', monospace">300 ms</text>
-
-  <!-- Speedup callout -->
-  <g transform="translate(300, 246)">
-    <line x1="0" y1="-10" x2="0" y2="22" stroke="#6b7c4e" stroke-width="1" stroke-dasharray="2 2"/>
-    <text x="10" y="6" font-size="10" fill="#566540" font-style="italic">3.7× faster — no more UDP wait</text>
-  </g>
-
-  <!-- Footer caption -->
-  <text x="360" y="298" text-anchor="middle" font-size="10" fill="#a39888" font-style="italic">The flag resets on network change (LAN IP delta). Switch back to a clean network and UDP is tried again.</text>
-</svg>

site/blog/index.html

@@ -67,7 +67,6 @@ body::before {
   font-weight: 400;
   color: var(--text-primary);
   text-decoration: none;
-  text-transform: none;
   letter-spacing: -0.02em;
 }
 .blog-nav .wordmark:hover { color: var(--amber); }
@@ -168,13 +167,6 @@ body::before {
 <main class="blog-index">
   <h1>Blog</h1>
   <ul class="post-list">
-    <li>
-      <a href="/blog/posts/dot-from-scratch.html">
-        <div class="post-title">DNS-over-TLS from Scratch in Rust</div>
-        <div class="post-desc">Building RFC 7858 on top of rustls — length-prefix framing, ALPN cross-protocol defense, iPhone dogfooding, and two bugs that only the strict clients caught.</div>
-        <div class="post-date">April 2026</div>
-      </a>
-    </li>
     <li>
       <a href="/blog/posts/dnssec-from-scratch.html">
         <div class="post-title">Implementing DNSSEC from Scratch in Rust</div>

site/dashboard.html

@@ -101,7 +101,7 @@ body {
 /* Stat cards row */
 .stats-row {
   display: grid;
-  grid-template-columns: repeat(6, 1fr);
+  grid-template-columns: repeat(5, 1fr);
   gap: 1rem;
 }
 .stat-card {
@@ -125,8 +125,6 @@ body {
 .stat-card.blocked::before { background: var(--rose); }
 .stat-card.overrides::before { background: var(--violet); }
 .stat-card.uptime::before { background: var(--cyan); }
-.stat-card.memory::before { background: var(--text-dim); }
-.stat-card.memory .stat-value { color: var(--text-secondary); }
 
 .stat-label {
   font-size: 0.7rem;
@@ -223,10 +221,6 @@ body {
 .path-bar-fill.override { background: var(--emerald); }
 .path-bar-fill.error { background: var(--rose); }
 .path-bar-fill.blocked { background: var(--text-dim); }
-.path-bar-fill.udp { background: var(--text-dim); }
-.path-bar-fill.tcp { background: var(--violet); }
-.path-bar-fill.dot { background: var(--emerald); }
-.path-bar-fill.doh { background: var(--teal); }
 .path-pct {
   font-family: var(--font-mono);
   font-size: 0.75rem;
@@ -292,11 +286,6 @@ body {
 .path-tag.SERVFAIL { background: rgba(181, 68, 58, 0.12); color: var(--rose); }
 .path-tag.BLOCKED { background: rgba(163, 152, 136, 0.15); color: var(--text-dim); }
 .path-tag.COALESCED { background: rgba(138, 104, 158, 0.12); color: var(--violet-dim); }
-.path-tag.UDP { background: rgba(163, 152, 136, 0.15); color: var(--text-dim); }
-.path-tag.TCP { background: rgba(100, 116, 139, 0.12); color: var(--violet-dim); }
-.path-tag.DOT { background: rgba(82, 122, 82, 0.12); color: var(--emerald); }
-.path-tag.DOH { background: rgba(107, 124, 78, 0.12); color: var(--teal); }
-.src-tag { font-size: 0.6rem; color: var(--text-dim); letter-spacing: 0.02em; }
 
 /* Sidebar panels */
 .sidebar {
@@ -479,74 +468,10 @@ body {
   display: none;
 }
 
-/* Memory sidebar panel */
-.memory-bar {
-  display: flex;
-  height: 18px;
-  border-radius: 4px;
-  overflow: hidden;
-  background: var(--bg-surface);
-  margin-bottom: 0.8rem;
-}
-.memory-bar-seg {
-  height: 100%;
-  min-width: 2px;
-  transition: width 0.6s ease;
-}
-.memory-bar-seg.cache { background: var(--teal); }
-.memory-bar-seg.blocklist { background: var(--rose); }
-.memory-bar-seg.querylog { background: var(--amber); }
-.memory-bar-seg.srtt { background: var(--cyan); }
-.memory-bar-seg.overrides { background: var(--violet); }
-.memory-row {
-  display: flex;
-  align-items: center;
-  padding: 0.3rem 0;
-  border-bottom: 1px solid var(--border);
-  font-family: var(--font-mono);
-  font-size: 0.72rem;
-}
-.memory-row:last-child { border-bottom: none; }
-.memory-row-dot {
-  width: 8px;
-  height: 8px;
-  border-radius: 2px;
-  flex-shrink: 0;
-  margin-right: 0.5rem;
-}
-.memory-row-label {
-  flex: 1;
-  color: var(--text-secondary);
-}
-.memory-row-size {
-  width: 65px;
-  text-align: right;
-  color: var(--text-primary);
-  font-weight: 500;
-}
-.memory-row-entries {
-  width: 90px;
-  text-align: right;
-  color: var(--text-dim);
-}
-.memory-rss {
-  margin-top: 0.5rem;
-  padding-top: 0.5rem;
-  border-top: 1px solid var(--border);
-  display: flex;
-  justify-content: space-between;
-  font-family: var(--font-mono);
-  font-size: 0.72rem;
-  color: var(--text-dim);
-}
-
 /* Responsive */
 @media (max-width: 1100px) {
   .main-grid { grid-template-columns: 1fr; }
 }
-@media (max-width: 900px) {
-  .stats-row { grid-template-columns: repeat(3, 1fr); }
-}
 @media (max-width: 700px) {
   .stats-row { grid-template-columns: repeat(2, 1fr); }
   .dashboard { padding: 1rem; }
@@ -562,20 +487,6 @@ body {
     <div class="tagline">DNS that governs itself</div>
   </div>
   <div style="display:flex;align-items:center;gap:1.2rem;">
-    <div id="phoneSetup" style="position:relative;display:none;">
-      <button class="btn" onclick="togglePhoneSetup()" style="background:var(--bg-surface);color:var(--text-secondary);font-family:var(--font-mono);font-size:0.7rem;padding:0.35rem 0.6rem;border:1px solid var(--border);" title="Set up phone">Phone Setup</button>
-      <div id="phoneSetupPopover" style="display:none;position:absolute;top:calc(100% + 8px);right:0;z-index:100;background:var(--bg-card);border:1px solid var(--border);border-radius:10px;padding:1.2rem;width:260px;box-shadow:0 4px 20px rgba(0,0,0,0.08);">
-        <div style="font-size:0.7rem;font-weight:600;text-transform:uppercase;letter-spacing:0.1em;color:var(--text-secondary);margin-bottom:0.8rem;">Phone Setup</div>
-        <div id="qrContainer" style="display:flex;justify-content:center;margin-bottom:0.8rem;"></div>
-        <div id="phoneSetupLink" style="display:none;text-align:center;margin-bottom:0.8rem;"></div>
-        <div style="font-family:var(--font-mono);font-size:0.62rem;color:var(--text-dim);line-height:1.6;">
-          1. Scan QR &rarr; allow download<br>
-          2. Settings &rarr; Profile Downloaded &rarr; Install<br>
-          3. Settings &rarr; General &rarr; About &rarr;<br>
-          &nbsp;&nbsp;&nbsp;Certificate Trust Settings &rarr; toggle ON
-        </div>
-      </div>
-    </div>
     <button class="btn" id="pauseBtn" style="background:var(--amber);color:white;font-family:var(--font-mono);font-size:0.7rem;display:none;">Pause 5m</button>
     <button class="btn" id="toggleBtn" onclick="toggleBlocking()" style="background:var(--rose);color:white;font-family:var(--font-mono);font-size:0.7rem;display:none;"></button>
     <div class="status-badge">
@@ -613,11 +524,6 @@ body {
       <div class="stat-value" id="uptime">—</div>
       <div class="stat-sub" id="uptimeSub">&nbsp;</div>
     </div>
-    <div class="stat-card memory">
-      <div class="stat-label">Memory</div>
-      <div class="stat-value" id="memoryRss">—</div>
-      <div class="stat-sub" id="memorySub">&nbsp;</div>
-    </div>
   </div>
 
   <!-- Resolution paths -->
@@ -630,16 +536,6 @@ body {
     </div>
   </div>
 
-  <!-- Transport breakdown -->
-  <div class="panel">
-    <div class="panel-header">
-      <span class="panel-title">Transport</span>
-      <span class="panel-title" id="transportEncrypted" style="color: var(--text-dim)"></span>
-    </div>
-    <div class="panel-body" id="transportBars">
-    </div>
-  </div>
-
   <!-- Main grid: query log + sidebar -->
   <div class="main-grid">
     <!-- Query log -->
@@ -661,14 +557,6 @@ body {
             <option value="LOCAL">local</option>
             <option value="SERVFAIL">error</option>
           </select>
-          <select id="logFilterTransport" onchange="applyLogFilter()"
-            style="font-family:var(--font-mono);font-size:0.7rem;padding:0.25rem 0.4rem;border:1px solid var(--border);border-radius:4px;background:var(--bg-surface);color:var(--text-secondary);outline:none;">
-            <option value="">all transports</option>
-            <option value="UDP">UDP</option>
-            <option value="TCP">TCP</option>
-            <option value="DOT">DoT</option>
-            <option value="DOH">DoH</option>
-          </select>
           <span class="panel-title" id="queryCount" style="color: var(--text-dim)"></span>
         </div>
       </div>
@@ -680,7 +568,6 @@ body {
               <th>Type</th>
               <th>Domain</th>
               <th>Path</th>
-              <th>Transport</th>
               <th>Result</th>
               <th>Latency</th>
             </tr>
@@ -761,17 +648,6 @@ body {
         </div>
       </div>
 
-      <!-- Memory breakdown -->
-      <div class="panel" id="memoryPanel">
-        <div class="panel-header">
-          <span class="panel-title">Memory</span>
-          <span class="panel-title" id="memoryTotal" style="color: var(--text-dim)"></span>
-        </div>
-        <div class="panel-body" id="memoryBody">
-          <div class="empty-state">No memory data</div>
-        </div>
-      </div>
-
       <!-- Cache entries -->
       <div class="panel">
         <div class="panel-header">
@@ -829,41 +705,6 @@ function formatTime(epoch) {
   return d.toLocaleTimeString([], { hour12: false });
 }
 
-let mobilePort = 8765;
-function togglePhoneSetup() {
-  const pop = document.getElementById('phoneSetupPopover');
-  const isOpen = pop.style.display !== 'none';
-  pop.style.display = isOpen ? 'none' : 'block';
-  if (!isOpen) {
-    if (window.innerWidth <= 700) {
-      document.getElementById('qrContainer').style.display = 'none';
-      const linkEl = document.getElementById('phoneSetupLink');
-      const host = window.location.hostname;
-      linkEl.style.display = 'block';
-      linkEl.innerHTML = `<a href="http://${host}:${mobilePort}/mobileconfig" style="display:inline-block;padding:0.5rem 1rem;background:var(--amber);color:white;border-radius:6px;text-decoration:none;font-family:var(--font-mono);font-size:0.75rem;">Install Profile</a>`;
-    } else {
-      fetch(API + '/qr').then(r => r.text()).then(svg => {
-        document.getElementById('qrContainer').innerHTML = svg;
-      }).catch(() => {
-        document.getElementById('qrContainer').innerHTML = '<div class="empty-state">Could not load QR</div>';
-      });
-    }
-  }
-}
-document.addEventListener('click', (e) => {
-  const setup = document.getElementById('phoneSetup');
-  if (setup && !setup.contains(e.target)) {
-    document.getElementById('phoneSetupPopover').style.display = 'none';
-  }
-});
-
-function shortSrc(addr) {
-  if (!addr) return '';
-  const ip = addr.replace(/:\d+$/, '');
-  if (ip === '127.0.0.1' || ip === '::1') return 'localhost';
-  return ip;
-}
-
 function formatRemaining(secs) {
   if (secs == null) return 'permanent';
   if (secs < 60) return `${secs}s left`;
@@ -871,90 +712,6 @@ function formatRemaining(secs) {
   return `${Math.floor(secs / 3600)}h ${Math.floor((secs % 3600) / 60)}m left`;
 }
 
-function formatBytes(bytes) {
-  if (bytes === 0) return '0 B';
-  if (bytes < 1024) return bytes + ' B';
-  if (bytes < 1048576) return (bytes / 1024).toFixed(1) + ' KB';
-  if (bytes < 1073741824) return (bytes / 1048576).toFixed(1) + ' MB';
-  return (bytes / 1073741824).toFixed(1) + ' GB';
-}
-
-const MEMORY_COMPONENTS = [
-  { key: 'cache',     label: 'Cache',     cls: 'cache',     color: 'var(--teal)' },
-  { key: 'blocklist', label: 'Blocklist',  cls: 'blocklist', color: 'var(--rose)' },
-  { key: 'query_log', label: 'Query Log',  cls: 'querylog',  color: 'var(--amber)' },
-  { key: 'srtt',      label: 'SRTT',       cls: 'srtt',      color: 'var(--cyan)' },
-  { key: 'overrides', label: 'Overrides',  cls: 'overrides', color: 'var(--violet)' },
-];
-
-function renderMemory(mem, stats) {
-  if (!mem) return;
-
-  // Stat card
-  document.getElementById('memoryRss').textContent = formatBytes(mem.process_memory_bytes);
-  document.getElementById('memorySub').textContent = 'est. ' + formatBytes(mem.total_estimated_bytes);
-
-  const entryCounts = {
-    cache: stats.cache.entries,
-    blocklist: stats.blocking.domains_loaded,
-    query_log: mem.query_log_entries,
-    srtt: mem.srtt_entries,
-    overrides: stats.overrides.active,
-  };
-
-  // Sidebar panel
-  const total = mem.total_estimated_bytes || 1;
-  document.getElementById('memoryTotal').textContent = formatBytes(total);
-
-  const barSegments = MEMORY_COMPONENTS.map(c => {
-    const bytes = mem[c.key + '_bytes'] || 0;
-    const pct = ((bytes / total) * 100).toFixed(1);
-    return `<div class="memory-bar-seg ${c.cls}" style="width:${pct}%" title="${c.label}: ${formatBytes(bytes)} (${pct}%)"></div>`;
-  }).join('');
-
-  const rows = MEMORY_COMPONENTS.map(c => {
-    const bytes = mem[c.key + '_bytes'] || 0;
-    const entries = entryCounts[c.key] || 0;
-    return `
-      <div class="memory-row">
-        <div class="memory-row-dot" style="background:${c.color}"></div>
-        <span class="memory-row-label">${c.label}</span>
-        <span class="memory-row-size">${formatBytes(bytes)}</span>
-        <span class="memory-row-entries">${formatNumber(entries)} entries</span>
-      </div>`;
-  }).join('');
-
-  document.getElementById('memoryBody').innerHTML = `
-    <div class="memory-bar">${barSegments}</div>
-    ${rows}
-    <div class="memory-rss">
-      <span>Process Footprint</span>
-      <span>${formatBytes(mem.process_memory_bytes)}</span>
-    </div>
-  `;
-}
-
-function renderBarChart(containerId, defs, data, total) {
-  total = total || 1;
-  document.getElementById(containerId).innerHTML = defs.map(d => {
-    const count = data[d.key] || 0;
-    const pct = ((count / total) * 100).toFixed(1);
-    return `
-      <div class="path-bar-row">
-        <span class="path-label">${d.label}</span>
-        <div class="path-bar-track">
-          <div class="path-bar-fill ${d.cls}" style="width: ${pct}%"></div>
-        </div>
-        <span class="path-pct">${pct}%</span>
-      </div>`;
-  }).join('');
-}
-
-function encryptionPct(transport) {
-  const total = (transport.udp + transport.tcp + transport.dot + transport.doh) || 1;
-  return (((transport.dot + transport.doh) / total) * 100).toFixed(0);
-}
-
 const PATH_DEFS = [
   { key: 'forwarded', label: 'Forward', cls: 'forward' },
   { key: 'recursive', label: 'Recursive', cls: 'recursive' },
@@ -966,23 +723,20 @@ const PATH_DEFS = [
 ];
 
 function renderPaths(queries) {
-  renderBarChart('pathBars', PATH_DEFS, queries, queries.total);
+  const total = queries.total || 1;
-}
+  const container = document.getElementById('pathBars');
-
+  container.innerHTML = PATH_DEFS.map(p => {
-const TRANSPORT_DEFS = [
+    const count = queries[p.key] || 0;
-  { key: 'udp', label: 'UDP',  cls: 'udp' },
+    const pct = ((count / total) * 100).toFixed(1);
-  { key: 'tcp', label: 'TCP',  cls: 'tcp' },
+    return `
-  { key: 'dot', label: 'DoT',  cls: 'dot' },
+      <div class="path-bar-row">
-  { key: 'doh', label: 'DoH',  cls: 'doh' },
+        <span class="path-label">${p.label}</span>
-];
+        <div class="path-bar-track">
-
+          <div class="path-bar-fill ${p.cls}" style="width: ${pct}%"></div>
-function renderTransport(transport) {
+        </div>
-  const total = (transport.udp + transport.tcp + transport.dot + transport.doh) || 1;
+        <span class="path-pct">${pct}%</span>
-  renderBarChart('transportBars', TRANSPORT_DEFS, transport, total);
+      </div>`;
-  const encPct = encryptionPct(transport);
+  }).join('');
-  const el = document.getElementById('transportEncrypted');
-  el.textContent = `${encPct}% encrypted`;
-  el.style.color = encPct >= 80 ? 'var(--emerald)' : encPct >= 50 ? 'var(--amber)' : 'var(--rose)';
 }
 
 function renderQueryLog(entries) {
@@ -993,7 +747,6 @@ function renderQueryLog(entries) {
 function applyLogFilter() {
   const domainFilter = document.getElementById('logFilterDomain').value.trim().toLowerCase();
   const pathFilter = document.getElementById('logFilterPath').value;
-  const transportFilter = document.getElementById('logFilterTransport').value;
 
   let filtered = lastLogEntries;
   if (domainFilter) {
@@ -1002,9 +755,6 @@ function applyLogFilter() {
   if (pathFilter) {
     filtered = filtered.filter(e => e.path === pathFilter);
   }
-  if (transportFilter) {
-    filtered = filtered.filter(e => e.transport === transportFilter);
-  }
 
   const tbody = document.getElementById('queryLogBody');
   document.getElementById('queryCount').textContent =
@@ -1017,12 +767,11 @@ function applyLogFilter() {
       ? ` <button class="btn-delete" onclick="allowDomain('${e.domain}')" title="Allow this domain" style="color:var(--emerald);font-size:0.65rem;">allow</button>`
       : '';
     return `
-    <tr title="Source: ${e.src || 'unknown'}">
+    <tr>
-      <td>${formatTime(e.timestamp_epoch)}<br><span class="src-tag">${shortSrc(e.src)}</span></td>
+      <td>${formatTime(e.timestamp_epoch)}</td>
       <td>${e.query_type}</td>
       <td class="domain-cell" title="${e.domain}">${e.domain}${allowBtn}</td>
       <td><span class="path-tag ${e.path}">${e.path}</span></td>
-      <td><span class="path-tag ${e.transport}">${e.transport}</span></td>
       <td style="white-space:nowrap;"><span style="display:inline-block;width:15px;text-align:center;">${e.dnssec === 'secure' ? '<svg title="DNSSEC verified" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="var(--emerald)" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-1px;"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/><path d="m9 12 2 2 4-4"/></svg>' : ''}</span>${e.rescode}</td>
       <td>${e.latency_ms.toFixed(1)}ms</td>
     </tr>`;
@@ -1133,9 +882,6 @@ async function refresh() {
     document.getElementById('footerUpstream').textContent = stats.upstream || '';
     document.getElementById('footerConfig').textContent = stats.config_path || '';
     document.getElementById('footerData').textContent = stats.data_dir || '';
-    const modeEl = document.getElementById('footerMode');
-    modeEl.textContent = stats.mode || '—';
-    modeEl.style.color = stats.mode === 'recursive' ? 'var(--emerald)' : 'var(--amber)';
     document.getElementById('footerDnssec').textContent = stats.dnssec ? 'on' : 'off';
     document.getElementById('footerDnssec').style.color = stats.dnssec ? 'var(--emerald)' : 'var(--text-dim)';
     document.getElementById('footerSrtt').textContent = stats.srtt ? 'on' : 'off';
@@ -1156,14 +902,6 @@ async function refresh() {
       }
     }
 
-    const phoneSetupEl = document.getElementById('phoneSetup');
-    if (stats.mobile && stats.mobile.enabled) {
-      phoneSetupEl.style.display = '';
-      mobilePort = stats.mobile.port;
-    } else {
-      phoneSetupEl.style.display = 'none';
-    }
-
     document.getElementById('overrideCount').textContent = stats.overrides.active;
     document.getElementById('blockedCount').textContent = formatNumber(q.blocked);
     const bl = stats.blocking;
@@ -1197,32 +935,28 @@ async function refresh() {
 
     // QPS calculation
     const now = Date.now();
-    const encPct = encryptionPct(stats.transport);
     if (prevTotal !== null && prevTime !== null) {
       const dt = (now - prevTime) / 1000;
       const dq = q.total - prevTotal;
       const qps = dt > 0 ? (dq / dt).toFixed(1) : '0.0';
-      const encTag = q.total > 0 ? ` · ${encPct}% enc` : '';
+      document.getElementById('qps').textContent = `~${qps}/s`;
-      document.getElementById('qps').textContent = `~${qps}/s${encTag}`;
     }
     prevTotal = q.total;
     prevTime = now;
 
     // Cache hit rate
-    const answered = q.cached + q.forwarded + q.recursive + q.coalesced + q.local + q.overridden;
+    const answered = q.cached + q.forwarded + q.local + q.overridden;
     const hitRate = answered > 0 ? ((q.cached / answered) * 100).toFixed(1) : '0.0';
     document.getElementById('cacheRate').textContent = hitRate + '%';
 
     // Panels
     renderPaths(q);
-    renderTransport(stats.transport);
     renderQueryLog(logs);
     renderOverrides(overrides);
     renderCache(cache);
     renderServices(services);
     renderBlockingInfo(blockingInfo);
     renderAllowlist(allowlist);
-    renderMemory(stats.memory, stats);
 
   } catch (err) {
     document.getElementById('statusDot').className = 'status-dot error';
@@ -1502,7 +1236,6 @@ setInterval(refresh, 2000);
   Config: <span id="footerConfig" style="user-select:all;color:var(--emerald);"></span>
   · Data: <span id="footerData" style="user-select:all;color:var(--emerald);"></span>
   · Upstream: <span id="footerUpstream" style="user-select:all;color:var(--emerald);"></span>
-  · Mode: <span id="footerMode" style="color:var(--text-dim);">—</span>
   · DNSSEC: <span id="footerDnssec" style="color:var(--text-dim);">—</span>
   · SRTT: <span id="footerSrtt" style="color:var(--text-dim);">—</span>
   · Logs: <span style="user-select:all;color:var(--emerald);">macOS: /usr/local/var/log/numa.log · Linux: journalctl -u numa -f</span>

site/index.html

@@ -4,10 +4,10 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>Numa — DNS you own. Everywhere you go.</title>
-<meta name="description" content="DNS you own. Portable DNS resolver with caching, ad blocking, .numa local domains, developer overrides. Optional recursive resolution with full DNSSEC validation. Built from scratch in Rust.">
+<meta name="description" content="DNS you own. Recursive resolver with full DNSSEC validation, ad blocking, .numa local domains, developer overrides. A single portable binary built from scratch in Rust.">
 <link rel="canonical" href="https://numa.rs">
 <meta property="og:title" content="Numa — DNS you own. Everywhere you go.">
-<meta property="og:description" content="Portable DNS resolver with caching, ad blocking, .numa local domains, and developer overrides. Optional recursive resolution with full DNSSEC validation. Built from scratch in Rust.">
+<meta property="og:description" content="Recursive DNS resolver with full DNSSEC validation, ad blocking, .numa local domains, and developer overrides. Built from scratch in Rust.">
 <meta property="og:type" content="website">
 <meta property="og:url" content="https://numa.rs">
 <link rel="stylesheet" href="/fonts/fonts.css">
@@ -188,50 +188,11 @@ p.lead {
   line-height: 1.8;
 }
 
-/* ===========================
-   TOP NAV
-   =========================== */
-.site-nav {
-  padding: 1.5rem 2rem;
-  display: flex;
-  align-items: center;
-  gap: 1.5rem;
-  position: relative;
-  z-index: 10;
-}
-
-.site-nav a {
-  font-family: var(--font-mono);
-  font-size: 0.75rem;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-  color: var(--text-dim);
-  text-decoration: none;
-  transition: color 0.2s ease;
-}
-.site-nav a:hover { color: var(--amber); }
-
-.site-nav .wordmark {
-  font-family: var(--font-display);
-  font-size: 1.4rem;
-  font-weight: 400;
-  color: var(--text-primary);
-  text-transform: none;
-  letter-spacing: -0.02em;
-}
-.site-nav .wordmark:hover { color: var(--amber); }
-
-.site-nav .sep {
-  color: var(--text-dim);
-  font-family: var(--font-mono);
-  font-size: 0.75rem;
-}
-
 /* ===========================
    HERO
    =========================== */
 .hero {
-  min-height: calc(100vh - 5rem);
+  min-height: 100vh;
   display: flex;
   align-items: center;
   position: relative;
@@ -1197,9 +1158,6 @@ footer .closing {
 @media (max-width: 600px) {
   section { padding: 4rem 0; }
   .container { padding: 0 1.25rem; }
-  .site-nav { padding: 1rem 1.25rem; gap: 1rem; }
-  .site-nav .wordmark { font-size: 1.2rem; }
-  .hero { min-height: calc(100vh - 4rem); }
   .network-grid { grid-template-columns: 1fr; }
   .pipeline { flex-direction: column; align-items: stretch; gap: 0; }
   .pipeline-arrow { transform: rotate(90deg); padding: 0.15rem 0; align-self: center; }
@@ -1213,14 +1171,6 @@ footer .closing {
 </head>
 <body>
 
-<nav class="site-nav">
-  <a href="/" class="wordmark">Numa</a>
-  <span class="sep">/</span>
-  <a href="/blog/">Blog</a>
-  <span class="sep">/</span>
-  <a href="https://github.com/razvandimescu/numa" target="_blank" rel="noopener">GitHub</a>
-</nav>
-
 <!-- ==================== HERO ==================== -->
 <section class="hero">
   <div class="roman-bricks" aria-hidden="true"></div>
@@ -1282,19 +1232,17 @@ footer .closing {
     <div class="reveal">
       <div class="section-label">How It Works</div>
       <h2>What it does today</h2>
-      <p class="lead">A DNS resolver with caching, ad blocking, local service domains, and a REST API. Optional recursive resolution with DNSSEC. Everything runs in a single binary.</p>
+      <p class="lead">A recursive DNS resolver with DNSSEC validation, ad blocking, local service domains, and a REST API. Everything runs in a single binary.</p>
     </div>
     <div class="layers-grid">
       <div class="layer-card reveal reveal-delay-1">
         <div class="layer-badge">Layer 1</div>
         <h3>Resolve &amp; Protect</h3>
         <ul>
-          <li>Forward mode by default &mdash; transparent proxy to your existing DNS, with caching</li>
+          <li>Recursive resolution &mdash; resolve from root nameservers, no upstream needed</li>
-          <li>Ad &amp; tracker blocking &mdash; 385K+ domains, zero config</li>
-          <li>Recursive resolution &mdash; opt-in, resolve from root nameservers, no upstream needed</li>
           <li>DNSSEC validation &mdash; chain-of-trust + NSEC/NSEC3 denial proofs (RSA, ECDSA, Ed25519)</li>
-          <li>DNS-over-TLS listener &mdash; encrypted DNS for phones and strict clients (RFC 7858 with ALPN defense)</li>
+          <li>Ad &amp; tracker blocking &mdash; 385K+ domains, zero config</li>
-          <li>Hostile-network resilience &mdash; TCP fallback with UDP auto-disable when ISPs block port 53</li>
+          <li>DNS-over-HTTPS &mdash; encrypted upstream as alternative to recursive mode</li>
           <li>TTL-aware caching (sub-ms lookups)</li>
           <li>Single binary, portable &mdash; macOS, Linux, and Windows</li>
         </ul>
@@ -1313,7 +1261,7 @@ footer .closing {
         </ul>
       </div>
       <div class="layer-card reveal reveal-delay-3">
-        <div class="layer-badge">The Vision</div>
+        <div class="layer-badge">Coming Next</div>
         <h3>Self-Sovereign DNS</h3>
         <ul>
           <li>pkarr integration &mdash; DNS via Mainline DHT, no registrar needed</li>
@@ -1394,14 +1342,6 @@ footer .closing {
             <td class="cross">No</td>
             <td class="check">Root hints + full DNSSEC</td>
           </tr>
-          <tr>
-            <td>DNSSEC validation</td>
-            <td class="muted">Passthrough</td>
-            <td class="muted">Cloud only</td>
-            <td class="muted">Cloud only</td>
-            <td class="muted">Passthrough</td>
-            <td class="check">Full chain-of-trust</td>
-          </tr>
           <tr>
             <td>Ad &amp; tracker blocking</td>
             <td class="check">Yes</td>
@@ -1458,14 +1398,6 @@ footer .closing {
             <td class="cross">No</td>
             <td class="check">Built in (HTTP/2 + rustls)</td>
           </tr>
-          <tr>
-            <td>DNS-over-TLS listener</td>
-            <td class="cross">No</td>
-            <td class="muted">Cloud only</td>
-            <td class="muted">Cloud only</td>
-            <td class="check">Yes (cert required)</td>
-            <td class="check">Self-signed or BYO</td>
-          </tr>
           <tr>
             <td>Conditional forwarding</td>
             <td class="cross">No</td>
@@ -1635,14 +1567,11 @@ footer .closing {
         <dt>Resolution Modes</dt>
         <dd>Recursive (iterative from root hints, CNAME chasing, glue extraction) or Forward (DoH / plain UDP)</dd>
 
-        <dt>Listeners</dt>
-        <dd>UDP:53 + TCP:53 (plain DNS), DoT:853 (RFC 7858 + ALPN), HTTP proxy :80 / HTTPS proxy :443, dashboard :5380</dd>
-
         <dt>DNSSEC</dt>
         <dd>Chain-of-trust via ring &mdash; RSA/SHA-256, ECDSA P-256, Ed25519. NSEC/NSEC3 denial proofs. EDNS0 DO bit, 1232-byte payload (DNS Flag Day 2020).</dd>
 
         <dt>Dependencies</dt>
-        <dd>A focused set &mdash; tokio, axum, hyper, ring (DNSSEC), reqwest (DoH), rcgen + rustls + tokio-rustls (TLS/DoT), socket2 (multicast), serde. No transitive DNS library.</dd>
+        <dd>19 runtime crates &mdash; tokio, axum, hyper, ring (DNSSEC), reqwest (DoH), rcgen + rustls (TLS), socket2 (multicast), serde, and more</dd>
 
         <dt>Packet Format</dt>
         <dd>RFC 1035 compliant. EDNS0 OPT pseudo-record. Parses A, AAAA, NS, CNAME, MX, SOA, SRV, HTTPS, DNSKEY, DS, RRSIG, NSEC, NSEC3.</dd>
@@ -1657,7 +1586,7 @@ footer .closing {
 <span class="prompt">$</span> <span class="cmd">curl</span> <span class="flag">-fsSL</span> https://raw.githubusercontent.com/razvandimescu/numa/main/install.sh <span class="flag">|</span> <span class="cmd">sh</span>
 
 <span class="comment"># Run</span>
-<span class="prompt">$</span> <span class="cmd">sudo numa</span>                          <span class="comment"># bind :53, :80, :443, :853, :5380</span>
+<span class="prompt">$</span> <span class="cmd">sudo numa</span>                          <span class="comment"># bind to :53, :80, :5380</span>
 <span class="prompt">$</span> <span class="cmd">dig</span> <span class="flag">@127.0.0.1</span> google.com         <span class="comment"># test resolution</span>
 <span class="prompt">$</span> <span class="cmd">open</span> http://localhost:5380           <span class="comment"># dashboard</span>
 <span class="prompt">$</span> <span class="cmd">curl</span> <span class="flag">-X POST</span> localhost:5380/services \
@@ -1710,28 +1639,16 @@ footer .closing {
         <span class="phase">Phase 7</span>
         <span class="phase-desc">DNSSEC validation &mdash; chain-of-trust, NSEC/NSEC3 denial proofs, RSA + ECDSA + Ed25519</span>
       </div>
-      <div class="roadmap-item done">
-        <span class="phase">Phase 8</span>
-        <span class="phase-desc">Hostile-network resilience &mdash; TCP fallback with UDP auto-disable when ISPs block :53, RFC 7816 query minimization</span>
-      </div>
-      <div class="roadmap-item done">
-        <span class="phase">Phase 9</span>
-        <span class="phase-desc">Windows support &mdash; cross-platform install/uninstall, <code>netsh</code> DNS config, service integration</span>
-      </div>
-      <div class="roadmap-item done">
-        <span class="phase">Phase 10</span>
-        <span class="phase-desc">DNS-over-TLS listener (RFC 7858) &mdash; ALPN enforcement, persistent connections, self-signed or BYO cert</span>
-      </div>
       <div class="roadmap-item phase-teal">
-        <span class="phase">Phase 11</span>
+        <span class="phase">Phase 8</span>
         <span class="phase-desc">pkarr integration &mdash; self-sovereign DNS via Mainline DHT, no registrar needed</span>
       </div>
       <div class="roadmap-item phase-teal">
-        <span class="phase">Phase 12</span>
+        <span class="phase">Phase 9</span>
         <span class="phase-desc">Global .numa names &mdash; self-publish, DHT-backed, first-come-first-served</span>
       </div>
       <div class="roadmap-item phase-teal">
-        <span class="phase">Phase 13</span>
+        <span class="phase">Phase 10</span>
         <span class="phase-desc">.onion bridge &mdash; human-readable Tor naming via Ed25519 same-key binding</span>
       </div>
     </div>

src/api.rs

@@ -57,7 +57,6 @@ pub fn router(ctx: Arc<ServerCtx>) -> Router {
         .route("/services/{name}/routes", post(add_route))
         .route("/services/{name}/routes", delete(remove_route))
         .route("/ca.pem", get(serve_ca))
-        .route("/qr", get(serve_qr))
         .route("/fonts/fonts.css", get(serve_fonts_css))
         .route(
             "/fonts/dm-sans-latin.woff2",
@@ -152,7 +151,6 @@ struct QueryLogResponse {
     domain: String,
     query_type: String,
     path: String,
-    transport: String,
     rescode: String,
     latency_ms: f64,
     dnssec: String,
@@ -162,33 +160,15 @@ struct QueryLogResponse {
 struct StatsResponse {
     uptime_secs: u64,
     upstream: String,
-    mode: &'static str, // "recursive" or "forward" — never "auto" at runtime
     config_path: String,
     data_dir: String,
     dnssec: bool,
     srtt: bool,
     queries: QueriesStats,
-    transport: TransportStats,
     cache: CacheStats,
     overrides: OverrideStats,
     blocking: BlockingStatsResponse,
     lan: LanStatsResponse,
-    mobile: MobileStatsResponse,
-    memory: MemoryStats,
-}
-
-#[derive(Serialize)]
-struct TransportStats {
-    udp: u64,
-    tcp: u64,
-    dot: u64,
-    doh: u64,
-}
-
-#[derive(Serialize)]
-struct MobileStatsResponse {
-    enabled: bool,
-    port: u16,
 }
 
 #[derive(Serialize)]
@@ -229,19 +209,6 @@ struct BlockingStatsResponse {
     allowlist_size: usize,
 }
 
-#[derive(Serialize)]
-struct MemoryStats {
-    cache_bytes: usize,
-    blocklist_bytes: usize,
-    query_log_bytes: usize,
-    query_log_entries: usize,
-    srtt_bytes: usize,
-    srtt_entries: usize,
-    overrides_bytes: usize,
-    total_estimated_bytes: usize,
-    process_memory_bytes: usize,
-}
-
 #[derive(Serialize)]
 struct DiagnoseResponse {
     domain: String,
@@ -421,12 +388,9 @@ async fn diagnose(
     }
 
     // Check upstream (async, no locks held)
-    let upstream = ctx.upstream_pool.lock().unwrap().preferred().cloned();
+    let upstream = ctx.upstream.lock().unwrap().clone();
-    let (upstream_matched, upstream_detail) = if let Some(ref u) = upstream {
+    let (upstream_matched, upstream_detail) =
-        forward_query_for_diagnose(&domain_lower, u, ctx.timeout).await
+        forward_query_for_diagnose(&domain_lower, &upstream, ctx.timeout).await;
-    } else {
-        (false, "no upstream configured".to_string())
-    };
     steps.push(DiagnoseStep {
         source: "upstream".to_string(),
         matched: upstream_matched,
@@ -446,8 +410,14 @@ async fn forward_query_for_diagnose(
     timeout: std::time::Duration,
 ) -> (bool, String) {
     use crate::packet::DnsPacket;
+    use crate::question::DnsQuestion;
 
-    let query = DnsPacket::query(0xBEEF, domain, QueryType::A);
+    let mut query = DnsPacket::new();
+    query.header.id = 0xBEEF;
+    query.header.recursion_desired = true;
+    query
+        .questions
+        .push(DnsQuestion::new(domain.to_string(), QueryType::A));
 
     match forward_query(&query, upstream, timeout).await {
         Ok(resp) => (
@@ -493,7 +463,6 @@ async fn query_log(
                     domain: e.domain.clone(),
                     query_type: e.query_type.as_str().to_string(),
                     path: e.path.as_str().to_string(),
-                    transport: e.transport.as_str().to_string(),
                     rescode: e.rescode.as_str().to_string(),
                     latency_ms: e.latency_us as f64 / 1000.0,
                     dnssec: e.dnssec.as_str().to_string(),
@@ -507,44 +476,26 @@ async fn query_log(
 
 async fn stats(State(ctx): State<Arc<ServerCtx>>) -> Json<StatsResponse> {
     let snap = ctx.stats.lock().unwrap().snapshot();
-    let (cache_len, cache_max, cache_bytes) = {
+    let (cache_len, cache_max) = {
         let cache = ctx.cache.read().unwrap();
-        (cache.len(), cache.max_entries(), cache.heap_bytes())
+        (cache.len(), cache.max_entries())
     };
-    let (override_count, overrides_bytes) = {
+    let override_count = ctx.overrides.read().unwrap().active_count();
-        let ov = ctx.overrides.read().unwrap();
+    let bl_stats = ctx.blocklist.read().unwrap().stats();
-        (ov.active_count(), ov.heap_bytes())
-    };
-    let (bl_stats, blocklist_bytes) = {
-        let bl = ctx.blocklist.read().unwrap();
-        (bl.stats(), bl.heap_bytes())
-    };
-    let (query_log_bytes, query_log_entries) = {
-        let log = ctx.query_log.lock().unwrap();
-        (log.heap_bytes(), log.len())
-    };
-    let (srtt_bytes, srtt_entries, srtt_enabled) = {
-        let s = ctx.srtt.read().unwrap();
-        (s.heap_bytes(), s.len(), s.is_enabled())
-    };
-
-    let total_estimated =
-        cache_bytes + blocklist_bytes + query_log_bytes + srtt_bytes + overrides_bytes;
 
     let upstream = if ctx.upstream_mode == crate::config::UpstreamMode::Recursive {
         "recursive (root hints)".to_string()
     } else {
-        ctx.upstream_pool.lock().unwrap().label()
+        ctx.upstream.lock().unwrap().to_string()
     };
 
     Json(StatsResponse {
         uptime_secs: snap.uptime_secs,
         upstream,
-        mode: ctx.upstream_mode.as_str(),
         config_path: ctx.config_path.clone(),
         data_dir: ctx.data_dir.to_string_lossy().to_string(),
         dnssec: ctx.dnssec_enabled,
-        srtt: srtt_enabled,
+        srtt: ctx.srtt.read().unwrap().is_enabled(),
         queries: QueriesStats {
             total: snap.total,
             forwarded: snap.forwarded,
@@ -556,12 +507,6 @@ async fn stats(State(ctx): State<Arc<ServerCtx>>) -> Json<StatsResponse> {
             blocked: snap.blocked,
             errors: snap.errors,
         },
-        transport: TransportStats {
-            udp: snap.transport_udp,
-            tcp: snap.transport_tcp,
-            dot: snap.transport_dot,
-            doh: snap.transport_doh,
-        },
         cache: CacheStats {
             entries: cache_len,
             max_entries: cache_max,
@@ -579,21 +524,6 @@ async fn stats(State(ctx): State<Arc<ServerCtx>>) -> Json<StatsResponse> {
             enabled: ctx.lan_enabled,
             peers: ctx.lan_peers.lock().unwrap().list().len(),
         },
-        mobile: MobileStatsResponse {
-            enabled: ctx.mobile_enabled,
-            port: ctx.mobile_port,
-        },
-        memory: MemoryStats {
-            cache_bytes,
-            blocklist_bytes,
-            query_log_bytes,
-            query_log_entries,
-            srtt_bytes,
-            srtt_entries,
-            overrides_bytes,
-            total_estimated_bytes: total_estimated,
-            process_memory_bytes: crate::stats::process_memory_bytes(),
-        },
     })
 }
 
@@ -624,19 +554,8 @@ async fn flush_cache_domain(
     StatusCode::NO_CONTENT
 }
 
-/// Enriched `/health` handler shared between the main API and the mobile API.
+async fn health() -> Json<serde_json::Value> {
-///
+    Json(serde_json::json!({ "status": "ok" }))
-/// Returns the cached `HealthMeta` assembled with live fields (LAN IP,
-/// uptime). Backward compatible with the previous minimal response in
-/// that `status` is still the first field and `"ok"` is still the value.
-/// The iOS companion app's `HealthInfo` Swift struct decodes the full
-/// response; any HTTP client asserting only on `"status"` keeps working.
-pub async fn health(State(ctx): State<Arc<ServerCtx>>) -> Json<crate::health::HealthResponse> {
-    let lan_ip = Some(*ctx.lan_ip.lock().unwrap());
-    Json(crate::health::HealthResponse::build(
-        &ctx.health_meta,
-        lan_ip,
-    ))
 }
 
 // --- Blocking handlers ---
@@ -948,8 +867,12 @@ async fn remove_route(
     }
 }
 
-pub async fn serve_ca(State(ctx): State<Arc<ServerCtx>>) -> Result<impl IntoResponse, StatusCode> {
+async fn serve_ca(State(ctx): State<Arc<ServerCtx>>) -> Result<impl IntoResponse, StatusCode> {
-    let pem = ctx.ca_pem.as_deref().ok_or(StatusCode::NOT_FOUND)?;
+    let ca_path = ctx.data_dir.join("ca.pem");
+    let bytes = tokio::task::spawn_blocking(move || std::fs::read(ca_path))
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
+        .map_err(|_| StatusCode::NOT_FOUND)?;
     Ok((
         [
             (header::CONTENT_TYPE, "application/x-pem-file"),
@@ -959,29 +882,7 @@ pub async fn serve_ca(State(ctx): State<Arc<ServerCtx>>) -> Result<impl IntoResp
             ),
             (header::CACHE_CONTROL, "public, max-age=86400"),
         ],
-        pem.to_string(),
+        bytes,
-    ))
-}
-
-async fn serve_qr(State(ctx): State<Arc<ServerCtx>>) -> Result<impl IntoResponse, StatusCode> {
-    if !ctx.mobile_enabled {
-        return Err(StatusCode::NOT_FOUND);
-    }
-    let lan_ip = *ctx.lan_ip.lock().unwrap();
-    let url = format!("http://{}:{}/mobileconfig", lan_ip, ctx.mobile_port);
-    let code = qrcode::QrCode::new(&url).map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
-    let svg = code
-        .render::<qrcode::render::svg::Color>()
-        .min_dimensions(180, 180)
-        .dark_color(qrcode::render::svg::Color("#2c2418"))
-        .light_color(qrcode::render::svg::Color("#faf7f2"))
-        .build();
-    Ok((
-        [
-            (header::CONTENT_TYPE, "image/svg+xml"),
-            (header::CACHE_CONTROL, "no-store"),
-        ],
-        svg,
     ))
 }
 
@@ -1029,7 +930,6 @@ mod tests {
             socket,
             zone_map: std::collections::HashMap::new(),
             cache: RwLock::new(crate::cache::DnsCache::new(100, 60, 86400)),
-            refreshing: Mutex::new(std::collections::HashSet::new()),
             stats: Mutex::new(crate::stats::ServerStats::new()),
             overrides: RwLock::new(crate::override_store::OverrideStore::new()),
             blocklist: RwLock::new(crate::blocklist::BlocklistStore::new()),
@@ -1037,17 +937,13 @@ mod tests {
             services: Mutex::new(crate::service_store::ServiceStore::new()),
             lan_peers: Mutex::new(crate::lan::PeerStore::new(90)),
             forwarding_rules: Vec::new(),
-            upstream_pool: Mutex::new(crate::forward::UpstreamPool::new(
+            upstream: Mutex::new(crate::forward::Upstream::Udp(
-                vec![crate::forward::Upstream::Udp(
+                "127.0.0.1:53".parse().unwrap(),
-                    "127.0.0.1:53".parse().unwrap(),
-                )],
-                vec![],
             )),
             upstream_auto: false,
             upstream_port: 53,
             lan_ip: Mutex::new(std::net::Ipv4Addr::LOCALHOST),
             timeout: std::time::Duration::from_secs(3),
-            hedge_delay: std::time::Duration::ZERO,
             proxy_tld: "numa".to_string(),
             proxy_tld_suffix: ".numa".to_string(),
             lan_enabled: false,
@@ -1062,10 +958,6 @@ mod tests {
             inflight: Mutex::new(std::collections::HashMap::new()),
             dnssec_enabled: false,
             dnssec_strict: false,
-            health_meta: crate::health::HealthMeta::test_fixture(),
-            ca_pem: None,
-            mobile_enabled: false,
-            mobile_port: 8765,
         })
     }
 

src/blocklist.rs

@@ -81,70 +81,66 @@ impl BlocklistStore {
         if !self.enabled {
             return false;
         }
+
         if let Some(until) = self.paused_until {
             if Instant::now() < until {
                 return false;
             }
         }
-        let domain = Self::normalize(domain);
+
-        if Self::find_in_set(&domain, &self.allowlist).is_some() {
+        if self.allowlist.contains(domain) {
             return false;
         }
-        Self::find_in_set(&domain, &self.domains).is_some()
+
+        if self.domains.contains(domain) {
+            return true;
+        }
+
+        // Walk up: ads.tracker.example.com → tracker.example.com → example.com
+        let mut d = domain;
+        while let Some(dot) = d.find('.') {
+            d = &d[dot + 1..];
+            if self.allowlist.contains(d) {
+                return false;
+            }
+            if self.domains.contains(d) {
+                return true;
+            }
+        }
+
+        false
     }
 
+    /// Check if a domain is blocked and return the reason.
     pub fn check(&self, domain: &str) -> BlockCheckResult {
+        let domain = domain.to_lowercase();
+
         if !self.enabled {
             return BlockCheckResult::disabled();
         }
 
-        if let Some(until) = self.paused_until {
+        if self.allowlist.contains(&domain) {
-            if Instant::now() < until {
+            return BlockCheckResult::allowed(&domain, "exact match in allowlist");
-                return BlockCheckResult::disabled();
+        }
+
+        if self.domains.contains(&domain) {
+            return BlockCheckResult::blocked(&domain, "exact match in blocklist");
+        }
+
+        let mut d = domain.as_str();
+        while let Some(dot) = d.find('.') {
+            d = &d[dot + 1..];
+            if self.allowlist.contains(d) {
+                return BlockCheckResult::allowed(d, "parent domain in allowlist");
+            }
+            if self.domains.contains(d) {
+                return BlockCheckResult::blocked(d, "parent domain in blocklist");
             }
-        }
-
-        let domain = Self::normalize(domain);
-
-        if let Some(matched) = Self::find_in_set(&domain, &self.allowlist) {
-            let reason = if matched == domain {
-                "exact match in allowlist"
-            } else {
-                "parent domain in allowlist"
-            };
-            return BlockCheckResult::allowed(matched, reason);
-        }
-
-        if let Some(matched) = Self::find_in_set(&domain, &self.domains) {
-            let reason = if matched == domain {
-                "exact match in blocklist"
-            } else {
-                "parent domain in blocklist"
-            };
-            return BlockCheckResult::blocked(matched, reason);
         }
 
         BlockCheckResult::not_blocked()
     }
 
-    fn normalize(domain: &str) -> String {
-        domain.to_lowercase().trim_end_matches('.').to_string()
-    }
-
-    fn find_in_set<'a>(domain: &'a str, set: &HashSet<String>) -> Option<&'a str> {
-        if set.contains(domain) {
-            return Some(domain);
-        }
-        let mut d = domain;
-        while let Some(dot) = d.find('.') {
-            d = &d[dot + 1..];
-            if set.contains(d) {
-                return Some(d);
-            }
-        }
-        None
-    }
-
     /// Atomically swap in a new domain set. Build the set outside the lock,
     /// then call this to swap — keeps lock hold time sub-microsecond.
     pub fn swap_domains(&mut self, domains: HashSet<String>, sources: Vec<String>) {
@@ -176,26 +172,17 @@ impl BlocklistStore {
     }
 
     pub fn add_to_allowlist(&mut self, domain: &str) {
-        self.allowlist.insert(Self::normalize(domain));
+        self.allowlist.insert(domain.to_lowercase());
     }
 
     pub fn remove_from_allowlist(&mut self, domain: &str) -> bool {
-        self.allowlist.remove(&Self::normalize(domain))
+        self.allowlist.remove(&domain.to_lowercase())
     }
 
     pub fn allowlist(&self) -> Vec<String> {
         self.allowlist.iter().cloned().collect()
     }
 
-    pub fn heap_bytes(&self) -> usize {
-        let per_slot_overhead = std::mem::size_of::<u64>() + std::mem::size_of::<String>() + 1;
-        let domains_table = self.domains.capacity() * per_slot_overhead;
-        let domains_heap: usize = self.domains.iter().map(|d| d.capacity()).sum();
-        let allow_table = self.allowlist.capacity() * per_slot_overhead;
-        let allow_heap: usize = self.allowlist.iter().map(|d| d.capacity()).sum();
-        domains_table + domains_heap + allow_table + allow_heap
-    }
-
     pub fn stats(&self) -> BlocklistStats {
         BlocklistStats {
             enabled: self.is_enabled(),
@@ -247,114 +234,6 @@ pub fn parse_blocklist(text: &str) -> HashSet<String> {
     domains
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn store_with(domains: &[&str], allowlist: &[&str]) -> BlocklistStore {
-        let mut store = BlocklistStore::new();
-        store.swap_domains(domains.iter().map(|s| s.to_string()).collect(), vec![]);
-        for d in allowlist {
-            store.add_to_allowlist(d);
-        }
-        store
-    }
-
-    #[test]
-    fn exact_block() {
-        let store = store_with(&["ads.example.com"], &[]);
-        assert!(store.is_blocked("ads.example.com"));
-        assert!(!store.is_blocked("example.com"));
-    }
-
-    #[test]
-    fn parent_block_covers_subdomain() {
-        let store = store_with(&["tracker.com"], &[]);
-        assert!(store.is_blocked("tracker.com"));
-        assert!(store.is_blocked("www.tracker.com"));
-        assert!(store.is_blocked("deep.sub.tracker.com"));
-    }
-
-    #[test]
-    fn exact_allowlist_unblocks() {
-        let store = store_with(&["ads.example.com"], &["ads.example.com"]);
-        assert!(!store.is_blocked("ads.example.com"));
-    }
-
-    #[test]
-    fn parent_allowlist_unblocks_subdomain() {
-        let store = store_with(&["example.com", "www.example.com"], &["example.com"]);
-        assert!(!store.is_blocked("example.com"));
-        assert!(!store.is_blocked("www.example.com"));
-        assert!(!store.is_blocked("sub.deep.example.com"));
-    }
-
-    #[test]
-    fn allowlist_does_not_unblock_sibling() {
-        let store = store_with(
-            &["www.example.com", "ads.example.com"],
-            &["www.example.com"],
-        );
-        assert!(!store.is_blocked("www.example.com"));
-        assert!(store.is_blocked("ads.example.com"));
-    }
-
-    #[test]
-    fn check_reports_parent_allowlist() {
-        let store = store_with(
-            &["goatcounter.com", "www.goatcounter.com"],
-            &["goatcounter.com"],
-        );
-        let result = store.check("www.goatcounter.com");
-        assert!(!result.blocked);
-        assert_eq!(result.matched_rule.as_deref(), Some("goatcounter.com"));
-    }
-
-    #[test]
-    fn disabled_never_blocks() {
-        let mut store = store_with(&["ads.example.com"], &[]);
-        store.set_enabled(false);
-        assert!(!store.is_blocked("ads.example.com"));
-    }
-
-    #[test]
-    fn trailing_dot_normalized() {
-        let store = store_with(&["ads.example.com"], &["safe.example.com"]);
-        assert!(store.is_blocked("ads.example.com."));
-        assert!(!store.is_blocked("safe.example.com."));
-        let result = store.check("ads.example.com.");
-        assert!(result.blocked);
-    }
-
-    #[test]
-    fn case_insensitive() {
-        let store = store_with(&["ads.example.com"], &["safe.example.com"]);
-        assert!(store.is_blocked("ADS.Example.COM"));
-        assert!(!store.is_blocked("Safe.Example.COM"));
-    }
-
-    #[test]
-    fn domain_in_neither_list() {
-        let store = store_with(&["ads.example.com"], &[]);
-        let result = store.check("clean.example.org");
-        assert!(!result.blocked);
-        assert_eq!(result.reason, "not in blocklist");
-        assert!(result.matched_rule.is_none());
-    }
-
-    #[test]
-    fn heap_bytes_grows_with_domains() {
-        let mut store = BlocklistStore::new();
-        let empty = store.heap_bytes();
-        let domains: HashSet<String> = ["example.com", "example.org", "test.net"]
-            .iter()
-            .map(|s| s.to_string())
-            .collect();
-        store.swap_domains(domains, vec![]);
-        assert!(store.heap_bytes() > empty);
-    }
-}
-
 pub async fn download_blocklists(lists: &[String]) -> Vec<(String, String)> {
     let client = reqwest::Client::builder()
         .timeout(std::time::Duration::from_secs(30))

src/buffer.rs

@@ -84,11 +84,6 @@ impl BytePacketBuffer {
 
     /// Read a qname, handling label compression (pointer jumps).
     /// Converts wire format like [3]www[6]google[3]com[0] into "www.google.com".
-    ///
-    /// Label bytes are escaped per RFC 1035 §5.1:
-    /// - literal `.` within a label → `\.`
-    /// - literal `\` → `\\`
-    /// - bytes outside `0x21..=0x7E` (excluding `.` and `\`) → `\DDD` (3-digit decimal)
     pub fn read_qname(&mut self, outstr: &mut String) -> Result<()> {
         let mut pos = self.pos();
         let mut jumped = false;
@@ -126,18 +121,7 @@ impl BytePacketBuffer {
 
                 let str_buffer = self.get_range(pos, len as usize)?;
                 for &b in str_buffer {
-                    let c = b.to_ascii_lowercase();
+                    outstr.push(b.to_ascii_lowercase() as char);
-                    match c {
-                        b'.' => outstr.push_str("\\."),
-                        b'\\' => outstr.push_str("\\\\"),
-                        0x21..=0x7E => outstr.push(c as char),
-                        _ => {
-                            outstr.push('\\');
-                            outstr.push((b'0' + c / 100) as char);
-                            outstr.push((b'0' + (c / 10) % 10) as char);
-                            outstr.push((b'0' + c % 10) as char);
-                        }
-                    }
                 }
 
                 delim = ".";
@@ -179,68 +163,24 @@ impl BytePacketBuffer {
         Ok(())
     }
 
-    /// Write a qname in wire format, parsing RFC 1035 §5.1 text escapes.
-    /// See `read_qname` for the escape grammar.
     pub fn write_qname(&mut self, qname: &str) -> Result<()> {
         if qname.is_empty() || qname == "." {
             self.write_u8(0)?;
             return Ok(());
         }
 
-        let bytes = qname.as_bytes();
+        for label in qname.split('.') {
-        let mut i = 0;
+            let len = label.len();
-        while i < bytes.len() {
+            if len == 0 {
-            let len_pos = self.pos;
+                continue; // skip empty labels from trailing dot
-            self.write_u8(0)?; // placeholder length byte, backpatched below
+            }
-            let body_start = self.pos;
+            if len > 0x3f {
-
+                return Err("Single label exceeds 63 characters of length".into());
-            while i < bytes.len() && bytes[i] != b'.' {
-                let b = bytes[i];
-                if b == b'\\' {
-                    i += 1;
-                    let c1 = *bytes.get(i).ok_or("trailing backslash in qname")?;
-                    if c1.is_ascii_digit() {
-                        let c2 = *bytes
-                            .get(i + 1)
-                            .ok_or("invalid \\DDD escape: expected 3 digits")?;
-                        let c3 = *bytes
-                            .get(i + 2)
-                            .ok_or("invalid \\DDD escape: expected 3 digits")?;
-                        if !c2.is_ascii_digit() || !c3.is_ascii_digit() {
-                            return Err("invalid \\DDD escape: expected 3 digits".into());
-                        }
-                        let val =
-                            (c1 - b'0') as u16 * 100 + (c2 - b'0') as u16 * 10 + (c3 - b'0') as u16;
-                        if val > 255 {
-                            return Err(format!("\\DDD escape out of range: {}", val).into());
-                        }
-                        self.write_u8(val as u8)?;
-                        i += 3;
-                    } else {
-                        // \. \\ and any other \X → literal next byte
-                        self.write_u8(c1)?;
-                        i += 1;
-                    }
-                } else {
-                    self.write_u8(b)?;
-                    i += 1;
-                }
-
-                if self.pos - body_start > 0x3f {
-                    return Err("Single label exceeds 63 characters of length".into());
-                }
             }
 
-            let label_len = self.pos - body_start;
+            self.write_u8(len as u8)?;
-            if label_len == 0 && i < bytes.len() {
+            for b in label.as_bytes() {
-                // Empty label from leading/consecutive dots — roll back the placeholder.
+                self.write_u8(*b)?;
-                self.pos = len_pos;
-            } else {
-                self.set(len_pos, label_len as u8)?;
-            }
-
-            if i < bytes.len() && bytes[i] == b'.' {
-                i += 1;
             }
         }
 
@@ -272,160 +212,3 @@ impl BytePacketBuffer {
         Ok(())
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn roundtrip(wire: &[u8]) -> String {
-        let mut buf = BytePacketBuffer::from_bytes(wire);
-        let mut out = String::new();
-        buf.read_qname(&mut out).unwrap();
-        out
-    }
-
-    fn write_then_read(text: &str) -> String {
-        let mut buf = BytePacketBuffer::new();
-        buf.write_qname(text).unwrap();
-        let wire_end = buf.pos();
-        buf.seek(0).unwrap();
-        let mut out = String::new();
-        buf.read_qname(&mut out).unwrap();
-        assert_eq!(
-            buf.pos(),
-            wire_end,
-            "reader should consume exactly what writer wrote"
-        );
-        out
-    }
-
-    #[test]
-    fn read_plain_domain() {
-        // [3]www[6]google[3]com[0]
-        let wire = b"\x03www\x06google\x03com\x00";
-        assert_eq!(roundtrip(wire), "www.google.com");
-    }
-
-    #[test]
-    fn read_label_with_literal_dot_is_escaped() {
-        // fanf2's example: [8]exa.mple[3]com[0] — two labels, first contains 0x2E
-        let wire = b"\x08exa.mple\x03com\x00";
-        assert_eq!(roundtrip(wire), "exa\\.mple.com");
-    }
-
-    #[test]
-    fn read_label_with_backslash_is_escaped() {
-        // [4]a\bc[3]com[0]
-        let wire = b"\x04a\\bc\x03com\x00";
-        assert_eq!(roundtrip(wire), "a\\\\bc.com");
-    }
-
-    #[test]
-    fn read_label_with_nonprintable_byte_uses_decimal_escape() {
-        // [4]\x00foo[3]com[0] — null byte at label start
-        let wire = b"\x04\x00foo\x03com\x00";
-        assert_eq!(roundtrip(wire), "\\000foo.com");
-    }
-
-    #[test]
-    fn read_label_with_space_uses_decimal_escape() {
-        // Space (0x20) is outside 0x21..=0x7E, so it must be decimal-escaped.
-        let wire = b"\x05a b c\x00";
-        assert_eq!(roundtrip(wire), "a\\032b\\032c");
-    }
-
-    #[test]
-    fn write_plain_domain() {
-        let mut buf = BytePacketBuffer::new();
-        buf.write_qname("www.google.com").unwrap();
-        assert_eq!(&buf.buf[..buf.pos], b"\x03www\x06google\x03com\x00");
-    }
-
-    #[test]
-    fn write_escaped_dot_does_not_split_label() {
-        let mut buf = BytePacketBuffer::new();
-        buf.write_qname("exa\\.mple.com").unwrap();
-        assert_eq!(&buf.buf[..buf.pos], b"\x08exa.mple\x03com\x00");
-    }
-
-    #[test]
-    fn write_escaped_backslash() {
-        let mut buf = BytePacketBuffer::new();
-        buf.write_qname("a\\\\bc.com").unwrap();
-        assert_eq!(&buf.buf[..buf.pos], b"\x04a\\bc\x03com\x00");
-    }
-
-    #[test]
-    fn write_decimal_escape_yields_raw_byte() {
-        let mut buf = BytePacketBuffer::new();
-        buf.write_qname("\\000foo.com").unwrap();
-        assert_eq!(&buf.buf[..buf.pos], b"\x04\x00foo\x03com\x00");
-    }
-
-    #[test]
-    fn write_skips_empty_labels() {
-        // Leading dot — first (empty) label is rolled back.
-        let mut buf = BytePacketBuffer::new();
-        buf.write_qname(".foo.com").unwrap();
-        assert_eq!(&buf.buf[..buf.pos], b"\x03foo\x03com\x00");
-
-        // Consecutive dots — middle empty label is rolled back.
-        let mut buf = BytePacketBuffer::new();
-        buf.write_qname("foo..com").unwrap();
-        assert_eq!(&buf.buf[..buf.pos], b"\x03foo\x03com\x00");
-    }
-
-    #[test]
-    fn write_rejects_out_of_range_decimal_escape() {
-        let mut buf = BytePacketBuffer::new();
-        assert!(buf.write_qname("\\999foo.com").is_err());
-    }
-
-    #[test]
-    fn write_rejects_trailing_backslash() {
-        let mut buf = BytePacketBuffer::new();
-        assert!(buf.write_qname("foo\\").is_err());
-    }
-
-    #[test]
-    fn write_rejects_short_decimal_escape() {
-        let mut buf = BytePacketBuffer::new();
-        assert!(buf.write_qname("\\1").is_err());
-    }
-
-    #[test]
-    fn write_rejects_label_over_63_bytes() {
-        // 64 bytes exceeds the wire-format label cap.
-        let mut buf = BytePacketBuffer::new();
-        assert!(buf.write_qname(&"a".repeat(64)).is_err());
-
-        // 63 bytes is the maximum permitted label length.
-        let mut buf = BytePacketBuffer::new();
-        assert!(buf.write_qname(&"a".repeat(63)).is_ok());
-    }
-
-    #[test]
-    fn roundtrip_preserves_dot_in_label() {
-        assert_eq!(write_then_read("exa\\.mple.com"), "exa\\.mple.com");
-    }
-
-    #[test]
-    fn roundtrip_preserves_backslash_in_label() {
-        assert_eq!(write_then_read("a\\\\b.com"), "a\\\\b.com");
-    }
-
-    #[test]
-    fn roundtrip_preserves_nonprintable_byte() {
-        assert_eq!(write_then_read("\\000foo.com"), "\\000foo.com");
-    }
-
-    #[test]
-    fn root_name_empty_and_dot_both_produce_single_zero() {
-        let mut a = BytePacketBuffer::new();
-        a.write_qname("").unwrap();
-        let mut b = BytePacketBuffer::new();
-        b.write_qname(".").unwrap();
-        assert_eq!(&a.buf[..a.pos], b"\x00");
-        assert_eq!(&b.buf[..b.pos], b"\x00");
-    }
-}

src/cache.rs

@@ -1,26 +1,9 @@
 use std::collections::HashMap;
 use std::time::{Duration, Instant};
 
-use crate::buffer::BytePacketBuffer;
 use crate::packet::DnsPacket;
 use crate::question::QueryType;
-use crate::wire::WireMeta;
+use crate::record::DnsRecord;
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Freshness {
-    /// Within TTL, no action needed.
-    Fresh,
-    /// Within TTL but <10% remaining — trigger background prefetch.
-    NearExpiry,
-    /// Past TTL but within stale window — serve with TTL=1, trigger background refresh.
-    Stale,
-}
-
-impl Freshness {
-    pub fn needs_refresh(self) -> bool {
-        matches!(self, Freshness::NearExpiry | Freshness::Stale)
-    }
-}
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub enum DnssecStatus {
@@ -43,16 +26,14 @@ impl DnssecStatus {
 }
 
 struct CacheEntry {
-    wire: Vec<u8>,
+    packet: DnsPacket,
-    meta: WireMeta,
     inserted_at: Instant,
     ttl: Duration,
     dnssec_status: DnssecStatus,
 }
 
-const STALE_WINDOW: Duration = Duration::from_secs(3600);
+/// DNS cache using a two-level map (domain -> query_type -> entry) so that
-
+/// lookups can borrow `&str` instead of allocating a `String` key.
-/// DNS cache with serve-stale (RFC 8767). Stores raw wire bytes.
 pub struct DnsCache {
     entries: HashMap<String, HashMap<QueryType, CacheEntry>>,
     entry_count: usize,
@@ -72,60 +53,54 @@ impl DnsCache {
         }
     }
 
-    /// Look up cached wire bytes, patching ID and TTLs in the returned copy.
+    /// Read-only lookup — expired entries are left in place (cleaned up on insert).
-    /// Implements serve-stale (RFC 8767): expired entries within STALE_WINDOW
+    pub fn lookup(&self, domain: &str, qtype: QueryType) -> Option<DnsPacket> {
-    /// are returned with TTL=1 and `stale=true` so callers can revalidate.
+        self.lookup_with_status(domain, qtype).map(|(pkt, _)| pkt)
-    pub fn lookup_wire(
+    }
+
+    pub fn lookup_with_status(
         &self,
         domain: &str,
         qtype: QueryType,
-        new_id: u16,
+    ) -> Option<(DnsPacket, DnssecStatus)> {
-    ) -> Option<(Vec<u8>, DnssecStatus, Freshness)> {
         let type_map = self.entries.get(domain)?;
         let entry = type_map.get(&qtype)?;
 
         let elapsed = entry.inserted_at.elapsed();
-        let (remaining, freshness) = if elapsed < entry.ttl {
+        if elapsed >= entry.ttl {
-            let secs = (entry.ttl - elapsed).as_secs() as u32;
-            let f = if elapsed * 10 >= entry.ttl * 9 {
-                Freshness::NearExpiry
-            } else {
-                Freshness::Fresh
-            };
-            (secs.max(1), f)
-        } else if elapsed < entry.ttl + STALE_WINDOW {
-            (1, Freshness::Stale)
-        } else {
             return None;
-        };
+        }
 
-        let mut wire = entry.wire.clone();
+        let remaining_secs = (entry.ttl - elapsed).as_secs() as u32;
-        crate::wire::patch_id(&mut wire, new_id);
+        let remaining = remaining_secs.max(1);
-        crate::wire::patch_ttls(&mut wire, &entry.meta.ttl_offsets, remaining);
 
-        Some((wire, entry.dnssec_status, freshness))
+        let mut packet = entry.packet.clone();
+        adjust_ttls(&mut packet.answers, remaining);
+        adjust_ttls(&mut packet.authorities, remaining);
+        adjust_ttls(&mut packet.resources, remaining);
+
+        Some((packet, entry.dnssec_status))
     }
 
-    pub fn insert_wire(
+    pub fn insert(&mut self, domain: &str, qtype: QueryType, packet: &DnsPacket) {
+        self.insert_with_status(domain, qtype, packet, DnssecStatus::Indeterminate);
+    }
+
+    pub fn insert_with_status(
         &mut self,
         domain: &str,
         qtype: QueryType,
-        wire: &[u8],
+        packet: &DnsPacket,
         dnssec_status: DnssecStatus,
     ) {
-        let meta = match crate::wire::scan_ttl_offsets(wire) {
-            Ok(m) => m,
-            Err(_) => return, // malformed wire, skip
-        };
-
         if self.entry_count >= self.max_entries {
             self.evict_expired();
             if self.entry_count >= self.max_entries {
-                self.evict_stalest();
+                return;
             }
         }
 
-        let min_ttl = crate::wire::min_ttl_from_wire(wire, &meta)
+        let min_ttl = extract_min_ttl(&packet.answers)
             .unwrap_or(self.min_ttl)
             .clamp(self.min_ttl, self.max_ttl);
 
@@ -142,8 +117,7 @@ impl DnsCache {
         type_map.insert(
             qtype,
             CacheEntry {
-                wire: wire.to_vec(),
+                packet: packet.clone(),
-                meta,
                 inserted_at: Instant::now(),
                 ttl: Duration::from_secs(min_ttl as u64),
                 dnssec_status,
@@ -151,64 +125,6 @@ impl DnsCache {
         );
     }
 
-    /// Read-only lookup — expired entries are left in place (cleaned up on insert).
-    pub fn lookup(&self, domain: &str, qtype: QueryType) -> Option<DnsPacket> {
-        self.lookup_with_status(domain, qtype)
-            .map(|(pkt, _, _)| pkt)
-    }
-
-    pub fn lookup_with_status(
-        &self,
-        domain: &str,
-        qtype: QueryType,
-    ) -> Option<(DnsPacket, DnssecStatus, Freshness)> {
-        let (wire, status, freshness) = self.lookup_wire(domain, qtype, 0)?;
-        let mut buf = BytePacketBuffer::from_bytes(&wire);
-        let pkt = DnsPacket::from_buffer(&mut buf).ok()?;
-        Some((pkt, status, freshness))
-    }
-
-    pub fn insert(&mut self, domain: &str, qtype: QueryType, packet: &DnsPacket) {
-        self.insert_with_status(domain, qtype, packet, DnssecStatus::Indeterminate);
-    }
-
-    pub fn insert_with_status(
-        &mut self,
-        domain: &str,
-        qtype: QueryType,
-        packet: &DnsPacket,
-        dnssec_status: DnssecStatus,
-    ) {
-        let mut buf = BytePacketBuffer::new();
-        if packet.write(&mut buf).is_err() {
-            return;
-        }
-        self.insert_wire(domain, qtype, buf.filled(), dnssec_status);
-    }
-
-    pub fn ttl_remaining(&self, domain: &str, qtype: QueryType) -> Option<(u32, u32)> {
-        let type_map = self.entries.get(domain)?;
-        let entry = type_map.get(&qtype)?;
-        let elapsed = entry.inserted_at.elapsed();
-        if elapsed >= entry.ttl {
-            return None;
-        }
-        let total = entry.ttl.as_secs() as u32;
-        let remaining = (entry.ttl - elapsed).as_secs() as u32;
-        Some((remaining, total))
-    }
-
-    pub fn needs_warm(&self, domain: &str) -> bool {
-        for qtype in [QueryType::A, QueryType::AAAA] {
-            match self.ttl_remaining(domain, qtype) {
-                None => return true,
-                Some((remaining, total)) if remaining < total / 4 => return true,
-                _ => {}
-            }
-        }
-        false
-    }
-
     pub fn len(&self) -> usize {
         self.entry_count
     }
@@ -226,27 +142,6 @@ impl DnsCache {
         self.entry_count = 0;
     }
 
-    pub fn heap_bytes(&self) -> usize {
-        let outer_slot = std::mem::size_of::<u64>()
-            + std::mem::size_of::<String>()
-            + std::mem::size_of::<HashMap<QueryType, CacheEntry>>()
-            + 1;
-        let mut total = self.entries.capacity() * outer_slot;
-        for (domain, type_map) in &self.entries {
-            total += domain.capacity();
-            let inner_slot = std::mem::size_of::<u64>()
-                + std::mem::size_of::<QueryType>()
-                + std::mem::size_of::<CacheEntry>()
-                + 1;
-            total += type_map.capacity() * inner_slot;
-            for entry in type_map.values() {
-                total += entry.wire.capacity()
-                    + entry.meta.ttl_offsets.capacity() * std::mem::size_of::<usize>();
-            }
-        }
-        total
-    }
-
     pub fn remove(&mut self, domain: &str) {
         let domain_lower = domain.to_lowercase();
         if let Some(type_map) = self.entries.remove(&domain_lower) {
@@ -282,34 +177,6 @@ impl DnsCache {
         });
         self.entry_count -= count;
     }
-
-    /// Evict the single entry closest to (or furthest past) expiry.
-    fn evict_stalest(&mut self) {
-        let mut worst: Option<(String, QueryType, Duration)> = None;
-        for (domain, type_map) in &self.entries {
-            for (qtype, entry) in type_map {
-                let age = entry.inserted_at.elapsed();
-                let remaining = entry.ttl.saturating_sub(age);
-                match &worst {
-                    None => worst = Some((domain.clone(), *qtype, remaining)),
-                    Some((_, _, w)) if remaining < *w => {
-                        worst = Some((domain.clone(), *qtype, remaining));
-                    }
-                    _ => {}
-                }
-            }
-        }
-        if let Some((domain, qtype, _)) = worst {
-            if let Some(type_map) = self.entries.get_mut(&domain) {
-                if type_map.remove(&qtype).is_some() {
-                    self.entry_count -= 1;
-                }
-                if type_map.is_empty() {
-                    self.entries.remove(&domain);
-                }
-            }
-        }
-    }
 }
 
 pub struct CacheInfo {
@@ -318,85 +185,12 @@ pub struct CacheInfo {
     pub ttl_remaining: u32,
 }
 
-#[cfg(test)]
+fn extract_min_ttl(records: &[DnsRecord]) -> Option<u32> {
-mod tests {
+    records.iter().map(|r| r.ttl()).min()
-    use super::*;
+}
-    use crate::packet::DnsPacket;
-    use crate::record::DnsRecord;
 
-    #[test]
+fn adjust_ttls(records: &mut [DnsRecord], new_ttl: u32) {
-    fn heap_bytes_grows_with_entries() {
+    for record in records.iter_mut() {
-        let mut cache = DnsCache::new(100, 1, 3600);
+        record.set_ttl(new_ttl);
-        let empty = cache.heap_bytes();
-        let mut pkt = DnsPacket::new();
-        pkt.answers.push(DnsRecord::A {
-            domain: "example.com".into(),
-            addr: "1.2.3.4".parse().unwrap(),
-            ttl: 300,
-        });
-        cache.insert("example.com", QueryType::A, &pkt);
-        assert!(cache.heap_bytes() > empty);
-    }
-
-    #[test]
-    fn ttl_remaining_returns_values_for_fresh_entry() {
-        let mut cache = DnsCache::new(100, 60, 3600);
-        let mut pkt = DnsPacket::new();
-        pkt.answers.push(DnsRecord::A {
-            domain: "example.com".into(),
-            addr: "1.2.3.4".parse().unwrap(),
-            ttl: 300,
-        });
-        cache.insert("example.com", QueryType::A, &pkt);
-        let (remaining, total) = cache.ttl_remaining("example.com", QueryType::A).unwrap();
-        assert_eq!(total, 300);
-        assert!(remaining <= 300);
-        assert!(remaining > 0);
-    }
-
-    #[test]
-    fn ttl_remaining_none_for_missing() {
-        let cache = DnsCache::new(100, 1, 3600);
-        assert!(cache.ttl_remaining("missing.com", QueryType::A).is_none());
-    }
-
-    #[test]
-    fn needs_warm_true_when_missing() {
-        let cache = DnsCache::new(100, 1, 3600);
-        assert!(cache.needs_warm("missing.com"));
-    }
-
-    #[test]
-    fn needs_warm_false_when_fresh() {
-        let mut cache = DnsCache::new(100, 1, 3600);
-        let mut pkt_a = DnsPacket::new();
-        pkt_a.answers.push(DnsRecord::A {
-            domain: "example.com".into(),
-            addr: "1.2.3.4".parse().unwrap(),
-            ttl: 300,
-        });
-        let mut pkt_aaaa = DnsPacket::new();
-        pkt_aaaa.answers.push(DnsRecord::AAAA {
-            domain: "example.com".into(),
-            addr: "::1".parse().unwrap(),
-            ttl: 300,
-        });
-        cache.insert("example.com", QueryType::A, &pkt_a);
-        cache.insert("example.com", QueryType::AAAA, &pkt_aaaa);
-        assert!(!cache.needs_warm("example.com"));
-    }
-
-    #[test]
-    fn needs_warm_true_when_only_a_cached() {
-        let mut cache = DnsCache::new(100, 1, 3600);
-        let mut pkt = DnsPacket::new();
-        pkt.answers.push(DnsRecord::A {
-            domain: "example.com".into(),
-            addr: "1.2.3.4".parse().unwrap(),
-            ttl: 300,
-        });
-        cache.insert("example.com", QueryType::A, &pkt);
-        // AAAA missing → needs warm
-        assert!(cache.needs_warm("example.com"));
     }
 }

src/config.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::net::Ipv4Addr;
 use std::net::Ipv6Addr;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use serde::Deserialize;
 
@@ -29,43 +29,6 @@ pub struct Config {
     pub lan: LanConfig,
     #[serde(default)]
     pub dnssec: DnssecConfig,
-    #[serde(default)]
-    pub dot: DotConfig,
-    #[serde(default)]
-    pub mobile: MobileConfig,
-    #[serde(default)]
-    pub forwarding: Vec<ForwardingRuleConfig>,
-}
-
-#[derive(Deserialize, Clone, Debug)]
-pub struct ForwardingRuleConfig {
-    #[serde(deserialize_with = "string_or_vec")]
-    pub suffix: Vec<String>,
-    pub upstream: String,
-}
-
-impl ForwardingRuleConfig {
-    fn to_runtime_rules(&self) -> Result<Vec<crate::system_dns::ForwardingRule>> {
-        let addr = crate::forward::parse_upstream_addr(&self.upstream, 53)
-            .map_err(|e| format!("forwarding rule for upstream '{}': {}", self.upstream, e))?;
-        Ok(self
-            .suffix
-            .iter()
-            .map(|s| crate::system_dns::ForwardingRule::new(s.clone(), addr))
-            .collect())
-    }
-}
-
-pub fn merge_forwarding_rules(
-    config_rules: &[ForwardingRuleConfig],
-    discovered: Vec<crate::system_dns::ForwardingRule>,
-) -> Result<Vec<crate::system_dns::ForwardingRule>> {
-    let mut merged: Vec<crate::system_dns::ForwardingRule> = Vec::new();
-    for rule in config_rules {
-        merged.extend(rule.to_runtime_rules()?);
-    }
-    merged.extend(discovered);
-    Ok(merged)
 }
 
 #[derive(Deserialize)]
@@ -76,10 +39,6 @@ pub struct ServerConfig {
     pub api_port: u16,
     #[serde(default = "default_api_bind_addr")]
     pub api_bind_addr: String,
-    /// Where numa writes TLS material (CA, leaf certs, regenerated state).
-    /// Defaults to `crate::data_dir()` (platform-specific system path) if unset.
-    #[serde(default)]
-    pub data_dir: Option<PathBuf>,
 }
 
 impl Default for ServerConfig {
@@ -88,7 +47,6 @@ impl Default for ServerConfig {
             bind_addr: default_bind_addr(),
             api_port: default_api_port(),
             api_bind_addr: default_api_bind_addr(),
-            data_dir: None,
         }
     }
 }
@@ -101,45 +59,28 @@ fn default_bind_addr() -> String {
     "0.0.0.0:53".to_string()
 }
 
-pub const DEFAULT_API_PORT: u16 = 5380;
-
 fn default_api_port() -> u16 {
-    DEFAULT_API_PORT
+    5380
 }
 
 #[derive(Deserialize, Default, PartialEq, Eq, Clone, Copy)]
 #[serde(rename_all = "lowercase")]
 pub enum UpstreamMode {
-    Auto,
     #[default]
     Forward,
     Recursive,
 }
 
-impl UpstreamMode {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            UpstreamMode::Auto => "auto",
-            UpstreamMode::Forward => "forward",
-            UpstreamMode::Recursive => "recursive",
-        }
-    }
-}
-
 #[derive(Deserialize)]
 pub struct UpstreamConfig {
     #[serde(default)]
     pub mode: UpstreamMode,
-    #[serde(default, deserialize_with = "string_or_vec")]
+    #[serde(default = "default_upstream_addr")]
-    pub address: Vec<String>,
+    pub address: String,
     #[serde(default = "default_upstream_port")]
     pub port: u16,
-    #[serde(default)]
-    pub fallback: Vec<String>,
     #[serde(default = "default_timeout_ms")]
     pub timeout_ms: u64,
-    #[serde(default = "default_hedge_ms")]
-    pub hedge_ms: u64,
     #[serde(default = "default_root_hints")]
     pub root_hints: Vec<String>,
     #[serde(default = "default_prime_tlds")]
@@ -152,11 +93,9 @@ impl Default for UpstreamConfig {
     fn default() -> Self {
         UpstreamConfig {
             mode: UpstreamMode::default(),
-            address: Vec::new(),
+            address: default_upstream_addr(),
             port: default_upstream_port(),
-            fallback: Vec::new(),
             timeout_ms: default_timeout_ms(),
-            hedge_ms: default_hedge_ms(),
             root_hints: default_root_hints(),
             prime_tlds: default_prime_tlds(),
             srtt: default_srtt(),
@@ -164,39 +103,8 @@ impl Default for UpstreamConfig {
     }
 }
 
-fn string_or_vec<'de, D>(deserializer: D) -> std::result::Result<Vec<String>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    struct Visitor;
-    impl<'de> serde::de::Visitor<'de> for Visitor {
-        type Value = Vec<String>;
-        fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-            f.write_str("string or array of strings")
-        }
-        fn visit_str<E: serde::de::Error>(self, v: &str) -> std::result::Result<Self::Value, E> {
-            Ok(vec![v.to_string()])
-        }
-        fn visit_seq<A: serde::de::SeqAccess<'de>>(
-            self,
-            mut seq: A,
-        ) -> std::result::Result<Self::Value, A::Error> {
-            let mut v = Vec::new();
-            while let Some(s) = seq.next_element::<String>()? {
-                v.push(s);
-            }
-            Ok(v)
-        }
-    }
-    deserializer.deserialize_any(Visitor)
-}
-
-fn default_true() -> bool {
-    true
-}
-
 fn default_srtt() -> bool {
-    default_true()
+    true
 }
 
 fn default_prime_tlds() -> Vec<String> {
@@ -268,15 +176,15 @@ fn default_root_hints() -> Vec<String> {
     ]
 }
 
+fn default_upstream_addr() -> String {
+    String::new() // empty = auto-detect from system resolver
+}
 fn default_upstream_port() -> u16 {
     53
 }
 fn default_timeout_ms() -> u64 {
     5000
 }
-fn default_hedge_ms() -> u64 {
-    10
-}
 
 #[derive(Deserialize)]
 pub struct CacheConfig {
@@ -286,8 +194,6 @@ pub struct CacheConfig {
     pub min_ttl: u32,
     #[serde(default = "default_max_ttl")]
     pub max_ttl: u32,
-    #[serde(default)]
-    pub warm: Vec<String>,
 }
 
 impl Default for CacheConfig {
@@ -296,13 +202,12 @@ impl Default for CacheConfig {
             max_entries: default_max_entries(),
             min_ttl: default_min_ttl(),
             max_ttl: default_max_ttl(),
-            warm: Vec::new(),
         }
     }
 }
 
 fn default_max_entries() -> usize {
-    100_000
+    10000
 }
 fn default_min_ttl() -> u32 {
     60
@@ -448,91 +353,6 @@ pub struct DnssecConfig {
     pub strict: bool,
 }
 
-#[derive(Deserialize, Clone)]
-pub struct DotConfig {
-    #[serde(default = "default_dot_enabled")]
-    pub enabled: bool,
-    #[serde(default = "default_dot_port")]
-    pub port: u16,
-    #[serde(default = "default_dot_bind_addr")]
-    pub bind_addr: String,
-    /// Path to TLS certificate (PEM). If None, uses self-signed CA.
-    #[serde(default)]
-    pub cert_path: Option<PathBuf>,
-    /// Path to TLS private key (PEM). If None, uses self-signed CA.
-    #[serde(default)]
-    pub key_path: Option<PathBuf>,
-}
-
-impl Default for DotConfig {
-    fn default() -> Self {
-        DotConfig {
-            enabled: default_dot_enabled(),
-            port: default_dot_port(),
-            bind_addr: default_dot_bind_addr(),
-            cert_path: None,
-            key_path: None,
-        }
-    }
-}
-
-fn default_dot_enabled() -> bool {
-    true
-}
-fn default_dot_port() -> u16 {
-    853
-}
-fn default_dot_bind_addr() -> String {
-    "0.0.0.0".to_string()
-}
-
-/// Configuration for the mobile API — a persistent HTTP listener that
-/// serves a read-only subset of routes (`/health`, `/ca.pem`,
-/// `/mobileconfig`, `/ca.mobileconfig`) on a LAN-reachable port, for
-/// consumption by the iOS/Android companion apps.
-///
-/// Unlike the main API (port 5380, localhost-only by default, supports
-/// state-mutating routes), the mobile API is safe to expose on the LAN
-/// because every route is idempotent and read-only.
-#[derive(Deserialize, Clone)]
-pub struct MobileConfig {
-    /// If true, spawn the mobile API listener at startup. **Default false.**
-    /// Opt-in because the listener binds to the LAN by default and exposes
-    /// a few read-only endpoints to any device on the same network (`/health`,
-    /// `/ca.pem`, `/mobileconfig`, `/ca.mobileconfig`). None of those are
-    /// cryptographically sensitive (the CA private key is never served),
-    /// but users should enable this explicitly rather than have a new
-    /// LAN-reachable port appear after an upgrade.
-    #[serde(default)]
-    pub enabled: bool,
-    /// Port for the mobile API. Default 8765.
-    #[serde(default = "default_mobile_port")]
-    pub port: u16,
-    /// Bind address for the mobile API. Default "0.0.0.0" (all interfaces)
-    /// so phones on the LAN can reach it. Set to "127.0.0.1" to restrict
-    /// to localhost — useful if you're running behind another front-end.
-    #[serde(default = "default_mobile_bind_addr")]
-    pub bind_addr: String,
-}
-
-impl Default for MobileConfig {
-    fn default() -> Self {
-        MobileConfig {
-            enabled: false,
-            port: default_mobile_port(),
-            bind_addr: default_mobile_bind_addr(),
-        }
-    }
-}
-
-fn default_mobile_port() -> u16 {
-    8765
-}
-
-fn default_mobile_bind_addr() -> String {
-    "0.0.0.0".to_string()
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -597,184 +417,6 @@ mod tests {
         assert!(config.services[0].routes[0].strip);
         assert!(!config.services[0].routes[1].strip); // default false
     }
-
-    #[test]
-    fn address_string_parses_to_vec() {
-        let config: Config = toml::from_str("[upstream]\naddress = \"1.2.3.4\"").unwrap();
-        assert_eq!(config.upstream.address, vec!["1.2.3.4"]);
-    }
-
-    #[test]
-    fn address_array_parses() {
-        let config: Config =
-            toml::from_str("[upstream]\naddress = [\"1.2.3.4\", \"5.6.7.8:5353\"]").unwrap();
-        assert_eq!(config.upstream.address, vec!["1.2.3.4", "5.6.7.8:5353"]);
-    }
-
-    #[test]
-    fn fallback_parses() {
-        let config: Config =
-            toml::from_str("[upstream]\nfallback = [\"8.8.8.8\", \"1.1.1.1\"]").unwrap();
-        assert_eq!(config.upstream.fallback, vec!["8.8.8.8", "1.1.1.1"]);
-    }
-
-    #[test]
-    fn empty_address_gives_empty_vec() {
-        let config: Config = toml::from_str("").unwrap();
-        assert!(config.upstream.address.is_empty());
-        assert!(config.upstream.fallback.is_empty());
-    }
-
-    // ── issue #82: [[forwarding]] config section ────────────────────────
-
-    #[test]
-    fn forwarding_empty_by_default() {
-        let config: Config = toml::from_str("").unwrap();
-        assert!(config.forwarding.is_empty());
-    }
-
-    #[test]
-    fn forwarding_parses_single_rule() {
-        let toml = r#"
-            [[forwarding]]
-            suffix = "home.local"
-            upstream = "100.90.1.63:5361"
-        "#;
-        let config: Config = toml::from_str(toml).unwrap();
-        assert_eq!(config.forwarding.len(), 1);
-        assert_eq!(config.forwarding[0].suffix, &["home.local"]);
-        assert_eq!(config.forwarding[0].upstream, "100.90.1.63:5361");
-    }
-
-    #[test]
-    fn forwarding_parses_reverse_dns_zone() {
-        let toml = r#"
-            [[forwarding]]
-            suffix = "168.192.in-addr.arpa"
-            upstream = "100.90.1.63:5361"
-        "#;
-        let config: Config = toml::from_str(toml).unwrap();
-        assert_eq!(config.forwarding.len(), 1);
-        assert_eq!(config.forwarding[0].suffix, &["168.192.in-addr.arpa"]);
-    }
-
-    #[test]
-    fn forwarding_parses_multiple_rules() {
-        let toml = r#"
-            [[forwarding]]
-            suffix = "168.192.in-addr.arpa"
-            upstream = "100.90.1.63:5361"
-
-            [[forwarding]]
-            suffix = "home.local"
-            upstream = "10.0.0.1"
-        "#;
-        let config: Config = toml::from_str(toml).unwrap();
-        assert_eq!(config.forwarding.len(), 2);
-        assert_eq!(config.forwarding[1].upstream, "10.0.0.1");
-    }
-
-    #[test]
-    fn forwarding_parses_suffix_array() {
-        let toml = r#"
-            [[forwarding]]
-            suffix = ["168.192.in-addr.arpa", "onsite"]
-            upstream = "192.168.88.1"
-        "#;
-        let config: Config = toml::from_str(toml).unwrap();
-        assert_eq!(config.forwarding.len(), 1);
-        assert_eq!(
-            config.forwarding[0].suffix,
-            &["168.192.in-addr.arpa", "onsite"]
-        );
-    }
-
-    #[test]
-    fn forwarding_suffix_array_expands_to_multiple_runtime_rules() {
-        let rule = ForwardingRuleConfig {
-            suffix: vec!["168.192.in-addr.arpa".to_string(), "onsite".to_string()],
-            upstream: "192.168.88.1".to_string(),
-        };
-        let runtime = rule.to_runtime_rules().unwrap();
-        assert_eq!(runtime.len(), 2);
-        assert_eq!(runtime[0].suffix, "168.192.in-addr.arpa");
-        assert_eq!(runtime[1].suffix, "onsite");
-        assert_eq!(runtime[0].upstream, runtime[1].upstream);
-    }
-
-    #[test]
-    fn forwarding_upstream_with_explicit_port() {
-        let rule = ForwardingRuleConfig {
-            suffix: vec!["home.local".to_string()],
-            upstream: "100.90.1.63:5361".to_string(),
-        };
-        let runtime = rule.to_runtime_rules().unwrap();
-        assert_eq!(runtime.len(), 1);
-        assert_eq!(runtime[0].upstream.to_string(), "100.90.1.63:5361");
-        assert_eq!(runtime[0].suffix, "home.local");
-    }
-
-    #[test]
-    fn forwarding_upstream_defaults_to_port_53() {
-        let rule = ForwardingRuleConfig {
-            suffix: vec!["home.local".to_string()],
-            upstream: "100.90.1.63".to_string(),
-        };
-        let runtime = rule.to_runtime_rules().unwrap();
-        assert_eq!(runtime[0].upstream.to_string(), "100.90.1.63:53");
-    }
-
-    #[test]
-    fn forwarding_invalid_upstream_returns_error() {
-        let rule = ForwardingRuleConfig {
-            suffix: vec!["home.local".to_string()],
-            upstream: "not-a-valid-host".to_string(),
-        };
-        assert!(rule.to_runtime_rules().is_err());
-    }
-
-    #[test]
-    fn forwarding_config_rules_take_precedence_over_discovered() {
-        let config_rules = vec![ForwardingRuleConfig {
-            suffix: vec!["home.local".to_string()],
-            upstream: "10.0.0.1:53".to_string(),
-        }];
-        let discovered = vec![crate::system_dns::ForwardingRule::new(
-            "home.local".to_string(),
-            "192.168.1.1:53".parse().unwrap(),
-        )];
-        let merged = merge_forwarding_rules(&config_rules, discovered).unwrap();
-        let picked = crate::system_dns::match_forwarding_rule("host.home.local", &merged)
-            .expect("rule should match");
-        assert_eq!(picked.to_string(), "10.0.0.1:53");
-    }
-
-    #[test]
-    fn forwarding_merge_preserves_non_overlapping_discovered() {
-        let config_rules = vec![ForwardingRuleConfig {
-            suffix: vec!["home.local".to_string()],
-            upstream: "10.0.0.1:53".to_string(),
-        }];
-        let discovered = vec![crate::system_dns::ForwardingRule::new(
-            "corp.example".to_string(),
-            "192.168.1.1:53".parse().unwrap(),
-        )];
-        let merged = merge_forwarding_rules(&config_rules, discovered).unwrap();
-        assert_eq!(merged.len(), 2);
-        let picked = crate::system_dns::match_forwarding_rule("host.corp.example", &merged)
-            .expect("discovered rule should still match");
-        assert_eq!(picked.to_string(), "192.168.1.1:53");
-    }
-
-    #[test]
-    fn forwarding_merge_suffix_array_expands_to_multiple_rules() {
-        let config_rules = vec![ForwardingRuleConfig {
-            suffix: vec!["a.local".to_string(), "b.local".to_string()],
-            upstream: "10.0.0.1:53".to_string(),
-        }];
-        let merged = merge_forwarding_rules(&config_rules, vec![]).unwrap();
-        assert_eq!(merged.len(), 2);
-    }
 }
 
 pub struct ConfigLoad {
@@ -802,13 +444,6 @@ pub fn load_config(path: &str) -> Result<ConfigLoad> {
             let filename = p.file_name().unwrap_or(p.as_os_str());
             v.push(crate::config_dir().join(filename));
             v.push(crate::data_dir().join(filename));
-            // Interactive root and sudo'd users: always consult the XDG path
-            // so `touch ~/.config/numa/numa.toml` works regardless of whether
-            // config_dir() routed to FHS (issue #81).
-            let suggested = crate::suggested_config_path();
-            if !v.contains(&suggested) {
-                v.push(suggested);
-            }
         }
         v
     };
@@ -829,7 +464,11 @@ pub fn load_config(path: &str) -> Result<ConfigLoad> {
         }
     }
 
-    let display_path = crate::suggested_config_path().to_string_lossy().to_string();
+    // Show config_dir candidate as the "expected" path — it's actionable
+    let display_path = candidates
+        .get(1)
+        .map(|p| p.to_string_lossy().to_string())
+        .unwrap_or_else(|| resolve_path(path));
     log::info!("config not found, using defaults (create {})", display_path);
     Ok(ConfigLoad {
         config: Config::default(),

src/ctx.rs

@@ -1,7 +1,7 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::path::PathBuf;
-use std::sync::{Arc, Mutex, RwLock};
+use std::sync::{Mutex, RwLock};
 use std::time::{Duration, Instant, SystemTime};
 
 use arc_swap::ArcSwap;
@@ -16,9 +16,8 @@ use crate::blocklist::BlocklistStore;
 use crate::buffer::BytePacketBuffer;
 use crate::cache::{DnsCache, DnssecStatus};
 use crate::config::{UpstreamMode, ZoneMap};
-use crate::forward::{forward_query_raw, forward_with_failover_raw, Upstream, UpstreamPool};
+use crate::forward::{forward_query, Upstream};
 use crate::header::ResultCode;
-use crate::health::HealthMeta;
 use crate::lan::PeerStore;
 use crate::override_store::OverrideStore;
 use crate::packet::DnsPacket;
@@ -27,7 +26,7 @@ use crate::question::QueryType;
 use crate::record::DnsRecord;
 use crate::service_store::ServiceStore;
 use crate::srtt::SrttCache;
-use crate::stats::{QueryPath, ServerStats, Transport};
+use crate::stats::{QueryPath, ServerStats};
 use crate::system_dns::ForwardingRule;
 
 pub struct ServerCtx {
@@ -35,8 +34,6 @@ pub struct ServerCtx {
     pub zone_map: ZoneMap,
     /// std::sync::RwLock (not tokio) — locks must never be held across .await points.
     pub cache: RwLock<DnsCache>,
-    /// Domains currently being refreshed in the background (dedup guard).
-    pub refreshing: Mutex<HashSet<(String, QueryType)>>,
     pub stats: Mutex<ServerStats>,
     pub overrides: RwLock<OverrideStore>,
     pub blocklist: RwLock<BlocklistStore>,
@@ -44,12 +41,11 @@ pub struct ServerCtx {
     pub services: Mutex<ServiceStore>,
     pub lan_peers: Mutex<PeerStore>,
     pub forwarding_rules: Vec<ForwardingRule>,
-    pub upstream_pool: Mutex<UpstreamPool>,
+    pub upstream: Mutex<Upstream>,
     pub upstream_auto: bool,
     pub upstream_port: u16,
     pub lan_ip: Mutex<std::net::Ipv4Addr>,
     pub timeout: Duration,
-    pub hedge_delay: Duration,
     pub proxy_tld: String,
     pub proxy_tld_suffix: String, // pre-computed ".{tld}" to avoid per-query allocation
     pub lan_enabled: bool,
@@ -64,36 +60,26 @@ pub struct ServerCtx {
     pub inflight: Mutex<InflightMap>,
     pub dnssec_enabled: bool,
     pub dnssec_strict: bool,
-    /// Cached health metadata (version, hostname, DoT config, CA
-    /// fingerprint, features). Shared between the main and mobile
-    /// API `/health` handlers. Built once at startup in `main.rs`.
-    pub health_meta: HealthMeta,
-    /// CA certificate in PEM form, cached at startup. `None` if no
-    /// TLS-using feature is enabled and the CA hasn't been generated.
-    /// Used by `/ca.pem`, `/mobileconfig`, and `/ca.mobileconfig`
-    /// handlers to avoid per-request disk I/O on the hot path.
-    pub ca_pem: Option<String>,
-    pub mobile_enabled: bool,
-    pub mobile_port: u16,
 }
 
-/// Transport-agnostic DNS resolution. Runs the full pipeline (overrides, blocklist,
+pub async fn handle_query(
-/// cache, upstream, DNSSEC) and returns the serialized response in a buffer.
+    mut buffer: BytePacketBuffer,
-/// Callers use `.filled()` to get the response bytes without heap allocation.
-/// Callers are responsible for parsing the incoming buffer into a `DnsPacket`
-/// (and logging parse errors) before calling this function.
-pub async fn resolve_query(
-    query: DnsPacket,
-    raw_wire: &[u8],
     src_addr: SocketAddr,
-    ctx: &Arc<ServerCtx>,
+    ctx: &ServerCtx,
-    transport: Transport,
+) -> crate::Result<()> {
-) -> crate::Result<BytePacketBuffer> {
     let start = Instant::now();
 
+    let query = match DnsPacket::from_buffer(&mut buffer) {
+        Ok(packet) => packet,
+        Err(e) => {
+            warn!("{} | PARSE ERROR | {}", src_addr, e);
+            return Ok(());
+        }
+    };
+
     let (qname, qtype) = match query.questions.first() {
         Some(q) => (q.name.clone(), q.qtype),
-        None => return Err("empty question section".into()),
+        None => return Ok(()),
     };
 
     // Pipeline: overrides -> .tld interception -> blocklist -> local zones -> cache -> upstream
@@ -107,17 +93,18 @@ pub async fn resolve_query(
         } else if qname == "localhost" || qname.ends_with(".localhost") {
             // RFC 6761: .localhost always resolves to loopback
             let mut resp = DnsPacket::response_from(&query, ResultCode::NOERROR);
-            resp.answers.push(sinkhole_record(
+            match qtype {
-                &qname,
+                QueryType::AAAA => resp.answers.push(DnsRecord::AAAA {
-                qtype,
+                    domain: qname.clone(),
-                std::net::Ipv4Addr::LOCALHOST,
+                    addr: std::net::Ipv6Addr::LOCALHOST,
-                std::net::Ipv6Addr::LOCALHOST,
+                    ttl: 300,
-                300,
+                }),
-            ));
+                _ => resp.answers.push(DnsRecord::A {
-            (resp, QueryPath::Local, DnssecStatus::Indeterminate)
+                    domain: qname.clone(),
-        } else if let Some(records) = ctx.zone_map.get(qname.as_str()).and_then(|m| m.get(&qtype)) {
+                    addr: std::net::Ipv4Addr::LOCALHOST,
-            let mut resp = DnsPacket::response_from(&query, ResultCode::NOERROR);
+                    ttl: 300,
-            resp.answers = records.clone();
+                }),
+            }
             (resp, QueryPath::Local, DnssecStatus::Indeterminate)
         } else if is_special_use_domain(&qname) {
             // RFC 6761/8880: private PTR, DDR, NAT64 — answer locally
@@ -126,17 +113,12 @@ pub async fn resolve_query(
         } else if !ctx.proxy_tld_suffix.is_empty()
             && (qname.ends_with(&ctx.proxy_tld_suffix) || qname == ctx.proxy_tld)
         {
-            // Resolve .numa: remote clients get LAN IP (can't reach 127.0.0.1), local get loopback
+            // Resolve .numa: local services → 127.0.0.1, LAN peers → peer IP
             let service_name = qname.strip_suffix(&ctx.proxy_tld_suffix).unwrap_or(&qname);
-            let is_remote = !src_addr.ip().is_loopback();
             let resolve_ip = {
                 let local = ctx.services.lock().unwrap();
                 if local.lookup(service_name).is_some() {
-                    if is_remote {
+                    std::net::Ipv4Addr::LOCALHOST
-                        *ctx.lan_ip.lock().unwrap()
-                    } else {
-                        std::net::Ipv4Addr::LOCALHOST
-                    }
                 } else {
                     let mut peers = ctx.lan_peers.lock().unwrap();
                     peers
@@ -148,65 +130,52 @@ pub async fn resolve_query(
                         .unwrap_or(std::net::Ipv4Addr::LOCALHOST)
                 }
             };
-            let v6 = if resolve_ip == std::net::Ipv4Addr::LOCALHOST {
-                std::net::Ipv6Addr::LOCALHOST
-            } else {
-                resolve_ip.to_ipv6_mapped()
-            };
             let mut resp = DnsPacket::response_from(&query, ResultCode::NOERROR);
-            resp.answers
+            match qtype {
-                .push(sinkhole_record(&qname, qtype, resolve_ip, v6, 300));
+                QueryType::AAAA => resp.answers.push(DnsRecord::AAAA {
+                    domain: qname.clone(),
+                    addr: if resolve_ip == std::net::Ipv4Addr::LOCALHOST {
+                        std::net::Ipv6Addr::LOCALHOST
+                    } else {
+                        resolve_ip.to_ipv6_mapped()
+                    },
+                    ttl: 300,
+                }),
+                _ => resp.answers.push(DnsRecord::A {
+                    domain: qname.clone(),
+                    addr: resolve_ip,
+                    ttl: 300,
+                }),
+            }
             (resp, QueryPath::Local, DnssecStatus::Indeterminate)
         } else if ctx.blocklist.read().unwrap().is_blocked(&qname) {
             let mut resp = DnsPacket::response_from(&query, ResultCode::NOERROR);
-            resp.answers.push(sinkhole_record(
+            match qtype {
-                &qname,
+                QueryType::AAAA => resp.answers.push(DnsRecord::AAAA {
-                qtype,
+                    domain: qname.clone(),
-                std::net::Ipv4Addr::UNSPECIFIED,
+                    addr: std::net::Ipv6Addr::UNSPECIFIED,
-                std::net::Ipv6Addr::UNSPECIFIED,
+                    ttl: 60,
-                60,
+                }),
-            ));
+                _ => resp.answers.push(DnsRecord::A {
+                    domain: qname.clone(),
+                    addr: std::net::Ipv4Addr::UNSPECIFIED,
+                    ttl: 60,
+                }),
+            }
             (resp, QueryPath::Blocked, DnssecStatus::Indeterminate)
+        } else if let Some(records) = ctx.zone_map.get(qname.as_str()).and_then(|m| m.get(&qtype)) {
+            let mut resp = DnsPacket::response_from(&query, ResultCode::NOERROR);
+            resp.answers = records.clone();
+            (resp, QueryPath::Local, DnssecStatus::Indeterminate)
         } else {
             let cached = ctx.cache.read().unwrap().lookup_with_status(&qname, qtype);
-            if let Some((cached, cached_dnssec, freshness)) = cached {
+            if let Some((cached, cached_dnssec)) = cached {
-                if freshness.needs_refresh() {
-                    let key = (qname.clone(), qtype);
-                    let already = !ctx.refreshing.lock().unwrap().insert(key.clone());
-                    if !already {
-                        let ctx = Arc::clone(ctx);
-                        tokio::spawn(async move {
-                            refresh_entry(&ctx, &key.0, key.1).await;
-                            ctx.refreshing.lock().unwrap().remove(&key);
-                        });
-                    }
-                }
                 let mut resp = cached;
                 resp.header.id = query.header.id;
                 if cached_dnssec == DnssecStatus::Secure {
                     resp.header.authed_data = true;
                 }
                 (resp, QueryPath::Cached, cached_dnssec)
-            } else if let Some(fwd_addr) =
-                crate::system_dns::match_forwarding_rule(&qname, &ctx.forwarding_rules)
-            {
-                // Conditional forwarding takes priority over recursive mode
-                // (e.g. Tailscale .ts.net, VPC private zones)
-                let upstream = Upstream::Udp(fwd_addr);
-                match forward_and_cache(raw_wire, &upstream, ctx, &qname, qtype).await {
-                    Ok(resp) => (resp, QueryPath::Forwarded, DnssecStatus::Indeterminate),
-                    Err(e) => {
-                        error!(
-                            "{} | {:?} {} | FORWARD ERROR | {}",
-                            src_addr, qtype, qname, e
-                        );
-                        (
-                            DnsPacket::response_from(&query, ResultCode::SERVFAIL),
-                            QueryPath::UpstreamError,
-                            DnssecStatus::Indeterminate,
-                        )
-                    }
-                }
             } else if ctx.upstream_mode == UpstreamMode::Recursive {
                 let key = (qname.clone(), qtype);
                 let (resp, path, err) = resolve_coalesced(&ctx.inflight, key, &query, || {
@@ -233,27 +202,16 @@ pub async fn resolve_query(
                 }
                 (resp, path, DnssecStatus::Indeterminate)
             } else {
-                let pool = ctx.upstream_pool.lock().unwrap().clone();
+                let upstream =
-                match forward_with_failover_raw(
+                    match crate::system_dns::match_forwarding_rule(&qname, &ctx.forwarding_rules) {
-                    raw_wire,
+                        Some(addr) => Upstream::Udp(addr),
-                    &pool,
+                        None => ctx.upstream.lock().unwrap().clone(),
-                    &ctx.srtt,
+                    };
-                    ctx.timeout,
+                match forward_query(&query, &upstream, ctx.timeout).await {
-                    ctx.hedge_delay,
+                    Ok(resp) => {
-                )
+                        ctx.cache.write().unwrap().insert(&qname, qtype, &resp);
-                .await
+                        (resp, QueryPath::Forwarded, DnssecStatus::Indeterminate)
-                {
+                    }
-                    Ok(resp_wire) => match cache_and_parse(ctx, &qname, qtype, &resp_wire) {
-                        Ok(resp) => (resp, QueryPath::Forwarded, DnssecStatus::Indeterminate),
-                        Err(e) => {
-                            error!("{} | {:?} {} | PARSE ERROR | {}", src_addr, qtype, qname, e);
-                            (
-                                DnsPacket::response_from(&query, ResultCode::SERVFAIL),
-                                QueryPath::UpstreamError,
-                                DnssecStatus::Indeterminate,
-                            )
-                        }
-                    },
                     Err(e) => {
                         error!(
                             "{} | {:?} {} | UPSTREAM ERROR | {}",
@@ -339,23 +297,23 @@ pub async fn resolve_query(
         response.resources.len(),
     );
 
-    // Serialize response
-    // TODO: TC bit is UDP-specific; DoT connections could carry up to 65535 bytes.
-    // Once BytePacketBuffer supports larger buffers, skip truncation for TCP/TLS.
     let mut resp_buffer = BytePacketBuffer::new();
     if response.write(&mut resp_buffer).is_err() {
-        // Response too large — set TC bit and send header + question only
+        // Response too large for UDP — set TC bit and send header + question only
         debug!("response too large, setting TC bit for {}", qname);
         let mut tc_response = DnsPacket::response_from(&query, response.header.rescode);
         tc_response.header.truncated_message = true;
-        resp_buffer = BytePacketBuffer::new();
+        let mut tc_buffer = BytePacketBuffer::new();
-        tc_response.write(&mut resp_buffer)?;
+        tc_response.write(&mut tc_buffer)?;
+        ctx.socket.send_to(tc_buffer.filled(), src_addr).await?;
+    } else {
+        ctx.socket.send_to(resp_buffer.filled(), src_addr).await?;
     }
 
     // Record stats and query log
     {
         let mut s = ctx.stats.lock().unwrap();
-        let total = s.record(path, transport);
+        let total = s.record(path);
         if total.is_multiple_of(1000) {
             s.log_summary();
         }
@@ -367,103 +325,11 @@ pub async fn resolve_query(
         domain: qname,
         query_type: qtype,
         path,
-        transport,
         rescode: response.header.rescode,
         latency_us: elapsed.as_micros() as u64,
         dnssec,
     });
 
-    Ok(resp_buffer)
-}
-
-fn cache_and_parse(
-    ctx: &ServerCtx,
-    qname: &str,
-    qtype: QueryType,
-    resp_wire: &[u8],
-) -> crate::Result<DnsPacket> {
-    ctx.cache
-        .write()
-        .unwrap()
-        .insert_wire(qname, qtype, resp_wire, DnssecStatus::Indeterminate);
-    let mut buf = BytePacketBuffer::from_bytes(resp_wire);
-    DnsPacket::from_buffer(&mut buf)
-}
-
-/// Re-resolve a single (domain, qtype) and update the cache.
-/// Used for both stale-entry refresh and proactive cache warming.
-pub async fn refresh_entry(ctx: &ServerCtx, qname: &str, qtype: QueryType) {
-    let query = DnsPacket::query(0, qname, qtype);
-    if ctx.upstream_mode == UpstreamMode::Recursive {
-        if let Ok(resp) = crate::recursive::resolve_recursive(
-            qname,
-            qtype,
-            &ctx.cache,
-            &query,
-            &ctx.root_hints,
-            &ctx.srtt,
-        )
-        .await
-        {
-            ctx.cache.write().unwrap().insert(qname, qtype, &resp);
-        }
-    } else {
-        let mut buf = BytePacketBuffer::new();
-        if query.write(&mut buf).is_ok() {
-            let pool = ctx.upstream_pool.lock().unwrap().clone();
-            if let Ok(wire) = forward_with_failover_raw(
-                buf.filled(),
-                &pool,
-                &ctx.srtt,
-                ctx.timeout,
-                ctx.hedge_delay,
-            )
-            .await
-            {
-                ctx.cache.write().unwrap().insert_wire(
-                    qname,
-                    qtype,
-                    &wire,
-                    DnssecStatus::Indeterminate,
-                );
-            }
-        }
-    }
-}
-
-async fn forward_and_cache(
-    wire: &[u8],
-    upstream: &Upstream,
-    ctx: &ServerCtx,
-    qname: &str,
-    qtype: QueryType,
-) -> crate::Result<DnsPacket> {
-    let resp_wire = forward_query_raw(wire, upstream, ctx.timeout).await?;
-    cache_and_parse(ctx, qname, qtype, &resp_wire)
-}
-
-pub async fn handle_query(
-    mut buffer: BytePacketBuffer,
-    raw_len: usize,
-    src_addr: SocketAddr,
-    ctx: &Arc<ServerCtx>,
-    transport: Transport,
-) -> crate::Result<()> {
-    let query = match DnsPacket::from_buffer(&mut buffer) {
-        Ok(packet) => packet,
-        Err(e) => {
-            warn!("{} | PARSE ERROR | {}", src_addr, e);
-            return Ok(());
-        }
-    };
-    match resolve_query(query, &buffer.buf[..raw_len], src_addr, ctx, transport).await {
-        Ok(resp_buffer) => {
-            ctx.socket.send_to(resp_buffer.filled(), src_addr).await?;
-        }
-        Err(e) => {
-            warn!("{} | RESOLVE ERROR | {}", src_addr, e);
-        }
-    }
     Ok(())
 }
 
@@ -517,27 +383,6 @@ fn is_special_use_domain(qname: &str) -> bool {
     qname == "local" || qname.ends_with(".local")
 }
 
-fn sinkhole_record(
-    domain: &str,
-    qtype: QueryType,
-    v4: std::net::Ipv4Addr,
-    v6: std::net::Ipv6Addr,
-    ttl: u32,
-) -> DnsRecord {
-    match qtype {
-        QueryType::AAAA => DnsRecord::AAAA {
-            domain: domain.to_string(),
-            addr: v6,
-            ttl,
-        },
-        _ => DnsRecord::A {
-            domain: domain.to_string(),
-            addr: v4,
-            ttl,
-        },
-    }
-}
-
 enum Disposition {
     Leader(broadcast::Sender<Option<DnsPacket>>),
     Follower(broadcast::Receiver<Option<DnsPacket>>),
@@ -830,6 +675,15 @@ mod tests {
 
     // ---- Integration: resolve_coalesced with mock futures ----
 
+    fn mock_query(id: u16, domain: &str, qtype: QueryType) -> DnsPacket {
+        let mut pkt = DnsPacket::new();
+        pkt.header.id = id;
+        pkt.header.recursion_desired = true;
+        pkt.questions
+            .push(crate::question::DnsQuestion::new(domain.to_string(), qtype));
+        pkt
+    }
+
     fn mock_response(domain: &str) -> DnsPacket {
         let mut resp = DnsPacket::new();
         resp.header.response = true;
@@ -852,7 +706,7 @@ mod tests {
             let count = resolve_count.clone();
             let inf = inflight.clone();
             let key = ("coalesce.test".to_string(), QueryType::A);
-            let query = DnsPacket::query(100 + i, "coalesce.test", QueryType::A);
+            let query = mock_query(100 + i, "coalesce.test", QueryType::A);
             handles.push(tokio::spawn(async move {
                 resolve_coalesced(&inf, key, &query, || async {
                     count.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
@@ -890,8 +744,8 @@ mod tests {
         let count1 = resolve_count.clone();
         let count2 = resolve_count.clone();
 
-        let query_a = DnsPacket::query(200, "same.domain", QueryType::A);
+        let query_a = mock_query(200, "same.domain", QueryType::A);
-        let query_aaaa = DnsPacket::query(201, "same.domain", QueryType::AAAA);
+        let query_aaaa = mock_query(201, "same.domain", QueryType::AAAA);
 
         let h1 = tokio::spawn(async move {
             resolve_coalesced(
@@ -934,7 +788,7 @@ mod tests {
     #[tokio::test]
     async fn inflight_map_cleaned_after_error() {
         let inflight: Mutex<InflightMap> = Mutex::new(HashMap::new());
-        let query = DnsPacket::query(300, "will-fail.test", QueryType::A);
+        let query = mock_query(300, "will-fail.test", QueryType::A);
 
         let (_, path, _) = resolve_coalesced(
             &inflight,
@@ -955,7 +809,7 @@ mod tests {
         let mut handles = Vec::new();
         for i in 0..3u16 {
             let inf = inflight.clone();
-            let query = DnsPacket::query(400 + i, "fail.test", QueryType::A);
+            let query = mock_query(400 + i, "fail.test", QueryType::A);
             handles.push(tokio::spawn(async move {
                 resolve_coalesced(
                     &inf,
@@ -995,7 +849,7 @@ mod tests {
     #[tokio::test]
     async fn servfail_leader_includes_question_section() {
         let inflight: Mutex<InflightMap> = Mutex::new(HashMap::new());
-        let query = DnsPacket::query(500, "question.test", QueryType::A);
+        let query = mock_query(500, "question.test", QueryType::A);
 
         let (resp, _, _) = resolve_coalesced(
             &inflight,
@@ -1019,7 +873,7 @@ mod tests {
     #[tokio::test]
     async fn leader_error_preserves_message() {
         let inflight: Mutex<InflightMap> = Mutex::new(HashMap::new());
-        let query = DnsPacket::query(700, "err-msg.test", QueryType::A);
+        let query = mock_query(700, "err-msg.test", QueryType::A);
 
         let (_, path, err) = resolve_coalesced(
             &inflight,

src/dnssec.rs

@@ -5,7 +5,6 @@ use log::{debug, trace};
 use ring::digest;
 use ring::signature;
 
-use crate::buffer::BytePacketBuffer;
 use crate::cache::{DnsCache, DnssecStatus};
 use crate::packet::DnsPacket;
 use crate::question::QueryType;
@@ -721,29 +720,22 @@ pub fn verify_ds(ds: &DnsRecord, dnskey: &DnsRecord, owner: &str) -> bool {
 
 // -- Canonical wire format --
 
-/// Encode a DNS name in canonical wire form per RFC 4034 §6.2:
-/// uncompressed, with ASCII letters lowercased.
-///
-/// Lowercasing happens *after* escape resolution because `\065` yields
-/// `'A'`, which canonical form must convert to `'a'`.
 pub fn name_to_wire(name: &str) -> Vec<u8> {
-    let mut buf = BytePacketBuffer::new();
+    let mut wire = Vec::with_capacity(name.len() + 2);
-    buf.write_qname(name)
+    if name == "." || name.is_empty() {
-        .expect("name_to_wire: input must parse as a valid DNS name");
+        wire.push(0);
-    let mut wire = buf.filled().to_vec();
+        return wire;
-
-    let mut i = 0;
-    while i < wire.len() {
-        let label_len = wire[i] as usize;
-        if label_len == 0 {
-            break;
-        }
-        i += 1;
-        let end = i + label_len;
-        wire[i..end].make_ascii_lowercase();
-        i = end;
     }
-
+    for label in name.split('.') {
+        if label.is_empty() {
+            continue;
+        }
+        wire.push(label.len() as u8);
+        for &b in label.as_bytes() {
+            wire.push(b.to_ascii_lowercase());
+        }
+    }
+    wire.push(0);
     wire
 }
 
@@ -1483,23 +1475,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn name_to_wire_escaped_dot_in_label_is_not_a_separator() {
-        // `exa\.mple.com` is two labels: `exa.mple` (8 bytes including the 0x2E) and `com`.
-        let wire = name_to_wire("exa\\.mple.com");
-        assert_eq!(
-            wire,
-            vec![8, b'e', b'x', b'a', b'.', b'm', b'p', b'l', b'e', 3, b'c', b'o', b'm', 0]
-        );
-    }
-
-    #[test]
-    fn name_to_wire_decimal_escape_is_lowercased() {
-        // \065 = 'A', must become 'a' in canonical form.
-        let wire = name_to_wire("\\065bc.com");
-        assert_eq!(wire, vec![3, b'a', b'b', b'c', 3, b'c', b'o', b'm', 0]);
-    }
-
     #[test]
     fn parent_zone_cases() {
         assert_eq!(parent_zone("example.com"), "com");

src/doh.rs

@@ -1,224 +0,0 @@
-use std::net::SocketAddr;
-
-use axum::body::Bytes;
-use axum::extract::{Request, State};
-use axum::response::{IntoResponse, Response};
-use hyper::StatusCode;
-use log::warn;
-
-use crate::buffer::BytePacketBuffer;
-use crate::ctx::{resolve_query, ServerCtx};
-use crate::header::ResultCode;
-use crate::packet::DnsPacket;
-use crate::stats::Transport;
-
-const MAX_DNS_MSG: usize = 4096;
-const DOH_CONTENT_TYPE: &str = "application/dns-message";
-
-pub async fn doh_post(State(state): State<super::proxy::DohState>, req: Request) -> Response {
-    let host = super::proxy::extract_host(&req);
-    if !is_doh_host(host.as_deref(), &state.ctx.proxy_tld) {
-        return StatusCode::NOT_FOUND.into_response();
-    }
-
-    let content_type = req
-        .headers()
-        .get(hyper::header::CONTENT_TYPE)
-        .and_then(|v| v.to_str().ok())
-        .unwrap_or("");
-    if !content_type.starts_with(DOH_CONTENT_TYPE) {
-        return StatusCode::UNSUPPORTED_MEDIA_TYPE.into_response();
-    }
-
-    let body = match axum::body::to_bytes(req.into_body(), MAX_DNS_MSG).await {
-        Ok(b) => b,
-        Err(_) => {
-            return (StatusCode::PAYLOAD_TOO_LARGE, "body exceeds 4096 bytes").into_response()
-        }
-    };
-
-    if body.is_empty() {
-        return (StatusCode::BAD_REQUEST, "empty body").into_response();
-    }
-
-    let src = state
-        .remote_addr
-        .unwrap_or_else(|| SocketAddr::from(([127, 0, 0, 1], 0)));
-
-    resolve_doh(&body, src, &state.ctx).await
-}
-
-fn is_doh_host(host: Option<&str>, tld: &str) -> bool {
-    let h = match host {
-        Some(h) => h,
-        None => return false,
-    };
-    let base = strip_port(h).unwrap_or(h);
-    is_loopback_host(base) || is_tld_match(base, tld)
-}
-
-fn strip_port(h: &str) -> Option<&str> {
-    if h.starts_with('[') {
-        // [::1]:443 → [::1]
-        let (base, port) = h.rsplit_once("]:")?;
-        port.bytes()
-            .all(|b| b.is_ascii_digit())
-            .then(|| &h[..base.len() + 1])
-    } else {
-        let (base, port) = h.rsplit_once(':')?;
-        // Bare IPv6 like "::1" has multiple colons — not a port suffix
-        if base.contains(':') {
-            return None;
-        }
-        port.bytes().all(|b| b.is_ascii_digit()).then_some(base)
-    }
-}
-
-fn is_loopback_host(h: &str) -> bool {
-    matches!(h, "127.0.0.1" | "::1" | "[::1]" | "localhost")
-}
-
-fn is_tld_match(h: &str, tld: &str) -> bool {
-    h == tld
-        || (h.len() == 2 * tld.len() + 1
-            && h.starts_with(tld)
-            && h.as_bytes().get(tld.len()) == Some(&b'.')
-            && h.ends_with(tld))
-}
-
-async fn resolve_doh(
-    dns_bytes: &[u8],
-    src: SocketAddr,
-    ctx: &std::sync::Arc<ServerCtx>,
-) -> Response {
-    let mut buffer = BytePacketBuffer::from_bytes(dns_bytes);
-    let query = match DnsPacket::from_buffer(&mut buffer) {
-        Ok(q) => q,
-        Err(e) => {
-            warn!("DoH: parse error from {}: {}", src, e);
-            let query_id = u16::from_be_bytes([
-                dns_bytes.first().copied().unwrap_or(0),
-                dns_bytes.get(1).copied().unwrap_or(0),
-            ]);
-            let mut resp = DnsPacket::new();
-            resp.header.id = query_id;
-            resp.header.response = true;
-            resp.header.rescode = ResultCode::FORMERR;
-            return serialize_response(&resp);
-        }
-    };
-
-    let query_id = query.header.id;
-    let query_rd = query.header.recursion_desired;
-    let questions = query.questions.clone();
-
-    match resolve_query(query, dns_bytes, src, ctx, Transport::Doh).await {
-        Ok(resp_buffer) => {
-            let min_ttl = extract_min_ttl(resp_buffer.filled());
-            dns_response(resp_buffer.filled(), min_ttl)
-        }
-        Err(e) => {
-            warn!("DoH: resolve error for {}: {}", src, e);
-            let mut resp = DnsPacket::new();
-            resp.header.id = query_id;
-            resp.header.response = true;
-            resp.header.recursion_desired = query_rd;
-            resp.header.recursion_available = true;
-            resp.header.rescode = ResultCode::SERVFAIL;
-            resp.questions = questions;
-            serialize_response(&resp)
-        }
-    }
-}
-
-fn extract_min_ttl(wire: &[u8]) -> u32 {
-    crate::wire::scan_ttl_offsets(wire)
-        .ok()
-        .and_then(|meta| crate::wire::min_ttl_from_wire(wire, &meta))
-        .unwrap_or(0)
-}
-
-fn dns_response(wire: &[u8], min_ttl: u32) -> Response {
-    (
-        StatusCode::OK,
-        [
-            (hyper::header::CONTENT_TYPE, DOH_CONTENT_TYPE),
-            (
-                hyper::header::CACHE_CONTROL,
-                &format!("max-age={}", min_ttl),
-            ),
-        ],
-        Bytes::copy_from_slice(wire),
-    )
-        .into_response()
-}
-
-fn serialize_response(pkt: &DnsPacket) -> Response {
-    let mut buf = BytePacketBuffer::new();
-    match pkt.write(&mut buf) {
-        Ok(_) => dns_response(buf.filled(), 0),
-        Err(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::buffer::BytePacketBuffer;
-    use crate::header::ResultCode;
-    use crate::packet::DnsPacket;
-    use crate::record::DnsRecord;
-
-    #[test]
-    fn is_doh_host_matches_tld() {
-        assert!(is_doh_host(Some("numa"), "numa"));
-        assert!(is_doh_host(Some("numa.numa"), "numa"));
-        assert!(is_doh_host(Some("127.0.0.1"), "numa"));
-        assert!(is_doh_host(Some("127.0.0.1:443"), "numa"));
-        assert!(is_doh_host(Some("::1"), "numa"));
-        assert!(is_doh_host(Some("[::1]"), "numa"));
-        assert!(is_doh_host(Some("[::1]:443"), "numa"));
-        assert!(is_doh_host(Some("localhost"), "numa"));
-        assert!(is_doh_host(Some("localhost:443"), "numa"));
-        assert!(!is_doh_host(Some("foo.numa"), "numa"));
-        assert!(!is_doh_host(None, "numa"));
-    }
-
-    #[test]
-    fn extract_min_ttl_from_response() {
-        let mut pkt = DnsPacket::new();
-        pkt.header.response = true;
-        pkt.answers.push(DnsRecord::A {
-            domain: "example.com".to_string(),
-            addr: std::net::Ipv4Addr::new(1, 2, 3, 4),
-            ttl: 300,
-        });
-        pkt.answers.push(DnsRecord::A {
-            domain: "example.com".to_string(),
-            addr: std::net::Ipv4Addr::new(5, 6, 7, 8),
-            ttl: 60,
-        });
-        let mut buf = BytePacketBuffer::new();
-        pkt.write(&mut buf).unwrap();
-        assert_eq!(extract_min_ttl(buf.filled()), 60);
-    }
-
-    #[test]
-    fn extract_min_ttl_no_answers() {
-        let mut pkt = DnsPacket::new();
-        pkt.header.response = true;
-        let mut buf = BytePacketBuffer::new();
-        pkt.write(&mut buf).unwrap();
-        assert_eq!(extract_min_ttl(buf.filled()), 0);
-    }
-
-    #[test]
-    fn serialize_formerr_response() {
-        let mut pkt = DnsPacket::new();
-        pkt.header.id = 0xABCD;
-        pkt.header.response = true;
-        pkt.header.rescode = ResultCode::FORMERR;
-        let resp = serialize_response(&pkt);
-        assert_eq!(resp.status(), StatusCode::OK);
-    }
-}

src/dot.rs

@@ -1,561 +0,0 @@
-use std::net::{IpAddr, SocketAddr};
-use std::path::Path;
-use std::sync::Arc;
-use std::time::Duration;
-
-use log::{debug, error, info, warn};
-use rustls::ServerConfig;
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use tokio::net::TcpListener;
-use tokio::sync::Semaphore;
-use tokio_rustls::TlsAcceptor;
-
-use crate::buffer::BytePacketBuffer;
-use crate::config::DotConfig;
-use crate::ctx::{resolve_query, ServerCtx};
-use crate::header::ResultCode;
-use crate::packet::DnsPacket;
-use crate::stats::Transport;
-
-const MAX_CONNECTIONS: usize = 512;
-const IDLE_TIMEOUT: Duration = Duration::from_secs(30);
-const HANDSHAKE_TIMEOUT: Duration = Duration::from_secs(10);
-const WRITE_TIMEOUT: Duration = Duration::from_secs(10);
-// Matches BytePacketBuffer::BUF_SIZE — RFC 7858 allows up to 65535 but our
-// buffer would silently truncate anything larger.
-const MAX_MSG_LEN: usize = 4096;
-
-fn dot_alpn() -> Vec<Vec<u8>> {
-    vec![b"dot".to_vec()]
-}
-
-/// Build a TLS ServerConfig for DoT from user-provided cert/key PEM files.
-fn load_tls_config(cert_path: &Path, key_path: &Path) -> crate::Result<Arc<ServerConfig>> {
-    // rustls needs a CryptoProvider installed before ServerConfig::builder().
-    // The proxy's build_tls_config also does this; we repeat it here because
-    // running DoT with user-provided certs while the proxy is disabled would
-    // otherwise panic on first handshake (no default provider).
-    let _ = rustls::crypto::ring::default_provider().install_default();
-
-    let cert_pem = std::fs::read(cert_path)?;
-    let key_pem = std::fs::read(key_path)?;
-
-    let certs: Vec<_> = rustls_pemfile::certs(&mut &cert_pem[..]).collect::<Result<_, _>>()?;
-    let key = rustls_pemfile::private_key(&mut &key_pem[..])?
-        .ok_or("no private key found in key file")?;
-
-    let mut config = ServerConfig::builder()
-        .with_no_client_auth()
-        .with_single_cert(certs, key)?;
-    config.alpn_protocols = dot_alpn();
-
-    Ok(Arc::new(config))
-}
-
-/// Build a self-signed DoT TLS config. Can't reuse `ctx.tls_config` (the
-/// proxy's shared config) because DoT needs its own ALPN advertisement.
-///
-/// Pass `proxy_tld` itself as a service name so the cert gets an explicit
-/// `{tld}.{tld}` SAN (e.g. "numa.numa") matching the ServerName that
-/// setup-phone's mobileconfig sends as SNI. The `*.{tld}` wildcard alone
-/// is rejected by strict TLS clients under single-label TLDs (per the
-/// note in tls.rs::generate_service_cert).
-fn self_signed_tls(ctx: &ServerCtx) -> Option<Arc<ServerConfig>> {
-    let service_names = [ctx.proxy_tld.clone()];
-    match crate::tls::build_tls_config(&ctx.proxy_tld, &service_names, dot_alpn(), &ctx.data_dir) {
-        Ok(cfg) => Some(cfg),
-        Err(e) => {
-            warn!(
-                "DoT: failed to generate self-signed TLS: {} — DoT disabled",
-                e
-            );
-            None
-        }
-    }
-}
-
-/// Start the DNS-over-TLS listener (RFC 7858).
-pub async fn start_dot(ctx: Arc<ServerCtx>, config: &DotConfig) {
-    let tls_config = match (&config.cert_path, &config.key_path) {
-        (Some(cert), Some(key)) => match load_tls_config(cert, key) {
-            Ok(cfg) => cfg,
-            Err(e) => {
-                warn!("DoT: failed to load TLS cert/key: {} — DoT disabled", e);
-                return;
-            }
-        },
-        _ => match self_signed_tls(&ctx) {
-            Some(cfg) => cfg,
-            None => return,
-        },
-    };
-
-    let bind_addr: IpAddr = config
-        .bind_addr
-        .parse()
-        .unwrap_or(IpAddr::V4(std::net::Ipv4Addr::UNSPECIFIED));
-    let addr = SocketAddr::new(bind_addr, config.port);
-    let listener = match TcpListener::bind(addr).await {
-        Ok(l) => l,
-        Err(e) => {
-            warn!("DoT: could not bind {} ({}) — DoT disabled", addr, e);
-            return;
-        }
-    };
-    info!("DoT listening on {}", addr);
-
-    accept_loop(listener, TlsAcceptor::from(tls_config), ctx).await;
-}
-
-async fn accept_loop(listener: TcpListener, acceptor: TlsAcceptor, ctx: Arc<ServerCtx>) {
-    let semaphore = Arc::new(Semaphore::new(MAX_CONNECTIONS));
-
-    loop {
-        let (tcp_stream, remote_addr) = match listener.accept().await {
-            Ok(conn) => conn,
-            Err(e) => {
-                error!("DoT: TCP accept error: {}", e);
-                // Back off to avoid tight-looping on persistent failures (e.g. fd exhaustion).
-                tokio::time::sleep(Duration::from_millis(100)).await;
-                continue;
-            }
-        };
-
-        let permit = match semaphore.clone().try_acquire_owned() {
-            Ok(p) => p,
-            Err(_) => {
-                debug!("DoT: connection limit reached, rejecting {}", remote_addr);
-                continue;
-            }
-        };
-        let acceptor = acceptor.clone();
-        let ctx = Arc::clone(&ctx);
-
-        tokio::spawn(async move {
-            let _permit = permit; // held until task exits
-
-            let tls_stream =
-                match tokio::time::timeout(HANDSHAKE_TIMEOUT, acceptor.accept(tcp_stream)).await {
-                    Ok(Ok(s)) => s,
-                    Ok(Err(e)) => {
-                        debug!("DoT: TLS handshake failed from {}: {}", remote_addr, e);
-                        return;
-                    }
-                    Err(_) => {
-                        debug!("DoT: TLS handshake timeout from {}", remote_addr);
-                        return;
-                    }
-                };
-
-            handle_dot_connection(tls_stream, remote_addr, &ctx).await;
-        });
-    }
-}
-
-/// Handle a single persistent DoT connection (RFC 7858).
-/// Reads length-prefixed DNS queries until EOF, idle timeout, or error.
-async fn handle_dot_connection<S>(
-    mut stream: S,
-    remote_addr: SocketAddr,
-    ctx: &std::sync::Arc<ServerCtx>,
-) where
-    S: AsyncReadExt + AsyncWriteExt + Unpin,
-{
-    loop {
-        // Read 2-byte length prefix (RFC 1035 §4.2.2) with idle timeout
-        let mut len_buf = [0u8; 2];
-        let Ok(Ok(_)) = tokio::time::timeout(IDLE_TIMEOUT, stream.read_exact(&mut len_buf)).await
-        else {
-            break;
-        };
-        let msg_len = u16::from_be_bytes(len_buf) as usize;
-        if msg_len > MAX_MSG_LEN {
-            debug!("DoT: oversized message {} from {}", msg_len, remote_addr);
-            break;
-        }
-
-        let mut buffer = BytePacketBuffer::new();
-        let Ok(Ok(_)) =
-            tokio::time::timeout(IDLE_TIMEOUT, stream.read_exact(&mut buffer.buf[..msg_len])).await
-        else {
-            break;
-        };
-
-        let query = match DnsPacket::from_buffer(&mut buffer) {
-            Ok(q) => q,
-            Err(e) => {
-                warn!("{} | PARSE ERROR | {}", remote_addr, e);
-                // BytePacketBuffer is zero-initialized, so buf[0..2] reads as 0x0000
-                // for sub-2-byte messages — harmless FORMERR with id=0.
-                let query_id = u16::from_be_bytes([buffer.buf[0], buffer.buf[1]]);
-                let mut resp = DnsPacket::new();
-                resp.header.id = query_id;
-                resp.header.response = true;
-                resp.header.rescode = ResultCode::FORMERR;
-                if send_response(&mut stream, &resp, remote_addr)
-                    .await
-                    .is_err()
-                {
-                    break;
-                }
-                continue;
-            }
-        };
-
-        match resolve_query(
-            query.clone(),
-            &buffer.buf[..msg_len],
-            remote_addr,
-            ctx,
-            Transport::Dot,
-        )
-        .await
-        {
-            Ok(resp_buffer) => {
-                if write_framed(&mut stream, resp_buffer.filled())
-                    .await
-                    .is_err()
-                {
-                    break;
-                }
-            }
-            Err(e) => {
-                warn!("{} | RESOLVE ERROR | {}", remote_addr, e);
-                // SERVFAIL that echoes the original question section.
-                let resp = DnsPacket::response_from(&query, ResultCode::SERVFAIL);
-                if send_response(&mut stream, &resp, remote_addr)
-                    .await
-                    .is_err()
-                {
-                    break;
-                }
-            }
-        }
-    }
-}
-
-/// Serialize a DNS response and send it framed. Logs serialization failures
-/// and returns Err so the caller can tear down the connection.
-async fn send_response<S>(
-    stream: &mut S,
-    resp: &DnsPacket,
-    remote_addr: SocketAddr,
-) -> std::io::Result<()>
-where
-    S: AsyncWriteExt + Unpin,
-{
-    let mut out_buf = BytePacketBuffer::new();
-    if resp.write(&mut out_buf).is_err() {
-        debug!(
-            "DoT: failed to serialize {:?} response for {}",
-            resp.header.rescode, remote_addr
-        );
-        return Err(std::io::Error::other("serialize failed"));
-    }
-    write_framed(stream, out_buf.filled()).await
-}
-
-/// Write a DNS message with its 2-byte length prefix, coalesced into one syscall.
-/// Bounded by WRITE_TIMEOUT so a stalled reader can't indefinitely hold a worker.
-async fn write_framed<S>(stream: &mut S, msg: &[u8]) -> std::io::Result<()>
-where
-    S: AsyncWriteExt + Unpin,
-{
-    let mut out = Vec::with_capacity(2 + msg.len());
-    out.extend_from_slice(&(msg.len() as u16).to_be_bytes());
-    out.extend_from_slice(msg);
-    match tokio::time::timeout(WRITE_TIMEOUT, async {
-        stream.write_all(&out).await?;
-        stream.flush().await
-    })
-    .await
-    {
-        Ok(result) => result,
-        Err(_) => Err(std::io::Error::other("write timeout")),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::HashMap;
-    use std::sync::{Mutex, RwLock};
-
-    use rcgen::{CertificateParams, DnType, KeyPair};
-    use rustls::pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer, ServerName};
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};
-
-    use crate::buffer::BytePacketBuffer;
-    use crate::header::ResultCode;
-    use crate::packet::DnsPacket;
-    use crate::question::QueryType;
-    use crate::record::DnsRecord;
-
-    /// Generate a self-signed DoT server config and return its leaf cert DER
-    /// so callers can build matching client configs with arbitrary ALPN.
-    fn test_tls_configs() -> (Arc<ServerConfig>, CertificateDer<'static>) {
-        let _ = rustls::crypto::ring::default_provider().install_default();
-
-        // Mirror production self_signed_tls SAN shape: *.numa wildcard plus
-        // explicit numa.numa apex (the ServerName setup-phone uses as SNI).
-        let key_pair = KeyPair::generate().unwrap();
-        let mut params = CertificateParams::default();
-        params
-            .distinguished_name
-            .push(DnType::CommonName, "Numa .numa services");
-        params.subject_alt_names = vec![
-            rcgen::SanType::DnsName("*.numa".try_into().unwrap()),
-            rcgen::SanType::DnsName("numa.numa".try_into().unwrap()),
-        ];
-        let cert = params.self_signed(&key_pair).unwrap();
-
-        let cert_der = CertificateDer::from(cert.der().to_vec());
-        let key_der = PrivateKeyDer::Pkcs8(PrivatePkcs8KeyDer::from(key_pair.serialize_der()));
-
-        let mut server_config = ServerConfig::builder()
-            .with_no_client_auth()
-            .with_single_cert(vec![cert_der.clone()], key_der)
-            .unwrap();
-        server_config.alpn_protocols = dot_alpn();
-
-        (Arc::new(server_config), cert_der)
-    }
-
-    /// Build a TLS client config that trusts `cert_der` and advertises the
-    /// given ALPN protocols. Used by tests to vary ALPN per test case.
-    fn dot_client(
-        cert_der: &CertificateDer<'static>,
-        alpn: Vec<Vec<u8>>,
-    ) -> Arc<rustls::ClientConfig> {
-        let mut root_store = rustls::RootCertStore::empty();
-        root_store.add(cert_der.clone()).unwrap();
-        let mut config = rustls::ClientConfig::builder()
-            .with_root_certificates(root_store)
-            .with_no_client_auth();
-        config.alpn_protocols = alpn;
-        Arc::new(config)
-    }
-
-    /// Spin up a DoT listener with a test TLS config. Returns the bind addr
-    /// and the leaf cert DER so callers can build clients with arbitrary ALPN.
-    /// The upstream is pointed at a bound-but-unresponsive UDP socket we own, so
-    /// any query that escapes to the upstream path times out deterministically
-    /// (SERVFAIL) regardless of what the host has running on port 53.
-    async fn spawn_dot_server() -> (SocketAddr, CertificateDer<'static>) {
-        let (server_tls, cert_der) = test_tls_configs();
-
-        let socket = tokio::net::UdpSocket::bind("127.0.0.1:0").await.unwrap();
-        // Bind an unresponsive upstream and leak it so it lives for the test duration.
-        let blackhole = Box::leak(Box::new(std::net::UdpSocket::bind("127.0.0.1:0").unwrap()));
-        let upstream_addr = blackhole.local_addr().unwrap();
-        let ctx = Arc::new(ServerCtx {
-            socket,
-            zone_map: {
-                let mut m = HashMap::new();
-                let mut inner = HashMap::new();
-                inner.insert(
-                    QueryType::A,
-                    vec![DnsRecord::A {
-                        domain: "dot-test.example".to_string(),
-                        addr: std::net::Ipv4Addr::new(10, 0, 0, 1),
-                        ttl: 300,
-                    }],
-                );
-                m.insert("dot-test.example".to_string(), inner);
-                m
-            },
-            cache: RwLock::new(crate::cache::DnsCache::new(100, 60, 86400)),
-            refreshing: Mutex::new(std::collections::HashSet::new()),
-            stats: Mutex::new(crate::stats::ServerStats::new()),
-            overrides: RwLock::new(crate::override_store::OverrideStore::new()),
-            blocklist: RwLock::new(crate::blocklist::BlocklistStore::new()),
-            query_log: Mutex::new(crate::query_log::QueryLog::new(100)),
-            services: Mutex::new(crate::service_store::ServiceStore::new()),
-            lan_peers: Mutex::new(crate::lan::PeerStore::new(90)),
-            forwarding_rules: Vec::new(),
-            upstream_pool: Mutex::new(crate::forward::UpstreamPool::new(
-                vec![crate::forward::Upstream::Udp(upstream_addr)],
-                vec![],
-            )),
-            upstream_auto: false,
-            upstream_port: 53,
-            lan_ip: Mutex::new(std::net::Ipv4Addr::LOCALHOST),
-            timeout: Duration::from_millis(200),
-            hedge_delay: Duration::ZERO,
-            proxy_tld: "numa".to_string(),
-            proxy_tld_suffix: ".numa".to_string(),
-            lan_enabled: false,
-            config_path: String::new(),
-            config_found: false,
-            config_dir: std::path::PathBuf::from("/tmp"),
-            data_dir: std::path::PathBuf::from("/tmp"),
-            tls_config: Some(arc_swap::ArcSwap::from(server_tls)),
-            upstream_mode: crate::config::UpstreamMode::Forward,
-            root_hints: Vec::new(),
-            srtt: RwLock::new(crate::srtt::SrttCache::new(true)),
-            inflight: Mutex::new(HashMap::new()),
-            dnssec_enabled: false,
-            dnssec_strict: false,
-            health_meta: crate::health::HealthMeta::test_fixture(),
-            ca_pem: None,
-            mobile_enabled: false,
-            mobile_port: 8765,
-        });
-
-        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let addr = listener.local_addr().unwrap();
-
-        let tls_config = Arc::clone(&*ctx.tls_config.as_ref().unwrap().load());
-        let acceptor = TlsAcceptor::from(tls_config);
-
-        tokio::spawn(accept_loop(listener, acceptor, ctx));
-
-        (addr, cert_der)
-    }
-
-    /// Open a TLS connection to the DoT server and return the stream.
-    /// Uses SNI "numa.numa" to mirror what setup-phone's mobileconfig sends.
-    async fn dot_connect(
-        addr: SocketAddr,
-        client_config: &Arc<rustls::ClientConfig>,
-    ) -> tokio_rustls::client::TlsStream<tokio::net::TcpStream> {
-        let connector = tokio_rustls::TlsConnector::from(Arc::clone(client_config));
-        let tcp = tokio::net::TcpStream::connect(addr).await.unwrap();
-        connector
-            .connect(ServerName::try_from("numa.numa").unwrap(), tcp)
-            .await
-            .unwrap()
-    }
-
-    /// Send a DNS query over a DoT stream and read the response.
-    async fn dot_exchange(
-        stream: &mut tokio_rustls::client::TlsStream<tokio::net::TcpStream>,
-        query: &DnsPacket,
-    ) -> DnsPacket {
-        let mut buf = BytePacketBuffer::new();
-        query.write(&mut buf).unwrap();
-        let msg = buf.filled();
-
-        let mut out = Vec::with_capacity(2 + msg.len());
-        out.extend_from_slice(&(msg.len() as u16).to_be_bytes());
-        out.extend_from_slice(msg);
-        stream.write_all(&out).await.unwrap();
-
-        let mut len_buf = [0u8; 2];
-        stream.read_exact(&mut len_buf).await.unwrap();
-        let resp_len = u16::from_be_bytes(len_buf) as usize;
-
-        let mut data = vec![0u8; resp_len];
-        stream.read_exact(&mut data).await.unwrap();
-
-        let mut resp_buf = BytePacketBuffer::from_bytes(&data);
-        DnsPacket::from_buffer(&mut resp_buf).unwrap()
-    }
-
-    #[tokio::test]
-    async fn dot_resolves_local_zone() {
-        let (addr, cert_der) = spawn_dot_server().await;
-        let client_config = dot_client(&cert_der, dot_alpn());
-        let mut stream = dot_connect(addr, &client_config).await;
-
-        let query = DnsPacket::query(0x1234, "dot-test.example", QueryType::A);
-        let resp = dot_exchange(&mut stream, &query).await;
-
-        assert_eq!(resp.header.id, 0x1234);
-        assert!(resp.header.response);
-        assert_eq!(resp.header.rescode, ResultCode::NOERROR);
-        assert_eq!(resp.answers.len(), 1);
-        match &resp.answers[0] {
-            DnsRecord::A { domain, addr, ttl } => {
-                assert_eq!(domain, "dot-test.example");
-                assert_eq!(*addr, std::net::Ipv4Addr::new(10, 0, 0, 1));
-                assert_eq!(*ttl, 300);
-            }
-            other => panic!("expected A record, got {:?}", other),
-        }
-    }
-
-    #[tokio::test]
-    async fn dot_multiple_queries_on_persistent_connection() {
-        let (addr, cert_der) = spawn_dot_server().await;
-        let client_config = dot_client(&cert_der, dot_alpn());
-        let mut stream = dot_connect(addr, &client_config).await;
-
-        for i in 0..3u16 {
-            let query = DnsPacket::query(0xA000 + i, "dot-test.example", QueryType::A);
-            let resp = dot_exchange(&mut stream, &query).await;
-            assert_eq!(resp.header.id, 0xA000 + i);
-            assert_eq!(resp.header.rescode, ResultCode::NOERROR);
-            assert_eq!(resp.answers.len(), 1);
-        }
-    }
-
-    #[tokio::test]
-    async fn dot_nxdomain_for_unknown() {
-        let (addr, cert_der) = spawn_dot_server().await;
-        let client_config = dot_client(&cert_der, dot_alpn());
-        let mut stream = dot_connect(addr, &client_config).await;
-
-        let query = DnsPacket::query(0xBEEF, "nonexistent.test", QueryType::A);
-        let resp = dot_exchange(&mut stream, &query).await;
-
-        assert_eq!(resp.header.id, 0xBEEF);
-        assert!(resp.header.response);
-        // Query goes to the blackhole upstream which never replies → SERVFAIL.
-        // The SERVFAIL response echoes the question section.
-        assert_eq!(resp.header.rescode, ResultCode::SERVFAIL);
-        assert_eq!(resp.questions.len(), 1);
-        assert_eq!(resp.questions[0].name, "nonexistent.test");
-    }
-
-    #[tokio::test]
-    async fn dot_negotiates_alpn() {
-        let (addr, cert_der) = spawn_dot_server().await;
-        let client_config = dot_client(&cert_der, dot_alpn());
-        let stream = dot_connect(addr, &client_config).await;
-        let (_io, conn) = stream.get_ref();
-        assert_eq!(conn.alpn_protocol(), Some(&b"dot"[..]));
-    }
-
-    #[tokio::test]
-    async fn dot_rejects_non_dot_alpn() {
-        // Cross-protocol confusion defense: a client that only offers "h2"
-        // (e.g. an HTTP/2 client mistakenly hitting :853) must not complete
-        // a TLS handshake with the DoT server. Verifies the rustls server
-        // sends `no_application_protocol` rather than silently negotiating.
-        let (addr, cert_der) = spawn_dot_server().await;
-        let client_config = dot_client(&cert_der, vec![b"h2".to_vec()]);
-        let connector = tokio_rustls::TlsConnector::from(client_config);
-        let tcp = tokio::net::TcpStream::connect(addr).await.unwrap();
-        let result = connector
-            .connect(ServerName::try_from("numa.numa").unwrap(), tcp)
-            .await;
-        assert!(
-            result.is_err(),
-            "DoT server must reject ALPN that doesn't include \"dot\""
-        );
-    }
-
-    #[tokio::test]
-    async fn dot_concurrent_connections() {
-        let (addr, cert_der) = spawn_dot_server().await;
-        let client_config = dot_client(&cert_der, dot_alpn());
-
-        let mut handles = Vec::new();
-        for i in 0..5u16 {
-            let cfg = Arc::clone(&client_config);
-            handles.push(tokio::spawn(async move {
-                let mut stream = dot_connect(addr, &cfg).await;
-                let query = DnsPacket::query(0xC000 + i, "dot-test.example", QueryType::A);
-                let resp = dot_exchange(&mut stream, &query).await;
-                assert_eq!(resp.header.id, 0xC000 + i);
-                assert_eq!(resp.header.rescode, ResultCode::NOERROR);
-                assert_eq!(resp.answers.len(), 1);
-            }));
-        }
-
-        for h in handles {
-            h.await.unwrap();
-        }
-    }
-}

src/forward.rs

@@ -1,14 +1,12 @@
 use std::fmt;
-use std::net::{IpAddr, SocketAddr};
+use std::net::SocketAddr;
-use std::sync::RwLock;
+use std::time::Duration;
-use std::time::{Duration, Instant};
 
 use tokio::net::UdpSocket;
 use tokio::time::timeout;
 
 use crate::buffer::BytePacketBuffer;
 use crate::packet::DnsPacket;
-use crate::srtt::SrttCache;
 use crate::Result;
 
 #[derive(Clone)]
@@ -18,11 +16,6 @@ pub enum Upstream {
         url: String,
         client: reqwest::Client,
     },
-    Dot {
-        addr: SocketAddr,
-        tls_name: Option<String>,
-        connector: tokio_rustls::TlsConnector,
-    },
 }
 
 impl PartialEq for Upstream {
@@ -30,7 +23,6 @@ impl PartialEq for Upstream {
         match (self, other) {
             (Self::Udp(a), Self::Udp(b)) => a == b,
             (Self::Doh { url: a, .. }, Self::Doh { url: b, .. }) => a == b,
-            (Self::Dot { addr: a, .. }, Self::Dot { addr: b, .. }) => a == b,
             _ => false,
         }
     }
@@ -41,118 +33,6 @@ impl fmt::Display for Upstream {
         match self {
             Upstream::Udp(addr) => write!(f, "{}", addr),
             Upstream::Doh { url, .. } => f.write_str(url),
-            Upstream::Dot { addr, tls_name, .. } => match tls_name {
-                Some(name) => write!(f, "tls://{}#{}", addr, name),
-                None => write!(f, "tls://{}", addr),
-            },
-        }
-    }
-}
-
-pub fn parse_upstream_addr(s: &str, default_port: u16) -> std::result::Result<SocketAddr, String> {
-    // Try full socket addr first: "1.2.3.4:5353" or "[::1]:5353"
-    if let Ok(addr) = s.parse::<SocketAddr>() {
-        return Ok(addr);
-    }
-    // Bare IP: "1.2.3.4" or "::1"
-    if let Ok(ip) = s.parse::<IpAddr>() {
-        return Ok(SocketAddr::new(ip, default_port));
-    }
-    Err(format!("invalid upstream address: {}", s))
-}
-
-pub fn parse_upstream(s: &str, default_port: u16) -> Result<Upstream> {
-    if s.starts_with("https://") {
-        let client = reqwest::Client::builder()
-            .use_rustls_tls()
-            .http2_initial_stream_window_size(65_535)
-            .http2_initial_connection_window_size(65_535)
-            .http2_keep_alive_interval(Duration::from_secs(15))
-            .http2_keep_alive_while_idle(true)
-            .http2_keep_alive_timeout(Duration::from_secs(10))
-            .pool_idle_timeout(Duration::from_secs(300))
-            .pool_max_idle_per_host(1)
-            .build()
-            .unwrap_or_default();
-        return Ok(Upstream::Doh {
-            url: s.to_string(),
-            client,
-        });
-    }
-    // tls://IP:PORT#hostname  or  tls://IP#hostname  (default port 853)
-    if let Some(rest) = s.strip_prefix("tls://") {
-        let (addr_part, tls_name) = match rest.find('#') {
-            Some(i) => (&rest[..i], Some(rest[i + 1..].to_string())),
-            None => (rest, None),
-        };
-        let addr = parse_upstream_addr(addr_part, 853)?;
-        let connector = build_dot_connector()?;
-        return Ok(Upstream::Dot {
-            addr,
-            tls_name,
-            connector,
-        });
-    }
-    let addr = parse_upstream_addr(s, default_port)?;
-    Ok(Upstream::Udp(addr))
-}
-
-fn build_dot_connector() -> Result<tokio_rustls::TlsConnector> {
-    let _ = rustls::crypto::ring::default_provider().install_default();
-    let mut root_store = rustls::RootCertStore::empty();
-    root_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
-    let config = rustls::ClientConfig::builder()
-        .with_root_certificates(root_store)
-        .with_no_client_auth();
-    Ok(tokio_rustls::TlsConnector::from(std::sync::Arc::new(
-        config,
-    )))
-}
-
-#[derive(Clone)]
-pub struct UpstreamPool {
-    primary: Vec<Upstream>,
-    fallback: Vec<Upstream>,
-}
-
-impl UpstreamPool {
-    pub fn new(primary: Vec<Upstream>, fallback: Vec<Upstream>) -> Self {
-        Self { primary, fallback }
-    }
-
-    pub fn preferred(&self) -> Option<&Upstream> {
-        self.primary.first().or(self.fallback.first())
-    }
-
-    pub fn set_primary(&mut self, primary: Vec<Upstream>) {
-        self.primary = primary;
-    }
-
-    /// Update the primary upstream if `new_addr` (parsed with `port`) differs
-    /// from the current preferred upstream. Returns `true` if the pool changed.
-    pub fn maybe_update_primary(&mut self, new_addr: &str, port: u16) -> bool {
-        let Ok(new_sock) = format!("{}:{}", new_addr, port).parse::<SocketAddr>() else {
-            return false;
-        };
-        let new_upstream = Upstream::Udp(new_sock);
-        if self.preferred() == Some(&new_upstream) {
-            return false;
-        }
-        self.primary = vec![new_upstream];
-        true
-    }
-
-    pub fn label(&self) -> String {
-        match self.preferred() {
-            Some(u) => {
-                let total = self.primary.len() + self.fallback.len();
-                if total > 1 {
-                    format!("{} (+{} more)", u, total - 1)
-                } else {
-                    u.to_string()
-                }
-            }
-            None => "none".to_string(),
         }
     }
 }
@@ -162,11 +42,10 @@ pub async fn forward_query(
     upstream: &Upstream,
     timeout_duration: Duration,
 ) -> Result<DnsPacket> {
-    let mut send_buffer = BytePacketBuffer::new();
+    match upstream {
-    query.write(&mut send_buffer)?;
+        Upstream::Udp(addr) => forward_udp(query, *addr, timeout_duration).await,
-    let data = forward_query_raw(send_buffer.filled(), upstream, timeout_duration).await?;
+        Upstream::Doh { url, client } => forward_doh(query, url, client, timeout_duration).await,
-    let mut recv_buffer = BytePacketBuffer::from_bytes(&data);
+    }
-    DnsPacket::from_buffer(&mut recv_buffer)
 }
 
 pub(crate) async fn forward_udp(
@@ -174,10 +53,24 @@ pub(crate) async fn forward_udp(
     upstream: SocketAddr,
     timeout_duration: Duration,
 ) -> Result<DnsPacket> {
+    let socket = UdpSocket::bind("0.0.0.0:0").await?;
+
     let mut send_buffer = BytePacketBuffer::new();
     query.write(&mut send_buffer)?;
-    let data = forward_udp_raw(send_buffer.filled(), upstream, timeout_duration).await?;
+
-    let mut recv_buffer = BytePacketBuffer::from_bytes(&data);
+    socket.send_to(send_buffer.filled(), upstream).await?;
+
+    let mut recv_buffer = BytePacketBuffer::new();
+    let (size, _) = timeout(timeout_duration, socket.recv_from(&mut recv_buffer.buf)).await??;
+
+    if size == recv_buffer.buf.len() {
+        log::debug!(
+            "upstream response truncated ({} bytes, buffer {})",
+            size,
+            recv_buffer.buf.len()
+        );
+    }
+
     DnsPacket::from_buffer(&mut recv_buffer)
 }
 
@@ -214,209 +107,22 @@ pub(crate) async fn forward_tcp(
     DnsPacket::from_buffer(&mut recv_buffer)
 }
 
-async fn forward_dot_raw(
+async fn forward_doh(
-    wire: &[u8],
+    query: &DnsPacket,
-    addr: SocketAddr,
-    tls_name: &Option<String>,
-    connector: &tokio_rustls::TlsConnector,
-    timeout_duration: Duration,
-) -> Result<Vec<u8>> {
-    use rustls::pki_types::ServerName;
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};
-    use tokio::net::TcpStream;
-
-    let server_name = match tls_name {
-        Some(name) => ServerName::try_from(name.clone())?,
-        None => ServerName::try_from(addr.ip().to_string())?,
-    };
-
-    let tcp = timeout(timeout_duration, TcpStream::connect(addr)).await??;
-    let mut tls = timeout(timeout_duration, connector.connect(server_name, tcp)).await??;
-
-    let mut outbuf = Vec::with_capacity(2 + wire.len());
-    outbuf.extend_from_slice(&(wire.len() as u16).to_be_bytes());
-    outbuf.extend_from_slice(wire);
-    timeout(timeout_duration, tls.write_all(&outbuf)).await??;
-
-    let mut len_buf = [0u8; 2];
-    timeout(timeout_duration, tls.read_exact(&mut len_buf)).await??;
-    let resp_len = u16::from_be_bytes(len_buf) as usize;
-
-    let mut data = vec![0u8; resp_len];
-    timeout(timeout_duration, tls.read_exact(&mut data)).await??;
-
-    Ok(data)
-}
-
-pub async fn forward_query_raw(
-    wire: &[u8],
-    upstream: &Upstream,
-    timeout_duration: Duration,
-) -> Result<Vec<u8>> {
-    match upstream {
-        Upstream::Udp(addr) => forward_udp_raw(wire, *addr, timeout_duration).await,
-        Upstream::Doh { url, client } => forward_doh_raw(wire, url, client, timeout_duration).await,
-        Upstream::Dot {
-            addr,
-            tls_name,
-            connector,
-        } => forward_dot_raw(wire, *addr, tls_name, connector, timeout_duration).await,
-    }
-}
-
-pub async fn forward_with_hedging_raw(
-    wire: &[u8],
-    primary: &Upstream,
-    secondary: &Upstream,
-    hedge_delay: Duration,
-    timeout_duration: Duration,
-) -> Result<Vec<u8>> {
-    use tokio::time::sleep;
-
-    let primary_fut = forward_query_raw(wire, primary, timeout_duration);
-    tokio::pin!(primary_fut);
-
-    let delay = sleep(hedge_delay);
-    tokio::pin!(delay);
-
-    // Phase 1: wait for either primary to return, or the hedge delay.
-    tokio::select! {
-        result = &mut primary_fut => return result,
-        _ = &mut delay => {}
-    }
-
-    // Phase 2: hedge delay expired — fire secondary while still polling primary.
-    let secondary_fut = forward_query_raw(wire, secondary, timeout_duration);
-    tokio::pin!(secondary_fut);
-
-    // First successful response wins. If one errors, wait for the other.
-    let mut primary_err: Option<crate::Error> = None;
-    let mut secondary_err: Option<crate::Error> = None;
-
-    loop {
-        tokio::select! {
-            r = &mut primary_fut, if primary_err.is_none() => {
-                match r {
-                    Ok(resp) => return Ok(resp),
-                    Err(e) => {
-                        if let Some(se) = secondary_err.take() {
-                            return Err(se);
-                        }
-                        primary_err = Some(e);
-                    }
-                }
-            }
-            r = &mut secondary_fut, if secondary_err.is_none() => {
-                match r {
-                    Ok(resp) => return Ok(resp),
-                    Err(e) => {
-                        if let Some(pe) = primary_err.take() {
-                            return Err(pe);
-                        }
-                        secondary_err = Some(e);
-                    }
-                }
-            }
-        }
-
-        match (primary_err, secondary_err) {
-            (Some(pe), Some(_)) => return Err(pe),
-            (pe, se) => {
-                primary_err = pe;
-                secondary_err = se;
-            }
-        }
-    }
-}
-
-pub async fn forward_with_failover_raw(
-    wire: &[u8],
-    pool: &UpstreamPool,
-    srtt: &RwLock<SrttCache>,
-    timeout_duration: Duration,
-    hedge_delay: Duration,
-) -> Result<Vec<u8>> {
-    let mut candidates: Vec<(usize, u64)> = pool
-        .primary
-        .iter()
-        .enumerate()
-        .map(|(i, u)| {
-            let rtt = match u {
-                Upstream::Udp(addr) => srtt.read().unwrap().get(addr.ip()),
-                _ => 0,
-            };
-            (i, rtt)
-        })
-        .collect();
-    candidates.sort_by_key(|&(_, rtt)| rtt);
-
-    let all_upstreams: Vec<&Upstream> = candidates
-        .iter()
-        .map(|&(i, _)| &pool.primary[i])
-        .chain(pool.fallback.iter())
-        .collect();
-
-    let mut last_err: Option<Box<dyn std::error::Error + Send + Sync>> = None;
-
-    for upstream in &all_upstreams {
-        let start = Instant::now();
-        let result = if !hedge_delay.is_zero() {
-            // Hedge against the same upstream: independent h2 streams (DoH),
-            // independent UDP packets (plain DNS), or independent TLS
-            // connections (DoT). Rescues packet loss, dispatch spikes, and
-            // TLS handshake stalls.
-            forward_with_hedging_raw(wire, upstream, upstream, hedge_delay, timeout_duration).await
-        } else {
-            forward_query_raw(wire, upstream, timeout_duration).await
-        };
-        match result {
-            Ok(resp) => {
-                if let Upstream::Udp(addr) = upstream {
-                    let rtt_ms = start.elapsed().as_millis() as u64;
-                    srtt.write().unwrap().record_rtt(addr.ip(), rtt_ms, false);
-                }
-                return Ok(resp);
-            }
-            Err(e) => {
-                if let Upstream::Udp(addr) = upstream {
-                    srtt.write().unwrap().record_failure(addr.ip());
-                }
-                log::debug!("upstream {} failed: {}", upstream, e);
-                last_err = Some(e);
-            }
-        }
-    }
-
-    Err(last_err.unwrap_or_else(|| "no upstream configured".into()))
-}
-
-async fn forward_udp_raw(
-    wire: &[u8],
-    upstream: SocketAddr,
-    timeout_duration: Duration,
-) -> Result<Vec<u8>> {
-    let socket = UdpSocket::bind("0.0.0.0:0").await?;
-    socket.send_to(wire, upstream).await?;
-
-    let mut recv_buf = vec![0u8; 4096];
-    let (size, _) = timeout(timeout_duration, socket.recv_from(&mut recv_buf)).await??;
-    recv_buf.truncate(size);
-    Ok(recv_buf)
-}
-
-async fn forward_doh_raw(
-    wire: &[u8],
     url: &str,
     client: &reqwest::Client,
     timeout_duration: Duration,
-) -> Result<Vec<u8>> {
+) -> Result<DnsPacket> {
+    let mut send_buffer = BytePacketBuffer::new();
+    query.write(&mut send_buffer)?;
+
     let resp = timeout(
         timeout_duration,
         client
             .post(url)
             .header("content-type", "application/dns-message")
             .header("accept", "application/dns-message")
-            .body(wire.to_vec())
+            .body(send_buffer.filled().to_vec())
             .send(),
     )
     .await??
@@ -424,25 +130,9 @@ async fn forward_doh_raw(
 
     let bytes = resp.bytes().await?;
     log::debug!("DoH response: {} bytes", bytes.len());
-    Ok(bytes.to_vec())
-}
 
-/// Send a lightweight keepalive query to a DoH upstream to prevent
+    let mut recv_buffer = BytePacketBuffer::from_bytes(&bytes);
-/// the HTTP/2 + TLS connection from going idle and being torn down.
+    DnsPacket::from_buffer(&mut recv_buffer)
-pub async fn keepalive_doh(upstream: &Upstream) {
-    if let Upstream::Doh { url, client } = upstream {
-        // Query for . NS — minimal, always succeeds, response is small
-        let wire: &[u8] = &[
-            0x00, 0x00, // ID
-            0x01, 0x00, // flags: RD=1
-            0x00, 0x01, // QDCOUNT=1
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // AN=0, NS=0, AR=0
-            0x00, // root name (.)
-            0x00, 0x02, // type NS
-            0x00, 0x01, // class IN
-        ];
-        let _ = forward_doh_raw(wire, url, client, Duration::from_secs(5)).await;
-    }
 }
 
 #[cfg(test)]
@@ -451,7 +141,7 @@ mod tests {
     use std::future::IntoFuture;
 
     use crate::header::ResultCode;
-    use crate::question::QueryType;
+    use crate::question::{DnsQuestion, QueryType};
     use crate::record::DnsRecord;
 
     #[test]
@@ -470,7 +160,12 @@ mod tests {
     }
 
     fn make_query() -> DnsPacket {
-        DnsPacket::query(0xABCD, "example.com", QueryType::A)
+        let mut q = DnsPacket::new();
+        q.header.id = 0xABCD;
+        q.header.recursion_desired = true;
+        q.questions
+            .push(DnsQuestion::new("example.com".to_string(), QueryType::A));
+        q
     }
 
     fn make_response(query: &DnsPacket) -> DnsPacket {
@@ -581,121 +276,4 @@ mod tests {
         let result = forward_query(&make_query(), &upstream, Duration::from_millis(100)).await;
         assert!(result.is_err());
     }
-
-    #[test]
-    fn parse_addr_ip_only() {
-        let addr = parse_upstream_addr("1.2.3.4", 53).unwrap();
-        assert_eq!(addr, "1.2.3.4:53".parse::<SocketAddr>().unwrap());
-    }
-
-    #[test]
-    fn parse_addr_ip_port() {
-        let addr = parse_upstream_addr("1.2.3.4:5353", 53).unwrap();
-        assert_eq!(addr, "1.2.3.4:5353".parse::<SocketAddr>().unwrap());
-    }
-
-    #[test]
-    fn parse_addr_ipv6_bracketed() {
-        let addr = parse_upstream_addr("[::1]:5553", 53).unwrap();
-        assert_eq!(addr, "[::1]:5553".parse::<SocketAddr>().unwrap());
-    }
-
-    #[test]
-    fn parse_addr_ipv6_bare() {
-        let addr = parse_upstream_addr("::1", 53).unwrap();
-        assert_eq!(addr, "[::1]:53".parse::<SocketAddr>().unwrap());
-    }
-
-    #[test]
-    fn pool_label_single() {
-        let pool = UpstreamPool::new(vec![Upstream::Udp("1.2.3.4:53".parse().unwrap())], vec![]);
-        assert_eq!(pool.label(), "1.2.3.4:53");
-    }
-
-    #[test]
-    fn pool_label_multi() {
-        let pool = UpstreamPool::new(
-            vec![Upstream::Udp("1.2.3.4:53".parse().unwrap())],
-            vec![Upstream::Udp("8.8.8.8:53".parse().unwrap())],
-        );
-        assert_eq!(pool.label(), "1.2.3.4:53 (+1 more)");
-    }
-
-    #[tokio::test]
-    async fn failover_tries_next_on_failure() {
-        // First upstream is unreachable, second responds
-        let query = make_query();
-        let response_bytes = to_wire(&make_response(&query));
-
-        let app = axum::Router::new().route(
-            "/dns-query",
-            axum::routing::post(move || {
-                let body = response_bytes.clone();
-                async move {
-                    (
-                        [(axum::http::header::CONTENT_TYPE, "application/dns-message")],
-                        body,
-                    )
-                }
-            }),
-        );
-
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let good_addr = listener.local_addr().unwrap();
-        tokio::spawn(axum::serve(listener, app).into_future());
-
-        // Unreachable UDP upstream + working DoH upstream
-        let pool = UpstreamPool::new(
-            vec![
-                Upstream::Udp("127.0.0.1:1".parse().unwrap()), // will fail
-                Upstream::Doh {
-                    url: format!("http://{}/dns-query", good_addr),
-                    client: reqwest::Client::new(),
-                },
-            ],
-            vec![],
-        );
-
-        let srtt = RwLock::new(SrttCache::new(true));
-        let wire = to_wire(&query);
-        let resp_wire = forward_with_failover_raw(
-            &wire,
-            &pool,
-            &srtt,
-            Duration::from_millis(500),
-            Duration::ZERO,
-        )
-        .await
-        .expect("should fail over to second upstream");
-
-        let mut buf = BytePacketBuffer::from_bytes(&resp_wire);
-        let result = DnsPacket::from_buffer(&mut buf).unwrap();
-        assert_eq!(result.header.id, 0xABCD);
-        assert_eq!(result.answers.len(), 1);
-    }
-
-    #[test]
-    fn maybe_update_primary_swaps_when_different() {
-        let mut pool = UpstreamPool::new(
-            vec![Upstream::Udp("1.2.3.4:53".parse().unwrap())],
-            vec![Upstream::Udp("8.8.8.8:53".parse().unwrap())],
-        );
-        assert!(pool.maybe_update_primary("5.6.7.8", 53));
-        assert_eq!(pool.preferred().unwrap().to_string(), "5.6.7.8:53");
-    }
-
-    #[test]
-    fn maybe_update_primary_noop_when_same() {
-        let mut pool =
-            UpstreamPool::new(vec![Upstream::Udp("1.2.3.4:53".parse().unwrap())], vec![]);
-        assert!(!pool.maybe_update_primary("1.2.3.4", 53));
-    }
-
-    #[test]
-    fn maybe_update_primary_rejects_invalid_addr() {
-        let mut pool =
-            UpstreamPool::new(vec![Upstream::Udp("1.2.3.4:53".parse().unwrap())], vec![]);
-        assert!(!pool.maybe_update_primary("not-an-ip", 53));
-        assert_eq!(pool.preferred().unwrap().to_string(), "1.2.3.4:53");
-    }
 }

src/health.rs

@@ -1,258 +0,0 @@
-//! Health metadata and `/health` response shape, shared between the main
-//! HTTP API and the mobile API.
-//!
-//! The static fields (version, hostname, DoT config, CA fingerprint,
-//! feature list) are computed once at startup and stored in [`HealthMeta`]
-//! on `ServerCtx`. Per-request fields (uptime, LAN IP) are computed live.
-//! Both handlers call [`HealthResponse::build`] to assemble the JSON
-//! response from `HealthMeta` + live inputs.
-//!
-//! JSON schema is documented in `docs/implementation/ios-companion-app.md`
-//! §4.2. The iOS companion app's `HealthInfo` struct is the canonical
-//! consumer; any change to this response must keep that struct decoding
-//! cleanly (all consumed fields are optional on the Swift side, but
-//! `lan_ip` is load-bearing for the pipeline).
-
-use std::net::Ipv4Addr;
-use std::path::Path;
-use std::time::Instant;
-
-use ring::digest::{digest, SHA256};
-use serde::Serialize;
-
-/// Immutable health metadata cached on `ServerCtx`. Built once at startup
-/// from config + file-system state (CA cert).
-#[derive(Clone)]
-pub struct HealthMeta {
-    pub version: &'static str,
-    pub hostname: String,
-    pub sni: String,
-    pub dot_enabled: bool,
-    pub dot_port: u16,
-    pub api_port: u16,
-    pub ca_fingerprint_sha256: Option<String>,
-    pub features: Vec<String>,
-    pub started_at: Instant,
-}
-
-impl HealthMeta {
-    /// Minimal `HealthMeta` for unit tests that construct a `ServerCtx`
-    /// without needing the real startup flow (CA file reads, hostname
-    /// detection, etc.). Deterministic values so test JSON assertions
-    /// stay stable.
-    #[cfg(test)]
-    pub fn test_fixture() -> Self {
-        HealthMeta {
-            version: env!("CARGO_PKG_VERSION"),
-            hostname: "test-host".to_string(),
-            sni: "numa.numa".to_string(),
-            dot_enabled: false,
-            dot_port: 853,
-            api_port: 8765,
-            ca_fingerprint_sha256: None,
-            features: vec![],
-            started_at: Instant::now(),
-        }
-    }
-
-    /// Build a new HealthMeta from config + startup-time environment.
-    /// Call once at server boot; the returned value is cheap to clone
-    /// (small number of short strings) and lives on `ServerCtx`.
-    ///
-    /// The argument count is deliberate — each flag corresponds to a
-    /// specific config value and is clearly named at the call site.
-    /// Collapsing into a struct hides nothing meaningful for a one-call
-    /// initializer.
-    #[allow(clippy::too_many_arguments)]
-    pub fn build(
-        data_dir: &Path,
-        dot_enabled: bool,
-        dot_port: u16,
-        api_port: u16,
-        dnssec_enabled: bool,
-        recursive_enabled: bool,
-        mdns_enabled: bool,
-        blocking_enabled: bool,
-        doh_enabled: bool,
-    ) -> Self {
-        let ca_path = data_dir.join("ca.pem");
-        let ca_fingerprint_sha256 = compute_ca_fingerprint(&ca_path);
-
-        let mut features = Vec::new();
-        if doh_enabled {
-            features.push("doh".to_string());
-        }
-        if dot_enabled {
-            features.push("dot".to_string());
-        }
-        if recursive_enabled {
-            features.push("recursive".to_string());
-        }
-        if blocking_enabled {
-            features.push("blocking".to_string());
-        }
-        if mdns_enabled {
-            features.push("mdns".to_string());
-        }
-        if dnssec_enabled {
-            features.push("dnssec".to_string());
-        }
-
-        HealthMeta {
-            version: env!("CARGO_PKG_VERSION"),
-            hostname: crate::hostname(),
-            sni: "numa.numa".to_string(),
-            dot_enabled,
-            dot_port,
-            api_port,
-            ca_fingerprint_sha256,
-            features,
-            started_at: Instant::now(),
-        }
-    }
-}
-
-/// JSON response shape returned by `GET /health` on both main and mobile APIs.
-///
-/// Fields are organized to match the iOS companion app's
-/// `HealthInfo` Swift struct — see `ios-companion-app.md` §4.2.
-#[derive(Serialize)]
-pub struct HealthResponse {
-    pub status: &'static str,
-    pub version: &'static str,
-    pub uptime_secs: u64,
-    pub hostname: String,
-    pub lan_ip: Option<String>,
-    pub sni: String,
-    pub dot: DotBlock,
-    pub api: ApiBlock,
-    pub ca: CaBlock,
-    pub features: Vec<String>,
-}
-
-#[derive(Serialize)]
-pub struct DotBlock {
-    pub enabled: bool,
-    pub port: Option<u16>,
-}
-
-#[derive(Serialize)]
-pub struct ApiBlock {
-    pub port: u16,
-}
-
-#[derive(Serialize)]
-pub struct CaBlock {
-    pub present: bool,
-    pub fingerprint_sha256: Option<String>,
-}
-
-impl HealthResponse {
-    /// Assemble a fresh `HealthResponse` from the cached metadata and
-    /// the current LAN IP (which may change across network transitions).
-    /// Pass `None` for `lan_ip` if detection fails — the response still
-    /// returns 200 OK, just without the LAN address.
-    pub fn build(meta: &HealthMeta, lan_ip: Option<Ipv4Addr>) -> Self {
-        HealthResponse {
-            status: "ok",
-            version: meta.version,
-            uptime_secs: meta.started_at.elapsed().as_secs(),
-            hostname: meta.hostname.clone(),
-            lan_ip: lan_ip.map(|ip| ip.to_string()),
-            sni: meta.sni.clone(),
-            dot: DotBlock {
-                enabled: meta.dot_enabled,
-                port: if meta.dot_enabled {
-                    Some(meta.dot_port)
-                } else {
-                    None
-                },
-            },
-            api: ApiBlock {
-                port: meta.api_port,
-            },
-            ca: CaBlock {
-                present: meta.ca_fingerprint_sha256.is_some(),
-                fingerprint_sha256: meta.ca_fingerprint_sha256.clone(),
-            },
-            features: meta.features.clone(),
-        }
-    }
-}
-
-/// Read the CA cert at `ca_path` and return its SHA-256 fingerprint as a
-/// lowercase hex string, or None if the file doesn't exist or can't be read.
-///
-/// Hashes the raw PEM bytes for simplicity. A more canonical SPKI-based
-/// fingerprint would require parsing the PEM → DER → extracting
-/// SubjectPublicKeyInfo, which adds complexity without meaningful benefit
-/// for our use case (the iOS app uses the fingerprint only for display
-/// and to detect rotation).
-fn compute_ca_fingerprint(ca_path: &Path) -> Option<String> {
-    let pem = std::fs::read(ca_path).ok()?;
-    let hash = digest(&SHA256, &pem);
-    let hex: String = hash.as_ref().iter().map(|b| format!("{:02x}", b)).collect();
-    Some(hex)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn health_response_contains_required_fields() {
-        let meta = HealthMeta {
-            version: "0.10.0",
-            hostname: "test-host".to_string(),
-            sni: "numa.numa".to_string(),
-            dot_enabled: true,
-            dot_port: 853,
-            api_port: 8765,
-            ca_fingerprint_sha256: Some("abcd1234".to_string()),
-            features: vec!["dot".to_string(), "dnssec".to_string()],
-            started_at: Instant::now(),
-        };
-
-        let response = HealthResponse::build(&meta, Some(Ipv4Addr::new(192, 168, 1, 50)));
-        let json = serde_json::to_string(&response).unwrap();
-
-        assert!(json.contains("\"status\":\"ok\""));
-        assert!(json.contains("\"version\":\"0.10.0\""));
-        assert!(json.contains("\"hostname\":\"test-host\""));
-        assert!(json.contains("\"lan_ip\":\"192.168.1.50\""));
-        assert!(json.contains("\"sni\":\"numa.numa\""));
-        assert!(json.contains("\"port\":853"));
-        assert!(json.contains("\"port\":8765"));
-        assert!(json.contains("\"fingerprint_sha256\":\"abcd1234\""));
-        assert!(json.contains("\"features\":[\"dot\",\"dnssec\"]"));
-    }
-
-    #[test]
-    fn health_response_omits_dot_port_when_disabled() {
-        let meta = HealthMeta {
-            version: "0.10.0",
-            hostname: "t".to_string(),
-            sni: "numa.numa".to_string(),
-            dot_enabled: false,
-            dot_port: 853,
-            api_port: 8765,
-            ca_fingerprint_sha256: None,
-            features: vec![],
-            started_at: Instant::now(),
-        };
-
-        let response = HealthResponse::build(&meta, None);
-        let json = serde_json::to_string(&response).unwrap();
-
-        assert!(json.contains("\"enabled\":false"));
-        assert!(json.contains("\"dot\":{\"enabled\":false,\"port\":null}"));
-        assert!(json.contains("\"present\":false"));
-        assert!(json.contains("\"lan_ip\":null"));
-    }
-
-    #[test]
-    fn ca_fingerprint_returns_none_for_missing_file() {
-        let fp = compute_ca_fingerprint(Path::new("/nonexistent/ca.pem"));
-        assert!(fp.is_none());
-    }
-}

src/lan.rs

@@ -9,7 +9,6 @@ use crate::buffer::BytePacketBuffer;
 use crate::config::LanConfig;
 use crate::ctx::ServerCtx;
 use crate::header::DnsHeader;
-use crate::health::HealthMeta;
 use crate::question::{DnsQuestion, QueryType};
 
 // --- Constants ---
@@ -19,18 +18,6 @@ const MDNS_PORT: u16 = 5353;
 const SERVICE_TYPE: &str = "_numa._tcp.local";
 const MDNS_TTL: u32 = 120;
 
-// TXT record key prefixes (including the trailing `=`). Shared between
-// the sender (`build_announcement`) and the receiver (`parse_mdns_response`)
-// to prevent drift — both sides match on the same literal, not on two
-// independent string constants that could diverge.
-const TXT_SERVICES: &str = "services=";
-const TXT_ID: &str = "id=";
-const TXT_VERSION: &str = "version=";
-const TXT_API_PORT: &str = "api_port=";
-const TXT_PROTO: &str = "proto=";
-const TXT_DOT_PORT: &str = "dot_port=";
-const TXT_CA_FP: &str = "ca_fp=";
-
 // --- Peer Store ---
 
 pub struct PeerStore {
@@ -110,16 +97,14 @@ pub fn detect_lan_ip() -> Option<Ipv4Addr> {
     }
 }
 
-/// Short hostname for mDNS instance names (`<short>._numa._tcp.local`).
-/// Truncates at the first `.` so `macbook-pro.local` becomes `macbook-pro`.
-/// Uses the shared `crate::hostname()` helper as the source.
 fn get_hostname() -> String {
-    crate::hostname()
+    std::process::Command::new("hostname")
-        .split('.')
+        .output()
-        .next()
+        .ok()
-        .filter(|s| !s.is_empty())
+        .and_then(|o| String::from_utf8(o.stdout).ok())
-        .unwrap_or("numa")
+        .map(|h| h.trim().split('.').next().unwrap_or("numa").to_string())
-        .to_string()
+        .filter(|h| !h.is_empty())
+        .unwrap_or_else(|| "numa".to_string())
 }
 
 /// Generate a per-process instance ID for self-filtering on multi-instance hosts
@@ -183,22 +168,13 @@ pub async fn start_lan_discovery(ctx: Arc<ServerCtx>, config: &LanConfig) {
                     .map(|e| (e.name.clone(), e.target_port))
                     .collect()
             };
-            // Note: we always announce ourselves, even when the
+            if services.is_empty() {
-            // services list is empty. The announcement still carries
+                continue;
-            // the mobile API port + version + CA fingerprint in TXT,
+            }
-            // which is what the iOS companion app browses for via
-            // NWBrowser on `_numa._tcp.local`. Other Numa peers
-            // receive these empty-services announcements too and
-            // correctly ignore them in parse_mdns_response (the
-            // receiver only processes when services is non-empty).
             let current_ip = *sender_ctx.lan_ip.lock().unwrap();
-            if let Ok(pkt) = build_announcement(
+            if let Ok(pkt) =
-                &sender_hostname,
+                build_announcement(&sender_hostname, current_ip, &services, &sender_instance_id)
-                current_ip,
+            {
-                &services,
-                &sender_instance_id,
-                &sender_ctx.health_meta,
-            ) {
                 let _ = sender_socket.send_to(pkt.filled(), dest).await;
             }
         }
@@ -264,7 +240,6 @@ fn build_announcement(
     ip: Ipv4Addr,
     services: &[(String, u16)],
     inst_id: &str,
-    meta: &HealthMeta,
 ) -> crate::Result<BytePacketBuffer> {
     let mut buf = BytePacketBuffer::new();
     let instance_name = format!("{}._numa._tcp.local", hostname);
@@ -285,11 +260,7 @@ fn build_announcement(
     patch_rdlen(&mut buf, rdlen_pos, rdata_start)?;
 
     // SRV: <instance>._numa._tcp.local → <hostname>.local
-    // Port = mobile API port, which is what the iOS companion app resolves
+    // Port in SRV is informational; actual service ports are in TXT
-    // the SRV record for. Legacy Numa peers don't read the SRV port (see
-    // parse_mdns_response — it only uses TXT services= for peer discovery),
-    // so changing the SRV port from "first service's port" to the mobile
-    // API port is backwards compatible.
     write_record_header(
         &mut buf,
         &instance_name,
@@ -302,13 +273,11 @@ fn build_announcement(
     let rdata_start = buf.pos();
     buf.write_u16(0)?; // priority
     buf.write_u16(0)?; // weight
-    buf.write_u16(meta.api_port)?; // mobile API port, for iOS companion app
+    buf.write_u16(services.first().map(|(_, p)| *p).unwrap_or(0))?; // first service port for SRV display
     buf.write_qname(&host_local)?;
     patch_rdlen(&mut buf, rdlen_pos, rdata_start)?;
 
-    // TXT: legacy peer-discovery entries (services, id) + enriched entries
+    // TXT: services + instance ID for self-filtering
-    // for the iOS companion app (version, api_port, proto, dot_port, ca_fp).
-    // All in one TXT RRset per mDNS convention.
     write_record_header(
         &mut buf,
         &instance_name,
@@ -324,21 +293,8 @@ fn build_announcement(
         .map(|(name, port)| format!("{}:{}", name, port))
         .collect::<Vec<_>>()
         .join(",");
-    // Legacy peer-discovery entries (consumed by parse_mdns_response)
+    write_txt_string(&mut buf, &format!("services={}", svc_str))?;
-    write_txt_string(&mut buf, &format!("{}{}", TXT_SERVICES, svc_str))?;
+    write_txt_string(&mut buf, &format!("id={}", inst_id))?;
-    write_txt_string(&mut buf, &format!("{}{}", TXT_ID, inst_id))?;
-    // Enriched entries (consumed by the iOS/Android companion apps)
-    write_txt_string(&mut buf, &format!("{}{}", TXT_VERSION, meta.version))?;
-    write_txt_string(&mut buf, &format!("{}{}", TXT_API_PORT, meta.api_port))?;
-    if meta.dot_enabled {
-        write_txt_string(&mut buf, &format!("{}dot", TXT_PROTO))?;
-        write_txt_string(&mut buf, &format!("{}{}", TXT_DOT_PORT, meta.dot_port))?;
-    } else {
-        write_txt_string(&mut buf, &format!("{}plain", TXT_PROTO))?;
-    }
-    if let Some(fp) = &meta.ca_fingerprint_sha256 {
-        write_txt_string(&mut buf, &format!("{}{}", TXT_CA_FP, fp))?;
-    }
     patch_rdlen(&mut buf, rdlen_pos, rdata_start)?;
 
     // A: <hostname>.local → IP
@@ -452,7 +408,7 @@ fn parse_mdns_response(data: &[u8]) -> Option<MdnsAnnouncement> {
                         break;
                     }
                     if let Ok(txt) = std::str::from_utf8(&data[pos..pos + txt_len]) {
-                        if let Some(val) = txt.strip_prefix(TXT_SERVICES) {
+                        if let Some(val) = txt.strip_prefix("services=") {
                             let svcs: Vec<(String, u16)> = val
                                 .split(',')
                                 .filter_map(|s| {
@@ -465,7 +421,7 @@ fn parse_mdns_response(data: &[u8]) -> Option<MdnsAnnouncement> {
                             if !svcs.is_empty() {
                                 txt_services = Some(svcs);
                             }
-                        } else if let Some(id) = txt.strip_prefix(TXT_ID) {
+                        } else if let Some(id) = txt.strip_prefix("id=") {
                             peer_instance_id = Some(id.to_string());
                         }
                     }

src/lib.rs

@@ -5,14 +5,9 @@ pub mod cache;
 pub mod config;
 pub mod ctx;
 pub mod dnssec;
-pub mod doh;
-pub mod dot;
 pub mod forward;
 pub mod header;
-pub mod health;
 pub mod lan;
-pub mod mobile_api;
-pub mod mobileconfig;
 pub mod override_store;
 pub mod packet;
 pub mod proxy;
@@ -21,71 +16,16 @@ pub mod question;
 pub mod record;
 pub mod recursive;
 pub mod service_store;
-pub mod setup_phone;
 pub mod srtt;
 pub mod stats;
 pub mod system_dns;
 pub mod tls;
-pub mod wire;
 
 pub type Error = Box<dyn std::error::Error + Send + Sync>;
 pub type Result<T> = std::result::Result<T, Error>;
 
-/// Detect the machine hostname via the `hostname` command. Returns the
-/// full hostname (e.g., `macbook-pro.local`), or `"numa"` if the command
-/// fails. Call sites that need the short form (e.g., mDNS instance
-/// names) should truncate at the first `.`.
-pub fn hostname() -> String {
-    std::process::Command::new("hostname")
-        .output()
-        .ok()
-        .and_then(|o| String::from_utf8(o.stdout).ok())
-        .map(|h| h.trim().to_string())
-        .filter(|h| !h.is_empty())
-        .unwrap_or_else(|| "numa".to_string())
-}
-
-/// Path to suggest to an interactive user when asking them to create
-/// `numa.toml`. Prefers `$HOME/.config/numa/numa.toml` when HOME is set
-/// (actionable without sudo); falls back to `config_dir()` otherwise.
-///
-/// Note: `config_dir()` routes interactive root to FHS (`/var/lib/numa`)
-/// so that runtime state like `services.json` stays continuous with the
-/// installed daemon. This helper exists specifically to give advisories
-/// and `load_config` an XDG-aware path for user-authored config, without
-/// moving runtime state out of FHS — see issue #81.
-pub(crate) fn suggested_config_path() -> std::path::PathBuf {
-    #[cfg(not(windows))]
-    {
-        resolve_suggested_config_path(std::env::var("HOME").ok().as_deref(), config_dir)
-    }
-    #[cfg(windows)]
-    {
-        config_dir().join("numa.toml")
-    }
-}
-
-#[cfg(not(windows))]
-fn resolve_suggested_config_path<F>(home: Option<&str>, fallback_dir: F) -> std::path::PathBuf
-where
-    F: FnOnce() -> std::path::PathBuf,
-{
-    if let Some(home) = home {
-        if !home.is_empty() && home != "/" {
-            return std::path::PathBuf::from(home)
-                .join(".config")
-                .join("numa")
-                .join("numa.toml");
-        }
-    }
-    fallback_dir().join("numa.toml")
-}
-
 /// Shared config directory for persistent data (services.json, etc).
-/// Unix users: ~/.config/numa/
+/// Unix: ~/.config/numa/ (or /usr/local/var/numa/ when running as root daemon)
-/// Linux root daemon: /var/lib/numa (FHS) — falls back to /usr/local/var/numa
-///                    if a pre-v0.10.1 install already lives there.
-/// macOS root daemon: /usr/local/var/numa (Homebrew prefix)
 /// Windows: %APPDATA%\numa
 pub fn config_dir() -> std::path::PathBuf {
     #[cfg(windows)]
@@ -122,15 +62,11 @@ fn config_dir_unix() -> std::path::PathBuf {
     }
 
     // Running as root daemon (launchd/systemd) — use system-wide path
-    daemon_data_dir()
+    std::path::PathBuf::from("/usr/local/var/numa")
 }
 
-/// Default system-wide data directory for TLS certs. Overridable via
+/// System-wide data directory for TLS certs.
-/// `[server] data_dir = "..."` in numa.toml — this function only provides
+/// Unix: /usr/local/var/numa
-/// the fallback when the config doesn't set it.
-/// Linux: /var/lib/numa (FHS) — falls back to /usr/local/var/numa if a
-///        pre-v0.10.1 install already has data there.
-/// macOS: /usr/local/var/numa (Homebrew prefix)
 /// Windows: %PROGRAMDATA%\numa
 pub fn data_dir() -> std::path::PathBuf {
     #[cfg(windows)]
@@ -142,131 +78,6 @@ pub fn data_dir() -> std::path::PathBuf {
     }
     #[cfg(not(windows))]
     {
-        daemon_data_dir()
-    }
-}
-
-/// Resolve the system-wide data directory for the running platform.
-/// Honors backwards compatibility with pre-v0.10.1 installs that still
-/// have their CA cert + services.json under `/usr/local/var/numa`.
-#[cfg(not(windows))]
-fn daemon_data_dir() -> std::path::PathBuf {
-    #[cfg(target_os = "linux")]
-    {
-        std::path::PathBuf::from(resolve_linux_data_dir(
-            std::path::Path::new("/usr/local/var/numa").exists(),
-            std::path::Path::new("/var/lib/numa").exists(),
-        ))
-    }
-    #[cfg(target_os = "macos")]
-    {
-        // macOS uses the Homebrew prefix convention; no FHS migration needed.
         std::path::PathBuf::from("/usr/local/var/numa")
     }
 }
-
-/// Extracted as a pure function so the migration logic is unit-testable
-/// without touching the real filesystem.
-#[cfg(any(target_os = "linux", test))]
-fn resolve_linux_data_dir(legacy_exists: bool, fhs_exists: bool) -> &'static str {
-    if legacy_exists && !fhs_exists {
-        "/usr/local/var/numa"
-    } else {
-        "/var/lib/numa"
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn linux_data_dir_fresh_install_uses_fhs() {
-        assert_eq!(resolve_linux_data_dir(false, false), "/var/lib/numa");
-    }
-
-    #[test]
-    fn linux_data_dir_upgrading_install_keeps_legacy() {
-        // Migration must keep legacy so the user doesn't lose their CA on upgrade.
-        assert_eq!(resolve_linux_data_dir(true, false), "/usr/local/var/numa");
-    }
-
-    #[test]
-    fn linux_data_dir_after_migration_uses_fhs() {
-        assert_eq!(resolve_linux_data_dir(true, true), "/var/lib/numa");
-    }
-
-    #[test]
-    fn linux_data_dir_only_fhs_uses_fhs() {
-        assert_eq!(resolve_linux_data_dir(false, true), "/var/lib/numa");
-    }
-
-    #[cfg(not(windows))]
-    fn fhs() -> std::path::PathBuf {
-        std::path::PathBuf::from("/var/lib/numa")
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn suggested_config_path_prefers_home() {
-        assert_eq!(
-            resolve_suggested_config_path(Some("/home/alice"), fhs),
-            std::path::PathBuf::from("/home/alice/.config/numa/numa.toml"),
-        );
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn suggested_config_path_prefers_root_home_over_fhs() {
-        // Interactive root: HOME=/root is a real user context, not a daemon signal.
-        // Advisory must point where load_config will actually look — issue #81.
-        assert_eq!(
-            resolve_suggested_config_path(Some("/root"), fhs),
-            std::path::PathBuf::from("/root/.config/numa/numa.toml"),
-        );
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn suggested_config_path_falls_back_when_home_unset() {
-        assert_eq!(
-            resolve_suggested_config_path(None, fhs),
-            std::path::PathBuf::from("/var/lib/numa/numa.toml"),
-        );
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn suggested_config_path_falls_back_when_home_is_root() {
-        // systemd services sometimes have HOME=/ — don't treat that as a real home.
-        assert_eq!(
-            resolve_suggested_config_path(Some("/"), fhs),
-            std::path::PathBuf::from("/var/lib/numa/numa.toml"),
-        );
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn suggested_config_path_falls_back_when_home_is_empty() {
-        assert_eq!(
-            resolve_suggested_config_path(Some(""), fhs),
-            std::path::PathBuf::from("/var/lib/numa/numa.toml"),
-        );
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn suggested_config_path_skips_fallback_when_home_valid() {
-        // Happy path shouldn't probe the filesystem via config_dir().
-        let called = std::cell::Cell::new(false);
-        let fallback = || {
-            called.set(true);
-            std::path::PathBuf::from("/should/not/be/used")
-        };
-        let _ = resolve_suggested_config_path(Some("/home/alice"), fallback);
-        assert!(
-            !called.get(),
-            "fallback must not be invoked when HOME is valid"
-        );
-    }
-}

src/main.rs

@@ -11,18 +11,16 @@ use numa::buffer::BytePacketBuffer;
 use numa::cache::DnsCache;
 use numa::config::{build_zone_map, load_config, ConfigLoad};
 use numa::ctx::{handle_query, ServerCtx};
-use numa::forward::{parse_upstream, Upstream, UpstreamPool};
+use numa::forward::Upstream;
 use numa::override_store::OverrideStore;
 use numa::query_log::QueryLog;
 use numa::service_store::ServiceStore;
-use numa::stats::{ServerStats, Transport};
+use numa::stats::ServerStats;
 use numa::system_dns::{
-    discover_system_dns, install_service, restart_service, service_status, uninstall_service,
+    discover_system_dns, install_service, install_system_dns, restart_service, service_status,
+    uninstall_service, uninstall_system_dns,
 };
 
-const QUAD9_IP: &str = "9.9.9.9";
-const DOH_FALLBACK: &str = "https://9.9.9.9/dns-query";
-
 #[tokio::main]
 async fn main() -> numa::Result<()> {
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
@@ -33,12 +31,12 @@ async fn main() -> numa::Result<()> {
     let arg1 = std::env::args().nth(1).unwrap_or_default();
     match arg1.as_str() {
         "install" => {
-            eprintln!("\x1b[1;38;2;192;98;58mNuma\x1b[0m — installing\n");
+            eprintln!("\x1b[1;38;2;192;98;58mNuma\x1b[0m — configuring system DNS\n");
-            return install_service().map_err(|e| e.into());
+            return install_system_dns().map_err(|e| e.into());
         }
         "uninstall" => {
-            eprintln!("\x1b[1;38;2;192;98;58mNuma\x1b[0m — uninstalling\n");
+            eprintln!("\x1b[1;38;2;192;98;58mNuma\x1b[0m — restoring system DNS\n");
-            return uninstall_service().map_err(|e| e.into());
+            return uninstall_system_dns().map_err(|e| e.into());
         }
         "service" => {
             let sub = std::env::args().nth(2).unwrap_or_default();
@@ -54,9 +52,6 @@ async fn main() -> numa::Result<()> {
                 }
             };
         }
-        "setup-phone" => {
-            return numa::setup_phone::run().await.map_err(|e| e.into());
-        }
         "lan" => {
             let sub = std::env::args().nth(2).unwrap_or_default();
             let config_path = std::env::args()
@@ -88,27 +83,12 @@ async fn main() -> numa::Result<()> {
             eprintln!("  service status  Check if the service is running");
             eprintln!("  lan on          Enable LAN service discovery (mDNS)");
             eprintln!("  lan off         Disable LAN service discovery");
-            eprintln!("  setup-phone     Generate a QR code to install Numa DoT on a phone");
             eprintln!("  help            Show this help");
             eprintln!();
             eprintln!("Config path defaults to numa.toml");
             return Ok(());
         }
-        _ => {
+        _ => {}
-            if !arg1.is_empty()
-                && arg1 != "run"
-                && !arg1.contains('/')
-                && !arg1.contains('\\')
-                && !arg1.ends_with(".toml")
-            {
-                eprintln!(
-                    "\x1b[1;38;2;192;98;58mNuma\x1b[0m — unknown command: \x1b[1m{}\x1b[0m\n",
-                    arg1
-                );
-                eprintln!("Run \x1b[1mnuma help\x1b[0m for a list of commands.");
-                std::process::exit(1);
-            }
-        }
     }
 
     let config_path = if arg1.is_empty() || arg1 == "run" {
@@ -127,71 +107,32 @@ async fn main() -> numa::Result<()> {
     // Discover system DNS in a single pass (upstream + forwarding rules)
     let system_dns = discover_system_dns();
 
-    let root_hints = numa::recursive::parse_root_hints(&config.upstream.root_hints);
+    let upstream_addr = if config.upstream.address.is_empty() {
-
+        system_dns
-    let recursive_pool = || {
+            .default_upstream
-        let dummy = UpstreamPool::new(vec![Upstream::Udp("0.0.0.0:0".parse().unwrap())], vec![]);
+            .or_else(numa::system_dns::detect_dhcp_dns)
-        (dummy, "recursive (root hints)".to_string())
+            .unwrap_or_else(|| {
+                info!("could not detect system DNS, falling back to Quad9 DoH");
+                "https://dns.quad9.net/dns-query".to_string()
+            })
+    } else {
+        config.upstream.address.clone()
     };
 
-    let (resolved_mode, upstream_auto, pool, upstream_label) = match config.upstream.mode {
+    let upstream: Upstream = if upstream_addr.starts_with("https://") {
-        numa::config::UpstreamMode::Auto => {
+        let client = reqwest::Client::builder()
-            info!("auto mode: probing recursive resolution...");
+            .use_rustls_tls()
-            if numa::recursive::probe_recursive(&root_hints).await {
+            .build()
-                info!("recursive probe succeeded — self-sovereign mode");
+            .unwrap_or_default();
-                let (pool, label) = recursive_pool();
+        Upstream::Doh {
-                (numa::config::UpstreamMode::Recursive, false, pool, label)
+            url: upstream_addr,
-            } else {
+            client,
-                log::warn!("recursive probe failed — falling back to Quad9 DoH");
-                let client = reqwest::Client::builder()
-                    .use_rustls_tls()
-                    .build()
-                    .unwrap_or_default();
-                let url = DOH_FALLBACK.to_string();
-                let label = url.clone();
-                let pool = UpstreamPool::new(vec![Upstream::Doh { url, client }], vec![]);
-                (numa::config::UpstreamMode::Forward, false, pool, label)
-            }
-        }
-        numa::config::UpstreamMode::Recursive => {
-            let (pool, label) = recursive_pool();
-            (numa::config::UpstreamMode::Recursive, false, pool, label)
-        }
-        numa::config::UpstreamMode::Forward => {
-            let addrs = if config.upstream.address.is_empty() {
-                let detected = system_dns
-                    .default_upstream
-                    .or_else(numa::system_dns::detect_dhcp_dns)
-                    .unwrap_or_else(|| {
-                        info!("could not detect system DNS, falling back to Quad9 DoH");
-                        DOH_FALLBACK.to_string()
-                    });
-                vec![detected]
-            } else {
-                config.upstream.address.clone()
-            };
-
-            let primary: Vec<Upstream> = addrs
-                .iter()
-                .map(|s| parse_upstream(s, config.upstream.port))
-                .collect::<numa::Result<Vec<_>>>()?;
-            let fallback: Vec<Upstream> = config
-                .upstream
-                .fallback
-                .iter()
-                .map(|s| parse_upstream(s, config.upstream.port))
-                .collect::<numa::Result<Vec<_>>>()?;
-
-            let pool = UpstreamPool::new(primary, fallback);
-            let label = pool.label();
-            (
-                numa::config::UpstreamMode::Forward,
-                config.upstream.address.is_empty(),
-                pool,
-                label,
-            )
         }
+    } else {
+        let addr: SocketAddr = format!("{}:{}", upstream_addr, config.upstream.port).parse()?;
+        Upstream::Udp(addr)
     };
+    let upstream_label = upstream.to_string();
     let api_port = config.server.api_port;
 
     let mut blocklist = BlocklistStore::new();
@@ -210,38 +151,15 @@ async fn main() -> numa::Result<()> {
     }
     service_store.load_persisted();
 
-    for fwd in &config.forwarding {
+    let forwarding_rules = system_dns.forwarding_rules;
-        for suffix in &fwd.suffix {
-            info!("forwarding .{} to {} (config rule)", suffix, fwd.upstream);
-        }
-    }
-    let forwarding_rules =
-        numa::config::merge_forwarding_rules(&config.forwarding, system_dns.forwarding_rules)?;
-
-    // Resolve data_dir from config, falling back to the platform default.
-    // Used for TLS CA storage below and stored on ServerCtx for runtime use.
-    let resolved_data_dir = config
-        .server
-        .data_dir
-        .clone()
-        .unwrap_or_else(numa::data_dir);
 
     // Build initial TLS config before ServerCtx (so ArcSwap is ready at construction)
     let initial_tls = if config.proxy.enabled && config.proxy.tls_port > 0 {
         let service_names = service_store.names();
-        match numa::tls::build_tls_config(
+        match numa::tls::build_tls_config(&config.proxy.tld, &service_names) {
-            &config.proxy.tld,
-            &service_names,
-            Vec::new(),
-            &resolved_data_dir,
-        ) {
             Ok(tls_config) => Some(ArcSwap::from(tls_config)),
             Err(e) => {
-                if let Some(advisory) = numa::tls::try_data_dir_advisory(&e, &resolved_data_dir) {
+                log::warn!("TLS setup failed, HTTPS proxy disabled: {}", e);
-                    eprint!("{}", advisory);
-                } else {
-                    log::warn!("TLS setup failed, HTTPS proxy disabled: {}", e);
-                }
                 None
             }
         }
@@ -249,43 +167,14 @@ async fn main() -> numa::Result<()> {
         None
     };
 
-    let doh_enabled = initial_tls.is_some();
-    let health_meta = numa::health::HealthMeta::build(
-        &resolved_data_dir,
-        config.dot.enabled,
-        config.dot.port,
-        config.mobile.port,
-        config.dnssec.enabled,
-        resolved_mode == numa::config::UpstreamMode::Recursive,
-        config.lan.enabled,
-        config.blocking.enabled,
-        doh_enabled,
-    );
-
-    let ca_pem = std::fs::read_to_string(resolved_data_dir.join("ca.pem")).ok();
-
-    let socket = match UdpSocket::bind(&config.server.bind_addr).await {
-        Ok(s) => s,
-        Err(e) => {
-            if let Some(advisory) =
-                numa::system_dns::try_port53_advisory(&config.server.bind_addr, &e)
-            {
-                eprint!("{}", advisory);
-                std::process::exit(1);
-            }
-            return Err(e.into());
-        }
-    };
-
     let ctx = Arc::new(ServerCtx {
-        socket,
+        socket: UdpSocket::bind(&config.server.bind_addr).await?,
         zone_map: build_zone_map(&config.zones)?,
         cache: RwLock::new(DnsCache::new(
             config.cache.max_entries,
             config.cache.min_ttl,
             config.cache.max_ttl,
         )),
-        refreshing: Mutex::new(std::collections::HashSet::new()),
         stats: Mutex::new(ServerStats::new()),
         overrides: RwLock::new(OverrideStore::new()),
         blocklist: RwLock::new(blocklist),
@@ -293,12 +182,11 @@ async fn main() -> numa::Result<()> {
         services: Mutex::new(service_store),
         lan_peers: Mutex::new(numa::lan::PeerStore::new(config.lan.peer_timeout_secs)),
         forwarding_rules,
-        upstream_pool: Mutex::new(pool),
+        upstream: Mutex::new(upstream),
-        upstream_auto,
+        upstream_auto: config.upstream.address.is_empty(),
         upstream_port: config.upstream.port,
         lan_ip: Mutex::new(numa::lan::detect_lan_ip().unwrap_or(std::net::Ipv4Addr::LOCALHOST)),
         timeout: Duration::from_millis(config.upstream.timeout_ms),
-        hedge_delay: Duration::from_millis(config.upstream.hedge_ms),
         proxy_tld_suffix: if config.proxy.tld.is_empty() {
             String::new()
         } else {
@@ -309,21 +197,18 @@ async fn main() -> numa::Result<()> {
         config_path: resolved_config_path,
         config_found,
         config_dir: numa::config_dir(),
-        data_dir: resolved_data_dir,
+        data_dir: numa::data_dir(),
         tls_config: initial_tls,
-        upstream_mode: resolved_mode,
+        upstream_mode: config.upstream.mode,
-        root_hints,
+        root_hints: numa::recursive::parse_root_hints(&config.upstream.root_hints),
         srtt: std::sync::RwLock::new(numa::srtt::SrttCache::new(config.upstream.srtt)),
         inflight: std::sync::Mutex::new(std::collections::HashMap::new()),
         dnssec_enabled: config.dnssec.enabled,
         dnssec_strict: config.dnssec.strict,
-        health_meta,
-        ca_pem,
-        mobile_enabled: config.mobile.enabled,
-        mobile_port: config.mobile.port,
     });
 
     let zone_count: usize = ctx.zone_map.values().map(|m| m.len()).sum();
+
     // Build banner rows, then size the box to fit the longest value
     let api_url = format!("http://localhost:{}", api_port);
     let proxy_label = if config.proxy.enabled {
@@ -412,9 +297,6 @@ async fn main() -> numa::Result<()> {
         g,
         &format!("max {} entries", config.cache.max_entries),
     );
-    if !config.cache.warm.is_empty() {
-        row("Warm", g, &format!("{} domains", config.cache.warm.len()));
-    }
     row(
         "Blocking",
         g,
@@ -426,27 +308,6 @@ async fn main() -> numa::Result<()> {
     );
     if let Some(ref label) = proxy_label {
         row("Proxy", g, label);
-        if config.proxy.bind_addr == "127.0.0.1" {
-            let y = "\x1b[38;2;204;176;59m"; // yellow
-            row(
-                "",
-                y,
-                &format!(
-                    "⚠ proxy on 127.0.0.1 — .{} not LAN reachable",
-                    config.proxy.tld
-                ),
-            );
-        }
-    }
-    if config.dot.enabled {
-        row("DoT", g, &format!("tls://:{}", config.dot.port));
-    }
-    if doh_enabled {
-        row(
-            "DoH",
-            g,
-            &format!("https://:{}/dns-query", config.proxy.tls_port),
-        );
     }
     if config.lan.enabled {
         row("LAN", g, "mDNS (_numa._tcp.local)");
@@ -504,23 +365,6 @@ async fn main() -> numa::Result<()> {
         });
     }
 
-    // Spawn cache warming for user-configured domains
-    if !config.cache.warm.is_empty() {
-        let warm_ctx = Arc::clone(&ctx);
-        let warm_domains = config.cache.warm.clone();
-        tokio::spawn(async move {
-            cache_warm_loop(warm_ctx, warm_domains).await;
-        });
-    }
-
-    // Spawn DoH connection keepalive — prevents idle TLS teardown
-    {
-        let keepalive_ctx = Arc::clone(&ctx);
-        tokio::spawn(async move {
-            doh_keepalive_loop(keepalive_ctx).await;
-        });
-    }
-
     // Spawn HTTP API server
     let api_ctx = Arc::clone(&ctx);
     let api_addr: SocketAddr = format!("{}:{}", config.server.api_bind_addr, api_port).parse()?;
@@ -531,26 +375,16 @@ async fn main() -> numa::Result<()> {
         axum::serve(listener, app).await.unwrap();
     });
 
-    // Spawn Mobile API listener (read-only subset for iOS/Android companion
+    // Proxy binds 0.0.0.0 when LAN is enabled (cross-machine access), otherwise config value
-    // apps, LAN-bound by default so phones can reach it). Only idempotent
+    let proxy_bind: std::net::Ipv4Addr = if config.lan.enabled {
-    // GETs; no state-mutating routes are exposed here regardless of
+        std::net::Ipv4Addr::UNSPECIFIED
-    // the main API's bind address.
+    } else {
-    if config.mobile.enabled {
+        config
-        let mobile_ctx = Arc::clone(&ctx);
+            .proxy
-        let mobile_bind = config.mobile.bind_addr.clone();
+            .bind_addr
-        let mobile_port = config.mobile.port;
+            .parse()
-        tokio::spawn(async move {
+            .unwrap_or(std::net::Ipv4Addr::LOCALHOST)
-            if let Err(e) = numa::mobile_api::start(mobile_ctx, mobile_bind, mobile_port).await {
+    };
-                log::warn!("Mobile API listener failed: {}", e);
-            }
-        });
-    }
-
-    let proxy_bind: std::net::Ipv4Addr = config
-        .proxy
-        .bind_addr
-        .parse()
-        .unwrap_or(std::net::Ipv4Addr::LOCALHOST);
 
     // Spawn HTTP reverse proxy for .numa domains
     if config.proxy.enabled {
@@ -587,30 +421,15 @@ async fn main() -> numa::Result<()> {
         });
     }
 
-    // Spawn DNS-over-TLS listener (RFC 7858)
-    if config.dot.enabled {
-        let dot_ctx = Arc::clone(&ctx);
-        let dot_config = config.dot.clone();
-        tokio::spawn(async move {
-            numa::dot::start_dot(dot_ctx, &dot_config).await;
-        });
-    }
-
     // UDP DNS listener
     #[allow(clippy::infinite_loop)]
     loop {
         let mut buffer = BytePacketBuffer::new();
-        let (len, src_addr) = match ctx.socket.recv_from(&mut buffer.buf).await {
+        let (_, src_addr) = ctx.socket.recv_from(&mut buffer.buf).await?;
-            Ok(r) => r,
+
-            Err(e) if e.kind() == std::io::ErrorKind::ConnectionReset => {
-                // Windows delivers ICMP port-unreachable as ConnectionReset on UDP sockets
-                continue;
-            }
-            Err(e) => return Err(e.into()),
-        };
         let ctx = Arc::clone(&ctx);
         tokio::spawn(async move {
-            if let Err(e) = handle_query(buffer, len, src_addr, &ctx, Transport::Udp).await {
+            if let Err(e) = handle_query(buffer, src_addr, &ctx).await {
                 error!("{} | HANDLER ERROR | {}", src_addr, e);
             }
         });
@@ -639,17 +458,27 @@ async fn network_watch_loop(ctx: Arc<numa::ctx::ServerCtx>) {
             }
         }
 
-        // Re-detect upstream every 30s or on LAN IP change (auto-detect only)
+        // Re-detect upstream every 30s or on LAN IP change (UDP only —
-        if ctx.upstream_auto && (changed || tick.is_multiple_of(6)) {
+        // DoH upstreams are explicitly configured via URL, not auto-detected)
+        if ctx.upstream_auto
+            && matches!(*ctx.upstream.lock().unwrap(), Upstream::Udp(_))
+            && (changed || tick.is_multiple_of(6))
+        {
             let dns_info = numa::system_dns::discover_system_dns();
             let new_addr = dns_info
                 .default_upstream
                 .or_else(numa::system_dns::detect_dhcp_dns)
-                .unwrap_or_else(|| QUAD9_IP.to_string());
+                .unwrap_or_else(|| "9.9.9.9".to_string());
-            let mut pool = ctx.upstream_pool.lock().unwrap();
+            if let Ok(new_sock) =
-            if pool.maybe_update_primary(&new_addr, ctx.upstream_port) {
+                format!("{}:{}", new_addr, ctx.upstream_port).parse::<SocketAddr>()
-                info!("upstream changed → {}", pool.label());
+            {
-                changed = true;
+                let new_upstream = Upstream::Udp(new_sock);
+                let mut upstream = ctx.upstream.lock().unwrap();
+                if *upstream != new_upstream {
+                    info!("upstream changed: {} → {}", upstream, new_upstream);
+                    *upstream = new_upstream;
+                    changed = true;
+                }
             }
         }
 
@@ -756,45 +585,3 @@ async fn load_blocklists(ctx: &ServerCtx, lists: &[String]) {
         downloaded.len()
     );
 }
-
-async fn warm_domain(ctx: &ServerCtx, domain: &str) {
-    for qtype in [
-        numa::question::QueryType::A,
-        numa::question::QueryType::AAAA,
-    ] {
-        numa::ctx::refresh_entry(ctx, domain, qtype).await;
-    }
-}
-
-async fn doh_keepalive_loop(ctx: Arc<ServerCtx>) {
-    let mut interval = tokio::time::interval(Duration::from_secs(25));
-    interval.tick().await; // skip first immediate tick
-    loop {
-        interval.tick().await;
-        let pool = ctx.upstream_pool.lock().unwrap().clone();
-        if let Some(upstream) = pool.preferred() {
-            numa::forward::keepalive_doh(upstream).await;
-        }
-    }
-}
-
-async fn cache_warm_loop(ctx: Arc<ServerCtx>, domains: Vec<String>) {
-    tokio::time::sleep(Duration::from_secs(2)).await;
-
-    for domain in &domains {
-        warm_domain(&ctx, domain).await;
-    }
-    info!("cache warm: {} domains resolved at startup", domains.len());
-
-    let mut interval = tokio::time::interval(Duration::from_secs(30));
-    interval.tick().await;
-    loop {
-        interval.tick().await;
-        for domain in &domains {
-            let refresh = ctx.cache.read().unwrap().needs_warm(domain);
-            if refresh {
-                warm_domain(&ctx, domain).await;
-            }
-        }
-    }
-}

src/mobile_api.rs

@@ -1,107 +0,0 @@
-//! Mobile API — persistent HTTP listener for iOS/Android companion apps.
-//!
-//! Read-only subset of Numa's HTTP surface served on a separate port
-//! (default 8765) bound to the LAN. Unlike the main API on port 5380
-//! (which defaults to `127.0.0.1` and serves mutating routes like
-//! `DELETE /services/{name}` or `PUT /blocking/toggle`), this listener
-//! is safe to expose on the LAN because every route is idempotent and
-//! read-only.
-//!
-//! Routes (all GET):
-//!
-//! - `/health` — enriched status + metadata, shares the handler with the
-//!   main API via `crate::api::health`
-//! - `/ca.pem` — Numa local CA in PEM form, shares the handler with the
-//!   main API via `crate::api::serve_ca`
-//! - `/mobileconfig` — combined CA + DNS settings profile (Full mode)
-//! - `/ca.mobileconfig` — CA-only trust profile (no DNS override)
-//!
-//! The mobile API does NOT include the mutating routes (overrides, cache
-//! flush, blocking toggle, service CRUD, etc.). Even if a user sets
-//! `api_bind_addr` to `0.0.0.0` for the main API, those routes stay on
-//! port 5380; the mobile API on port 8765 never serves them. This is the
-//! primary security boundary: anything exposed to the LAN is read-only.
-
-use std::net::Ipv4Addr;
-use std::sync::Arc;
-
-use axum::extract::State;
-use axum::http::{header, StatusCode};
-use axum::response::IntoResponse;
-use axum::routing::get;
-use axum::Router;
-use log::info;
-
-use crate::ctx::ServerCtx;
-use crate::mobileconfig::{build_mobileconfig, ProfileMode};
-
-/// Content-Disposition for the full CA + DNS profile download.
-const FULL_PROFILE_DISPOSITION: &str = "attachment; filename=\"numa.mobileconfig\"";
-
-/// Content-Disposition for the CA-only profile download.
-const CA_ONLY_PROFILE_DISPOSITION: &str = "attachment; filename=\"numa-ca.mobileconfig\"";
-
-/// Build the axum router for the mobile API.
-///
-/// Shares handler functions with the main API where possible (`health`,
-/// `serve_ca`) so the response shapes are identical across both ports.
-pub fn router(ctx: Arc<ServerCtx>) -> Router {
-    Router::new()
-        .route("/health", get(crate::api::health))
-        .route("/ca.pem", get(crate::api::serve_ca))
-        .route("/mobileconfig", get(serve_full_mobileconfig))
-        .route("/ca.mobileconfig", get(serve_ca_only_mobileconfig))
-        .with_state(ctx)
-}
-
-/// Start the mobile API listener on `bind_addr:port`. Runs until the
-/// caller cancels the spawned task. Logs the URL on successful bind.
-pub async fn start(ctx: Arc<ServerCtx>, bind_addr: String, port: u16) -> crate::Result<()> {
-    let addr: std::net::SocketAddr = format!("{}:{}", bind_addr, port).parse()?;
-    let listener = tokio::net::TcpListener::bind(addr).await?;
-
-    info!("Mobile API listening on http://{}", addr);
-
-    let app = router(ctx);
-    axum::serve(listener, app).await?;
-
-    Ok(())
-}
-
-/// Serve the full mobileconfig profile (CA + DNS settings), with the
-/// DNS payload pointing at the current LAN IP. Each request reads the
-/// fresh LAN IP from `ctx.lan_ip` so the profile always reflects the
-/// laptop's current network state.
-async fn serve_full_mobileconfig(
-    State(ctx): State<Arc<ServerCtx>>,
-) -> Result<impl IntoResponse, StatusCode> {
-    let ca_pem = ctx.ca_pem.as_deref().ok_or(StatusCode::NOT_FOUND)?;
-    let lan_ip: Ipv4Addr = *ctx.lan_ip.lock().unwrap();
-    let profile = build_mobileconfig(ProfileMode::Full { lan_ip }, ca_pem);
-    Ok(profile_response(profile, FULL_PROFILE_DISPOSITION))
-}
-
-/// Serve the CA-only mobileconfig profile. Trusts the Numa local CA but
-/// does NOT change the device's DNS settings. Used by the iOS companion
-/// app's DoT mode, where the app configures DNS via `NEDNSSettingsManager`
-/// and only needs the system trust store to accept Numa's self-signed cert.
-async fn serve_ca_only_mobileconfig(
-    State(ctx): State<Arc<ServerCtx>>,
-) -> Result<impl IntoResponse, StatusCode> {
-    let ca_pem = ctx.ca_pem.as_deref().ok_or(StatusCode::NOT_FOUND)?;
-    let profile = build_mobileconfig(ProfileMode::CaOnly, ca_pem);
-    Ok(profile_response(profile, CA_ONLY_PROFILE_DISPOSITION))
-}
-
-/// Shared response constructor for both mobileconfig variants.
-/// Identical headers; only the Content-Disposition filename differs.
-fn profile_response(profile: String, disposition: &'static str) -> impl IntoResponse {
-    (
-        [
-            (header::CONTENT_TYPE, "application/x-apple-aspen-config"),
-            (header::CONTENT_DISPOSITION, disposition),
-            (header::CACHE_CONTROL, "no-store"),
-        ],
-        profile,
-    )
-}

src/mobileconfig.rs

@@ -1,305 +0,0 @@
-//! Apple `.mobileconfig` profile generator.
-//!
-//! Builds iOS Configuration Profiles that Numa serves to phones for one-tap
-//! CA trust and DNS-over-TLS setup. The plist structure is hand-rendered
-//! via `format!` — no plist crate dependency, deterministic output, small
-//! binary footprint.
-//!
-//! Two modes:
-//!
-//! - [`ProfileMode::Full`]: CA trust payload + DNS settings payload pointing
-//!   at a specific LAN IP over DoT. This is what `numa setup-phone` has
-//!   always produced — the user scans a QR, installs this profile, and the
-//!   phone is configured for DoT through Numa in a single step (after the
-//!   iOS Certificate Trust Settings toggle, which is a separate system
-//!   gate we can't bypass).
-//!
-//! - [`ProfileMode::CaOnly`]: CA trust payload only, no DNS settings. Used
-//!   by the future iOS companion app flow where `NEDNSSettingsManager`
-//!   configures DNS programmatically and we only need the system trust
-//!   store to accept Numa's DoT cert. Installing this profile does NOT
-//!   change the user's DNS at all.
-//!
-//! Payload identifiers and UUIDs are fixed (not randomized) so iOS replaces
-//! the existing profile on re-install rather than accumulating duplicates.
-//! The `Full` and `CaOnly` profiles have distinct top-level UUIDs so they
-//! can coexist as separate installed profiles, but they share the same CA
-//! payload UUID since the CA itself is the same trust anchor in both.
-
-use std::net::Ipv4Addr;
-
-/// Top-level UUID and PayloadIdentifier for the full profile (CA + DNS).
-/// Changing this breaks in-place replacement on existing iOS installs.
-const FULL_PROFILE_UUID: &str = "F1E2D3C4-B5A6-7890-1234-567890ABCDEF";
-const FULL_PROFILE_ID: &str = "com.numa.dns.profile";
-
-/// Top-level UUID and PayloadIdentifier for the CA-only profile.
-/// Distinct from `FULL_PROFILE_UUID` so a user can install one, the other,
-/// or both without the latest install silently replacing a different mode.
-const CA_ONLY_PROFILE_UUID: &str = "F2E3D4C5-B6A7-8901-2345-67890ABCDEF0";
-const CA_ONLY_PROFILE_ID: &str = "com.numa.dns.ca.profile";
-
-/// CA trust payload UUID. Same in both modes — iOS will see "the same CA
-/// trust anchor" regardless of which wrapping profile contains it.
-const CA_PAYLOAD_UUID: &str = "B2C3D4E5-F6A7-8901-BCDE-F12345678901";
-const CA_PAYLOAD_ID: &str = "com.numa.dns.ca";
-
-/// DNS settings payload UUID (Full mode only).
-const DNS_PAYLOAD_UUID: &str = "A1B2C3D4-E5F6-7890-ABCD-EF1234567890";
-const DNS_PAYLOAD_ID: &str = "com.numa.dns.dot";
-
-/// Profile mode determines which payloads are included in the generated
-/// `.mobileconfig`.
-#[derive(Debug, Clone)]
-pub enum ProfileMode {
-    /// Full profile: CA trust anchor + managed DNS settings payload
-    /// pointing at the given LAN IP over DoT. This is what the classic
-    /// `numa setup-phone` QR flow serves.
-    Full { lan_ip: Ipv4Addr },
-
-    /// CA-only profile: just the trust anchor, no DNS settings. For use
-    /// with the iOS companion app which manages DNS programmatically via
-    /// `NEDNSSettingsManager` and only needs the system trust store to
-    /// accept Numa's self-signed DoT cert.
-    CaOnly,
-}
-
-/// Build a full `.mobileconfig` profile as an XML plist string.
-pub fn build_mobileconfig(mode: ProfileMode, ca_pem: &str) -> String {
-    let ca_payload = build_ca_payload(ca_pem);
-
-    match mode {
-        ProfileMode::Full { lan_ip } => {
-            let dns_payload = build_dns_payload(lan_ip);
-            let payloads = format!("{}\n{}", ca_payload, dns_payload);
-            let description = format!(
-                "Trusts the Numa local CA and routes DNS queries to Numa over DoT on your local network ({lan_ip})"
-            );
-            wrap_plist(
-                &payloads,
-                FULL_PROFILE_UUID,
-                FULL_PROFILE_ID,
-                &description,
-                "Numa DNS",
-            )
-        }
-        ProfileMode::CaOnly => wrap_plist(
-            &ca_payload,
-            CA_ONLY_PROFILE_UUID,
-            CA_ONLY_PROFILE_ID,
-            "Trusts the Numa local Certificate Authority. Does not change your DNS settings.",
-            "Numa CA",
-        ),
-    }
-}
-
-/// Strip the PEM header/footer and newlines from a CA cert, leaving raw
-/// base64 for embedding in a plist `<data>` block.
-fn pem_to_base64(pem: &str) -> String {
-    pem.lines()
-        .filter(|line| !line.starts_with("-----"))
-        .collect::<String>()
-}
-
-/// Wrap the base64 CA cert at 52 chars per line for plist readability
-/// (matches Apple convention in hand-written profiles).
-fn chunk_base64(base64: &str) -> String {
-    base64
-        .chars()
-        .collect::<Vec<_>>()
-        .chunks(52)
-        .map(|chunk| format!("\t\t\t{}", chunk.iter().collect::<String>()))
-        .collect::<Vec<_>>()
-        .join("\n")
-}
-
-/// Render the `com.apple.security.root` payload dict containing the CA cert.
-fn build_ca_payload(ca_pem: &str) -> String {
-    let ca_wrapped = chunk_base64(&pem_to_base64(ca_pem));
-    format!(
-        r#"		<dict>
-			<key>PayloadCertificateFileName</key>
-			<string>numa-ca.pem</string>
-			<key>PayloadContent</key>
-			<data>
-{ca}
-			</data>
-			<key>PayloadDescription</key>
-			<string>Numa local Certificate Authority — required for DoT trust</string>
-			<key>PayloadDisplayName</key>
-			<string>Numa Local CA</string>
-			<key>PayloadIdentifier</key>
-			<string>{ca_id}</string>
-			<key>PayloadType</key>
-			<string>com.apple.security.root</string>
-			<key>PayloadUUID</key>
-			<string>{ca_uuid}</string>
-			<key>PayloadVersion</key>
-			<integer>1</integer>
-		</dict>"#,
-        ca = ca_wrapped,
-        ca_id = CA_PAYLOAD_ID,
-        ca_uuid = CA_PAYLOAD_UUID,
-    )
-}
-
-/// Render the `com.apple.dnsSettings.managed` payload dict for Full mode.
-fn build_dns_payload(lan_ip: Ipv4Addr) -> String {
-    format!(
-        r#"		<dict>
-			<key>DNSSettings</key>
-			<dict>
-				<key>DNSProtocol</key>
-				<string>TLS</string>
-				<key>ServerAddresses</key>
-				<array>
-					<string>{ip}</string>
-				</array>
-				<key>ServerName</key>
-				<string>numa.numa</string>
-			</dict>
-			<key>OnDemandRules</key>
-			<array>
-				<dict>
-					<key>Action</key>
-					<string>Connect</string>
-					<key>InterfaceTypeMatch</key>
-					<string>WiFi</string>
-				</dict>
-				<dict>
-					<key>Action</key>
-					<string>Disconnect</string>
-				</dict>
-			</array>
-			<key>PayloadDescription</key>
-			<string>Routes DNS queries through Numa over DoT when on Wi-Fi</string>
-			<key>PayloadDisplayName</key>
-			<string>Numa DNS-over-TLS</string>
-			<key>PayloadIdentifier</key>
-			<string>{dns_id}</string>
-			<key>PayloadType</key>
-			<string>com.apple.dnsSettings.managed</string>
-			<key>PayloadUUID</key>
-			<string>{dns_uuid}</string>
-			<key>PayloadVersion</key>
-			<integer>1</integer>
-		</dict>"#,
-        ip = lan_ip,
-        dns_id = DNS_PAYLOAD_ID,
-        dns_uuid = DNS_PAYLOAD_UUID,
-    )
-}
-
-/// Wrap one or more payload dicts in the top-level plist structure
-/// with Configuration type, PayloadContent array, and profile metadata.
-fn wrap_plist(
-    payloads: &str,
-    top_uuid: &str,
-    top_id: &str,
-    description: &str,
-    display_name: &str,
-) -> String {
-    format!(
-        r#"<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PayloadContent</key>
-	<array>
-{payloads}
-	</array>
-	<key>PayloadDescription</key>
-	<string>{description}</string>
-	<key>PayloadDisplayName</key>
-	<string>{display_name}</string>
-	<key>PayloadIdentifier</key>
-	<string>{top_id}</string>
-	<key>PayloadRemovalDisallowed</key>
-	<false/>
-	<key>PayloadType</key>
-	<string>Configuration</string>
-	<key>PayloadUUID</key>
-	<string>{top_uuid}</string>
-	<key>PayloadVersion</key>
-	<integer>1</integer>
-</dict>
-</plist>
-"#,
-        payloads = payloads,
-        description = description,
-        display_name = display_name,
-        top_id = top_id,
-        top_uuid = top_uuid,
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const SAMPLE_PEM: &str =
-        "-----BEGIN CERTIFICATE-----\nMIIBkDCCATagAwIBAgIUTEST\n-----END CERTIFICATE-----\n";
-
-    #[test]
-    fn pem_to_base64_strips_headers() {
-        let pem = "-----BEGIN CERTIFICATE-----\nABCDEF\nGHIJKL\n-----END CERTIFICATE-----\n";
-        assert_eq!(pem_to_base64(pem), "ABCDEFGHIJKL");
-    }
-
-    #[test]
-    fn full_profile_contains_ip_and_ca() {
-        let config = build_mobileconfig(
-            ProfileMode::Full {
-                lan_ip: Ipv4Addr::new(192, 168, 1, 100),
-            },
-            SAMPLE_PEM,
-        );
-        assert!(config.contains("192.168.1.100"));
-        assert!(config.contains("MIIBkDCCATagAwIBAgIUTEST"));
-        assert!(config.contains("com.apple.security.root"));
-        assert!(config.contains("com.apple.dnsSettings.managed"));
-        assert!(config.contains("DNSProtocol"));
-        assert!(config.contains(FULL_PROFILE_UUID));
-        assert!(config.contains(FULL_PROFILE_ID));
-    }
-
-    #[test]
-    fn ca_only_profile_contains_ca_but_not_dns() {
-        let config = build_mobileconfig(ProfileMode::CaOnly, SAMPLE_PEM);
-        assert!(config.contains("MIIBkDCCATagAwIBAgIUTEST"));
-        assert!(config.contains("com.apple.security.root"));
-        assert!(!config.contains("com.apple.dnsSettings.managed"));
-        assert!(!config.contains("DNSProtocol"));
-        assert!(!config.contains("ServerAddresses"));
-        assert!(config.contains(CA_ONLY_PROFILE_UUID));
-        assert!(config.contains(CA_ONLY_PROFILE_ID));
-    }
-
-    #[test]
-    fn full_and_ca_only_have_distinct_top_uuids() {
-        let full = build_mobileconfig(
-            ProfileMode::Full {
-                lan_ip: Ipv4Addr::new(10, 0, 0, 1),
-            },
-            SAMPLE_PEM,
-        );
-        let ca_only = build_mobileconfig(ProfileMode::CaOnly, SAMPLE_PEM);
-        assert!(full.contains(FULL_PROFILE_UUID));
-        assert!(!full.contains(CA_ONLY_PROFILE_UUID));
-        assert!(ca_only.contains(CA_ONLY_PROFILE_UUID));
-        assert!(!ca_only.contains(FULL_PROFILE_UUID));
-    }
-
-    #[test]
-    fn both_modes_share_ca_payload_uuid() {
-        let full = build_mobileconfig(
-            ProfileMode::Full {
-                lan_ip: Ipv4Addr::new(10, 0, 0, 1),
-            },
-            SAMPLE_PEM,
-        );
-        let ca_only = build_mobileconfig(ProfileMode::CaOnly, SAMPLE_PEM);
-        assert!(full.contains(CA_PAYLOAD_UUID));
-        assert!(ca_only.contains(CA_PAYLOAD_UUID));
-    }
-}

src/override_store.rs

@@ -117,22 +117,6 @@ impl OverrideStore {
         self.entries.clear();
     }
 
-    pub fn heap_bytes(&self) -> usize {
-        let per_slot = std::mem::size_of::<u64>()
-            + std::mem::size_of::<String>()
-            + std::mem::size_of::<OverrideEntry>()
-            + 1;
-        let table = self.entries.capacity() * per_slot;
-        let heap: usize = self
-            .entries
-            .iter()
-            .map(|(k, v)| {
-                k.capacity() + v.domain.capacity() + v.target.capacity() + v.record.heap_bytes()
-            })
-            .sum();
-        table + heap
-    }
-
     pub fn active_count(&self) -> usize {
         self.entries.values().filter(|e| !e.is_expired()).count()
     }
@@ -170,16 +154,3 @@ fn parse_target(domain: &str, target: &str, ttl: u32) -> Result<(QueryType, DnsR
         },
     ))
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn heap_bytes_grows_with_entries() {
-        let mut store = OverrideStore::new();
-        let empty = store.heap_bytes();
-        store.insert("example.com", "1.2.3.4", 300, None).unwrap();
-        assert!(store.heap_bytes() > empty);
-    }
-}

src/packet.rs

@@ -57,34 +57,6 @@ impl DnsPacket {
         }
     }
 
-    pub fn query(id: u16, domain: &str, qtype: crate::question::QueryType) -> DnsPacket {
-        let mut pkt = DnsPacket::new();
-        pkt.header.id = id;
-        pkt.header.recursion_desired = true;
-        pkt.questions
-            .push(crate::question::DnsQuestion::new(domain.to_string(), qtype));
-        pkt
-    }
-
-    pub fn heap_bytes(&self) -> usize {
-        fn records_heap(records: &[DnsRecord]) -> usize {
-            records
-                .iter()
-                .map(|r| std::mem::size_of::<DnsRecord>() + r.heap_bytes())
-                .sum::<usize>()
-        }
-        let questions: usize = self
-            .questions
-            .iter()
-            .map(|q| std::mem::size_of::<DnsQuestion>() + q.name.capacity())
-            .sum();
-        questions
-            + records_heap(&self.answers)
-            + records_heap(&self.authorities)
-            + records_heap(&self.resources)
-            + self.edns.as_ref().map_or(0, |e| e.options.capacity())
-    }
-
     pub fn response_from(query: &DnsPacket, rescode: crate::header::ResultCode) -> DnsPacket {
         let mut resp = DnsPacket::new();
         resp.header.id = query.header.id;
@@ -610,16 +582,4 @@ mod tests {
             panic!("expected DNSKEY");
         }
     }
-
-    #[test]
-    fn heap_bytes_accounts_for_records() {
-        let mut pkt = DnsPacket::new();
-        let empty = pkt.heap_bytes();
-        pkt.answers.push(DnsRecord::A {
-            domain: "example.com".into(),
-            addr: "1.2.3.4".parse().unwrap(),
-            ttl: 300,
-        });
-        assert!(pkt.heap_bytes() > empty);
-    }
 }

src/proxy.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 use axum::body::Body;
 use axum::extract::{Request, State};
 use axum::response::IntoResponse;
-use axum::routing::{any, post};
+use axum::routing::any;
 use axum::Router;
 use http_body_util::BodyExt;
 use hyper::StatusCode;
@@ -18,14 +18,6 @@ use crate::ctx::ServerCtx;
 
 type HttpClient = Client<hyper_util::client::legacy::connect::HttpConnector, Body>;
 
-/// State passed to the DoH handler. Includes the remote address so
-/// `resolve_query` can log the client IP.
-#[derive(Clone)]
-pub struct DohState {
-    pub ctx: Arc<ServerCtx>,
-    pub remote_addr: Option<std::net::SocketAddr>,
-}
-
 #[derive(Clone)]
 struct ProxyState {
     ctx: Arc<ServerCtx>,
@@ -82,17 +74,9 @@ pub async fn start_proxy_tls(ctx: Arc<ServerCtx>, port: u16, bind_addr: Ipv4Addr
 
     // Hold a separate Arc so we can access tls_config after ctx moves into ProxyState
     let tls_holder = Arc::clone(&ctx);
-    let proxy_state = ProxyState {
+    let state = ProxyState { ctx, client };
-        ctx: Arc::clone(&ctx),
-        client,
-    };
 
-    // DoH route (RFC 8484) served only on the TLS listener.
+    let app = Router::new().fallback(any(proxy_handler)).with_state(state);
-    // DohState.remote_addr is set per-connection below.
-    let doh_state = DohState {
-        ctx,
-        remote_addr: None,
-    };
 
     loop {
         let (tcp_stream, remote_addr) = match listener.accept().await {
@@ -107,17 +91,7 @@ pub async fn start_proxy_tls(ctx: Arc<ServerCtx>, port: u16, bind_addr: Ipv4Addr
         // unwrap safe: guarded by is_none() check above
         let acceptor =
             TlsAcceptor::from(Arc::clone(&*tls_holder.tls_config.as_ref().unwrap().load()));
-
+        let app = app.clone();
-        let mut conn_doh_state = doh_state.clone();
-        conn_doh_state.remote_addr = Some(remote_addr);
-
-        let app = Router::new()
-            .route(
-                "/dns-query",
-                post(crate::doh::doh_post).with_state(conn_doh_state),
-            )
-            .fallback(any(proxy_handler))
-            .with_state(proxy_state.clone());
 
         tokio::spawn(async move {
             let tls_stream = match acceptor.accept(tcp_stream).await {
@@ -258,7 +232,7 @@ pre .str {{ color: #d48a5a }}
     )
 }
 
-pub fn extract_host(req: &Request) -> Option<String> {
+fn extract_host(req: &Request) -> Option<String> {
     req.headers()
         .get(hyper::header::HOST)
         .and_then(|v| v.to_str().ok())

src/query_log.rs

@@ -5,7 +5,7 @@ use std::time::SystemTime;
 use crate::cache::DnssecStatus;
 use crate::header::ResultCode;
 use crate::question::QueryType;
-use crate::stats::{QueryPath, Transport};
+use crate::stats::QueryPath;
 
 pub struct QueryLogEntry {
     pub timestamp: SystemTime,
@@ -13,7 +13,6 @@ pub struct QueryLogEntry {
     pub domain: String,
     pub query_type: QueryType,
     pub path: QueryPath,
-    pub transport: Transport,
     pub rescode: ResultCode,
     pub latency_us: u64,
     pub dnssec: DnssecStatus,
@@ -39,21 +38,6 @@ impl QueryLog {
         self.entries.push_back(entry);
     }
 
-    pub fn len(&self) -> usize {
-        self.entries.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.entries.is_empty()
-    }
-
-    pub fn heap_bytes(&self) -> usize {
-        self.entries
-            .iter()
-            .map(|e| std::mem::size_of::<QueryLogEntry>() + e.domain.capacity())
-            .sum()
-    }
-
     pub fn query(&self, filter: &QueryLogFilter) -> Vec<&QueryLogEntry> {
         self.entries
             .iter()
@@ -93,26 +77,3 @@ pub struct QueryLogFilter {
     pub since: Option<SystemTime>,
     pub limit: Option<usize>,
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn heap_bytes_grows_with_entries() {
-        let mut log = QueryLog::new(100);
-        let empty = log.heap_bytes();
-        log.push(QueryLogEntry {
-            timestamp: SystemTime::now(),
-            src_addr: "127.0.0.1:1234".parse().unwrap(),
-            domain: "example.com".into(),
-            query_type: QueryType::A,
-            path: QueryPath::Forwarded,
-            transport: Transport::Udp,
-            rescode: ResultCode::NOERROR,
-            latency_us: 500,
-            dnssec: DnssecStatus::Indeterminate,
-        });
-        assert!(log.heap_bytes() > empty);
-    }
-}

src/record.rs

@@ -136,46 +136,6 @@ impl DnsRecord {
         }
     }
 
-    pub fn heap_bytes(&self) -> usize {
-        match self {
-            DnsRecord::A { domain, .. } => domain.capacity(),
-            DnsRecord::NS { domain, host, .. } | DnsRecord::CNAME { domain, host, .. } => {
-                domain.capacity() + host.capacity()
-            }
-            DnsRecord::MX { domain, host, .. } => domain.capacity() + host.capacity(),
-            DnsRecord::AAAA { domain, .. } => domain.capacity(),
-            DnsRecord::DNSKEY {
-                domain, public_key, ..
-            } => domain.capacity() + public_key.capacity(),
-            DnsRecord::DS { domain, digest, .. } => domain.capacity() + digest.capacity(),
-            DnsRecord::RRSIG {
-                domain,
-                signer_name,
-                signature,
-                ..
-            } => domain.capacity() + signer_name.capacity() + signature.capacity(),
-            DnsRecord::NSEC {
-                domain,
-                next_domain,
-                type_bitmap,
-                ..
-            } => domain.capacity() + next_domain.capacity() + type_bitmap.capacity(),
-            DnsRecord::NSEC3 {
-                domain,
-                salt,
-                next_hashed_owner,
-                type_bitmap,
-                ..
-            } => {
-                domain.capacity()
-                    + salt.capacity()
-                    + next_hashed_owner.capacity()
-                    + type_bitmap.capacity()
-            }
-            DnsRecord::UNKNOWN { domain, data, .. } => domain.capacity() + data.capacity(),
-        }
-    }
-
     pub fn set_ttl(&mut self, new_ttl: u32) {
         match self {
             DnsRecord::A { ttl, .. }
@@ -690,14 +650,4 @@ mod tests {
         let parsed = round_trip(&rec);
         assert_eq!(rec, parsed);
     }
-
-    #[test]
-    fn heap_bytes_reflects_string_capacity() {
-        let rec = DnsRecord::CNAME {
-            domain: "a]".repeat(100),
-            host: "b".repeat(200),
-            ttl: 60,
-        };
-        assert!(rec.heap_bytes() >= 300);
-    }
 }

src/recursive.rs

@@ -9,14 +9,14 @@ use crate::cache::DnsCache;
 use crate::forward::forward_udp;
 use crate::header::ResultCode;
 use crate::packet::DnsPacket;
-use crate::question::QueryType;
+use crate::question::{DnsQuestion, QueryType};
 use crate::record::DnsRecord;
 use crate::srtt::SrttCache;
 
 const MAX_REFERRAL_DEPTH: u8 = 10;
 const MAX_CNAME_DEPTH: u8 = 8;
-const NS_QUERY_TIMEOUT: Duration = Duration::from_millis(400);
+const NS_QUERY_TIMEOUT: Duration = Duration::from_millis(800);
-const TCP_TIMEOUT: Duration = Duration::from_millis(400);
+const TCP_TIMEOUT: Duration = Duration::from_millis(1500);
 const UDP_FAIL_THRESHOLD: u8 = 3;
 
 static QUERY_ID: AtomicU16 = AtomicU16::new(1);
@@ -32,14 +32,6 @@ fn dns_addr(ip: impl Into<IpAddr>) -> SocketAddr {
     SocketAddr::new(ip.into(), 53)
 }
 
-fn record_to_addr(rec: &DnsRecord) -> Option<SocketAddr> {
-    match rec {
-        DnsRecord::A { addr, .. } => Some(dns_addr(*addr)),
-        DnsRecord::AAAA { addr, .. } => Some(dns_addr(*addr)),
-        _ => None,
-    }
-}
-
 pub fn reset_udp_state() {
     UDP_DISABLED.store(false, Ordering::Release);
     UDP_FAILURES.store(0, Ordering::Release);
@@ -54,8 +46,11 @@ pub async fn probe_udp(root_hints: &[SocketAddr]) {
         Some(h) => *h,
         None => return,
     };
-    let mut probe = DnsPacket::query(next_id(), ".", QueryType::NS);
+    let mut probe = DnsPacket::new();
-    probe.header.recursion_desired = false;
+    probe.header.id = next_id();
+    probe
+        .questions
+        .push(DnsQuestion::new(".".to_string(), QueryType::NS));
     if forward_udp(&probe, hint, Duration::from_millis(1500))
         .await
         .is_ok()
@@ -65,21 +60,6 @@ pub async fn probe_udp(root_hints: &[SocketAddr]) {
     }
 }
 
-/// Probe whether recursive resolution works by querying root servers.
-/// Tries up to 3 hints before declaring failure.
-pub async fn probe_recursive(root_hints: &[SocketAddr]) -> bool {
-    let mut probe = DnsPacket::query(next_id(), ".", QueryType::NS);
-    probe.header.recursion_desired = false;
-    for hint in root_hints.iter().take(3) {
-        if let Ok(resp) = forward_udp(&probe, *hint, Duration::from_secs(3)).await {
-            if !resp.answers.is_empty() || !resp.authorities.is_empty() {
-                return true;
-            }
-        }
-    }
-    false
-}
-
 pub async fn prime_tld_cache(
     cache: &RwLock<DnsCache>,
     root_hints: &[SocketAddr],
@@ -202,24 +182,23 @@ pub(crate) fn resolve_iterative<'a>(
         let mut ns_idx = 0;
 
         for _ in 0..MAX_REFERRAL_DEPTH {
-            if ns_idx >= ns_addrs.len() {
+            let ns_addr = match ns_addrs.get(ns_idx) {
-                return Err("no nameserver available".into());
+                Some(addr) => *addr,
-            }
+                None => return Err("no nameserver available".into()),
+            };
 
             let (q_name, q_type) = minimize_query(qname, qtype, &current_zone);
 
             debug!(
-                "recursive: querying {} (+ hedge) for {:?} {} (zone: {}, depth {})",
+                "recursive: querying {} for {:?} {} (zone: {}, depth {})",
-                ns_addrs[ns_idx], q_type, q_name, current_zone, referral_depth
+                ns_addr, q_type, q_name, current_zone, referral_depth
             );
 
-            let response = match send_query_hedged(q_name, q_type, &ns_addrs[ns_idx..], srtt).await
+            let response = match send_query(q_name, q_type, ns_addr, srtt).await {
-            {
                 Ok(r) => r,
                 Err(e) => {
-                    debug!("recursive: NS query failed: {}", e);
+                    debug!("recursive: NS {} failed: {}", ns_addr, e);
-                    let remaining = ns_addrs.len().saturating_sub(ns_idx);
+                    ns_idx += 1;
-                    ns_idx += remaining.min(2);
                     continue;
                 }
             };
@@ -229,9 +208,6 @@ pub(crate) fn resolve_iterative<'a>(
             {
                 if let Some(zone) = referral_zone(&response) {
                     current_zone = zone;
-                    let mut cache_w = cache.write().unwrap();
-                    cache_ns_delegation(&mut cache_w, &current_zone, &response);
-                    drop(cache_w);
                 }
                 let mut all_ns = extract_ns_from_records(&response.answers);
                 if all_ns.is_empty() {
@@ -300,7 +276,6 @@ pub(crate) fn resolve_iterative<'a>(
 
             {
                 let mut cache_w = cache.write().unwrap();
-                cache_ns_delegation(&mut cache_w, &current_zone, &response);
                 cache_ds_from_authority(&mut cache_w, &response);
             }
             let mut new_ns_addrs = resolve_ns_addrs_from_glue(&response, &ns_names, cache);
@@ -321,8 +296,17 @@ pub(crate) fn resolve_iterative<'a>(
                             )
                             .await
                             {
-                                new_ns_addrs
+                                for rec in &ns_resp.answers {
-                                    .extend(ns_resp.answers.iter().filter_map(record_to_addr));
+                                    match rec {
+                                        DnsRecord::A { addr, .. } => {
+                                            new_ns_addrs.push(dns_addr(*addr));
+                                        }
+                                        DnsRecord::AAAA { addr, .. } => {
+                                            new_ns_addrs.push(dns_addr(*addr));
+                                        }
+                                        _ => {}
+                                    }
+                                }
                             }
                             if !new_ns_addrs.is_empty() {
                                 break;
@@ -376,7 +360,13 @@ fn find_closest_ns(
                 if let DnsRecord::NS { host, .. } = ns_rec {
                     for qt in [QueryType::A, QueryType::AAAA] {
                         if let Some(resp) = guard.lookup(host, qt) {
-                            addrs.extend(resp.answers.iter().filter_map(record_to_addr));
+                            for rec in &resp.answers {
+                                match rec {
+                                    DnsRecord::A { addr, .. } => addrs.push(dns_addr(*addr)),
+                                    DnsRecord::AAAA { addr, .. } => addrs.push(dns_addr(*addr)),
+                                    _ => {}
+                                }
+                            }
                         }
                     }
                 }
@@ -462,7 +452,13 @@ fn addrs_from_cache(cache: &RwLock<DnsCache>, name: &str) -> Vec<SocketAddr> {
     let mut addrs = Vec::new();
     for qt in [QueryType::A, QueryType::AAAA] {
         if let Some(pkt) = guard.lookup(name, qt) {
-            addrs.extend(pkt.answers.iter().filter_map(record_to_addr));
+            for rec in &pkt.answers {
+                match rec {
+                    DnsRecord::A { addr, .. } => addrs.push(dns_addr(*addr)),
+                    DnsRecord::AAAA { addr, .. } => addrs.push(dns_addr(*addr)),
+                    _ => {}
+                }
+            }
         }
     }
     addrs
@@ -472,13 +468,15 @@ fn glue_addrs_for(response: &DnsPacket, ns_name: &str) -> Vec<SocketAddr> {
     response
         .resources
         .iter()
-        .filter(|r| match r {
+        .filter_map(|r| match r {
-            DnsRecord::A { domain, .. } | DnsRecord::AAAA { domain, .. } => {
+            DnsRecord::A { domain, addr, .. } if domain.eq_ignore_ascii_case(ns_name) => {
-                domain.eq_ignore_ascii_case(ns_name)
+                Some(dns_addr(*addr))
             }
-            _ => false,
+            DnsRecord::AAAA { domain, addr, .. } if domain.eq_ignore_ascii_case(ns_name) => {
+                Some(dns_addr(*addr))
+            }
+            _ => None,
         })
-        .filter_map(record_to_addr)
         .collect()
 }
 
@@ -565,23 +563,6 @@ fn cache_ds_from_authority(cache: &mut DnsCache, response: &DnsPacket) {
     }
 }
 
-/// Cache NS delegation records from a referral response so that
-/// `find_closest_ns` can skip re-querying TLD servers on subsequent lookups.
-fn cache_ns_delegation(cache: &mut DnsCache, zone: &str, response: &DnsPacket) {
-    let ns_records: Vec<_> = response
-        .authorities
-        .iter()
-        .filter(|r| matches!(r, DnsRecord::NS { .. }))
-        .cloned()
-        .collect();
-    if ns_records.is_empty() {
-        return;
-    }
-    let mut pkt = make_glue_packet();
-    pkt.answers = ns_records;
-    cache.insert(zone, QueryType::NS, &pkt);
-}
-
 fn make_glue_packet() -> DnsPacket {
     let mut pkt = DnsPacket::new();
     pkt.header.response = true;
@@ -609,123 +590,18 @@ async fn tcp_with_srtt(
     }
 }
 
-/// Smart NS query: fire to two servers simultaneously when SRTT is unknown
-/// (cold queries), or to the best server with SRTT-based hedge when known.
-async fn send_query_hedged(
-    qname: &str,
-    qtype: QueryType,
-    servers: &[SocketAddr],
-    srtt: &RwLock<SrttCache>,
-) -> crate::Result<DnsPacket> {
-    if servers.is_empty() {
-        return Err("no nameserver available".into());
-    }
-    if servers.len() == 1 {
-        return send_query(qname, qtype, servers[0], srtt).await;
-    }
-
-    let primary = servers[0];
-    let secondary = servers[1];
-    let primary_known = srtt.read().unwrap().is_known(primary.ip());
-
-    if !primary_known {
-        // Cold: fire both simultaneously, first response wins
-        debug!(
-            "recursive: parallel query to {} and {} for {:?} {}",
-            primary, secondary, qtype, qname
-        );
-        let fut_a = send_query(qname, qtype, primary, srtt);
-        let fut_b = send_query(qname, qtype, secondary, srtt);
-        tokio::pin!(fut_a);
-        tokio::pin!(fut_b);
-
-        // First Ok wins. If one errors, wait for the other.
-        let mut a_done = false;
-        let mut b_done = false;
-        let mut a_err: Option<crate::Error> = None;
-        let mut b_err: Option<crate::Error> = None;
-
-        loop {
-            tokio::select! {
-                r = &mut fut_a, if !a_done => {
-                    match r {
-                        Ok(resp) => return Ok(resp),
-                        Err(e) => { a_done = true; a_err = Some(e); }
-                    }
-                }
-                r = &mut fut_b, if !b_done => {
-                    match r {
-                        Ok(resp) => return Ok(resp),
-                        Err(e) => { b_done = true; b_err = Some(e); }
-                    }
-                }
-            }
-            match (a_err.take(), b_err.take()) {
-                (Some(e), Some(_)) => return Err(e),
-                (a, b) => {
-                    a_err = a;
-                    b_err = b;
-                }
-            }
-        }
-    } else {
-        // Warm: send to best, hedge after SRTT × 3 if slow
-        let hedge_ms = srtt.read().unwrap().get(primary.ip()) * 3;
-        let hedge_delay = Duration::from_millis(hedge_ms.max(50));
-
-        let fut_a = send_query(qname, qtype, primary, srtt);
-        tokio::pin!(fut_a);
-        let delay = tokio::time::sleep(hedge_delay);
-        tokio::pin!(delay);
-
-        tokio::select! {
-            r = &mut fut_a => return r,
-            _ = &mut delay => {}
-        }
-
-        debug!(
-            "recursive: hedging {} -> {} after {}ms for {:?} {}",
-            primary, secondary, hedge_ms, qtype, qname
-        );
-        let fut_b = send_query(qname, qtype, secondary, srtt);
-        tokio::pin!(fut_b);
-
-        // First Ok wins; if one errors, wait for the other.
-        let mut a_err: Option<crate::Error> = None;
-        let mut b_err: Option<crate::Error> = None;
-        loop {
-            tokio::select! {
-                r = &mut fut_a, if a_err.is_none() => {
-                    match r {
-                        Ok(resp) => return Ok(resp),
-                        Err(e) => {
-                            if b_err.is_some() { return Err(e); }
-                            a_err = Some(e);
-                        }
-                    }
-                }
-                r = &mut fut_b, if b_err.is_none() => {
-                    match r {
-                        Ok(resp) => return Ok(resp),
-                        Err(e) => {
-                            if let Some(ae) = a_err.take() { return Err(ae); }
-                            b_err = Some(e);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
 async fn send_query(
     qname: &str,
     qtype: QueryType,
     server: SocketAddr,
     srtt: &RwLock<SrttCache>,
 ) -> crate::Result<DnsPacket> {
-    let mut query = DnsPacket::query(next_id(), qname, qtype);
+    let mut query = DnsPacket::new();
+    query.header.id = next_id();
     query.header.recursion_desired = false;
+    query
+        .questions
+        .push(DnsQuestion::new(qname.to_string(), qtype));
     query.edns = Some(crate::packet::EdnsOpt {
         do_bit: true,
         ..Default::default()
@@ -765,13 +641,9 @@ async fn send_query(
                     "send_query: {} consecutive UDP failures — switching to TCP-first",
                     fails
                 );
-                // Now that UDP is disabled, retry this query via TCP
-                return tcp_with_srtt(&query, server, srtt, start).await;
             }
-            // UDP works in general (priming succeeded) but this server timed out.
+            debug!("send_query: UDP failed for {}: {}, trying TCP", server, e);
-            // Don't waste another 400ms on TCP — the server is unreachable.
+            tcp_with_srtt(&query, server, srtt, start).await
-            srtt.write().unwrap().record_failure(server.ip());
-            Err(e)
         }
     }
 }
@@ -813,10 +685,6 @@ mod tests {
     use super::*;
     use std::net::{Ipv4Addr, Ipv6Addr};
 
-    /// Tests that mutate the global UDP_DISABLED / UDP_FAILURES flags must hold
-    /// this lock to avoid racing with each other under `cargo test` parallelism.
-    static UDP_STATE_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
-
     #[test]
     fn extract_ns_from_authority() {
         let mut pkt = DnsPacket::new();
@@ -1009,25 +877,14 @@ mod tests {
                 };
                 let handler = handler.clone();
                 tokio::spawn(async move {
-                    let timeout = std::time::Duration::from_secs(5);
                     // Read length-prefixed DNS query
                     let mut len_buf = [0u8; 2];
-                    if tokio::time::timeout(timeout, stream.read_exact(&mut len_buf))
+                    if stream.read_exact(&mut len_buf).await.is_err() {
-                        .await
-                        .ok()
-                        .and_then(|r| r.ok())
-                        .is_none()
-                    {
                         return;
                     }
                     let len = u16::from_be_bytes(len_buf) as usize;
                     let mut data = vec![0u8; len];
-                    if tokio::time::timeout(timeout, stream.read_exact(&mut data))
+                    if stream.read_exact(&mut data).await.is_err() {
-                        .await
-                        .ok()
-                        .and_then(|r| r.ok())
-                        .is_none()
-                    {
                         return;
                     }
 
@@ -1055,11 +912,10 @@ mod tests {
     }
 
     /// TCP-only server returns authoritative answer directly.
-    /// Verifies: when UDP is disabled, TCP-first resolves.
+    /// Verifies: UDP fails → TCP fallback → resolves.
     #[tokio::test]
     async fn tcp_fallback_resolves_when_udp_blocked() {
-        let _guard = UDP_STATE_LOCK.lock().unwrap();
+        UDP_DISABLED.store(false, Ordering::Relaxed);
-        UDP_DISABLED.store(true, Ordering::Relaxed);
         UDP_FAILURES.store(0, Ordering::Release);
 
         let server_addr = spawn_tcp_dns_server(|query| {
@@ -1090,32 +946,49 @@ mod tests {
         }
     }
 
-    /// TCP round-trip through mock: query → authoritative answer via forward_tcp.
+    /// Full iterative resolution through TCP-only mock: root referral → authoritative answer.
-    /// Uses forward_tcp directly to avoid dependence on the global UDP_DISABLED flag
+    /// The mock plays both roles (returns referral for NS queries, answer for A queries).
-    /// which is shared across concurrent tests.
     #[tokio::test]
     async fn tcp_only_iterative_resolution() {
+        UDP_DISABLED.store(true, Ordering::Release); // Skip UDP entirely for speed
+
         let server_addr = spawn_tcp_dns_server(|query| {
             let q = match query.questions.first() {
                 Some(q) => q,
                 None => return DnsPacket::response_from(query, ResultCode::SERVFAIL),
             };
 
-            let mut resp = DnsPacket::response_from(query, ResultCode::NOERROR);
+            if q.qtype == QueryType::NS || q.name == "com" {
-            resp.header.authoritative_answer = true;
+                // Return referral — NS points back to ourselves (same IP, port 53 in glue
-            resp.answers.push(DnsRecord::A {
+                // won't work, but cache will have our address from root_hints)
-                domain: q.name.clone(),
+                let mut resp = DnsPacket::new();
-                addr: Ipv4Addr::new(10, 0, 0, 42),
+                resp.header.id = query.header.id;
-                ttl: 300,
+                resp.header.response = true;
-            });
+                resp.header.rescode = ResultCode::NOERROR;
-            resp
+                resp.questions = query.questions.clone();
+                resp.authorities.push(DnsRecord::NS {
+                    domain: "com".into(),
+                    host: "ns1.com".into(),
+                    ttl: 3600,
+                });
+                resp
+            } else {
+                // Return authoritative answer
+                let mut resp = DnsPacket::response_from(query, ResultCode::NOERROR);
+                resp.header.authoritative_answer = true;
+                resp.answers.push(DnsRecord::A {
+                    domain: q.name.clone(),
+                    addr: Ipv4Addr::new(10, 0, 0, 42),
+                    ttl: 300,
+                });
+                resp
+            }
         })
         .await;
 
-        let query = DnsPacket::query(0x1234, "hello.example.com", QueryType::A);
+        let srtt = RwLock::new(SrttCache::new(true));
-        let resp = crate::forward::forward_tcp(&query, server_addr, TCP_TIMEOUT)
+        let result = send_query("hello.example.com", QueryType::A, server_addr, &srtt).await;
-            .await
+        let resp = result.expect("TCP-only send_query should work");
-            .expect("TCP query should work");
         assert_eq!(resp.header.rescode, ResultCode::NOERROR);
         match &resp.answers[0] {
             DnsRecord::A { addr, .. } => assert_eq!(*addr, Ipv4Addr::new(10, 0, 0, 42)),
@@ -1125,8 +998,7 @@ mod tests {
 
     #[tokio::test]
     async fn tcp_fallback_handles_nxdomain() {
-        let _guard = UDP_STATE_LOCK.lock().unwrap();
+        UDP_DISABLED.store(false, Ordering::Relaxed);
-        UDP_DISABLED.store(true, Ordering::Relaxed);
         UDP_FAILURES.store(0, Ordering::Release);
 
         let server_addr = spawn_tcp_dns_server(|query| {
@@ -1158,7 +1030,6 @@ mod tests {
 
     #[tokio::test]
     async fn udp_auto_disable_resets() {
-        let _guard = UDP_STATE_LOCK.lock().unwrap();
         UDP_DISABLED.store(true, Ordering::Release);
         UDP_FAILURES.store(5, Ordering::Relaxed);
 
@@ -1185,7 +1056,11 @@ mod tests {
         })
         .await;
 
-        let query = DnsPacket::query(0xBEEF, "test.com", QueryType::A);
+        let mut query = DnsPacket::new();
+        query.header.id = 0xBEEF;
+        query
+            .questions
+            .push(DnsQuestion::new("test.com".to_string(), QueryType::A));
 
         let resp = crate::forward::forward_tcp(&query, server_addr, Duration::from_secs(2))
             .await
@@ -1245,7 +1120,11 @@ mod tests {
                 .unwrap();
         });
 
-        let query = DnsPacket::query(0xCAFE, "strict.test", QueryType::A);
+        let mut query = DnsPacket::new();
+        query.header.id = 0xCAFE;
+        query
+            .questions
+            .push(DnsQuestion::new("strict.test".to_string(), QueryType::A));
 
         let resp = crate::forward::forward_tcp(&query, addr, Duration::from_secs(2))
             .await

src/setup_phone.rs

@@ -1,126 +0,0 @@
-//! `numa setup-phone` CLI — thin QR wrapper over the persistent mobile API.
-//!
-//! Before the mobile API existed, this command spawned its own one-shot
-//! HTTP server on port 8765 to serve a freshly-generated mobileconfig
-//! for a single download. That role now belongs to
-//! [`crate::mobile_api`], which runs persistently alongside the main
-//! API and serves `/mobileconfig` at the same port whenever Numa is
-//! running.
-//!
-//! This command is now a thin terminal-side wrapper:
-//!
-//!   1. Detect the current LAN IP
-//!   2. Render a terminal QR code pointing at
-//!      `http://<lan_ip>:8765/mobileconfig`
-//!   3. Print install instructions and exit
-//!
-//! The user scans the QR, iOS fetches the profile from the mobile API
-//! (which is always up as long as `numa` is running), installs, and the
-//! user walks through Settings → Certificate Trust Settings to enable
-//! trust.
-//!
-//! Numa must be running for the profile download to succeed; if the
-//! mobile API is not listening on port 8765, the download will fail
-//! and the user will see Safari's "Cannot Connect to Server" error.
-//! The CLI prints a reminder about this at the bottom of the output.
-
-use qrcode::render::unicode;
-use qrcode::QrCode;
-
-/// Default port where the persistent mobile API serves `/mobileconfig`.
-/// Matches `MobileConfig::default().port` in `config.rs`. If the user
-/// has overridden `[mobile] port = N` in `numa.toml`, they'll need to
-/// adjust the URL manually — this CLI uses the default without parsing
-/// `numa.toml`.
-const SETUP_PORT: u16 = 8765;
-
-fn render_qr(url: &str) -> Result<String, String> {
-    let code = QrCode::new(url).map_err(|e| format!("failed to encode QR: {}", e))?;
-    Ok(code
-        .render::<unicode::Dense1x2>()
-        .dark_color(unicode::Dense1x2::Light)
-        .light_color(unicode::Dense1x2::Dark)
-        .build())
-}
-
-/// Run the `numa setup-phone` flow.
-pub async fn run() -> Result<(), String> {
-    let lan_ip = crate::lan::detect_lan_ip()
-        .ok_or("could not detect LAN IP — are you connected to a network?")?;
-
-    let addr = std::net::SocketAddr::from(([127, 0, 0, 1], SETUP_PORT));
-    let api_reachable = tokio::time::timeout(
-        std::time::Duration::from_millis(500),
-        tokio::net::TcpStream::connect(addr),
-    )
-    .await
-    .map(|r| r.is_ok())
-    .unwrap_or(false);
-
-    if !api_reachable {
-        eprintln!();
-        eprintln!(
-            "  \x1b[1;38;2;192;98;58mNuma\x1b[0m — mobile API is not reachable on port {}.",
-            SETUP_PORT
-        );
-        eprintln!();
-        eprintln!("  The phone won't be able to download the profile until the mobile");
-        eprintln!("  API is running. Add this to your numa.toml and restart Numa:");
-        eprintln!();
-        eprintln!("    [mobile]");
-        eprintln!("    enabled = true");
-        eprintln!();
-        return Err("mobile API not running".into());
-    }
-
-    let url = format!("http://{}:{}/mobileconfig", lan_ip, SETUP_PORT);
-    let qr = render_qr(&url)?;
-
-    eprintln!();
-    eprintln!("  \x1b[1;38;2;192;98;58mNuma Phone Setup\x1b[0m");
-    eprintln!();
-    eprintln!("  Profile URL: \x1b[36m{}\x1b[0m", url);
-    eprintln!();
-    for line in qr.lines() {
-        eprintln!("  {}", line);
-    }
-    eprintln!();
-    eprintln!("  \x1b[1mOn your iPhone:\x1b[0m");
-    eprintln!("    1. Open Camera, point at the QR code, tap the yellow banner");
-    eprintln!("    2. Allow the download when Safari asks");
-    eprintln!("    3. Open Settings — tap \"Profile Downloaded\" near the top");
-    eprintln!("       (or: Settings → General → VPN & Device Management → Numa DNS)");
-    eprintln!("    4. Tap Install (top right), enter passcode, Install again");
-    eprintln!("    5. \x1b[1mSettings → General → About → Certificate Trust Settings\x1b[0m");
-    eprintln!("       Toggle ON \"Numa Local CA\" — required for DoT to work");
-    eprintln!();
-    eprintln!(
-        "  \x1b[33mNote:\x1b[0m profile uses your laptop's current IP ({}). If your",
-        lan_ip
-    );
-    eprintln!("  laptop changes networks, re-scan this QR — iOS will replace the");
-    eprintln!("  existing profile automatically (fixed UUID).");
-    eprintln!();
-    eprintln!(
-        "  \x1b[90mThe profile is served by Numa's persistent mobile API on port {}.\x1b[0m",
-        SETUP_PORT
-    );
-    eprintln!("  \x1b[90mMake sure `numa` is running before scanning. If it's not,\x1b[0m");
-    eprintln!("  \x1b[90mstart it with `sudo numa install` or run it interactively.\x1b[0m");
-    eprintln!();
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn render_qr_produces_unicode() {
-        let qr = render_qr("http://192.168.1.9:8765/mobileconfig").unwrap();
-        assert!(!qr.is_empty());
-        // Dense1x2 uses these block characters
-        assert!(qr.chars().any(|c| matches!(c, '█' | '▀' | '▄' | ' ')));
-    }
-}

src/srtt.rs

@@ -45,26 +45,18 @@ impl SrttCache {
         }
     }
 
-    /// Whether we have observed RTT data for this IP.
-    pub fn is_known(&self, ip: IpAddr) -> bool {
-        self.entries.contains_key(&ip)
-    }
-
     /// Apply time-based decay: each DECAY_AFTER_SECS period halves distance to INITIAL.
     fn decayed_srtt(entry: &SrttEntry) -> u64 {
-        Self::decay_for_age(entry.srtt_ms, entry.updated_at.elapsed().as_secs())
+        let age_secs = entry.updated_at.elapsed().as_secs();
-    }
-
-    fn decay_for_age(srtt_ms: u64, age_secs: u64) -> u64 {
         if age_secs > DECAY_AFTER_SECS {
             let periods = (age_secs / DECAY_AFTER_SECS).min(8);
-            let mut srtt = srtt_ms;
+            let mut srtt = entry.srtt_ms;
             for _ in 0..periods {
                 srtt = (srtt + INITIAL_SRTT_MS) / 2;
             }
             srtt
         } else {
-            srtt_ms
+            entry.srtt_ms
         }
     }
 
@@ -108,14 +100,6 @@ impl SrttCache {
         addrs.sort_by_key(|a| self.get(a.ip()));
     }
 
-    pub fn heap_bytes(&self) -> usize {
-        let per_slot = std::mem::size_of::<u64>()
-            + std::mem::size_of::<IpAddr>()
-            + std::mem::size_of::<SrttEntry>()
-            + 1;
-        self.entries.capacity() * per_slot
-    }
-
     pub fn len(&self) -> usize {
         self.entries.len()
     }
@@ -124,6 +108,13 @@ impl SrttCache {
         self.entries.is_empty()
     }
 
+    #[cfg(test)]
+    fn set_updated_at(&mut self, ip: IpAddr, at: Instant) {
+        if let Some(entry) = self.entries.get_mut(&ip) {
+            entry.updated_at = at;
+        }
+    }
+
     fn maybe_evict(&mut self) {
         if self.entries.len() < MAX_ENTRIES {
             return;
@@ -219,41 +210,63 @@ mod tests {
         assert_eq!(addrs, original);
     }
 
+    fn age(secs: u64) -> Instant {
+        Instant::now() - std::time::Duration::from_secs(secs)
+    }
+
+    /// Cache with ip(1) saturated at FAILURE_PENALTY_MS
+    fn saturated_penalty_cache() -> SrttCache {
+        let mut cache = SrttCache::new(true);
+        for _ in 0..30 {
+            cache.record_rtt(ip(1), FAILURE_PENALTY_MS, false);
+        }
+        cache
+    }
+
     #[test]
     fn no_decay_within_threshold() {
-        // At exactly DECAY_AFTER_SECS, no decay applied
+        let mut cache = SrttCache::new(true);
-        let result = SrttCache::decay_for_age(FAILURE_PENALTY_MS, DECAY_AFTER_SECS);
+        cache.record_rtt(ip(1), 5000, false);
-        assert_eq!(result, FAILURE_PENALTY_MS);
+        cache.set_updated_at(ip(1), age(DECAY_AFTER_SECS));
+        assert_eq!(cache.get(ip(1)), cache.entries[&ip(1)].srtt_ms);
     }
 
     #[test]
     fn one_decay_period() {
-        let result = SrttCache::decay_for_age(FAILURE_PENALTY_MS, DECAY_AFTER_SECS + 1);
+        let mut cache = saturated_penalty_cache();
-        let expected = (FAILURE_PENALTY_MS + INITIAL_SRTT_MS) / 2;
+        let raw = cache.entries[&ip(1)].srtt_ms;
-        assert_eq!(result, expected);
+        cache.set_updated_at(ip(1), age(DECAY_AFTER_SECS + 1));
+        let expected = (raw + INITIAL_SRTT_MS) / 2;
+        assert_eq!(cache.get(ip(1)), expected);
     }
 
     #[test]
     fn multiple_decay_periods() {
-        let result = SrttCache::decay_for_age(FAILURE_PENALTY_MS, DECAY_AFTER_SECS * 4 + 1);
+        let mut cache = saturated_penalty_cache();
-        let mut expected = FAILURE_PENALTY_MS;
+        let raw = cache.entries[&ip(1)].srtt_ms;
+        cache.set_updated_at(ip(1), age(DECAY_AFTER_SECS * 4 + 1));
+        let mut expected = raw;
         for _ in 0..4 {
             expected = (expected + INITIAL_SRTT_MS) / 2;
         }
-        assert_eq!(result, expected);
+        assert_eq!(cache.get(ip(1)), expected);
     }
 
     #[test]
     fn decay_caps_at_8_periods() {
         // 9 periods and 100 periods should produce the same result (capped at 8)
-        let a = SrttCache::decay_for_age(FAILURE_PENALTY_MS, DECAY_AFTER_SECS * 9 + 1);
+        let mut cache_a = saturated_penalty_cache();
-        let b = SrttCache::decay_for_age(FAILURE_PENALTY_MS, DECAY_AFTER_SECS * 100);
+        let mut cache_b = saturated_penalty_cache();
-        assert_eq!(a, b);
+        cache_a.set_updated_at(ip(1), age(DECAY_AFTER_SECS * 9 + 1));
+        cache_b.set_updated_at(ip(1), age(DECAY_AFTER_SECS * 100));
+        assert_eq!(cache_a.get(ip(1)), cache_b.get(ip(1)));
     }
 
     #[test]
     fn decay_converges_toward_initial() {
-        let decayed = SrttCache::decay_for_age(FAILURE_PENALTY_MS, DECAY_AFTER_SECS * 100);
+        let mut cache = saturated_penalty_cache();
+        cache.set_updated_at(ip(1), age(DECAY_AFTER_SECS * 100));
+        let decayed = cache.get(ip(1));
         let diff = decayed.abs_diff(INITIAL_SRTT_MS);
         assert!(
             diff < 25,
@@ -265,38 +278,29 @@ mod tests {
 
     #[test]
     fn record_rtt_applies_decay_before_ewma() {
-        // Verify decay is applied before EWMA in record_rtt by checking
+        let mut cache = saturated_penalty_cache();
-        // that a saturated penalty + long age + new sample produces a low SRTT
+        cache.set_updated_at(ip(1), age(DECAY_AFTER_SECS * 8));
-        let decayed = SrttCache::decay_for_age(FAILURE_PENALTY_MS, DECAY_AFTER_SECS * 8);
+        cache.record_rtt(ip(1), 50, false);
-        // EWMA: (decayed * 7 + 50) / 8
+        let srtt = cache.get(ip(1));
-        let after_ewma = (decayed * 7 + 50) / 8;
+        // Without decay-before-EWMA, result would be ~(5000*7+50)/8 ≈ 4381
-        assert!(
+        assert!(srtt < 500, "expected decay before EWMA, got srtt={}", srtt);
-            after_ewma < 500,
-            "expected decay before EWMA, got srtt={}",
-            after_ewma
-        );
     }
 
     #[test]
     fn decay_reranks_stale_failures() {
-        // After enough decay, a failed server (5000ms) converges toward
+        let mut cache = saturated_penalty_cache();
-        // INITIAL (200ms), which is below a stable server at 300ms
+        for _ in 0..30 {
-        let decayed = SrttCache::decay_for_age(FAILURE_PENALTY_MS, DECAY_AFTER_SECS * 100);
+            cache.record_rtt(ip(2), 300, false);
-        assert!(
-            decayed < 300,
-            "expected decayed penalty ({}) < 300ms",
-            decayed
-        );
-    }
-
-    #[test]
-    fn heap_bytes_grows_with_entries() {
-        let mut cache = SrttCache::new(true);
-        let empty = cache.heap_bytes();
-        for i in 1..=10u8 {
-            cache.record_rtt(ip(i), 100, false);
         }
-        assert!(cache.heap_bytes() > empty);
+        let mut addrs = vec![sock(1), sock(2)];
+        cache.sort_by_rtt(&mut addrs);
+        assert_eq!(addrs, vec![sock(2), sock(1)]);
+
+        // Age server 1 so it decays toward INITIAL (200ms) — below server 2's 300ms
+        cache.set_updated_at(ip(1), age(DECAY_AFTER_SECS * 100));
+        let mut addrs = vec![sock(1), sock(2)];
+        cache.sort_by_rtt(&mut addrs);
+        assert_eq!(addrs, vec![sock(1), sock(2)]);
     }
 
     #[test]

src/stats.rs

@@ -1,92 +1,5 @@
 use std::time::Instant;
 
-/// Returns the process memory footprint in bytes, or 0 if unavailable.
-/// macOS: phys_footprint (matches Activity Monitor). Linux: RSS from /proc/self/statm.
-pub fn process_memory_bytes() -> usize {
-    #[cfg(target_os = "macos")]
-    {
-        macos_rss()
-    }
-    #[cfg(target_os = "linux")]
-    {
-        linux_rss()
-    }
-    #[cfg(not(any(target_os = "macos", target_os = "linux")))]
-    {
-        0
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn macos_rss() -> usize {
-    use std::mem;
-    extern "C" {
-        fn mach_task_self() -> u32;
-        fn task_info(
-            target_task: u32,
-            flavor: u32,
-            task_info_out: *mut TaskVmInfo,
-            task_info_count: *mut u32,
-        ) -> i32;
-    }
-    // Partial task_vm_info_data_t — only fields up to phys_footprint.
-    #[repr(C)]
-    struct TaskVmInfo {
-        virtual_size: u64,
-        region_count: i32,
-        page_size: i32,
-        resident_size: u64,
-        resident_size_peak: u64,
-        device: u64,
-        device_peak: u64,
-        internal: u64,
-        internal_peak: u64,
-        external: u64,
-        external_peak: u64,
-        reusable: u64,
-        reusable_peak: u64,
-        purgeable_volatile_pmap: u64,
-        purgeable_volatile_resident: u64,
-        purgeable_volatile_virtual: u64,
-        compressed: u64,
-        compressed_peak: u64,
-        compressed_lifetime: u64,
-        phys_footprint: u64,
-    }
-    const TASK_VM_INFO: u32 = 22;
-    let mut info: TaskVmInfo = unsafe { mem::zeroed() };
-    let mut count = (mem::size_of::<TaskVmInfo>() / mem::size_of::<u32>()) as u32;
-    let kr = unsafe { task_info(mach_task_self(), TASK_VM_INFO, &mut info, &mut count) };
-    if kr == 0 {
-        info.phys_footprint as usize
-    } else {
-        0
-    }
-}
-
-#[cfg(target_os = "linux")]
-fn linux_rss() -> usize {
-    extern "C" {
-        fn sysconf(name: i32) -> i64;
-    }
-    const SC_PAGESIZE: i32 = 30; // x86_64 + aarch64; differs on mips (28), sparc (29)
-    let page_size = unsafe { sysconf(SC_PAGESIZE) };
-    let page_size = if page_size > 0 {
-        page_size as usize
-    } else {
-        4096
-    };
-
-    if let Ok(statm) = std::fs::read_to_string("/proc/self/statm") {
-        if let Some(rss_pages) = statm.split_whitespace().nth(1) {
-            if let Ok(pages) = rss_pages.parse::<usize>() {
-                return pages * page_size;
-            }
-        }
-    }
-    0
-}
-
 pub struct ServerStats {
     queries_total: u64,
     queries_forwarded: u64,
@@ -97,32 +10,9 @@ pub struct ServerStats {
     queries_local: u64,
     queries_overridden: u64,
     upstream_errors: u64,
-    transport_udp: u64,
-    transport_tcp: u64,
-    transport_dot: u64,
-    transport_doh: u64,
     started_at: Instant,
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Transport {
-    Udp,
-    Tcp,
-    Dot,
-    Doh,
-}
-
-impl Transport {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            Transport::Udp => "UDP",
-            Transport::Tcp => "TCP",
-            Transport::Dot => "DOT",
-            Transport::Doh => "DOH",
-        }
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum QueryPath {
     Local,
@@ -190,15 +80,11 @@ impl ServerStats {
             queries_local: 0,
             queries_overridden: 0,
             upstream_errors: 0,
-            transport_udp: 0,
-            transport_tcp: 0,
-            transport_dot: 0,
-            transport_doh: 0,
             started_at: Instant::now(),
         }
     }
 
-    pub fn record(&mut self, path: QueryPath, transport: Transport) -> u64 {
+    pub fn record(&mut self, path: QueryPath) -> u64 {
         self.queries_total += 1;
         match path {
             QueryPath::Local => self.queries_local += 1,
@@ -210,12 +96,6 @@ impl ServerStats {
             QueryPath::Overridden => self.queries_overridden += 1,
             QueryPath::UpstreamError => self.upstream_errors += 1,
         }
-        match transport {
-            Transport::Udp => self.transport_udp += 1,
-            Transport::Tcp => self.transport_tcp += 1,
-            Transport::Dot => self.transport_dot += 1,
-            Transport::Doh => self.transport_doh += 1,
-        }
         self.queries_total
     }
 
@@ -239,10 +119,6 @@ impl ServerStats {
             overridden: self.queries_overridden,
             blocked: self.queries_blocked,
             errors: self.upstream_errors,
-            transport_udp: self.transport_udp,
-            transport_tcp: self.transport_tcp,
-            transport_dot: self.transport_dot,
-            transport_doh: self.transport_doh,
         }
     }
 
@@ -279,8 +155,4 @@ pub struct StatsSnapshot {
     pub overridden: u64,
     pub blocked: u64,
     pub errors: u64,
-    pub transport_udp: u64,
-    pub transport_tcp: u64,
-    pub transport_dot: u64,
-    pub transport_doh: u64,
 }

src/tls.rs

@@ -5,9 +5,7 @@ use std::sync::Arc;
 use log::{info, warn};
 
 use crate::ctx::ServerCtx;
-use rcgen::{
+use rcgen::{BasicConstraints, CertificateParams, DnType, IsCa, KeyPair, KeyUsagePurpose, SanType};
-    BasicConstraints, CertificateParams, DnType, IsCa, Issuer, KeyPair, KeyUsagePurpose, SanType,
-};
 use rustls::pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
 use rustls::ServerConfig;
 use time::{Duration, OffsetDateTime};
@@ -15,13 +13,6 @@ use time::{Duration, OffsetDateTime};
 const CA_VALIDITY_DAYS: i64 = 3650; // 10 years
 const CERT_VALIDITY_DAYS: i64 = 365; // 1 year
 
-/// Common Name on Numa's local CA. Referenced by trust-store helpers
-/// (`security`, `certutil`) when locating the cert for removal.
-pub const CA_COMMON_NAME: &str = "Numa Local CA";
-
-/// Filename of the CA certificate inside the data dir.
-pub const CA_FILE_NAME: &str = "ca.pem";
-
 /// Collect all service + LAN peer names and regenerate the TLS cert.
 pub fn regenerate_tls(ctx: &ServerCtx) {
     let tls = match &ctx.tls_config {
@@ -33,7 +24,7 @@ pub fn regenerate_tls(ctx: &ServerCtx) {
     names.extend(ctx.lan_peers.lock().unwrap().names());
     let names: Vec<String> = names.into_iter().collect();
 
-    match build_tls_config(&ctx.proxy_tld, &names, Vec::new(), &ctx.data_dir) {
+    match build_tls_config(&ctx.proxy_tld, &names) {
         Ok(new_config) => {
             tls.store(new_config);
             info!("TLS cert regenerated for {} services", names.len());
@@ -42,64 +33,20 @@ pub fn regenerate_tls(ctx: &ServerCtx) {
     }
 }
 
-/// Advisory for TLS-setup failures caused by a non-writable data dir;
-/// `None` if not applicable so the caller can fall back to the raw error.
-pub fn try_data_dir_advisory(err: &crate::Error, data_dir: &Path) -> Option<String> {
-    let io_err = err.downcast_ref::<std::io::Error>()?;
-    if io_err.kind() != std::io::ErrorKind::PermissionDenied {
-        return None;
-    }
-    let o = "\x1b[1;38;2;192;98;58m";
-    let r = "\x1b[0m";
-    Some(format!(
-        "
-{o}Numa{r} — HTTPS proxy disabled: cannot write TLS CA to {}.
-
-  The data directory is not writable by the current user. Numa needs
-  to persist a local Certificate Authority there to serve .numa over
-  HTTPS. DNS resolution and plain-HTTP proxy continue to work.
-
-  Fix — pick one:
-
-    1. Install Numa as the system resolver (sets up a writable data dir):
-
-         sudo numa install       (on Windows, run as Administrator)
-
-    2. Point data_dir at a path you can write.
-       Create {} with:
-
-         [server]
-         data_dir = \"/path/you/can/write\"
-
-",
-        data_dir.display(),
-        crate::suggested_config_path().display()
-    ))
-}
-
 /// Build a TLS config with a cert covering all provided service names.
 /// Wildcards under single-label TLDs (*.numa) are rejected by browsers,
 /// so we list each service explicitly as a SAN.
-/// `alpn` is advertised in the TLS ServerHello — pass empty for the proxy
+pub fn build_tls_config(tld: &str, service_names: &[String]) -> crate::Result<Arc<ServerConfig>> {
-/// (which accepts any ALPN), or `[b"dot"]` for DoT (RFC 7858 §3.2).
+    let dir = crate::data_dir();
-/// `data_dir` is where the CA material is stored — taken from
+    let (ca_cert, ca_key) = ensure_ca(&dir)?;
-/// `[server] data_dir` in numa.toml (defaults to `crate::data_dir()`).
+    let (cert_chain, key) = generate_service_cert(&ca_cert, &ca_key, tld, service_names)?;
-pub fn build_tls_config(
-    tld: &str,
-    service_names: &[String],
-    alpn: Vec<Vec<u8>>,
-    data_dir: &Path,
-) -> crate::Result<Arc<ServerConfig>> {
-    let (ca_der, issuer) = ensure_ca(data_dir)?;
-    let (cert_chain, key) = generate_service_cert(&ca_der, &issuer, tld, service_names)?;
 
     // Ensure a crypto provider is installed (rustls needs one)
     let _ = rustls::crypto::ring::default_provider().install_default();
 
-    let mut config = ServerConfig::builder()
+    let config = ServerConfig::builder()
         .with_no_client_auth()
         .with_single_cert(cert_chain, key)?;
-    config.alpn_protocols = alpn;
 
     info!(
         "TLS configured for {} .{} domains",
@@ -109,20 +56,18 @@ pub fn build_tls_config(
     Ok(Arc::new(config))
 }
 
-fn ensure_ca(dir: &Path) -> crate::Result<(CertificateDer<'static>, Issuer<'static, KeyPair>)> {
+fn ensure_ca(dir: &Path) -> crate::Result<(rcgen::Certificate, KeyPair)> {
     let ca_key_path = dir.join("ca.key");
-    let ca_cert_path = dir.join(CA_FILE_NAME);
+    let ca_cert_path = dir.join("ca.pem");
 
     if ca_key_path.exists() && ca_cert_path.exists() {
         let key_pem = std::fs::read_to_string(&ca_key_path)?;
         let cert_pem = std::fs::read_to_string(&ca_cert_path)?;
         let key_pair = KeyPair::from_pem(&key_pem)?;
-        let ca_der = rustls_pemfile::certs(&mut cert_pem.as_bytes())
+        let params = CertificateParams::from_ca_cert_pem(&cert_pem)?;
-            .next()
+        let cert = params.self_signed(&key_pair)?;
-            .ok_or("empty CA PEM file")??;
-        let issuer = Issuer::from_ca_cert_der(&ca_der, key_pair)?;
         info!("loaded CA from {:?}", ca_cert_path);
-        return Ok((ca_der, issuer));
+        return Ok((cert, key_pair));
     }
 
     // Generate new CA
@@ -132,7 +77,7 @@ fn ensure_ca(dir: &Path) -> crate::Result<(CertificateDer<'static>, Issuer<'stat
     let mut params = CertificateParams::default();
     params
         .distinguished_name
-        .push(DnType::CommonName, CA_COMMON_NAME);
+        .push(DnType::CommonName, "Numa Local CA");
     params.is_ca = IsCa::Ca(BasicConstraints::Unconstrained);
     params.key_usages = vec![KeyUsagePurpose::KeyCertSign, KeyUsagePurpose::CrlSign];
     params.not_before = OffsetDateTime::now_utc();
@@ -150,16 +95,14 @@ fn ensure_ca(dir: &Path) -> crate::Result<(CertificateDer<'static>, Issuer<'stat
     }
 
     info!("generated CA at {:?}", ca_cert_path);
-    let ca_der = cert.der().clone();
+    Ok((cert, key_pair))
-    let issuer = Issuer::new(params, key_pair);
-    Ok((ca_der, issuer))
 }
 
 /// Generate a cert with explicit SANs for each service name.
 /// Always regenerated at startup (~5ms) — no disk caching needed.
 fn generate_service_cert(
-    ca_der: &CertificateDer<'static>,
+    ca_cert: &rcgen::Certificate,
-    issuer: &Issuer<'_, KeyPair>,
+    ca_key: &KeyPair,
     tld: &str,
     service_names: &[String],
 ) -> crate::Result<(Vec<CertificateDer<'static>>, PrivateKeyDer<'static>)> {
@@ -186,26 +129,15 @@ fn generate_service_cert(
         }
     }
 
-    // Loopback IP SANs so browsers can reach DoH at https://127.0.0.1/dns-query
+    if sans.is_empty() {
-    sans.push(SanType::IpAddress(std::net::IpAddr::V4(
+        return Err("no valid service names for TLS cert".into());
-        std::net::Ipv4Addr::LOCALHOST,
-    )));
-    sans.push(SanType::IpAddress(std::net::IpAddr::V6(
-        std::net::Ipv6Addr::LOCALHOST,
-    )));
-
-    for name in ["localhost", tld] {
-        match name.to_string().try_into() {
-            Ok(ia5) => sans.push(SanType::DnsName(ia5)),
-            Err(e) => warn!("invalid SAN {}: {}", name, e),
-        }
     }
 
     params.subject_alt_names = sans;
     params.not_before = OffsetDateTime::now_utc();
     params.not_after = OffsetDateTime::now_utc() + Duration::days(CERT_VALIDITY_DAYS);
 
-    let cert = params.signed_by(&key_pair, issuer)?;
+    let cert = params.signed_by(&key_pair, ca_cert, ca_key)?;
 
     info!(
         "generated TLS cert for: {}",
@@ -216,107 +148,9 @@ fn generate_service_cert(
             .join(", ")
     );
 
-    let cert_der = cert.der().clone();
+    let cert_der = CertificateDer::from(cert.der().to_vec());
-    let ca_cert_der = ca_der.clone();
+    let ca_der = CertificateDer::from(ca_cert.der().to_vec());
     let key_der = PrivateKeyDer::Pkcs8(PrivatePkcs8KeyDer::from(key_pair.serialize_der()));
 
-    Ok((vec![cert_der, ca_cert_der], key_der))
+    Ok((vec![cert_der, ca_der], key_der))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::path::PathBuf;
-
-    #[test]
-    fn try_data_dir_advisory_permission_denied() {
-        let err: crate::Error =
-            Box::new(std::io::Error::from(std::io::ErrorKind::PermissionDenied));
-        let path = PathBuf::from("/usr/local/var/numa");
-        let msg = try_data_dir_advisory(&err, &path).expect("should advise");
-        assert!(msg.contains("HTTPS proxy disabled"));
-        assert!(msg.contains("/usr/local/var/numa"));
-        assert!(msg.contains("numa install"));
-        assert!(msg.contains("data_dir"));
-    }
-
-    #[test]
-    fn try_data_dir_advisory_skips_other_io_kinds() {
-        let err: crate::Error = Box::new(std::io::Error::from(std::io::ErrorKind::NotFound));
-        assert!(try_data_dir_advisory(&err, &PathBuf::from("/x")).is_none());
-    }
-
-    #[test]
-    fn try_data_dir_advisory_skips_non_io_errors() {
-        let err: crate::Error = "rcgen failure".into();
-        assert!(try_data_dir_advisory(&err, &PathBuf::from("/x")).is_none());
-    }
-
-    #[test]
-    fn service_cert_contains_expected_sans() {
-        use x509_parser::prelude::GeneralName;
-
-        let dir = std::env::temp_dir().join(format!("numa-test-san-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        let (ca_der, issuer) = ensure_ca(&dir).unwrap();
-
-        let names = vec!["grafana".into(), "router".into()];
-        let (chain, _) = generate_service_cert(&ca_der, &issuer, "numa", &names).unwrap();
-        assert_eq!(chain.len(), 2, "chain should be [leaf, CA]");
-
-        let (_, cert) = x509_parser::parse_x509_certificate(chain[0].as_ref()).unwrap();
-        let san = cert
-            .tbs_certificate
-            .subject_alternative_name()
-            .unwrap()
-            .unwrap();
-
-        let dns: Vec<&str> = san
-            .value
-            .general_names
-            .iter()
-            .filter_map(|gn| match gn {
-                GeneralName::DNSName(s) => Some(*s),
-                _ => None,
-            })
-            .collect();
-
-        let ips: Vec<std::net::IpAddr> = san
-            .value
-            .general_names
-            .iter()
-            .filter_map(|gn| match gn {
-                GeneralName::IPAddress(b) => match b.len() {
-                    4 => Some(std::net::IpAddr::V4(std::net::Ipv4Addr::new(
-                        b[0], b[1], b[2], b[3],
-                    ))),
-                    16 => {
-                        let a: [u8; 16] = (*b).try_into().unwrap();
-                        Some(std::net::IpAddr::V6(std::net::Ipv6Addr::from(a)))
-                    }
-                    _ => None,
-                },
-                _ => None,
-            })
-            .collect();
-
-        // DNS SANs
-        assert!(dns.contains(&"*.numa"), "missing wildcard SAN");
-        assert!(dns.contains(&"grafana.numa"), "missing service SAN");
-        assert!(dns.contains(&"router.numa"), "missing service SAN");
-        assert!(dns.contains(&"localhost"), "missing localhost SAN");
-        assert!(dns.contains(&"numa"), "missing bare TLD SAN");
-
-        // IP SANs
-        assert!(
-            ips.contains(&std::net::IpAddr::V4(std::net::Ipv4Addr::LOCALHOST)),
-            "missing 127.0.0.1 SAN"
-        );
-        assert!(
-            ips.contains(&std::net::IpAddr::V6(std::net::Ipv6Addr::LOCALHOST)),
-            "missing ::1 SAN"
-        );
-
-        let _ = std::fs::remove_dir_all(&dir);
-    }
 }

tests/docker/hold53.py

@@ -1,5 +0,0 @@
-import socket, signal
-s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 0)
-s.bind(("", 53))
-signal.pause()

tests/docker/install-trust.sh

@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-#
-# Cross-distro CA trust contract test for issue #35.
-#
-# Runs the exact shell commands `src/system_dns.rs::trust_ca_linux` would run
-# on each Linux trust-store family (Debian, Fedora pki, Arch p11-kit), and
-# asserts the certificate ends up in (and is removed from) the system bundle.
-#
-# This is a contract test, not an integration test: it doesn't drive the Rust
-# code (that would need systemd-in-container). It verifies the assumptions in
-# `LINUX_TRUST_STORES` against the real distro behavior. If you change that
-# table in src/system_dns.rs, update the per-distro cases below to match.
-#
-# Requirements: docker, openssl (host).
-# Usage:        ./tests/docker/install-trust.sh
-
-set -euo pipefail
-
-cd "$(dirname "$0")/../.."
-
-GREEN="\033[32m"; RED="\033[31m"; RESET="\033[0m"
-
-# Self-signed CA fixture, mounted into each container as ca.pem.
-# basicConstraints=CA:TRUE is required — without it, Debian's
-# update-ca-certificates silently skips the cert during bundle build.
-FIXTURE_DIR=$(mktemp -d)
-trap 'rm -rf "$FIXTURE_DIR"' EXIT
-openssl req -x509 -newkey rsa:2048 -nodes -days 1 \
-    -keyout "$FIXTURE_DIR/ca.key" \
-    -out    "$FIXTURE_DIR/ca.pem" \
-    -subj   "/CN=Numa Local CA Test $(date +%s)" \
-    -addext "basicConstraints=critical,CA:TRUE" \
-    -addext "keyUsage=critical,keyCertSign,cRLSign" >/dev/null 2>&1
-
-# Distro bundles store certs differently — Debian writes raw PEM only,
-# Fedora prepends "# CN" comment headers, Arch via extract-compat is
-# raw PEM. To detect cert presence uniformly we grep for a deterministic
-# substring of the base64 body (first base64 line is unique per cert).
-CERT_TAG=$(sed -n '2p' "$FIXTURE_DIR/ca.pem")
-
-PASSED=0; FAILED=0
-
-run_case() {
-    local distro="$1"; shift
-    local image="$1"; shift
-    local platform="$1"; shift
-    local script="$1"
-
-    printf "── %s (%s) ──\n" "$distro" "$image"
-    if docker run --rm \
-        --platform "$platform" \
-        --security-opt seccomp=unconfined \
-        -e CERT_TAG="$CERT_TAG" \
-        -e DEBIAN_FRONTEND=noninteractive \
-        -v "$FIXTURE_DIR/ca.pem:/fixture/ca.pem:ro" \
-        "$image" bash -c "$script"; then
-        printf "${GREEN}✓${RESET} %s\n\n" "$distro"
-        PASSED=$((PASSED + 1))
-    else
-        printf "${RED}✗${RESET} %s\n\n" "$distro"
-        FAILED=$((FAILED + 1))
-    fi
-}
-
-# Debian / Ubuntu / Mint — anchor: /usr/local/share/ca-certificates/*.crt
-run_case "debian" "debian:stable" "linux/amd64" '
-    set -e
-    apt-get update -qq
-    apt-get install -qq -y ca-certificates >/dev/null
-    install -m 0644 /fixture/ca.pem /usr/local/share/ca-certificates/numa-local-ca.crt
-    update-ca-certificates >/dev/null 2>&1
-    grep -q "$CERT_TAG" /etc/ssl/certs/ca-certificates.crt
-    echo "  install: cert present in bundle"
-    rm /usr/local/share/ca-certificates/numa-local-ca.crt
-    update-ca-certificates --fresh >/dev/null 2>&1
-    if grep -q "$CERT_TAG" /etc/ssl/certs/ca-certificates.crt; then
-        echo "  uninstall: cert STILL present (regression)" >&2
-        exit 1
-    fi
-    echo "  uninstall: cert removed from bundle"
-'
-
-# Fedora / RHEL / CentOS / SUSE — anchor: /etc/pki/ca-trust/source/anchors/*.pem
-run_case "fedora" "fedora:latest" "linux/amd64" '
-    set -e
-    dnf install -q -y ca-certificates >/dev/null
-    install -m 0644 /fixture/ca.pem /etc/pki/ca-trust/source/anchors/numa-local-ca.pem
-    update-ca-trust extract
-    grep -q "$CERT_TAG" /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
-    echo "  install: cert present in bundle"
-    rm /etc/pki/ca-trust/source/anchors/numa-local-ca.pem
-    update-ca-trust extract
-    if grep -q "$CERT_TAG" /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem; then
-        echo "  uninstall: cert STILL present (regression)" >&2
-        exit 1
-    fi
-    echo "  uninstall: cert removed from bundle"
-'
-
-# Arch / Manjaro — anchor: /etc/ca-certificates/trust-source/anchors/*.pem
-# archlinux:latest is x86_64-only; --platform forces emulation on Apple Silicon.
-run_case "arch" "archlinux:latest" "linux/amd64" '
-    set -e
-    # pacman 7+ filters syscalls in its own sandbox; disable for Rosetta/qemu emulation.
-    sed -i "s/^#DisableSandboxSyscalls/DisableSandboxSyscalls/" /etc/pacman.conf
-    pacman -Sy --noconfirm --needed ca-certificates p11-kit >/dev/null 2>&1
-    install -m 0644 /fixture/ca.pem /etc/ca-certificates/trust-source/anchors/numa-local-ca.pem
-    trust extract-compat
-    grep -q "$CERT_TAG" /etc/ssl/certs/ca-certificates.crt
-    echo "  install: cert present in bundle"
-    rm /etc/ca-certificates/trust-source/anchors/numa-local-ca.pem
-    trust extract-compat
-    if grep -q "$CERT_TAG" /etc/ssl/certs/ca-certificates.crt; then
-        echo "  uninstall: cert STILL present (regression)" >&2
-        exit 1
-    fi
-    echo "  uninstall: cert removed from bundle"
-'
-
-printf "── summary ──\n"
-printf "  ${GREEN}passed${RESET}: %d\n" "$PASSED"
-printf "  ${RED}failed${RESET}: %d\n" "$FAILED"
-[ "$FAILED" -eq 0 ]

tests/docker/issue-81.sh

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-#
-# End-to-end validation of the issue #81 fix (config path advisory).
-#
-# Builds numa from two source trees — the buggy baseline and the fix
-# candidate — inside one debian:bookworm container, then runs four
-# scenarios to prove:
-#
-#   1. replication/main  — reporter's sequence, bug confirmed
-#   2. replication/fix   — reporter's sequence, bug is gone
-#   3. existing/main     — pre-installed config at FHS data dir still loads
-#   4. existing/fix      — same, unchanged by the fix (no regression)
-#
-# Scenarios 3 and 4 guard against the fear that the fix might change
-# candidate order and break existing daemon installs (including the
-# macOS Homebrew-prefix layout at /usr/local/var/numa/).
-#
-# Usage:
-#   MAIN_SRC=/path/to/main-checkout FIX_SRC=/path/to/fix-worktree \
-#     ./tests/docker/issue-81.sh
-#
-# Defaults: MAIN_SRC = $(git rev-parse --show-toplevel), FIX_SRC = same.
-
-set -euo pipefail
-
-MAIN_SRC="${MAIN_SRC:-$(git rev-parse --show-toplevel)}"
-FIX_SRC="${FIX_SRC:-$MAIN_SRC}"
-
-GREEN="\033[32m"; RED="\033[31m"; RESET="\033[0m"
-
-echo "── issue #81 validation ──"
-echo "  main: $MAIN_SRC"
-echo "  fix:  $FIX_SRC"
-echo
-
-docker run --rm \
-    --platform linux/amd64 \
-    -v "$MAIN_SRC:/main:ro" \
-    -v "$FIX_SRC:/fix:ro" \
-    -v "$(dirname "$0")/hold53.py:/tmp/hold53.py:ro" \
-    -v numa-port53-cargo:/root/.cargo \
-    -v numa-port53-target:/work/target \
-    debian:bookworm bash -c '
-set -euo pipefail
-
-# Paths and ports used by all scenarios — keep in one place so the
-# heredocs and the verdict greps cannot drift.
-XDG_CONFIG="/root/.config/numa/numa.toml"
-FHS_CONFIG="/var/lib/numa/numa.toml"
-TEST_PORT="5354"
-TEST_API_PORT="5380"
-
-apt-get update -qq && apt-get install -y -qq curl build-essential python3 2>&1 | tail -1
-if ! command -v cargo &>/dev/null; then
-    curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --quiet
-fi
-. "$HOME/.cargo/env"
-
-build_from() {
-    local label="$1"; local src="$2"
-    mkdir -p "/work/$label"
-    tar -C "$src" --exclude=./target --exclude=./.git -cf - . | tar -C "/work/$label" -xf -
-    (cd "/work/$label" && cargo build --release --locked 2>&1 | tail -1)
-    cp "/work/$label/target/release/numa" "/work/numa-$label"
-}
-
-build_from main /main
-build_from fix /fix
-
-holder=0
-stop_holder() {
-    if [ "$holder" -ne 0 ]; then
-        kill "$holder" 2>/dev/null || true
-        wait "$holder" 2>/dev/null || true
-        holder=0
-    fi
-}
-trap stop_holder EXIT
-
-start_holder() {
-    python3 /tmp/hold53.py &
-    holder=$!
-    sleep 0.3
-}
-
-write_test_config() {
-    local path="$1"
-    mkdir -p "$(dirname "$path")"
-    cat > "$path" <<EOF
-[server]
-bind_addr = "127.0.0.1:$TEST_PORT"
-api_port = $TEST_API_PORT
-EOF
-}
-
-verdict() {
-    local label="$1"; local expected="$2"; local file="$3"
-    # "cannot bind to" is printed by the advisory when numa fails to start.
-    # Its absence is a reliable proxy for "numa bound successfully" because
-    # the banner-only log we capture contains no other failure surface.
-    if grep -q "cannot bind to" "$file"; then
-        echo "  [$label] did not bind $TEST_PORT — numa ignored the XDG config"
-        [ "$expected" = "ignored" ] && return 0 || return 1
-    else
-        echo "  [$label] bound $TEST_PORT — config loaded"
-        [ "$expected" = "bound" ] && return 0 || return 1
-    fi
-}
-
-scenario_replication() {
-    local label="$1"; local bin="/work/numa-$label"; local expected="$2"
-    echo
-    echo "════════ REPLICATION / $label ════════"
-    rm -rf /root/.config/numa /var/lib/numa
-    mkdir -p "$(dirname "$XDG_CONFIG")"
-
-    start_holder
-    set +e
-    timeout 5 "$bin" > /tmp/run1.txt 2>&1
-    set -e
-    echo "── step 1: advisory printed by $label ──"
-    grep -E "Create .* with:" /tmp/run1.txt | sed "s/^/  /" || echo "  <no advisory line>"
-
-    write_test_config "$XDG_CONFIG"
-    echo "── step 2: wrote config at $XDG_CONFIG ──"
-
-    set +e
-    timeout 3 "$bin" > /tmp/run2.txt 2>&1
-    set -e
-    stop_holder
-
-    verdict "$label" "$expected" /tmp/run2.txt
-}
-
-scenario_existing_install() {
-    local label="$1"; local bin="/work/numa-$label"
-    echo
-    echo "════════ EXISTING INSTALL / $label ════════"
-    rm -rf /root/.config/numa /var/lib/numa
-    write_test_config "$FHS_CONFIG"
-
-    start_holder
-    set +e
-    timeout 3 "$bin" > /tmp/run.txt 2>&1
-    set -e
-    stop_holder
-
-    verdict "$label" "bound" /tmp/run.txt
-}
-
-RC=0
-scenario_replication main ignored || RC=1
-scenario_replication fix bound || RC=1
-scenario_existing_install main || RC=1
-scenario_existing_install fix || RC=1
-
-echo
-if [ "$RC" -eq 0 ]; then
-    echo "── all scenarios matched expectations ──"
-else
-    echo "── FAILURE: one or more scenarios diverged ──"
-fi
-exit $RC
-'

tests/docker/smoke-arch.sh

@@ -1,147 +0,0 @@
-#!/usr/bin/env bash
-#
-# Arch Linux compatibility smoke test.
-#
-# Builds numa from source inside an archlinux:latest container, runs it
-# in forward mode on port 5354, and verifies a single DNS query returns
-# an A record. Validates the "Arch compatible" claim end-to-end before
-# release announcements.
-#
-# Dogfooding: the test numa forwards to the host's running numa via
-# host.docker.internal (Docker Desktop's host gateway). This avoids the
-# Docker NAT/UDP issues with public resolvers and exercises the realistic
-# numa-on-numa shape. Requires the host to be running numa on port 53.
-#
-# First run is slow (~8-12 min): image pull + pacman + cold cargo build.
-# No caching across runs.
-#
-# Requirements: docker, host running numa on 0.0.0.0:53
-# Usage:        ./tests/docker/smoke-arch.sh
-
-set -euo pipefail
-
-cd "$(dirname "$0")/../.."
-
-GREEN="\033[32m"; RED="\033[31m"; RESET="\033[0m"
-
-# Precondition: the test numa-on-arch forwards to the host numa as its
-# upstream (dogfood pattern). Fail fast with a clear error if there is
-# no working DNS on the host, rather than letting the dig inside the
-# container time out with "deadline has elapsed".
-if ! dig @127.0.0.1 google.com A +short +time=1 +tries=1 >/dev/null 2>&1; then
-    printf "${RED}error:${RESET} host numa is not answering on 127.0.0.1:53\n" >&2
-    echo "  This test forwards to the host numa via host.docker.internal." >&2
-    echo "  Start numa on the host first (sudo numa install), then rerun." >&2
-    exit 1
-fi
-
-echo "── building + running numa on archlinux:latest ──"
-echo "  (first run is slow: image pull + pacman + cold cargo build, ~8-12 min)"
-echo
-
-docker run --rm \
-    --platform linux/amd64 \
-    --security-opt seccomp=unconfined \
-    -v "$PWD:/src:ro" \
-    -v numa-arch-cargo:/root/.cargo \
-    -v numa-arch-target:/work/target \
-    archlinux:latest bash -c '
-    set -e
-
-    # pacman 7+ filters syscalls in its own sandbox; disable for Rosetta/qemu
-    sed -i "s/^#DisableSandboxSyscalls/DisableSandboxSyscalls/" /etc/pacman.conf
-
-    echo "── pacman: installing build + runtime deps ──"
-    pacman -Sy --noconfirm --needed rust gcc pkgconf cmake make perl bind 2>&1 | tail -3
-    echo
-
-    # Copy source to a writable workdir, skipping target/ + .git so we
-    # do not pull in the host (macOS) build artifacts.
-    mkdir -p /work
-    tar -C /src --exclude=./target --exclude=./.git -cf - . | tar -C /work -xf -
-    cd /work
-
-    echo "── cargo build --release --locked ──"
-    cargo build --release --locked 2>&1 | tail -5
-    echo
-
-    # Dogfood: forward to the host numa via host.docker.internal.
-    # numa parses upstream.address as a literal SocketAddr, so we resolve
-    # the hostname to an IPv4 address first (force v4 — getent hosts may
-    # return IPv6 first, and IPv6 addresses need bracketed addr:port form).
-    HOST_IP=$(getent ahostsv4 host.docker.internal | awk "/STREAM/ {print \$1; exit}")
-    if [ -z "$HOST_IP" ]; then
-        echo "  ✗ could not resolve host.docker.internal to IPv4 (not on Docker Desktop?)"
-        exit 1
-    fi
-    echo "── starting numa on :5354 (forward to host numa at $HOST_IP:53) ──"
-    # Intentionally NOT setting [server] data_dir — we want to exercise the
-    # default code path (data_dir() → daemon_data_dir() → /var/lib/numa) so
-    # the FHS-path assertion below verifies the live wiring, not just the
-    # unit-tested helper.
-    cat > /tmp/numa.toml <<EOF
-[server]
-bind_addr = "127.0.0.1:5354"
-api_port = 5381
-
-[upstream]
-mode = "forward"
-address = "$HOST_IP"
-port = 53
-EOF
-
-    ./target/release/numa /tmp/numa.toml > /tmp/numa.log 2>&1 &
-    NUMA_PID=$!
-
-    # Poll for readiness — numa is ready when it answers a query
-    READY=0
-    for i in 1 2 3 4 5 6 7 8; do
-        sleep 1
-        if dig @127.0.0.1 -p 5354 google.com A +short +time=1 +tries=1 2>/dev/null \
-            | grep -qE "^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$"; then
-            READY=1
-            break
-        fi
-    done
-
-    if [ "$READY" -ne 1 ]; then
-        echo "  ✗ numa did not return an A record after 8s"
-        echo "  numa log:"
-        cat /tmp/numa.log
-        kill $NUMA_PID 2>/dev/null || true
-        exit 1
-    fi
-
-    echo "── dig @127.0.0.1 -p 5354 google.com A ──"
-    ANSWER=$(dig @127.0.0.1 -p 5354 google.com A +short +time=2 +tries=1)
-    echo "$ANSWER" | sed "s/^/  /"
-
-    kill $NUMA_PID 2>/dev/null || true
-
-    # FHS path assertion: the default data dir on Linux must be /var/lib/numa
-    # (not the legacy /usr/local/var/numa). The CA cert generated at startup
-    # is the canonical proof that numa wrote to the right place.
-    echo
-    echo "── FHS path check ──"
-    if [ -f /var/lib/numa/ca.pem ]; then
-        echo "  ✓ CA cert at /var/lib/numa/ca.pem (FHS path)"
-    else
-        echo "  ✗ CA cert NOT at /var/lib/numa/ca.pem"
-        echo "  ls /var/lib/numa/:"
-        ls -la /var/lib/numa/ 2>&1 | sed "s/^/    /"
-        echo "  ls /usr/local/var/numa/:"
-        ls -la /usr/local/var/numa/ 2>&1 | sed "s/^/    /"
-        exit 1
-    fi
-    if [ -e /usr/local/var/numa ]; then
-        echo "  ✗ legacy path /usr/local/var/numa unexpectedly exists on a fresh container"
-        exit 1
-    fi
-    echo "  ✓ legacy path /usr/local/var/numa absent (fresh install used FHS)"
-
-    echo
-    echo "  ✓ numa built, ran, answered a forward query, and used the FHS data dir on Arch"
-'
-
-echo
-printf "${GREEN}── smoke-arch passed ──${RESET}\n"

tests/docker/smoke-port53.sh

@@ -1,138 +0,0 @@
-#!/usr/bin/env bash
-#
-# Port-53 conflict advisory integration test.
-#
-# Builds numa from source inside a debian:bookworm container, pre-binds
-# port 53 with a UDP socket, then runs numa bare (default bind_addr
-# 0.0.0.0:53). Verifies:
-#   - process exits with code 1
-#   - stderr contains the advisory ("cannot bind to")
-#   - stderr contains both fix suggestions ("numa install", "bind_addr")
-#
-# This is the end-to-end test for the fix in:
-#   src/main.rs — AddrInUse match arm → eprint advisory + process::exit(1)
-#
-# No systemd-resolved needed — the conflict is simulated by a Python
-# UDP socket held open before numa starts.
-#
-# Requirements: docker
-# Usage:        ./tests/docker/smoke-port53.sh
-
-set -euo pipefail
-
-cd "$(dirname "$0")/../.."
-
-GREEN="\033[32m"; RED="\033[31m"; RESET="\033[0m"
-
-pass() { printf "  ${GREEN}✓${RESET} %s\n" "$1"; }
-fail() { printf "  ${RED}✗${RESET} %s\n" "$1"; printf "    %s\n" "$2"; FAILED=$((FAILED+1)); }
-FAILED=0
-
-echo "── smoke-port53: building + testing numa on debian:bookworm ──"
-echo "  (first run is slow: image pull + cold cargo build, ~5-8 min)"
-echo
-
-OUTPUT=$(docker run --rm \
-    --platform linux/amd64 \
-    -v "$PWD:/src:ro" \
-    -v numa-port53-cargo:/root/.cargo \
-    -v numa-port53-target:/work/target \
-    debian:bookworm bash -c '
-set -e
-
-apt-get update -qq && apt-get install -y -qq curl build-essential python3 2>&1 | tail -3
-
-# Install rustup if not already in the cargo cache volume
-if ! command -v cargo &>/dev/null; then
-    curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --quiet
-fi
-. "$HOME/.cargo/env"
-
-# Copy source to a writable workdir
-mkdir -p /work
-tar -C /src --exclude=./target --exclude=./.git -cf - . | tar -C /work -xf -
-cd /work
-
-echo "── cargo build --release --locked ──"
-cargo build --release --locked 2>&1 | tail -5
-echo
-
-# Write the holder script to a file to avoid quoting hell.
-# Holds port 53 until killed — no sleep race.
-cat > /tmp/hold53.py << '"'"'PYEOF'"'"'
-import socket, signal
-s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 0)
-s.bind(("", 53))
-signal.pause()
-PYEOF
-
-python3 /tmp/hold53.py &
-HOLDER_PID=$!
-
-# Verify the holder is actually up before proceeding
-sleep 0.3
-if ! kill -0 $HOLDER_PID 2>/dev/null; then
-    echo "holder_failed=1"
-    exit 1
-fi
-
-echo "── running numa with port 53 already bound ──"
-# timeout 5: guards against numa not exiting (advisory not fired, bug present)
-# Capture stderr to a file so the exit code is not clobbered by || or $()
-set +e
-timeout 5 ./target/release/numa > /tmp/numa-stderr.txt 2>&1
-EXIT_CODE=$?
-set -e
-STDERR=$(cat /tmp/numa-stderr.txt)
-
-kill $HOLDER_PID 2>/dev/null || true
-
-echo "exit_code=$EXIT_CODE"
-printf "%s" "$STDERR" | sed "s/^/  numa: /"
-' 2>&1)
-
-echo "$OUTPUT"
-
-echo
-echo "── assertions ──"
-
-if echo "$OUTPUT" | grep -q "holder_failed=1"; then
-    echo "  SETUP FAILED: could not pre-bind port 53 inside container"
-    exit 1
-fi
-
-EXIT_CODE=$(echo "$OUTPUT" | grep '^exit_code=' | cut -d= -f2)
-
-if [ "${EXIT_CODE:-}" = "1" ]; then
-    pass "exits with code 1"
-else
-    fail "exits with code 1" "got: exit_code=${EXIT_CODE:-<missing>}"
-fi
-
-if echo "$OUTPUT" | grep -q "cannot bind to"; then
-    pass "advisory printed to stderr"
-else
-    fail "advisory printed to stderr" "stderr did not contain 'cannot bind to'"
-fi
-
-if echo "$OUTPUT" | grep -q "numa install"; then
-    pass "advisory offers 'sudo numa install'"
-else
-    fail "advisory offers 'sudo numa install'" "not found in output"
-fi
-
-if echo "$OUTPUT" | grep -q "bind_addr"; then
-    pass "advisory offers non-privileged port alternative"
-else
-    fail "advisory offers non-privileged port alternative" "'bind_addr' not found in output"
-fi
-
-echo
-if [ "$FAILED" -eq 0 ]; then
-    printf "${GREEN}── smoke-port53 passed ──${RESET}\n"
-    exit 0
-else
-    printf "${RED}── smoke-port53 failed ($FAILED assertion(s)) ──${RESET}\n"
-    exit 1
-fi

tests/integration.sh

@@ -53,17 +53,7 @@ CONF
     echo "Starting Numa on :$PORT ($SUITE_NAME)..."
     RUST_LOG=info "$BINARY" "$CONFIG" > "$LOG" 2>&1 &
     NUMA_PID=$!
-    sleep 2
+    sleep 4
-
-    # Wait for blocklist to load (if blocking is enabled in this suite)
-    if echo "$SUITE_CONFIG" | grep -q 'enabled = true'; then
-        for i in $(seq 1 20); do
-            LOADED=$(curl -sf http://127.0.0.1:$API_PORT/blocking/stats 2>/dev/null \
-                | grep -o '"domains_loaded":[0-9]*' | cut -d: -f2)
-            if [ "${LOADED:-0}" -gt 0 ]; then break; fi
-            sleep 1
-        done
-    fi
 
     if ! kill -0 "$NUMA_PID" 2>/dev/null; then
         echo "Failed to start Numa:"
@@ -414,289 +404,6 @@ check "Cache flushed" \
 
 kill "$NUMA_PID" 2>/dev/null || true
 wait "$NUMA_PID" 2>/dev/null || true
-sleep 1
-
-# ---- Suite 5: DNS-over-TLS (RFC 7858) ----
-echo ""
-echo "╔══════════════════════════════════════════╗"
-echo "║  Suite 5: DNS-over-TLS (RFC 7858)        ║"
-echo "╚══════════════════════════════════════════╝"
-
-if ! command -v kdig >/dev/null 2>&1; then
-    printf "  ${DIM}skipped — install 'knot' for kdig${RESET}\n"
-elif ! command -v openssl >/dev/null 2>&1; then
-    printf "  ${DIM}skipped — openssl not found${RESET}\n"
-else
-    DOT_PORT=8853
-    DOT_CERT=/tmp/numa-integration-dot.crt
-    DOT_KEY=/tmp/numa-integration-dot.key
-
-    # Generate a test cert mirroring production self_signed_tls SAN shape
-    # (*.numa wildcard + explicit numa.numa apex).
-    openssl req -x509 -newkey rsa:2048 -nodes -days 1 \
-        -keyout "$DOT_KEY" -out "$DOT_CERT" \
-        -subj "/CN=Numa .numa services" \
-        -addext "subjectAltName=DNS:*.numa,DNS:numa.numa" \
-        >/dev/null 2>&1
-
-    # Suite 5 uses a local zone so it's upstream-independent — the point is
-    # to exercise the DoT transport layer (handshake, ALPN, framing,
-    # persistent connections), not re-test recursive resolution.
-    cat > "$CONFIG" << CONF
-[server]
-bind_addr = "127.0.0.1:$PORT"
-api_port = $API_PORT
-
-[upstream]
-mode = "forward"
-address = "127.0.0.1"
-port = 65535
-
-[cache]
-max_entries = 10000
-
-[blocking]
-enabled = false
-
-[proxy]
-enabled = false
-
-[dot]
-enabled = true
-port = $DOT_PORT
-bind_addr = "127.0.0.1"
-cert_path = "$DOT_CERT"
-key_path = "$DOT_KEY"
-
-[[zones]]
-domain = "dot-test.example"
-record_type = "A"
-value = "10.0.0.1"
-ttl = 60
-CONF
-
-    RUST_LOG=info "$BINARY" "$CONFIG" > "$LOG" 2>&1 &
-    NUMA_PID=$!
-    sleep 4
-
-    if ! kill -0 "$NUMA_PID" 2>/dev/null; then
-        FAILED=$((FAILED + 1))
-        printf "  ${RED}✗${RESET} DoT startup\n"
-        printf "    ${DIM}%s${RESET}\n" "$(tail -5 "$LOG")"
-    else
-        echo ""
-        echo "=== Listener ==="
-
-        check "DoT bound on 127.0.0.1:$DOT_PORT" \
-            "DoT listening on 127.0.0.1:$DOT_PORT" \
-            "$(grep 'DoT listening' "$LOG")"
-
-        KDIG="kdig @127.0.0.1 -p $DOT_PORT +tls +tls-ca=$DOT_CERT +tls-hostname=numa.numa +time=5 +retry=0"
-
-        echo ""
-        echo "=== Queries over DoT ==="
-
-        check "DoT local zone A record" \
-            "10.0.0.1" \
-            "$($KDIG +short dot-test.example A 2>/dev/null)"
-
-        # +keepopen reuses one TLS connection for multiple queries — tests
-        # persistent connection handling. kdig applies options left-to-right,
-        # so +short and +keepopen must come before the query specs.
-        check "DoT persistent connection (3 queries, 1 handshake)" \
-            "10.0.0.1" \
-            "$($KDIG +keepopen +short dot-test.example A dot-test.example A dot-test.example A 2>/dev/null | head -1)"
-
-        echo ""
-        echo "=== ALPN ==="
-
-        # Positive case: client offers "dot", server picks it.
-        ALPN_OK=$(echo "" | openssl s_client -connect "127.0.0.1:$DOT_PORT" \
-            -servername numa.numa -alpn dot -CAfile "$DOT_CERT" 2>&1 </dev/null || true)
-        check "DoT negotiates ALPN \"dot\"" \
-            "ALPN protocol: dot" \
-            "$ALPN_OK"
-
-        # Negative case: client offers only "h2", server must reject the
-        # handshake with no_application_protocol alert (cross-protocol
-        # confusion defense, RFC 7858bis §3.2).
-        if echo "" | openssl s_client -connect "127.0.0.1:$DOT_PORT" \
-            -servername numa.numa -alpn h2 -CAfile "$DOT_CERT" \
-            </dev/null >/dev/null 2>&1; then
-            ALPN_MISMATCH="handshake unexpectedly succeeded"
-        else
-            ALPN_MISMATCH="rejected"
-        fi
-        check "DoT rejects non-dot ALPN" \
-            "rejected" \
-            "$ALPN_MISMATCH"
-    fi
-
-    kill "$NUMA_PID" 2>/dev/null || true
-    wait "$NUMA_PID" 2>/dev/null || true
-    rm -f "$DOT_CERT" "$DOT_KEY"
-fi
-sleep 1
-
-# ---- Suite 6: Proxy + DoT coexistence ----
-echo ""
-echo "╔══════════════════════════════════════════╗"
-echo "║  Suite 6: Proxy + DoT Coexistence        ║"
-echo "╚══════════════════════════════════════════╝"
-
-if ! command -v kdig >/dev/null 2>&1 || ! command -v openssl >/dev/null 2>&1; then
-    printf "  ${DIM}skipped — needs kdig + openssl${RESET}\n"
-else
-    DOT_PORT=8853
-    PROXY_HTTP_PORT=8080
-    PROXY_HTTPS_PORT=8443
-    NUMA_DATA=/tmp/numa-integration-data
-
-    # Fresh data dir so we generate a fresh CA for this suite. Path is set
-    # via [server] data_dir in the TOML below, not an env var — numa treats
-    # its config file as the single source of truth for all knobs.
-    rm -rf "$NUMA_DATA"
-    mkdir -p "$NUMA_DATA"
-
-    cat > "$CONFIG" << CONF
-[server]
-bind_addr = "127.0.0.1:$PORT"
-api_port = $API_PORT
-data_dir = "$NUMA_DATA"
-
-[upstream]
-mode = "forward"
-address = "127.0.0.1"
-port = 65535
-
-[cache]
-max_entries = 10000
-
-[blocking]
-enabled = false
-
-[proxy]
-enabled = true
-port = $PROXY_HTTP_PORT
-tls_port = $PROXY_HTTPS_PORT
-tld = "numa"
-bind_addr = "127.0.0.1"
-
-[dot]
-enabled = true
-port = $DOT_PORT
-bind_addr = "127.0.0.1"
-
-[[zones]]
-domain = "dot-test.example"
-record_type = "A"
-value = "10.0.0.1"
-ttl = 60
-CONF
-
-    RUST_LOG=info "$BINARY" "$CONFIG" > "$LOG" 2>&1 &
-    NUMA_PID=$!
-    sleep 4
-
-    if ! kill -0 "$NUMA_PID" 2>/dev/null; then
-        FAILED=$((FAILED + 1))
-        printf "  ${RED}✗${RESET} Startup with proxy + DoT\n"
-        printf "    ${DIM}%s${RESET}\n" "$(tail -5 "$LOG")"
-    else
-        echo ""
-        echo "=== Both listeners ==="
-
-        check "DoT listener bound" \
-            "DoT listening on 127.0.0.1:$DOT_PORT" \
-            "$(grep 'DoT listening' "$LOG")"
-
-        check "HTTPS proxy listener bound" \
-            "HTTPS proxy listening on 127.0.0.1:$PROXY_HTTPS_PORT" \
-            "$(grep 'HTTPS proxy listening' "$LOG")"
-
-        PANIC_COUNT=$(grep -c 'panicked' "$LOG" 2>/dev/null || echo 0)
-        check "No startup panics in log" \
-            "^0$" \
-            "$PANIC_COUNT"
-
-        echo ""
-        echo "=== DoT works with proxy enabled ==="
-
-        # Proxy's build_tls_config runs first and creates the CA in
-        # $NUMA_DATA_DIR. DoT self_signed_tls then loads the same CA and
-        # issues its own leaf cert. One CA trusts both listeners.
-        CA="$NUMA_DATA/ca.pem"
-        KDIG="kdig @127.0.0.1 -p $DOT_PORT +tls +tls-ca=$CA +tls-hostname=numa.numa +time=5 +retry=0"
-
-        check "DoT local zone A (with proxy on)" \
-            "10.0.0.1" \
-            "$($KDIG +short dot-test.example A 2>/dev/null)"
-
-        echo ""
-        echo "=== DNS-over-HTTPS (RFC 8484) ==="
-
-        DOH_QUERY_FILE=/tmp/numa-doh-query.bin
-        DOH_RESP_FILE=/tmp/numa-doh-resp.bin
-
-        # Build DNS wire-format query for dot-test.example A
-        printf '\x00\x01\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00\x08dot-test\x07example\x00\x00\x01\x00\x01' > "$DOH_QUERY_FILE"
-
-        # POST valid DoH query
-        DOH_CODE=$(curl -sk -X POST \
-            --resolve "numa.numa:$PROXY_HTTPS_PORT:127.0.0.1" \
-            -H "Content-Type: application/dns-message" \
-            --data-binary @"$DOH_QUERY_FILE" \
-            --cacert "$CA" \
-            -o "$DOH_RESP_FILE" \
-            -w "%{http_code}" \
-            "https://numa.numa:$PROXY_HTTPS_PORT/dns-query")
-        check "DoH POST returns HTTP 200" "200" "$DOH_CODE"
-
-        # Check response contains IP 10.0.0.1 (hex: 0a000001)
-        DOH_HEX=$(xxd -p "$DOH_RESP_FILE" | tr -d '\n')
-        if echo "$DOH_HEX" | grep -q "0a000001"; then
-            check "DoH response resolves dot-test.example → 10.0.0.1" "found" "found"
-        else
-            check "DoH response resolves dot-test.example → 10.0.0.1" "0a000001" "$DOH_HEX"
-        fi
-
-        # Wrong Content-Type → 415
-        DOH_CT_CODE=$(curl -sk -X POST \
-            -H "Host: numa.numa" \
-            -H "Content-Type: text/plain" \
-            --data-binary @"$DOH_QUERY_FILE" \
-            -o /dev/null -w "%{http_code}" \
-            "https://127.0.0.1:$PROXY_HTTPS_PORT/dns-query")
-        check "DoH wrong Content-Type → 415" "415" "$DOH_CT_CODE"
-
-        # Wrong host → 404 (DoH only serves numa.numa)
-        DOH_HOST_CODE=$(curl -sk -X POST \
-            -H "Host: foo.numa" \
-            -H "Content-Type: application/dns-message" \
-            --data-binary @"$DOH_QUERY_FILE" \
-            -o /dev/null -w "%{http_code}" \
-            "https://127.0.0.1:$PROXY_HTTPS_PORT/dns-query")
-        check "DoH wrong host → 404" "404" "$DOH_HOST_CODE"
-
-        rm -f "$DOH_QUERY_FILE" "$DOH_RESP_FILE"
-
-        echo ""
-        echo "=== Proxy TLS works with DoT enabled ==="
-
-        # Proxy cert has SAN numa.numa (auto-added "numa" service). A
-        # successful handshake validates that the proxy's separate
-        # ServerConfig wasn't disturbed by DoT's own cert generation.
-        PROXY_TLS=$(echo "" | openssl s_client -connect "127.0.0.1:$PROXY_HTTPS_PORT" \
-            -servername numa.numa -CAfile "$CA" 2>&1 </dev/null || true)
-        check "Proxy HTTPS TLS handshake succeeds" \
-            "Verify return code: 0 (ok)" \
-            "$PROXY_TLS"
-    fi
-
-    kill "$NUMA_PID" 2>/dev/null || true
-    wait "$NUMA_PID" 2>/dev/null || true
-    rm -rf "$NUMA_DATA"
-fi
 
 # Summary
 echo ""

tests/manual/install-trust-macos.sh

@@ -1,94 +0,0 @@
-#!/usr/bin/env bash
-#
-# Manual macOS CA trust contract test.
-#
-# Mirrors src/system_dns.rs::trust_ca_macos / untrust_ca_macos by running
-# the same `security` shell commands against a fixture cert with a unique
-# CN. Safe to run alongside a production numa install:
-#
-#   - Test cert CN = "Numa Local CA Test <pid-ts>", always strictly longer
-#     than the production CN "Numa Local CA". `security find-certificate -c`
-#     does substring matching, so the test's search for $TEST_CN can never
-#     match the production cert (the search term is longer than the prod CN).
-#   - All deletes use `delete-certificate -Z <hash>`, which only touches the
-#     cert with that exact hash. Production and test certs have different
-#     hashes by construction (different key material), so the delete cannot
-#     reach the production cert even if a CN search somehow returned both.
-#
-# Mutates the System keychain (briefly). Cleans up on success or interrupt.
-# Requires sudo for `security add-trusted-cert` and `delete-certificate`.
-#
-# Usage: ./tests/manual/install-trust-macos.sh
-
-set -euo pipefail
-
-if [[ "$OSTYPE" != darwin* ]]; then
-    echo "This test is macOS-only." >&2
-    exit 1
-fi
-
-GREEN="\033[32m"; RED="\033[31m"; RESET="\033[0m"
-
-# Production constant from src/tls.rs::CA_COMMON_NAME — keep in sync.
-PROD_CN="Numa Local CA"
-KEYCHAIN="/Library/Keychains/System.keychain"
-
-# Notice if production numa is already installed. We proceed regardless —
-# see header for why coexistence is safe (unique CN + by-hash deletion).
-if security find-certificate -c "$PROD_CN" "$KEYCHAIN" >/dev/null 2>&1; then
-    echo "  note: production '$PROD_CN' detected — proceeding alongside (test cert can't touch it)"
-    echo
-fi
-
-# Unique CN ensures the test cert can never collide with production.
-TEST_CN="Numa Local CA Test $$-$(date +%s)"
-FIXTURE_DIR=$(mktemp -d)
-
-cleanup() {
-    # Best-effort: remove any test certs by hash if still present.
-    if security find-certificate -c "$TEST_CN" "$KEYCHAIN" >/dev/null 2>&1; then
-        echo "  cleanup: removing leftover test cert"
-        security find-certificate -c "$TEST_CN" -a -Z "$KEYCHAIN" 2>/dev/null \
-            | awk '/^SHA-1 hash:/ {print $NF}' \
-            | while read -r hash; do
-                sudo security delete-certificate -Z "$hash" "$KEYCHAIN" >/dev/null 2>&1 || true
-            done
-    fi
-    rm -rf "$FIXTURE_DIR"
-}
-trap cleanup EXIT
-
-echo "── generating fixture CA ──"
-openssl req -x509 -newkey rsa:2048 -nodes -days 1 \
-    -keyout "$FIXTURE_DIR/ca.key" \
-    -out    "$FIXTURE_DIR/ca.pem" \
-    -subj   "/CN=$TEST_CN" \
-    -addext "basicConstraints=critical,CA:TRUE" \
-    -addext "keyUsage=critical,keyCertSign,cRLSign" >/dev/null 2>&1
-echo "  CN: $TEST_CN"
-echo
-
-echo "── trust step (mirrors trust_ca_macos) ──"
-sudo security add-trusted-cert -d -r trustRoot -k "$KEYCHAIN" "$FIXTURE_DIR/ca.pem"
-if security find-certificate -c "$TEST_CN" "$KEYCHAIN" >/dev/null 2>&1; then
-    printf "  ${GREEN}✓${RESET} test cert found in keychain\n"
-else
-    printf "  ${RED}✗${RESET} test cert NOT found after add-trusted-cert\n"
-    exit 1
-fi
-echo
-
-echo "── untrust step (mirrors untrust_ca_macos) ──"
-security find-certificate -c "$TEST_CN" -a -Z "$KEYCHAIN" 2>/dev/null \
-    | awk '/^SHA-1 hash:/ {print $NF}' \
-    | while read -r hash; do
-        sudo security delete-certificate -Z "$hash" "$KEYCHAIN" >/dev/null
-    done
-if security find-certificate -c "$TEST_CN" "$KEYCHAIN" >/dev/null 2>&1; then
-    printf "  ${RED}✗${RESET} test cert STILL present after delete (regression)\n"
-    exit 1
-fi
-printf "  ${GREEN}✓${RESET} test cert removed from keychain\n"
-echo
-
-printf "${GREEN}all checks passed${RESET}\n"