Merge branch 'current' of https://github.com/vyos/vyos-1x into current

3 files changed, 375 insertions, 22 deletions

diff --git a/interface-definitions/ntp.xml b/interface-definitions/ntp.xml
index d324404da..945345898 100644
--- a/interface-definitions/ntp.xml
+++ b/interface-definitions/ntp.xml
@@ -14,12 +14,6 @@
               <help>Network Time Protocol (NTP) server</help>
             </properties>
             <children>
-              <leafNode name="dynamic">
-                <properties>
-                  <help>Allow server to be configured even if not reachable</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
               <leafNode name="noselect">
                 <properties>
                   <help>Marks the server as unused</help>
diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml
index 543ff1663..2fac4ec5a 100644
--- a/interface-definitions/pppoe-server.xml
+++ b/interface-definitions/pppoe-server.xml
@@ -8,6 +8,19 @@
           <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>
@@ -51,22 +64,25 @@
                   </tagNode>
                 </children>
               </node>
-              <leafNode name="mode">
+              <node name="mode">
                 <properties>
                   <help>Authentication mode for PPPoE Server</help>
-                  <valueHelp>
-                    <format>local</format>
-                    <description>Use local username/password configuration</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>radius</format>
-                    <description>Use Radius server to autenticate users</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>^(local|radius)</regex>
-                  </constraint>
                 </properties>
-              </leafNode>
+                <children>
+                  <leafNode name="local">
+                    <properties>
+                      <help>Use local username/password configuration</help>
+                      <valueless />
+                    </properties>
+                  </leafNode>
+                  <leafNode name="radius">
+                    <properties>
+                      <help>Use Radius server to autenticate users</help>
+                      <valueless />
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
               <tagNode name="radius-server">
                 <properties>
                   <help>IP address of radius server</help>
@@ -76,13 +92,77 @@
                   </valueHelp>
                 </properties>
                 <children>
-                  <leafNode name="key">
+                  <leafNode name="secret">
                     <properties>
                       <help>Key for accessing the specified server</help>
                     </properties>
                   </leafNode>
+                  <leafNode name="req-limit">
+                    <properties>
+                      <help>maximum number of simultaneous requests to server (default: unlimited)</help>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="fail-time">
+                    <properties>
+                      <help>if server doesn't responds mark it as unavailable for this amount of time in seconds</help>
+                    </properties>
+                  </leafNode>
                 </children>
               </tagNode>
+              <node name="radius-settings">
+                <properties>
+                  <help>radius settings</help>
+                </properties>
+                <children>
+                  <leafNode name="timeout">
+                    <properties>
+                      <help>timeout to wait response from server (sec)</help>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="acct-timeout">
+                    <properties>
+                      <help>timeout to wait reply for Interim-Update packets. (default 3 sec)</help>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="max-try">
+                    <properties>
+                      <help>maximum number of tries to send Access-Request/Accounting-Request queries</help>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="nas-identifier">
+                    <properties>
+                      <help>value to send to RADIUS server in NAS-Identifier attribute and to be matched in DM/CoA requests.</help>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="nas-ip-address">
+                    <properties>
+                      <help>value to send to RADIUS server in NAS-IP-Address attribute and to be matched in DM/CoA requests. Also DM/CoA server will bind to that address.</help>
+                    </properties>
+                  </leafNode>
+                  <node name="dae-server">
+                    <properties>
+                      <help>IPv4 address and port to bind Dynamic Authorization Extension server (DM/CoA)</help>
+                    </properties>
+                    <children>
+                      <leafNode name="ip-address">
+                        <properties>
+                          <help>IP address for Dynamic Authorization Extension server (DM/CoA)</help>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="port">
+                        <properties>
+                          <help>port for Dynamic Authorization Extension server (DM/CoA)</help>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="secret">
+                        <properties>
+                          <help>secret for Dynamic Authorization Extension server (DM/CoA)</help>
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </node>
+                </children>
+              </node>
             </children>
           </node>
           <node name="client-ip-pool">
@@ -108,14 +188,38 @@
               </leafNode>
             </children>
           </node>
+
+          <node name="client-ipv6-pool">
+            <properties>
+              <help>pool of client IP space</help>
+            </properties>
+            <children>
+              <leafNode name="prefix">
+                <properties>
+                  <help>format: ipv6prefix/mask,prefix_len (e.g.: fc00:0:1::/48,64 - divides prefix into /64 subnets for clients)</help>
+                  <multi />
+                </properties>
+              </leafNode>
+              <leafNode name="delegate-prefix">
+                <properties>
+                  <help>format: ipv6prefix/mask,prefix_len (delegate to clients through DHCPv6 prefix delegation - rfc3633)</help>
+                  <multi />
+                </properties>
+              </leafNode>
+            </children>
+          </node>
           <node name="dns-servers">
             <properties>
-              <help>Domain Name Service (DNS) server</help>
+              <help>IPv4 Domain Name Service (DNS) server</help>
             </properties>
             <children>
             <leafNode name="server-1">
               <properties>
                 <help>Primary DNS server</help>
+                <valueHelp>
+                  <format>ipv4</format>
+                  <description>IPv4 address</description>
+                </valueHelp>
                 <constraint>
                   <validator name="ipv4-address"/>
                 </constraint>
@@ -124,6 +228,10 @@
             <leafNode name="server-2">
               <properties>
                 <help>Secondary DNS server</help>
+                <valueHelp>
+                  <format>ipv4</format>
+                  <description>IPv4 address</description>
+                </valueHelp>
                 <constraint>
                   <validator name="ipv4-address"/>
                 </constraint>
@@ -131,6 +239,49 @@
             </leafNode>
             </children>
           </node> 
+           <node name="dnsv6-servers">
+            <properties>
+              <help>IPv6 Domain Name Service (DNS) server</help>
+            </properties>
+            <children>
+              <leafNode name="server-1">
+                <properties>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address</description>
+                  </valueHelp>
+                  <help>Primary DNS server</help>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="server-2">
+                <properties>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address</description>
+                  </valueHelp>
+                  <help>Secondary DNS server</help>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="server-3">
+                <properties>
+                  <valueHelp>
+                    <format>ipv6</format>
+                  <description>IPv6 address</description>
+                  </valueHelp>
+                  <help>Tertiary DNS server</help>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
           <leafNode name="interface">
             <properties>
               <help>interface(s) to listen on</help>
@@ -150,12 +301,38 @@
           </leafNode>
           <leafNode name="mtu">
             <properties>
-              <help>Maximum Transmission Unit (MTU) - default 1440</help>
+              <help>Maximum Transmission Unit (MTU) - default 1492</help>
               <constraint>
               <validator name="numeric" argument="--range 128-16384"/>
               </constraint>
             </properties>
           </leafNode>
+          <node name="limits">
+            <properties>
+              <help>limits the connection rate from a single source</help>
+            </properties>
+            <children>
+              <leafNode name="connection-limit">
+                <properties>
+                  <help>acceptable rate of connections (e.g. 1/min, 60/sec)</help>
+                  <constraint>
+                    <regex>^[0-9]+\/(min|sec)$</regex>
+                  </constraint>
+                  <constraintErrorMessage>illegal value</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="burst">
+                <properties>
+                  <help>burst count</help>
+                </properties>
+              </leafNode>
+              <leafNode name="timeout">
+                <properties>
+                  <help>timeout in seconds</help>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
           <node name="radius">
             <properties>
               <help>RADIUS settings</help>
@@ -207,6 +384,173 @@
               </leafNode>
             </children>
           </node>
+          <node name="ppp-options">
+            <children>
+              <leafNode name="min-mtu">
+                <properties>
+                  <help>minimum acceptable MTU (68-65535)</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 68-65535"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="mru">
+                <properties>
+                  <help>preferred MRU (68-65535)</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 68-65535"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="ccp">
+                <properties>
+                  <help>ccp negotiation (default disabled)</help>
+                  <valueless />
+                </properties>
+              </leafNode>
+              <node name="mppe">
+                <properties>
+                  <help>specifies mppe negotiation preference. (default prefer mppe)</help>
+                </properties>
+                <children>
+                  <leafNode name="require">
+                    <properties>
+                      <help>ask client for mppe, if it rejects drop 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 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>
+              <leafNode name="ipv4">
+                <properties>
+                  <help>specify IPv4 (IPCP) negotiation algorithm</help>
+                  <constraint>
+                    <regex>^(deny|allow|prefer|require)</regex>
+                  </constraint>
+                  <constraintErrorMessage>invalid value</constraintErrorMessage>
+                  <valueHelp>
+                    <format>deny</format>
+                    <description>don't negotiate IPv4</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>allow</format>
+                    <description>negotiate IPv4 only if client requests</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>prefer</format>
+                    <description>ask client for IPv4 negotiation, don't fail if he rejects</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>require</format>
+                    <description>require IPv4 negotiation</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="ipv6">
+                <properties>
+                  <help>specify IPv6 (IPCP6) negotiation algorithm</help>
+                  <constraint>
+                    <regex>^(deny|allow|prefer|require)</regex>
+                  </constraint>
+                  <constraintErrorMessage>invalid value</constraintErrorMessage>
+                  <valueHelp>
+                    <format>deny</format>
+                    <description>don't negotiate IPv6</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>allow</format>
+                    <description>negotiate IPv6 only if client requests</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>prefer</format>
+                    <description>ask client for IPv6 negotiation, don't fail if he rejects</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>require</format>
+                    <description>require IPv6 negotiation</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="ipv6-intf-id">
+                <properties>
+                  <help>Specify fixed or random interface identifier for IPv6</help>
+                  <valueHelp>
+                    <format>random</format>
+                    <description>specify random interface identifier for IPv6</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>x:x:x:x</format>
+                    <description>specify interface identifier for IPv6</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="ipv6-peer-intf-id">
+                <properties>
+                  <help>specify peer interface identifier for IPv6</help>
+                  <valueHelp>
+                    <format>x:x:x:x</format>
+                    <description>specify interface identifier for IPv6</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>random</format>
+                    <description>specify a random interface identifier for IPv6</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>ipv4</format>
+                    <description>calculate interface identifier from IPv4 address, for example 192:168:0:1</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>calling-sid</format>
+                    <description>calculate interface identifier from calling-station-Id</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="ipv6-accept-peer-intf-id">
+                <properties>
+                  <help>accept peer's interface identifier</help>
+                  <valueless /> 
+                </properties>
+              </leafNode>
+
+
+            </children>
+          </node>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/syslog.xml b/interface-definitions/syslog.xml
index aafa91b55..a1479128c 100644
--- a/interface-definitions/syslog.xml
+++ b/interface-definitions/syslog.xml
@@ -520,6 +520,21 @@
                   </leafNode>
                 </children>
               </tagNode>
+              <node name="marker">
+                <properties>
+                  <help>mark messages sent to syslog</help>
+                </properties>
+                <children>
+                  <leafNode name="interval">
+                    <properties>
+                      <help>time interval how often a mark message is being sent in seconds (default: 1200)</help>
+                      <constraint>
+                        <validator name="numeric" argument="--positive"/>
+                      </constraint> 
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
             </children>
           </node>
           <tagNode name="file">