diff options
| author | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-20 11:59:32 +0200 |
|---|---|---|
| committer | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-20 11:59:32 +0200 |
| commit | 45b30adfaaec7065f768d04085138a75a76ed376 (patch) | |
| tree | a9cd47236468077141eee56068ba23027b0d4c7d /interface-definitions | |
| parent | 46fb580fa0131f6815bbcfc95631654f6fe999a8 (diff) | |
| parent | e0797331774a02ca23e8363fbcfe5a49fb3ca2bd (diff) | |
| download | vyos-1x-45b30adfaaec7065f768d04085138a75a76ed376.tar.gz vyos-1x-45b30adfaaec7065f768d04085138a75a76ed376.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dns-dynamic.xml.in | 1 | ||||
| -rw-r--r-- | interface-definitions/interfaces-bonding.xml.in | 13 | ||||
| -rw-r--r-- | interface-definitions/interfaces-ethernet.xml.in | 31 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireless.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/vpn_openconnect.xml.in (renamed from interface-definitions/vpn_anyconnect.xml.in) | 4 |
5 files changed, 47 insertions, 4 deletions
diff --git a/interface-definitions/dns-dynamic.xml.in b/interface-definitions/dns-dynamic.xml.in index 143c04ef6..34a31a7c5 100644 --- a/interface-definitions/dns-dynamic.xml.in +++ b/interface-definitions/dns-dynamic.xml.in @@ -58,6 +58,7 @@ <validator name="numeric" argument="--range 1-86400"/> </constraint> </properties> + <defaultValue>600</defaultValue> </leafNode> <leafNode name="zone"> <properties> diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 7d658f6a0..b28be387b 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -99,6 +99,19 @@ </children> </node> #include <include/interface-mac.xml.i> + <leafNode name="min-links"> + <properties> + <help>Minimum number of member interfaces required up before enabling bond</help> + <valueHelp> + <format><0-16></format> + <description>Minimum number of member interfaces required up before enabling bond</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 0-16"/> + </constraint> + </properties> + <defaultValue>0</defaultValue> + </leafNode> <leafNode name="mode"> <properties> <help>Bonding mode</help> diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index e8f3f09f1..0aef0d332 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -268,6 +268,37 @@ </properties> <defaultValue>auto</defaultValue> </leafNode> + <node name="ring-buffer"> + <properties> + <help>Shared buffer between the device driver and NIC</help> + </properties> + <children> + <leafNode name="rx"> + <properties> + <help>RX ring buffer</help> + <valueHelp> + <format>80-16384</format> + <description>ring buffer size</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 80-16384"/> + </constraint> + </properties> + </leafNode> + <leafNode name="tx"> + <properties> + <help>TX ring buffer</help> + <valueHelp> + <format>80-16384</format> + <description>ring buffer size</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 80-16384"/> + </constraint> + </properties> + </leafNode> + </children> + </node> #include <include/vif-s.xml.i> #include <include/vif.xml.i> </children> diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index 6f0ec9e71..a0caf810f 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -110,7 +110,6 @@ <constraint> <regex>(3839|7935)</regex> </constraint> - <multi/> </properties> </leafNode> <leafNode name="short-gi"> @@ -150,7 +149,6 @@ <constraint> <regex>(static|dynamic)</regex> </constraint> - <multi/> </properties> </leafNode> <node name="stbc"> diff --git a/interface-definitions/vpn_anyconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in index e74326986..16fe660a9 100644 --- a/interface-definitions/vpn_anyconnect.xml.in +++ b/interface-definitions/vpn_openconnect.xml.in @@ -2,9 +2,9 @@ <interfaceDefinition> <node name="vpn"> <children> - <node name="anyconnect" owner="${vyos_conf_scripts_dir}/vpn_anyconnect.py"> + <node name="openconnect" owner="${vyos_conf_scripts_dir}/vpn_openconnect.py"> <properties> - <help>SSL VPN AnyConnect</help> + <help>SSL VPN OpenConnect, AnyConnect compatible server</help> <priority>901</priority> </properties> <children> |