summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-08-26 20:00:14 +0200
committerChristian Poessinger <christian@poessinger.com>2020-08-26 20:01:19 +0200
commit12f566f4566c8ef115b15f0c11280cb3ea9a7673 (patch)
tree98359409a42b1286b7d50b20f8af452a6efa6bbf /interface-definitions
parent2822a43dfa151ab577cb4d9d22f33247784cac13 (diff)
downloadvyos-1x-12f566f4566c8ef115b15f0c11280cb3ea9a7673.tar.gz
vyos-1x-12f566f4566c8ef115b15f0c11280cb3ea9a7673.zip
pppoe-server: bugfix MPPE node definition
PPPoE server supports setting the MPPE preferences, it is implemented as node with leafNodes for require, prefer and deny. This will render a wrong AccelPPP configuration as it will be "None" if specified. pppoe-server { ppp-options { mppe { deny require } } } instead it must be: pppoe-server { ppp-options { mppe require } }
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/service_pppoe-server.xml.in42
1 files changed, 20 insertions, 22 deletions
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index c7ba2617a..605f47b37 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -311,31 +311,29 @@
<valueless />
</properties>
</leafNode>
- <node name="mppe">
+ <leafNode name="mppe">
<properties>
<help>Specifies MPPE negotiation preference. (default prefer mppe)</help>
+ <completionHelp>
+ <list>deny prefer require</list>
+ </completionHelp>
+ <valueHelp>
+ <format>deny</format>
+ <description>Deny MPPE</description>
+ </valueHelp>
+ <valueHelp>
+ <format>prefer</format>
+ <description>Ask client for MPPE - do not fail on reject</description>
+ </valueHelp>
+ <valueHelp>
+ <format>require</format>
+ <description>Ask client for MPPE - drop connection on reject</description>
+ </valueHelp>
+ <constraint>
+ <regex>^(deny|prefer|require)$</regex>
+ </constraint>
</properties>
- <children>
- <leafNode name="require">
- <properties>
- <help>Ask client for MPPE, if it rejects then drop the connection</help>
- <valueless />
- </properties>
- </leafNode>
- <leafNode name="prefer">
- <properties>
- <help>Ask client for MPPE, if it rejects do not fail</help>
- <valueless />
- </properties>
- </leafNode>
- <leafNode name="deny">
- <properties>
- <help>Deny MPPE</help>
- <valueless />
- </properties>
- </leafNode>
- </children>
- </node>
+ </leafNode>
<leafNode name="lcp-echo-interval">
<properties>
<help>LCP echo-requests/sec</help>