diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-08-26 20:09:44 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-08-26 20:09:44 +0200 |
| commit | 1bb1a388dba4b2e21ca20de78317d853bea10845 (patch) | |
| tree | 66ff083fb089f68e7bdab9a89c22a2b7ba3534a2 | |
| parent | ff0bdfbc523ac8dbcb885361f06c6a329ca502cb (diff) | |
| download | vyos-1x-1bb1a388dba4b2e21ca20de78317d853bea10845.tar.gz vyos-1x-1bb1a388dba4b2e21ca20de78317d853bea10845.zip | |
pppoe-server: T2829: 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
}
}
| -rw-r--r-- | interface-definitions/pppoe-server.xml | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml index 331f03b1f..e77886e4d 100644 --- a/interface-definitions/pppoe-server.xml +++ b/interface-definitions/pppoe-server.xml @@ -445,34 +445,32 @@ <leafNode name="ccp"> <properties> <help>CCP negotiation (default disabled)</help> - <valueless /> + <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 don't 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> |