diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-10-06 23:47:43 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2024-10-07 00:22:44 +0200 |
| commit | f6155cf735678fa1e297baa4ace992af3a871ae7 (patch) | |
| tree | 21c8d87ca763471360fef1c4c8ea448784ccb4e6 /examples/nrf9160 | |
| parent | 631fec8d092b247b02d4279b8087cceb49146575 (diff) | |
Update smoltcp, embedded-nal-async to use the `core::net` IP addr types.
Diffstat (limited to 'examples/nrf9160')
| -rw-r--r-- | examples/nrf9160/src/bin/modem_tcp_client.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/examples/nrf9160/src/bin/modem_tcp_client.rs b/examples/nrf9160/src/bin/modem_tcp_client.rs index 495ee26dd..067ec4276 100644 --- a/examples/nrf9160/src/bin/modem_tcp_client.rs +++ b/examples/nrf9160/src/bin/modem_tcp_client.rs | |||
| @@ -9,7 +9,7 @@ use core::str::FromStr; | |||
| 9 | 9 | ||
| 10 | use defmt::{info, unwrap, warn}; | 10 | use defmt::{info, unwrap, warn}; |
| 11 | use embassy_executor::Spawner; | 11 | use embassy_executor::Spawner; |
| 12 | use embassy_net::{Ipv4Address, Ipv4Cidr, Stack, StackResources}; | 12 | use embassy_net::{Ipv4Cidr, Stack, StackResources}; |
| 13 | use embassy_net_nrf91::context::Status; | 13 | use embassy_net_nrf91::context::Status; |
| 14 | use embassy_net_nrf91::{context, Runner, State, TraceBuffer, TraceReader}; | 14 | use embassy_net_nrf91::{context, Runner, State, TraceBuffer, TraceReader}; |
| 15 | use embassy_nrf::buffered_uarte::{self, BufferedUarteTx}; | 15 | use embassy_nrf::buffered_uarte::{self, BufferedUarteTx}; |
| @@ -70,18 +70,16 @@ fn status_to_config(status: &Status) -> embassy_net::ConfigV4 { | |||
| 70 | let Some(IpAddr::V4(addr)) = status.ip else { | 70 | let Some(IpAddr::V4(addr)) = status.ip else { |
| 71 | panic!("Unexpected IP address"); | 71 | panic!("Unexpected IP address"); |
| 72 | }; | 72 | }; |
| 73 | let addr = Ipv4Address(addr.octets()); | ||
| 74 | 73 | ||
| 75 | let gateway = if let Some(IpAddr::V4(addr)) = status.gateway { | 74 | let gateway = match status.gateway { |
| 76 | Some(Ipv4Address(addr.octets())) | 75 | Some(IpAddr::V4(addr)) => Some(addr), |
| 77 | } else { | 76 | _ => None, |
| 78 | None | ||
| 79 | }; | 77 | }; |
| 80 | 78 | ||
| 81 | let mut dns_servers = Vec::new(); | 79 | let mut dns_servers = Vec::new(); |
| 82 | for dns in status.dns.iter() { | 80 | for dns in status.dns.iter() { |
| 83 | if let IpAddr::V4(ip) = dns { | 81 | if let IpAddr::V4(ip) = dns { |
| 84 | unwrap!(dns_servers.push(Ipv4Address(ip.octets()))); | 82 | unwrap!(dns_servers.push(*ip)); |
| 85 | } | 83 | } |
| 86 | } | 84 | } |
| 87 | 85 | ||
