NationTech/harmony
6
0
Fork 1
Code Issues 35 Pull Requests 6 Actions Packages Projects Releases 1 Wiki Activity

Merge pull request 'feat: don't crash if ip:mac already exist, just skip it' (#7) from feat/validateExistingStaticLease into master

Browse Source 
Reviewed-on: https://git.nationtech.io/NationTech/harmony/pulls/7
This commit is contained in:
johnride 2024-12-18 17:46:25 +00:00
commit b098757683
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
harmony-rs/opnsense-config/src/modules/dhcp.rs
View File

@ -1,3 +1,4 @@
use log::info;
use opnsense_config_xml::MaybeString; use opnsense_config_xml::MaybeString;
use opnsense_config_xml::Range; use opnsense_config_xml::Range;
use opnsense_config_xml::StaticMap; use opnsense_config_xml::StaticMap;
@ -93,6 +94,21 @@ impl<'a> DhcpConfig<'a> {
// return Err(DhcpError::IpAddressOutOfRange(ipaddr.to_string())); // return Err(DhcpError::IpAddressOutOfRange(ipaddr.to_string()));
// } // }
if existing_mappings.iter().any(|m| {
m.ipaddr
.parse::<Ipv4Addr>()
.expect("Mapping contains invalid ipv4")
== ipaddr
&& m.mac == mac
}) {
info!(
"Mapping already exists for {} [{}], skipping",
ipaddr.to_string(),
mac
);
return Ok(());
}
if existing_mappings.iter().any(|m| { if existing_mappings.iter().any(|m| {
m.ipaddr m.ipaddr
.parse::<Ipv4Addr>() .parse::<Ipv4Addr>()