summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-05-19 17:12:51 +0200
committerChristian Poessinger <christian@poessinger.com>2020-05-19 17:13:08 +0200
commit5cbdffd3c1bd3eedc1b17010964dc69be6962349 (patch)
tree5f1babafdbdafa8fab876fee3e19da46a7807687
parent6e77c5b73eb040e3a9adb35b10c42ea2117f655a (diff)
downloadvyos-1x-5cbdffd3c1bd3eedc1b17010964dc69be6962349.tar.gz
vyos-1x-5cbdffd3c1bd3eedc1b17010964dc69be6962349.zip
dhcpv6-server: T815: support delegating IPv6 prefixes
-rw-r--r--data/templates/dhcpv6-server/dhcpdv6.conf.tmpl3
-rwxr-xr-xsrc/conf_mode/dhcpv6_server.py32
2 files changed, 31 insertions, 4 deletions
diff --git a/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl b/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
index d6b0ae935..ff7822b0d 100644
--- a/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
+++ b/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
@@ -56,6 +56,9 @@ shared-network {{ network.name }} {
{%- if subnet.sntp_server %}
option dhcp6.sntp-servers {{ subnet.sntp_server | join(', ') }};
{%- endif %}
+ {%- for prefix in subnet.prefix_delegation %}
+ prefix6 {{ prefix.start }} {{ prefix.stop }} /{{ prefix.length }};
+ {%- endfor %}
{%- for host in subnet.static_mapping %}
{% if not host.disabled -%}
host {{ network.name }}_{{ host.name }} {
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index 159d16401..9e24ee591 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -85,6 +85,7 @@ def get_config():
'nis_server': [],
'nisp_domain': '',
'nisp_server': [],
+ 'prefix_delegation': [],
'sip_address': [],
'sip_hostname': [],
'sntp_server': [],
@@ -161,10 +162,6 @@ def get_config():
if conf.exists(['nisplus-server']):
subnet['nisp_server'] = conf.return_values(['nisplus-server'])
- # Prefix Delegation (RFC 3633)
- if conf.exists(['prefix-delegation']):
- print('TODO: This option is actually not implemented right now!')
-
# Local SIP server that is to be used for all outbound SIP requests - IPv6 address
if conf.exists(['sip-server']):
for value in conf.return_values(['sip-server']):
@@ -177,9 +174,28 @@ def get_config():
if conf.exists(['sntp-server']):
subnet['sntp_server'] = conf.return_values(['sntp-server'])
+ # Prefix Delegation (RFC 3633)
+ if conf.exists(['prefix-delegation', 'start']):
+ for address in conf.list_nodes(['prefix-delegation', 'start']):
+ conf.set_level(base + ['shared-network-name', network, 'subnet', net, 'prefix-delegation', 'start', address])
+ prefix = {
+ 'start' : address,
+ 'stop' : '',
+ 'length' : ''
+ }
+
+ if conf.exists(['prefix-length']):
+ prefix['length'] = conf.return_value(['prefix-length'])
+
+ if conf.exists(['stop']):
+ prefix['stop'] = conf.return_value(['stop'])
+
+ subnet['prefix_delegation'].append(prefix)
+
#
# Static DHCP v6 leases
#
+ conf.set_level(base + ['shared-network-name', network, 'subnet', net])
if conf.exists(['static-mapping']):
for mapping in conf.list_nodes(['static-mapping']):
conf.set_level(base + ['shared-network-name', network, 'subnet', net, 'static-mapping', mapping])
@@ -280,6 +296,14 @@ def verify(dhcpv6):
else:
range6_stop.append(stop)
+ # Prefix delegation sanity checks
+ for prefix in subnet['prefix_delegation']:
+ if not prefix['stop']:
+ raise ConfigError('Stop address of delegated IPv6 prefix range must be configured')
+
+ if not prefix['length']:
+ raise ConfigError('Length of delegated IPv6 prefix must be configured')
+
# We also have prefixes that require checking
for prefix in subnet['range6_prefix']:
# If configured prefix does not match our subnet, we have to check that it's inside