diff options
| author | Viacheslav <v.gletenko@vyos.io> | 2021-06-22 12:16:51 +0000 |
|---|---|---|
| committer | Viacheslav <v.gletenko@vyos.io> | 2021-06-22 12:24:17 +0000 |
| commit | b6d2abba08ef0a1475e890d534d32a477dc97811 (patch) | |
| tree | b777b2906b21ca0454178f0b366a0e66ec8065a3 | |
| parent | 395595f832ac67a26d6b898b7df8f5a5913de951 (diff) | |
| download | vyos-1x-b6d2abba08ef0a1475e890d534d32a477dc97811.tar.gz vyos-1x-b6d2abba08ef0a1475e890d534d32a477dc97811.zip | |
sstp-l2tp: T3636: Add ipv6 options
| -rw-r--r-- | interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i | 30 | ||||
| -rw-r--r-- | interface-definitions/service_pppoe-server.xml.in | 29 | ||||
| -rw-r--r-- | interface-definitions/vpn_l2tp.xml.in | 1 | ||||
| -rw-r--r-- | interface-definitions/vpn_sstp.xml.in | 1 |
4 files changed, 33 insertions, 28 deletions
diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i new file mode 100644 index 000000000..cd40a1f96 --- /dev/null +++ b/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i @@ -0,0 +1,30 @@ +<!-- include start from accel-ppp/ppp-options-ipv6.xml.i --> +<leafNode name="ipv6"> + <properties> + <help>IPv6 (IPCP6) negotiation algorithm</help> + <constraint> + <regex>^(deny|allow|prefer|require)$</regex> + </constraint> + <constraintErrorMessage>invalid value</constraintErrorMessage> + <valueHelp> + <format>deny</format> + <description>Do not negotiate IPv6</description> + </valueHelp> + <valueHelp> + <format>allow</format> + <description>Negotiate IPv6 only if client requests</description> + </valueHelp> + <valueHelp> + <format>prefer</format> + <description>Ask client for IPv6 negotiation, do not fail if it rejects</description> + </valueHelp> + <valueHelp> + <format>require</format> + <description>Require IPv6 negotiation</description> + </valueHelp> + <completionHelp> + <list>deny allow prefer require</list> + </completionHelp> + </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 9d0f887a9..788683868 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -192,34 +192,7 @@ </completionHelp> </properties> </leafNode> - <leafNode name="ipv6"> - <properties> - <help>IPv6 (IPCP6) negotiation algorithm</help> - <constraint> - <regex>^(deny|allow|prefer|require)$</regex> - </constraint> - <constraintErrorMessage>invalid value</constraintErrorMessage> - <valueHelp> - <format>deny</format> - <description>Do not negotiate IPv6</description> - </valueHelp> - <valueHelp> - <format>allow</format> - <description>Negotiate IPv6 only if client requests</description> - </valueHelp> - <valueHelp> - <format>prefer</format> - <description>Ask client for IPv6 negotiation, do not fail if it rejects</description> - </valueHelp> - <valueHelp> - <format>require</format> - <description>Require IPv6 negotiation</description> - </valueHelp> - <completionHelp> - <list>deny allow prefer require</list> - </completionHelp> - </properties> - </leafNode> + #include <include/accel-ppp/ppp-options-ipv6.xml.i> <leafNode name="ipv6-intf-id"> <properties> <help>Fixed or random interface identifier for IPv6</help> diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 5bdebcb05..4fbf3fa44 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -308,6 +308,7 @@ </properties> <children> #include <include/accel-ppp/lcp-echo-interval-failure.xml.i> + #include <include/accel-ppp/ppp-options-ipv6.xml.i> </children> </node> </children> diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index e4ade844d..c09603028 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -43,6 +43,7 @@ </properties> <children> #include <include/accel-ppp/ppp-mppe.xml.i> + #include <include/accel-ppp/ppp-options-ipv6.xml.i> #include <include/accel-ppp/lcp-echo-interval-failure.xml.i> #include <include/accel-ppp/lcp-echo-timeout.xml.i> </children> |