From daf821a4a469f0412923c524d40d3380cb4b6fa2 Mon Sep 17 00:00:00 2001 From: Andy Chiang Date: Mon, 20 Oct 2025 00:52:53 +0700 Subject: [PATCH] luci-proto-ppp: add ac_mac and IPv6-PD options add ac_mac and IPv6-PD options Signed-off-by: Andy Chiang --- .../htdocs/luci-static/resources/protocol/ppp.js | 10 ++++++++++ .../luci-static/resources/protocol/pppoa.js | 10 ++++++++++ .../luci-static/resources/protocol/pppoe.js | 16 ++++++++++++++++ .../luci-static/resources/protocol/pptp.js | 10 ++++++++++ 4 files changed, 46 insertions(+) diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js index 6d3db0fbe3..f9761c222c 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js @@ -99,6 +99,16 @@ return network.registerProtocol('ppp', { o.default = 'auto'; } + o = s.taboption('advanced', form.Value, 'reqprefix', _('Request IPv6-prefix'), + _('Either a prefix length hint (e.g. 56) only, whereby the operator selects the prefix, or specify a prefix also (e.g. %s)') + .format('2001:db8::/56')); + o.depends("ppp_ipv6", "auto"); + + o = s.taboption('advanced', form.Flag, 'norelease', _('Do not send a Release when restarting'), _('Enable to minimise the chance of prefix change after a restart')); + o.depends("ppp_ipv6", "auto"); + o.default = '1'; + o.rmempty = false; + o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures')); o.placeholder = '5'; o.datatype = 'uinteger'; diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js index 8955d09725..5c3e87c8a9 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js @@ -85,6 +85,16 @@ return network.registerProtocol('pppoa', { o.default = 'auto'; } + o = s.taboption('advanced', form.Value, 'reqprefix', _('Request IPv6-prefix'), + _('Either a prefix length hint (e.g. 56) only, whereby the operator selects the prefix, or specify a prefix also (e.g. %s)') + .format('2001:db8::/56')); + o.depends("ppp_ipv6", "auto"); + + o = s.taboption('advanced', form.Flag, 'norelease', _('Do not send a Release when restarting'), _('Enable to minimise the chance of prefix change after a restart')); + o.depends("ppp_ipv6", "auto"); + o.default = '1'; + o.rmempty = false; + o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures')); o.placeholder = '5'; o.datatype = 'uinteger'; diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js index 5fbeca8c10..d66da8a021 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js @@ -47,6 +47,12 @@ return network.registerProtocol('pppoe', { o = s.taboption('general', form.Value, 'ac', _('Access Concentrator'), _('Leave empty to autodetect')); o.placeholder = _('auto'); + o = s.taboption('general', form.Value, 'ac_mac', + '%s'.format(_('Access Concentrator'), _('AC')) + ' ' + _('MAC Address'), + _('Leave empty to autodetect')); + o.placeholder = _('auto'); + o.datatype = 'macaddr'; + o = s.taboption('general', form.Value, 'service', _('Service Name'), _('Leave empty to autodetect')); o.placeholder = _('auto'); @@ -59,6 +65,16 @@ return network.registerProtocol('pppoe', { o.default = 'auto'; } + o = s.taboption('advanced', form.Value, 'reqprefix', _('Request IPv6-prefix'), + _('Either a prefix length hint (e.g. 56) only, whereby the operator selects the prefix, or specify a prefix also (e.g. %s)') + .format('2001:db8::/56')); + o.depends("ppp_ipv6", "auto"); + + o = s.taboption('advanced', form.Flag, 'norelease', _('Do not send a Release when restarting'), _('Enable to minimise the chance of prefix change after a restart')); + o.depends("ppp_ipv6", "auto"); + o.default = '1'; + o.rmempty = false; + o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures')); o.placeholder = '5'; o.datatype = 'uinteger'; diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js index abb006700f..d65b079b7d 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js @@ -72,6 +72,16 @@ return network.registerProtocol('pptp', { o.default = 'auto'; } + o = s.taboption('advanced', form.Value, 'reqprefix', _('Request IPv6-prefix'), + _('Either a prefix length hint (e.g. 56) only, whereby the operator selects the prefix, or specify a prefix also (e.g. %s)') + .format('2001:db8::/56')); + o.depends("ppp_ipv6", "auto"); + + o = s.taboption('advanced', form.Flag, 'norelease', _('Do not send a Release when restarting'), _('Enable to minimise the chance of prefix change after a restart')); + o.depends("ppp_ipv6", "auto"); + o.default = '1'; + o.rmempty = false; + o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures')); o.placeholder = '5'; o.datatype = 'uinteger'; -- 2.30.2