Skip to content

Commit 7acf1ac

Browse files
DirbaioDirbaio
authored
Merge pull request #994 from smoltcp-rs/core-ip
wire: use core::net types for IP addresses.
2 parents 61156ed + b65e1b6 commit 7acf1ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+765
-1391
lines changed

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "smoltcp"
33
version = "0.11.0"
44
edition = "2021"
5-
rust-version = "1.77"
5+
rust-version = "1.80"
66
authors = ["whitequark <[email protected]>"]
77
description = "A TCP/IP stack designed for bare-metal, real-time systems without a heap."
88
documentation = "https://docs.rs/smoltcp/"
@@ -25,7 +25,7 @@ byteorder = { version = "1.0", default-features = false }
2525
log = { version = "0.4.4", default-features = false, optional = true }
2626
libc = { version = "0.2.18", optional = true }
2727
bitflags = { version = "1.0", default-features = false }
28-
defmt = { version = "0.3", optional = true }
28+
defmt = { version = "0.3.8", optional = true, features = ["ip_in_core"] }
2929
cfg-if = "1.0.0"
3030
heapless = "0.8"
3131

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ include complicated compile-time computations, such as macro or type tricks, eve
1212
at cost of performance degradation.
1313

1414
_smoltcp_ does not need heap allocation *at all*, is [extensively documented][docs],
15-
and compiles on stable Rust 1.77 and later.
15+
and compiles on stable Rust 1.80 and later.
1616

1717
_smoltcp_ achieves [~Gbps of throughput](#examplesbenchmarkrs) when tested against
1818
the Linux TCP stack in loopback mode.

‎benches/bench.rs

+8-12
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,14 @@ mod wire {
1313
extern crate test;
1414

1515
#[cfg(feature = "proto-ipv6")]
16-
const SRC_ADDR: IpAddress = IpAddress::Ipv6(Ipv6Address([
17-
0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
18-
]));
16+
const SRC_ADDR: IpAddress = IpAddress::Ipv6(Ipv6Address::new(0xfe80, 0, 0, 0, 0, 0, 0, 1));
1917
#[cfg(feature = "proto-ipv6")]
20-
const DST_ADDR: IpAddress = IpAddress::Ipv6(Ipv6Address([
21-
0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,
22-
]));
18+
const DST_ADDR: IpAddress = IpAddress::Ipv6(Ipv6Address::new(0xfe80, 0, 0, 0, 0, 0, 0, 2));
2319

2420
#[cfg(all(not(feature = "proto-ipv6"), feature = "proto-ipv4"))]
25-
const SRC_ADDR: IpAddress = IpAddress::Ipv4(Ipv4Address([192, 168, 1, 1]));
21+
const SRC_ADDR: IpAddress = IpAddress::Ipv4(Ipv4Address::new(192, 168, 1, 1));
2622
#[cfg(all(not(feature = "proto-ipv6"), feature = "proto-ipv4"))]
27-
const DST_ADDR: IpAddress = IpAddress::Ipv4(Ipv4Address([192, 168, 1, 2]));
23+
const DST_ADDR: IpAddress = IpAddress::Ipv4(Ipv4Address::new(192, 168, 1, 2));
2824

2925
#[bench]
3026
#[cfg(any(feature = "proto-ipv6", feature = "proto-ipv4"))]
@@ -84,8 +80,8 @@ mod wire {
8480
#[cfg(feature = "proto-ipv4")]
8581
fn bench_emit_ipv4(b: &mut test::Bencher) {
8682
let repr = Ipv4Repr {
87-
src_addr: Ipv4Address([192, 168, 1, 1]),
88-
dst_addr: Ipv4Address([192, 168, 1, 2]),
83+
src_addr: Ipv4Address::new(192, 168, 1, 1),
84+
dst_addr: Ipv4Address::new(192, 168, 1, 2),
8985
next_header: IpProtocol::Tcp,
9086
payload_len: 100,
9187
hop_limit: 64,
@@ -102,8 +98,8 @@ mod wire {
10298
#[cfg(feature = "proto-ipv6")]
10399
fn bench_emit_ipv6(b: &mut test::Bencher) {
104100
let repr = Ipv6Repr {
105-
src_addr: Ipv6Address([0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]),
106-
dst_addr: Ipv6Address([0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2]),
101+
src_addr: Ipv6Address::new(0xfe80, 0, 0, 0, 0, 0, 0, 1),
102+
dst_addr: Ipv6Address::new(0xfe80, 0, 0, 0, 0, 0, 0, 2),
107103
next_header: IpProtocol::Tcp,
108104
payload_len: 100,
109105
hop_limit: 64,

‎ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eox pipefail
44

55
export DEFMT_LOG=trace
66

7-
MSRV="1.77.0"
7+
MSRV="1.80.0"
88

99
RUSTC_VERSIONS=(
1010
$MSRV

‎examples/loopback.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![allow(clippy::collapsible_if)]
44

55
#[cfg(feature = "std")]
6-
#[allow(dead_code)]
76
mod utils;
87

98
use core::str;

‎examples/multicast.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use smoltcp::wire::{
1212
};
1313

1414
const MDNS_PORT: u16 = 5353;
15-
const MDNS_GROUP: [u8; 4] = [224, 0, 0, 251];
15+
const MDNS_GROUP: Ipv4Address = Ipv4Address::new(224, 0, 0, 251);
1616

1717
fn main() {
1818
utils::setup_logging("warn");
@@ -81,9 +81,7 @@ fn main() {
8181
let udp_handle = sockets.add(udp_socket);
8282

8383
// Join a multicast group to receive mDNS traffic
84-
iface
85-
.join_multicast_group(Ipv4Address::from_bytes(&MDNS_GROUP))
86-
.unwrap();
84+
iface.join_multicast_group(MDNS_GROUP).unwrap();
8785

8886
loop {
8987
let timestamp = Instant::now();

‎examples/multicast6.rs

+6-9
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr, Ipv6Address};
1919
// will send packets to the multicast group we join below on tap0.
2020

2121
const PORT: u16 = 8123;
22-
const GROUP: [u16; 8] = [0xff02, 0, 0, 0, 0, 0, 0, 0x1234];
23-
const LOCAL_ADDR: [u16; 8] = [0xfe80, 0, 0, 0, 0, 0, 0, 0x101];
24-
const ROUTER_ADDR: [u16; 8] = [0xfe80, 0, 0, 0, 0, 0, 0, 0x100];
22+
const GROUP: Ipv6Address = Ipv6Address::new(0xff02, 0, 0, 0, 0, 0, 0, 0x1234);
23+
const LOCAL_ADDR: Ipv6Address = Ipv6Address::new(0xfe80, 0, 0, 0, 0, 0, 0, 0x101);
24+
const ROUTER_ADDR: Ipv6Address = Ipv6Address::new(0xfe80, 0, 0, 0, 0, 0, 0, 0x100);
2525

2626
fn main() {
2727
utils::setup_logging("warn");
@@ -37,7 +37,6 @@ fn main() {
3737
utils::parse_middleware_options(&mut matches, device, /*loopback=*/ false);
3838

3939
// Create interface
40-
let local_addr = Ipv6Address::from_parts(&LOCAL_ADDR);
4140
let ethernet_addr = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x02]);
4241
let mut config = match device.capabilities().medium {
4342
Medium::Ethernet => Config::new(ethernet_addr.into()),
@@ -49,12 +48,12 @@ fn main() {
4948
let mut iface = Interface::new(config, &mut device, Instant::now());
5049
iface.update_ip_addrs(|ip_addrs| {
5150
ip_addrs
52-
.push(IpCidr::new(IpAddress::from(local_addr), 64))
51+
.push(IpCidr::new(IpAddress::from(LOCAL_ADDR), 64))
5352
.unwrap();
5453
});
5554
iface
5655
.routes_mut()
57-
.add_default_ipv6_route(Ipv6Address::from_parts(&ROUTER_ADDR))
56+
.add_default_ipv6_route(ROUTER_ADDR)
5857
.unwrap();
5958

6059
// Create sockets
@@ -65,9 +64,7 @@ fn main() {
6564
let udp_handle = sockets.add(udp_socket);
6665

6766
// Join a multicast group
68-
iface
69-
.join_multicast_group(Ipv6Address::from_parts(&GROUP))
70-
.unwrap();
67+
iface.join_multicast_group(GROUP).unwrap();
7168

7269
loop {
7370
let timestamp = Instant::now();

‎src/iface/fragmentation.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl<K> PacketAssembler<K> {
137137
/// # Errors
138138
///
139139
/// - Returns [`Error::PacketAssemblerBufferTooSmall`] when trying to add data into the buffer at a non-existing
140-
/// place.
140+
/// place.
141141
pub(crate) fn add(&mut self, data: &[u8], offset: usize) -> Result<(), AssemblerError> {
142142
#[cfg(not(feature = "alloc"))]
143143
if self.buffer.len() < offset + data.len() {
@@ -329,8 +329,8 @@ impl Fragmenter {
329329
#[cfg(feature = "proto-ipv4-fragmentation")]
330330
ipv4: Ipv4Fragmenter {
331331
repr: Ipv4Repr {
332-
src_addr: Ipv4Address::default(),
333-
dst_addr: Ipv4Address::default(),
332+
src_addr: Ipv4Address::new(0, 0, 0, 0),
333+
dst_addr: Ipv4Address::new(0, 0, 0, 0),
334334
next_header: IpProtocol::Unknown(0),
335335
payload_len: 0,
336336
hop_limit: 0,
@@ -373,8 +373,8 @@ impl Fragmenter {
373373
#[cfg(feature = "proto-ipv4-fragmentation")]
374374
{
375375
self.ipv4.repr = Ipv4Repr {
376-
src_addr: Ipv4Address::default(),
377-
dst_addr: Ipv4Address::default(),
376+
src_addr: Ipv4Address::new(0, 0, 0, 0),
377+
dst_addr: Ipv4Address::new(0, 0, 0, 0),
378378
next_header: IpProtocol::Unknown(0),
379379
payload_len: 0,
380380
hop_limit: 0,

‎src/iface/interface/ipv4.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl InterfaceInner {
7070

7171
/// Checks if an ipv4 address is unicast, taking into account subnet broadcast addresses
7272
fn is_unicast_v4(&self, address: Ipv4Address) -> bool {
73-
address.is_unicast() && !self.is_broadcast_v4(address)
73+
address.x_is_unicast() && !self.is_broadcast_v4(address)
7474
}
7575

7676
/// Get the first IPv4 address of the interface.
@@ -182,7 +182,7 @@ impl InterfaceInner {
182182
// Ignore IP packets not directed at us, or broadcast, or any of the multicast groups.
183183
// If AnyIP is enabled, also check if the packet is routed locally.
184184
if !self.any_ip
185-
|| !ipv4_repr.dst_addr.is_unicast()
185+
|| !ipv4_repr.dst_addr.x_is_unicast()
186186
|| self
187187
.routes
188188
.lookup(&IpAddress::Ipv4(ipv4_repr.dst_addr), self.now)
@@ -260,7 +260,7 @@ impl InterfaceInner {
260260
}
261261

262262
// Discard packets with non-unicast source addresses.
263-
if !source_protocol_addr.is_unicast() || !source_hardware_addr.is_unicast() {
263+
if !source_protocol_addr.x_is_unicast() || !source_hardware_addr.is_unicast() {
264264
net_debug!("arp: non-unicast source address");
265265
return None;
266266
}

‎src/iface/interface/ipv6.rs

+19-18
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ impl InterfaceInner {
3737
}
3838

3939
if dst_addr.is_multicast()
40-
&& matches!(dst_addr.multicast_scope(), Ipv6MulticastScope::LinkLocal)
40+
&& matches!(dst_addr.x_multicast_scope(), Ipv6MulticastScope::LinkLocal)
4141
&& src_addr.is_multicast()
42-
&& !matches!(src_addr.multicast_scope(), Ipv6MulticastScope::LinkLocal)
42+
&& !matches!(src_addr.x_multicast_scope(), Ipv6MulticastScope::LinkLocal)
4343
{
4444
return false;
4545
}
@@ -58,7 +58,7 @@ impl InterfaceInner {
5858
fn common_prefix_length(dst_addr: &Ipv6Cidr, src_addr: &Ipv6Address) -> usize {
5959
let addr = dst_addr.address();
6060
let mut bits = 0;
61-
for (l, r) in addr.as_bytes().iter().zip(src_addr.as_bytes().iter()) {
61+
for (l, r) in addr.octets().iter().zip(src_addr.octets().iter()) {
6262
if l == r {
6363
bits += 8;
6464
} else {
@@ -82,7 +82,7 @@ impl InterfaceInner {
8282
.count()
8383
== 0
8484
{
85-
return Ipv6Address::LOOPBACK;
85+
return Ipv6Address::LOCALHOST;
8686
}
8787

8888
let mut candidate = self
@@ -111,15 +111,16 @@ impl InterfaceInner {
111111
}
112112

113113
// Rule 2: prefer appropriate scope.
114-
if (candidate.address().multicast_scope() as u8)
115-
< (addr.address().multicast_scope() as u8)
114+
if (candidate.address().x_multicast_scope() as u8)
115+
< (addr.address().x_multicast_scope() as u8)
116116
{
117-
if (candidate.address().multicast_scope() as u8)
118-
< (dst_addr.multicast_scope() as u8)
117+
if (candidate.address().x_multicast_scope() as u8)
118+
< (dst_addr.x_multicast_scope() as u8)
119119
{
120120
candidate = addr;
121121
}
122-
} else if (addr.address().multicast_scope() as u8) > (dst_addr.multicast_scope() as u8)
122+
} else if (addr.address().x_multicast_scope() as u8)
123+
> (dst_addr.x_multicast_scope() as u8)
123124
{
124125
candidate = addr;
125126
}
@@ -147,10 +148,10 @@ impl InterfaceInner {
147148
pub fn has_solicited_node(&self, addr: Ipv6Address) -> bool {
148149
self.ip_addrs.iter().any(|cidr| {
149150
match *cidr {
150-
IpCidr::Ipv6(cidr) if cidr.address() != Ipv6Address::LOOPBACK => {
151+
IpCidr::Ipv6(cidr) if cidr.address() != Ipv6Address::LOCALHOST => {
151152
// Take the lower order 24 bits of the IPv6 address and
152153
// append those bits to FF02:0:0:0:0:1:FF00::/104.
153-
addr.as_bytes()[14..] == cidr.address().as_bytes()[14..]
154+
addr.octets()[14..] == cidr.address().octets()[14..]
154155
}
155156
_ => false,
156157
}
@@ -192,7 +193,7 @@ impl InterfaceInner {
192193
) -> Option<Packet<'frame>> {
193194
let ipv6_repr = check!(Ipv6Repr::parse(ipv6_packet));
194195

195-
if !ipv6_repr.src_addr.is_unicast() {
196+
if !ipv6_repr.src_addr.x_is_unicast() {
196197
// Discard packets with non-unicast source addresses.
197198
net_debug!("non-unicast source address");
198199
return None;
@@ -213,7 +214,7 @@ impl InterfaceInner {
213214
{
214215
// If AnyIP is enabled, also check if the packet is routed locally.
215216
if !self.any_ip
216-
|| !ipv6_repr.dst_addr.is_unicast()
217+
|| !ipv6_repr.dst_addr.x_is_unicast()
217218
|| self
218219
.routes
219220
.lookup(&IpAddress::Ipv6(ipv6_repr.dst_addr), self.now)
@@ -230,7 +231,7 @@ impl InterfaceInner {
230231
let handled_by_raw_socket = false;
231232

232233
#[cfg(any(feature = "medium-ethernet", feature = "medium-ieee802154"))]
233-
if ipv6_repr.dst_addr.is_unicast() {
234+
if ipv6_repr.dst_addr.x_is_unicast() {
234235
self.neighbor_cache.reset_expiry_if_existing(
235236
IpAddress::Ipv6(ipv6_repr.src_addr),
236237
source_hardware_addr,
@@ -436,7 +437,7 @@ impl InterfaceInner {
436437
let ip_addr = ip_repr.src_addr.into();
437438
if let Some(lladdr) = lladdr {
438439
let lladdr = check!(lladdr.parse(self.caps.medium));
439-
if !lladdr.is_unicast() || !target_addr.is_unicast() {
440+
if !lladdr.is_unicast() || !target_addr.x_is_unicast() {
440441
return None;
441442
}
442443
if flags.contains(NdiscNeighborFlags::OVERRIDE)
@@ -454,7 +455,7 @@ impl InterfaceInner {
454455
} => {
455456
if let Some(lladdr) = lladdr {
456457
let lladdr = check!(lladdr.parse(self.caps.medium));
457-
if !lladdr.is_unicast() || !target_addr.is_unicast() {
458+
if !lladdr.is_unicast() || !target_addr.x_is_unicast() {
458459
return None;
459460
}
460461
self.neighbor_cache
@@ -492,7 +493,7 @@ impl InterfaceInner {
492493
let src_addr = ipv6_repr.dst_addr;
493494
let dst_addr = ipv6_repr.src_addr;
494495

495-
let src_addr = if src_addr.is_unicast() {
496+
let src_addr = if src_addr.x_is_unicast() {
496497
src_addr
497498
} else {
498499
self.get_source_address_ipv6(&dst_addr)
@@ -524,7 +525,7 @@ impl InterfaceInner {
524525

525526
// Per [RFC 3810 § 5.2.14], all MLDv2 reports are sent to ff02::16.
526527
// [RFC 3810 § 5.2.14]: https://tools.ietf.org/html/rfc3810#section-5.2.14
527-
let dst_addr = Ipv6Address::LINK_LOCAL_ALL_MLDV2_ROUTERS;
528+
let dst_addr = IPV6_LINK_LOCAL_ALL_MLDV2_ROUTERS;
528529

529530
// Create a dummy IPv6 extension header so we can calculate the total length of the packet.
530531
// The actual extension header will be created later by Packet::emit_payload().

0 commit comments

Comments
 (0)