summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorViacheslav <v.gletenko@vyos.io>2021-11-02 13:48:36 +0000
committerChristian Poessinger <christian@poessinger.com>2021-11-03 19:57:38 +0100
commit2ed561e249e7f44d1269879bcf55cb83aee2324a (patch)
treeffae4c3fceea3b9829ae3ba29dede6b2bde879a3 /data
parentc605e211584b502c905d61bb48728889d992072b (diff)
downloadvyos-1x-2ed561e249e7f44d1269879bcf55cb83aee2324a.tar.gz
vyos-1x-2ed561e249e7f44d1269879bcf55cb83aee2324a.zip
sstp: T2566: Fix to allow IPv6 only pools
To allow IPv6 only for vpn sstp sessions we have to add 'ppp-options' which can disable IPv4 allocation explicity. Additional IPv6 ppp-options and fix template for it. (cherry picked from commit dd036c62d1370f655a8d2075577597f24ffff7dc)
Diffstat (limited to 'data')
-rw-r--r--data/templates/accel-ppp/config_ipv6_pool.j22
-rw-r--r--data/templates/accel-ppp/sstp.config.tmpl6
2 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/accel-ppp/config_ipv6_pool.j2 b/data/templates/accel-ppp/config_ipv6_pool.j2
index f45bf9442..093887f7e 100644
--- a/data/templates/accel-ppp/config_ipv6_pool.j2
+++ b/data/templates/accel-ppp/config_ipv6_pool.j2
@@ -5,7 +5,7 @@ AdvAutonomousFlag=1
{% if client_ipv6_pool.prefix is defined and client_ipv6_pool.prefix is not none %}
[ipv6-pool]
{% for prefix, options in client_ipv6_pool.prefix.items() %}
-{{ prefix }},{{ options.mask }}
+{{ prefix }},{{ '64 ' if options.mask is not defined else options.mask }}
{% endfor %}
{% if client_ipv6_pool.delegate is defined and client_ipv6_pool.delegate is not none %}
{% for prefix, options in client_ipv6_pool.delegate.items() %}
diff --git a/data/templates/accel-ppp/sstp.config.tmpl b/data/templates/accel-ppp/sstp.config.tmpl
index fad91d118..8fd7d230d 100644
--- a/data/templates/accel-ppp/sstp.config.tmpl
+++ b/data/templates/accel-ppp/sstp.config.tmpl
@@ -50,9 +50,9 @@ verbose=1
check-ip=1
{# MTU #}
mtu={{ mtu }}
-{% if client_ipv6_pool is defined %}
-ipv6=allow
-{% endif %}
+ipv6={{ 'allow' if ppp_options.ipv6 == "deny" and client_ipv6_pool is defined else ppp_options.ipv6 }}
+ipv4={{ ppp_options.ipv4 }}
+
mppe={{ ppp_options.mppe }}
lcp-echo-interval={{ ppp_options.lcp_echo_interval }}
lcp-echo-timeout={{ ppp_options.lcp_echo_timeout }}