diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-12-24 11:30:05 +0000 |
|---|---|---|
| committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-12-30 18:53:00 +0000 |
| commit | e471707ccff74c1bf500a43b5dfc47ffcf944644 (patch) | |
| tree | 28203b66e9734523c659342edf152b6db8a5fa6a /interface-definitions | |
| parent | e83671d0f6e1b95867ec11430a66ac02b4b9fbdb (diff) | |
| download | vyos-1x-e471707ccff74c1bf500a43b5dfc47ffcf944644.tar.gz vyos-1x-e471707ccff74c1bf500a43b5dfc47ffcf944644.zip | |
T4893: Add ppp-options ipv6-interface-id for L2TP
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'
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i | 8 | ||||
| -rw-r--r-- | interface-definitions/vpn-l2tp.xml.in | 1 |
2 files changed, 8 insertions, 1 deletions
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 @@ <format>x:x:x:x</format> <description>specify interface identifier for IPv6</description> </valueHelp> + <constraint> + <regex>(random|((\d+){1,4}:){3}(\d+){1,4})</regex> + </constraint> </properties> </leafNode> <leafNode name="ipv6-peer-intf-id"> @@ -37,12 +40,15 @@ <format>calling-sid</format> <description>Calculate interface identifier from calling-station-id</description> </valueHelp> + <constraint> + <regex>(random|calling-sid|ipv4|((\d+){1,4}:){3}(\d+){1,4})</regex> + </constraint> </properties> </leafNode> <leafNode name="ipv6-accept-peer-intf-id"> <properties> <help>Accept peer interface identifier</help> - <valueless /> + <valueless/> </properties> </leafNode> <!-- include end --> 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 @@ <children> #include <include/accel-ppp/lcp-echo-interval-failure.xml.i> #include <include/accel-ppp/ppp-options-ipv6.xml.i> + #include <include/accel-ppp/ppp-options-ipv6-interface-id.xml.i> </children> </node> </children> |