Update smoltcp from 0.9.1 to 0.10.0

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+- Update smoltcp from 0.9.1 to 0.10.0 ([#510](https://github.com/vinc/moros/pull/510))
 
 ## 0.10.0 (2023-06-21)
 - Add cut/copy/paste to editor ([#456](https://github.com/vinc/moros/pull/456))

Cargo.toml

@@ -35,7 +35,7 @@ rand = { version = "0.8.5", default-features = false }
 rand_hc = "0.3.1"
 raw-cpuid = "11.0.1"
 sha2 = { version = "0.10.7", default-features = false, features = ["force-soft"] }
-smoltcp = { version = "0.9.1", default-features = false, features = ["alloc", "medium-ethernet", "socket-tcp", "socket-udp", "socket-dhcpv4", "proto-ipv4", "proto-dhcpv4"] }
+smoltcp = { version = "0.10.0", default-features = false, features = ["alloc", "medium-ethernet", "socket-tcp", "socket-udp", "socket-dhcpv4", "proto-ipv4", "proto-dhcpv4"] }
 spin = "0.9.8"
 time = { version = "0.2.27", default-features = false }
 uart_16550 = "0.2.18"

src/sys/net/mod.rs

@@ -5,6 +5,7 @@ use alloc::vec::Vec;
 use core::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use smoltcp::iface::Interface;
 use smoltcp::phy::DeviceCapabilities;
+use smoltcp::time::Instant;
 use smoltcp::wire::EthernetAddress;
 use spin::Mutex;
 
@@ -221,9 +222,9 @@ pub fn init() {
         if let Some(mac) = device.config().mac() {
             log!("NET {} MAC {}\n", name, mac);
 
-            let mut config = smoltcp::iface::Config::new();
-            config.hardware_addr = Some(mac.into());
-            let iface = Interface::new(config, &mut device);
+            let config = smoltcp::iface::Config::new(mac.into());
+            let time = Instant::from_micros((sys::clock::realtime() * 1000000.0) as i64);
+            let iface = Interface::new(config, &mut device, time);
 
             *NET.lock() = Some((iface, device));
         }

src/usr/dhcp.rs

@@ -43,8 +43,8 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 return Err(ExitCode::Failure);
             }
 
-            let timestamp = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
-            iface.poll(timestamp, device, &mut sockets);
+            let time = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
+            iface.poll(time, device, &mut sockets);
             let event = sockets.get_mut::<dhcpv4::Socket>(dhcp_handle).poll();
 
             match event {
@@ -60,7 +60,7 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 }
             }
 
-            if let Some(wait_duration) = iface.poll_delay(timestamp, &sockets) {
+            if let Some(wait_duration) = iface.poll_delay(time, &sockets) {
                 syscall::sleep((wait_duration.total_micros() as f64) / 1000000.0);
             }
         }

src/usr/host.rs

@@ -177,8 +177,8 @@ pub fn resolve(name: &str) -> Result<IpAddress, ResponseCode> {
                 return Err(ResponseCode::NetworkError);
             }
 
-            let timestamp = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
-            iface.poll(timestamp, device, &mut sockets);
+            let time = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
+            iface.poll(time, device, &mut sockets);
             let socket = sockets.get_mut::<udp::Socket>(udp_handle);
 
             state = match state {
@@ -214,7 +214,7 @@ pub fn resolve(name: &str) -> Result<IpAddress, ResponseCode> {
                 _ => state
             };
 
-            if let Some(wait_duration) = iface.poll_delay(timestamp, &sockets) {
+            if let Some(wait_duration) = iface.poll_delay(time, &sockets) {
                 syscall::sleep((wait_duration.total_micros() as f64) / 1000000.0);
 
             }

src/usr/http.rs

@@ -139,8 +139,8 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 return Err(ExitCode::Failure);
             }
 
-            let timestamp = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
-            iface.poll(timestamp, device, &mut sockets);
+            let time = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
+            iface.poll(time, device, &mut sockets);
             let socket = sockets.get_mut::<tcp::Socket>(tcp_handle);
             let cx = iface.context();
 
@@ -225,7 +225,7 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 _ => session_state
             };
 
-            if let Some(wait_duration) = iface.poll_delay(timestamp, &sockets) {
+            if let Some(wait_duration) = iface.poll_delay(time, &sockets) {
                 syscall::sleep((wait_duration.total_micros() as f64) / 1000000.0);
             }
         }

src/usr/httpd.rs

@@ -231,8 +231,8 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 return Ok(());
             }
 
-            let timestamp = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
-            iface.poll(timestamp, device, &mut sockets);
+            let time = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
+            iface.poll(time, device, &mut sockets);
 
             for (tcp_handle, send_queue, keep_alive) in &mut connections {
                 let socket = sockets.get_mut::<tcp::Socket>(*tcp_handle);
@@ -363,7 +363,7 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                     send_queue.clear();
                 }
             }
-            if let Some(wait_duration) = iface.poll_delay(timestamp, &sockets) {
+            if let Some(wait_duration) = iface.poll_delay(time, &sockets) {
                 let t = wait_duration.total_micros() / POLL_DELAY_DIV as u64;
                 if t > 0 {
                     syscall::sleep((t as f64) / 1000000.0);

src/usr/net.rs

@@ -68,8 +68,8 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                     }
                     syscall::sleep(0.1);
 
-                    let timestamp = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
-                    iface.poll(timestamp, device, &mut sockets);
+                    let time = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
+                    iface.poll(time, device, &mut sockets);
                     let socket = sockets.get_mut::<tcp::Socket>(tcp_handle);
                     if socket.may_recv() {
                         socket.recv(|buffer| {

src/usr/socket.rs

@@ -110,8 +110,8 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 return Err(ExitCode::Failure);
             }
 
-            let timestamp = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
-            iface.poll(timestamp, device, &mut sockets);
+            let time = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
+            iface.poll(time, device, &mut sockets);
             let socket = sockets.get_mut::<tcp::Socket>(tcp_handle);
             let cx = iface.context();
 
@@ -211,7 +211,7 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
             if interval > 0.0 {
                 syscall::sleep(interval);
             }
-            if let Some(wait_duration) = iface.poll_delay(timestamp, &sockets) {
+            if let Some(wait_duration) = iface.poll_delay(time, &sockets) {
                 syscall::sleep((wait_duration.total_micros() as f64) / 1000000.0);
             }
         }

src/usr/tcp.rs

@@ -82,8 +82,8 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 return Err(ExitCode::Failure);
             }
 
-            let timestamp = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
-            iface.poll(timestamp, device, &mut sockets);
+            let time = Instant::from_micros((clock::realtime() * 1000000.0) as i64);
+            iface.poll(time, device, &mut sockets);
             let socket = sockets.get_mut::<tcp::Socket>(tcp_handle);
             let cx = iface.context();
 
@@ -121,7 +121,7 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 _ => state
             };
 
-            if let Some(wait_duration) = iface.poll_delay(timestamp, &sockets) {
+            if let Some(wait_duration) = iface.poll_delay(time, &sockets) {
                 syscall::sleep((wait_duration.total_micros() as f64) / 1000000.0);
             }
         }