From 7d49508480446febe4ed0de929f83ea923c98324 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 29 Mar 2021 20:34:43 +0200 Subject: protocols: fix interface.ipv6 vs. device.ipv6 option conflict Ref: https://forum.openwrt.org/t/pppoe-disable-ipv6/92548 Signed-off-by: Jo-Philipp Wich --- protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js | 3 ++- protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js | 3 ++- protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js | 3 ++- protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js | 3 ++- .../luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js | 3 ++- .../luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js | 3 ++- protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js | 3 ++- .../htdocs/luci-static/resources/protocol/pppossh.js | 3 ++- protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js | 3 ++- .../luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js index 12acb74d9f..7dab110207 100644 --- a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js +++ b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js @@ -102,7 +102,8 @@ return network.registerProtocol('3g', { o.placeholder = '*99***1#'; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address')); + o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); o.value('1', _('Manual')); diff --git a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js index 8496b7de3c..3195592d97 100644 --- a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js +++ b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js @@ -94,7 +94,8 @@ return network.registerProtocol('ncm', { o.placeholder = '*99***1#'; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address')); + o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); o.value('1', _('Manual')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js index 4ea0e2f7d0..4cf4d82701 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js @@ -46,7 +46,8 @@ return network.registerProtocol('l2tp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); o.value('1', _('Manual')); 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 f5a484f357..6df468f9e3 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 @@ -90,7 +90,8 @@ return network.registerProtocol('ppp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); o.value('1', _('Manual')); 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 495a581a6c..ef2b18d62c 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 @@ -77,7 +77,8 @@ return network.registerProtocol('pppoa', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); o.value('1', _('Manual')); 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 9ec2a81d3e..0279830899 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 @@ -51,7 +51,8 @@ return network.registerProtocol('pppoe', { o.placeholder = _('auto'); if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); o.value('1', _('Manual')); 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 871fb34b4c..9ae683a296 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 @@ -64,7 +64,8 @@ return network.registerProtocol('pptp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); o.value('1', _('Manual')); diff --git a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js index 3c233f1e1b..54035eb23e 100644 --- a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js +++ b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js @@ -90,7 +90,8 @@ return network.registerProtocol('pppossh', { o.datatype = 'ipaddr("nomask")'; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.Flag, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o.ucioption = 'ipv6'; o.default = o.disabled; } diff --git a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js index 6a8c2b6ac5..de5bf49351 100644 --- a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js +++ b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js @@ -86,7 +86,8 @@ return network.registerProtocol('qmi', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.Flag, 'ipv6', _('Enable IPv6 negotiation')); + o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('Enable IPv6 negotiation')); + o.ucioption = 'ipv6'; o.default = o.disabled; } diff --git a/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js b/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js index b568f17018..6a23407b50 100644 --- a/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js +++ b/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js @@ -48,7 +48,8 @@ return network.registerProtocol('sstp', { // -- advanced -------------------------------------------------------------------- - o = s.taboption('advanced', form.Flag, 'ipv6', _('IPv6 support'), _('If checked, adds "+ipv6" to the pppd options')); + o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('IPv6 support'), _('If checked, adds "+ipv6" to the pppd options')); + o.ucioption = 'ipv6'; o = s.taboption('advanced', form.ListValue, 'log_level', _('sstpc Log-level')); o.value('0', _('0', 'sstp log level value')); -- cgit v1.2.3