Update smoltcp, embedded-nal-async to use the `core::net` IP addr types.

3 files changed, 14 insertions, 19 deletions

diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml
index 2e21b4231..a33c693fc 100644
--- a/embassy-net/Cargo.toml
+++ b/embassy-net/Cargo.toml
@@ -68,7 +68,7 @@ multicast = ["smoltcp/multicast"]
 defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 
-smoltcp = { git="https://github.com/smoltcp-rs/smoltcp", rev="dd43c8f189178b0ab3bda798ed8578b5b0a6f094", default-features = false, features = [
+smoltcp = { git="https://github.com/smoltcp-rs/smoltcp", rev="b65e1b64dc9b66fa984a2ad34e90685cb0b606de", default-features = false, features = [
   "socket",
   "async",
 ] }
@@ -80,5 +80,5 @@ embedded-io-async = { version = "0.6.1" }
 
 managed = { version = "0.8.0", default-features = false, features = [ "map" ] }
 heapless = { version = "0.8", default-features = false }
-embedded-nal-async = { version = "0.7.1" }
+embedded-nal-async = "0.8.0"
 document-features = "0.2.7"
diff --git a/embassy-net/src/dns.rs b/embassy-net/src/dns.rs
index 1fbaea4f0..dbe73776c 100644
--- a/embassy-net/src/dns.rs
+++ b/embassy-net/src/dns.rs
@@ -73,8 +73,11 @@ impl<'a> embedded_nal_async::Dns for DnsSocket<'a> {
         &self,
         host: &str,
         addr_type: embedded_nal_async::AddrType,
-    ) -> Result<embedded_nal_async::IpAddr, Self::Error> {
-        use embedded_nal_async::{AddrType, IpAddr};
+    ) -> Result<core::net::IpAddr, Self::Error> {
+        use core::net::IpAddr;
+
+        use embedded_nal_async::AddrType;
+
         let (qtype, secondary_qtype) = match addr_type {
             AddrType::IPv4 => (DnsQueryType::A, None),
             AddrType::IPv6 => (DnsQueryType::Aaaa, None),
@@ -98,20 +101,16 @@ impl<'a> embedded_nal_async::Dns for DnsSocket<'a> {
         if let Some(first) = addrs.get(0) {
             Ok(match first {
                 #[cfg(feature = "proto-ipv4")]
-                IpAddress::Ipv4(addr) => IpAddr::V4(addr.0.into()),
+                IpAddress::Ipv4(addr) => IpAddr::V4(*addr),
                 #[cfg(feature = "proto-ipv6")]
-                IpAddress::Ipv6(addr) => IpAddr::V6(addr.0.into()),
+                IpAddress::Ipv6(addr) => IpAddr::V6(*addr),
             })
         } else {
             Err(Error::Failed)
         }
     }
 
-    async fn get_host_by_address(
-        &self,
-        _addr: embedded_nal_async::IpAddr,
-        _result: &mut [u8],
-    ) -> Result<usize, Self::Error> {
+    async fn get_host_by_address(&self, _addr: core::net::IpAddr, _result: &mut [u8]) -> Result<usize, Self::Error> {
         todo!()
     }
 }
diff --git a/embassy-net/src/tcp.rs b/embassy-net/src/tcp.rs
index bcddbc95b..1bd582b65 100644
--- a/embassy-net/src/tcp.rs
+++ b/embassy-net/src/tcp.rs
@@ -675,10 +675,9 @@ mod embedded_io_impls {
 pub mod client {
     use core::cell::{Cell, UnsafeCell};
     use core::mem::MaybeUninit;
+    use core::net::IpAddr;
     use core::ptr::NonNull;
 
-    use embedded_nal_async::IpAddr;
-
     use super::*;
 
     /// TCP client connection pool compatible with `embedded-nal-async` traits.
@@ -715,17 +714,14 @@ pub mod client {
         type Error = Error;
         type Connection<'m> = TcpConnection<'m, N, TX_SZ, RX_SZ> where Self: 'm;
 
-        async fn connect<'a>(
-            &'a self,
-            remote: embedded_nal_async::SocketAddr,
-        ) -> Result<Self::Connection<'a>, Self::Error> {
+        async fn connect<'a>(&'a self, remote: core::net::SocketAddr) -> Result<Self::Connection<'a>, Self::Error> {
             let addr: crate::IpAddress = match remote.ip() {
                 #[cfg(feature = "proto-ipv4")]
-                IpAddr::V4(addr) => crate::IpAddress::Ipv4(crate::Ipv4Address::from_bytes(&addr.octets())),
+                IpAddr::V4(addr) => crate::IpAddress::Ipv4(addr),
                 #[cfg(not(feature = "proto-ipv4"))]
                 IpAddr::V4(_) => panic!("ipv4 support not enabled"),
                 #[cfg(feature = "proto-ipv6")]
-                IpAddr::V6(addr) => crate::IpAddress::Ipv6(crate::Ipv6Address::from_bytes(&addr.octets())),
+                IpAddr::V6(addr) => crate::IpAddress::Ipv6(addr),
                 #[cfg(not(feature = "proto-ipv6"))]
                 IpAddr::V6(_) => panic!("ipv6 support not enabled"),
             };