From e83671d0f6e1b95867ec11430a66ac02b4b9fbdb Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Sat, 24 Dec 2022 10:06:20 +0000 Subject: T4893: Move ppp-opt ipv6-intf-id to include section accel-ppp Move PPPoE-server ppp-options XML ipv6-intf-id to 'include' section accel-ppp It allows to use the same code for different accel-ppp services --- .../accel-ppp/ppp-options-ipv6-interface-id.xml.i | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i (limited to 'interface-definitions/include/accel-ppp') diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i new file mode 100644 index 000000000..9f5710fe4 --- /dev/null +++ b/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i @@ -0,0 +1,48 @@ + + + + Fixed or random interface identifier for IPv6 + + random + + + random + Random interface identifier for IPv6 + + + x:x:x:x + specify interface identifier for IPv6 + + + + + + Peer interface identifier for IPv6 + + random calling-sid ipv4 + + + x:x:x:x + Interface identifier for IPv6 + + + random + Use a random interface identifier for IPv6 + + + ipv4 + Calculate interface identifier from IPv4 address, for example 192:168:0:1 + + + calling-sid + Calculate interface identifier from calling-station-id + + + + + + Accept peer interface identifier + + + + -- cgit v1.2.3 From e471707ccff74c1bf500a43b5dfc47ffcf944644 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Sat, 24 Dec 2022 11:30:05 +0000 Subject: T4893: Add ppp-options ipv6-interface-id for L2TP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add ppp-options IPv6 interface id for vpn L2TP - fixed or random interface identifier for IPv6 - peer interface identifier for IPv6 - whether to accept peer’s interface identifier set vpn l2tp remote-access ppp-options ipv6-accept-peer-intf-id set vpn l2tp remote-access ppp-options ipv6-intf-id 'random' set vpn l2tp remote-access ppp-options ipv6-peer-intf-id 'calling-sid' --- data/templates/accel-ppp/l2tp.config.j2 | 8 +++++++- .../include/accel-ppp/ppp-options-ipv6-interface-id.xml.i | 8 +++++++- interface-definitions/vpn-l2tp.xml.in | 1 + src/conf_mode/vpn_l2tp.py | 12 ++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) (limited to 'interface-definitions/include/accel-ppp') diff --git a/data/templates/accel-ppp/l2tp.config.j2 b/data/templates/accel-ppp/l2tp.config.j2 index 3d1e835a9..5914fd375 100644 --- a/data/templates/accel-ppp/l2tp.config.j2 +++ b/data/templates/accel-ppp/l2tp.config.j2 @@ -126,7 +126,13 @@ ipv6={{ ppp_ipv6 }} {% else %} {{ 'ipv6=allow' if client_ipv6_pool_configured else '' }} {% endif %} - +{% if ppp_ipv6_intf_id is vyos_defined %} +ipv6-intf-id={{ ppp_ipv6_intf_id }} +{% endif %} +{% if ppp_ipv6_peer_intf_id is vyos_defined %} +ipv6-peer-intf-id={{ ppp_ipv6_peer_intf_id }} +{% endif %} +ipv6-accept-peer-intf-id={{ "1" if ppp_ipv6_accept_peer_intf_id else "0" }} {% if client_ipv6_pool %} [ipv6-pool] diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i index 9f5710fe4..265f7f97c 100644 --- a/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i +++ b/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i @@ -13,6 +13,9 @@ x:x:x:x specify interface identifier for IPv6 + + (random|((\d+){1,4}:){3}(\d+){1,4}) + @@ -37,12 +40,15 @@ calling-sid Calculate interface identifier from calling-station-id + + (random|calling-sid|ipv4|((\d+){1,4}:){3}(\d+){1,4}) + Accept peer interface identifier - + diff --git a/interface-definitions/vpn-l2tp.xml.in b/interface-definitions/vpn-l2tp.xml.in index 06ca4ece5..86aeb324e 100644 --- a/interface-definitions/vpn-l2tp.xml.in +++ b/interface-definitions/vpn-l2tp.xml.in @@ -251,6 +251,7 @@ #include #include + #include diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py index 27e78db99..65623c2b1 100755 --- a/src/conf_mode/vpn_l2tp.py +++ b/src/conf_mode/vpn_l2tp.py @@ -58,6 +58,9 @@ default_config_data = { 'ppp_echo_failure' : '3', 'ppp_echo_interval' : '30', 'ppp_echo_timeout': '0', + 'ppp_ipv6_accept_peer_intf_id': False, + 'ppp_ipv6_intf_id': None, + 'ppp_ipv6_peer_intf_id': None, 'radius_server': [], 'radius_acct_inter_jitter': '', 'radius_acct_tmo': '3', @@ -314,6 +317,15 @@ def get_config(config=None): if conf.exists(['ppp-options', 'ipv6']): l2tp['ppp_ipv6'] = conf.return_value(['ppp-options', 'ipv6']) + if conf.exists(['ppp-options', 'ipv6-accept-peer-intf-id']): + l2tp['ppp_ipv6_accept_peer_intf_id'] = True + + if conf.exists(['ppp-options', 'ipv6-intf-id']): + l2tp['ppp_ipv6_intf_id'] = conf.return_value(['ppp-options', 'ipv6-intf-id']) + + if conf.exists(['ppp-options', 'ipv6-peer-intf-id']): + l2tp['ppp_ipv6_peer_intf_id'] = conf.return_value(['ppp-options', 'ipv6-peer-intf-id']) + return l2tp -- cgit v1.2.3