summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-05-26 08:53:13 +0200
committerChristian Breunig <christian@breunig.cc>2024-05-26 08:53:13 +0200
commitb6c343c363bf471fc78bd8dec885c88f1dd90cb5 (patch)
tree056b834fa2b0c34bccb9ffe5a55a559f7b386bb9
parentc15ee875a6ed6d2f053ad0dd6d576b93a6ea858f (diff)
downloadvyos-1x-b6c343c363bf471fc78bd8dec885c88f1dd90cb5.tar.gz
vyos-1x-b6c343c363bf471fc78bd8dec885c88f1dd90cb5.zip
Revert "dhcpv6-server: T3493: adds prefix range validation"
This reverts the prefix start/stop address must be inside network part from commit 4cde0b8ce778d269d3fe1d4f33ba5b2caf424181.
-rwxr-xr-xsrc/conf_mode/service_dhcpv6-server.py18
1 files changed, 0 insertions, 18 deletions
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')