From aec3bcdeda889f4eafdafd7b93461e3645a43cef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 08:26:48 +0000 Subject: [PATCH 1/9] chore(deps): update flume requirement from 0.10 to 0.11 Updates the requirements on [flume](https://github.com/zesterer/flume) to permit the latest version. - [Changelog](https://github.com/zesterer/flume/blob/master/CHANGELOG.md) - [Commits](https://github.com/zesterer/flume/commits) --- updated-dependencies: - dependency-name: flume dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- fake-tcp/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fake-tcp/Cargo.toml b/fake-tcp/Cargo.toml index 43c4196..00e8ab9 100644 --- a/fake-tcp/Cargo.toml +++ b/fake-tcp/Cargo.toml @@ -22,4 +22,4 @@ rand = { version = "0.8", features = ["small_rng"] } log = "0.4" internet-checksum = "0.2" tokio-tun = "0.7" -flume = "0.10" +flume = "0.11" From 805bf80cd89a8c7f1fec6c4ba1cb592f78c6d7d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 04:59:02 +0000 Subject: [PATCH 2/9] chore(deps): update tokio-tun requirement from 0.7 to 0.9 Updates the requirements on [tokio-tun](https://github.com/yaa110/tokio-tun) to permit the latest version. - [Commits](https://github.com/yaa110/tokio-tun/compare/0.7.0...0.9.0) --- updated-dependencies: - dependency-name: tokio-tun dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- fake-tcp/Cargo.toml | 2 +- phantun/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fake-tcp/Cargo.toml b/fake-tcp/Cargo.toml index 00e8ab9..411494f 100644 --- a/fake-tcp/Cargo.toml +++ b/fake-tcp/Cargo.toml @@ -21,5 +21,5 @@ tokio = { version = "1.14", features = ["full"] } rand = { version = "0.8", features = ["small_rng"] } log = "0.4" internet-checksum = "0.2" -tokio-tun = "0.7" +tokio-tun = "0.9" flume = "0.11" diff --git a/phantun/Cargo.toml b/phantun/Cargo.toml index 2a25c2f..97d3d5a 100644 --- a/phantun/Cargo.toml +++ b/phantun/Cargo.toml @@ -18,7 +18,7 @@ tokio = { version = "1.14", features = ["full"] } tokio-util = "0.7" log = "0.4" pretty_env_logger = "0.5" -tokio-tun = "0.7" +tokio-tun = "0.9" num_cpus = "1.13" neli = "0.6" nix = "0.26" From 3fa8f863796ac663f7a1c75779022e67142b36c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 08:44:16 +0000 Subject: [PATCH 3/9] chore(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/rust.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8989a10..c16a563 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22ecfba..e92166e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: - mipsel-unknown-linux-musl steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 2921282..8331676 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable From 590a048b5bc9c11307a48282805b854322702907 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:29:41 +0000 Subject: [PATCH 4/9] chore(deps): bump docker/build-push-action from 4 to 5 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c16a563..3b2074c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,7 +22,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build Docker Image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: docker/Dockerfile From 48a0399f59e765a7dfd617fe6c1ad16e42b2221a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:29:50 +0000 Subject: [PATCH 5/9] chore(deps): bump docker/setup-qemu-action from 2 to 3 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3b2074c..6405b8d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Setup QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: linux/amd64 From 632132b75adfa23532fadf45fd5d5ec1b549f768 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:29:45 +0000 Subject: [PATCH 6/9] chore(deps): bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6405b8d..ebcd451 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -19,7 +19,7 @@ jobs: platforms: linux/amd64 - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build Docker Image uses: docker/build-push-action@v5 From 310bb175163fce926c1dbe05333f0557f1cb6fd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 05:00:51 +0000 Subject: [PATCH 7/9] chore(deps): update pnet requirement from 0.33 to 0.34 Updates the requirements on [pnet](https://github.com/libpnet/libpnet) to permit the latest version. - [Release notes](https://github.com/libpnet/libpnet/releases) - [Commits](https://github.com/libpnet/libpnet/compare/v0.33.0...v0.34.0) --- updated-dependencies: - dependency-name: pnet dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 ++ fake-tcp/Cargo.toml | 2 +- fake-tcp/src/lib.rs | 2 +- fake-tcp/src/packet.rs | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 35a885f..4ab4671 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,7 @@ [workspace] +resolver = "2" + members = [ "fake-tcp", "phantun", diff --git a/fake-tcp/Cargo.toml b/fake-tcp/Cargo.toml index 411494f..2316965 100644 --- a/fake-tcp/Cargo.toml +++ b/fake-tcp/Cargo.toml @@ -16,7 +16,7 @@ benchmark = [] [dependencies] bytes = "1" -pnet = "0.33" +pnet = "0.34" tokio = { version = "1.14", features = ["full"] } rand = { version = "0.8", features = ["small_rng"] } log = "0.4" diff --git a/fake-tcp/src/lib.rs b/fake-tcp/src/lib.rs index a5c5863..a66da47 100644 --- a/fake-tcp/src/lib.rs +++ b/fake-tcp/src/lib.rs @@ -146,7 +146,7 @@ impl Socket { ) } - fn build_tcp_packet(&self, flags: u16, payload: Option<&[u8]>) -> Bytes { + fn build_tcp_packet(&self, flags: u8, payload: Option<&[u8]>) -> Bytes { let ack = self.ack.load(Ordering::Relaxed); self.last_ack.store(ack, Ordering::Relaxed); diff --git a/fake-tcp/src/packet.rs b/fake-tcp/src/packet.rs index c2abe56..349ffb7 100644 --- a/fake-tcp/src/packet.rs +++ b/fake-tcp/src/packet.rs @@ -36,7 +36,7 @@ pub fn build_tcp_packet( remote_addr: SocketAddr, seq: u32, ack: u32, - flags: u16, + flags: u8, payload: Option<&[u8]>, ) -> Bytes { let ip_header_len = match local_addr { From b58d58956bb1077b4c9e8ddd577f0604c9e2b204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 09:01:11 +0000 Subject: [PATCH 8/9] chore(deps): update nix requirement from 0.26 to 0.27 Updates the requirements on [nix](https://github.com/nix-rust/nix) to permit the latest version. - [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md) - [Commits](https://github.com/nix-rust/nix/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: nix dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- phantun/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phantun/Cargo.toml b/phantun/Cargo.toml index 97d3d5a..05df56b 100644 --- a/phantun/Cargo.toml +++ b/phantun/Cargo.toml @@ -21,4 +21,4 @@ pretty_env_logger = "0.5" tokio-tun = "0.9" num_cpus = "1.13" neli = "0.6" -nix = "0.26" +nix = { version = "0.27", features = ["net"] } From 78dd7c13b104f9863de69ebcc6b176f8a8314551 Mon Sep 17 00:00:00 2001 From: Datong Sun Date: Mon, 18 Sep 2023 09:16:32 -0700 Subject: [PATCH 9/9] style(phantun): fix Clippy warnings --- phantun/src/bin/client.rs | 2 +- phantun/src/bin/server.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phantun/src/bin/client.rs b/phantun/src/bin/client.rs index 360101e..f19a28f 100644 --- a/phantun/src/bin/client.rs +++ b/phantun/src/bin/client.rs @@ -71,7 +71,7 @@ async fn main() -> io::Result<()> { .required(false) .help("Only use IPv4 address when connecting to remote") .action(ArgAction::SetTrue) - .conflicts_with_all(&["tun_local6", "tun_peer6"]), + .conflicts_with_all(["tun_local6", "tun_peer6"]), ) .arg( Arg::new("tun_local6") diff --git a/phantun/src/bin/server.rs b/phantun/src/bin/server.rs index c5dfeea..58a373a 100644 --- a/phantun/src/bin/server.rs +++ b/phantun/src/bin/server.rs @@ -71,7 +71,7 @@ async fn main() -> io::Result<()> { .required(false) .help("Do not assign IPv6 addresses to Tun interface") .action(ArgAction::SetTrue) - .conflicts_with_all(&["tun_local6", "tun_peer6"]), + .conflicts_with_all(["tun_local6", "tun_peer6"]), ) .arg( Arg::new("tun_local6")