Merge pull request #49 from quartiq/feature/nal-bump

Updating embedded-nal to v0.8
quartiq · Apr 22, 2024 · 1f73380 · 1f73380
2 parents 3e3373e + 56bc647
commit 1f73380
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,10 @@
 
 This document describes the changes to smoltcp-nal between releases.
 
-# [Unreleased]
+# [0.5.0] - 2024-04-22
 
 ## Changed
+* [breaking] Updated to `embedded-nal` v0.8
 * Updated to smoltcp 0.11
 
 # [0.4.1] - 2023-08-22
@@ -54,7 +55,8 @@ This document describes the changes to smoltcp-nal between releases.
 # Version [0.1.0] - 2021-02-17
 * Initial library release and publish to crates.io
 
-[Unreleased]: https://github.com/quartiq/smoltcp-nal/compare/0.4.1...HEAD
+[Unreleased]: https://github.com/quartiq/smoltcp-nal/compare/0.5.0...HEAD
+[0.5.0]: https://github.com/quartiq/smoltcp-nal/tree/0.4.1
 [0.4.1]: https://github.com/quartiq/smoltcp-nal/tree/0.4.1
 [0.4.0]: https://github.com/quartiq/smoltcp-nal/tree/0.4.0
 [0.3.0]: https://github.com/quartiq/smoltcp-nal/tree/0.3.0

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "smoltcp-nal"
-version = "0.4.1"
+version = "0.5.0"
 authors = ["Ryan Summers <ryan.summers@vertigo-designs.com>"]
 edition = "2018"
 license = "MIT"
@@ -11,7 +11,7 @@ repository = "https://github.com/quartiq/smoltcp-nal.git"
 
 [dependencies]
 heapless = "0.7"
-embedded-nal = "0.7"
+embedded-nal = "0.8"
 embedded-time = "0.12"
 
 [dependencies.nanorand]

diff --git a/src/lib.rs b/src/lib.rs
@@ -700,7 +700,7 @@ where
         let handle = self.dns_handle.ok_or(NetworkError::Unsupported)?;
         let dns_socket: &mut smoltcp::socket::dns::Socket = self.sockets.get_mut(handle);
         let context = self.network_interface.context();
-        let key = heapless::String::try_from(hostname).map_err(|_| NetworkError::Unsupported)?;
+        let key = heapless::String::from(hostname);
 
         if let Some(handle) = self.dns_lookups.get(&key) {
             match dns_socket.get_query_result(*handle) {
@@ -733,9 +733,10 @@ where
     }
 
     fn get_host_by_address(
-        &mut self,
+        &self,
         _addr: embedded_nal::IpAddr,
-    ) -> embedded_nal::nb::Result<embedded_nal::heapless::String<256>, Self::Error> {
+        _: &mut [u8],
+    ) -> Result<usize, Self::Error> {
         unimplemented!()
     }
 }
diff --git a/src/shared.rs b/src/shared.rs
@@ -99,7 +99,15 @@ where
     type Error = S::Error;
 
     forward! {get_host_by_name(hostname: &str, addr_type: embedded_nal::AddrType) -> embedded_nal::nb::Result<embedded_nal::IpAddr, Self::Error>}
-    forward! {get_host_by_address(addr: embedded_nal::IpAddr) -> embedded_nal::nb::Result<embedded_nal::heapless::String<256>, Self::Error>}
+
+    fn get_host_by_address(
+        &self,
+        addr: embedded_nal::IpAddr,
+        buf: &mut [u8],
+    ) -> Result<usize, Self::Error> {
+        self.mutex
+            .lock(|stack| stack.get_host_by_address(addr, buf))
+    }
 }
 
 impl<'a, Device, Clock> NetworkManager<'a, Device, Clock>