diff options
Diffstat (limited to 'interface-definitions')
68 files changed, 479 insertions, 605 deletions
diff --git a/interface-definitions/include/accel-auth-local-users.xml.i b/interface-definitions/include/accel-auth-local-users.xml.i new file mode 100644 index 000000000..4dc6c6dff --- /dev/null +++ b/interface-definitions/include/accel-auth-local-users.xml.i @@ -0,0 +1,56 @@ +<!-- included start from accel-auth-local-users.xml.i --> +<node name="local-users"> + <properties> + <help>Local user authentication for PPPoE server</help> + </properties> + <children> + <tagNode name="username"> + <properties> + <help>User name for authentication</help> + </properties> + <children> + <leafNode name="disable"> + <properties> + <help>Option to disable a PPPoE Server user</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="password"> + <properties> + <help>Password for authentication</help> + </properties> + </leafNode> + <leafNode name="static-ip"> + <properties> + <help>Static client IP address</help> + </properties> + <defaultValue>*</defaultValue> + </leafNode> + <node name="rate-limit"> + <properties> + <help>Upload/Download speed limits</help> + </properties> + <children> + <leafNode name="upload"> + <properties> + <help>Upload bandwidth limit in kbits/sec</help> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + <leafNode name="download"> + <properties> + <help>Download bandwidth limit in kbits/sec</help> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> + </children> + </node> + </children> + </tagNode> + </children> +</node> +<!-- included end --> diff --git a/interface-definitions/include/accel-auth-mode.xml.i b/interface-definitions/include/accel-auth-mode.xml.i index e719112db..85c3c5e82 100644 --- a/interface-definitions/include/accel-auth-mode.xml.i +++ b/interface-definitions/include/accel-auth-mode.xml.i @@ -1,3 +1,4 @@ +<!-- included start from accel-auth-mode.xml.i --> <leafNode name="mode"> <properties> <help>Authentication mode used by this server</help> @@ -16,4 +17,6 @@ <list>local radius</list> </completionHelp> </properties> + <defaultValue>local</defaultValue> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-auth-protocols.xml.i b/interface-definitions/include/accel-auth-protocols.xml.i new file mode 100644 index 000000000..a6899a4d8 --- /dev/null +++ b/interface-definitions/include/accel-auth-protocols.xml.i @@ -0,0 +1,31 @@ +<!-- included start from accel-auth-protocols.xml.i --> +<leafNode name="protocols"> + <properties> + <help>Authentication protocol for remote access peer SSTP VPN</help> + <completionHelp> + <list>pap chap mschap mschap-v2</list> + </completionHelp> + <valueHelp> + <format>pap</format> + <description>Authentication via PAP (Password Authentication Protocol)</description> + </valueHelp> + <valueHelp> + <format>chap</format> + <description>Authentication via CHAP (Challenge Handshake Authentication Protocol)</description> + </valueHelp> + <valueHelp> + <format>mschap</format> + <description>Authentication via MS-CHAP (Microsoft Challenge Handshake Authentication Protocol)</description> + </valueHelp> + <valueHelp> + <format>mschap-v2</format> + <description>Authentication via MS-CHAPv2 (Microsoft Challenge Handshake Authentication Protocol, version 2)</description> + </valueHelp> + <constraint> + <regex>(pap|chap|mschap|mschap-v2)</regex> + </constraint> + <multi/> + </properties> + <defaultValue>pap chap mschap mschap-v2</defaultValue> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i new file mode 100644 index 000000000..a92c315f1 --- /dev/null +++ b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i @@ -0,0 +1,18 @@ +<!-- included start from accel-client-ip-pool-start-stop.xml.i -->
+<leafNode name="start">
+ <properties>
+ <help>First IP address in the pool</help>
+ <constraint>
+ <validator name="ipv4-address"/>
+ </constraint>
+ </properties>
+</leafNode>
+<leafNode name="stop">
+ <properties>
+ <help>Last IP address in the pool</help>
+ <constraint>
+ <validator name="ipv4-address"/>
+ </constraint>
+ </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/accel-client-ip-pool-subnet.xml.i b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i new file mode 100644 index 000000000..8e9ca0e92 --- /dev/null +++ b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i @@ -0,0 +1,16 @@ +<!-- included start from accel-client-ip-pool-subnet.xml.i --> +<leafNode name="subnet"> + <properties> + <help>Client IP subnet (CIDR notation)</help> + <valueHelp> + <format>ipv4net</format> + <description>IPv4 address and prefix length</description> + </valueHelp> + <constraint> + <validator name="ipv4-prefix"/> + </constraint> + <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage> + <multi /> + </properties> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.i b/interface-definitions/include/accel-client-ipv6-pool.xml.i index 455ada6ef..471ff714c 100644 --- a/interface-definitions/include/accel-client-ipv6-pool.xml.i +++ b/interface-definitions/include/accel-client-ipv6-pool.xml.i @@ -1,3 +1,4 @@ +<!-- included start from accel-client-ipv6-pool.xml.i --> <node name="client-ipv6-pool"> <properties> <help>Pool of client IPv6 addresses</help> @@ -57,3 +58,4 @@ </tagNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/accel-gateway-address.xml.i b/interface-definitions/include/accel-gateway-address.xml.i new file mode 100644 index 000000000..c45c8b532 --- /dev/null +++ b/interface-definitions/include/accel-gateway-address.xml.i @@ -0,0 +1,15 @@ +<!-- included start from accel-gateway-address.xml.i --> +<leafNode name="gateway-address"> + <properties> + <help>Gateway IP address</help> + <constraint> + <validator name="ipv4-address"/> + </constraint> + <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage> + <valueHelp> + <format>ipv4</format> + <description>Default Gateway send to the client</description> + </valueHelp> + </properties> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i b/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i new file mode 100644 index 000000000..cccf4b4f2 --- /dev/null +++ b/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i @@ -0,0 +1,20 @@ +<!-- included start from accel-lcp-echo-interval-failure.xml.i --> +<leafNode name="lcp-echo-interval"> + <properties> + <help>LCP echo-requests/sec</help> + <constraint> + <validator name="numeric" argument="--positive"/> + </constraint> + </properties> + <defaultValue>30</defaultValue> +</leafNode> +<leafNode name="lcp-echo-failure"> + <properties> + <help>Maximum number of Echo-Requests may be sent without valid reply</help> + <constraint> + <validator name="numeric" argument="--positive"/> + </constraint> + </properties> + <defaultValue>3</defaultValue> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-lcp-echo-timeout.xml.i b/interface-definitions/include/accel-lcp-echo-timeout.xml.i new file mode 100644 index 000000000..888fa9d41 --- /dev/null +++ b/interface-definitions/include/accel-lcp-echo-timeout.xml.i @@ -0,0 +1,11 @@ +<!-- included start from accel-lcp-echo-timeout.xml.i --> +<leafNode name="lcp-echo-timeout"> + <properties> + <help>Timeout in seconds to wait for any peer activity. If this option specified it turns on adaptive lcp echo functionality and "lcp-echo-failure" is not used.</help> + <constraint> + <validator name="numeric" argument="--positive"/> + </constraint> + </properties> + <defaultValue>0</defaultValue> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-mtu-128-16384.xml.i b/interface-definitions/include/accel-mtu-128-16384.xml.i new file mode 100644 index 000000000..72ab550f9 --- /dev/null +++ b/interface-definitions/include/accel-mtu-128-16384.xml.i @@ -0,0 +1,9 @@ + <leafNode name="mtu">
+ <properties>
+ <help>Maximum Transmission Unit (MTU) - default 1492</help>
+ <constraint>
+ <validator name="numeric" argument="--range 128-16384"/>
+ </constraint>
+ </properties>
+ <defaultValue>1492</defaultValue>
+ </leafNode>
diff --git a/interface-definitions/include/accel-name-server.xml.i b/interface-definitions/include/accel-name-server.xml.i index 82ed6771d..e46c75b52 100644 --- a/interface-definitions/include/accel-name-server.xml.i +++ b/interface-definitions/include/accel-name-server.xml.i @@ -1,3 +1,4 @@ +<!-- included start from accel-name-server.xml.i --> <leafNode name="name-server"> <properties> <help>Domain Name Server (DNS) propagated to client</help> @@ -16,3 +17,4 @@ <multi/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-ppp-mppe.xml.i b/interface-definitions/include/accel-ppp-mppe.xml.i new file mode 100644 index 000000000..b7f9cfd92 --- /dev/null +++ b/interface-definitions/include/accel-ppp-mppe.xml.i @@ -0,0 +1,26 @@ +<!-- included start from accel-ppp-mppe.xml.i --> +<leafNode name="mppe"> + <properties> + <help>Specifies mppe negotiation preferences</help> + <completionHelp> + <list>require prefer deny</list> + </completionHelp> + <valueHelp> + <format>require</format> + <description>send mppe request, if client rejects, drop the connection</description> + </valueHelp> + <valueHelp> + <format>prefer</format> + <description>send mppe request, if client rejects continue</description> + </valueHelp> + <valueHelp> + <format>deny</format> + <description>drop all mppe</description> + </valueHelp> + <constraint> + <regex>^(require|prefer|deny)$</regex> + </constraint> + </properties> + <defaultValue>prefer</defaultValue> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-radius-additions-rate-limit.xml.i b/interface-definitions/include/accel-radius-additions-rate-limit.xml.i new file mode 100644 index 000000000..23a4a51cf --- /dev/null +++ b/interface-definitions/include/accel-radius-additions-rate-limit.xml.i @@ -0,0 +1,26 @@ +<!-- included start from accel-radius-additions-rate-limit.xml.i --> +<node name="rate-limit"> + <properties> + <help>Upload/Download speed limits</help> + </properties> + <children> + <leafNode name="attribute"> + <properties> + <help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help> + </properties> + <defaultValue>Filter-Id</defaultValue> + </leafNode> + <leafNode name="vendor"> + <properties> + <help>Specifies the vendor dictionary. (dictionary needs to be in /usr/share/accel-ppp/radius)</help> + </properties> + </leafNode> + <leafNode name="enable"> + <properties> + <help>Enables Bandwidth shaping via RADIUS</help> + <valueless /> + </properties> + </leafNode> + </children> +</node> +<!-- included end --> diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i index f4db51b97..598fb73f8 100644 --- a/interface-definitions/include/accel-radius-additions.xml.i +++ b/interface-definitions/include/accel-radius-additions.xml.i @@ -1,3 +1,4 @@ +<!-- included start from accel-radius-additions.xml.i --> <node name="radius"> <children> <leafNode name="acct-interim-jitter"> @@ -26,6 +27,7 @@ <validator name="numeric" argument="--range 1-65535"/> </constraint> </properties> + <defaultValue>1813</defaultValue> </leafNode> <leafNode name="fail-time"> <properties> @@ -39,6 +41,7 @@ </constraint> <constraintErrorMessage>Fail time must be between 0 and 600 seconds</constraintErrorMessage> </properties> + <defaultValue>0</defaultValue> </leafNode> </children> </tagNode> @@ -54,6 +57,7 @@ </constraint> <constraintErrorMessage>Timeout must be between 1 and 60 seconds</constraintErrorMessage> </properties> + <defaultValue>3</defaultValue> </leafNode> <leafNode name="acct-timeout"> <properties> @@ -67,6 +71,7 @@ </constraint> <constraintErrorMessage>Timeout must be between 0 and 60 seconds</constraintErrorMessage> </properties> + <defaultValue>3</defaultValue> </leafNode> <leafNode name="max-try"> <properties> @@ -80,6 +85,7 @@ </constraint> <constraintErrorMessage>Maximum tries must be between 1 and 20</constraintErrorMessage> </properties> + <defaultValue>3</defaultValue> </leafNode> <leafNode name="nas-identifier"> <properties> @@ -123,7 +129,7 @@ </leafNode> <leafNode name="port"> <properties> - <help>Port for Dynamic Authorization Extension server (DM/CoA)</help> + <help>Port for Dynamic Authorization Extension server (DM/CoA) (default: 1700)</help> <valueHelp> <format>number</format> <description>TCP port</description> @@ -132,6 +138,7 @@ <validator name="numeric" argument="--range 1-65535"/> </constraint> </properties> + <defaultValue>1700</defaultValue> </leafNode> <leafNode name="key"> <properties> @@ -142,3 +149,4 @@ </node> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/accel-wins-server.xml.i b/interface-definitions/include/accel-wins-server.xml.i index 461a65ddf..6de032981 100644 --- a/interface-definitions/include/accel-wins-server.xml.i +++ b/interface-definitions/include/accel-wins-server.xml.i @@ -1,3 +1,4 @@ +<!-- included start from accel-wins-server.xml.i --> <leafNode name="wins-server"> <properties> <help>Windows Internet Name Service (WINS) servers propagated to client</help> @@ -11,3 +12,4 @@ <multi/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i index cca824d89..7805110bc 100644 --- a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i +++ b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i @@ -1,3 +1,4 @@ +<!-- included start from address-ipv4-ipv6-dhcp.xml.i --> <leafNode name="address"> <properties> <help>IP address</help> @@ -27,3 +28,4 @@ <multi/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/address-ipv4-ipv6.xml.i index a891085bd..b11610104 100644 --- a/interface-definitions/include/address-ipv4-ipv6.xml.i +++ b/interface-definitions/include/address-ipv4-ipv6.xml.i @@ -1,3 +1,4 @@ +<!-- included start from address-ipv4-ipv6.xml.i --> <leafNode name="address"> <properties> <help>IP address</help> @@ -15,3 +16,4 @@ <multi/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp-afi-aggregate-address.xml.i index 050ee0074..c33d1097c 100644 --- a/interface-definitions/include/bgp-afi-aggregate-address.xml.i +++ b/interface-definitions/include/bgp-afi-aggregate-address.xml.i @@ -1,3 +1,4 @@ +<!-- included start from bgp-afi-aggregate-address.xml.i --> <leafNode name="as-set"> <properties> <help>Generate AS-set path information for this aggregate address</help> @@ -10,3 +11,4 @@ <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i b/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i index 9b3f7a008..f35f13e8d 100644 --- a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i +++ b/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i @@ -1,3 +1,4 @@ +<!-- included start from bgp-afi-redistribute-metric-route-map.xml.i --> <leafNode name="metric"> <properties> <help>Metric for redistributed routes</help> @@ -15,3 +16,4 @@ </completionHelp> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i index 74afb8851..f1a61d669 100644 --- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i +++ b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i @@ -1,3 +1,4 @@ +<!-- included start from bgp-neighbor-afi-ipv4-unicast.xml.i --> <node name="ipv4-unicast"> <properties> <help>IPv4 BGP neighbor parameters</help> @@ -283,3 +284,4 @@ </leafNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i index e95cb6dd8..dcdc0eb66 100644 --- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i +++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i @@ -1,3 +1,4 @@ +<!-- included start from bgp-neighbor-afi-ipv6-unicast.xml.i --> <node name="ipv6-unicast"> <properties> <help>IPv6 BGP neighbor parameters</help> @@ -320,3 +321,4 @@ </leafNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i index df051ace5..c6ba2630f 100644 --- a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i +++ b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i @@ -1,3 +1,4 @@ +<!-- included start from bgp-peer-group-afi-ipv4-unicast.xml.i --> <node name="ipv4-unicast"> <properties> <help>IPv4 BGP peer group parameters</help> @@ -299,3 +300,4 @@ </leafNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i index a381e02f0..933065dde 100644 --- a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i +++ b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i @@ -1,3 +1,4 @@ +<!-- included start from bgp-peer-group-afi-ipv6-unicast.xml.i --> <node name="ipv6-unicast"> <properties> <help>IPv6 BGP neighbor parameters</help> @@ -315,3 +316,4 @@ </leafNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/dhcp-options.xml.i index 9989291fc..e33022361 100644 --- a/interface-definitions/include/dhcp-options.xml.i +++ b/interface-definitions/include/dhcp-options.xml.i @@ -1,3 +1,4 @@ +<!-- included start from dhcp-options.xml.i --> <node name="dhcp-options"> <properties> <help>DHCP client settings/options</help> @@ -20,3 +21,4 @@ </leafNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i index b0a806806..9a1016956 100644 --- a/interface-definitions/include/dhcpv6-options.xml.i +++ b/interface-definitions/include/dhcpv6-options.xml.i @@ -1,3 +1,4 @@ +<!-- included start from dhcpv6-options.xml.i --> <node name="dhcpv6-options"> <properties> <help>DHCPv6 client settings/options</help> @@ -84,3 +85,4 @@ </leafNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface-arp-cache-timeout.xml.i index e65321158..6dfebfee4 100644 --- a/interface-definitions/include/interface-arp-cache-timeout.xml.i +++ b/interface-definitions/include/interface-arp-cache-timeout.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-arp-cache-timeout.xml.i --> <leafNode name="arp-cache-timeout"> <properties> <help>ARP cache entry timeout in seconds</help> @@ -12,3 +13,4 @@ </properties> <defaultValue>30</defaultValue> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i index 961533e26..daf09d8bc 100644 --- a/interface-definitions/include/interface-description.xml.i +++ b/interface-definitions/include/interface-description.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-description.xml.i --> <leafNode name="description"> <properties> <help>Interface specific description</help> @@ -7,3 +8,4 @@ <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-dial-on-demand.xml.i b/interface-definitions/include/interface-dial-on-demand.xml.i index c14ddf6f5..8fba8099d 100644 --- a/interface-definitions/include/interface-dial-on-demand.xml.i +++ b/interface-definitions/include/interface-dial-on-demand.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-dial-on-demand.xml.i --> <leafNode name="connect-on-demand"> <properties> <help>Establishment connection automatically when traffic is sent</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface-disable-arp-filter.xml.i index ec3f51b2d..4de3ca893 100644 --- a/interface-definitions/include/interface-disable-arp-filter.xml.i +++ b/interface-definitions/include/interface-disable-arp-filter.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-disable-arp-filter.xml.i --> <leafNode name="disable-arp-filter"> <properties> <help>Disable ARP filter on this interface</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-disable-link-detect.xml.i b/interface-definitions/include/interface-disable-link-detect.xml.i index 619cd03b0..4298b4b5d 100644 --- a/interface-definitions/include/interface-disable-link-detect.xml.i +++ b/interface-definitions/include/interface-disable-link-detect.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-disable-link-detect.xml.i --> <leafNode name="disable-link-detect"> <properties> <help>Ignore link state changes</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface-disable.xml.i index 7bd3df5da..5d73d54ba 100644 --- a/interface-definitions/include/interface-disable.xml.i +++ b/interface-definitions/include/interface-disable.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-disable.xml.i --> <leafNode name="disable"> <properties> <help>Administratively disable interface</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface-enable-arp-accept.xml.i index 69f26b322..688b3572e 100644 --- a/interface-definitions/include/interface-enable-arp-accept.xml.i +++ b/interface-definitions/include/interface-enable-arp-accept.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-enable-arp-accept.xml.i --> <leafNode name="enable-arp-accept"> <properties> <help>Enable ARP accept on this interface</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface-enable-arp-announce.xml.i index 8d51874c1..c84bb7ea9 100644 --- a/interface-definitions/include/interface-enable-arp-announce.xml.i +++ b/interface-definitions/include/interface-enable-arp-announce.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-enable-arp-announce.xml.i --> <leafNode name="enable-arp-announce"> <properties> <help>Enable ARP announce on this interface</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface-enable-arp-ignore.xml.i index 9adc0f17e..741771a89 100644 --- a/interface-definitions/include/interface-enable-arp-ignore.xml.i +++ b/interface-definitions/include/interface-enable-arp-ignore.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-enable-arp-ignore.xml.i --> <leafNode name="enable-arp-ignore"> <properties> <help>Enable ARP ignore on this interface</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface-enable-proxy-arp.xml.i index 14ab08875..08351e673 100644 --- a/interface-definitions/include/interface-enable-proxy-arp.xml.i +++ b/interface-definitions/include/interface-enable-proxy-arp.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-enable-proxy-arp.xml.i --> <leafNode name="enable-proxy-arp"> <properties> <help>Enable proxy-arp on this interface</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-hw-id.xml.i b/interface-definitions/include/interface-hw-id.xml.i index 318ddd1c4..af58fae3c 100644 --- a/interface-definitions/include/interface-hw-id.xml.i +++ b/interface-definitions/include/interface-hw-id.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-hw-id.xml.i --> <leafNode name="hw-id"> <properties> <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help> @@ -10,3 +11,4 @@ </constraint> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-ipv4.xml.i b/interface-definitions/include/interface-ipv4.xml.i index 15932a9d3..551059247 100644 --- a/interface-definitions/include/interface-ipv4.xml.i +++ b/interface-definitions/include/interface-ipv4.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-ipv4.xml.i --> <node name="ip"> <properties> <help>IPv4 routing parameters</help> @@ -9,3 +10,4 @@ #include <include/interface-enable-arp-ignore.xml.i> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/interface-ipv6.xml.i b/interface-definitions/include/interface-ipv6.xml.i index 23362f75a..c9299890b 100644 --- a/interface-definitions/include/interface-ipv6.xml.i +++ b/interface-definitions/include/interface-ipv6.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-ipv6.xml.i --> <node name="ipv6"> <properties> <help>IPv6 routing parameters</help> @@ -8,3 +9,4 @@ #include <include/ipv6-dup-addr-detect-transmits.xml.i> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i index 7b2456236..e277de85c 100644 --- a/interface-definitions/include/interface-mac.xml.i +++ b/interface-definitions/include/interface-mac.xml.i @@ -1,3 +1,4 @@ +<!-- included start from mac.xml.i --> <leafNode name="mac"> <properties> <help>Media Access Control (MAC) address</help> @@ -10,3 +11,4 @@ </constraint> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-1200-9000.xml.i b/interface-definitions/include/interface-mtu-1200-9000.xml.i index de48db65e..387e60fa5 100644 --- a/interface-definitions/include/interface-mtu-1200-9000.xml.i +++ b/interface-definitions/include/interface-mtu-1200-9000.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-mtu-1200-9000.xml.i --> <leafNode name="mtu"> <properties> <help>Maximum Transmission Unit (MTU)</help> @@ -12,3 +13,4 @@ </properties> <defaultValue>1500</defaultValue> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-1450-9000.xml.i b/interface-definitions/include/interface-mtu-1450-9000.xml.i index d15987394..3fc961051 100644 --- a/interface-definitions/include/interface-mtu-1450-9000.xml.i +++ b/interface-definitions/include/interface-mtu-1450-9000.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-mtu-1450-9000.xml.i --> <leafNode name="mtu"> <properties> <help>Maximum Transmission Unit (MTU)</help> @@ -12,3 +13,4 @@ </properties> <defaultValue>1500</defaultValue> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface-mtu-64-8024.xml.i index e60867e35..f51e098c1 100644 --- a/interface-definitions/include/interface-mtu-64-8024.xml.i +++ b/interface-definitions/include/interface-mtu-64-8024.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-mtu-68-8024.xml.i --> <leafNode name="mtu"> <properties> <help>Maximum Transmission Unit (MTU)</help> @@ -12,3 +13,4 @@ </properties> <defaultValue>1500</defaultValue> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface-mtu-68-1500.xml.i index d47efd2c9..0563e0023 100644 --- a/interface-definitions/include/interface-mtu-68-1500.xml.i +++ b/interface-definitions/include/interface-mtu-68-1500.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-mtu-68-1500.xml.i --> <leafNode name="mtu"> <properties> <help>Maximum Transmission Unit (MTU)</help> @@ -12,3 +13,4 @@ </properties> <defaultValue>1500</defaultValue> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-mtu-68-9000.xml.i b/interface-definitions/include/interface-mtu-68-9000.xml.i index 8fae2043c..82d0ed82b 100644 --- a/interface-definitions/include/interface-mtu-68-9000.xml.i +++ b/interface-definitions/include/interface-mtu-68-9000.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-mtu-68-9000.xml.i --> <leafNode name="mtu"> <properties> <help>Maximum Transmission Unit (MTU)</help> @@ -12,3 +13,4 @@ </properties> <defaultValue>1500</defaultValue> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i index 7e72b3800..02b96e353 100644 --- a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i +++ b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i @@ -1,6 +1,8 @@ +<!-- included start from interface-proxy-arp-pvlan.xml.i --> <leafNode name="proxy-arp-pvlan"> <properties> <help>Enable private VLAN proxy ARP on this interface</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/interface-vrf.xml.i b/interface-definitions/include/interface-vrf.xml.i index 355e7f0f3..e3d6b53e0 100644 --- a/interface-definitions/include/interface-vrf.xml.i +++ b/interface-definitions/include/interface-vrf.xml.i @@ -1,3 +1,4 @@ +<!-- included start from interface-vrf.xml.i --> <leafNode name="vrf"> <properties> <help>VRF instance name</help> @@ -10,3 +11,4 @@ </completionHelp> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/ipv6-address.xml.i b/interface-definitions/include/ipv6-address.xml.i index 34f54e4c1..26ac1d374 100644 --- a/interface-definitions/include/ipv6-address.xml.i +++ b/interface-definitions/include/ipv6-address.xml.i @@ -1,3 +1,4 @@ +<!-- included start from ipv6-address.xml.i --> <node name="address"> <children> <leafNode name="autoconf"> @@ -27,3 +28,4 @@ </leafNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/ipv6-disable-forwarding.xml.i b/interface-definitions/include/ipv6-disable-forwarding.xml.i index 3f90c7e34..14d9eada9 100644 --- a/interface-definitions/include/ipv6-disable-forwarding.xml.i +++ b/interface-definitions/include/ipv6-disable-forwarding.xml.i @@ -1,6 +1,8 @@ +<!-- included start from ipv6-disable-forwarding.xml.i --> <leafNode name="disable-forwarding"> <properties> <help>Disable IPv6 forwarding on this interface</help> <valueless/> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i index 728187560..61e6669c4 100644 --- a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i +++ b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i @@ -1,3 +1,4 @@ +<!-- included start from ipv6-dup-addr-detect-transmits.xml.i --> <leafNode name="dup-addr-detect-transmits"> <properties> <help>Number of NS messages to send while performing DAD (default: 1)</help> @@ -14,3 +15,4 @@ </constraint> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/isis-redistribute-ipv4.xml.i b/interface-definitions/include/isis-redistribute-ipv4.xml.i index f90900da1..a40d8dfc2 100644 --- a/interface-definitions/include/isis-redistribute-ipv4.xml.i +++ b/interface-definitions/include/isis-redistribute-ipv4.xml.i @@ -1,3 +1,4 @@ +<!-- included start from isis-redistribute-ipv4.xml.i --> <node name="level-1"> <properties> <help>Redistribute into level-1</help> @@ -80,3 +81,4 @@ </tagNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/nat-address.xml.i b/interface-definitions/include/nat-address.xml.i index 933dae07b..846ef3dec 100644 --- a/interface-definitions/include/nat-address.xml.i +++ b/interface-definitions/include/nat-address.xml.i @@ -1,3 +1,4 @@ +<!-- included start from nat-address.xml.i --> <leafNode name="address"> <properties> <help>IP address, subnet, or range</help> @@ -35,3 +36,4 @@ </constraint> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/nat-interface.xml.i b/interface-definitions/include/nat-interface.xml.i index c49483297..e42003530 100644 --- a/interface-definitions/include/nat-interface.xml.i +++ b/interface-definitions/include/nat-interface.xml.i @@ -1,3 +1,4 @@ +<!-- included start from nat-interface.xml.i --> <leafNode name="outbound-interface"> <properties> <help>Outbound interface of NAT traffic</help> @@ -7,3 +8,4 @@ </completionHelp> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/nat-port.xml.i b/interface-definitions/include/nat-port.xml.i index 24803ae05..e417d13cc 100644 --- a/interface-definitions/include/nat-port.xml.i +++ b/interface-definitions/include/nat-port.xml.i @@ -1,3 +1,4 @@ +<!-- included start from nat-port.xml.i --> <leafNode name="port"> <properties> <help>Port number</help> @@ -15,3 +16,4 @@ </valueHelp> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i index a2d058479..f91834ae0 100644 --- a/interface-definitions/include/nat-rule.xml.i +++ b/interface-definitions/include/nat-rule.xml.i @@ -1,3 +1,4 @@ +<!-- included start from nat-rule.xml.i --> <tagNode name="rule"> <properties> <help>Rule number for NAT</help> @@ -301,3 +302,4 @@ </node> </children> </tagNode> +<!-- included end --> diff --git a/interface-definitions/include/nat-translation-port.xml.i b/interface-definitions/include/nat-translation-port.xml.i index 93de471e3..db8803dac 100644 --- a/interface-definitions/include/nat-translation-port.xml.i +++ b/interface-definitions/include/nat-translation-port.xml.i @@ -1,3 +1,4 @@ +<!-- included start from nat-translation-port.xml.i --> <leafNode name="port"> <properties> <help>Port number</help> @@ -11,3 +12,4 @@ </valueHelp> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i index 29d2f55fd..d94523e1e 100644 --- a/interface-definitions/include/port-number.xml.i +++ b/interface-definitions/include/port-number.xml.i @@ -1,3 +1,4 @@ +<!-- included start from port-number.xml.i --> <leafNode name="port"> <properties> <help>Port number used to establish connection</help> @@ -10,3 +11,4 @@ </constraint> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/radius-server.xml.i b/interface-definitions/include/radius-server.xml.i index 047728233..b78ebb306 100644 --- a/interface-definitions/include/radius-server.xml.i +++ b/interface-definitions/include/radius-server.xml.i @@ -1,3 +1,4 @@ +<!-- included start from radius-server.xml.i --> <node name="radius"> <properties> <help>RADIUS based user authentication</help> @@ -49,8 +50,10 @@ <validator name="numeric" argument="--range 1-65535"/> </constraint> </properties> + <defaultValue>1812</defaultValue> </leafNode> </children> </tagNode> </children> </node> +<!-- included end --> diff --git a/interface-definitions/include/rip-redistribute.xml.i b/interface-definitions/include/rip-redistribute.xml.i index d94dfa5a8..d287c1c2b 100644 --- a/interface-definitions/include/rip-redistribute.xml.i +++ b/interface-definitions/include/rip-redistribute.xml.i @@ -1,3 +1,4 @@ +<!-- included start from rip-redistribute.xml.i --> <leafNode name="metric"> <properties> <help>Metric for redistributed routes</help> @@ -22,3 +23,4 @@ </completionHelp> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/source-address-ipv4-ipv6.xml.i b/interface-definitions/include/source-address-ipv4-ipv6.xml.i index 6d2d77c95..6716e0ae4 100644 --- a/interface-definitions/include/source-address-ipv4-ipv6.xml.i +++ b/interface-definitions/include/source-address-ipv4-ipv6.xml.i @@ -1,3 +1,4 @@ +<!-- included start from source-address-ipv4-ipv6.xml.i --> <leafNode name="source-address"> <properties> <help>IPv4/IPv6 source address</help> @@ -15,3 +16,4 @@ </constraint> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/source-interface-ethernet.xml.i b/interface-definitions/include/source-interface-ethernet.xml.i index ad90bc4ac..d641f3cb1 100644 --- a/interface-definitions/include/source-interface-ethernet.xml.i +++ b/interface-definitions/include/source-interface-ethernet.xml.i @@ -1,3 +1,4 @@ +<!-- included start from source-interface-ethernet.xml.i --> <leafNode name="source-interface"> <properties> <help>Physical interface the traffic will go through</help> @@ -10,3 +11,4 @@ </completionHelp> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/source-interface.xml.i b/interface-definitions/include/source-interface.xml.i index ae579c2a6..e6f0b69a1 100644 --- a/interface-definitions/include/source-interface.xml.i +++ b/interface-definitions/include/source-interface.xml.i @@ -1,3 +1,4 @@ +<!-- included start from source-interface.xml.i --> <leafNode name="source-interface"> <properties> <help>Physical interface used for connection</help> @@ -10,3 +11,4 @@ </completionHelp> </properties> </leafNode> +<!-- included end --> diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index cd0afe742..3a04b10d9 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -1,3 +1,4 @@ +<!-- included start from vif-s.xml.i --> <tagNode name="vif-s"> <properties> <help>QinQ TAG-S Virtual Local Area Network (VLAN) ID</help> @@ -66,3 +67,4 @@ </tagNode> </children> </tagNode> +<!-- included end --> diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 919e4d493..15c453fcc 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -1,3 +1,4 @@ +<!-- included start from vif.xml.i --> <tagNode name="vif"> <properties> <help>Virtual Local Area Network (VLAN) ID</help> @@ -64,3 +65,4 @@ #include <include/interface-mtu-68-9000.xml.i> </children> </tagNode> +<!-- included end --> diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 64fd6e4ef..6d11f41a0 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -8,19 +8,6 @@ <priority>900</priority> </properties> <children> - <node name="snmp"> - <properties> - <help>Enable SNMP</help> - </properties> - <children> - <leafNode name="master-agent"> - <properties> - <help>enable SNMP master agent mode</help> - <valueless /> - </properties> - </leafNode> - </children> - </node> <leafNode name="access-concentrator"> <properties> <help>Access concentrator name</help> @@ -29,142 +16,43 @@ </constraint> <constraintErrorMessage>access-concentrator name limited to alphanumerical characters only (max. 100)</constraintErrorMessage> </properties> - </leafNode> - <leafNode name="session-control"> - <properties> - <help>control sessions count</help> - <constraint> - <regex>(deny|disable)</regex> - </constraint> - <constraintErrorMessage>Invalid value</constraintErrorMessage> - <valueHelp> - <format>disable</format> - <description>Disables session control</description> - </valueHelp> - <valueHelp> - <format>deny</format> - <description>Deny second session authorization</description> - </valueHelp> - <completionHelp> - <list>deny disable</list> - </completionHelp> - </properties> + <defaultValue>vyos-ac</defaultValue> </leafNode> <node name="authentication"> <properties> <help>Authentication for remote access PPPoE Server</help> </properties> <children> - <node name="local-users"> - <properties> - <help>Local user authentication for PPPoE server</help> - </properties> - <children> - <tagNode name="username"> - <properties> - <help>User name for authentication</help> - </properties> - <children> - <leafNode name="disable"> - <properties> - <help>Option to disable a PPPoE Server user</help> - </properties> - </leafNode> - <leafNode name="password"> - <properties> - <help>Password for authentication</help> - </properties> - </leafNode> - <leafNode name="static-ip"> - <properties> - <help>Static client IP address</help> - </properties> - </leafNode> - <node name="rate-limit"> - <properties> - <help>Upload/Download speed limits</help> - </properties> - <children> - <leafNode name="upload"> - <properties> - <help>Upload bandwidth limit in kbits/sec</help> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - <leafNode name="download"> - <properties> - <help>Download bandwidth limit in kbits/sec</help> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - </children> - </node> - </children> - </tagNode> - </children> - </node> + #include <include/accel-auth-local-users.xml.i> #include <include/accel-auth-mode.xml.i> + #include <include/accel-auth-protocols.xml.i> #include <include/radius-server.xml.i> #include <include/accel-radius-additions.xml.i> <node name="radius"> <children> - <node name="rate-limit"> + #include <include/accel-radius-additions-rate-limit.xml.i> + <leafNode name="called-sid-format"> <properties> - <help>Upload/Download speed limits</help> + <help>Format of Called-Station-Id attribute</help> + <completionHelp> + <list>ifname ifname:mac</list> + </completionHelp> + <constraint> + <regex>(ifname|ifname:mac)</regex> + </constraint> + <constraintErrorMessage>Invalid Called-Station-Id format</constraintErrorMessage> + <valueHelp> + <format>ifname</format> + <description>NAS-Port-Id - should contain root interface name (NAS-Port-Id=eth1)</description> + </valueHelp> + <valueHelp> + <format>ifname:mac</format> + <description>NAS-Port-Id - should contain root interface name and mac address (NAS-Port-Id=eth1:00:00:00:00:00:00)</description> + </valueHelp> </properties> - <children> - <leafNode name="attribute"> - <properties> - <help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help> - </properties> - </leafNode> - <leafNode name="vendor"> - <properties> - <help>Specifies the vendor dictionary. (dictionary needs to be in /usr/share/accel-ppp/radius)</help> - </properties> - </leafNode> - <leafNode name="enable"> - <properties> - <help>Enables Bandwidth shaping via RADIUS</help> - <valueless /> - </properties> - </leafNode> - </children> - </node> + </leafNode> </children> </node> - <leafNode name="protocols"> - <properties> - <help>Authentication protocol</help> - <valueHelp> - <format>pap</format> - <description>Allow PAP authentication [Password Authentication Protocol]</description> - </valueHelp> - <valueHelp> - <format>chap</format> - <description>Allow CHAP authentication [Challenge Handshake Authentication Protocol]</description> - </valueHelp> - <valueHelp> - <format>mschap</format> - <description>Allow MS-CHAP authentication [Microsoft Challenge Handshake Authentication Protocol, Version 1]</description> - </valueHelp> - <valueHelp> - <format>mschap-v2</format> - <description>Allow MS-CHAPv2 authentication [Microsoft Challenge Handshake Authentication Protocol, Version 2]</description> - </valueHelp> - <constraint> - <regex>(pap|chap|mschap|mschap-v2)</regex> - </constraint> - <completionHelp> - <list>pap chap mschap mschap-v2</list> - </completionHelp> - <multi /> - </properties> - </leafNode> </children> </node> <node name="client-ip-pool"> @@ -172,32 +60,8 @@ <help>Pool of client IP addresses (must be within a /24)</help> </properties> <children> - <leafNode name="start"> - <properties> - <help>First IP address in the pool</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> - <leafNode name="stop"> - <properties> - <help>Last IP address in the pool</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> - <leafNode name="subnet"> - <properties> - <help>Client IP subnet (CIDR notation)</help> - <constraint> - <validator name="ipv4-prefix"/> - </constraint> - <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage> - <multi /> - </properties> - </leafNode> + #include <include/accel-client-ip-pool-start-stop.xml.i> + #include <include/accel-client-ip-pool-subnet.xml.i> </children> </node> #include <include/accel-client-ipv6-pool.xml.i> @@ -214,10 +78,10 @@ <properties> <help>VLAN monitor for the automatic creation of vlans (user per vlan)</help> <constraint> - <validator name="numeric" argument="--range 1-4096"/> - </constraint> - <constraintErrorMessage>VLAN ID needs to be between 1 and 4096</constraintErrorMessage> - <multi /> + <validator name="numeric" argument="--range 1-4096"/> + </constraint> + <constraintErrorMessage>VLAN ID needs to be between 1 and 4096</constraintErrorMessage> + <multi/> </properties> </leafNode> <leafNode name="vlan-range"> @@ -226,27 +90,13 @@ <constraint> <regex>(409[0-6]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{0,2})-(409[0-6]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{0,2})</regex> </constraint> - <multi /> + <multi/> </properties> </leafNode> </children> </tagNode> - <leafNode name="local-ip"> - <properties> - <help>local gateway address</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> - <leafNode name="mtu"> - <properties> - <help>Maximum Transmission Unit (MTU) - default 1492</help> - <constraint> - <validator name="numeric" argument="--range 128-16384"/> - </constraint> - </properties> - </leafNode> + #include <include/accel-gateway-address.xml.i> + #include <include/accel-mtu-128-16384.xml.i> <node name="limits"> <properties> <help>Limits the connection rate from a single source</help> @@ -311,53 +161,9 @@ <valueless /> </properties> </leafNode> - <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> - </leafNode> - <leafNode name="lcp-echo-interval"> - <properties> - <help>LCP echo-requests/sec</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - </leafNode> - <leafNode name="lcp-echo-failure"> - <properties> - <help>Maximum number of Echo-Requests may be sent without valid reply</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - </leafNode> - <leafNode name="lcp-echo-timeout"> - <properties> - <help>Timeout in seconds to wait for any peer activity. If this option specified it turns on adaptive lcp echo functionality and "lcp-echo-failure" is not used.</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - </leafNode> + #include <include/accel-ppp-mppe.xml.i> + #include <include/accel-lcp-echo-interval-failure.xml.i> + #include <include/accel-lcp-echo-timeout.xml.i> <leafNode name="ipv4"> <properties> <help>IPv4 (IPCP) negotiation algorithm</help> @@ -417,6 +223,9 @@ <leafNode name="ipv6-intf-id"> <properties> <help>Fixed or random interface identifier for IPv6</help> + <completionHelp> + <list>random</list> + </completionHelp> <valueHelp> <format>random</format> <description>Random interface identifier for IPv6</description> @@ -430,6 +239,9 @@ <leafNode name="ipv6-peer-intf-id"> <properties> <help>Peer interface identifier for IPv6</help> + <completionHelp> + <list>random calling-sid ipv4</list> + </completionHelp> <valueHelp> <format>x:x:x:x</format> <description>Interface identifier for IPv6</description> @@ -484,6 +296,44 @@ </leafNode> </children> </tagNode> + <leafNode name="session-control"> + <properties> + <help>control sessions count</help> + <constraint> + <regex>^(deny|disable|replace)$</regex> + </constraint> + <constraintErrorMessage>Invalid value</constraintErrorMessage> + <valueHelp> + <format>disable</format> + <description>Disables session control</description> + </valueHelp> + <valueHelp> + <format>deny</format> + <description>Deny second session authorization</description> + </valueHelp> + <valueHelp> + <format>replace</format> + <description>Terminate first session when second is authorized</description> + </valueHelp> + <completionHelp> + <list>deny disable replace</list> + </completionHelp> + </properties> + <defaultValue>replace</defaultValue> + </leafNode> + <node name="snmp"> + <properties> + <help>Enable SNMP</help> + </properties> + <children> + <leafNode name="master-agent"> + <properties> + <help>enable SNMP master agent mode</help> + <valueless /> + </properties> + </leafNode> + </children> + </node> </children> </node> </children> diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 4de28d2bd..8802c0564 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -12,14 +12,7 @@ <help>Remote access L2TP VPN</help> </properties> <children> - <leafNode name="mtu"> - <properties> - <help>Maximum Transmission Unit (MTU)</help> - <constraint> - <validator name="numeric" argument="--range 128-16384"/> - </constraint> - </properties> - </leafNode> + #include <include/accel-mtu-128-16384.xml.i> <leafNode name="outside-address"> <properties> <help>External IP address to which VPN clients will connect</help> @@ -28,14 +21,7 @@ </constraint> </properties> </leafNode> - <leafNode name="gateway-address"> - <properties> - <help>Gatway address uses as client tunnel termination point</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> + #include <include/accel-gateway-address.xml.i> #include <include/accel-name-server.xml.i> <node name="lns"> <properties> @@ -171,36 +157,8 @@ <help>Pool of client IP addresses (must be within a /24)</help> </properties> <children> - <leafNode name="start"> - <properties> - <help>First IP address in the pool (will be used as gateway address)</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> - <leafNode name="stop"> - <properties> - <help>Last IP address in the pool</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> - <leafNode name="subnet"> - <properties> - <help>Client IP subnet (CIDR notation)</help> - <constraint> - <validator name="ipv4-prefix"/> - </constraint> - <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage> - <valueHelp> - <format>ipv4net</format> - <description>IPv4 subnet address</description> - </valueHelp> - <multi /> - </properties> - </leafNode> + #include <include/accel-client-ip-pool-start-stop.xml.i> + #include <include/accel-client-ip-pool-subnet.xml.i> </children> </node> #include <include/accel-client-ipv6-pool.xml.i> @@ -259,83 +217,9 @@ <multi /> </properties> </leafNode> - <leafNode name="mppe"> - <properties> - <help>Specifies mppe negotioation preference. (default require mppe 128-bit stateless</help> - <valueHelp> - <format>deny</format> - <description>deny mppe</description> - </valueHelp> - <valueHelp> - <format>prefer</format> - <description>Ask client for mppe, if it rejects do not fail</description> - </valueHelp> - <valueHelp> - <format>require</format> - <description>ask client for mppe, if it rejects drop connection</description> - </valueHelp> - <constraint> - <regex>(deny|prefer|require)</regex> - </constraint> - <completionHelp> - <list>deny prefer require</list> - </completionHelp> - </properties> - </leafNode> + #include <include/accel-ppp-mppe.xml.i> #include <include/accel-auth-mode.xml.i> - <node name="local-users"> - <properties> - <help>Local user authentication for remote access L2TP VPN</help> - </properties> - <children> - <tagNode name="username"> - <properties> - <help>User name for authentication</help> - </properties> - <children> - <leafNode name="disable"> - <properties> - <help>Option to disable a L2TP Server user</help> - <valueless/> - </properties> - </leafNode> - <leafNode name="password"> - <properties> - <help>Password for authentication</help> - </properties> - </leafNode> - <leafNode name="static-ip"> - <properties> - <help>Static client IP address</help> - </properties> - </leafNode> - <node name="rate-limit"> - <properties> - <help>Upload/Download speed limits</help> - </properties> - <children> - <leafNode name="upload"> - <properties> - <help>Upload bandwidth limit in kbits/sec</help> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - <leafNode name="download"> - <properties> - <help>Download bandwidth limit in kbits/sec</help> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - </children> - </node> - </children> - </tagNode> - </children> - </node> + #include <include/accel-auth-local-users.xml.i> #include <include/radius-server.xml.i> <node name="radius"> <children> @@ -430,22 +314,7 @@ <help>Advanced protocol options</help> </properties> <children> - <leafNode name="lcp-echo-interval"> - <properties> - <help>LCP echo-requests/sec</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - </leafNode> - <leafNode name="lcp-echo-failure"> - <properties> - <help>Maximum number of Echo-Requests may be sent without valid reply</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - </leafNode> + #include <include/accel-lcp-echo-interval-failure.xml.i> </children> </node> </children> diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in index f37c9bd01..b17138e33 100644 --- a/interface-definitions/vpn_pptp.xml.in +++ b/interface-definitions/vpn_pptp.xml.in @@ -12,14 +12,7 @@ <help>Remote access PPTP VPN</help> </properties> <children> - <leafNode name="mtu"> - <properties> - <help>Maximum Transmission Unit (MTU)</help> - <constraint> - <validator name="numeric" argument="--range 128-16384"/> - </constraint> - </properties> - </leafNode> + #include <include/accel-mtu-128-16384.xml.i> <leafNode name="outside-address"> <properties> <help>External IP address to which VPN clients will connect</help> @@ -47,32 +40,10 @@ <help>Pool of client IP addresses (must be within a /24)</help> </properties> <children> - <leafNode name="start"> - <properties> - <help>First IP address in the pool (will be used as gateway address)</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> - <leafNode name="stop"> - <properties> - <help>Last IP address in the pool</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> + #include <include/accel-client-ip-pool-start-stop.xml.i> </children> </node> - <leafNode name="gateway-address"> - <properties> - <help>Gatway address uses as client tunnel termination point</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> + #include <include/accel-gateway-address.xml.i> <node name="authentication"> <properties> <help>Authentication for remote access PPTP VPN</help> diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index 5da2f8f24..77b1c1ec1 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -13,119 +13,40 @@ <help>Authentication for remote access SSTP Server</help> </properties> <children> - <node name="local-users"> - <properties> - <help>Local user authentication for SSTP server</help> - </properties> - <children> - <tagNode name="username"> - <properties> - <help>User name for authentication</help> - </properties> - <children> - <leafNode name="disable"> - <properties> - <help>Option to disable a SSTP Server user</help> - <valueless /> - </properties> - </leafNode> - <leafNode name="password"> - <properties> - <help>Password for authentication</help> - </properties> - </leafNode> - <leafNode name="static-ip"> - <properties> - <help>Static client IP address</help> - </properties> - </leafNode> - <node name="rate-limit"> - <properties> - <help>Upload/Download speed limits</help> - </properties> - <children> - <leafNode name="upload"> - <properties> - <help>Upload bandwidth limit in kbits/sec</help> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - <leafNode name="download"> - <properties> - <help>Download bandwidth limit in kbits/sec</help> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - </properties> - </leafNode> - </children> - </node> - </children> - </tagNode> - </children> - </node> + #include <include/accel-auth-local-users.xml.i> #include <include/accel-auth-mode.xml.i> - <leafNode name="protocols"> - <properties> - <help>Authentication protocol for remote access peer SSTP VPN</help> - <completionHelp> - <list>pap chap mschap mschap-v2</list> - </completionHelp> - <valueHelp> - <format>pap</format> - <description>Authentication via PAP (Password Authentication Protocol)</description> - </valueHelp> - <valueHelp> - <format>chap</format> - <description>Authentication via CHAP (Challenge Handshake Authentication Protocol)</description> - </valueHelp> - <valueHelp> - <format>mschap</format> - <description>Authentication via MS-CHAP (Microsoft Challenge Handshake Authentication Protocol)</description> - </valueHelp> - <valueHelp> - <format>mschap-v2</format> - <description>Authentication via MS-CHAPv2 (Microsoft Challenge Handshake Authentication Protocol, version 2)</description> - </valueHelp> - <constraint> - <regex>(pap|chap|mschap|mschap-v2)</regex> - </constraint> - <multi /> - </properties> - </leafNode> + #include <include/accel-auth-protocols.xml.i> #include <include/radius-server.xml.i> #include <include/accel-radius-additions.xml.i> <node name="radius"> <children> - <node name="rate-limit"> - <properties> - <help>Upload/Download speed limits</help> - </properties> - <children> - <leafNode name="attribute"> - <properties> - <help>Specifies RADIUS attribute containing rate information (default 'Filter-Id')</help> - </properties> - </leafNode> - <leafNode name="vendor"> - <properties> - <help>Specifies vendor dictionary (needs to be in /usr/share/accel-ppp/radius)</help> - </properties> - </leafNode> - <leafNode name="enable"> - <properties> - <help>Enable RADIUS bandwidth shaping</help> - <valueless /> - </properties> - </leafNode> - </children> - </node> + #include <include/accel-radius-additions-rate-limit.xml.i> </children> </node> </children> </node> + #include <include/interface-mtu-68-1500.xml.i> + #include <include/accel-gateway-address.xml.i> + #include <include/accel-name-server.xml.i> + <node name="client-ip-pool"> + <properties> + <help>Client IP pools and gateway setting</help> + </properties> + <children> + #include <include/accel-client-ip-pool-subnet.xml.i> + </children> + </node> + #include <include/accel-client-ipv6-pool.xml.i> + <node name="ppp-options"> + <properties> + <help>PPP (Point-to-Point Protocol) settings</help> + </properties> + <children> + #include <include/accel-ppp-mppe.xml.i> + #include <include/accel-lcp-echo-interval-failure.xml.i> + #include <include/accel-lcp-echo-timeout.xml.i> + </children> + </node> <node name="ssl"> <properties> <help>SSL Certificate, SSL Key and CA (/config/user-data/sstp)</help> @@ -168,106 +89,8 @@ </leafNode> </children> </node> - <node name="network-settings"> - <properties> - <help>Network settings</help> - </properties> - <children> - <node name="client-ip-settings"> - <properties> - <help>Client IP pools and gateway setting</help> - </properties> - <children> - <leafNode name="subnet"> - <properties> - <help>Client IP subnet (CIDR notation)</help> - <valueHelp> - <format>ipv4net</format> - <description>IPv4 address and prefix length</description> - </valueHelp> - <constraint> - <validator name="ipv4-prefix"/> - </constraint> - <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage> - <multi /> - </properties> - </leafNode> - <leafNode name="gateway-address"> - <properties> - <help>Gateway IP address</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage> - <valueHelp> - <format>ipv4</format> - <description>Default Gateway send to the client</description> - </valueHelp> - </properties> - </leafNode> - </children> - </node> - #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> - <node name="ppp-settings"> - <properties> - <help>PPP (Point-to-Point Protocol) settings</help> - </properties> - <children> - <leafNode name="mppe"> - <properties> - <help>Specifies mppe negotiation preferences</help> - <completionHelp> - <list>require prefer deny</list> - </completionHelp> - <constraint> - <regex>(^require|prefer|deny)</regex> - </constraint> - <valueHelp> - <format>require</format> - <description>send mppe request, if client rejects, drop the connection</description> - </valueHelp> - <valueHelp> - <format>prefer</format> - <description>send mppe request, if client rejects continue</description> - </valueHelp> - <valueHelp> - <format>deny</format> - <description>drop all mppe</description> - </valueHelp> - </properties> - </leafNode> - <leafNode name="lcp-echo-interval"> - <properties> - <help>LCP echo-requests/sec</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - </leafNode> - <leafNode name="lcp-echo-failure"> - <properties> - <help>Maximum number of Echo-Requests may be sent without valid reply</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - </leafNode> - <leafNode name="lcp-echo-timeout"> - <properties> - <help>Timeout in seconds to wait for any peer activity. If this option specified it turns on adaptive lcp echo functionality and "lcp-echo-failure" is not used.</help> - <constraint> - <validator name="numeric" argument="--positive"/> - </constraint> - </properties> - </leafNode> - </children> - </node> - </children> - </node> - </children> -</node> + </children> + </node> + </children> + </node> </interfaceDefinition> diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in index 120c7d218..ec0a71a95 100644 --- a/interface-definitions/vrrp.xml.in +++ b/interface-definitions/vrrp.xml.in @@ -222,6 +222,25 @@ </valueHelp> </properties> </leafNode> + <leafNode name="virtual-address-excluded"> + <properties> + <help>Virtual address (If you need additional IPv4 and IPv6 in same group)</help> + <valueHelp> + <format>ipv4</format> + <description>IP address</description> + </valueHelp> + <valueHelp> + <format>ipv6</format> + <description>IPv6 address</description> + </valueHelp> + <multi/> + <constraint> + <validator name="ipv4-host"/> + <validator name="ipv6-host"/> + </constraint> + <constraintErrorMessage>Virtual address must be a valid IPv4 or IPv6 address with prefix length (e.g. 192.0.2.3/24 or 2001:db8:ff::10/64)</constraintErrorMessage> + </properties> + </leafNode> <leafNode name="vrid"> <properties> <help>Virtual router identifier</help> |