summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-03-21 09:52:40 +0100
committerGitHub <noreply@github.com>2023-03-21 09:52:40 +0100
commitcb26936dc0994f42dc457b5f7ea82b14583ab8a9 (patch)
tree7e55dadbb60b5280bca65f2f02c4d0d7c6c91082
parent71cea18861d05c146af77120c73d93ca95bfb5d1 (diff)
parent616c5b38ec2f26fd589b3a01dbc4c2bf9b4d22c1 (diff)
downloadvyos-1x-cb26936dc0994f42dc457b5f7ea82b14583ab8a9.tar.gz
vyos-1x-cb26936dc0994f42dc457b5f7ea82b14583ab8a9.zip
Merge pull request #1899 from rgwan/current
pppoe: T5098: allow user to set pppd holdoff option
-rw-r--r--data/templates/pppoe/peer.j24
-rw-r--r--interface-definitions/interfaces-pppoe.xml.in14
2 files changed, 18 insertions, 0 deletions
diff --git a/data/templates/pppoe/peer.j2 b/data/templates/pppoe/peer.j2
index 5e650fa3b..f30cefe63 100644
--- a/data/templates/pppoe/peer.j2
+++ b/data/templates/pppoe/peer.j2
@@ -65,6 +65,10 @@ mru {{ mtu }}
noipv6
{% endif %}
+{% if holdoff is vyos_defined %}
+holdoff {{ holdoff }}
+{% endif %}
+
{% if connect_on_demand is vyos_defined %}
demand
# See T2249. PPP default route options should only be set when in on-demand
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index c6fd7096b..b78f92c85 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -50,6 +50,20 @@
<constraintErrorMessage>Host-uniq must be specified as hex-adecimal byte-string (even number of HEX characters)</constraintErrorMessage>
</properties>
</leafNode>
+ <leafNode name="holdoff">
+ <properties>
+ <help>Delay before re-dial to the access concentrator when PPP session terminated by peer (in seconds)</help>
+ <valueHelp>
+ <format>u32:0-86400</format>
+ <description>Holdoff time in seconds</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 0-86400"/>
+ </constraint>
+ <constraintErrorMessage>Holdoff must be in range 0 to 86400</constraintErrorMessage>
+ </properties>
+ <defaultValue>30</defaultValue>
+ </leafNode>
<node name="ip">
<properties>
<help>IPv4 routing parameters</help>