itsscb/smoltcp
1
0
Fork 0
mirror of https://github.com/smoltcp-rs/smoltcp.git synced 2025-10-02 23:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Hash trait on IpAddress/IpCidr

Browse Source
This commit is contained in:
luozijun 2018-01-26 23:46:33 +08:00 committed by whitequark
parent cb5be48868
commit 3b824ca642
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wire/ip.rs
View File

@ -9,7 +9,7 @@ use super::{Ipv4Address, Ipv4Packet, Ipv4Repr, Ipv4Cidr};
use super::{Ipv6Address, Ipv6Cidr, Ipv6Packet, Ipv6Repr}; use super::{Ipv6Address, Ipv6Cidr, Ipv6Packet, Ipv6Repr};
/// Internet protocol version. /// Internet protocol version.
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)] #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
pub enum Version { pub enum Version {
Unspecified, Unspecified,
#[cfg(feature = "proto-ipv4")] #[cfg(feature = "proto-ipv4")]
@ -82,7 +82,7 @@ impl fmt::Display for Protocol {
} }
/// An internetworking address. /// An internetworking address.
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)] #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
pub enum Address { pub enum Address {
/// An unspecified address. /// An unspecified address.
/// May be used as a placeholder for storage where the address is not assigned yet. /// May be used as a placeholder for storage where the address is not assigned yet.
@ -195,7 +195,7 @@ impl fmt::Display for Address {
/// A specification of a CIDR block, containing an address and a variable-length /// A specification of a CIDR block, containing an address and a variable-length
/// subnet masking prefix length. /// subnet masking prefix length.
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
pub enum Cidr { pub enum Cidr {
#[cfg(feature = "proto-ipv4")] #[cfg(feature = "proto-ipv4")]
Ipv4(Ipv4Cidr), Ipv4(Ipv4Cidr),
@ -304,7 +304,7 @@ impl fmt::Display for Cidr {
/// An internet endpoint address. /// An internet endpoint address.
/// ///
/// An endpoint can be constructed from a port, in which case the address is unspecified. /// An endpoint can be constructed from a port, in which case the address is unspecified.
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)] #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
pub struct Endpoint { pub struct Endpoint {
pub addr: Address, pub addr: Address,
pub port: u16 pub port: u16

4
src/wire/ipv4.rs
View File

@ -22,7 +22,7 @@ pub use super::IpProtocol as Protocol;
pub const MIN_MTU: usize = 576; pub const MIN_MTU: usize = 576;
/// A four-octet IPv4 address. /// A four-octet IPv4 address.
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)] #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
pub struct Address(pub [u8; 4]); pub struct Address(pub [u8; 4]);
impl Address { impl Address {
@ -94,7 +94,7 @@ impl fmt::Display for Address {
/// A specification of an IPv4 CIDR block, containing an address and a variable-length /// A specification of an IPv4 CIDR block, containing an address and a variable-length
/// subnet masking prefix length. /// subnet masking prefix length.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
pub struct Cidr { pub struct Cidr {
address: Address, address: Address,
prefix_len: u8, prefix_len: u8,

4
src/wire/ipv6.rs
View File

@ -13,7 +13,7 @@ use super::ip::pretty_print_ip_payload;
pub const MIN_MTU: usize = 1280; pub const MIN_MTU: usize = 1280;
/// A sixteen-octet IPv6 address. /// A sixteen-octet IPv6 address.
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)] #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
pub struct Address(pub [u8; 16]); pub struct Address(pub [u8; 16]);
impl Address { impl Address {
@ -237,7 +237,7 @@ impl From<::wire::ipv4::Address> for Address {
/// A specification of an IPv6 CIDR block, containing an address and a variable-length /// A specification of an IPv6 CIDR block, containing an address and a variable-length
/// subnet masking prefix length. /// subnet masking prefix length.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
pub struct Cidr { pub struct Cidr {
address: Address, address: Address,
prefix_len: u8, prefix_len: u8,