diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-04-11 23:12:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 23:12:31 +0200 |
| commit | c04976f3ccfb5a739a679050a4238a2cfa1e81d8 (patch) | |
| tree | 1d7a5e9b7b83a76ca2769087be11172a021b608a /src/conf_mode | |
| parent | 14582acd1c7d169f6d50efc7aaf250fecff81740 (diff) | |
| parent | f62dffaa3121261925b4850fe0400dd33449e5f5 (diff) | |
| download | vyos-1x-c04976f3ccfb5a739a679050a4238a2cfa1e81d8.tar.gz vyos-1x-c04976f3ccfb5a739a679050a4238a2cfa1e81d8.zip | |
Merge pull request #1953 from sever-sever/T4727-curr
T4727: Change and fix RADIUS rate-limit option for pptp
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/vpn_pptp.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/conf_mode/vpn_pptp.py b/src/conf_mode/vpn_pptp.py index 7550c411e..986a19972 100755 --- a/src/conf_mode/vpn_pptp.py +++ b/src/conf_mode/vpn_pptp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2020 VyOS maintainers and contributors +# Copyright (C) 2018-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 @@ -44,6 +44,8 @@ default_pptp = { 'radius_nas_ip' : '', 'radius_source_address' : '', 'radius_shaper_attr' : '', + 'radius_shaper_enable': False, + 'radius_shaper_multiplier': '', 'radius_shaper_vendor': '', 'radius_dynamic_author' : '', 'chap_secrets_file': pptp_chap_secrets, # used in Jinja2 template @@ -183,15 +185,18 @@ def get_config(config=None): pptp['radius_dynamic_author'] = dae + # Rate limit + if conf.exists(['rate-limit', 'attribute']): + pptp['radius_shaper_attr'] = conf.return_value(['rate-limit', 'attribute']) + if conf.exists(['rate-limit', 'enable']): - pptp['radius_shaper_attr'] = 'Filter-Id' - c_attr = ['rate-limit', 'enable', 'attribute'] - if conf.exists(c_attr): - pptp['radius_shaper_attr'] = conf.return_value(c_attr) - - c_vendor = ['rate-limit', 'enable', 'vendor'] - if conf.exists(c_vendor): - pptp['radius_shaper_vendor'] = conf.return_value(c_vendor) + pptp['radius_shaper_enable'] = True + + if conf.exists(['rate-limit', 'multiplier']): + pptp['radius_shaper_multiplier'] = conf.return_value(['rate-limit', 'multiplier']) + + if conf.exists(['rate-limit', 'vendor']): + pptp['radius_shaper_vendor'] = conf.return_value(['rate-limit', 'vendor']) conf.set_level(base_path) if conf.exists(['client-ip-pool']): |