From 62a8ef29d6238d5b777c3e946c132aca16a813c3 Mon Sep 17 00:00:00 2001 From: Jose Phillips Date: Tue, 16 Jan 2024 23:35:14 -0500 Subject: dhcp: T5952: Fix validate duplicate MAC Address on same subnet --- src/conf_mode/service_dhcp-server.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/conf_mode/service_dhcp-server.py') diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py index 2418c8faa..b11fa7c1a 100755 --- a/src/conf_mode/service_dhcp-server.py +++ b/src/conf_mode/service_dhcp-server.py @@ -233,6 +233,7 @@ def verify(dhcp): if 'static_mapping' in subnet_config: # Static mappings require just a MAC address (will use an IP from the dynamic pool if IP is not set) used_ips = [] + used_mac = [] for mapping, mapping_config in subnet_config['static_mapping'].items(): if 'ip_address' in mapping_config: if ip_address(mapping_config['ip_address']) not in ip_network(subnet): @@ -247,7 +248,11 @@ def verify(dhcp): if mapping_config['ip_address'] in used_ips: raise ConfigError(f'Configured IP address for static mapping "{mapping}" exists on another static mapping') + if mapping_config['mac'] in used_mac: + raise ConfigError(f'Configured MAC address for static mapping "{mapping}" exists on another static mapping') + used_ips.append(mapping_config['ip_address']) + used_mac.append(mapping_config['mac']) # There must be one subnet connected to a listen interface. # This only counts if the network itself is not disabled! -- cgit v1.2.3