Merge pull request #322 from quartiq/dependabot/cargo/smoltcp-nal-0.4.0

Bump smoltcp-nal from 0.3.0 to 0.4.0

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Changed
+* Network stack is randomly seeded on startup so that random ports are used.
+
 ## [0.5.0] - 03-07-2023
 
 ### Added

Cargo.toml

@@ -28,6 +28,7 @@ exclude = [
 cortex-m = "0.7.7"
 cortex-m-rt = "0.7"
 cortex-m-rtic = "1.1"
+rand_core = "0.6"
 mono-clock = "0.1"
 systick-monotonic = "1.0.1"
 cortex-m-log = { version = "0.8.0", features = ["log-integration"] }
@@ -53,7 +54,7 @@ minireq = "0.2"
 rtt-target = {version = "0.3", features=["cortex-m"]}
 enum-iterator = { version = "1.4", default-features = false }
 enc424j600 = { version = "0.3", features = ["cortex-m-cpu"] }
-smoltcp-nal = { version = "0.3", features=["shared-stack"] }
+smoltcp-nal = { version = "0.4", features=["shared-stack"] }
 
 [build-dependencies]
 built = { version = "0.6", features = ["git2"], default-features = false }

src/hardware/net_interface.rs

@@ -50,9 +50,11 @@ impl TcpSocketStorage {
 /// # Args
 /// * `mac` - The smoltcp interface MAC.
 /// * `settings` - The device settings to use.
+/// * `random_seed` - A random seed for the network stack.
 pub fn setup(
     device: &mut Mac,
     settings: &BoosterSettings,
+    random_seed: u64,
 ) -> (
     smoltcp::iface::Interface,
     smoltcp::iface::SocketSet<'static>,
@@ -61,12 +63,12 @@ pub fn setup(
 
     let ip_address = settings.ip_address();
 
-    let mut config = smoltcp::iface::Config::default();
-    config
-        .hardware_addr
-        .replace(smoltcp::wire::HardwareAddress::Ethernet(settings.mac()));
+    let mut config =
+        smoltcp::iface::Config::new(smoltcp::wire::HardwareAddress::Ethernet(settings.mac()));
+    config.random_seed = random_seed;
 
-    let mut interface = smoltcp::iface::Interface::new(config, device);
+    let mut interface =
+        smoltcp::iface::Interface::new(config, device, smoltcp::time::Instant::ZERO);
 
     interface
         .routes_mut()

src/hardware/setup.rs

@@ -20,6 +20,7 @@ use core::convert::TryInto;
 use core::fmt::Write;
 use hal::prelude::*;
 use heapless::String;
+use rand_core::RngCore;
 use usb_device::prelude::*;
 
 /// Macro for genering an RfChannelPins structure.
@@ -377,8 +378,14 @@ pub fn setup(
         ApplicationMetadata::new(hardware_version, phy_string)
     };
 
-    let (interface, sockets) = net_interface::setup(&mut mac, &settings);
-    let network_stack = smoltcp_nal::NetworkStack::new(interface, mac, sockets, clock);
+    let mut rng = device.RNG.constrain(&clocks);
+
+    let (interface, sockets) = net_interface::setup(&mut mac, &settings, rng.next_u64());
+    let mut network_stack = smoltcp_nal::NetworkStack::new(interface, mac, sockets, clock);
+
+    let mut seed_bytes = [0; 8];
+    rng.fill_bytes(&mut seed_bytes);
+    network_stack.seed_random_port(&seed_bytes);
 
     let mut fans = {
         let main_board_leds = {