yggdrasil/yggdrasil-rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alnyan/yggdrasil: remove some todos in networking

Browse Source
This commit is contained in:
Mark Poliakov 2024-11-01 01:21:47 +02:00
parent d6da94083e
commit 338dad6aa8
3 changed files with 121 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
library/std/src/sys/pal/yggdrasil/net/tcp_listener.rs
View File

@ -1,3 +1,7 @@
use yggdrasil_rt::net::{SocketOption, SocketType};
use yggdrasil_rt::sys as syscall;
use super::TcpStream;
use crate::io;
use crate::mem::MaybeUninit;
use crate::net::SocketAddr;
@ -6,10 +10,6 @@ use crate::sys::cvt_io;
use crate::sys::fd::FileDesc;
use crate::sys_common::{AsInner, IntoInner};
use yggdrasil_rt::{net::SocketType, sys as syscall};
use super::TcpStream;
#[derive(Debug)]
pub struct TcpListener {
local: SocketAddr,
@ -40,28 +40,38 @@ impl TcpListener {
todo!()
}
pub fn set_ttl(&self, _ttl: u32) -> io::Result<()> {
todo!()
pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
cvt_io(unsafe { syscall::set_socket_option(self.as_raw_fd(), &SocketOption::Ttl(ttl)) })
}
pub fn ttl(&self) -> io::Result<u32> {
todo!()
let mut option = SocketOption::Ttl(0);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::Ttl(ttl) = option else { unreachable!() };
Ok(ttl)
}
pub fn set_only_v6(&self, _only_v6: bool) -> io::Result<()> {
todo!()
pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::Ipv6Only(only_v6))
})
}
pub fn only_v6(&self) -> io::Result<bool> {
todo!()
let mut option = SocketOption::Ipv6Only(false);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::Ipv6Only(value) = option else { unreachable!() };
Ok(value)
}
pub fn take_error(&self) -> io::Result<Option<io::Error>> {
todo!()
}
pub fn set_nonblocking(&self, _nonblocking: bool) -> io::Result<()> {
todo!()
pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::NonBlocking(nonblocking))
})
}
}

53
library/std/src/sys/pal/yggdrasil/net/tcp_stream.rs
View File

@ -1,3 +1,6 @@
use yggdrasil_rt::net::{SocketOption, SocketType};
use yggdrasil_rt::sys as syscall;
use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut};
use crate::mem::MaybeUninit;
use crate::net::{Shutdown, SocketAddr};
@ -7,8 +10,6 @@ use crate::sys::fd::FileDesc;
use crate::sys_common::{AsInner, IntoInner};
use crate::time::Duration;
use yggdrasil_rt::{net::SocketType, sys as syscall};
#[derive(Debug)]
pub struct TcpStream {
local: SocketAddr,
@ -41,20 +42,30 @@ impl TcpStream {
todo!()
}
pub fn set_read_timeout(&self, _dur: Option<Duration>) -> io::Result<()> {
todo!()
pub fn set_read_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::RecvTimeout(dur))
})
}
pub fn set_write_timeout(&self, _dur: Option<Duration>) -> io::Result<()> {
todo!()
pub fn set_write_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::SendTimeout(dur))
})
}
pub fn read_timeout(&self) -> io::Result<Option<Duration>> {
todo!()
let mut option = SocketOption::RecvTimeout(None);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::RecvTimeout(value) = option else { unreachable!() };
Ok(value)
}
pub fn write_timeout(&self) -> io::Result<Option<Duration>> {
todo!()
let mut option = SocketOption::SendTimeout(None);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::SendTimeout(value) = option else { unreachable!() };
Ok(value)
}
pub fn peek(&self, _buf: &mut [u8]) -> io::Result<usize> {
@ -116,28 +127,38 @@ impl TcpStream {
todo!()
}
pub fn set_nodelay(&self, _nodelay: bool) -> io::Result<()> {
todo!()
pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::NoDelay(nodelay))
})
}
pub fn nodelay(&self) -> io::Result<bool> {
todo!()
let mut option = SocketOption::NoDelay(false);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::NoDelay(value) = option else { unreachable!() };
Ok(value)
}
pub fn set_ttl(&self, _ttl: u32) -> io::Result<()> {
todo!()
pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
cvt_io(unsafe { syscall::set_socket_option(self.as_raw_fd(), &SocketOption::Ttl(ttl)) })
}
pub fn ttl(&self) -> io::Result<u32> {
todo!()
let mut option = SocketOption::Ttl(0);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::Ttl(ttl) = option else { unreachable!() };
Ok(ttl)
}
pub fn take_error(&self) -> io::Result<Option<io::Error>> {
todo!()
}
pub fn set_nonblocking(&self, _nonblocking: bool) -> io::Result<()> {
todo!()
pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::NonBlocking(nonblocking))
})
}
}

89
library/std/src/sys/pal/yggdrasil/net/udp_socket.rs
View File

@ -1,16 +1,15 @@
use yggdrasil_rt::net::{SocketOption, SocketType};
use yggdrasil_rt::sys as syscall;
use crate::io;
use crate::mem::MaybeUninit;
use crate::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
use crate::os::fd::{AsRawFd, FromRawFd, RawFd};
use crate::sys::{cvt_io, io::FileDesc};
use crate::sys::cvt_io;
use crate::sys::io::FileDesc;
use crate::sys_common::{AsInner, IntoInner};
use crate::time::Duration;
use yggdrasil_rt::{
net::{SocketOption, SocketType},
sys as syscall,
};
#[derive(Debug)]
pub struct UdpSocket {
fd: FileDesc,
@ -26,7 +25,7 @@ impl UdpSocket {
Ok(Self { fd: inner, local: *listen, _remote: None })
}
pub fn connect(&self, _remote: io::Result<&SocketAddr>) -> io::Result<()> {
pub fn connect(&self, remote: io::Result<&SocketAddr>) -> io::Result<()> {
todo!()
}
@ -70,32 +69,47 @@ impl UdpSocket {
todo!()
}
pub fn set_read_timeout(&self, _dur: Option<Duration>) -> io::Result<()> {
todo!()
pub fn set_read_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::RecvTimeout(dur))
})
}
pub fn read_timeout(&self) -> io::Result<Option<Duration>> {
todo!()
let mut option = SocketOption::RecvTimeout(None);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::RecvTimeout(value) = option else { unreachable!() };
Ok(value)
}
pub fn set_write_timeout(&self, _dur: Option<Duration>) -> io::Result<()> {
todo!()
pub fn set_write_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::SendTimeout(dur))
})
}
pub fn write_timeout(&self) -> io::Result<Option<Duration>> {
todo!()
let mut option = SocketOption::SendTimeout(None);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::SendTimeout(value) = option else { unreachable!() };
Ok(value)
}
pub fn set_ttl(&self, _ttl: u32) -> io::Result<()> {
todo!()
pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
cvt_io(unsafe { syscall::set_socket_option(self.as_raw_fd(), &SocketOption::Ttl(ttl)) })
}
pub fn ttl(&self) -> io::Result<u32> {
todo!()
let mut option = SocketOption::Ttl(0);
cvt_io(unsafe { syscall::get_socket_option(self.as_raw_fd(), &mut option) })?;
let SocketOption::Ttl(ttl) = option else { unreachable!() };
Ok(ttl)
}
pub fn set_nonblocking(&self, _nonblocking: bool) -> io::Result<()> {
todo!()
pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.as_raw_fd(), &SocketOption::NonBlocking(nonblocking))
})
}
pub fn set_broadcast(&self, broadcast: bool) -> io::Result<()> {
@ -113,28 +127,49 @@ impl UdpSocket {
Ok(value)
}
pub fn set_multicast_loop_v4(&self, _loop_v4: bool) -> io::Result<()> {
todo!()
pub fn set_multicast_loop_v4(&self, loop_v4: bool) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.fd.as_raw_fd(), &SocketOption::MulticastLoopV4(loop_v4))
})
}
pub fn multicast_loop_v4(&self) -> io::Result<bool> {
todo!()
let mut value = SocketOption::MulticastLoopV4(false);
cvt_io(unsafe { syscall::get_socket_option(self.fd.as_raw_fd(), &mut value) })?;
let SocketOption::MulticastLoopV4(value) = value else {
unreachable!();
};
Ok(value)
}
pub fn set_multicast_ttl_v4(&self, _ttl: u32) -> io::Result<()> {
todo!()
pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.fd.as_raw_fd(), &SocketOption::MulticastTtlV4(ttl))
})
}
pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
todo!()
let mut value = SocketOption::MulticastTtlV4(0);
cvt_io(unsafe { syscall::get_socket_option(self.fd.as_raw_fd(), &mut value) })?;
let SocketOption::MulticastTtlV4(value) = value else {
unreachable!();
};
Ok(value)
}
pub fn set_multicast_loop_v6(&self, _loop_v6: bool) -> io::Result<()> {
todo!()
pub fn set_multicast_loop_v6(&self, loop_v6: bool) -> io::Result<()> {
cvt_io(unsafe {
syscall::set_socket_option(self.fd.as_raw_fd(), &SocketOption::MulticastLoopV6(loop_v6))
})
}
pub fn multicast_loop_v6(&self) -> io::Result<bool> {
todo!()
let mut value = SocketOption::MulticastLoopV6(false);
cvt_io(unsafe { syscall::get_socket_option(self.fd.as_raw_fd(), &mut value) })?;
let SocketOption::MulticastLoopV6(value) = value else {
unreachable!();
};
Ok(value)
}
pub fn join_multicast_v6(&self, _multiaddr: &Ipv6Addr, _interface: u32) -> io::Result<()> {