Merge branch 'master' into build-ci-openbsd

fujiapple852 · Feb 11, 2024 · 0e4aad5 · 0e4aad5
2 parents 9cfef50 + 1d3b718
commit 0e4aad5
Show file tree

Hide file tree

Showing 49 changed files with 3,867 additions and 818 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -20,9 +20,10 @@ assignees: ''
 <!-- If applicable, add screenshots to help explain your problem. -->
 
 **Environment Info**
-- OS: <!-- [e.g. Linux, Windows 11] -->
-- Trippy version: <!-- [e.g. the output of `trip -V`] -->
-- Installation method: <!-- [e.g. `brew`, `winget`, `cargo`] -->
+- OS: <!-- e.g. Linux, Windows 11, MacOS -->
+- Trippy version: <!-- the output of `trip -V` -->
+- Installation method: <!-- e.g. `brew`, `winget`, `cargo` -->
+- Terminal / Console: <!-- If you are not sure you can use "About" or, "Help" on the terminal window to gather the requested information. e.g. `iterm2`, `cmd.exe`, `PowerShell`, 'GNOME Terminal' -->
 
 **Additional context**
-<!-- Add any other context about the problem here. -->
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: triage
+assignees: ''
+
+---
+
+**Describe the feature you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,19 +20,19 @@ jobs:
           - windows-stable
         include:
           - build: linux-stable
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             target: x86_64-unknown-linux-gnu
             rust: stable
           - build: linux-musl-stable
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             target: x86_64-unknown-linux-musl
             rust: stable
           - build: linux-beta
-            os: ubuntu-22.04
+            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             rust: beta
           - build: linux-nightly
-            os: ubuntu-22.04
+            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             rust: nightly
           - build: macos-stable
@@ -49,6 +49,7 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
+      - uses: Swatinem/rust-cache@v2
       - run: cargo test --target ${{ matrix.target }}
 
   build-cross:
@@ -58,11 +59,11 @@ jobs:
         build: [ netbsd, freebsd, openbsd ]
         include:
           - build: netbsd
-            os: ubuntu-22.04
+            os: ubuntu-latest
             target: x86_64-unknown-netbsd
             rust: stable
           - build: freebsd
-            os: ubuntu-22.04
+            os: ubuntu-latest
             target: x86_64-unknown-freebsd
             rust: stable
           - build: openbsd
@@ -75,6 +76,7 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
+      - uses: Swatinem/rust-cache@v2
       - name: Use Cross
         shell: bash
         run: |
@@ -96,7 +98,7 @@ jobs:
           - windows-stable
         include:
           - build: linux-stable
-            os: ubuntu-20.04
+            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             rust: stable
           - build: macos-stable
@@ -109,11 +111,11 @@ jobs:
             rust: stable
     steps:
       - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@v2
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
+      - uses: Swatinem/rust-cache@v2
       - name: Copy wintun.dll to current dir
         if: startsWith(matrix.build, 'windows')
         shell: bash
@@ -125,12 +127,14 @@ jobs:
         run: |
           New-NetFirewallRule -DisplayName "ICMPv4 Trippy Allow" -Name ICMPv4_TRIPPY_ALLOW -Protocol ICMPv4 -Action Allow
           New-NetFirewallRule -DisplayName "ICMPv6 Trippy Allow" -Name ICMPv6_TRIPPY_ALLOW -Protocol ICMPv6 -Action Allow
+      - name: Build (without root)
+        run: cargo build --target ${{ matrix.target }} --features sim-tests --test sim
       - name: Run simulation test on ${{ matrix.build }}
         if: ${{ ! startsWith(matrix.build, 'windows') }}
         run: sudo -E env "PATH=$PATH" cargo test --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
       - name: Run simulation test on ${{ matrix.build }}
         if: startsWith(matrix.build, 'windows')
-        run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
+        run: cargo test --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
 
   fmt:
     runs-on: ubuntu-22.04
@@ -140,6 +144,7 @@ jobs:
         with:
           toolchain: stable
           components: rustfmt
+      - uses: Swatinem/rust-cache@v2
       - run: cargo fmt --all -- --check
 
   clippy:
@@ -152,7 +157,7 @@ jobs:
           - windows-stable
         include:
           - build: linux-stable
-            os: ubuntu-20.04
+            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             rust: stable
           - build: macos-stable
@@ -169,14 +174,25 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           components: clippy
+      - uses: Swatinem/rust-cache@v2
       - run: cargo clippy --workspace --all-features --target ${{ matrix.target }} --tests -- -Dwarnings
 
   cargo-deny:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
           log-level: warn
           command: check
           arguments: --all-features
+
+  cargo-msrv:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - name: install cargo-msrv
+        run: cargo install cargo-msrv
+      - name: check msrv
+        run: cargo msrv --output-format json verify -- cargo check
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,10 +9,29 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 
+- Added support for calculating and displaying jitter ([#39](https://github.com/fujiapple852/trippy/issues/39))
+- Added support for customizing columns ([#757](https://github.com/fujiapple852/trippy/issues/757))
+- Added support for [IPinfo](https://ipinfo.io) flavoured `mmdb` files ([#862](https://github.com/fujiapple852/trippy/issues/862))
+- Added support for `IPv4->IPv6` and `IPv6->IPv4` DNS fallback modes ([#864](https://github.com/fujiapple852/trippy/issues/864))
+- Added [TUN](https://en.wikipedia.org/wiki/TUN/TAP) based simulation tests ([#908](https://github.com/fujiapple852/trippy/issues/908))
+- Added support for last src port (`S`) and last dest port (`P`) custom columns ([#974](https://github.com/fujiapple852/trippy/issues/974))
+- Added support for last sequence (`Q`) custom columns ([#976](https://github.com/fujiapple852/trippy/issues/976))
+
 ### Changed
 
+- Ensure `paris` and `dublin` ECMP strategy are only used with supported protocols ([#848](https://github.com/fujiapple852/trippy/issues/848))
+- Improved Tui table column layout logic ([#925](https://github.com/fujiapple852/trippy/issues/925))
+- Use exclusive reference `&mut` for all Socket operations ([#843](https://github.com/fujiapple852/trippy/issues/843))
+
 ### Fixed
 
+- Fixed off-by-one bug in max-rounds calculation ([#906](https://github.com/fujiapple852/trippy/issues/906))
+- Fixed panic with `expand-hosts-max` Tui command ([#892](https://github.com/fujiapple852/trippy/issues/892))
+- Fixed failure to parse generated config file on Windows ([#958](https://github.com/fujiapple852/trippy/issues/958))
+- Fixed tracer panic for `icmp` TimeExceeded "Fragment reassembly time exceeded" packets ([#979](https://github.com/fujiapple852/trippy/issues/979))
+- Fixed tracer not discarding unrelated `icmp` packets for `udp` and `tcp` protocols ([#982](https://github.com/fujiapple852/trippy/issues/982))
+- Fixed incorrect minimum packet size for `IPv6` ([#985](https://github.com/fujiapple852/trippy/issues/985))
+
 ## [0.9.0] - 2023-11-30
 
 ### Added