diff options
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | .github/workflows/commit-message-check.yaml | 2 | ||||
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 23 | ||||
-rw-r--r-- | src/lib.rs | 4 |
7 files changed, 21 insertions, 23 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 00feee6..0ea5218 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "a48080b8fd4ace9d3f455222d0336757acd6d098" + "sha1": "92a6b0d827ea440e7fdea51e93ce26d26a43ccc0" }, "path_in_vcs": "" }
\ No newline at end of file diff --git a/.github/workflows/commit-message-check.yaml b/.github/workflows/commit-message-check.yaml index dcdf0ec..304cf77 100644 --- a/.github/workflows/commit-message-check.yaml +++ b/.github/workflows/commit-message-check.yaml @@ -19,7 +19,7 @@ jobs: steps: - name: Get PR Commits id: 'get-pr-commits' - uses: tim-actions/get-pr-commits@v1.3.0 + uses: tim-actions/get-pr-commits@v1.3.1 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -1,5 +1,6 @@ // This file is generated by cargo_embargo. -// Do not modify this file as changes will be overridden on upgrade. +// Do not modify this file as most changes will be overridden on upgrade. +// Content before the first "rust_*" or "genrule" module is preserved. package { default_applicable_licenses: ["external_rust_crates_vsock_license"], @@ -23,7 +24,7 @@ rust_library { host_supported: true, crate_name: "vsock", cargo_env_compat: true, - cargo_pkg_version: "0.4.0", + cargo_pkg_version: "0.5.0", srcs: ["src/lib.rs"], edition: "2021", rustlibs: [ @@ -12,7 +12,7 @@ [package] edition = "2021" name = "vsock" -version = "0.4.0" +version = "0.5.0" authors = [ "fsyncd", "rust-vsock", @@ -28,7 +28,7 @@ repository = "https://github.com/rust-vsock/vsock-rs" version = "0.2.150" [dependencies.nix] -version = "0.27.1" +version = "0.28.0" features = [ "ioctl", "socket", diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 255d7f1..ed04547 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "vsock" -version = "0.4.0" +version = "0.5.0" authors = ["fsyncd", "rust-vsock"] description = "Virtio socket support for Rust" repository = "https://github.com/rust-vsock/vsock-rs" @@ -12,7 +12,7 @@ exclude = ["test_fixture"] [dependencies] libc = "0.2.150" -nix = { version = "0.27.1", features = ["ioctl", "socket"] } +nix = { version = "0.28.0", features = ["ioctl", "socket"] } [dev-dependencies] rand = "0.8.3" @@ -1,23 +1,20 @@ # This project was upgraded with external_updater. -# Usage: tools/external_updater/updater.sh update rust/crates/vsock +# Usage: tools/external_updater/updater.sh update external/rust/crates/vsock # For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md name: "vsock" description: "Virtio socket support for Rust" third_party { - url { - type: HOMEPAGE - value: "https://crates.io/crates/vsock" - } - url { - type: ARCHIVE - value: "https://static.crates.io/crates/vsock/vsock-0.4.0.crate" - } - version: "0.4.0" license_type: NOTICE last_upgrade_date { - year: 2023 - month: 12 - day: 5 + year: 2024 + month: 4 + day: 9 + } + homepage: "https://crates.io/crates/vsock" + identifier { + type: "Archive" + value: "https://static.crates.io/crates/vsock/vsock-0.5.0.crate" + version: "0.5.0" } } @@ -26,7 +26,7 @@ use nix::{ sys::socket::{ self, bind, connect, getpeername, getsockname, listen, recv, send, shutdown, socket, sockopt::{ReceiveTimeout, SendTimeout, SocketError}, - AddressFamily, GetSockOpt, MsgFlags, SetSockOpt, SockFlag, SockType, + AddressFamily, Backlog, GetSockOpt, MsgFlags, SetSockOpt, SockFlag, SockType, }, }; use std::mem::size_of; @@ -86,7 +86,7 @@ impl VsockListener { bind(socket.as_raw_fd(), addr)?; // rust stdlib uses a 128 connection backlog - listen(&socket, 128)?; + listen(&socket, Backlog::new(128).unwrap_or(Backlog::MAXCONN))?; Ok(Self { socket }) } |