Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 54 additions & 21 deletions litebox_common_linux/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -327,22 +327,20 @@ pub type IoVec<P> = IoReadVec<P>;

impl<P: RawConstPointer<u8>> Clone for IoWriteVec<P> {
fn clone(&self) -> Self {
Self {
iov_base: self.iov_base,
iov_len: self.iov_len,
}
*self
}
}

impl<P: RawConstPointer<u8>> Copy for IoWriteVec<P> {}

impl<P: RawMutPointer<u8>> Clone for IoReadVec<P> {
fn clone(&self) -> Self {
Self {
iov_base: self.iov_base,
iov_len: self.iov_len,
}
*self
}
}

impl<P: RawMutPointer<u8>> Copy for IoReadVec<P> {}

impl From<litebox::fs::FileStatus> for FileStat {
fn from(value: litebox::fs::FileStatus) -> Self {
// TODO: add more fields
Expand Down Expand Up @@ -1616,6 +1614,9 @@ bitflags::bitflags! {
const TRUNC = 0x20;
/// `MSG_WAITALL`: wait for the full amount of data
const WAITALL = 0x100;
/// `MSG_WAITFORONE`: `recvmmsg` only — turn on `MSG_DONTWAIT` after the
/// first message has been received.
const WAITFORONE = 0x10000;
/// <https://docs.rs/bitflags/*/bitflags/#externally-defined-flags>
const _ = !0;
}
Expand Down Expand Up @@ -1684,22 +1685,33 @@ pub struct UserMsgHdr<Platform: litebox::platform::RawPointerProvider> {

impl<Platform: litebox::platform::RawPointerProvider> Clone for UserMsgHdr<Platform> {
fn clone(&self) -> Self {
Self {
msg_name: self.msg_name,
msg_namelen: self.msg_namelen,
#[cfg(target_pointer_width = "64")]
_pad: 0,
msg_iov: self.msg_iov,
msg_iovlen: self.msg_iovlen,
msg_control: self.msg_control,
msg_controllen: self.msg_controllen,
msg_flags: self.msg_flags,
#[cfg(target_pointer_width = "64")]
_pad2: 0,
}
*self
}
}

impl<Platform: litebox::platform::RawPointerProvider> Copy for UserMsgHdr<Platform> {}

/// Linux's `struct mmsghdr`: a `msghdr` paired with the number of bytes
/// transmitted, used by `sendmmsg`/`recvmmsg`.
#[derive(Debug, FromBytes, IntoBytes)]
#[repr(C, packed)]
pub struct UserMmsgHdr<Platform: litebox::platform::RawPointerProvider> {
/// the per-message `msghdr`
pub msg_hdr: UserMsgHdr<Platform>,
/// bytes transmitted for this entry, written back by the kernel
pub msg_len: u32,
#[cfg(target_pointer_width = "64")]
_pad: u32,
}

impl<Platform: litebox::platform::RawPointerProvider> Clone for UserMmsgHdr<Platform> {
fn clone(&self) -> Self {
*self
}
}

impl<Platform: litebox::platform::RawPointerProvider> Copy for UserMmsgHdr<Platform> {}

#[repr(i32)]
#[derive(Debug, IntEnum)]
pub enum SocketcallType {
Expand Down Expand Up @@ -1904,6 +1916,12 @@ pub enum SyscallRequest<Platform: litebox::platform::RawPointerProvider> {
msg: Platform::RawConstPointer<UserMsgHdr<Platform>>,
flags: SendFlags,
},
Sendmmsg {
sockfd: i32,
msgvec: Platform::RawMutPointer<UserMmsgHdr<Platform>>,
vlen: u32,
flags: SendFlags,
},
Recvfrom {
sockfd: i32,
buf: Platform::RawMutPointer<u8>,
Expand All @@ -1917,6 +1935,13 @@ pub enum SyscallRequest<Platform: litebox::platform::RawPointerProvider> {
msg: Platform::RawMutPointer<UserMsgHdr<Platform>>,
flags: ReceiveFlags,
},
Recvmmsg {
sockfd: i32,
msgvec: Platform::RawMutPointer<UserMmsgHdr<Platform>>,
vlen: u32,
flags: ReceiveFlags,
timeout: TimeParam<Platform>,
},
Bind {
sockfd: i32,
sockaddr: Platform::RawConstPointer<u8>,
Expand Down Expand Up @@ -2363,8 +2388,16 @@ impl<Platform: litebox::platform::RawPointerProvider> SyscallRequest<Platform> {
Sysno::accept4 => sys_req!(Accept { sockfd, addr:*, addrlen:*, flags }),
Sysno::sendto => sys_req!(Sendto { sockfd, buf:*, len, flags, addr:*, addrlen }),
Sysno::sendmsg => sys_req!(Sendmsg { sockfd, msg:*, flags }),
Sysno::sendmmsg => sys_req!(Sendmmsg { sockfd, msgvec:*, vlen, flags }),
Sysno::recvfrom => sys_req!(Recvfrom { sockfd, buf:*, len, flags, addr:*, addrlen:*, }),
Sysno::recvmsg => sys_req!(Recvmsg { sockfd, msg:*, flags }),
Sysno::recvmmsg => sys_req!(Recvmmsg {
sockfd,
msgvec:*,
vlen,
flags,
timeout: { =*> TimeParam::timespec_old }
}),
Sysno::bind => sys_req!(Bind { sockfd, sockaddr:*, addrlen }),
Sysno::listen => sys_req!(Listen { sockfd, backlog }),
Sysno::setsockopt => sys_req!(Setsockopt {
Expand Down
Loading
Loading