max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add extra feature flags to fix build without dhcp.

Browse Source
This commit is contained in:
Roy Buitenhuis 2023-04-18 22:11:15 +02:00
parent bfa3cbaf30
commit a2ac1eed1b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
embassy-net/src/lib.rs
View File

@ -27,12 +27,10 @@ use embassy_sync::waitqueue::WakerRegistration;
use embassy_time::{Instant, Timer}; use embassy_time::{Instant, Timer};
use futures::pin_mut; use futures::pin_mut;
use heapless::Vec; use heapless::Vec;
use smoltcp::iface::{Interface, SocketHandle, SocketSet, SocketStorage};
#[cfg(feature = "dhcpv4")] #[cfg(feature = "dhcpv4")]
use smoltcp::iface::SocketHandle; use smoltcp::socket::dhcpv4::{self, RetryConfig};
use smoltcp::iface::{Interface, SocketSet, SocketStorage};
#[cfg(feature = "dhcpv4")] #[cfg(feature = "dhcpv4")]
use smoltcp::socket::dhcpv4;
use smoltcp::socket::dhcpv4::RetryConfig;
use smoltcp::time::Duration; use smoltcp::time::Duration;
// smoltcp reexports // smoltcp reexports
pub use smoltcp::time::{Duration as SmolDuration, Instant as SmolInstant}; pub use smoltcp::time::{Duration as SmolDuration, Instant as SmolInstant};
@ -76,6 +74,7 @@ pub struct StaticConfig {
pub dns_servers: Vec<Ipv4Address, 3>, pub dns_servers: Vec<Ipv4Address, 3>,
} }
#[cfg(feature = "dhcpv4")]
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct DhcpConfig { pub struct DhcpConfig {
pub max_lease_duration: Option<Duration>, pub max_lease_duration: Option<Duration>,
@ -88,6 +87,7 @@ pub struct DhcpConfig {
pub client_port: u16, pub client_port: u16,
} }
#[cfg(feature = "dhcpv4")]
impl Default for DhcpConfig { impl Default for DhcpConfig {
fn default() -> Self { fn default() -> Self {
Self { Self {
@ -384,6 +384,7 @@ impl<D: Driver + 'static> Inner<D> {
self.config = Some(config) self.config = Some(config)
} }
#[cfg(feature = "dhcpv4")]
fn apply_dhcp_config(&self, socket: &mut smoltcp::socket::dhcpv4::Socket, config: DhcpConfig) { fn apply_dhcp_config(&self, socket: &mut smoltcp::socket::dhcpv4::Socket, config: DhcpConfig) {
socket.set_ignore_naks(config.ignore_naks); socket.set_ignore_naks(config.ignore_naks);
socket.set_max_lease_duration(config.max_lease_duration); socket.set_max_lease_duration(config.max_lease_duration);