Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-15 08:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump smoltcp version

Browse Source
This commit is contained in:
Ruihan Li 2024-10-19 17:38:30 +08:00 committed by Tate, Hongliang Tian
parent 25a918d132
commit 9707b46c7f
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -509,9 +509,9 @@ checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
[[package]] [[package]]
name = "defmt" name = "defmt"
version = "0.3.5" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8a2d011b2fee29fb7d659b83c43fce9a2cb4df453e16d441a51448e448f3f98" checksum = "a99dd22262668b887121d4672af5a64b238f026099f1a2a1b322066c9ecfe9e0"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"defmt-macros", "defmt-macros",
@ -1425,7 +1425,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "smoltcp" name = "smoltcp"
version = "0.11.0" version = "0.11.0"
source = "git+https://github.com/asterinas/smoltcp?rev=37716bf#37716bff5ed5b16aba1b8a37e788ee5a6bf32cab" source = "git+https://github.com/lrh2000/smoltcp?tag=r_2024-11-08_3e68ef4#85dfcb0518f764aff1bd3bf62d14396d3c621c03"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"byteorder", "byteorder",

2
kernel/libs/aster-bigtcp/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2021"
[dependencies] [dependencies]
keyable-arc = { path = "../keyable-arc" } keyable-arc = { path = "../keyable-arc" }
ostd = { path = "../../../ostd" } ostd = { path = "../../../ostd" }
smoltcp = { git = "https://github.com/asterinas/smoltcp", rev = "37716bf", default-features = false, features = [ smoltcp = { git = "https://github.com/asterinas/smoltcp", tag = "r_2024-11-08_f07e5b5", default-features = false, features = [
"alloc", "alloc",
"log", "log",
"medium-ethernet", "medium-ethernet",

4
kernel/libs/aster-bigtcp/src/iface/phy/ether.rs
View File

@ -8,7 +8,7 @@ use smoltcp::{
phy::{DeviceCapabilities, TxToken}, phy::{DeviceCapabilities, TxToken},
wire::{ wire::{
self, ArpOperation, ArpPacket, ArpRepr, EthernetAddress, EthernetFrame, EthernetProtocol, self, ArpOperation, ArpPacket, ArpRepr, EthernetAddress, EthernetFrame, EthernetProtocol,
EthernetRepr, IpAddress, Ipv4Address, Ipv4Cidr, Ipv4Packet, EthernetRepr, IpAddress, Ipv4Address, Ipv4AddressExt, Ipv4Cidr, Ipv4Packet,
}, },
}; };
@ -157,7 +157,7 @@ impl<D, E> EtherIface<D, E> {
.. ..
} => { } => {
// Ignore the ARP packet if the source addresses are not unicast. // Ignore the ARP packet if the source addresses are not unicast.
if !source_hardware_addr.is_unicast() || !source_protocol_addr.is_unicast() { if !source_hardware_addr.is_unicast() || !source_protocol_addr.x_is_unicast() {
return None; return None;
} }

2
kernel/src/net/socket/ip/addr.rs
View File

@ -9,7 +9,7 @@ impl TryFrom<SocketAddr> for IpEndpoint {
fn try_from(value: SocketAddr) -> Result<Self> { fn try_from(value: SocketAddr) -> Result<Self> {
match value { match value {
SocketAddr::IPv4(addr, port) => Ok(IpEndpoint::new(addr.into_address(), port)), SocketAddr::IPv4(addr, port) => Ok(IpEndpoint::new(addr.into(), port)),
_ => return_errno_with_message!( _ => return_errno_with_message!(
Errno::EAFNOSUPPORT, Errno::EAFNOSUPPORT,
"the address is in an unsupported address family" "the address is in an unsupported address family"

6
kernel/src/util/net/addr/ip.rs
View File

@ -51,13 +51,15 @@ struct CInetAddr {
impl From<Ipv4Address> for CInetAddr { impl From<Ipv4Address> for CInetAddr {
fn from(value: Ipv4Address) -> Self { fn from(value: Ipv4Address) -> Self {
Self { s_addr: value.0 } Self {
s_addr: value.octets(),
}
} }
} }
impl From<CInetAddr> for Ipv4Address { impl From<CInetAddr> for Ipv4Address {
fn from(value: CInetAddr) -> Self { fn from(value: CInetAddr) -> Self {
Self(value.s_addr) Self::from(value.s_addr)
} }
} }