2.4.0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,10 +7,6 @@ assignees: ''
 
 ---
 
-IMPORTANT: If you do not fill this out, your issue will be automatically closed.
-
-As of November 2024, RustScan no longer offiically supports any packages other than `cargo`. If you have an issue with Docker or a `.deb`, please bring it up with whoever created it :)
-
 **Describe the bug**
 A clear and concise description of what the bug is.
 

.github/workflows/build.yml

@@ -1,179 +1,96 @@
-name: CD Pipeline
-
-on: [push]
+name: Build
+on:
+  pull_request:
+    paths-ignore:
+      - '.github/**'
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '.github/**'
+  schedule:
+    - cron: '00 01 * * *'
 
 jobs:
-  build-nix:
-    env:
-      IN_PIPELINE: true
-    runs-on: ${{ matrix.os }}
-    if: github.ref == 'refs/heads/master'
-    strategy:
-      matrix:
-        type: [ubuntu-x64, ubuntu-x86, armv7, aarch64]
-        include:
-          - type: ubuntu-x64
-            os: ubuntu-latest
-            target: x86_64-unknown-linux-musl
-            name: x86_64-linux-rustscan
-            path: target/x86_64-unknown-linux-musl/release/rustscan
-            pkg_config_path: /usr/lib/x86_64-linux-gnu/pkgconfig
-          - type: ubuntu-x86
-            os: ubuntu-latest
-            target: i686-unknown-linux-musl
-            name: x86-linux-rustscan
-            path: target/i686-unknown-linux-musl/release/rustscan
-            pkg_config_path: /usr/lib/i686-linux-gnu/pkgconfig
-          - type: armv7
-            os: ubuntu-latest
-            target: armv7-unknown-linux-gnueabihf
-            name: armv7-linux-rustscan
-            path: target/armv7-unknown-linux-gnueabihf/release/rustscan
-            pkg_config_path: /usr/lib/x86_64-linux-gnu/pkgconfig
-          - type: aarch64
-            os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
-            name: aarch64-linux-rustscan
-            path: target/aarch64-unknown-linux-gnu/release/rustscan
-            pkg_config_path: /usr/lib/x86_64-linux-gnu/pkgconfig
-    steps:
-      - uses: actions/checkout@v4
-      - name: Cache cargo & target directories
-        uses: Swatinem/rust-cache@v2
-      - name: Build binary
-        uses: houseabsolute/actions-rust-cross@v0
-        with:
-          command: build
-          target: ${{ matrix.target }}
-          args: "--locked --release"
-          strip: true
-          toolchain: stable
-      - name: Build tar.gz for homebrew installs
-        if: matrix.type == 'ubuntu-x64'
-        run: |
-          tar czf ${{ matrix.name }}.tar.gz -C target/x86_64-unknown-linux-musl/release rustscan
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.name }}
-          path: ${{ matrix.path }}
-      - uses: actions/upload-artifact@v4
-        if: matrix.type == 'ubuntu-x64'
-        with:
-          name: ${{ matrix.name }}.tar.gz
-          path: ${{ matrix.name }}.tar.gz
-  build-deb:
-    needs: [build-nix]
+  check:
+    name: Check
     runs-on: ubuntu-latest
-    env:
-      IN_PIPELINE: true
     steps:
-      - uses: actions/checkout@v4
-      - name: Install cargo-deb
-        run: cargo install -f cargo-deb
-      - uses: awalsh128/cache-apt-pkgs-action@v1
-        with:
-          packages: musl-tools # provides musl-gcc
-          version: 1.0
-      - name: Install musl toolchain
-        run: rustup target add x86_64-unknown-linux-musl
-      - name: Deb Build
-        run: cargo deb --target=x86_64-unknown-linux-musl
-      - name: Upload Deb Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: rustscan.deb
-          path: ./target/x86_64-unknown-linux-musl/debian/*
+      - name: Checkout sources
+        uses: actions/checkout@v4
 
-  build-macos:
-    env:
-      IN_PIPELINE: true
-    runs-on: macos-latest
-    if: github.ref == 'refs/heads/master'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Cache cargo & target directories
-        uses: Swatinem/rust-cache@v2
-      - name: Build binary
-        uses: houseabsolute/actions-rust-cross@v0
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          command: build
-          target: x86_64-apple-darwin
-          args: "--locked --release"
-          strip: true
+          profile: minimal
           toolchain: stable
-      - name: Build tar.gz for homebrew installs
-        run: |
-          tar czf x86_64-macos-rustscan.tar.gz -C target/x86_64-apple-darwin/release rustscan
-      - uses: actions/upload-artifact@v4
-        with:
-          name: x86_64-macos-rustscan
-          path: target/x86_64-apple-darwin/release/rustscan
-      - uses: actions/upload-artifact@v4
-        with:
-          name: x86_64-macos-rustscan.tar.gz
-          path: x86_64-macos-rustscan.tar.gz
-  
-  build-macos-aarch64:
-    env:
-      IN_PIPELINE: true
-    runs-on: macos-latest
-    if: github.ref == 'refs/heads/master'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Cache cargo & target directories
-        uses: Swatinem/rust-cache@v2
-      - name: Build binary
-        uses: houseabsolute/actions-rust-cross@v0
-        with:
-          command: build
-          target: aarch64-apple-darwin
-          args: "--locked --release"
-          strip: true
-          toolchain: stable
-      - name: Build tar.gz for homebrew installs
-        run: |
-          tar czf aarch64-macos-rustscan.tar.gz -C target/aarch64-apple-darwin/release rustscan
-      - uses: actions/upload-artifact@v4
-        with:
-          name: aarch64-macos-rustscan
-          path: target/aarch64-apple-darwin/release/rustscan
-      - uses: actions/upload-artifact@v4
-        with:
-          name: aarch64-macos-rustscan.tar.gz
-          path: aarch64-macos-rustscan.tar.gz
+          override: true
 
-  build-windows:
-    env:
-      IN_PIPELINE: true
-    runs-on: ${{ matrix.os }}
-    if: github.ref == 'refs/heads/master'
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Run cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+
+  test:
+    name: Test Suite
     strategy:
       matrix:
-        type: [windows-x64, windows-x86]
-        include:
-          - type: windows-x64
-            os: windows-latest
-            target: x86_64-pc-windows-msvc
-            name: x86_64-windows-rustscan.exe
-            path: target\x86_64-pc-windows-msvc\release\rustscan.exe
-          - type: windows-x86
-            os: windows-latest
-            target: i686-pc-windows-msvc
-            name: x86-windows-rustscan.exe
-            path: target\i686-pc-windows-msvc\release\rustscan.exe
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        rust: [stable]
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Cache cargo & target directories
-        uses: Swatinem/rust-cache@v2
-      - name: Build binary
-        uses: houseabsolute/actions-rust-cross@v0
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          command: build
-          target:  ${{ matrix.target }}
-          args: "--locked --release"
-          strip: true
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+
+  lints:
+    name: Lints
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
           toolchain: stable
-      - uses: actions/upload-artifact@v4
+          override: true
+          components: rustfmt, clippy
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Run cargo fmt
+        uses: actions-rs/cargo@v1
         with:
-          name: ${{ matrix.name }}
-          path: ${{ matrix.path }}
+          command: fmt
+          args: --all -- --check
+
+      - name: Run cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings
+
+      - name: Run rustdoc lints
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --workspace --all-features --no-deps --document-private-items

.github/workflows/docker.yml

@@ -0,0 +1,38 @@
+name: Release - Distribute Docker image
+
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  # release:
+  #   types: [published]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          password: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: rustscan/rustscan
+          flavor: latest=true
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: ${{ contains(fromJson('["push", "release"]'), github.event_name) }} # Publish to docker registry only on push event or new release.
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release.yml

@@ -0,0 +1,216 @@
+name: Release - Distribute binaries
+on:
+  # If we want to make release using github interface.
+  # release:
+  #   types: [published]
+  # If we want to make release by pushing new tag.
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'Cargo.toml'
+      - 'Cargo.lock'
+      - '.github/workflows/release.yml'
+
+env:
+  BIN_NAME: rustscan
+  PROJECT_NAME: rustscan
+  REPO_NAME: RustScan/RustScan
+  BREW_TAP: RustScan/homebrew-tap
+
+jobs:
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false # don't fail other jobs if one fails
+      matrix:
+        # aarch64-linux is failing due to python3 missing issues during tests. I'm removing it for now.
+        # build: [x86_64-linux, aarch64-linux, x86_64-macos, aarch64-macos, x86_64-windows, x86_64-win-gnu]
+        build: [x86_64-linux, x86_64-macos, aarch64-macos, x86_64-windows, x86_64-win-gnu]
+        include:
+          - build: aarch64-macos
+            os: macos-latest
+            rust: stable
+            target: aarch64-apple-darwin
+            cross: true
+          # - build: aarch64-linux
+          #   os: ubuntu-20.04
+          #   rust: stable
+          #   target: aarch64-unknown-linux-gnu
+          #   cross: true
+          - build: x86_64-linux
+            os: ubuntu-20.04
+            rust: stable
+            target: x86_64-unknown-linux-gnu
+            cross: false
+          - build: x86_64-macos
+            os: macos-latest
+            rust: stable
+            target: x86_64-apple-darwin
+            cross: false
+          - build: x86_64-windows
+            os: windows-2019
+            rust: stable
+            target: x86_64-pc-windows-msvc
+            cross: false
+          - build: x86_64-win-gnu
+            os: windows-2019
+            rust: stable-x86_64-gnu
+            target: x86_64-pc-windows-gnu
+            cross: false
+
+    steps:
+      - name: Set Git config (windows only)
+        if: contains(matrix.os, 'windows') # Windows is missing some dependencies
+        run: |
+          git config --global pack.windowMemory "100m"
+          git config --global pack.packSizeLimit "100m"
+          git config --global pack.threads "1" 
+          git config --global pack.deltaCacheSize "512m"
+
+      - name: Install dependencies
+        if: contains(matrix.build, 'aarch64-linux') # Windows is missing some dependencies
+        run: sudo apt-get update && sudo apt-get install -y gcc-aarch64-linux-gnu python3
+
+      - name: Install python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install ${{ matrix.rust }} toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          target: ${{ matrix.target }}
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: ${{ matrix.cross }}
+          command: test
+          args: --release --locked --target ${{ matrix.target }}
+
+      - name: Build release binary
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: ${{ matrix.cross }}
+          command: build
+          args: --release --locked --target ${{ matrix.target }}
+
+      - name: Calculate tag name
+        # if: contains(matrix.build, 'linux')
+        shell: bash
+        run: |
+          name=dev
+          if [[ ${GITHUB_REF} =~ refs/tags/[0-9]+.[0-9]+.[0-9]+ ]]; then
+            name=${GITHUB_REF#refs/tags/}
+          fi
+          echo "TAG=$name" >> $GITHUB_ENV
+        id: tagname
+
+      - name: Build and package artifacts
+        shell: bash
+        run: |
+          mkdir dist
+          if [[ "${{ matrix.build }}" =~ "windows" ]]; then
+            cp "target/${{ matrix.target }}/release/$BIN_NAME.exe" "dist/"
+          else
+            cp "target/${{ matrix.target }}/release/$BIN_NAME" "dist/"
+          fi
+
+          if [[ "${{ matrix.build }}" =~ "linux" ]]; then
+            cargo install cargo-deb
+            cargo deb --target ${{ matrix.target }} --deb-version ${TAG}
+            cp "target/${{ matrix.target }}/debian/rustscan_${TAG}_amd64.deb" "dist/" || true
+          fi
+
+      - uses: actions/[email protected]
+        with:
+          name: bins-${{ matrix.build }}
+          path: dist
+
+  package:
+    name: Package
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+
+      - uses: actions/download-artifact@v4
+        with:
+          path: dist
+
+      - name: Calculate tag name
+        # if: contains(matrix.build, 'linux')
+        shell: bash
+        run: |
+          name=dev
+          if [[ ${GITHUB_REF} =~ refs/tags/[0-9]+.[0-9]+.[0-9]+ ]]; then
+            name=${GITHUB_REF#refs/tags/}
+          fi
+          echo "TAG=$name" >> $GITHUB_ENV
+        id: tagname
+
+      - name: Build archive
+        shell: bash
+        run: |
+          set -ex
+          rm -rf tmp
+          mkdir tmp
+          for dir in dist/bins-* ; do
+              platform=${dir#"dist/bins-"}
+              unset exe
+              if [[ $platform =~ "win" ]]; then
+                  exe=".exe"
+              fi
+              pkgname=$PROJECT_NAME-$TAG-$platform
+              mkdir tmp/$pkgname
+              cp $dir/$BIN_NAME$exe dist/ || true
+              mv $dir/$BIN_NAME$exe tmp/$pkgname
+              chmod +x tmp/$pkgname/$BIN_NAME$exe
+
+              if [[ $platform =~ "linux" ]]; then
+                  mv "$dir/rustscan_${TAG}_amd64.deb" dist/ || true
+              fi
+
+              tar cJf dist/$pkgname.tar.xz -C tmp $pkgname
+              7z a dist/$pkgname.zip tmp/$pkgname
+          done
+
+      - name: Upload binaries to release
+        if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) || github.event_name == 'release'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: dist/*
+          file_glob: true
+          tag: ${{ github.ref }}
+          overwrite: true
+
+      # - uses: mislav/bump-homebrew-formula-action@v3
+      #   with:
+      #     formula-path: ${{env.PROJECT_NAME}}.rb
+      #     homebrew-tap: ${{ env.BREW_TAP }}
+      #     download-url: 'https://github.com/${{ env.REPO_NAME }}/releases/download/${{ github.ref }}/${{env.PROJECT_NAME}}-${{ github.ref }}-x86_64-macos.tar.xz'
+      #     commit-message: updating formula for ${{ env.PROJECT_NAME }}
+      #   env:
+      #     COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
+
+      - run: cargo publish --token ${CRATES_TOKEN}
+        if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) || github.event_name == 'release'
+        env:
+          CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }}

.github/workflows/test.yml

@@ -1,34 +0,0 @@
-name: Test
-on:
-  pull_request:
-    branches: [master]
-  push:
-    branches:
-      - master
-jobs:
-  test:
-    name: Test Suite
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [stable]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-
-      - uses: taiki-e/install-action@nextest
-      - uses: Swatinem/rust-cache@v2
-
-      - name: Install Just
-        uses: extractions/setup-just@v2
-
-      - name: Run just
-        run: just test

.gitignore

@@ -121,4 +121,4 @@ fabric.properties
 .idea
 .idea*
 
-settings.json
+settings.json

Cargo.lock

@@ -38,12 +38,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -55,9 +49,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -94,12 +88,12 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -139,8 +133,8 @@ checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
 dependencies = [
  "async-task",
  "concurrent-queue",
- "fastrand",
- "futures-lite",
+ "fastrand 2.1.0",
+ "futures-lite 2.3.0",
  "slab",
 ]
 
@@ -152,32 +146,61 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
  "async-channel 2.3.1",
  "async-executor",
- "async-io",
- "async-lock",
+ "async-io 2.3.3",
+ "async-lock 3.4.0",
  "blocking",
- "futures-lite",
+ "futures-lite 2.3.0",
  "once_cell",
 ]
 
+[[package]]
+name = "async-io"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+dependencies = [
+ "async-lock 2.8.0",
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-lite 1.13.0",
+ "log",
+ "parking",
+ "polling 2.8.0",
+ "rustix 0.37.27",
+ "slab",
+ "socket2 0.4.10",
+ "waker-fn",
+]
+
 [[package]]
 name = "async-io"
 version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
 dependencies = [
- "async-lock",
+ "async-lock 3.4.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite",
+ "futures-lite 2.3.0",
  "parking",
- "polling",
- "rustix",
+ "polling 3.7.2",
+ "rustix 0.38.34",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "async-lock"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+dependencies = [
+ "event-listener 2.5.3",
+]
+
 [[package]]
 name = "async-lock"
 version = "3.4.0"
@@ -191,19 +214,19 @@ dependencies = [
 
 [[package]]
 name = "async-std"
-version = "1.13.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
 dependencies = [
  "async-channel 1.9.0",
  "async-global-executor",
- "async-io",
- "async-lock",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
  "crossbeam-utils",
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite",
+ "futures-lite 1.13.0",
  "gloo-timers",
  "kv-log-macro",
  "log",
@@ -265,6 +288,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
 [[package]]
 name = "bitflags"
 version = "2.6.0"
@@ -280,7 +309,7 @@ dependencies = [
  "async-channel 2.3.1",
  "async-task",
  "futures-io",
- "futures-lite",
+ "futures-lite 2.3.0",
  "piper",
 ]
 
@@ -296,12 +325,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
 [[package]]
 name = "cc"
 version = "1.0.106"
@@ -314,33 +337,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
 [[package]]
 name = "cidr"
 version = "0.2.3"
@@ -360,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.13"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -370,9 +366,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.13"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
 dependencies = [
  "anstream",
  "anstyle",
@@ -383,9 +379,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -417,9 +413,9 @@ dependencies = [
 
 [[package]]
 name = "colorful"
-version = "0.3.2"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb474a9c3219a8254ead020421ecf1b90427f29b55f6aae9a2471fa62c126ef"
+checksum = "97af0562545a7d7f3d9222fcf909963bec36dcb502afaacab98c6ffac8da47ce"
 
 [[package]]
 name = "concurrent-queue"
@@ -430,73 +426,12 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
 [[package]]
 name = "data-encoding"
 version = "2.6.0"
@@ -554,9 +489,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -608,6 +543,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.1.0"
@@ -671,13 +615,28 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
+[[package]]
+name = "futures-lite"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+dependencies = [
+ "fastrand 1.9.0",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
 [[package]]
 name = "futures-lite"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
- "fastrand",
+ "fastrand 2.1.0",
  "futures-core",
  "futures-io",
  "parking",
@@ -750,9 +709,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "gloo-timers"
-version = "0.3.0"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -760,16 +719,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "half"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -787,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "heck"
@@ -914,12 +863,32 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -928,7 +897,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2",
+ "socket2 0.5.7",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
@@ -940,32 +909,12 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -1017,7 +966,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "libc",
 ]
 
@@ -1027,6 +976,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -1142,15 +1097,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-
-[[package]]
-name = "oorandom"
-version = "11.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "option-ext"
@@ -1233,36 +1182,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
 dependencies = [
  "atomic-waker",
- "fastrand",
+ "fastrand 2.1.0",
  "futures-io",
 ]
 
 [[package]]
-name = "plotters"
-version = "0.3.7"
+name = "polling"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
 dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
-dependencies = [
- "plotters-backend",
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "concurrent-queue",
+ "libc",
+ "log",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1275,7 +1212,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi 0.4.0",
  "pin-project-lite",
- "rustix",
+ "rustix 0.38.34",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -1340,33 +1277,13 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -1436,9 +1353,9 @@ dependencies = [
 
 [[package]]
 name = "rlimit"
-version = "0.10.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
+checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8"
 dependencies = [
  "libc",
 ]
@@ -1449,16 +1366,30 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
+[[package]]
+name = "rustix"
+version = "0.37.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "rustix"
 version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.14",
  "windows-sys 0.52.0",
 ]
 
@@ -1505,15 +1436,13 @@ dependencies = [
  "clap",
  "colored",
  "colorful",
- "criterion",
  "dirs",
  "env_logger",
  "futures",
  "gcd",
  "hickory-resolver",
- "itertools 0.13.0",
+ "itertools",
  "log",
- "once_cell",
  "parameterized",
  "rand",
  "rlimit",
@@ -1531,15 +1460,6 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1589,9 +1509,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -1611,6 +1531,16 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -1660,7 +1590,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix",
+ "rustix 0.38.34",
  "windows-sys 0.48.0",
 ]
 
@@ -1695,16 +1625,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.7.0"
@@ -1732,7 +1652,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.7",
  "windows-sys 0.48.0",
 ]
 
@@ -1748,9 +1668,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -1760,20 +1680,20 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -1877,14 +1797,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "walkdir"
-version = "2.5.0"
+name = "waker-fn"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "wasi"
@@ -1990,15 +1906,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
-[[package]]
-name = "winapi-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -2023,15 +1930,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -2155,9 +2053,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 description = "Faster Nmap Scanning with Rust"
 homepage = "https://github.com/rustscan/rustscan"
 repository = "https://github.com/rustscan/rustscan"
-license = "GPL-3.0-only"
+license = "MIT"
 keywords = ["port", "scanning", "nmap"]
 categories = ["command-line-utilities"]
 readme = "README.md"
@@ -17,20 +17,20 @@ exclude = [
 ]
 
 [dependencies]
-clap = { version = "4.5.13", features = ["derive", "wrap_help"] }
+clap = { version = "4.5.8", features = ["derive", "wrap_help"] }
 colored = "2.1.0"
-async-std = "1.13.0"
+async-std = "1.7.0"
 futures = "0.3"
-rlimit = "0.10.2"
+rlimit = "0.10.1"
 log = "0.4.22"
-env_logger = "0.11.5"
-anstream = "=0.6.18"
+env_logger = "0.11.3"
+anstream = "=0.6.14"
 dirs = "5.0.1"
 gcd = "2.0.1"
 rand = "0.8.5"
-colorful = "0.3.2"
+colorful = "0.2.1"
 ansi_term = "0.12.1"
-toml = "0.8.19"
+toml = "0.8.14"
 serde = "1.0.124"
 serde_derive = "1.0.116"
 cidr-utils = "0.6.1"
@@ -39,12 +39,10 @@ hickory-resolver = { version = "0.24.0", features = ["dns-over-rustls"] }
 anyhow = "1.0.40"
 subprocess = "0.2.6"
 text_placeholder = { version = "0.5", features = ["struct_context"] }
-once_cell = "1.20.2"
 
 [dev-dependencies]
 parameterized = "2.0.0"
 wait-timeout = "0.2"
-criterion = { version = "0.5", features = ["html_reports"] }
 
 [package.metadata.deb]
 depends = "$auto, nmap"
@@ -59,10 +57,3 @@ strip = true
 [[bin]]
 name = "rustscan"
 path = "src/main.rs"
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(tarpaulin_include)"] }
-
-[[bench]]
-name = "benchmark_portscan"
-harness = false

Dockerfile

@@ -10,7 +10,7 @@ COPY src/ src/
 RUN cargo build --release
 
 # Release Stage
-FROM alpine:3.20.3 as release
+FROM alpine:3.20.1 as release
 LABEL author="Hydragyrum <https://github.com/Hydragyrum>"
 LABEL author="LeoFVO <https://github.com/LeoFVO>"
 

README.md

@@ -9,6 +9,16 @@
 
 ![Arch Linux package][badge-1] ![Built with Rust][badge-2] ![GitHub All Releases][badge-3] ![Crates.io][badge-4] ![Discord][badge-5] ![Actions][badge-6]
 
+
+---
+
+|                     🐋 `(Recommended)`                      |              👩‍💻               |             🏗️              |             🔧              |
+| :---------------------------------------------------------: | :---------------------------: | :-------------------------: | :-------------------------: |
+|               [![Docker][DockerPic]][Docker]                | [![Kali][Kali1]][Kali/Debian] | [![Arch][Arch]][Arch-Linux] | [![apple][apple]][Homebrew] |
+| `docker pull rustscan/rustscan:latest`</br>[Docker][usage-0] | [Link to Documentation][kali] |      `yay -S rustscan`      |   `brew install rustscan`   |
+
+---
+
 </div>
 
 # 🤔 What is this?
@@ -17,13 +27,6 @@
 
 The Modern Port Scanner. **Find ports quickly (3 seconds at its fastest)**. Run scripts through our scripting engine (Python, Lua, Shell supported).
 
-# 🛠️ Installation
-
-RustScan is in many repositories already. Install it with whatever tools you wish:
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/rustscan.svg)](https://repology.org/project/rustscan/versions)
-
-RustScan only officially supports Cargo installations, if you want to use that please install Rust and then `cargo install rustscan`
 # ✨ Features
 
 - Scans all 65k ports in **3 seconds**.
@@ -44,6 +47,7 @@ RustScan only officially supports Cargo installations, if you want to use that p
 - 🐋 [Docker Usage][toc-docker-usage]
 - 🦜 [Discord][discord]
 - 🤸 [Usage][usage-1]
+- 🎪 [Community][toc-community]
 
 # 🔭 Why RustScan?
 
@@ -101,6 +105,21 @@ RustScan is one of the first penetration testing tools that aims to be entirely
 
 RustScan has continuous integration testing that aims to ensure it is accessible, and we are constantly working on ways to improve our accessibility and ensure _everyone_ can use RustScan.
 
+# 📖 Full Installation Guide
+
+You can find our guide [here][install-1].
+
+## 🦊 Community Distributions
+
+Here are all of RustScan's community distributions.
+
+If you maintain a community distribution and want it listed here, leave an issue / pull request / Discord message or however, you want to let us know.
+
+- [Open Suse][distributions-1]
+- [Fedora/CentOS][distributions-2]
+
+[![Packaging status][rustscan-svg]][repology-1]
+
 # 🤸 Usage
 
 We have 2 usage guides. [Basic Usage][usage-1] and [Things you may want to do][usage-2].
@@ -174,7 +193,7 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 [kali]: https://github.com/RustScan/RustScan/wiki/Installation-Guide#%EF%B8%8F-debian--kali "Read the install guide"
 [Kali/Debian]: https://github.com/RustScan/RustScan/releases "Kali Debian"
 [Arch-Linux]: https://archlinux.org/packages/extra/x86_64/rustscan/ "Arch Linux installation of Rustscan"
-[Homebrew]: https://formulae.brew.sh/formula/rustscan "Homebrew install of Rustscan"
+[Homebrew]: https://crates.io/crates/rustscan/ "Homebrew install of Rustscan"
 [usage-1]: https://github.com/RustScan/RustScan/wiki/Usage "Basic Usage of Rustscan"
 [usage-0]: https://github.com/RustScan/RustScan/wiki/Installation-Guide#docker-whale "Use Docker Rustscan"
 [config-file-here]: https://github.com/RustScan/RustScan/wiki/Config-File "RustScan Configuration File"
@@ -213,4 +232,4 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 [badge-3]: https://img.shields.io/github/downloads/rustscan/rustscan/total?label=GitHub%20Downloads
 [badge-4]: https://img.shields.io/crates/d/rustscan?label=Cargo%20Downloads
 [badge-5]: https://img.shields.io/discord/754001738184392704
-[badge-6]: https://github.com/RustScan/RustScan/workflows/Build/badge.svg?branch=master
+[badge-6]: https://github.com/RustScan/RustScan/workflows/Continuous%20integration/badge.svg?branch=master

benches/benchmark_portscan.rs

@@ -1,17 +0,0 @@
-use criterion::{criterion_group, criterion_main, Criterion};
-use std::hint::black_box;
-
-fn fibonacci(n: u64) -> u64 {
-    match n {
-        0 => 1,
-        1 => 1,
-        n => fibonacci(n - 1) + fibonacci(n - 2),
-    }
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    c.bench_function("fib 20", |b| b.iter(|| fibonacci(black_box(20))));
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

build.rs

@@ -1,234 +0,0 @@
-use std::collections::BTreeMap;
-use std::fs::{self, File};
-
-use std::env;
-use std::io::{BufReader, Read};
-use std::path::PathBuf;
-use std::process::Command;
-
-// Reads in a file with payloads based on port
-pub fn main() {
-    let mut file_path = env::current_dir().expect("cant find curr dir");
-    file_path.push("./nmap-payloads");
-
-    let mut data = String::new();
-    let file = File::open(&file_path).expect("File not found.");
-    let mut file_buf = BufReader::new(file);
-    file_buf
-        .read_to_string(&mut data)
-        .expect("unable to read file");
-
-    let mut fp_map: BTreeMap<i32, String> = BTreeMap::new();
-
-    let mut count = 0;
-    let mut capturing = false;
-    let mut curr = String::new();
-
-    for line in data.trim().split('\n') {
-        if line.contains('#') || line.is_empty() {
-            continue;
-        }
-
-        if line.starts_with("udp") {
-            if !curr.is_empty() {
-                fp_map.insert(count, curr);
-                curr = String::new();
-            }
-            capturing = true;
-            count += 1;
-        }
-
-        if capturing {
-            if !curr.is_empty() {
-                curr.push(' ');
-            }
-            curr.push_str(line);
-        }
-    }
-
-    let pb_linenr = ports_v(&fp_map);
-    let payb_linenr = payloads_v(&fp_map);
-    let map = port_payload_map(pb_linenr, payb_linenr);
-
-    generate_code(map);
-}
-
-/// Generates a file called Generated.rs and calls cargo fmt from the command line
-///
-/// # Arguments
-///
-/// * `port_payload_map` - A BTreeMap mapping port numbers to payload data
-fn generate_code(port_payload_map: BTreeMap<Vec<u16>, Vec<u8>>) {
-    let dest_path = PathBuf::from("src/generated.rs");
-
-    let mut generated_code = String::new();
-    generated_code.push_str("use std::collections::BTreeMap;\n");
-    generated_code.push_str("use once_cell::sync::Lazy;\n\n");
-
-    generated_code.push_str("fn generated_data() -> BTreeMap<Vec<u16>, Vec<u8>> {\n");
-    generated_code.push_str("    let mut map = BTreeMap::new();\n");
-
-    for (ports, payloads) in port_payload_map {
-        generated_code.push_str("    map.insert(vec![");
-        generated_code.push_str(
-            &ports
-                .iter()
-                .map(|&p| p.to_string())
-                .collect::<Vec<_>>()
-                .join(","),
-        );
-        generated_code.push_str("], vec![");
-        generated_code.push_str(
-            &payloads
-                .iter()
-                .map(|&p| p.to_string())
-                .collect::<Vec<_>>()
-                .join(","),
-        );
-        generated_code.push_str("]);\n");
-    }
-
-    generated_code.push_str("    map\n");
-    generated_code.push_str("}\n\n");
-
-    generated_code.push_str(
-        "static PARSED_DATA: Lazy<BTreeMap<Vec<u16>, Vec<u8>>> = Lazy::new(generated_data);\n",
-    );
-    generated_code.push_str("pub fn get_parsed_data() -> &'static BTreeMap<Vec<u16>, Vec<u8>> {\n");
-    generated_code.push_str("    &PARSED_DATA\n");
-    generated_code.push_str("}\n");
-
-    fs::write(dest_path, generated_code).unwrap();
-
-    // format the generated code
-    Command::new("cargo")
-        .arg("fmt")
-        .arg("--all")
-        .output()
-        .expect("Failed to execute cargo fmt");
-}
-
-/// Creates a BTreeMap of line numbers mapped to a Vec<u16> of ports
-///
-/// # Arguments
-///
-/// * `fp_map` - A BTreeMap containing the parsed file data
-///
-/// # Returns
-///
-/// A BTreeMap where keys are line numbers and values are vectors of ports
-fn ports_v(fp_map: &BTreeMap<i32, String>) -> BTreeMap<i32, Vec<u16>> {
-    let mut pb_linenr: BTreeMap<i32, Vec<u16>> = BTreeMap::new();
-    let mut port_list: Vec<u16> = Vec::new();
-
-    for (&line_nr, ports) in fp_map {
-        if ports.contains("udp ") {
-            let remain = &ports[4..];
-            let mut start = remain.split(' ');
-
-            let ports = start.next().unwrap();
-            let port_segments: Vec<&str> = ports.split(',').collect();
-
-            for segment in port_segments {
-                if segment.contains('-') {
-                    let range: Vec<&str> = segment.trim().split('-').collect();
-                    let start = range[0].parse::<u16>().unwrap();
-                    let end = range[1].parse::<u16>().unwrap();
-
-                    for port in start..end {
-                        port_list.push(port);
-                    }
-                } else if !segment.is_empty() {
-                    match segment.parse::<u16>() {
-                        Ok(port) => port_list.push(port),
-                        Err(_) => println!("Error parsing port: {}", segment),
-                    }
-                }
-            }
-        }
-
-        pb_linenr.insert(line_nr, port_list.clone());
-        port_list.clear();
-    }
-
-    pb_linenr
-}
-
-/// Parses out the Payloads into a BTreeMap of line numbers mapped to vectors of payload bytes
-///
-/// # Arguments
-///
-/// * `fp_map` - A BTreeMap containing the parsed file data
-///
-/// # Returns
-///
-/// A BTreeMap where keys are line numbers and values are vectors of payload bytes
-fn payloads_v(fp_map: &BTreeMap<i32, String>) -> BTreeMap<i32, Vec<u8>> {
-    let mut payb_linenr: BTreeMap<i32, Vec<u8>> = BTreeMap::new();
-
-    for (&line_nr, data) in fp_map {
-        if data.contains('\"') {
-            let start = data.find('\"').expect("payload opening \" not found");
-            let payloads = &data[start + 1..];
-            payb_linenr.insert(line_nr, parser(payloads.trim()));
-        }
-    }
-
-    payb_linenr
-}
-
-/// Converts a hexadecimal string to a Vec<u8>
-///
-/// # Arguments
-///
-/// * `payload` - A string slice containing the hexadecimal payload
-///
-/// # Returns
-///
-/// A vector of bytes representing the decoded payload
-fn parser(payload: &str) -> Vec<u8> {
-    let payload = payload.trim_matches('"');
-    let mut tmp_str = String::new();
-    let mut bytes: Vec<u8> = Vec::new();
-
-    for (idx, char) in payload.chars().enumerate() {
-        if char == '\\' && payload.chars().nth(idx + 1) == Some('x') {
-            continue;
-        } else if char.is_ascii_digit() {
-            tmp_str.push(char);
-            if tmp_str.len() == 2 {
-                bytes.push(u8::from_str_radix(&tmp_str, 16).unwrap());
-                tmp_str.clear();
-            }
-        }
-    }
-
-    bytes
-}
-
-/// Combines the ports BTreeMap and the Payloads BTreeMap
-///
-/// # Arguments
-///
-/// * `pb_linenr` - A BTreeMap mapping line numbers to vectors of ports
-/// * `payb_linenr` - A BTreeMap mapping line numbers to vectors of payload bytes
-///
-/// # Returns
-///
-/// A BTreeMap mapping vectors of ports to vectors of payload bytes
-fn port_payload_map(
-    pb_linenr: BTreeMap<i32, Vec<u16>>,
-    payb_linenr: BTreeMap<i32, Vec<u8>>,
-) -> BTreeMap<Vec<u16>, Vec<u8>> {
-    let mut ppm_fin: BTreeMap<Vec<u16>, Vec<u8>> = BTreeMap::new();
-
-    for (port_linenr, ports) in pb_linenr {
-        for (pay_linenr, payloads) in &payb_linenr {
-            if pay_linenr == &port_linenr {
-                ppm_fin.insert(ports.to_vec(), payloads.to_vec());
-            }
-        }
-    }
-
-    ppm_fin
-}

justfile

@@ -1,17 +0,0 @@
-test:
-    cargo nextest run
-    cargo clippy 
-    cargo fmt --check
-    cargo doc --workspace --all-features --no-deps --document-private-items
-
-fix:
-    cargo fmt
-    cargo clippy --fix
-
-# release only runs if test runs
-release: test
-    git checkout master
-    git pull
-    cargo generate-lockfile
-    cargo publish 
-    git push

nmap-payloads

@@ -1,500 +0,0 @@
-# Nmap nmap payload database -*- mode: fundamental; -*-
-# $Id$
-#
-# These payloads are sent with every host discovery or port scan probe
-# by default. This database should only include payloads that are
-# unlikely to crash services, trip IDS alerts, or change state on the
-# server. The idea behind these is to evoke a response using a payload.
-# Some of them are taken from nmap-service-probes.
-#
-# This collection of data is (C) 1996-2022 by Nmap Software LLC.  It
-# is distributed under the Nmap Public Source license as provided in
-# the LICENSE file of the source distribution or at
-# https://nmap.org/npsl/.  Note that this free license does not allow
-# incorporation of Nmap or its data files within proprietary
-# software. We sell a separate Nmap OEM for that as described
-# (including pricing) at https://nmap.org/npsl/.
-#
-# Each entry begins with a protocol (only "udp" is supported) followed
-# by a comma-separated list of ports, followed by one or more quoted
-# strings containing the payload. These elements may be broken across
-# several lines. For future expansion, additional keywords may follow
-# the payload data. Any data following one of these keywords must be on
-# the same line as the keyword so that unknown keywords can be ignored
-# by the parser. Currently this file contains some entries with the
-# "source" keyword to specify a desired source port, but it is not
-# honored by Nmap.
-#
-# Multiple payloads may be defined for a single protocol and port, in
-# which case they will be all be sent concurrently. There is a limit
-# of 255 payloads per port.
-#
-# Lines longer than 1024 characters will be ignored.
-#
-# Example:
-# udp 1234 "payloaddatapayloaddata"
-#   "payloaddatapayloaddata"
-# source 5678
-
-# GenericLines. Use for the echo service.
-udp 7 "\x0D\x0A\x0D\x0A"
-# DNSStatusRequest
-# Sent for TFTP (69) as well due to its ability to provoke an error response
-udp 53,69,5353,26198 "\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-# DNS VER
-udp 53,5353,26198
-  "\x77\x77\x01\x00\x00"
-  "\x01\x00\x00\x00\x00\x00\x00\x07version\x04bind\x00\x00\x10\x00\x03"
-
-# DHCP INFORM
-udp 67
-  "\x01\x01\x06\x00"
-  "\x01\x23\x45\x67\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x0e\x35\xd4\xd8\x51\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x63\x82\x53\x63\x35\x01"
-  "\x08\xff"
-
-# TFTP GET
-udp 69 "\x00\x01r7tftp.txt\x00octet\x00"
-
-# QUIC packet with unsupported version Q999
-# Also found on 443, but need to check whether DTLS or QUIC is more prevalent
-udp 80 "\r12345678Q999\x00"
-# RPCCheck
-udp 111
-  "\x72\xFE\x1D\x13\x00\x00\x00\x00\x00\x00\x00\x02\x00\x01\x86\xA0"
-  "\x00\x01\x97\x7C\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00"
-# ONCRPC CALL
-udp 111,2049,4045,32768-65535
-  "\x3e\xec\xe3\xca\x00\x00\x00\x00\x00\x00\x00\x02\x00"
-  "\xbc\x61\x4e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-# NTPRequest
-udp 123
-  "\xE3\x00\x04\xFA\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\xC5\x4F\x23\x4B\x71\xB1\x52\xF3"
-# NTP REQ
-udp 123
-  "\xd9\x00\x0a\xfa\x00\x00\x00"
-  "\x00\x00\x01\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc6"
-  "\xf1\x5e\xdb\x78\x00\x00\x00"
-# DCERPC CALL
-udp 135,1025-1199
-  "\x05\x00\x0b\x03\x10\x00\x00\x00\x48\x00"
-  "\x00\x00\x01\x00\x00\x00\xb8\x10\xb8\x10\x00\x00\x00\x00\x01\x00\x00"
-  "\x00\x00\x00\x01\x00\x01\x23\x45\x67\x89\xab\xcd\xef\x01\x23\x45\x67"
-  "\x89\xab\xcd\xef\xe7\x03\x00\x00\xfe\xdc\xba\x98\x76\x54\x32\x10\x01"
-  "\x23\x45\x67\x89\xab\xcd\xef\xe7\x03\x00\x00"
-# NBTStat
-udp 137
-  "\x80\xF0\x00\x10\x00\x01\x00\x00\x00\x00\x00\x00"
-  "\x20CKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\x00\x00\x21\x00\x01"
-# CIFS NS NAME QUERY UC
-udp 137
-  "\x01\x91\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00"
-  "\x20CKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\x00\x00\x21\x00\x01"
-# CIFS NS NAME QUERY BC
-udp 137
-  "\x01\x91\x00\x10\x00\x01\x00\x00\x00\x00\x00\x00"
-  "\x20CKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\x00\x00\x21\x00\x01"
-# SNMPv3GetRequest
-udp 161,260,3401
-  "\x30\x3A\x02\x01\x03\x30\x0F\x02\x02\x4A\x69\x02\x03\x00\xFF\xE3"
-  "\x04\x01\x04\x02\x01\x03\x04\x10\x30\x0E\x04\x00\x02\x01\x00\x02"
-  "\x01\x00\x04\x00\x04\x00\x04\x00\x30\x12\x04\x00\x04\x00\xA0\x0C"
-  "\x02\x02\x37\xF0\x02\x01\x00\x02\x01\x00\x30\x00"
-# SNMP PUBLIC WALK
-udp 161,260,3401
-  "\x30\x1f\x02\x01\x00\x04\x06public\xa1\x12\x02\x01\x00\x02"
-  "\x01\x00\x02\x01\x00\x30\x07\x30\x05\x06\x01\x00\x05\x00"
-
-# Sqlping - disabled because it trips a Snort rule with SID 2049
-# ("MS-SQL ping attempt").
-# udp 1434 "\x02"
-
-# xdmcp - X Display Manager Control Protocol. Version 1, packet type
-# Query (2), no authorization names. We expect a Willing or Unwilling
-# packet in reply.
-# http://cgit.freedesktop.org/xorg/doc/xorg-docs/plain/hardcopy/XDMCP/xdmcp.PS.gz
-udp 177 "\x00\x01\x00\x02\x00\x01\x00"
-
-# Connectionless LDAP - used by Microsoft Active Directory
-udp 389
-  "\x30\x84\x00\x00\x00\x2d\x02\x01\x07\x63\x84\x00\x00\x00\x24\x04\x00"
-  "\x0a\x01\x00\x0a\x01\x00\x02\x01\x00\x02\x01\x64\x01\x01\x00\x87\x0b"
-  "objectClass0\x84\x00\x00\x00\x00"
-
-
-# svrloc
-udp 427
-  "\x02\x01\x00\x006 \x00\x00\x00\x00\x00\x01\x00\x02en\x00\x00\x00\x15"
-  "service:service-agent\x00\x07default\x00\x00\x00\x00"
-
-# DTLS
-udp 443,853,3391,4433,4740,5349,5684,5868,6514,6636,8232,10161,10162,12346,12446,12546,12646,12746,12846,12946,13046
-  # DTLS 1.0, length 52
-  "\x16\xfe\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x36"
-  # ClientHello, length 40, sequence 0, offset 0
-  "\x01\x00\x00\x2a\x00\x00\x00\x00\x00\x00\x00\x2a"
-  # DTLS 1.2
-  "\xfe\xfd"
-  # Random
-  "\x00\x00\x00\x00\x7c\x77\x40\x1e\x8a\xc8\x22\xa0\xa0\x18\xff\x93"
-  "\x08\xca\xac\x0a\x64\x2f\xc9\x22\x64\xbc\x08\xa8\x16\x89\x19\x3f"
-  # Session id length 0, cookie length 0
-  "\x00\x00"
-  # Cipher suites, mandatory TLS_RSA_WITH_AES_128_CBC_SHA
-  "\x00\x02\x00\x2f"
-  # Compressors (NULL)
-  "\x01\x00"
-
-# Internet Key Exchange version 1, phase 1 Main Mode. We offer every
-# combination of (DES, 3DES) and (MD5, SHA) in the hope that one of them will
-# be acceptable. Because we use a fixed cookie, we set the association lifetime
-# to 1 second to reduce the chance that repeated probes will look like
-# retransmissions (and therefore not get a response). This payload comes from
-#   ike-scan --lifetime 1 --cookie 0011223344556677 --trans=5,2,1,2 --trans=5,1,1,2 --trans=1,2,1,2 --trans=1,1,1,2
-# We expect another phase 1 message in response. This payload works better with
-# a source port of 500 or a randomized initiator cookie.
-udp 500
-  # Initiator cookie 0x0011223344556677, responder cookie 0x0000000000000000.
-  "\x00\x11\x22\x33\x44\x55\x66\x77\x00\x00\x00\x00\x00\x00\x00\x00"
-  # Version 1, Main Mode, flags 0x00, message ID 0x00000000, length 192.
-  "\x01\x10\x02\x00\x00\x00\x00\x00\x00\x00\x00\xC0"
-  # Security Association payload, length 164, IPSEC, IDENTITY.
-  "\x00\x00\x00\xA4\x00\x00\x00\x01\x00\x00\x00\x01"
-  # Proposal 1, length 152, ISAKMP, 4 transforms.
-  "\x00\x00\x00\x98\x01\x01\x00\x04"
-  # Transform 1, 3DES-CBC, SHA, PSK, group 2.
-  "\x03\x00\x00\x24\x01\x01\x00\x00\x80\x01\x00\x05\x80\x02\x00\x02"
-  "\x80\x03\x00\x01\x80\x04\x00\x02"
-  "\x80\x0B\x00\x01\x00\x0C\x00\x04\x00\x00\x00\x01"
-  # Transform 2, 3DES-CBC, MD5, PSK, group 2.
-  "\x03\x00\x00\x24\x02\x01\x00\x00\x80\x01\x00\x05\x80\x02\x00\x01"
-  "\x80\x03\x00\x01\x80\x04\x00\x02"
-  "\x80\x0B\x00\x01\x00\x0C\x00\x04\x00\x00\x00\x01"
-  # Transform 3, DES-CBC, SHA, PSK, group 2.
-  "\x03\x00\x00\x24\x03\x01\x00\x00\x80\x01\x00\x01\x80\x02\x00\x02"
-  "\x80\x03\x00\x01\x80\x04\x00\x02"
-  "\x80\x0B\x00\x01\x00\x0C\x00\x04\x00\x00\x00\x01"
-  # Transform 4, DES-CBC, MD5, PSK, group 2.
-  "\x00\x00\x00\x24\x04\x01\x00\x00\x80\x01\x00\x01\x80\x02\x00\x01"
-  "\x80\x03\x00\x01\x80\x04\x00\x02"
-  "\x80\x0B\x00\x01\x00\x0C\x00\x04\x00\x00\x00\x01"
-# IPSEC START
-udp 500,4500
-  "\x31\x27\xfc"
-  "\xb0\x38\x10\x9e\x89\x00\x00\x00\x00\x00\x00\x00\x00\x01\x10\x02\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\xcc\x0d\x00\x00\x5c\x00\x00\x00\x01\x00"
-  "\x00\x00\x01\x00\x00\x00\x50\x01\x01\x00\x02\x03\x00\x00\x24\x01\x01"
-  "\x00\x00\x80\x01\x00\x05\x80\x02\x00\x02\x80\x04\x00\x02\x80\x03\x00"
-  "\x03\x80\x0b\x00\x01\x00\x0c\x00\x04\x00\x00\x0e\x10\x00\x00\x00\x24"
-  "\x02\x01\x00\x00\x80\x01\x00\x05\x80\x02\x00\x01\x80\x04\x00\x02\x80"
-  "\x03\x00\x03\x80\x0b\x00\x01\x00\x0c\x00\x04\x00\x00\x0e\x10\x0d\x00"
-  "\x00\x18\x1e\x2b\x51\x69\x05\x99\x1c\x7d\x7c\x96\xfc\xbf\xb5\x87\xe4"
-  "\x61\x00\x00\x00\x04\x0d\x00\x00\x14\x40\x48\xb7\xd5\x6e\xbc\xe8\x85"
-  "\x25\xe7\xde\x7f\x00\xd6\xc2\xd3\x0d\x00\x00\x14\x90\xcb\x80\x91\x3e"
-  "\xbb\x69\x6e\x08\x63\x81\xb5\xec\x42\x7b\x1f\x00\x00\x00\x14\x26\x24"
-  "\x4d\x38\xed\xdb\x61\xb3\x17\x2a\x36\xe3\xd0\xcf\xb8\x19"
-
-# Routing Information Protocol version 1. Special-case request for the entire
-# routing table (address family 0, address 0.0.0.0, metric 16). RFC 1058,
-# section 3.4.1.
-udp 520
-  "\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x10"
-
-# RMCP ASF ping
-udp 623
-  "\x06\x00\xff\x06" # RMCP version 6, sequence 0xff, normal RMCP class ASF
-  "\x00\x00\x11\xbe" # IAN ASF code 4542
-  "\x80\x00\x00\x00" # payload-less ASF presence ping
-
-# IPMI
-# RMCP Get Channel Auth Capabilities
-udp 623
-  "\x06\x00\xff\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09\x20\x18"
-  "\xc8\x81\x00\x38\x8e\x04\xb5"
-
-# serialnumberd. This service runs on Mac OS X Server. This probe
-# requests the serial number of another server. In response we expect a
-# packet starting with "SNRESPS:", followed by some data whose purpose
-# is not known.
-udp 626 "SNQUERY: 127.0.0.1:AAAAAA:xsvr"
-
-# OpenVPN P_CONTROL_HARD_RESET_CLIENT_V2
-# Byte 0; 0x38 opcode
-# Byte 1-8: Session ID, random
-# Byte 9: Message packet-id array length (0)
-# Byte 10-13: Message packet-id (0)
-udp 1194 "8d\xc1x\x01\xb8\x9b\xcb\x8f\0\0\0\0\0"
-# OpenVPN when in PKI mode and without the "HMAC Firewall" setting enabled
-# (tls-auth) should respond to the following probe, which is
-# 0x38<8 random bytes><4 null bytes>
-udp 1194
-  "\x38\x01\x02\x03\x04\x05\x06\x07\x08\x00\x00\x00\x00"
-
-# Citrix MetaFrame application browser service
-# Original idea from http://sh0dan.org/oldfiles/hackingcitrix.html
-# Payload contents copied from Wireshark capture of Citrix Program
-# Neighborhood client application.  The application uses this payload to
-# locate Citrix servers on the local network.  Response to this probe is
-# a 48 byte UDP payload as shown here:
-#
-# 0000   30 00 02 31 02 fd a8 e3 02 00 06 44 c0 a8 80 55
-# 0010   00 00 00 00 00 00 00 00 00 00 00 00 02 00 06 44
-# 0020   c0 a8 80 56 00 00 00 00 00 00 00 00 00 00 00 00
-#
-# The first 12 bytes appear to be the same in all responses.
-#
-# Bytes 0x00 appears to be a packet length field
-# Bytes 0x0C - 0x0F are the IP address of the server
-# Bytes 0x10 - 0x13 may vary, 0x14 - 0x1F do not appear to
-# Bytes 0x20 - 0x23 are the IP address of the primary system in a server farm
-#                   configuration
-# Bytes 0x24 - 0x27 can vary, 0x28 - 0x2F do not appear to
-udp 1604
-  "\x1e\x00\x01\x30\x02\xfd\xa8\xe3\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-
-# RADIUS Access-Request. This is a degenerate packet with no username or
-# password; we expect an Access-Reject in response. The Identifier and Request
-# Authenticator are both 0. It was generated by running
-#   echo 'User-Password = ""' | radclient <ip> auth ""
-# and then manually stripping out the password.
-#
-# Section 2 of the RFC says "A request from a client for which the
-# RADIUS server does not have a shared secret MUST be silently
-# discarded." So this payload only works when the server is configured
-# (or misconfigured) to know the scanning machine as a client.
-#
-# RFC 2865: "The early deployment of RADIUS was done using UDP port
-# number 1645, which conflicts with the "datametrics" service. The
-# officially assigned port number for RADIUS is 1812.
-udp 1645,1812
-  "\x01\x00\x00\x14"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-
-# L2TP ICRQ
-udp 1701
-  "\xc8\x02"
-  "\x00\x3c\x00\x00\x00\x00\x00\x00\x00\x00\x80\x08\x00\x00\x00\x00\x00"
-  "\x01\x80\x08\x00\x00\x00\x02\x01\x00\x80\x0e\x00\x00\x00\x07"
-  "nxp-scan\x80\x0a\x00\x00\x00\x03\x00\x00\x00\x03\x80"
-  "\x08\x00\x00\x00\x09\x00\x00"
-
-# UPNP MSEARCH
-udp 1900
-  "M-SEARCH * HTTP/1.1\r\nHost: 239.255.255.250:1900\r\n"
-  "Man: \"ssdp:discover\"\r\nMX: 5\r\nST: ssdp:all\r\n\r\n"
-
-# NFS version 2, RFC 1831. XID 0x00000000, program 100003 (NFS), procedure
-# NFSPROC_NULL (does nothing, see section 2.2.1), null authentication (see
-# section 9.1).
-udp 2049
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x01\x86\xA3"
-  "\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  "\x00\x00\x00\x00\x00\x00\x00\x00"
-
-# GPRS Tunneling Protocol (GTP)
-udp 2123,2152
-# GTPv1, protocol 1
-"\x32"
-# EchoRequest
-"\x01"
-# message length
-"\x00\x04"
-# Tunnel endpoint identifier
-"\x00\x00\x42\x00"
-# sequence number
-"\x13\x37"
-# N-PDU number
-"\x00"
-# next extension header type
-"\x00"
-
-# GPRS Tunneling Protocol (GTP) "prime" v2
-# This same packet can be used for GTP v2 on ports 2123 and 2152 if you change
-# the first byte from \x4e to \x40
-udp 3386
-# GTP'v2
-"\x4e"
-# EchoRequest
-"\x01"
-# message length
-"\x00\x04"
-# sequence number
-"\xde\xfe\xc8\x00"
-
-# Freelancer game server status query
-# http://sourceforge.net/projects/gameq/
-# (relevant files: games.ini, packets.ini, freelancer.php)
-udp 2302 "\x00\x02\xf1\x26\x01\x26\xf0\x90\xa6\xf0\x26\x57\x4e\xac\xa0\xec\xf8\x68\xe4\x8d\x21"
-
-# Apple Remote Desktop (ARD)
-udp 3283 "\0\x14\0\x01\x03"
-
-# STUN Binding request, see RFC 5389 Section 6
-# message type = 0x001, Binding (see Section 18.1)
-# message length = 0
-# magic cookie = 0x2112a442
-# transaction ID = "\x00"*12
-udp 3478 "\x00\x01\x00\x00\x21\x12\xa4\x42\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-
-# Sun Service Tag Discovery protocol (stdiscover)
-# http://arc.opensolaris.org/caselog/PSARC/2006/638/stdiscover_protocolv2.pdf
-# Would work better with a varying cookie; the second and later sends of this
-# probe will be interpreted as resends by the server and will be ignored.
-udp 6481 "[PROBE] 0000"
-
-# NAT-PMP external IP address request. See section 3.2 of
-# http://files.dns-sd.org/draft-cheshire-nat-pmp.txt.
-udp 5351 "\x00\x00"
-
-# DNS Service Discovery (DNS-SD) service query, as used in Zeroconf.
-# Transaction ID 0x0000, flags 0x0000, 1 question: PTR query for
-# _services._dns-sd._udp.local. If the remote host supports DNS-SD it will send
-# back a list of all its services. This is the same as a packet capture of
-#   dns-sd -B _services._dns-sd._udp .
-# See section 9 of
-# http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt.
-# This first probe is a QU probe, meaning a unicast response is desired
-udp 5353
-  "\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00"
-  "\x09_services\x07_dns-sd\x04_udp\x05local\x00\x00\x0C\x80\x01"
-# This second probe is a QM probe, meaning a unicast response is desired
-udp 5353
-  "\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00"
-  "\x09_services\x07_dns-sd\x04_udp\x05local\x00\x00\x0C\x00\x01"
-
-# PCANY STATUS
-udp 5632 "ST"
-
-# CoAP GET .well-known/core
-udp 5683 "@\x01\x01\xce\xbb.well-known\x04core"
-
-# UT2K PING
-udp 7777 "None\x00"
-
-# Ubiquiti Discovery Service - v1
-udp 10001 "\x01\x00\x00\x00"
-
-# Amanda backup service noop request. I think that this does nothing on the
-# server but only asks it to send back its feature list. In reply we expect an
-# ACK or (more likely) an ERROR. I couldn't find good online documentation of
-# the Amanda network protocol. There is parsing code in the Amanda source at
-# common-src/security-util.c. This is based on a packet capture of
-#   amcheck <config> <host>
-udp 10080
-  "Amanda 2.6 REQ HANDLE 000-00000000 SEQ 0\n"
-  "SERVICE noop\n"
-
-# VxWorks Wind River Debugger
-udp 17185
-# Random XID
-"\x00\x00\x00\x00"
-# RPC version 2 procedure call
-"\x00\x00\x00\x00\x00\x00\x00\x02"
-# WDB version 1
-"\x55\x55\x55\x55\x00\x00\x00\x01"
-# WDB_TARGET_PING
-"\x00\x00\x00\x00"
-# RPC Auth NULL
-"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-# Checksum
-"\xff\xff\x55\x13"
-# WDB wrapper (length and sequence number)
-"\x00\x00\x00\x30\x00\x00\x00\x01"
-# Empty data?
-"\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00"
-# VXWORKS DEBUG (alternative?)
-udp 17185
-  "\x72\x37\x72\x37\x00\x00\x00"
-  "\x00\x00\x00\x00\x02\x55\x55\x55\x55\x00\x00\x00\x01\x00\x00\x00\x01"
-  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff"
-  "\xff\x55\x10\x00\x00\x00\x3c\x00\x00\x00\x03\x00\x00\x00\x02\x00\x00"
-  "\x00\x00\x00\x00\x00\x00"
-
-# Quake 2 and Quake 3 game servers (and servers of derived games like Nexuiz).
-# Gets game information from the server (see probe responses in
-# nmap-service-probes). These services typically run on a base port or a
-# few numbers higher.
-# Quake 2. Typical ports: 27910-27914.
-udp 27910-27914 "\xff\xff\xff\xffstatus"
-# Quake 3. Typical ports:
-# 26000-26004: Nexuiz
-# 27960-27964: Various games
-# 30720-30724: Tremulous
-# 44400: Warsow
-udp 26000-26004,27960-27964,30720-30724,44400 "\xff\xff\xff\xffgetstatus"
-
-# Murmur 1.2.X (Mumble server)
-# UDP ping. "abcdefgh" is an identifier. See
-# http://mumble.sourceforge.net/Protocol.
-udp 64738 "\x00\x00\x00\x00abcdefgh"
-
-# Ventrilo 2.1.2+
-# UDP general status request (encrypted).
-# See http://aluigi.altervista.org/papers.htm#ventrilo
-udp 3784
-"\x01\xe7\xe5\x75\x31\xa3\x17\x0b\x21\xcf\xbf\x2b\x99\x4e\xdd\x19\xac\xde\x08\x5f\x8b\x24\x0a\x11\x19\xb6\x73\x6f\xad\x28\x13\xd2\x0a\xb9\x12\x75"
-
-# Kademlia (kad) as used by various P2P applications.  Send a Kademlia ping
-# 4665, 4666, 4672, 6429: eDonkey/eMule and variants
-udp 4665,4666,4672,6429 "\xE4\x60"
-
-# TeamSpeak 2
-# UDP login request
-# See http://wiki.wireshark.org/TeamSpeak2
-udp 8767
-"\xf4\xbe\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x002x\xba\x85\tTeamSpeak\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\nWindows XP\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00 \x00<\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08nickname\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-
-# TS3INIT1
-udp 9987
-"TS3INIT1\x00\x65\x00\x00\x88\x0a\x39\x7b\x0f\x00\x5b\x55\x72\xef\xdc\x78\x32\x6b\x00\x00\x00\x00\x00\x00\x00\x00"
-
-# TeamSpeak 3
-# UDP login request (encrypted)
-# http://seclists.org/nmap-dev/2013/q3/72
-udp 9987
-"\x05\xca\x7f\x16\x9c\x11\xf9\x89\x00\x00\x00\x00\x02\x9d\x74\x8b\x45\xaa\x7b\xef\xb9\x9e\xfe\xad\x08\x19\xba\xcf\x41\xe0\x16\xa2\x32\x6c\xf3\xcf\xf4\x8e\x3c\x44\x83\xc8\x8d\x51\x45\x6f\x90\x95\x23\x3e\x00\x97\x2b\x1c\x71\xb2\x4e\xc0\x61\xf1\xd7\x6f\xc5\x7e\xf6\x48\x52\xbf\x82\x6a\xa2\x3b\x65\xaa\x18\x7a\x17\x38\xc3\x81\x27\xc3\x47\xfc\xa7\x35\xba\xfc\x0f\x9d\x9d\x72\x24\x9d\xfc\x02\x17\x6d\x6b\xb1\x2d\x72\xc6\xe3\x17\x1c\x95\xd9\x69\x99\x57\xce\xdd\xdf\x05\xdc\x03\x94\x56\x04\x3a\x14\xe5\xad\x9a\x2b\x14\x30\x3a\x23\xa3\x25\xad\xe8\xe6\x39\x8a\x85\x2a\xc6\xdf\xe5\x5d\x2d\xa0\x2f\x5d\x9c\xd7\x2b\x24\xfb\xb0\x9c\xc2\xba\x89\xb4\x1b\x17\xa2\xb6"
-
-# Memcached
-# version request (shorter response than stats)
-# https://github.com/memcached/memcached/blob/master/doc/protocol.txt
-udp 11211
-"\0\x01\0\0\0\x01\0\0version\r\n"
-
-# Steam, typically using a port in 27015-27030.  Send a "Source Engine query"
-udp 27015-27030
-  "\xff\xff\xff\xffTSource Engine Query\x00"
-
-# TRIN00 UNIX PING
-udp 27444 "png l44adsl"
-
-# BO PING
-udp 31337
-  "\xce\x63\xd1\xd2\x16\xe7\x13\xcf\x38"
-  "\xa5\xa5\x86\xb2\x75\x4b\x99\xaa\x32\x58"
-
-# TRIN00 WIN PING
-udp 34555 "png []..Ks"
-
-# Beckhoff ADS discovery request
-# https://github.com/ONE75/adsclient/blob/master/src/AdsClient.Finder/DeviceFinder.cs#L49-L64
-udp 48899
-"\x03\x66\x14\x71\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x01\x10\x27\x00\x00\x00\x00"

src/address.rs

@@ -1,5 +1,4 @@
 //! Provides functions to parse input IP addresses, CIDRs or files.
-use std::collections::BTreeSet;
 use std::fs::{self, File};
 use std::io::{prelude::*, BufReader};
 use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
@@ -28,8 +27,6 @@ use crate::warning;
 ///
 /// let ips = parse_addresses(&opts);
 /// ```
-///
-/// Finally, any duplicates are removed to avoid excessive scans.
 pub fn parse_addresses(input: &Opts) -> Vec<IpAddr> {
     let mut ips: Vec<IpAddr> = Vec::new();
     let mut unresolved_addresses: Vec<&str> = Vec::new();
@@ -69,10 +66,7 @@ pub fn parse_addresses(input: &Opts) -> Vec<IpAddr> {
         }
     }
 
-    ips.into_iter()
-        .collect::<BTreeSet<_>>()
-        .into_iter()
-        .collect()
+    ips
 }
 
 /// Given a string, parse it as a host, IP address, or CIDR.
@@ -262,16 +256,6 @@ mod tests {
         assert_eq!(ips.len(), 0);
     }
 
-    #[test]
-    fn parse_duplicate_cidrs() {
-        let mut opts = Opts::default();
-        opts.addresses = vec!["79.98.104.0/21".to_owned(), "79.98.104.0/24".to_owned()];
-
-        let ips = parse_addresses(&opts);
-
-        assert_eq!(ips.len(), 2_048);
-    }
-
     #[test]
     fn resolver_default_cloudflare() {
         let opts = Opts::default();

src/input.rs

@@ -271,7 +271,6 @@ pub struct Config {
 
 #[cfg(not(tarpaulin_include))]
 #[allow(clippy::doc_link_with_quotes)]
-#[allow(clippy::manual_unwrap_or_default)]
 impl Config {
     /// Reads the configuration file with TOML format and parses it into a
     /// Config struct.

src/lib.rs

@@ -55,4 +55,4 @@ pub mod scripts;
 
 pub mod address;
 
-pub mod generated;
+pub mod udp_packets;

src/main.rs

@@ -35,9 +35,6 @@ extern crate log;
 /// Faster Nmap scanning with Rust
 /// If you're looking for the actual scanning, check out the module Scanner
 fn main() {
-    #[cfg(not(unix))]
-    let _ = ansi_term::enable_ansi_support();
-
     env_logger::init();
     let mut benchmarks = Benchmark::init();
     let mut rustscan_bench = NamedTimer::start("RustScan");
@@ -48,7 +45,7 @@ fn main() {
 
     debug!("Main() `opts` arguments are {:?}", opts);
 
-    let scripts_to_run: Vec<ScriptFile> = match init_scripts(&opts.scripts) {
+    let scripts_to_run: Vec<ScriptFile> = match init_scripts(opts.scripts) {
         Ok(scripts_to_run) => scripts_to_run,
         Err(e) => {
             warning!(

src/port_strategy/mod.rs

@@ -105,7 +105,7 @@ mod tests {
         let range = PortRange { start: 1, end: 100 };
         let strategy = PortStrategy::pick(&Some(range), None, ScanOrder::Serial);
         let result = strategy.order();
-        let expected_range = (1..=100).collect::<Vec<u16>>();
+        let expected_range = (1..=100).into_iter().collect::<Vec<u16>>();
         assert_eq!(expected_range, result);
     }
     #[test]
@@ -113,7 +113,7 @@ mod tests {
         let range = PortRange { start: 1, end: 100 };
         let strategy = PortStrategy::pick(&Some(range), None, ScanOrder::Random);
         let mut result = strategy.order();
-        let expected_range = (1..=100).collect::<Vec<u16>>();
+        let expected_range = (1..=100).into_iter().collect::<Vec<u16>>();
         assert_ne!(expected_range, result);
 
         result.sort_unstable();
@@ -131,7 +131,7 @@ mod tests {
     fn random_strategy_with_ports() {
         let strategy = PortStrategy::pick(&None, Some((1..10).collect()), ScanOrder::Random);
         let mut result = strategy.order();
-        let expected_range = (1..10).collect::<Vec<u16>>();
+        let expected_range = (1..10).into_iter().collect::<Vec<u16>>();
         assert_ne!(expected_range, result);
 
         result.sort_unstable();

src/port_strategy/range_iterator.rs

@@ -103,23 +103,23 @@ mod tests {
     #[test]
     fn range_iterator_iterates_through_the_entire_range() {
         let result = generate_sorted_range(1, 10);
-        let expected_range = (1..=10).collect::<Vec<u16>>();
+        let expected_range = (1..=10).into_iter().collect::<Vec<u16>>();
         assert_eq!(expected_range, result);
 
         let result = generate_sorted_range(1, 100);
-        let expected_range = (1..=100).collect::<Vec<u16>>();
+        let expected_range = (1..=100).into_iter().collect::<Vec<u16>>();
         assert_eq!(expected_range, result);
 
         let result = generate_sorted_range(1, 1000);
-        let expected_range = (1..=1000).collect::<Vec<u16>>();
+        let expected_range = (1..=1000).into_iter().collect::<Vec<u16>>();
         assert_eq!(expected_range, result);
 
         let result = generate_sorted_range(1, 65_535);
-        let expected_range = (1..=65_535).collect::<Vec<u16>>();
+        let expected_range = (1..=65_535).into_iter().collect::<Vec<u16>>();
         assert_eq!(expected_range, result);
 
         let result = generate_sorted_range(1000, 2000);
-        let expected_range = (1000..=2000).collect::<Vec<u16>>();
+        let expected_range = (1000..=2000).into_iter().collect::<Vec<u16>>();
         assert_eq!(expected_range, result);
     }
 

src/scanner/mod.rs

@@ -1,6 +1,6 @@
 //! Core functionality for actual scanning behaviour.
-use crate::generated::get_parsed_data;
 use crate::port_strategy::PortStrategy;
+use crate::udp_packets::udp_payload::cust_payload;
 use log::debug;
 
 mod socket_iterator;
@@ -11,7 +11,6 @@ use async_std::prelude::*;
 use async_std::{io, net::UdpSocket};
 use colored::Colorize;
 use futures::stream::FuturesUnordered;
-use std::collections::BTreeMap;
 use std::{
     collections::HashSet,
     net::{IpAddr, Shutdown, SocketAddr},
@@ -85,11 +84,10 @@ impl Scanner {
         let mut open_sockets: Vec<SocketAddr> = Vec::new();
         let mut ftrs = FuturesUnordered::new();
         let mut errors: HashSet<String> = HashSet::new();
-        let udp_map = get_parsed_data();
 
         for _ in 0..self.batch_size {
             if let Some(socket) = socket_iterator.next() {
-                ftrs.push(self.scan_socket(socket, udp_map.clone()));
+                ftrs.push(self.scan_socket(socket));
             } else {
                 break;
             }
@@ -103,7 +101,7 @@ impl Scanner {
 
         while let Some(result) = ftrs.next().await {
             if let Some(socket) = socket_iterator.next() {
-                ftrs.push(self.scan_socket(socket, udp_map.clone()));
+                ftrs.push(self.scan_socket(socket));
             }
 
             match result {
@@ -135,13 +133,19 @@ impl Scanner {
     /// ```
     ///
     /// Note: `self` must contain `self.ip`.
-    async fn scan_socket(
-        &self,
-        socket: SocketAddr,
-        udp_map: BTreeMap<Vec<u16>, Vec<u8>>,
-    ) -> io::Result<SocketAddr> {
+    async fn scan_socket(&self, socket: SocketAddr) -> io::Result<SocketAddr> {
         if self.udp {
-            return self.scan_udp_socket(socket, udp_map).await;
+            let payload = cust_payload(socket.port());
+
+            let tries = self.tries.get();
+            for _ in 1..=tries {
+                match self.udp_scan(socket, &payload, self.timeout).await {
+                    Ok(true) => return Ok(socket),
+                    Ok(false) => continue,
+                    Err(e) => return Err(e),
+                }
+            }
+            return Ok(socket);
         }
 
         let tries = self.tries.get();
@@ -176,30 +180,6 @@ impl Scanner {
         unreachable!();
     }
 
-    async fn scan_udp_socket(
-        &self,
-        socket: SocketAddr,
-        udp_map: BTreeMap<Vec<u16>, Vec<u8>>,
-    ) -> io::Result<SocketAddr> {
-        let mut payload: Vec<u8> = Vec::new();
-        for (key, value) in udp_map {
-            if key.contains(&socket.port()) {
-                payload = value;
-            }
-        }
-
-        let tries = self.tries.get();
-        for _ in 1..=tries {
-            match self.udp_scan(socket, &payload, self.timeout).await {
-                Ok(true) => return Ok(socket),
-                Ok(false) => continue,
-                Err(e) => return Err(e),
-            }
-        }
-
-        Ok(socket)
-    }
-
     /// Performs the connection to the socket with timeout
     /// # Example
     ///

src/scripts/mod.rs

@@ -79,6 +79,7 @@ use crate::input::ScriptsRequired;
 use anyhow::{anyhow, Result};
 use log::debug;
 use serde_derive::{Deserialize, Serialize};
+use std::collections::HashSet;
 use std::convert::TryInto;
 use std::fs::{self, File};
 use std::io::{self, prelude::*};
@@ -91,56 +92,64 @@ use text_placeholder::Template;
 static DEFAULT: &str = r#"tags = ["core_approved", "RustScan", "default"]
 developer = [ "RustScan", "https://github.com/RustScan" ]
 ports_separator = ","
-call_format = "nmap -vvv -p {{port}} -{{ipversion}} {{ip}}"
+call_format = "nmap -vvv -p {{port}} {{ip}}"
 "#;
 
 #[cfg(not(tarpaulin_include))]
-pub fn init_scripts(scripts: &ScriptsRequired) -> Result<Vec<ScriptFile>> {
+pub fn init_scripts(scripts: ScriptsRequired) -> Result<Vec<ScriptFile>> {
     let mut scripts_to_run: Vec<ScriptFile> = Vec::new();
 
     match scripts {
-        ScriptsRequired::None => {}
+        ScriptsRequired::None => Ok(scripts_to_run),
         ScriptsRequired::Default => {
             let default_script =
                 toml::from_str::<ScriptFile>(DEFAULT).expect("Failed to parse Script file.");
             scripts_to_run.push(default_script);
+            Ok(scripts_to_run)
         }
         ScriptsRequired::Custom => {
-            let scripts_dir_base =
-                dirs::home_dir().ok_or_else(|| anyhow!("Could not infer scripts path."))?;
-            let script_paths = find_scripts(scripts_dir_base)?;
+            let Some(scripts_dir_base) = dirs::home_dir() else {
+                return Err(anyhow!("Could not infer scripts path."));
+            };
+            let script_paths = match find_scripts(scripts_dir_base) {
+                Ok(script_paths) => script_paths,
+                Err(e) => return Err(anyhow!(e)),
+            };
             debug!("Scripts paths \n{:?}", script_paths);
 
             let parsed_scripts = parse_scripts(script_paths);
             debug!("Scripts parsed \n{:?}", parsed_scripts);
 
-            let script_config = ScriptConfig::read_config()?;
+            let script_config = match ScriptConfig::read_config() {
+                Ok(script_config) => script_config,
+                Err(e) => return Err(anyhow!(e)),
+            };
             debug!("Script config \n{:?}", script_config);
 
             // Only Scripts that contain all the tags found in ScriptConfig will be selected.
-            if let Some(config_hashset) = script_config.tags {
-                for script in parsed_scripts {
-                    if let Some(script_hashset) = &script.tags {
-                        if script_hashset
-                            .iter()
-                            .all(|tag| config_hashset.contains(tag))
-                        {
-                            scripts_to_run.push(script);
+            if script_config.tags.is_some() {
+                let config_hashset: HashSet<String> =
+                    script_config.tags.unwrap().into_iter().collect();
+                for script in &parsed_scripts {
+                    if script.tags.is_some() {
+                        let script_hashset: HashSet<String> =
+                            script.tags.clone().unwrap().into_iter().collect();
+                        if config_hashset.is_subset(&script_hashset) {
+                            scripts_to_run.push(script.clone());
                         } else {
                             debug!(
                                 "\nScript tags does not match config tags {:?} {}",
                                 &script_hashset,
-                                script.path.unwrap().display()
+                                script.path.clone().unwrap().display()
                             );
                         }
                     }
                 }
             }
             debug!("\nScript(s) to run {:?}", scripts_to_run);
+            Ok(scripts_to_run)
         }
     }
-
-    Ok(scripts_to_run)
 }
 
 pub fn parse_scripts(scripts: Vec<PathBuf>) -> Vec<ScriptFile> {
@@ -184,14 +193,12 @@ struct ExecPartsScript {
     script: String,
     ip: String,
     port: String,
-    ipversion: String,
 }
 
 #[derive(Serialize)]
 struct ExecParts {
     ip: String,
     port: String,
-    ipversion: String,
 }
 
 impl Script {
@@ -246,24 +253,17 @@ impl Script {
                 script: self.path.unwrap().to_str().unwrap().to_string(),
                 ip: self.ip.to_string(),
                 port: ports_str,
-                ipversion: match &self.ip {
-                    IpAddr::V4(_) => String::from("4"),
-                    IpAddr::V6(_) => String::from("6"),
-                },
             };
             to_run = default_template.fill_with_struct(&exec_parts_script)?;
         } else {
             let exec_parts: ExecParts = ExecParts {
                 ip: self.ip.to_string(),
                 port: ports_str,
-                ipversion: match &self.ip {
-                    IpAddr::V4(_) => String::from("4"),
-                    IpAddr::V6(_) => String::from("6"),
-                },
             };
             to_run = default_template.fill_with_struct(&exec_parts)?;
         }
         debug!("\nScript format to run {}", to_run);
+
         execute_script(&to_run)
     }
 }

src/udp_packets.rs

@@ -0,0 +1,279 @@
+pub mod udp_payload {
+    // const MAX_PAYLOAD_IPV4: usize = 65507; // 65,535 - 20 (IP header) - 8 (UDP header)
+    // const MAX_PAYLOAD_IPV6: usize = 65527; // 65,535 - 40 (IPv6 header) - 8 (UDP header)
+
+    /// From [RFC 768](https://www.rfc-editor.org/rfc/rfc768.txt)
+    /// We send blank UDP packets, unless the port is determined to be special.
+    ///
+    /// ```text
+    /// HEADER Handled by the OS
+    /// 0                   1                   2                   3
+    /// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+    /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    /// |          Source Port          |       Destination Port        |
+    /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    /// |            Length             |           Checksum            |
+    /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    /// We append the data, based on the port the the header
+    /// DATA
+    /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    /// |                    Data (based on port)                       |
+    /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    /// ```
+    ///
+    /// # Fields
+    ///
+    /// - **Source Port**: The source port number.
+    /// - **Destination Port**: The destination port number.
+    /// - **Length**: The length of the UDP header and data.
+    /// - **Checksum**: The checksum for error-checking.
+    /// - **Data**: The payload data, which can vary based on the port.
+    #[allow(clippy::match_single_binding)]
+    pub fn cust_payload(dst_prt: u16) -> Vec<u8> {
+        match dst_prt {
+            // 53 => craft_dns_query_packet(),
+            // 67 => craft_dhcpc_packet(),
+            // 123 => craft_ntp_packet(),
+            // 161 => craft_snmp_packet(),
+            _ => vec![],
+        }
+    }
+
+    pub fn craft_snmptrap_packet() -> Vec<u16> {
+        let version = vec![0x30, 0x82]; // SNMP version
+        let community_string = vec![0x04, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63]; // Community string "public"
+        let pdu_type = vec![0xa4, 0x82]; // PDU type for SNMP Trap
+        let enterprise_oid = vec![0x06, 0x09, 0x2b, 0x06, 0x01, 0x02, 0x01, 0x01, 0x01, 0x00]; // Enterprise OID
+
+        // Combine the components into a single SNMP Trap packet
+        [version, community_string, pdu_type, enterprise_oid].concat()
+    }
+
+    /// From [RFC 1592](https://www.rfc-editor.org/rfc/rfc1592.txt)
+    /// Crafts an SNMP packet based on the structure from RFC 1592.
+    ///
+    /// RFC 1592 defines the structure of an SNMP packet as follows
+    /// - **ASN.1 header**: 0x30
+    /// - **PDU length**: 37 + length of community name
+    /// - **SNMP version**: 0x02 0x01 0x00 (integer, length=1, value=0)
+    /// - **Community name**: A string of varying length
+    /// - **SNMP GET request**: 0xa0 0x1c (request type=0xa0, length=0x1c)
+    /// - **SNMP request ID**: 0x02 0x01 0x01 (integer, length=1, ID=1)
+    /// - **SNMP error status**: 0x02 0x01 0x00 (integer, length=1, error=0)
+    /// - **SNMP index**: 0x02 0x01 0x00 (integer, length=1, index=0)
+    /// - **VarBind list**: 0x30 0x11 (length=0x11)
+    /// - **VarBind**: 0x30 0x0f (length=0x0f)
+    /// - **Object ID**: 0x06 0x0b (length=0x0b)
+    /// - **Object instance**: 1.3.6.1.4.1.2.2.1.1.1.0
+    /// - **Null value**: 0x05 0x00 (length=0)
+    ///
+    /// The PDU length formula:
+    /// ```text
+    /// PDU_length = length of version field and string tag (4 bytes)
+    ///            + length of community length field (1 byte)
+    ///            + length of community name (depends...)
+    ///            + length of SNMP GET request (32 bytes)
+    /// ```
+    ///
+    /// # Returns
+    ///
+    /// A `Vec<u8>` representing the crafted SNMP packet.
+    pub fn craft_snmp_packet() -> Vec<u8> {
+        // TODO all versions of snmp
+        let v1 = vec![0x30, 0x29, 0x02, 0x01, 0x00];
+
+        let community_string = vec![0x04, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63];
+        let pdu_type = vec![0xa0, 0x1c];
+
+        let request_id = vec![0x02, 0x04, 0x7a, 0x69, 0x67, 0x71];
+        let error_status = vec![0x02, 0x01, 0x00];
+        let error_index = vec![0x02, 0x01, 0x00];
+        let variable_bindings = vec![
+            0x30, 0x0e, 0x30, 0x0c, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x02, 0x01, 0x01, 0x01, 0x00,
+            0x05, 0x00,
+        ];
+
+        let _basic_snmp = [
+            0x30, 0x26, 0x02, 0x01, 0x01, 0x04, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0xa0,
+            0x19, 0x02, 0x04, 0x71, 0x64, 0xfe, 0xf1, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x30,
+            0x0b, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x06, 0x01, 0x02, 0x01, 0x05, 0x00,
+        ];
+
+        [
+            v1,
+            community_string,
+            pdu_type,
+            request_id,
+            error_status,
+            error_index,
+            variable_bindings,
+        ]
+        .concat()
+    }
+
+    /// Constructs a DHCP packet based on the RFC 1541 Dynamic Host Configuration Protocol specification.
+    ///
+    ///
+    /// # Returns
+    ///
+    /// A `Vec<u8>` representing the DHCP packet.
+    ///
+    /// This function crafts a DHCP Discover packet with the following fields:
+    /// - **op**: BOOTREQUEST (1)
+    /// - **htype**: Ethernet (1)
+    /// - **hlen**: 6
+    /// - **hops**: 0
+    /// - **xid**: Random transaction ID
+    /// - **secs**: 0
+    /// - **flags**: 0x8000 (Broadcast)
+    /// - **ciaddr**: 0.0.0.0
+    /// - **yiaddr**: 0.0.0.0
+    /// - **siaddr**: 0.0.0.0
+    /// - **giaddr**: 0.0.0.0
+    /// - **chaddr**: 00:00:00:00:00:00 (Client MAC address)
+    /// - **sname**: Not given
+    /// - **file**: Not given
+    /// - **options**: DHCP options
+    pub fn craft_dhcpc_packet() -> Vec<u8> {
+        let mut packet = Vec::with_capacity(240);
+
+        // BOOTP message type: Boot Request (1)
+        packet.push(0x01);
+
+        // Hardware type: Ethernet (10Mb) (1)
+        packet.push(0x01);
+
+        // Hardware address length: 6
+        packet.push(0x06);
+
+        // Hops: 0
+        packet.push(0x00);
+
+        // Transaction ID: random (0x3903F326)
+        packet.extend(&[0x39, 0x03, 0xF3, 0x26]);
+
+        // Seconds elapsed: 0
+        packet.extend(&[0x00, 0x00]);
+
+        // Bootp flags: 0x8000 (Broadcast) (0x8000)
+        packet.extend(&[0x80, 0x00]);
+
+        // Client IP address: 0.0.0.0
+        packet.extend(&[0x00, 0x00, 0x00, 0x00]);
+
+        // Your (client) IP address: 0.0.0.0
+        packet.extend(&[0x00, 0x00, 0x00, 0x00]);
+
+        // Next server IP address: 0.0.0.0
+        packet.extend(&[0x00, 0x00, 0x00, 0x00]);
+
+        // Relay agent IP address: 0.0.0.0
+        packet.extend(&[0x00, 0x00, 0x00, 0x00]);
+
+        // Client MAC address: 00:00:00:00:00:00
+        packet.extend(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00]);
+
+        // Client hardware address padding: 00000000000000000000
+        packet.extend(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]);
+
+        // Server host name not given
+        packet.extend(&[0x00; 64]);
+
+        // Boot file name not given
+        packet.extend(&[0x00; 128]);
+
+        // Magic cookie: DHCP
+        packet.extend(&[0x63, 0x82, 0x53, 0x63]);
+
+        // DHCP Message Type: DHCP Discover (1)
+        packet.extend(&[0x35, 0x01, 0x01]);
+
+        // DHCP Option: Parameter Request List
+        packet.extend(&[0x37, 0x04, 0x01, 0x03, 0x06, 0x2a]);
+
+        // End Option
+        packet.push(0xff);
+
+        packet
+    }
+
+    /// Constructs a DNS query packet.
+    ///
+    /// The structure of the DNS packet is as follows:
+    ///
+    /// ```text
+    /// +---------------------+
+    /// |        Header       |
+    /// +---------------------+
+    /// |       Question      | the question for the name server
+    /// +---------------------+
+    /// |        Answer       | RRs answering the question
+    /// +---------------------+
+    /// |      Authority      | RRs pointing toward an authority
+    /// +---------------------+
+    /// |      Additional     | RRs holding additional information
+    /// +---------------------+
+    /// ```
+    ///
+    /// The function builds a DNS query packet with the following fields:
+    /// - **Header**: Contains the transaction ID and flags.
+    /// - **Question**: Specifies the query (e.g., the domain name to look up).
+    /// - **Answer**: Resource records that answer the question (empty for a query).
+    /// - **Authority**: Resource records that point toward an authority (empty for a query).
+    /// - **Additional**: Resource records holding additional information (empty for a query).
+    ///
+    /// # Returns
+    ///
+    /// A `Vec<u8>` representing the DNS query packet.
+    pub fn craft_dns_query_packet() -> Vec<u8> {
+        let mut packet = Vec::new();
+
+        // Transaction ID: Random
+        packet.extend(&[0x12, 0x34]);
+
+        // Flags: Standard query
+        packet.extend(&[0x01, 0x00]);
+        // Header ^
+
+        // Questions: 1
+        packet.extend(&[0x00, 0x01]);
+
+        // Answer RRs: 0
+        packet.extend(&[0x00, 0x00]);
+
+        // Authority RRs: 0
+        packet.extend(&[0x00, 0x00]);
+
+        // Additional RRs: 0
+        packet.extend(&[0x00, 0x00]);
+
+        // Query: www.google.com
+        let query_name = "www.google.com";
+        for part in query_name.split('.') {
+            packet.push(part.len() as u8);
+            packet.extend(part.as_bytes());
+        }
+        packet.push(0); // End of query name
+
+        // Query Type: A (host address)
+        packet.extend(&[0x00, 0x01]);
+
+        // Query Class: IN (internet)
+        packet.extend(&[0x00, 0x01]);
+
+        packet
+    }
+
+    /// Creates the simplest NTP packet possible
+    /// 0x1b followed by 47 0s, (Version = 3, Mode = 3)
+    pub fn craft_ntp_packet() -> Vec<u8> {
+        let mut packet = vec![0u8; 48];
+        packet[0] = 0x1b;
+        packet
+    }
+
+    // TODO add more packets for the top 1000 ports
+    // `sort -r -k3 /usr/share/nmap/nmap-services | grep udp | head -n 1000`
+    // There has to be a better way to structure this, maybe internal crate for packet payload
+    // creation
+}