diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-08-31 17:35:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-31 17:35:01 +0200 |
| commit | cfb75337c242301a2f4bbeeb9e8106c01fee235c (patch) | |
| tree | 9395f103758bd6357193dc974da5b341be01262a | |
| parent | 8e9709002abf2ba5784153025511e296724ff128 (diff) | |
| parent | 0bf8c55386f0c3d684089c8bdc93e762fe7f7122 (diff) | |
| download | vyos-1x-cfb75337c242301a2f4bbeeb9e8106c01fee235c.tar.gz vyos-1x-cfb75337c242301a2f4bbeeb9e8106c01fee235c.zip | |
Merge pull request #2168 from sever-sever/T3546
T3546: PPPoE-server add extended scripts for RADIUS attributes
| -rw-r--r-- | data/templates/accel-ppp/pppoe.config.tmpl | 14 | ||||
| -rw-r--r-- | interface-definitions/service_pppoe-server.xml.in | 39 |
2 files changed, 53 insertions, 0 deletions
diff --git a/data/templates/accel-ppp/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl index b37004f5b..3e5c64eb8 100644 --- a/data/templates/accel-ppp/pppoe.config.tmpl +++ b/data/templates/accel-ppp/pppoe.config.tmpl @@ -17,6 +17,10 @@ net-snmp {% if limits is defined %} connlimit {% endif %} +{% if extended_scripts is defined %} +sigchld +pppd_compat +{% endif %} [core] thread-count={{ thread_count }} @@ -167,5 +171,15 @@ timeout={{ limits.timeout }} {# Common RADIUS shaper configuration #} {% include 'accel-ppp/config_shaper_radius.j2' %} +{% if extended_scripts is defined %} +[pppd-compat] +verbose=1 +radattr-prefix=/run/accel-pppd/radattr +{% set script_name = {'on_up': 'ip-up', 'on_down': 'ip-down', 'on_change':'ip-change', 'on_pre_up':'ip-pre-up'} %} +{% for script in extended_scripts %} +{{ script_name[script] }}={{ extended_scripts[script] }} +{% endfor %} +{% endif %} + [cli] tcp=127.0.0.1:2001 diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 65868226b..876aadcf7 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -340,6 +340,45 @@ </leafNode> </children> </node> + <node name="extended-scripts"> + <properties> + <help>Extended script execution</help> + </properties> + <children> + <leafNode name="on-pre-up"> + <properties> + <help>Script to run before PPPoE session interface comes up</help> + <constraint> + <validator name="script"/> + </constraint> + </properties> + </leafNode> + <leafNode name="on-up"> + <properties> + <help>Script to run when PPPoE session interface is completely configured and started</help> + <constraint> + <validator name="script"/> + </constraint> + </properties> + </leafNode> + <leafNode name="on-down"> + <properties> + <help>Script to run when PPPoE session interface going to terminate</help> + <constraint> + <validator name="script"/> + </constraint> + </properties> + </leafNode> + <leafNode name="on-change"> + <properties> + <help>Script to run when PPPoE session interface changed by RADIUS CoA handling</help> + <constraint> + <validator name="script"/> + </constraint> + </properties> + </leafNode> + </children> + </node> </children> </node> </children> |