Use socklen_t rather than u32, as they are not always the same. am: fcaa523d01
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1466267
Change-Id: I58bea33fde56d7987be271d798310d8f85b9ce82
diff --git a/METADATA b/METADATA
index f407b00..be7a313 100644
--- a/METADATA
+++ b/METADATA
@@ -16,4 +16,5 @@
month: 9
day: 28
}
+ local_modifications: "Cherry-picked https://github.com/qwandor/vsock-rs/commit/4f73c26fc9a95e36e3ac4d304a02b6a424d7bcfd to fix Android build. This should be included in the next upstream release."
}
diff --git a/src/lib.rs b/src/lib.rs
index ec059ce..97055e7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -72,7 +72,7 @@
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 {
@@ -234,7 +234,7 @@
connect(
sock,
&vsock_addr as *const _ as *const sockaddr,
- size_of::<sockaddr_vm>() as u32,
+ size_of::<sockaddr_vm>() as socklen_t,
)
} < 0
{
@@ -320,7 +320,7 @@
SOL_SOCKET,
SO_SNDTIMEO,
&timeout as *const _ as *const c_void,
- size_of::<timeval>() as u32,
+ size_of::<timeval>() as socklen_t,
)
} < 0
{
@@ -339,7 +339,7 @@
SOL_SOCKET,
SO_RCVTIMEO,
&timeout as *const _ as *const c_void,
- size_of::<timeval>() as u32,
+ size_of::<timeval>() as socklen_t,
)
} < 0
{
