summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Isalski <git@maz.nu>2021-08-06 14:44:48 +0100
committerChristian Poessinger <christian@poessinger.com>2021-10-16 19:01:15 +0200
commit3d00140453b3967370c77ddd9dac4af223a7ddce (patch)
treee22d6db2e6d249687a37a1443aafc5b82c3a3660
parenta98efc300c45cbfdd9b5c34561737909a77ecb22 (diff)
downloadvyos-1x-3d00140453b3967370c77ddd9dac4af223a7ddce.tar.gz
vyos-1x-3d00140453b3967370c77ddd9dac4af223a7ddce.zip
l2tp: T3724: allow setting accel-ppp l2tp host-name
-rw-r--r--data/templates/accel-ppp/l2tp.config.tmpl3
-rw-r--r--interface-definitions/vpn_l2tp.xml.in5
-rwxr-xr-xsrc/conf_mode/vpn_l2tp.py2
3 files changed, 10 insertions, 0 deletions
diff --git a/data/templates/accel-ppp/l2tp.config.tmpl b/data/templates/accel-ppp/l2tp.config.tmpl
index 44c96b935..9fcda76d4 100644
--- a/data/templates/accel-ppp/l2tp.config.tmpl
+++ b/data/templates/accel-ppp/l2tp.config.tmpl
@@ -57,6 +57,9 @@ bind={{ outside_addr }}
{% if lns_shared_secret %}
secret={{ lns_shared_secret }}
{% endif %}
+{% if lns_host_name %}
+host-name={{ lns_host_name }}
+{% endif %}
[client-ip-range]
0.0.0.0/0
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index cbd5e38e7..6cb0d4544 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -34,6 +34,11 @@
<help>Tunnel password used to authenticate the client (LAC)</help>
</properties>
</leafNode>
+ <leafNode name="host-name">
+ <properties>
+ <help>Sent to the client (LAC) in the Host-Name attribute</help>
+ </properties>
+ </leafNode>
</children>
</node>
<leafNode name="ccp-disable">
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index 9c52f77ca..818e8fa0b 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -290,6 +290,8 @@ def get_config(config=None):
# LNS secret
if conf.exists(['lns', 'shared-secret']):
l2tp['lns_shared_secret'] = conf.return_value(['lns', 'shared-secret'])
+ if conf.exists(['lns', 'host-name']):
+ l2tp['lns_host_name'] = conf.return_value(['lns', 'host-name'])
if conf.exists(['ccp-disable']):
l2tp['ccp_disable'] = True