From 422eb463d413da812eabc28706e507a9910d7b53 Mon Sep 17 00:00:00 2001
From: aapostoliuk <a.apostoliuk@vyos.io>
Date: Mon, 13 Nov 2023 11:17:23 +0200
Subject: accel-ppp: T5688: Standardized pool configuration in accel-ppp

Standardized pool configuration for all accel-ppp services.
1. Only named pools are used now.
2. Allows all services to use range in x.x.x.x/mask
   and x.x.x.x-x.x.x.y format
3. next-pool can be used in all services
2. Allows to use in ipoe gw-ip-address without pool configuration
   which allows to use Fraimed-IP-Address attribute by radius.
3. Default pool name should be explicidly configured
   with default-pool.
4. In ipoe netmask and range subnet can be different.
---
 interface-definitions/vpn-pptp.xml.in | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'interface-definitions/vpn-pptp.xml.in')

diff --git a/interface-definitions/vpn-pptp.xml.in b/interface-definitions/vpn-pptp.xml.in
index 964c4d21e..96f87f3e2 100644
--- a/interface-definitions/vpn-pptp.xml.in
+++ b/interface-definitions/vpn-pptp.xml.in
@@ -23,17 +23,10 @@
                   </constraint>
                 </properties>
               </leafNode>
+              #include <include/accel-ppp/gateway-address.xml.i>
               #include <include/name-server-ipv4.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-ppp/client-ip-pool-start-stop.xml.i>
-                </children>
-              </node>
-              #include <include/accel-ppp/gateway-address.xml.i>
+              #include <include/accel-ppp/client-ip-pool.xml.i>
               <node name="authentication">
                 <properties>
                   <help>Authentication for remote access PPTP VPN</help>
@@ -118,6 +111,7 @@
                   #include <include/accel-ppp/radius-additions.xml.i>
                 </children>
               </node>
+              #include <include/accel-ppp/default-pool.xml.i>
             </children>
           </node>
         </children>
-- 
cgit v1.2.3