Skip to content

Expose netif DNS setting functions #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jothan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Expose netif DNS setting functions #495

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a8ed50
Expose the DNS setters.
jothan Sep 29, 2024
808a662
Expose the set_hostname function.
jothan Sep 29, 2024
1ca3cd5
Remove some potential panics.
jothan Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/netif.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ impl EspNetif {
};

if let Some(dns) = dns {
netif.set_dns(dns);
netif.set_dns(dns)?;

if dhcps {
#[cfg(esp_idf_version_major = "4")]
Expand All @@ -398,7 +398,7 @@ impl EspNetif {
}

if let Some(secondary_dns) = secondary_dns {
netif.set_secondary_dns(secondary_dns);
netif.set_secondary_dns(secondary_dns)?;
}

if let Some(hostname) = hostname {
Expand Down Expand Up @@ -479,7 +479,7 @@ impl EspNetif {
}
}

fn set_dns(&mut self, dns: ipv4::Ipv4Addr) {
pub fn set_dns(&mut self, dns: ipv4::Ipv4Addr) -> Result<(), EspError> {
let mut dns_info: esp_netif_dns_info_t = Default::default();

unsafe {
Expand All @@ -489,8 +489,8 @@ impl EspNetif {
self.handle,
esp_netif_dns_type_t_ESP_NETIF_DNS_MAIN,
&mut dns_info
))
.unwrap();
))?;
Ok(())
}
}

Expand All @@ -509,7 +509,7 @@ impl EspNetif {
}
}

fn set_secondary_dns(&mut self, secondary_dns: ipv4::Ipv4Addr) {
pub fn set_secondary_dns(&mut self, secondary_dns: ipv4::Ipv4Addr) -> Result<(), EspError> {
let mut dns_info: esp_netif_dns_info_t = Default::default();

unsafe {
Expand All @@ -519,8 +519,8 @@ impl EspNetif {
self.handle,
esp_netif_dns_type_t_ESP_NETIF_DNS_BACKUP,
&mut dns_info
))
.unwrap();
))?;
Ok(())
}
}

Expand All @@ -531,7 +531,7 @@ impl EspNetif {
Ok(unsafe { from_cstr_ptr(ptr) }.try_into().unwrap())
}

fn set_hostname(&mut self, hostname: &str) -> Result<(), EspError> {
pub fn set_hostname(&mut self, hostname: &str) -> Result<(), EspError> {
let hostname = to_cstring_arg(hostname)?;

esp!(unsafe { esp_netif_set_hostname(self.handle, hostname.as_ptr() as *const _) })?;
Expand Down