Merge pull request #6 from qwandor/master

Update dependencies and increment version number

Author: Tim-Zhang

Cargo.toml

@@ -9,9 +9,9 @@ edition = "2018"
 exclude = ["test_fixture"]
 
 [dependencies]
-libc = "0.2.65"
-nix = "0.17.0"
+libc = "0.2.79"
+nix = "0.19.1"
 
 [dev-dependencies]
-rand = "0.7.2"
+rand = "0.8.3"
 sha2 = ">=0.8.0"

Makefile

@@ -47,7 +47,7 @@ kmod:
 # Start a virtio socket enabled vm
 vm: initrd.cpio
 	sudo qemu-system-x86_64 -kernel test_fixture/bzImage -initrd target/$(TOOLCHAIN)/debug/initrd.cpio \
-		-enable-kvm -m 256 -device vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=3 -nographic -append "console=ttyS0"
+		-enable-kvm -m 256 -device vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=3,disable-legacy=on -nographic -append "console=ttyS0"
 
 # Create a simple operating system image for the vm
 initrd.cpio: echo_server

echo_server/Cargo.lock

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 edition = "2018"
 
 [dependencies]
-clap = "2.33.0"
-libc = "0.2.65"
-nix = "0.17.0"
+clap = "2.33.3"
+libc = "0.2.79"
+nix = "0.19.0"
 vsock = { path = "../" }

echo_server/Cargo.toml

@@ -72,7 +72,7 @@ impl VsockListener {
             bind(
                 socket,
                 &mut vsock_addr as *mut _ as *mut sockaddr,
-                size_of::<sockaddr_vm>() as u32,
+                size_of::<sockaddr_vm>() as socklen_t,
             )
         };
         if res < 0 {
@@ -236,7 +236,7 @@ impl VsockStream {
             connect(
                 sock,
                 &vsock_addr as *const _ as *const sockaddr,
-                size_of::<sockaddr_vm>() as u32,
+                size_of::<sockaddr_vm>() as socklen_t,
             )
         } < 0
         {
@@ -322,7 +322,7 @@ impl VsockStream {
                 SOL_SOCKET,
                 SO_SNDTIMEO,
                 &timeout as *const _ as *const c_void,
-                size_of::<timeval>() as u32,
+                size_of::<timeval>() as socklen_t,
             )
         } < 0
         {
@@ -341,7 +341,7 @@ impl VsockStream {
                 SOL_SOCKET,
                 SO_RCVTIMEO,
                 &timeout as *const _ as *const c_void,
-                size_of::<timeval>() as u32,
+                size_of::<timeval>() as socklen_t,
             )
         } < 0
         {