diff --git a/kernel/src/net/net_core.rs b/kernel/src/net/net_core.rs index d7e9bc8f4..9038e7dec 100644 --- a/kernel/src/net/net_core.rs +++ b/kernel/src/net/net_core.rs @@ -7,10 +7,7 @@ use crate::{ driver::net::{Iface, Operstate}, libs::rwlock::RwLockReadGuard, net::NET_DEVICES, - time::{ - sleep::nanosleep, - PosixTimeSpec, - }, + time::{sleep::nanosleep, PosixTimeSpec}, }; pub fn net_init() -> Result<(), SystemError> { @@ -21,7 +18,12 @@ fn dhcp_query() -> Result<(), SystemError> { let binding = NET_DEVICES.write_irqsave(); // Default iface, misspelled to net_face - let net_face = binding.iter().find(|(_, iface)| iface.common().is_default_iface()).unwrap().1.clone(); + let net_face = binding + .iter() + .find(|(_, iface)| iface.common().is_default_iface()) + .unwrap() + .1 + .clone(); drop(binding); diff --git a/kernel/src/net/socket/inet/datagram/inner.rs b/kernel/src/net/socket/inet/datagram/inner.rs index 50020d97f..cbd49a57e 100644 --- a/kernel/src/net/socket/inet/datagram/inner.rs +++ b/kernel/src/net/socket/inet/datagram/inner.rs @@ -33,13 +33,14 @@ impl UnboundUdp { } pub fn bind(self, local_endpoint: smoltcp::wire::IpEndpoint) -> Result { - let inner = BoundInner::bind(self.socket, &local_endpoint.addr)?; let bind_addr = local_endpoint.addr; let bind_port = if local_endpoint.port == 0 { inner.port_manager().bind_ephemeral_port(InetTypes::Udp)? } else { - inner.port_manager().bind_port(InetTypes::Udp, local_endpoint.port)?; + inner + .port_manager() + .bind_port(InetTypes::Udp, local_endpoint.port)?; local_endpoint.port }; diff --git a/kernel/src/net/socket/inet/datagram/mod.rs b/kernel/src/net/socket/inet/datagram/mod.rs index e6d8796e3..dbf6a6304 100644 --- a/kernel/src/net/socket/inet/datagram/mod.rs +++ b/kernel/src/net/socket/inet/datagram/mod.rs @@ -90,7 +90,7 @@ impl UdpSocket { let ret = bound.try_recv(buf); poll_ifaces(); ret - }, + } _ => Err(ENOTCONN), } } @@ -199,7 +199,8 @@ impl Socket for UdpSocket { if !self.is_bound() { self.bind_emphemeral(remote.addr)?; } - if let UdpInner::Bound(inner) = self.inner.read().as_ref().expect("UDP Inner disappear") { + if let UdpInner::Bound(inner) = self.inner.read().as_ref().expect("UDP Inner disappear") + { inner.connect(remote); return Ok(()); } else {