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

Merge branch 'recover-netstack' into 'main'

Browse Source 
netstack: Do not quit at error

See merge request redox-os/base!39
This commit is contained in:
Jeremy Soller
2025-11-24 06:41:06 -07:00
parent 1145e908f1 e65fbb6537
commit 6de1b07cb1
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netstack/src/error.rs
+1 -1
View File
@@ -48,7 +48,7 @@ impl std::error::Error for Error {}
impl convert::From<IOError> for Error {
fn from(e: IOError) -> Self {
Error::from_io_error(e, "")
Error::from_io_error(e, "generic error")
}
}
netstack/src/main.rs
+8 -7
View File
@@ -150,14 +150,15 @@ fn run(daemon: redox_daemon::Daemon) -> Result<()> {
.chain(event_queue.map(|r| r.map(|e| e.user_data)))
{
match event_res? {
EventSource::Network => smolnetd.on_network_scheme_event()?,
EventSource::Time => smolnetd.on_time_event()?,
EventSource::IpScheme => smolnetd.on_ip_scheme_event()?,
EventSource::UdpScheme => smolnetd.on_udp_scheme_event()?,
EventSource::TcpScheme => smolnetd.on_tcp_scheme_event()?,
EventSource::IcmpScheme => smolnetd.on_icmp_scheme_event()?,
EventSource::NetcfgScheme => smolnetd.on_netcfg_scheme_event()?,
EventSource::Network => smolnetd.on_network_scheme_event(),
EventSource::Time => smolnetd.on_time_event(),
EventSource::IpScheme => smolnetd.on_ip_scheme_event(),
EventSource::UdpScheme => smolnetd.on_udp_scheme_event(),
EventSource::TcpScheme => smolnetd.on_tcp_scheme_event(),
EventSource::IcmpScheme => smolnetd.on_icmp_scheme_event(),
EventSource::NetcfgScheme => smolnetd.on_netcfg_scheme_event(),
}
.map_err(|e| error!("Received packet error: {:?}", e));
}
Ok(())
}