Update smoltcp

Author: oli-obk

Cargo.lock

@@ -37,8 +37,8 @@ default-features = false
 
 [dependencies.smoltcp]
 #version = "0.5.0"
-git = "https://github.com/astro/smoltcp.git"
-branch = "dhcp"
+git = "https://github.com/oli-obk/smoltcp.git"
+branch = "patch-2"
 default-features = false
 features = ["alloc", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp", "proto-ipv4", "proto-dhcpv4"]
 

Cargo.toml

@@ -26,6 +26,7 @@ use cortex_m_semihosting::hio::{self, HStdout};
 use smoltcp::{
     socket::{Socket, TcpSocket, TcpSocketBuffer, UdpPacketMetadata, UdpSocket, UdpSocketBuffer},
     time::Instant,
+    storage::{PacketBuffer, PacketMetadata},
     wire::{EthernetAddress, IpEndpoint},
 };
 use stm32f7::stm32f7x6::{
@@ -509,14 +510,14 @@ where
 
         let mut sockets = SocketSet::new(Vec::new());
 
-        let dhcp_rx_buffer = UdpSocketBuffer::new([UdpPacketMetadata::EMPTY; 1], vec![0; 1500]);
-        let dhcp_tx_buffer = UdpSocketBuffer::new([UdpPacketMetadata::EMPTY; 1], vec![0; 3000]);
+        let dhcp_rx_buffer = PacketBuffer::new([PacketMetadata::EMPTY; 1], vec![0; 1500]);
+        let dhcp_tx_buffer = PacketBuffer::new([PacketMetadata::EMPTY; 1], vec![0; 3000]);
         let mut dhcp = Dhcpv4Client::new(
             &mut sockets,
             dhcp_rx_buffer,
             dhcp_tx_buffer,
             Instant::from_millis(system_clock::ms() as i64),
-        ).expect("could not bind udp socket for dhcp");
+        );
         let mut prev_ip_addr = iface.ipv4_addr().unwrap();
 
         // handle new ethernet packets

src/bin/async-await.rs

@@ -23,6 +23,7 @@ use smoltcp::{
         Socket, SocketSet, TcpSocket, TcpSocketBuffer,
         UdpPacketMetadata, UdpSocket, UdpSocketBuffer,
     },
+    storage::{PacketBuffer, PacketMetadata},
     time::Instant,
     wire::{EthernetAddress, IpCidr, IpEndpoint, Ipv4Address},
 };
@@ -150,14 +151,14 @@ fn main() -> ! {
     };
 
     let mut sockets = SocketSet::new(Vec::new());
-    let dhcp_rx_buffer = UdpSocketBuffer::new([UdpPacketMetadata::EMPTY; 1], vec![0; 1500]);
-    let dhcp_tx_buffer = UdpSocketBuffer::new([UdpPacketMetadata::EMPTY; 1], vec![0; 3000]);
+    let dhcp_rx_buffer = PacketBuffer::new([PacketMetadata::EMPTY; 1], vec![0; 1500]);
+    let dhcp_tx_buffer = PacketBuffer::new([PacketMetadata::EMPTY; 1], vec![0; 3000]);
     let mut dhcp = Dhcpv4Client::new(
         &mut sockets,
         dhcp_rx_buffer,
         dhcp_tx_buffer,
         Instant::from_millis(system_clock::ms() as i64),
-    ).expect("could not bind udp socket");
+    );
 
     let mut previous_button_state = pins.button.get();
     let mut audio_writer = AudioWriter::new();