From b6c343c363bf471fc78bd8dec885c88f1dd90cb5 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 26 May 2024 08:53:13 +0200 Subject: Revert "dhcpv6-server: T3493: adds prefix range validation" This reverts the prefix start/stop address must be inside network part from commit 4cde0b8ce778d269d3fe1d4f33ba5b2caf424181. --- src/conf_mode/service_dhcpv6-server.py | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src') diff --git a/src/conf_mode/service_dhcpv6-server.py b/src/conf_mode/service_dhcpv6-server.py index 36b2d8b08..560251336 100755 --- a/src/conf_mode/service_dhcpv6-server.py +++ b/src/conf_mode/service_dhcpv6-server.py @@ -113,29 +113,11 @@ def verify(dhcpv6): raise ConfigError('prefix-delegation start address not defined!') for prefix, prefix_config in subnet_config['prefix_delegation']['start'].items(): - prefix_start_addr = prefix - - # Prefix start address must be inside network - if not ip_address(prefix_start_addr) in ip_network(subnet): - raise ConfigError(f'Prefix delegation start address '\ - f'"{prefix_start_addr}" is not in '\ - f'subnet "{subnet}"') - if 'stop' not in prefix_config: raise ConfigError(f'Stop address of delegated IPv6 '\ f'prefix range "{prefix}" '\ f'must be configured') - if 'stop' in prefix_config: - prefix_stop_addr = prefix_config['stop'] - - # Prefix stop address must be inside network - if not (ip_address(prefix_stop_addr) in - ip_network(subnet)): - raise ConfigError(f'Prefix delegation stop '\ - f'address "{prefix_stop_addr}" '\ - f'is not in subnet "{subnet}"') - if 'prefix_length' not in prefix_config: raise ConfigError(f'Length of delegated IPv6 prefix '\ f'must be configured') -- cgit v1.2.3