Merge branch 'main' into 'main'

misc(netstack): update `smoltcp` to v0.13.1

See merge request redox-os/base!287

netstack/Cargo.toml

@@ -22,7 +22,7 @@ scheme-utils = { path = "../scheme-utils" }
 workspace = true
 
 [dependencies.smoltcp]
-version = "0.12.0"
+version = "0.13.1"
 default-features = false
 features = [
     "std",

netstack/src/scheme/ip.rs

@@ -80,8 +80,8 @@ impl<'a> SchemeSocket for RawSocket<'a> {
             vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
         );
         let ip_socket = RawSocket::new(
-            IpVersion::Ipv4,
-            IpProtocol::from(proto),
+            Some(IpVersion::Ipv4),
+            Some(IpProtocol::from(proto)),
             rx_buffer,
             tx_buffer,
         );
@@ -139,7 +139,7 @@ impl<'a> SchemeSocket for RawSocket<'a> {
 
     fn fpath(&self, _file: &SchemeFile<Self>, buf: &mut [u8]) -> SyscallResult<usize> {
         FpathWriter::with(buf, "ip", |w| {
-            write!(w, "{}", self.ip_protocol()).unwrap();
+            write!(w, "{}", self.ip_protocol().unwrap()).unwrap();
             Ok(())
         })
     }

netstack/src/scheme/tcp.rs

@@ -162,8 +162,7 @@ impl<'a> SchemeSocket for TcpSocket<'a> {
         } else if !self.is_active() {
             Err(SyscallError::new(syscall::ENOTCONN))
         } else if self.can_send() {
-            self.send_slice(buf).expect("Can't send slice");
-            Ok(buf.len())
+            Ok(self.send_slice(buf).expect("Can't send slice"))
         } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
             Err(SyscallError::new(syscall::EAGAIN))
         } else {