From 7ded78e78ce7f64189efa3f8909c53dbe0f41ad9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 21:03:17 +0000 Subject: [PATCH] build(deps): Bump wintun from 0.3.2 to 0.4.0 in /rust (#3341) Bumps [wintun](https://github.com/nulldotblack/wintun) from 0.3.2 to 0.4.0.
Release notes

Sourced from wintun's releases.

v0.4.0

Added

Breaking Changes

Changelog

Sourced from wintun's changelog.

[0.4.0] - 2024-01-12

Added

Breaking Changes

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=wintun&package-manager=cargo&previous-version=0.3.2&new-version=0.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Reactor Scram --- rust/Cargo.lock | 8 ++++---- rust/connlib/shared/Cargo.toml | 2 +- rust/connlib/tunnel/Cargo.toml | 2 +- rust/connlib/tunnel/src/device_channel/tun_windows.rs | 3 +-- rust/windows-client/src-tauri/Cargo.toml | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index f9c5a6472..3a7b044e4 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -3012,7 +3012,7 @@ dependencies = [ "httpdate", "itoa 1.0.10", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -8385,15 +8385,15 @@ dependencies = [ [[package]] name = "wintun" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b83b0eca06dd125dbcd48a45327c708a6da8aada3d95a3f06db0ce4b17e0d4" +checksum = "1b3c8c8876c686f8a2d6376999ac1c9a24c74d2968551c9394f7e89127783685" dependencies = [ "c2rust-bitfields", "libloading 0.8.1", "log", "thiserror", - "windows 0.51.1", + "windows 0.52.0", ] [[package]] diff --git a/rust/connlib/shared/Cargo.toml b/rust/connlib/shared/Cargo.toml index 343c49b23..25868c691 100644 --- a/rust/connlib/shared/Cargo.toml +++ b/rust/connlib/shared/Cargo.toml @@ -53,7 +53,7 @@ rtnetlink = { version = "0.13", default-features = false, features = ["tokio_soc # Windows tunnel dependencies [target.'cfg(target_os = "windows")'.dependencies] -wintun = "0.3.2" +wintun = "0.4.0" # Windows Win32 API [target.'cfg(windows)'.dependencies.windows] diff --git a/rust/connlib/tunnel/Cargo.toml b/rust/connlib/tunnel/Cargo.toml index 396a4595d..6059ae50b 100644 --- a/rust/connlib/tunnel/Cargo.toml +++ b/rust/connlib/tunnel/Cargo.toml @@ -53,7 +53,7 @@ tracing-android = "0.2" # Windows tunnel dependencies [target.'cfg(target_os = "windows")'.dependencies] uuid = { version = "1.5.0", features = ["v4"] } -wintun = "0.3.2" +wintun = "0.4.0" # Windows Win32 API [target.'cfg(windows)'.dependencies.windows] diff --git a/rust/connlib/tunnel/src/device_channel/tun_windows.rs b/rust/connlib/tunnel/src/device_channel/tun_windows.rs index 589c957ee..4ac8a0755 100644 --- a/rust/connlib/tunnel/src/device_channel/tun_windows.rs +++ b/rust/connlib/tunnel/src/device_channel/tun_windows.rs @@ -246,8 +246,7 @@ fn start_recv_thread( break; } } - // We get an Error::String when `Session::shutdown` is called - Err(wintun::Error::String(_)) => break, + Err(wintun::Error::ShuttingDown) => break, Err(e) => { tracing::error!("wintun::Session::receive_blocking: {e:#?}"); break; diff --git a/rust/windows-client/src-tauri/Cargo.toml b/rust/windows-client/src-tauri/Cargo.toml index add8a923e..f07f8a551 100755 --- a/rust/windows-client/src-tauri/Cargo.toml +++ b/rust/windows-client/src-tauri/Cargo.toml @@ -54,7 +54,7 @@ bincode = "1.3.3" tauri = { version = "1.5", features = [ "dialog", "notification", "shell-open-api", "system-tray" ] } tauri-utils = "1.5.1" winreg = "0.51.0" -wintun = "0.3.2" +wintun = "0.4.0" [target.'cfg(windows)'.dependencies.windows] version = "0.52.0"