diff --git a/Cargo.lock b/Cargo.lock index 50f827ab8b..79ec928a66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -459,7 +459,6 @@ name = "redox_netstack" version = "0.1.0" dependencies = [ "anyhow", - "byteorder 1.5.0", "dns-parser", "ioslice", "libredox", diff --git a/Cargo.toml b/Cargo.toml index 232c5b730c..221b2ec6a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,6 @@ redox_event = "0.4.1" redox-daemon = "0.1.2" redox_syscall = "0.5" redox-log = "0.1" -byteorder = { version = "1.0", default-features = false } dns-parser = "0.7.1" libredox = { version = "0.1.3", features = ["mkns"] } anyhow = "1.0.81" diff --git a/src/smolnetd/scheme/icmp.rs b/src/smolnetd/scheme/icmp.rs index df2aaa49ad..242c1fef5a 100644 --- a/src/smolnetd/scheme/icmp.rs +++ b/src/smolnetd/scheme/icmp.rs @@ -1,4 +1,3 @@ -use byteorder::{ByteOrder, NetworkEndian}; use smoltcp::iface::SocketHandle; use smoltcp::socket::icmp::{ Endpoint as IcmpEndpoint, PacketBuffer as IcmpSocketBuffer, @@ -178,8 +177,8 @@ impl<'a> SchemeSocket for IcmpSocket<'a> { if buf.len() < mem::size_of::() { return Err(SyscallError::new(syscall::EINVAL)); } - let (seq_buf, payload) = buf.split_at(mem::size_of::()); - let seq_no = NetworkEndian::read_u16(seq_buf); + let (&seq_buf, payload) = buf.split_first_chunk::<2>().unwrap(); + let seq_no = u16::from_be_bytes(seq_buf); let icmp_repr = Icmpv4Repr::EchoRequest { ident: file.data.ident, seq_no, @@ -218,7 +217,7 @@ impl<'a> SchemeSocket for IcmpSocket<'a> { if buf.len() < mem::size_of::() + data.len() { return Err(SyscallError::new(syscall::EINVAL)); } - NetworkEndian::write_u16(&mut buf[0..2], seq_no); + buf[0..2].copy_from_slice(&seq_no.to_be_bytes()); for i in 0..data.len() { buf[mem::size_of::() + i] = data[i];