diff --git a/kernel/src/net/socket/family.rs b/kernel/src/net/socket/family.rs index 6a702a0f..3a17feb0 100644 --- a/kernel/src/net/socket/family.rs +++ b/kernel/src/net/socket/family.rs @@ -117,5 +117,8 @@ use crate::net::socket; use alloc::sync::Arc; pub trait Family { - fn socket(stype: socket::PSOCK, protocol: u32) -> Result, system_error::SystemError>; + fn socket( + stype: socket::PSOCK, + protocol: u32, + ) -> Result, system_error::SystemError>; } diff --git a/kernel/src/net/socket/inet/stream/inner.rs b/kernel/src/net/socket/inet/stream/inner.rs index 4340b369..20f7943f 100644 --- a/kernel/src/net/socket/inet/stream/inner.rs +++ b/kernel/src/net/socket/inet/stream/inner.rs @@ -66,7 +66,7 @@ impl Init { Init::Bound(_) => { log::debug!("Already Bound"); Err(EINVAL) - }, + } } } diff --git a/kernel/src/net/socket/inet/stream/mod.rs b/kernel/src/net/socket/inet/stream/mod.rs index 9c15be58..5cd9e928 100644 --- a/kernel/src/net/socket/inet/stream/mod.rs +++ b/kernel/src/net/socket/inet/stream/mod.rs @@ -73,7 +73,7 @@ impl TcpSocket { writer.replace(any); log::error!("TcpSocket::do_bind: not Init"); Err(EINVAL) - }, + } } } @@ -234,11 +234,13 @@ impl Socket for TcpSocket { fn get_name(&self) -> Result { match self.inner.read().as_ref().expect("Tcp Inner is None") { - Inner::Init(Init::Unbound((_, v4))) => if *v4 { - Ok(Endpoint::Ip(UNSPECIFIED_LOCAL_ENDPOINT_V4)) - } else { - Ok(Endpoint::Ip(UNSPECIFIED_LOCAL_ENDPOINT_V6)) - }, + Inner::Init(Init::Unbound((_, v4))) => { + if *v4 { + Ok(Endpoint::Ip(UNSPECIFIED_LOCAL_ENDPOINT_V4)) + } else { + Ok(Endpoint::Ip(UNSPECIFIED_LOCAL_ENDPOINT_V6)) + } + } Inner::Init(Init::Bound((_, local))) => Ok(Endpoint::Ip(*local)), Inner::Connecting(connecting) => Ok(Endpoint::Ip(connecting.get_name())), Inner::Established(established) => Ok(Endpoint::Ip(established.local_endpoint())), diff --git a/kernel/src/net/socket/inet/syscall.rs b/kernel/src/net/socket/inet/syscall.rs index 46f44c0e..bb541f87 100644 --- a/kernel/src/net/socket/inet/syscall.rs +++ b/kernel/src/net/socket/inet/syscall.rs @@ -44,7 +44,8 @@ fn create_inet_socket( pub struct Inet; impl family::Family for Inet { fn socket(stype: PSOCK, protocol: u32) -> Result, SystemError> { - let socket = create_inet_socket(true, stype, smoltcp::wire::IpProtocol::from(protocol as u8))?; + let socket = + create_inet_socket(true, stype, smoltcp::wire::IpProtocol::from(protocol as u8))?; Ok(Inode::new(socket)) } } @@ -52,7 +53,11 @@ impl family::Family for Inet { pub struct Inet6; impl family::Family for Inet6 { fn socket(stype: PSOCK, protocol: u32) -> Result, SystemError> { - let socket = create_inet_socket(false, stype, smoltcp::wire::IpProtocol::from(protocol as u8))?; + let socket = create_inet_socket( + false, + stype, + smoltcp::wire::IpProtocol::from(protocol as u8), + )?; Ok(Inode::new(socket)) } }