xml: accel-ppp: move building blocks to subfolder

As the amount of include files now has reached a certain amount, it is getting
more and more crowsded, thuse introducing "per topic" subdirectories on the
filesystem to keep a clean structure makes sense.

23 files changed, 76 insertions, 74 deletions

diff --git a/interface-definitions/include/accel-mtu-128-16384.xml.i b/interface-definitions/include/accel-mtu-128-16384.xml.i
deleted file mode 100644
index 7ee483056..000000000
--- a/interface-definitions/include/accel-mtu-128-16384.xml.i
+++ /dev/null
@@ -1,9 +0,0 @@
-          <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-auth-local-users.xml.i b/interface-definitions/include/accel-ppp/auth-local-users.xml.i
index 70a08c10e..308d6510d 100644
--- a/interface-definitions/include/accel-auth-local-users.xml.i
+++ b/interface-definitions/include/accel-ppp/auth-local-users.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-auth-local-users.xml.i -->
+<!-- include start from accel-ppp/auth-local-users.xml.i -->
 <node name="local-users">
   <properties>
     <help>Local user authentication for PPPoE server</help>
diff --git a/interface-definitions/include/accel-auth-mode.xml.i b/interface-definitions/include/accel-ppp/auth-mode.xml.i
index 81d687182..c1a87cfe3 100644
--- a/interface-definitions/include/accel-auth-mode.xml.i
+++ b/interface-definitions/include/accel-ppp/auth-mode.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-auth-mode.xml.i -->
+<!-- include start from accel-ppp/auth-mode.xml.i -->
 <leafNode name="mode">
   <properties>
     <help>Authentication mode used by this server</help>
diff --git a/interface-definitions/include/accel-auth-protocols.xml.i b/interface-definitions/include/accel-ppp/auth-protocols.xml.i
index c5cf743c6..d43266152 100644
--- a/interface-definitions/include/accel-auth-protocols.xml.i
+++ b/interface-definitions/include/accel-ppp/auth-protocols.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-auth-protocols.xml.i -->
+<!-- include start from accel-ppp/auth-protocols.xml.i -->
 <leafNode name="protocols">
   <properties>
     <help>Authentication protocol for remote access peer SSTP VPN</help>
diff --git a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i b/interface-definitions/include/accel-ppp/client-ip-pool-start-stop.xml.i
index b0668f93f..5f4132d13 100644
--- a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
+++ b/interface-definitions/include/accel-ppp/client-ip-pool-start-stop.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-client-ip-pool-start-stop.xml.i -->
+<!-- include start from accel-ppp/client-ip-pool-start-stop.xml.i -->
 <leafNode name="start">
   <properties>
     <help>First IP address in the pool</help>
diff --git a/interface-definitions/include/accel-client-ip-pool-subnet.xml.i b/interface-definitions/include/accel-ppp/client-ip-pool-subnet.xml.i
index 72f660c39..2dc71d3f9 100644
--- a/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
+++ b/interface-definitions/include/accel-ppp/client-ip-pool-subnet.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-client-ip-pool-subnet.xml.i -->
+<!-- include start from accel-ppp/client-ip-pool-subnet.xml.i -->
 <leafNode name="subnet">
   <properties>
     <help>Client IP subnet (CIDR notation)</help>
diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.i b/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
index 3608c2a0b..bd3dadf8d 100644
--- a/interface-definitions/include/accel-client-ipv6-pool.xml.i
+++ b/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-client-ipv6-pool.xml.i -->
+<!-- include start from accel-ppp/client-ipv6-pool.xml.i -->
 <node name="client-ipv6-pool">
   <properties>
     <help>Pool of client IPv6 addresses</help>
diff --git a/interface-definitions/include/accel-gateway-address.xml.i b/interface-definitions/include/accel-ppp/gateway-address.xml.i
index f7f9c721d..59f8b5023 100644
--- a/interface-definitions/include/accel-gateway-address.xml.i
+++ b/interface-definitions/include/accel-ppp/gateway-address.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-gateway-address.xml.i -->
+<!-- include start from accel-ppp/gateway-address.xml.i -->
 <leafNode name="gateway-address">
   <properties>
     <help>Gateway IP address</help>
diff --git a/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i b/interface-definitions/include/accel-ppp/lcp-echo-interval-failure.xml.i
index 26f010916..dd7ae1276 100644
--- a/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i
+++ b/interface-definitions/include/accel-ppp/lcp-echo-interval-failure.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-lcp-echo-interval-failure.xml.i -->
+<!-- include start from accel-ppp/lcp-echo-interval-failure.xml.i -->
 <leafNode name="lcp-echo-interval">
   <properties>
     <help>LCP echo-requests/sec</help>
diff --git a/interface-definitions/include/accel-lcp-echo-timeout.xml.i b/interface-definitions/include/accel-ppp/lcp-echo-timeout.xml.i
index a60ca7ace..a630bec32 100644
--- a/interface-definitions/include/accel-lcp-echo-timeout.xml.i
+++ b/interface-definitions/include/accel-ppp/lcp-echo-timeout.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-lcp-echo-timeout.xml.i -->
+<!-- include start from accel-ppp/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>
diff --git a/interface-definitions/include/accel-ppp/mtu-128-16384.xml.i b/interface-definitions/include/accel-ppp/mtu-128-16384.xml.i
new file mode 100644
index 000000000..b4008a63b
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/mtu-128-16384.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from accel-ppp/mtu-128-16384.xml.i -->
+<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>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-name-server.xml.i b/interface-definitions/include/accel-ppp/name-server.xml.i
index 68e4ae418..e744b384f 100644
--- a/interface-definitions/include/accel-name-server.xml.i
+++ b/interface-definitions/include/accel-ppp/name-server.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-name-server.xml.i -->
+<!-- include start from accel-ppp/name-server.xml.i -->
 <leafNode name="name-server">
   <properties>
     <help>Domain Name Server (DNS) propagated to client</help>
diff --git a/interface-definitions/include/accel-ppp-mppe.xml.i b/interface-definitions/include/accel-ppp/ppp-mppe.xml.i
index dbf231ebe..e8370180b 100644
--- a/interface-definitions/include/accel-ppp-mppe.xml.i
+++ b/interface-definitions/include/accel-ppp/ppp-mppe.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-ppp-mppe.xml.i -->
+<!-- include start from accel-ppp/ppp-mppe.xml.i -->
 <leafNode name="mppe">
   <properties>
     <help>Specifies mppe negotiation preferences</help>
diff --git a/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i b/interface-definitions/include/accel-ppp/radius-additions-disable-accounting.xml.i
index 209f7a5f8..c723c3174 100644
--- a/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
+++ b/interface-definitions/include/accel-ppp/radius-additions-disable-accounting.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-radius-additions-disable-accounting.xml.i -->
+<!-- include start from accel-ppp/radius-additions-disable-accounting.xml.i -->
 <leafNode name="disable-accounting">
   <properties>
     <help>Disable accounting</help>
diff --git a/interface-definitions/include/accel-radius-additions-rate-limit.xml.i b/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i
index 8c37c62d1..be49fce5a 100644
--- a/interface-definitions/include/accel-radius-additions-rate-limit.xml.i
+++ b/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-radius-additions-rate-limit.xml.i -->
+<!-- include start from accel-ppp/radius-additions-rate-limit.xml.i -->
 <node name="rate-limit">
   <properties>
     <help>Upload/Download speed limits</help>
diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-ppp/radius-additions.xml.i
index 3df0f88fa..e65088c43 100644
--- a/interface-definitions/include/accel-radius-additions.xml.i
+++ b/interface-definitions/include/accel-ppp/radius-additions.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-radius-additions.xml.i -->
+<!-- include start from accel-ppp/radius-additions.xml.i -->
 <node name="radius">
   <children>
     <leafNode name="acct-interim-jitter">
@@ -29,7 +29,7 @@
           </properties>
           <defaultValue>1813</defaultValue>
         </leafNode>
-        #include <include/accel-radius-additions-disable-accounting.xml.i>
+        #include <include/accel-ppp/radius-additions-disable-accounting.xml.i>
         <leafNode name="fail-time">
           <properties>
             <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
diff --git a/interface-definitions/include/accel-wins-server.xml.i b/interface-definitions/include/accel-ppp/wins-server.xml.i
index 6d5d3d301..f7f483f59 100644
--- a/interface-definitions/include/accel-wins-server.xml.i
+++ b/interface-definitions/include/accel-ppp/wins-server.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from accel-wins-server.xml.i -->
+<!-- include start from accel-ppp/wins-server.xml.i -->
 <leafNode name="wins-server">
   <properties>
     <help>Windows Internet Name Service (WINS) servers propagated to client</help>
diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in
index c54de58f5..d0a05aea6 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.i>
-          #include <include/accel-client-ipv6-pool.xml.i>
+          #include <include/accel-ppp/name-server.xml.i>
+          #include <include/accel-ppp/client-ipv6-pool.xml.i>
           <node name="authentication">
             <properties>
               <help>Client authentication methods</help>
@@ -198,7 +198,7 @@
                 </children>
               </tagNode>
               #include <include/radius-server-ipv4.xml.i>
-              #include <include/accel-radius-additions.xml.i>
+              #include <include/accel-ppp/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 5c0a66527..1d3e8ba29 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -23,14 +23,14 @@
               <help>Authentication for remote access PPPoE Server</help>
             </properties>
             <children>
-              #include <include/accel-auth-local-users.xml.i>
-              #include <include/accel-auth-mode.xml.i>
-              #include <include/accel-auth-protocols.xml.i>
+              #include <include/accel-ppp/auth-local-users.xml.i>
+              #include <include/accel-ppp/auth-mode.xml.i>
+              #include <include/accel-ppp/auth-protocols.xml.i>
               #include <include/radius-server-ipv4.xml.i>
-              #include <include/accel-radius-additions.xml.i>
+              #include <include/accel-ppp/radius-additions.xml.i>
               <node name="radius">
                 <children>
-                  #include <include/accel-radius-additions-rate-limit.xml.i>
+                  #include <include/accel-ppp/radius-additions-rate-limit.xml.i>
                   <leafNode name="called-sid-format">
                     <properties>
                       <help>Format of Called-Station-Id attribute</help>
@@ -60,12 +60,12 @@
               <help>Pool of client IP addresses (must be within a /24)</help>
             </properties>
             <children>
-              #include <include/accel-client-ip-pool-start-stop.xml.i>
-              #include <include/accel-client-ip-pool-subnet.xml.i>
+              #include <include/accel-ppp/client-ip-pool-start-stop.xml.i>
+              #include <include/accel-ppp/client-ip-pool-subnet.xml.i>
             </children>
           </node>
-          #include <include/accel-client-ipv6-pool.xml.i>
-          #include <include/accel-name-server.xml.i>
+          #include <include/accel-ppp/client-ipv6-pool.xml.i>
+          #include <include/accel-ppp/name-server.xml.i>
           <tagNode name="interface">
             <properties>
               <help>interface(s) to listen on</help>
@@ -95,8 +95,8 @@
               </leafNode>
             </children>
           </tagNode>
-          #include <include/accel-gateway-address.xml.i>
-          #include <include/accel-mtu-128-16384.xml.i>
+          #include <include/accel-ppp/gateway-address.xml.i>
+          #include <include/accel-ppp/mtu-128-16384.xml.i>
           <node name="limits">
             <properties>
               <help>Limits the connection rate from a single source</help>
@@ -133,7 +133,7 @@
               <multi/>
             </properties>
           </leafNode>
-          #include <include/accel-wins-server.xml.i>
+          #include <include/accel-ppp/wins-server.xml.i>
           <node name="ppp-options">
             <properties>
               <help>Advanced protocol options</help>
@@ -161,9 +161,9 @@
                   <valueless />
                 </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>
+              #include <include/accel-ppp/ppp-mppe.xml.i>
+              #include <include/accel-ppp/lcp-echo-interval-failure.xml.i>
+              #include <include/accel-ppp/lcp-echo-timeout.xml.i>
               <leafNode name="ipv4">
                 <properties>
                   <help>IPv4 (IPCP) negotiation algorithm</help>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index 3a6c8a992..2d8a8503d 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -12,7 +12,7 @@
               <help>Remote access L2TP VPN</help>
             </properties>
             <children>
-              #include <include/accel-mtu-128-16384.xml.i>
+              #include <include/accel-ppp/mtu-128-16384.xml.i>
               <leafNode name="outside-address">
                 <properties>
                   <help>External IP address to which VPN clients will connect</help>
@@ -21,8 +21,8 @@
                   </constraint>
                 </properties>
               </leafNode>
-              #include <include/accel-gateway-address.xml.i>
-              #include <include/accel-name-server.xml.i>
+              #include <include/accel-ppp/gateway-address.xml.i>
+              #include <include/accel-ppp/name-server.xml.i>
               <node name="lns">
                 <properties>
                   <help>L2TP Network Server (LNS)</help>
@@ -143,17 +143,17 @@
                   </leafNode>
                 </children>
               </node>
-              #include <include/accel-wins-server.xml.i>
+              #include <include/accel-ppp/wins-server.xml.i>
               <node name="client-ip-pool">
                 <properties>
                   <help>Pool of client IP addresses (must be within a /24)</help>
                 </properties>
                 <children>
-                  #include <include/accel-client-ip-pool-start-stop.xml.i>
-                  #include <include/accel-client-ip-pool-subnet.xml.i>
+                  #include <include/accel-ppp/client-ip-pool-start-stop.xml.i>
+                  #include <include/accel-ppp/client-ip-pool-subnet.xml.i>
                 </children>
               </node>
-              #include <include/accel-client-ipv6-pool.xml.i>
+              #include <include/accel-ppp/client-ipv6-pool.xml.i>
               <leafNode name="description">
                 <properties>
                   <help>Description for L2TP remote-access settings</help>
@@ -209,15 +209,15 @@
                       <multi />
                     </properties>
                   </leafNode>
-                  #include <include/accel-ppp-mppe.xml.i>
-                  #include <include/accel-auth-mode.xml.i>
-                  #include <include/accel-auth-local-users.xml.i>
+                  #include <include/accel-ppp/ppp-mppe.xml.i>
+                  #include <include/accel-ppp/auth-mode.xml.i>
+                  #include <include/accel-ppp/auth-local-users.xml.i>
                   #include <include/radius-server-ipv4.xml.i>
                   <node name="radius">
                     <children>
                       <tagNode name="server">
                         <children>
-                          #include <include/accel-radius-additions-disable-accounting.xml.i>
+                          #include <include/accel-ppp/radius-additions-disable-accounting.xml.i>
                           <leafNode name="fail-time">
                             <properties>
                               <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
@@ -307,7 +307,7 @@
                   <help>Advanced protocol options</help>
                 </properties>
                 <children>
-                  #include <include/accel-lcp-echo-interval-failure.xml.i>
+                  #include <include/accel-ppp/lcp-echo-interval-failure.xml.i>
                 </children>
               </node>
             </children>
diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in
index 054e027fc..f64aa7f23 100644
--- a/interface-definitions/vpn_openconnect.xml.in
+++ b/interface-definitions/vpn_openconnect.xml.in
@@ -190,7 +190,7 @@
                   </leafNode>
                 </children>
               </node>
-              #include <include/accel-name-server.xml.i>
+              #include <include/accel-ppp/name-server.xml.i>
             </children>
           </node>
       </children>
diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index 72eda8752..7cf584a18 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -12,7 +12,7 @@
               <help>Remote access PPTP VPN</help>
             </properties>
             <children>
-              #include <include/accel-mtu-128-16384.xml.i>
+              #include <include/accel-ppp/mtu-128-16384.xml.i>
               <leafNode name="outside-address">
                 <properties>
                   <help>External IP address to which VPN clients will connect</help>
@@ -34,16 +34,16 @@
                   <multi/>
                 </properties>
               </leafNode>
-              #include <include/accel-wins-server.xml.i>
+              #include <include/accel-ppp/wins-server.xml.i>
               <node name="client-ip-pool">
                 <properties>
                   <help>Pool of client IP addresses (must be within a /24)</help>
                 </properties>
                 <children>
-                  #include <include/accel-client-ip-pool-start-stop.xml.i>
+                  #include <include/accel-ppp/client-ip-pool-start-stop.xml.i>
                 </children>
               </node>
-              #include <include/accel-gateway-address.xml.i>
+              #include <include/accel-ppp/gateway-address.xml.i>
               <node name="authentication">
                 <properties>
                   <help>Authentication for remote access PPTP VPN</help>
@@ -93,7 +93,7 @@
                       </completionHelp>
                     </properties>
                   </leafNode>
-                  #include <include/accel-auth-mode.xml.i>
+                  #include <include/accel-ppp/auth-mode.xml.i>
                   <node name="local-users">
                     <properties>
                       <help>Local user authentication for remote access PPTP VPN</help>
@@ -120,7 +120,7 @@
                     </children>
                   </node>
                   #include <include/radius-server-ipv4.xml.i>
-                  #include <include/accel-radius-additions.xml.i>
+                  #include <include/accel-ppp/radius-additions.xml.i>
                 </children>
               </node>
             </children>
diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in
index 45d65b3e7..e4ade844d 100644
--- a/interface-definitions/vpn_sstp.xml.in
+++ b/interface-definitions/vpn_sstp.xml.in
@@ -13,38 +13,38 @@
               <help>Authentication for remote access SSTP Server</help>
             </properties>
             <children>
-              #include <include/accel-auth-local-users.xml.i>
-              #include <include/accel-auth-mode.xml.i>
-              #include <include/accel-auth-protocols.xml.i>
+              #include <include/accel-ppp/auth-local-users.xml.i>
+              #include <include/accel-ppp/auth-mode.xml.i>
+              #include <include/accel-ppp/auth-protocols.xml.i>
               #include <include/radius-server-ipv4.xml.i>
-              #include <include/accel-radius-additions.xml.i>
+              #include <include/accel-ppp/radius-additions.xml.i>
               <node name="radius">
                 <children>
-                  #include <include/accel-radius-additions-rate-limit.xml.i>
+                  #include <include/accel-ppp/radius-additions-rate-limit.xml.i>
                 </children>
               </node>
             </children>
           </node>
           #include <include/interface/interface-mtu-68-1500.xml.i>
-          #include <include/accel-gateway-address.xml.i>
-          #include <include/accel-name-server.xml.i>
+          #include <include/accel-ppp/gateway-address.xml.i>
+          #include <include/accel-ppp/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>
+              #include <include/accel-ppp/client-ip-pool-subnet.xml.i>
             </children>
           </node>
-          #include <include/accel-client-ipv6-pool.xml.i>
+          #include <include/accel-ppp/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>
+              #include <include/accel-ppp/ppp-mppe.xml.i>
+              #include <include/accel-ppp/lcp-echo-interval-failure.xml.i>
+              #include <include/accel-ppp/lcp-echo-timeout.xml.i>
             </children>
           </node>
           <node name="ssl">