diff options
| author | Marek Isalski <git@maz.nu> | 2021-08-06 14:44:48 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-11-15 21:25:18 +0100 |
| commit | ef392ba9715290a5b8e8b619fc19e708fe7e442b (patch) | |
| tree | 4a5c73bbde1b0648a3ac1e9960ccabe42d95d069 | |
| parent | af1cfebaff5e98cf0e50325863def209f965abd4 (diff) | |
| download | vyos-1x-ef392ba9715290a5b8e8b619fc19e708fe7e442b.tar.gz vyos-1x-ef392ba9715290a5b8e8b619fc19e708fe7e442b.zip | |
l2tp: T3724: allow setting accel-ppp l2tp host-name
(cherry picked from commit 3d00140453b3967370c77ddd9dac4af223a7ddce)
| -rw-r--r-- | data/templates/accel-ppp/l2tp.config.tmpl | 3 | ||||
| -rw-r--r-- | interface-definitions/vpn_l2tp.xml.in | 5 | ||||
| -rwxr-xr-x | src/conf_mode/vpn_l2tp.py | 2 |
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 070a966b7..a2a2382fa 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 8bcede159..ff3219866 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -33,6 +33,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 e970d2ef5..86aa9af09 100755 --- a/src/conf_mode/vpn_l2tp.py +++ b/src/conf_mode/vpn_l2tp.py @@ -291,6 +291,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 |