vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'recvmsg' into 'main'

Browse Source 
fix os-test recvfrom hang

See merge request redox-os/base!205
This commit is contained in:
Jeremy Soller
2026-03-27 10:06:52 -06:00
parent bede348e52 4d6c9db9c0
commit ca1d7bf729
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netstack/src/scheme/tcp.rs
+3 -5
View File
@@ -327,10 +327,10 @@ impl<'a> SchemeSocket for TcpSocket<'a> {
let prepared_msg_controllen = usize::from_le_bytes(
how[2 * usize_length..3 * usize_length].try_into().map_err(|_| SyscallError::new(syscall::EINVAL))?,
);
if prepared_name_len + prepared_msg_controllen + prepared_whole_iov_size > how.len() {//expected returned buffer size is larger than provided -> return invalid
if 3 * usize_length + prepared_name_len + prepared_msg_controllen + prepared_whole_iov_size > how.len() {//expected returned buffer size is larger than provided -> return invalid
return Err(SyscallError::new(syscall::EINVAL));
}
let mut address = match self.remote_endpoint() {
let address = match self.remote_endpoint() {
Some(endpoint) => format!("/scheme/tcp/{}:{}", endpoint.addr, endpoint.port),
None => String::from("/scheme/tcp/0.0.0.0:0"),
};
@@ -339,11 +339,9 @@ impl<'a> SchemeSocket for TcpSocket<'a> {
how[..usize_length].copy_from_slice(&address.len().to_le_bytes());
how[usize_length..address.len() + usize_length].copy_from_slice(&address.as_bytes());
let payload_length = self.recv_slice(&mut how[address.len() + 2 * usize_length..address.len() + 2 * usize_length + prepared_whole_iov_size]).unwrap();
println!("\n\n{}\n", payload_length);
how[address.len() + usize_length..address.len() + 2 * usize_length].copy_from_slice(&payload_length.to_le_bytes());
//TODO should return the length of payload but relibc uses trim on the buffer incorrectly
Ok(how.len())
Ok(address.len() + 2 * usize_length + prepared_whole_iov_size)
} else if socket_file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK || flags & flag::MSG_DONTWAIT as usize != 0 {
Err(SyscallError::new(syscall::EAGAIN))
} else {
netstack/src/scheme/udp.rs
+3 -4
View File
@@ -317,13 +317,13 @@ impl<'a> SchemeSocket for UdpSocket<'a> {
let prepared_msg_controllen = usize::from_le_bytes(
how[2 * usize_length..3 * usize_length].try_into().map_err(|_| SyscallError::new(syscall::EINVAL))?,
);
if prepared_name_len + prepared_msg_controllen + prepared_whole_iov_size > how.len() {//expected returned buffer size is larger than provided -> return invalid
if 3 * usize_length + prepared_name_len + prepared_msg_controllen + prepared_whole_iov_size > how.len() {//expected returned buffer size is larger than provided -> return invalid
return Err(SyscallError::new(syscall::EINVAL));
}
//the relibc deserialization functions expect NO GAPS between the name and payload slices
//so the payload must be temporarily stored during recv_slice
let mut payload_tmp = vec![0u8; prepared_whole_iov_size - prepared_name_len];
let mut payload_tmp = vec![0u8; prepared_whole_iov_size];
let (length, address) = self.recv_slice(&mut payload_tmp).expect("Can't recieve slice");
//Address Handling
@@ -339,8 +339,7 @@ impl<'a> SchemeSocket for UdpSocket<'a> {
//Payload Handling
how[payload_len_index..payload_len_index + usize_length].copy_from_slice(&(length as usize).to_le_bytes());
how[payload_len_index + usize_length..payload_len_index + usize_length + length].copy_from_slice(&payload_tmp[..length]);
//TODO should return the length of payload but relibc uses trim on the buffer incorrectly
Ok(how.len())
Ok(payload_len_index + usize_length + length)
} else if socket_file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK || flags & flag::MSG_DONTWAIT as usize != 0 {
Err(SyscallError::new(syscall::EAGAIN))
} else {