diff options
Diffstat (limited to 'interface-definitions')
17 files changed, 58 insertions, 42 deletions
diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in index aaf8bb27d..07e63d54a 100644 --- a/interface-definitions/dns-forwarding.xml.in +++ b/interface-definitions/dns-forwarding.xml.in @@ -16,7 +16,7 @@ <children> <leafNode name="cache-size"> <properties> - <help>DNS forwarding cache size</help> + <help>DNS forwarding cache size (default: 10000)</help> <valueHelp> <format>0-10000</format> <description>DNS forwarding cache size</description> @@ -25,6 +25,7 @@ <validator name="numeric" argument="--range 0-10000"/> </constraint> </properties> + <defaultValue>10000</defaultValue> </leafNode> <leafNode name="dhcp"> <properties> @@ -37,7 +38,7 @@ </leafNode> <leafNode name="dnssec"> <properties> - <help>DNSSEC mode</help> + <help>DNSSEC mode (default: process-no-validate)</help> <completionHelp> <list>off process-no-validate process log-fail validate</list> </completionHelp> @@ -62,9 +63,10 @@ <description>Full blown DNSSEC validation. Send SERVFAIL to clients on bogus responses.</description> </valueHelp> <constraint> - <regex>(off|process-no-validate|process|log-fail|validate)</regex> + <regex>^(off|process-no-validate|process|log-fail|validate)$</regex> </constraint> </properties> + <defaultValue>process-no-validate</defaultValue> </leafNode> <tagNode name="domain"> <properties> @@ -146,7 +148,7 @@ </leafNode> <leafNode name="negative-ttl"> <properties> - <help>Maximum amount of time negative entries are cached</help> + <help>Maximum amount of time negative entries are cached (default: 3600)</help> <valueHelp> <format>0-7200</format> <description>Seconds to cache NXDOMAIN entries</description> @@ -155,6 +157,7 @@ <validator name="numeric" argument="--range 0-7200"/> </constraint> </properties> + <defaultValue>3600</defaultValue> </leafNode> <leafNode name="name-server"> <properties> diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.in b/interface-definitions/include/accel-client-ipv6-pool.xml.i index 455ada6ef..455ada6ef 100644 --- a/interface-definitions/include/accel-client-ipv6-pool.xml.in +++ b/interface-definitions/include/accel-client-ipv6-pool.xml.i diff --git a/interface-definitions/include/accel-name-server.xml.in b/interface-definitions/include/accel-name-server.xml.i index 82ed6771d..82ed6771d 100644 --- a/interface-definitions/include/accel-name-server.xml.in +++ b/interface-definitions/include/accel-name-server.xml.i diff --git a/interface-definitions/include/accel-radius-additions.xml.in b/interface-definitions/include/accel-radius-additions.xml.i index e37b68514..e37b68514 100644 --- a/interface-definitions/include/accel-radius-additions.xml.in +++ b/interface-definitions/include/accel-radius-additions.xml.i diff --git a/interface-definitions/include/interface-dial-on-demand.xml.i b/interface-definitions/include/interface-dial-on-demand.xml.i new file mode 100644 index 000000000..c14ddf6f5 --- /dev/null +++ b/interface-definitions/include/interface-dial-on-demand.xml.i @@ -0,0 +1,6 @@ +<leafNode name="connect-on-demand"> + <properties> + <help>Establishment connection automatically when traffic is sent</help> + <valueless/> + </properties> +</leafNode> diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index a6d7c81ce..cd0afe742 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -13,25 +13,26 @@ #include <include/dhcpv6-options.xml.i> #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> - <leafNode name="ethertype"> + <leafNode name="protocol"> <properties> - <help>Set Ethertype</help> + <help>Protocol used for service VLAN (default: 802.1ad)</help> <completionHelp> - <list>0x88A8 0x8100</list> + <list>802.1ad 802.1q</list> </completionHelp> <valueHelp> - <format>0x88A8</format> - <description>802.1ad</description> + <format>802.1ad</format> + <description>Provider Bridging (IEEE 802.1ad, Q-inQ), ethertype 0x88a8</description> </valueHelp> <valueHelp> - <format>0x8100</format> - <description>802.1q</description> + <format>802.1q</format> + <description>VLAN-tagged frame (IEEE 802.1q), ethertype 0x8100</description> </valueHelp> <constraint> - <regex>(0x88A8|0x8100)</regex> + <regex>(802.1q|802.1ad)</regex> </constraint> - <constraintErrorMessage>Ethertype must be 0x88A8 or 0x8100</constraintErrorMessage> + <constraintErrorMessage>Ethertype must be 802.1ad or 802.1q</constraintErrorMessage> </properties> + <defaultValue>802.1ad</defaultValue> </leafNode> <node name="ip"> <children> diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 5a4e52122..919e4d493 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -50,6 +50,7 @@ #include <include/interface-enable-arp-announce.xml.i> #include <include/interface-enable-arp-ignore.xml.i> #include <include/interface-enable-proxy-arp.xml.i> + #include <include/interface-proxy-arp-pvlan.xml.i> </children> </node> <node name="ipv6"> diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in index dfef387d2..9384726cc 100644 --- a/interface-definitions/interfaces-macsec.xml.in +++ b/interface-definitions/interfaces-macsec.xml.in @@ -107,8 +107,9 @@ </node> #include <include/interface-description.xml.i> #include <include/interface-disable.xml.i> - #include <include/interface-vrf.xml.i> + #include <include/interface-mtu-68-9000.xml.i> #include <include/source-interface-ethernet.xml.i> + #include <include/interface-vrf.xml.i> </children> </tagNode> </children> diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in index 905c76507..5675379d5 100644 --- a/interface-definitions/interfaces-openvpn.xml.in +++ b/interface-definitions/interfaces-openvpn.xml.in @@ -63,9 +63,13 @@ <properties> <help>Standard Data Encryption Algorithm</help> <completionHelp> - <list>des 3des bf128 bf256 aes128 aes128gcm aes192 aes192gcm aes256 aes256gcm</list> + <list>none des 3des bf128 bf256 aes128 aes128gcm aes192 aes192gcm aes256 aes256gcm</list> </completionHelp> <valueHelp> + <format>none</format> + <description>Disable encryption</description> + </valueHelp> + <valueHelp> <format>des</format> <description>DES algorithm</description> </valueHelp> @@ -106,7 +110,7 @@ <description>AES algorithm with 256-bit key GCM</description> </valueHelp> <constraint> - <regex>(des|3des|bf128|bf256|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)</regex> + <regex>(none|des|3des|bf128|bf256|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)</regex> </constraint> </properties> </leafNode> @@ -114,9 +118,13 @@ <properties> <help>Cipher negotiation list for use in server or client mode</help> <completionHelp> - <list>des 3des aes128 aes128gcm aes192 aes192gcm aes256 aes256gcm</list> + <list>none des 3des aes128 aes128gcm aes192 aes192gcm aes256 aes256gcm</list> </completionHelp> <valueHelp> + <format>none</format> + <description>Disable encryption</description> + </valueHelp> + <valueHelp> <format>des</format> <description>DES algorithm</description> </valueHelp> @@ -149,7 +157,7 @@ <description>AES algorithm with 256-bit key GCM</description> </valueHelp> <constraint> - <regex>(des|3des|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)</regex> + <regex>(none|des|3des|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)</regex> </constraint> <multi/> </properties> diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in index 8a6c61312..b6208e0b9 100644 --- a/interface-definitions/interfaces-pppoe.xml.in +++ b/interface-definitions/interfaces-pppoe.xml.in @@ -42,12 +42,7 @@ </leafNode> </children> </node> - <leafNode name="connect-on-demand"> - <properties> - <help>Automatic establishment of PPPOE connection when traffic is sent</help> - <valueless/> - </properties> - </leafNode> + #include <include/interface-dial-on-demand.xml.i> <leafNode name="default-route"> <properties> <help>Default route insertion behaviour (default: auto)</help> diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index a0caf810f..8c594e758 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -770,6 +770,12 @@ </leafNode> #include <include/vif.xml.i> #include <include/vif-s.xml.i> + <leafNode name="wds"> + <properties> + <help>Enable WDS (Wireless Distribution System)</help> + <valueless/> + </properties> + </leafNode> </children> </tagNode> </children> diff --git a/interface-definitions/interfaces-wirelessmodem.xml.in b/interface-definitions/interfaces-wirelessmodem.xml.in index d375b808d..96604ff00 100644 --- a/interface-definitions/interfaces-wirelessmodem.xml.in +++ b/interface-definitions/interfaces-wirelessmodem.xml.in @@ -80,12 +80,7 @@ <valueless/> </properties> </leafNode> - <leafNode name="ondemand"> - <properties> - <help>Only dial when traffic is available</help> - <valueless/> - </properties> - </leafNode> + #include <include/interface-dial-on-demand.xml.i> </children> </tagNode> </children> diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in index 9ee5d5156..ee09d01d6 100644 --- a/interface-definitions/service_ipoe-server.xml.in +++ b/interface-definitions/service_ipoe-server.xml.in @@ -111,8 +111,8 @@ </leafNode> </children> </tagNode> - #include <include/accel-name-server.xml.in> - #include <include/accel-client-ipv6-pool.xml.in> + #include <include/accel-name-server.xml.i> + #include <include/accel-client-ipv6-pool.xml.i> <node name="authentication"> <properties> <help>Client authentication methods</help> @@ -198,7 +198,7 @@ </children> </tagNode> #include <include/radius-server.xml.i> - #include <include/accel-radius-additions.xml.in> + #include <include/accel-radius-additions.xml.i> </children> </node> </children> diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 605f47b37..64fd6e4ef 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -109,7 +109,7 @@ </node> #include <include/accel-auth-mode.xml.i> #include <include/radius-server.xml.i> - #include <include/accel-radius-additions.xml.in> + #include <include/accel-radius-additions.xml.i> <node name="radius"> <children> <node name="rate-limit"> @@ -200,8 +200,8 @@ </leafNode> </children> </node> - #include <include/accel-client-ipv6-pool.xml.in> - #include <include/accel-name-server.xml.in> + #include <include/accel-client-ipv6-pool.xml.i> + #include <include/accel-name-server.xml.i> <tagNode name="interface"> <properties> <help>interface(s) to listen on</help> diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 702ef8b5a..4de28d2bd 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -36,7 +36,7 @@ </constraint> </properties> </leafNode> - #include <include/accel-name-server.xml.in> + #include <include/accel-name-server.xml.i> <node name="lns"> <properties> <help>L2TP Network Server (LNS)</help> @@ -203,7 +203,7 @@ </leafNode> </children> </node> - #include <include/accel-client-ipv6-pool.xml.in> + #include <include/accel-client-ipv6-pool.xml.i> <leafNode name="description"> <properties> <help>Description for L2TP remote-access settings</help> diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in index 032455b4d..f37c9bd01 100644 --- a/interface-definitions/vpn_pptp.xml.in +++ b/interface-definitions/vpn_pptp.xml.in @@ -153,7 +153,7 @@ </children> </node> #include <include/radius-server.xml.i> - #include <include/accel-radius-additions.xml.in> + #include <include/accel-radius-additions.xml.i> </children> </node> </children> diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index f0c93b882..5da2f8f24 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -96,7 +96,7 @@ </properties> </leafNode> #include <include/radius-server.xml.i> - #include <include/accel-radius-additions.xml.in> + #include <include/accel-radius-additions.xml.i> <node name="radius"> <children> <node name="rate-limit"> @@ -207,8 +207,8 @@ </leafNode> </children> </node> - #include <include/accel-client-ipv6-pool.xml.in> - #include <include/accel-name-server.xml.in> + #include <include/accel-client-ipv6-pool.xml.i> + #include <include/accel-name-server.xml.i> #include <include/interface-mtu-68-1500.xml.i> </children> </node> |