Merge pull request #1988 from sever-sever/T5213

T5213: Add accounting-interim-interval option for L2TP/PPTP servers

2 files changed, 9 insertions, 1 deletions

diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index 65623c2b1..ffac3b023 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2019-2020 VyOS maintainers and contributors
+# Copyright (C) 2019-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -63,6 +63,7 @@ default_config_data = {
     'ppp_ipv6_peer_intf_id': None,
     'radius_server': [],
     'radius_acct_inter_jitter': '',
+    'radius_acct_interim_interval': None,
     'radius_acct_tmo': '3',
     'radius_max_try': '3',
     'radius_timeout': '3',
@@ -190,6 +191,9 @@ def get_config(config=None):
         # advanced radius-setting
         conf.set_level(base_path + ['authentication', 'radius'])
 
+        if conf.exists(['accounting-interim-interval']):
+            l2tp['radius_acct_interim_interval'] = conf.return_value(['accounting-interim-interval'])
+
         if conf.exists(['acct-interim-jitter']):
             l2tp['radius_acct_inter_jitter'] = conf.return_value(['acct-interim-jitter'])
 
diff --git a/src/conf_mode/vpn_pptp.py b/src/conf_mode/vpn_pptp.py
index 986a19972..b9d18110a 100755
--- a/src/conf_mode/vpn_pptp.py
+++ b/src/conf_mode/vpn_pptp.py
@@ -37,6 +37,7 @@ default_pptp = {
     'local_users' : [],
     'radius_server' : [],
     'radius_acct_inter_jitter': '',
+    'radius_acct_interim_interval': None,
     'radius_acct_tmo' : '30',
     'radius_max_try' : '3',
     'radius_timeout' : '30',
@@ -145,6 +146,9 @@ def get_config(config=None):
         # advanced radius-setting
         conf.set_level(base_path + ['authentication', 'radius'])
 
+        if conf.exists(['accounting-interim-interval']):
+            pptp['radius_acct_interim_interval'] = conf.return_value(['accounting-interim-interval'])
+
         if conf.exists(['acct-interim-jitter']):
             pptp['radius_acct_inter_jitter'] = conf.return_value(['acct-interim-jitter'])