diff options
author | David LeGare <legare@google.com> | 2022-03-21 20:19:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-21 20:19:12 +0000 |
commit | 34c25bb318dc916018e33e50b1fec97323b38532 (patch) | |
tree | 911bb07584e758873118951a14ea4e361198c485 | |
parent | ca1ebcc270db869099c84b08e37b55f6587766b7 (diff) | |
parent | eadfc342ff5fdb6033c0a9dd39f04f64a3232753 (diff) | |
download | vsock-34c25bb318dc916018e33e50b1fec97323b38532.tar.gz |
Update vsock to 0.2.6 am: bc5a1c46a7 am: 12119859e2 am: eadfc342fft_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/2005052
Change-Id: I043a75863ce7428517cdb243d3a4844de23ea475
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | Cargo.toml | 13 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | src/lib.rs | 29 | ||||
-rw-r--r-- | tests/vsock.rs | 7 |
7 files changed, 46 insertions, 21 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 4fc9144..3d9568d 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "56852d4006efce337875594e6a21ec49f0fc9c89" + "sha1": "9b5e180bf04fd1d02db0c1e79c5ddd838dd42328" } } @@ -23,7 +23,7 @@ rust_library { host_supported: true, crate_name: "vsock", cargo_env_compat: true, - cargo_pkg_version: "0.2.4", + cargo_pkg_version: "0.2.6", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -3,17 +3,16 @@ # When uploading crates to the registry Cargo will automatically # "normalize" Cargo.toml files for maximal compatibility # with all versions of Cargo and also rewrite `path` dependencies -# to registry (e.g., crates.io) dependencies +# to registry (e.g., crates.io) dependencies. # -# If you believe there's an error in this file please file an -# issue against the rust-lang/cargo repository. If you're -# editing this file be aware that the upstream Cargo.toml -# will likely look very different (and much more reasonable) +# If you are reading this file be aware that the original Cargo.toml +# will likely look very different (and much more reasonable). +# See Cargo.toml.orig for the original contents. [package] edition = "2018" name = "vsock" -version = "0.2.4" +version = "0.2.6" authors = ["fsyncd", "rust-vsock"] exclude = ["test_fixture"] description = "Virtio socket support for Rust" @@ -25,7 +24,7 @@ repository = "https://github.com/rust-vsock/vsock-rs" version = "0.2.79" [dependencies.nix] -version = "0.19.1" +version = "0.23.0" [dev-dependencies.rand] version = "0.8.3" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index aa90128..7a6d39a 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "vsock" -version = "0.2.4" +version = "0.2.6" 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.79" -nix = "0.19.1" +nix = "0.23.0" [dev-dependencies] rand = "0.8.3" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/vsock/vsock-0.2.4.crate" + value: "https://static.crates.io/crates/vsock/vsock-0.2.6.crate" } - version: "0.2.4" + version: "0.2.6" license_type: NOTICE last_upgrade_date { - year: 2021 - month: 6 - day: 21 + year: 2022 + month: 3 + day: 1 } } @@ -17,15 +17,17 @@ //! Virtio socket support for Rust. -use std::io::{Error, ErrorKind, Read, Result, Write}; -use std::mem::{self, size_of}; -use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd}; - use libc::*; +use nix::ioctl_read_bad; use std::ffi::c_void; +use std::fs::File; +use std::io::{Error, ErrorKind, Read, Result, Write}; +use std::mem::{self, size_of}; use std::net::Shutdown; +use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd}; use std::time::Duration; +pub use libc::{VMADDR_CID_ANY, VMADDR_CID_HOST, VMADDR_CID_HYPERVISOR, VMADDR_CID_LOCAL}; pub use nix::sys::socket::{SockAddr, VsockAddr}; fn new_socket() -> libc::c_int { @@ -505,3 +507,22 @@ impl Drop for VsockStream { unsafe { close(self.socket) }; } } + +const IOCTL_VM_SOCKETS_GET_LOCAL_CID: usize = 0x7b9; +ioctl_read_bad!( + vm_sockets_get_local_cid, + IOCTL_VM_SOCKETS_GET_LOCAL_CID, + u32 +); + +/// Gets the CID of the local machine. +/// +/// Note that when calling [`VsockListener::bind`], you should generally use [`VMADDR_CID_ANY`] +/// instead, and for making a loopback connection you should use [`VMADDR_CID_LOCAL`]. +pub fn get_local_cid() -> Result<u32> { + let f = File::open("/dev/vsock")?; + let mut cid = 0; + // SAFETY: the kernel only modifies the given u32 integer. + unsafe { vm_sockets_get_local_cid(f.as_raw_fd(), &mut cid) }?; + Ok(cid) +} diff --git a/tests/vsock.rs b/tests/vsock.rs index d51bad0..52d908b 100644 --- a/tests/vsock.rs +++ b/tests/vsock.rs @@ -17,7 +17,7 @@ use rand::RngCore; use sha2::{Digest, Sha256}; use std::io::{Read, Write}; -use vsock::{SockAddr, VsockAddr, VsockStream}; +use vsock::{get_local_cid, SockAddr, VsockAddr, VsockStream, VMADDR_CID_HOST}; const TEST_BLOB_SIZE: usize = 1_000_000; const TEST_BLOCK_SIZE: usize = 5_000; @@ -67,3 +67,8 @@ fn test_vsock() { assert_eq!(expected, actual); } + +#[test] +fn test_get_local_cid() { + assert_eq!(get_local_cid().unwrap(), VMADDR_CID_HOST); +} |