Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: remove rendundant proto handler options

Browse source 
The introduction of network device configuration support also implemented
all common, protocol-independent interface options directly in the
interface config view, so drop the redundant option definitions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 171ef77e89)
This commit is contained in:
Jo-Philipp Wich 2020-08-06 20:58:35 +02:00 committed by Rafał Miłecki
parent 17a62e0f4e
commit 9eee69a62e
23 changed files with 1 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js
View file

@ -34,21 +34,6 @@ return network.registerProtocol('dhcp', {
o = s.taboption('advanced', form.Flag, 'broadcast', _('Use broadcast flag'), _('Required for certain ISPs, e.g. Charter with DOCSIS 3'));
o.default = o.disabled;
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o = s.taboption('advanced', form.Value, 'clientid', _('Client ID to send when requesting DHCP'));
o.datatype = 'hexstring';

30
modules/luci-base/htdocs/luci-static/resources/protocol/static.js
View file

@ -179,28 +179,6 @@ return network.registerProtocol('static', {
s.taboption('general', this.CBINetmaskValue, 'netmask', _('IPv4 netmask'));
s.taboption('general', this.CBIGatewayValue, 'gateway', _('IPv4 gateway'));
s.taboption('general', this.CBIBroadcastValue, 'broadcast', _('IPv4 broadcast'));
s.taboption('general', form.DynamicList, 'dns', _('Use custom DNS servers'));
o = s.taboption('general', form.Value, 'ip6assign', _('IPv6 assignment length'), _('Assign a part of given length of every public IPv6-prefix to this interface'));
o.value('', _('disabled'));
o.value('64');
o.datatype = 'max(64)';
o = s.taboption('general', form.Value, 'ip6hint', _('IPv6 assignment hint'), _('Assign prefix parts using this hexadecimal subprefix ID for this interface.'));
o.placeholder = '0';
o.validate = function(section_id, value) {
if (value == null || value == '')
return true;
var n = parseInt(value, 16);
if (!/^(0x)?[0-9a-fA-F]+$/.test(value) || isNaN(n) || n >= 0xffffffff)
return _('Expecting a hexadecimal assignment hint');
return true;
};
for (var i = 33; i <= 64; i++)
o.depends('ip6assign', String(i));
o = s.taboption('general', form.DynamicList, 'ip6addr', _('IPv6 address'));
o.datatype = 'ip6addr';
@ -215,10 +193,6 @@ return network.registerProtocol('static', {
o.datatype = 'ip6addr';
o.depends('ip6assign', '');
o = s.taboption('general', form.Value, 'ip6ifaceid', _('IPv6 suffix'), _("Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or '::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating server, use the suffix (like '::1') to form the IPv6 address ('a:b:c:d::1') for the interface."));
o.datatype = 'ip6hostid';
o.placeholder = '::1';
o = s.taboption('advanced', form.Value, 'macaddr', _('Override MAC address'));
o.datatype = 'macaddr';
o.placeholder = dev ? (dev.getMAC() || '') : '';
@ -226,9 +200,5 @@ return network.registerProtocol('static', {
o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
o.datatype = 'max(9200)';
o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = this.getMetric() || '0';
o.datatype = 'uinteger';
}
});

15
protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
View file

@ -113,21 +113,6 @@ return network.registerProtocol('3g', {
o.placeholder = '10';
o.datatype = 'min(1)';
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
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 = '0';
o.datatype = 'uinteger';

4
protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js
View file

@ -24,10 +24,6 @@ return network.registerProtocol('hnet', {
o.value('hybrid', _('Hybrid'));
o.default = 'auto';
o = s.taboption('advanced', form.Value, 'ip6assign', _('IPv6 assignment length'), _('Assign a part of given length of every public IPv6-prefix to this interface'));
o.datatype = 'max(128)';
o.default = '64';
s.taboption('advanced', form.Value, 'link_id', _('IPv6 assignment hint'), _('Assign prefix parts using this hexadecimal subprefix ID for this interface.'));
o = s.taboption('advanced', form.Value, 'ip4assign', _('IPv4 assignment length'));

8
protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js
View file

@ -45,14 +45,6 @@ return network.registerProtocol('464xlat', {
o.nocreate = true;
o.exclude = s.section;
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface'));
o.placeholder = '1280';
o.datatype = 'max(9200)';

8
protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js
View file

@ -82,14 +82,6 @@ return network.registerProtocol('6in4', {
o.password = true;
o.depends('_update', '1');
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface'));
o.placeholder = '64';
o.datatype = 'range(1,255)';

8
protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js
View file

@ -62,14 +62,6 @@ return network.registerProtocol('6rd', {
o.placeholder = '0';
o.datatype = 'range(0,32)';
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface'));
o.placeholder = '64';
o.datatype = 'range(1,255)';

8
protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js
View file

@ -46,14 +46,6 @@ return network.registerProtocol('6to4', {
}, this));
};
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface'));
o.placeholder = '64';
o.datatype = 'range(1,255)';

14
protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js
View file

@ -30,20 +30,6 @@ return network.registerProtocol('dhcpv6', {
o.value('64');
o.default = 'auto';
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'ip6prefix', _('Custom delegated IPv6-prefix'));
o.datatype = 'cidr6';
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'clientid', _('Client ID to send when requesting DHCP'));
o.datatype = 'hexstring';

8
protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js
View file

@ -64,14 +64,6 @@ return network.registerProtocol('dslite', {
for (var i = 0; i < 256; i++)
o.value(i);
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface'));
o.placeholder = '1280';
o.datatype = 'max(9200)';

8
protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js
View file

@ -77,14 +77,6 @@ return network.registerProtocol('map', {
o.nocreate = true;
o.exclude = s.section;
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface'));
o.placeholder = '64';
o.datatype = 'range(1,255)';

5
protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
View file

@ -120,11 +120,8 @@ return network.registerProtocol('modemmanager', {
o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
o.datatype = 'max(9200)';
o = s.taboption('general', form.Value, 'signalrate', _('Signal Refresh Rate'), _("In seconds"));
o.datatype = 'uinteger';
s.taboption('general', form.Value, 'metric', _('Gateway metric'));
}
});

15
protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
View file

@ -104,20 +104,5 @@ return network.registerProtocol('ncm', {
o = s.taboption('advanced', form.Value, 'delay', _('Modem init timeout'), _('Maximum amount of seconds to wait for the modem to become ready'));
o.placeholder = '10';
o.datatype = 'min(1)';
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
}
});

8
protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js
View file

@ -153,14 +153,6 @@ return network.registerProtocol('openconnect', {
return callSetCertificateFiles(section_id, null, null, sanitizeCert(value));
};
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', '1');
o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
o.optional = true;
o.placeholder = 1406;

15
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
View file

@ -53,21 +53,6 @@ return network.registerProtocol('l2tp', {
o.default = 'auto';
}
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
o.datatype = 'max(9200)';

15
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
View file

@ -97,21 +97,6 @@ return network.registerProtocol('ppp', {
o.default = 'auto';
}
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
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 = '0';
o.datatype = 'uinteger';

15
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
View file

@ -84,21 +84,6 @@ return network.registerProtocol('pppoa', {
o.default = 'auto';
}
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
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 = '0';
o.datatype = 'uinteger';

15
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
View file

@ -58,21 +58,6 @@ return network.registerProtocol('pppoe', {
o.default = 'auto';
}
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
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 = '0';
o.datatype = 'uinteger';

15
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
View file

@ -71,21 +71,6 @@ return network.registerProtocol('pptp', {
o.default = 'auto';
}
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
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 = '0';
o.datatype = 'uinteger';

15
protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
View file

@ -94,21 +94,6 @@ return network.registerProtocol('pppossh', {
o.default = o.disabled;
}
o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
o.default = o.enabled;
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
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 = '0';
o.datatype = 'uinteger';

16
protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js
View file

@ -58,22 +58,6 @@ return network.registerProtocol('sstp', {
o.value('4', _('4', 'sstp log level value'));
o.default = '0';
var defaultroute = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
defaultroute.default = defaultroute.enabled;
o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
o.placeholder = '0';
o.datatype = 'uinteger';
o.depends('defaultroute', defaultroute.enabled);
o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
o.default = o.enabled;
o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
o.depends('peerdns', '0');
o.datatype = 'ipaddr';
o.cast = 'string';
o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
o.datatype = 'max(9200)';

4
protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js
View file

@ -103,9 +103,5 @@ return network.registerProtocol('vpnc', {
o = s.taboption('general', form.Value, 'target_network', _('Target network'));
o.placeholder = '0.0.0.0/0';
o.datatype = 'network';
o = s.taboption('general', form.ListValue, 'defaultroute', _('Default Route'), _('Set VPN as Default Route'));
o.value('0', _('No'));
o.value('1', _('Yes'));
}
});

5
protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
View file

@ -89,11 +89,6 @@ return network.registerProtocol('wireguard', {
// -- advanced --------------------------------------------------------------------
o = s.taboption('advanced', form.Value, 'metric', _('Metric'), _('Optional'));
o.datatype = 'uinteger';
o.placeholder = '0';
o.optional = true;
o = s.taboption('advanced', form.Value, 'mtu', _('MTU'), _('Optional. Maximum Transmission Unit of tunnel interface.'));
o.datatype = 'range(1280,1420)';
o.placeholder = '1420';