From c5739567a36fd37190743a49c3027616ce3d79a7 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Tue, 29 Sep 2020 12:32:53 +0100 Subject: Support vsock on Android as well as Linux. Fix deprecation warning from libc update. --- test/sys/test_socket.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/sys') diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs index a5fa54bd..1003598e 100644 --- a/test/sys/test_socket.rs +++ b/test/sys/test_socket.rs @@ -1411,7 +1411,7 @@ pub fn test_recv_ipv6pktinfo() { } } -#[cfg(target_os = "linux")] +#[cfg(any(target_os = "android", target_os = "linux"))] #[test] pub fn test_vsock() { use libc; @@ -1428,13 +1428,13 @@ pub fn test_vsock() { SockFlag::empty(), None) .expect("socket failed"); - // VMADDR_CID_HYPERVISOR and VMADDR_CID_RESERVED are reserved, so we expect + // VMADDR_CID_HYPERVISOR and VMADDR_CID_LOCAL are reserved, so we expect // an EADDRNOTAVAIL error. let sockaddr = SockAddr::new_vsock(libc::VMADDR_CID_HYPERVISOR, port); assert_eq!(bind(s1, &sockaddr).err(), Some(Error::Sys(Errno::EADDRNOTAVAIL))); - let sockaddr = SockAddr::new_vsock(libc::VMADDR_CID_RESERVED, port); + let sockaddr = SockAddr::new_vsock(libc::VMADDR_CID_LOCAL, port); assert_eq!(bind(s1, &sockaddr).err(), Some(Error::Sys(Errno::EADDRNOTAVAIL))); -- cgit v1.2.3