renet
/
renet
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix many warnings.

v0.7.x
whitequark 2017-09-25 00:55:54 +00:00
parent dd0f4b706a
commit ba93552ccd
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ping.rs
View File

@ -7,7 +7,7 @@ extern crate byteorder;
mod utils;
use std::str::{self, FromStr};
use std::str::FromStr;
use std::time::Instant;
use std::os::unix::io::AsRawFd;
use smoltcp::phy::wait as phy_wait;

2
src/phy/fault_injector.rs
View File

@ -40,7 +40,7 @@ impl State {
}
fn corrupt<T: AsMut<[u8]>>(&mut self, mut buffer: T) {
let mut buffer = buffer.as_mut();
let buffer = buffer.as_mut();
// We introduce a single bitflip, as the most likely, and the hardest to detect, error.
let index = (xorshift32(&mut self.rng_seed) as usize) % buffer.len();
let bit = 1 << (xorshift32(&mut self.rng_seed) % 8) as u8;

4
src/storage/ring_buffer.rs
View File

@ -553,7 +553,7 @@ mod test {
assert_eq!(ring.enqueue_slice(b"abcdefghijkl"), 12);
{
let mut buf = ring.dequeue_many(8);
let buf = ring.dequeue_many(8);
assert_eq!(buf, b"abcdefgh");
buf.copy_from_slice(b"........");
}
@ -561,7 +561,7 @@ mod test {
assert_eq!(&ring.storage[..], b"........ijkl");
{
let mut buf = ring.dequeue_many(8);
let buf = ring.dequeue_many(8);
assert_eq!(buf, b"ijkl");
buf.copy_from_slice(b"....");
}

14
src/wire/icmpv4.rs
View File

@ -300,21 +300,21 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the message type field.
#[inline]
pub fn set_msg_type(&mut self, value: Message) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
data[field::TYPE] = value.into()
}
/// Set the message code field.
#[inline]
pub fn set_msg_code(&mut self, value: u8) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
data[field::CODE] = value
}
/// Set the checksum field.
#[inline]
pub fn set_checksum(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::CHECKSUM], value)
}
@ -324,7 +324,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// This function may panic if this packet is not an echo request or reply packet.
#[inline]
pub fn set_echo_ident(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::ECHO_IDENT], value)
}
@ -334,7 +334,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// This function may panic if this packet is not an echo request or reply packet.
#[inline]
pub fn set_echo_seq_no(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::ECHO_SEQNO], value)
}
@ -354,7 +354,7 @@ impl<'a, T: AsRef<[u8]> + AsMut<[u8]> + ?Sized> Packet<&'a mut T> {
#[inline]
pub fn data_mut(&mut self) -> &mut [u8] {
let range = self.header_len()..;
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
&mut data[range]
}
}
@ -468,7 +468,7 @@ impl<'a> Repr<'a> {
let mut ip_packet = Ipv4Packet::new(packet.data_mut());
header.emit(&mut ip_packet);
let mut payload = &mut ip_packet.into_inner()[header.buffer_len()..];
let payload = &mut ip_packet.into_inner()[header.buffer_len()..];
payload.copy_from_slice(&data[..])
}

36
src/wire/tcp.rs
View File

@ -325,28 +325,28 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the source port field.
#[inline]
pub fn set_src_port(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::SRC_PORT], value)
}
/// Set the destination port field.
#[inline]
pub fn set_dst_port(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::DST_PORT], value)
}
/// Set the sequence number field.
#[inline]
pub fn set_seq_number(&mut self, value: SeqNumber) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_i32(&mut data[field::SEQ_NUM], value.0)
}
/// Set the acknowledgement number field.
#[inline]
pub fn set_ack_number(&mut self, value: SeqNumber) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_i32(&mut data[field::ACK_NUM], value.0)
}
@ -362,7 +362,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the FIN flag.
#[inline]
pub fn set_fin(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_FIN } else { raw & !field::FLG_FIN };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -371,7 +371,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the SYN flag.
#[inline]
pub fn set_syn(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_SYN } else { raw & !field::FLG_SYN };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -380,7 +380,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the RST flag.
#[inline]
pub fn set_rst(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_RST } else { raw & !field::FLG_RST };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -389,7 +389,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the PSH flag.
#[inline]
pub fn set_psh(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_PSH } else { raw & !field::FLG_PSH };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -398,7 +398,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the ACK flag.
#[inline]
pub fn set_ack(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_ACK } else { raw & !field::FLG_ACK };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -407,7 +407,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the URG flag.
#[inline]
pub fn set_urg(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_URG } else { raw & !field::FLG_URG };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -416,7 +416,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the ECE flag.
#[inline]
pub fn set_ece(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_ECE } else { raw & !field::FLG_ECE };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -425,7 +425,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the CWR flag.
#[inline]
pub fn set_cwr(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_CWR } else { raw & !field::FLG_CWR };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -434,7 +434,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the NS flag.
#[inline]
pub fn set_ns(&mut self, value: bool) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = if value { raw | field::FLG_NS } else { raw & !field::FLG_NS };
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -443,7 +443,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the header length, in octets.
#[inline]
pub fn set_header_len(&mut self, value: u8) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
let raw = NetworkEndian::read_u16(&data[field::FLAGS]);
let raw = (raw & !0xf000) | ((value as u16) / 4) << 12;
NetworkEndian::write_u16(&mut data[field::FLAGS], raw)
@ -452,21 +452,21 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Return the window size field.
#[inline]
pub fn set_window_len(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::WIN_SIZE], value)
}
/// Set the checksum field.
#[inline]
pub fn set_checksum(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::CHECKSUM], value)
}
/// Set the urgent pointer field.
#[inline]
pub fn set_urgent_at(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::URGENT], value)
}
@ -502,7 +502,7 @@ impl<'a, T: AsRef<[u8]> + AsMut<[u8]> + ?Sized> Packet<&'a mut T> {
#[inline]
pub fn payload_mut(&mut self) -> &mut [u8] {
let header_len = self.header_len() as usize;
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
&mut data[header_len..]
}
}

10
src/wire/udp.rs
View File

@ -133,28 +133,28 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> Packet<T> {
/// Set the source port field.
#[inline]
pub fn set_src_port(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::SRC_PORT], value)
}
/// Set the destination port field.
#[inline]
pub fn set_dst_port(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::DST_PORT], value)
}
/// Set the length field.
#[inline]
pub fn set_len(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::LENGTH], value)
}
/// Set the checksum field.
#[inline]
pub fn set_checksum(&mut self, value: u16) {
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
NetworkEndian::write_u16(&mut data[field::CHECKSUM], value)
}
@ -186,7 +186,7 @@ impl<'a, T: AsRef<[u8]> + AsMut<[u8]> + ?Sized> Packet<&'a mut T> {
#[inline]
pub fn payload_mut(&mut self) -> &mut [u8] {
let length = self.len();
let mut data = self.buffer.as_mut();
let data = self.buffer.as_mut();
&mut data[field::PAYLOAD(length)]
}
}