mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
remove dns forward check
This commit is contained in:
parent
bc9117a3f3
commit
d02277c710
11 changed files with 4585 additions and 0 deletions
18
luci-mod-network/Makefile
Normal file
18
luci-mod-network/Makefile
Normal file
|
@ -0,0 +1,18 @@
|
|||
#
|
||||
# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
|
||||
#
|
||||
# This is free software, licensed under the Apache License, Version 2.0 .
|
||||
#
|
||||
# From https://github.com/openwrt/luci/commit/6efaea2ffb46f9909038b85cf12e7acf4467ae2e
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI Network Administration
|
||||
LUCI_DEPENDS:=+luci-base +libiwinfo-lua +rpcd-mod-iwinfo
|
||||
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
|
||||
include $(TOPDIR)/feeds/luci/luci.mk
|
||||
|
||||
# call BuildPackage - OpenWrt buildroot signature
|
||||
|
|
@ -0,0 +1,557 @@
|
|||
'use strict';
|
||||
'require rpc';
|
||||
'require uci';
|
||||
'require form';
|
||||
'require validation';
|
||||
|
||||
var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus, CBILease6Status;
|
||||
|
||||
callHostHints = rpc.declare({
|
||||
object: 'luci-rpc',
|
||||
method: 'getHostHints',
|
||||
expect: { '': {} }
|
||||
});
|
||||
|
||||
callDUIDHints = rpc.declare({
|
||||
object: 'luci-rpc',
|
||||
method: 'getDUIDHints',
|
||||
expect: { '': {} }
|
||||
});
|
||||
|
||||
callDHCPLeases = rpc.declare({
|
||||
object: 'luci-rpc',
|
||||
method: 'getDHCPLeases',
|
||||
expect: { '': {} }
|
||||
});
|
||||
|
||||
CBILeaseStatus = form.DummyValue.extend({
|
||||
renderWidget: function(section_id, option_id, cfgvalue) {
|
||||
return E([
|
||||
E('h4', _('Active DHCP Leases')),
|
||||
E('div', { 'id': 'lease_status_table', 'class': 'table' }, [
|
||||
E('div', { 'class': 'tr table-titles' }, [
|
||||
E('div', { 'class': 'th' }, _('Hostname')),
|
||||
E('div', { 'class': 'th' }, _('IPv4-Address')),
|
||||
E('div', { 'class': 'th' }, _('MAC-Address')),
|
||||
E('div', { 'class': 'th' }, _('Lease time remaining'))
|
||||
]),
|
||||
E('div', { 'class': 'tr placeholder' }, [
|
||||
E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
|
||||
])
|
||||
])
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
CBILease6Status = form.DummyValue.extend({
|
||||
renderWidget: function(section_id, option_id, cfgvalue) {
|
||||
return E([
|
||||
E('h4', _('Active DHCPv6 Leases')),
|
||||
E('div', { 'id': 'lease6_status_table', 'class': 'table' }, [
|
||||
E('div', { 'class': 'tr table-titles' }, [
|
||||
E('div', { 'class': 'th' }, _('Host')),
|
||||
E('div', { 'class': 'th' }, _('IPv6-Address')),
|
||||
E('div', { 'class': 'th' }, _('DUID')),
|
||||
E('div', { 'class': 'th' }, _('Lease time remaining'))
|
||||
]),
|
||||
E('div', { 'class': 'tr placeholder' }, [
|
||||
E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
|
||||
])
|
||||
])
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
function validateHostname(sid, s) {
|
||||
if (s.length > 256)
|
||||
return _('Expecting: %s').format(_('valid hostname'));
|
||||
|
||||
var labels = s.replace(/^\.+|\.$/g, '').split(/\./);
|
||||
|
||||
for (var i = 0; i < labels.length; i++)
|
||||
if (!labels[i].match(/^[a-z0-9_](?:[a-z0-9-]{0,61}[a-z0-9])?$/i))
|
||||
return _('Expecting: %s').format(_('valid hostname'));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function validateAddressList(sid, s) {
|
||||
if (s == null || s == '')
|
||||
return true;
|
||||
|
||||
var m = s.match(/^\/(.+)\/$/),
|
||||
names = m ? m[1].split(/\//) : [ s ];
|
||||
|
||||
for (var i = 0; i < names.length; i++) {
|
||||
var res = validateHostname(sid, names[i]);
|
||||
|
||||
if (res !== true)
|
||||
return res;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function validateServerSpec(sid, s) {
|
||||
if (s == null || s == '')
|
||||
return true;
|
||||
|
||||
var m = s.match(/^\/(.+)\/(.*)$/);
|
||||
if (!m)
|
||||
return _('Expecting: %s').format(_('valid hostname'));
|
||||
|
||||
var res = validateAddressList(sid, m[1]);
|
||||
if (res !== true)
|
||||
return res;
|
||||
|
||||
if (m[2] == '' || m[2] == '#')
|
||||
return true;
|
||||
|
||||
// ipaddr%scopeid#srvport@source@interface#srcport
|
||||
|
||||
m = m[2].match(/^([0-9a-f:.]+)(?:%[^#@]+)?(?:#(\d+))?(?:@([0-9a-f:.]+)(?:@[^#]+)?(?:#(\d+))?)?$/);
|
||||
|
||||
if (!m)
|
||||
return _('Expecting: %s').format(_('valid IP address'));
|
||||
else if (validation.parseIPv4(m[1]) && m[3] != null && !validation.parseIPv4(m[3]))
|
||||
return _('Expecting: %s').format(_('valid IPv4 address'));
|
||||
else if (validation.parseIPv6(m[1]) && m[3] != null && !validation.parseIPv6(m[3]))
|
||||
return _('Expecting: %s').format(_('valid IPv6 address'));
|
||||
else if ((m[2] != null && +m[2] > 65535) || (m[4] != null && +m[4] > 65535))
|
||||
return _('Expecting: %s').format(_('valid port value'));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return L.view.extend({
|
||||
load: function() {
|
||||
return Promise.all([
|
||||
callHostHints(),
|
||||
callDUIDHints()
|
||||
]);
|
||||
},
|
||||
|
||||
render: function(hosts_duids) {
|
||||
var has_dhcpv6 = L.hasSystemFeature('dnsmasq', 'dhcpv6') || L.hasSystemFeature('odhcpd'),
|
||||
hosts = hosts_duids[0],
|
||||
duids = hosts_duids[1],
|
||||
m, s, o, ss, so;
|
||||
|
||||
m = new form.Map('dhcp', _('DHCP and DNS'), _('Dnsmasq is a combined <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Server and <abbr title="Domain Name System">DNS</abbr>-Forwarder for <abbr title="Network Address Translation">NAT</abbr> firewalls'));
|
||||
|
||||
s = m.section(form.TypedSection, 'dnsmasq', _('Server Settings'));
|
||||
s.anonymous = true;
|
||||
s.addremove = false;
|
||||
|
||||
s.tab('general', _('General Settings'));
|
||||
s.tab('files', _('Resolv and Hosts Files'));
|
||||
s.tab('tftp', _('TFTP Settings'));
|
||||
s.tab('advanced', _('Advanced Settings'));
|
||||
s.tab('leases', _('Static Leases'));
|
||||
|
||||
s.taboption('general', form.Flag, 'domainneeded',
|
||||
_('Domain required'),
|
||||
_('Don\'t forward <abbr title="Domain Name System">DNS</abbr>-Requests without <abbr title="Domain Name System">DNS</abbr>-Name'));
|
||||
|
||||
s.taboption('general', form.Flag, 'authoritative',
|
||||
_('Authoritative'),
|
||||
_('This is the only <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr> in the local network'));
|
||||
|
||||
|
||||
s.taboption('files', form.Flag, 'readethers',
|
||||
_('Use <code>/etc/ethers</code>'),
|
||||
_('Read <code>/etc/ethers</code> to configure the <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Server'));
|
||||
|
||||
s.taboption('files', form.Value, 'leasefile',
|
||||
_('Leasefile'),
|
||||
_('file where given <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-leases will be stored'));
|
||||
|
||||
s.taboption('files', form.Flag, 'noresolv',
|
||||
_('Ignore resolve file')).optional = true;
|
||||
|
||||
o = s.taboption('files', form.Value, 'resolvfile',
|
||||
_('Resolve file'),
|
||||
_('local <abbr title="Domain Name System">DNS</abbr> file'));
|
||||
|
||||
o.depends('noresolv', '0');
|
||||
o.placeholder = '/tmp/resolv.conf.d/resolv.conf.auto';
|
||||
o.optional = true;
|
||||
|
||||
|
||||
s.taboption('files', form.Flag, 'nohosts',
|
||||
_('Ignore <code>/etc/hosts</code>')).optional = true;
|
||||
|
||||
s.taboption('files', form.DynamicList, 'addnhosts',
|
||||
_('Additional Hosts files')).optional = true;
|
||||
|
||||
o = s.taboption('advanced', form.Flag, 'quietdhcp',
|
||||
_('Suppress logging'),
|
||||
_('Suppress logging of the routine operation of these protocols'));
|
||||
o.optional = true;
|
||||
|
||||
o = s.taboption('advanced', form.Flag, 'sequential_ip',
|
||||
_('Allocate IP sequentially'),
|
||||
_('Allocate IP addresses sequentially, starting from the lowest available address'));
|
||||
o.optional = true;
|
||||
|
||||
o = s.taboption('advanced', form.Flag, 'boguspriv',
|
||||
_('Filter private'),
|
||||
_('Do not forward reverse lookups for local networks'));
|
||||
o.default = o.enabled;
|
||||
|
||||
s.taboption('advanced', form.Flag, 'filterwin2k',
|
||||
_('Filter useless'),
|
||||
_('Do not forward requests that cannot be answered by public name servers'));
|
||||
|
||||
|
||||
s.taboption('advanced', form.Flag, 'localise_queries',
|
||||
_('Localise queries'),
|
||||
_('Localise hostname depending on the requesting subnet if multiple IPs are available'));
|
||||
|
||||
if (L.hasSystemFeature('dnsmasq', 'dnssec')) {
|
||||
o = s.taboption('advanced', form.Flag, 'dnssec',
|
||||
_('DNSSEC'));
|
||||
o.optional = true;
|
||||
|
||||
o = s.taboption('advanced', form.Flag, 'dnsseccheckunsigned',
|
||||
_('DNSSEC check unsigned'),
|
||||
_('Requires upstream supports DNSSEC; verify unsigned domain responses really come from unsigned domains'));
|
||||
o.default = o.enabled;
|
||||
o.optional = true;
|
||||
}
|
||||
|
||||
s.taboption('general', form.Value, 'local',
|
||||
_('Local server'),
|
||||
_('Local domain specification. Names matching this domain are never forwarded and are resolved from DHCP or hosts files only'));
|
||||
|
||||
s.taboption('general', form.Value, 'domain',
|
||||
_('Local domain'),
|
||||
_('Local domain suffix appended to DHCP names and hosts file entries'));
|
||||
|
||||
s.taboption('advanced', form.Flag, 'expandhosts',
|
||||
_('Expand hosts'),
|
||||
_('Add local domain suffix to names served from hosts files'));
|
||||
|
||||
s.taboption('advanced', form.Flag, 'nonegcache',
|
||||
_('No negative cache'),
|
||||
_('Do not cache negative replies, e.g. for not existing domains'));
|
||||
|
||||
s.taboption('advanced', form.Value, 'serversfile',
|
||||
_('Additional servers file'),
|
||||
_('This file may contain lines like \'server=/domain/1.2.3.4\' or \'server=1.2.3.4\' for domain-specific or full upstream <abbr title="Domain Name System">DNS</abbr> servers.'));
|
||||
|
||||
s.taboption('advanced', form.Flag, 'strictorder',
|
||||
_('Strict order'),
|
||||
_('<abbr title="Domain Name System">DNS</abbr> servers will be queried in the order of the resolvfile')).optional = true;
|
||||
|
||||
s.taboption('advanced', form.Flag, 'allservers',
|
||||
_('All Servers'),
|
||||
_('Query all available upstream <abbr title="Domain Name System">DNS</abbr> servers')).optional = true;
|
||||
|
||||
o = s.taboption('advanced', form.DynamicList, 'bogusnxdomain', _('Bogus NX Domain Override'),
|
||||
_('List of hosts that supply bogus NX domain results'));
|
||||
|
||||
o.optional = true;
|
||||
o.placeholder = '67.215.65.132';
|
||||
|
||||
|
||||
s.taboption('general', form.Flag, 'logqueries',
|
||||
_('Log queries'),
|
||||
_('Write received DNS requests to syslog')).optional = true;
|
||||
|
||||
o = s.taboption('general', form.DynamicList, 'server', _('DNS forwardings'),
|
||||
_('List of <abbr title="Domain Name System">DNS</abbr> servers to forward requests to'));
|
||||
|
||||
o.optional = true;
|
||||
o.placeholder = '/example.org/10.1.2.3';
|
||||
// o.validate = validateServerSpec;
|
||||
|
||||
|
||||
o = s.taboption('general', form.Flag, 'rebind_protection',
|
||||
_('Rebind protection'),
|
||||
_('Discard upstream RFC1918 responses'));
|
||||
|
||||
o.rmempty = false;
|
||||
|
||||
|
||||
o = s.taboption('general', form.Flag, 'rebind_localhost',
|
||||
_('Allow localhost'),
|
||||
_('Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services'));
|
||||
|
||||
o.depends('rebind_protection', '1');
|
||||
|
||||
|
||||
o = s.taboption('general', form.DynamicList, 'rebind_domain',
|
||||
_('Domain whitelist'),
|
||||
_('List of domains to allow RFC1918 responses for'));
|
||||
o.optional = true;
|
||||
|
||||
o.depends('rebind_protection', '1');
|
||||
o.placeholder = 'ihost.netflix.com';
|
||||
o.validate = validateAddressList;
|
||||
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'port',
|
||||
_('<abbr title="Domain Name System">DNS</abbr> server port'),
|
||||
_('Listening port for inbound DNS queries'));
|
||||
|
||||
o.optional = true;
|
||||
o.datatype = 'port';
|
||||
o.placeholder = 53;
|
||||
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'queryport',
|
||||
_('<abbr title="Domain Name System">DNS</abbr> query port'),
|
||||
_('Fixed source port for outbound DNS queries'));
|
||||
|
||||
o.optional = true;
|
||||
o.datatype = 'port';
|
||||
o.placeholder = _('any');
|
||||
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'dhcpleasemax',
|
||||
_('<abbr title="maximal">Max.</abbr> <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr> leases'),
|
||||
_('Maximum allowed number of active DHCP leases'));
|
||||
|
||||
o.optional = true;
|
||||
o.datatype = 'uinteger';
|
||||
o.placeholder = _('unlimited');
|
||||
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'ednspacket_max',
|
||||
_('<abbr title="maximal">Max.</abbr> <abbr title="Extension Mechanisms for Domain Name System">EDNS0</abbr> packet size'),
|
||||
_('Maximum allowed size of EDNS.0 UDP packets'));
|
||||
|
||||
o.optional = true;
|
||||
o.datatype = 'uinteger';
|
||||
o.placeholder = 1280;
|
||||
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'dnsforwardmax',
|
||||
_('<abbr title="maximal">Max.</abbr> concurrent queries'),
|
||||
_('Maximum allowed number of concurrent DNS queries'));
|
||||
|
||||
o.optional = true;
|
||||
o.datatype = 'uinteger';
|
||||
o.placeholder = 150;
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'cachesize',
|
||||
_('Size of DNS query cache'),
|
||||
_('Number of cached DNS entries (max is 10000, 0 is no caching)'));
|
||||
o.optional = true;
|
||||
o.datatype = 'range(0,10000)';
|
||||
o.placeholder = 150;
|
||||
|
||||
s.taboption('tftp', form.Flag, 'enable_tftp',
|
||||
_('Enable TFTP server')).optional = true;
|
||||
|
||||
o = s.taboption('tftp', form.Value, 'tftp_root',
|
||||
_('TFTP server root'),
|
||||
_('Root directory for files served via TFTP'));
|
||||
|
||||
o.optional = true;
|
||||
o.depends('enable_tftp', '1');
|
||||
o.placeholder = '/';
|
||||
|
||||
|
||||
o = s.taboption('tftp', form.Value, 'dhcp_boot',
|
||||
_('Network boot image'),
|
||||
_('Filename of the boot image advertised to clients'));
|
||||
|
||||
o.optional = true;
|
||||
o.depends('enable_tftp', '1');
|
||||
o.placeholder = 'pxelinux.0';
|
||||
|
||||
o = s.taboption('general', form.Flag, 'localservice',
|
||||
_('Local Service Only'),
|
||||
_('Limit DNS service to subnets interfaces on which we are serving DNS.'));
|
||||
o.optional = false;
|
||||
o.rmempty = false;
|
||||
|
||||
o = s.taboption('general', form.Flag, 'nonwildcard',
|
||||
_('Non-wildcard'),
|
||||
_('Bind dynamically to interfaces rather than wildcard address (recommended as linux default)'));
|
||||
o.default = o.enabled;
|
||||
o.optional = false;
|
||||
o.rmempty = true;
|
||||
|
||||
o = s.taboption('general', form.DynamicList, 'interface',
|
||||
_('Listen Interfaces'),
|
||||
_('Limit listening to these interfaces, and loopback.'));
|
||||
o.optional = true;
|
||||
|
||||
o = s.taboption('general', form.DynamicList, 'notinterface',
|
||||
_('Exclude interfaces'),
|
||||
_('Prevent listening on these interfaces.'));
|
||||
o.optional = true;
|
||||
|
||||
o = s.taboption('leases', form.SectionValue, '__leases__', form.GridSection, 'host', null,
|
||||
_('Static leases are used to assign fixed IP addresses and symbolic hostnames to DHCP clients. They are also required for non-dynamic interface configurations where only hosts with a corresponding lease are served.') + '<br />' +
|
||||
_('Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> identifies the host, the <em>IPv4-Address</em> specifies the fixed address to use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. The optional <em>Lease time</em> can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.'));
|
||||
|
||||
ss = o.subsection;
|
||||
|
||||
ss.addremove = true;
|
||||
ss.anonymous = true;
|
||||
|
||||
so = ss.option(form.Value, 'name', _('Hostname'));
|
||||
so.validate = validateHostname;
|
||||
so.rmempty = true;
|
||||
so.write = function(section, value) {
|
||||
uci.set('dhcp', section, 'name', value);
|
||||
uci.set('dhcp', section, 'dns', '1');
|
||||
};
|
||||
so.remove = function(section) {
|
||||
uci.unset('dhcp', section, 'name');
|
||||
uci.unset('dhcp', section, 'dns');
|
||||
};
|
||||
|
||||
so = ss.option(form.Value, 'mac', _('<abbr title="Media Access Control">MAC</abbr>-Address'));
|
||||
so.datatype = 'list(unique(macaddr))';
|
||||
so.rmempty = true;
|
||||
so.cfgvalue = function(section) {
|
||||
var macs = uci.get('dhcp', section, 'mac'),
|
||||
result = [];
|
||||
|
||||
if (!Array.isArray(macs))
|
||||
macs = (macs != null && macs != '') ? macs.split(/\ss+/) : [];
|
||||
|
||||
for (var i = 0, mac; (mac = macs[i]) != null; i++)
|
||||
if (/^([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2})$/.test(mac))
|
||||
result.push('%02X:%02X:%02X:%02X:%02X:%02X'.format(
|
||||
parseInt(RegExp.$1, 16), parseInt(RegExp.$2, 16),
|
||||
parseInt(RegExp.$3, 16), parseInt(RegExp.$4, 16),
|
||||
parseInt(RegExp.$5, 16), parseInt(RegExp.$6, 16)));
|
||||
|
||||
return result.length ? result.join(' ') : null;
|
||||
};
|
||||
so.renderWidget = function(section_id, option_index, cfgvalue) {
|
||||
var node = form.Value.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]),
|
||||
ipopt = this.section.children.filter(function(o) { return o.option == 'ip' })[0];
|
||||
|
||||
node.addEventListener('cbi-dropdown-change', L.bind(function(ipopt, section_id, ev) {
|
||||
var mac = ev.detail.value.value;
|
||||
if (mac == null || mac == '' || !hosts[mac] || !hosts[mac].ipv4)
|
||||
return;
|
||||
|
||||
var ip = ipopt.formvalue(section_id);
|
||||
if (ip != null && ip != '')
|
||||
return;
|
||||
|
||||
var node = ipopt.map.findElement('id', ipopt.cbid(section_id));
|
||||
if (node)
|
||||
L.dom.callClassMethod(node, 'setValue', hosts[mac].ipv4);
|
||||
}, this, ipopt, section_id));
|
||||
|
||||
return node;
|
||||
};
|
||||
Object.keys(hosts).forEach(function(mac) {
|
||||
var hint = hosts[mac].name || hosts[mac].ipv4;
|
||||
so.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac);
|
||||
});
|
||||
|
||||
so = ss.option(form.Value, 'ip', _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address'));
|
||||
so.datatype = 'or(ip4addr,"ignore")';
|
||||
so.validate = function(section, value) {
|
||||
var mac = this.map.lookupOption('mac', section),
|
||||
name = this.map.lookupOption('name', section),
|
||||
m = mac ? mac[0].formvalue(section) : null,
|
||||
n = name ? name[0].formvalue(section) : null;
|
||||
|
||||
if ((m == null || m == '') && (n == null || n == ''))
|
||||
return _('One of hostname or mac address must be specified!');
|
||||
|
||||
return true;
|
||||
};
|
||||
Object.keys(hosts).forEach(function(mac) {
|
||||
if (hosts[mac].ipv4) {
|
||||
var hint = hosts[mac].name;
|
||||
so.value(hosts[mac].ipv4, hint ? '%s (%s)'.format(hosts[mac].ipv4, hint) : hosts[mac].ipv4);
|
||||
}
|
||||
});
|
||||
|
||||
so = ss.option(form.Value, 'gw', _('Gateway'));
|
||||
so.datatype = 'or(ip4addr,"ignore")';
|
||||
so.rmempty = true;
|
||||
|
||||
so = ss.option(form.Value, 'leasetime', _('Lease time'));
|
||||
so.rmempty = true;
|
||||
|
||||
so = ss.option(form.Value, 'duid', _('<abbr title="The DHCP Unique Identifier">DUID</abbr>'));
|
||||
so.datatype = 'and(rangelength(20,36),hexstring)';
|
||||
Object.keys(duids).forEach(function(duid) {
|
||||
so.value(duid, '%s (%s)'.format(duid, duids[duid].hostname || duids[duid].macaddr || duids[duid].ip6addr || '?'));
|
||||
});
|
||||
|
||||
so = ss.option(form.Value, 'hostid', _('<abbr title="Internet Protocol Version 6">IPv6</abbr>-Suffix (hex)'));
|
||||
|
||||
o = s.taboption('leases', CBILeaseStatus, '__status__');
|
||||
|
||||
if (has_dhcpv6)
|
||||
o = s.taboption('leases', CBILease6Status, '__status6__');
|
||||
|
||||
return m.render().then(function(mapEl) {
|
||||
L.Poll.add(function() {
|
||||
return callDHCPLeases().then(function(leaseinfo) {
|
||||
var leases = Array.isArray(leaseinfo.dhcp_leases) ? leaseinfo.dhcp_leases : [],
|
||||
leases6 = Array.isArray(leaseinfo.dhcp6_leases) ? leaseinfo.dhcp6_leases : [];
|
||||
|
||||
cbi_update_table(mapEl.querySelector('#lease_status_table'),
|
||||
leases.map(function(lease) {
|
||||
var exp;
|
||||
|
||||
if (lease.expires === false)
|
||||
exp = E('em', _('unlimited'));
|
||||
else if (lease.expires <= 0)
|
||||
exp = E('em', _('expired'));
|
||||
else
|
||||
exp = '%t'.format(lease.expires);
|
||||
|
||||
return [
|
||||
lease.hostname || '?',
|
||||
lease.ipaddr,
|
||||
lease.macaddr,
|
||||
exp
|
||||
];
|
||||
}),
|
||||
E('em', _('There are no active leases')));
|
||||
|
||||
if (has_dhcpv6) {
|
||||
cbi_update_table(mapEl.querySelector('#lease6_status_table'),
|
||||
leases6.map(function(lease) {
|
||||
var exp;
|
||||
|
||||
if (lease.expires === false)
|
||||
exp = E('em', _('unlimited'));
|
||||
else if (lease.expires <= 0)
|
||||
exp = E('em', _('expired'));
|
||||
else
|
||||
exp = '%t'.format(lease.expires);
|
||||
|
||||
var hint = lease.macaddr ? hosts[lease.macaddr] : null,
|
||||
name = hint ? (hint.name || hint.ipv4 || hint.ipv6) : null,
|
||||
host = null;
|
||||
|
||||
if (name && lease.hostname && lease.hostname != name && lease.ip6addr != name)
|
||||
host = '%s (%s)'.format(lease.hostname, name);
|
||||
else if (lease.hostname)
|
||||
host = lease.hostname;
|
||||
else if (name)
|
||||
host = name;
|
||||
|
||||
return [
|
||||
host || '-',
|
||||
lease.ip6addrs ? lease.ip6addrs.join(' ') : lease.ip6addr,
|
||||
lease.duid,
|
||||
exp
|
||||
];
|
||||
}),
|
||||
E('em', _('There are no active leases')));
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
return mapEl;
|
||||
});
|
||||
}
|
||||
});
|
|
@ -0,0 +1,137 @@
|
|||
'use strict';
|
||||
'require fs';
|
||||
'require ui';
|
||||
'require uci';
|
||||
|
||||
return L.view.extend({
|
||||
handleCommand: function(exec, args) {
|
||||
var buttons = document.querySelectorAll('.diag-action > .cbi-button');
|
||||
|
||||
for (var i = 0; i < buttons.length; i++)
|
||||
buttons[i].setAttribute('disabled', 'true');
|
||||
|
||||
return fs.exec(exec, args).then(function(res) {
|
||||
var out = document.querySelector('.command-output');
|
||||
out.style.display = '';
|
||||
|
||||
L.dom.content(out, [ res.stdout || '', res.stderr || '' ]);
|
||||
}).catch(function(err) {
|
||||
ui.addNotification(null, E('p', [ err ]))
|
||||
}).finally(function() {
|
||||
for (var i = 0; i < buttons.length; i++)
|
||||
buttons[i].removeAttribute('disabled');
|
||||
});
|
||||
},
|
||||
|
||||
handlePing: function(ev, cmd) {
|
||||
var exec = cmd || 'ping',
|
||||
addr = ev.currentTarget.parentNode.previousSibling.value,
|
||||
args = (exec == 'ping') ? [ '-c', '5', '-W', '1', addr ] : [ '-c', '5', addr ];
|
||||
|
||||
return this.handleCommand(exec, args);
|
||||
},
|
||||
|
||||
handleTraceroute: function(ev, cmd) {
|
||||
var exec = cmd || 'traceroute',
|
||||
addr = ev.currentTarget.parentNode.previousSibling.value,
|
||||
args = (exec == 'traceroute') ? [ '-q', '1', '-w', '1', '-n', addr ] : [ '-q', '1', '-w', '2', '-n', addr ];
|
||||
|
||||
return this.handleCommand(exec, args);
|
||||
},
|
||||
|
||||
handleNslookup: function(ev, cmd) {
|
||||
var addr = ev.currentTarget.parentNode.previousSibling.value;
|
||||
|
||||
return this.handleCommand('nslookup', [ addr ]);
|
||||
},
|
||||
|
||||
load: function() {
|
||||
return Promise.all([
|
||||
L.resolveDefault(fs.stat('/bin/ping6'), {}),
|
||||
L.resolveDefault(fs.stat('/usr/bin/ping6'), {}),
|
||||
L.resolveDefault(fs.stat('/bin/traceroute6'), {}),
|
||||
L.resolveDefault(fs.stat('/usr/bin/traceroute6'), {}),
|
||||
uci.load('luci')
|
||||
]);
|
||||
},
|
||||
|
||||
render: function(res) {
|
||||
var has_ping6 = res[0].path || res[1].path,
|
||||
has_traceroute6 = res[2].path || res[3].path,
|
||||
dns_host = uci.get('luci', 'diag', 'dns') || 'openwrt.org',
|
||||
ping_host = uci.get('luci', 'diag', 'ping') || 'openwrt.org',
|
||||
route_host = uci.get('luci', 'diag', 'route') || 'openwrt.org';
|
||||
|
||||
return E([], [
|
||||
E('h2', {}, [ _('Network Utilities') ]),
|
||||
E('div', { 'class': 'table' }, [
|
||||
E('div', { 'class': 'tr' }, [
|
||||
E('div', { 'class': 'td left' }, [
|
||||
E('input', {
|
||||
'style': 'margin:5px 0',
|
||||
'type': 'text',
|
||||
'value': ping_host
|
||||
}),
|
||||
E('span', { 'class': 'diag-action' }, [
|
||||
has_ping6 ? new ui.ComboButton('ping', {
|
||||
'ping': '%s %s'.format(_('IPv4'), _('Ping')),
|
||||
'ping6': '%s %s'.format(_('IPv6'), _('Ping')),
|
||||
}, {
|
||||
'click': ui.createHandlerFn(this, 'handlePing'),
|
||||
'classes': {
|
||||
'ping': 'btn cbi-button cbi-button-action',
|
||||
'ping6': 'btn cbi-button cbi-button-action'
|
||||
}
|
||||
}).render() : E('button', {
|
||||
'class': 'cbi-button cbi-button-action',
|
||||
'click': ui.createHandlerFn(this, 'handlePing')
|
||||
}, [ _('Ping') ])
|
||||
])
|
||||
]),
|
||||
|
||||
E('div', { 'class': 'td left' }, [
|
||||
E('input', {
|
||||
'style': 'margin:5px 0',
|
||||
'type': 'text',
|
||||
'value': route_host
|
||||
}),
|
||||
E('span', { 'class': 'diag-action' }, [
|
||||
has_traceroute6 ? new ui.ComboButton('traceroute', {
|
||||
'traceroute': '%s %s'.format(_('IPv4'), _('Traceroute')),
|
||||
'traceroute6': '%s %s'.format(_('IPv6'), _('Traceroute')),
|
||||
}, {
|
||||
'click': ui.createHandlerFn(this, 'handleTraceroute'),
|
||||
'classes': {
|
||||
'traceroute': 'btn cbi-button cbi-button-action',
|
||||
'traceroute6': 'btn cbi-button cbi-button-action'
|
||||
}
|
||||
}).render() : E('button', {
|
||||
'class': 'cbi-button cbi-button-action',
|
||||
'click': ui.createHandlerFn(this, 'handleTraceroute')
|
||||
}, [ _('Traceroute') ])
|
||||
])
|
||||
]),
|
||||
|
||||
E('div', { 'class': 'td left' }, [
|
||||
E('input', {
|
||||
'style': 'margin:5px 0',
|
||||
'type': 'text',
|
||||
'value': dns_host
|
||||
}),
|
||||
E('span', { 'class': 'diag-action' }, [
|
||||
E('button', {
|
||||
'class': 'cbi-button cbi-button-action',
|
||||
'click': ui.createHandlerFn(this, 'handleNslookup')
|
||||
}, [ _('Nslookup') ])
|
||||
])
|
||||
])
|
||||
])
|
||||
]),
|
||||
E('pre', { 'class': 'command-output', 'style': 'display:none' })
|
||||
]);
|
||||
},
|
||||
|
||||
handleSaveApply: null,
|
||||
handleSave: null,
|
||||
handleReset: null
|
||||
});
|
|
@ -0,0 +1,42 @@
|
|||
'use strict';
|
||||
'require rpc';
|
||||
'require form';
|
||||
|
||||
return L.view.extend({
|
||||
callHostHints: rpc.declare({
|
||||
object: 'luci-rpc',
|
||||
method: 'getHostHints',
|
||||
expect: { '': {} }
|
||||
}),
|
||||
|
||||
load: function() {
|
||||
return this.callHostHints();
|
||||
},
|
||||
|
||||
render: function(hosts) {
|
||||
var m, s, o;
|
||||
|
||||
m = new form.Map('dhcp', _('Hostnames'));
|
||||
|
||||
s = m.section(form.GridSection, 'domain', _('Host entries'));
|
||||
s.addremove = true;
|
||||
s.anonymous = true;
|
||||
s.sortable = true;
|
||||
|
||||
o = s.option(form.Value, 'name', _('Hostname'));
|
||||
o.datatype = 'hostname';
|
||||
o.rmempty = true;
|
||||
|
||||
o = s.option(form.Value, 'ip', _('IP address'));
|
||||
o.datatype = 'ipaddr';
|
||||
o.rmempty = true;
|
||||
L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
|
||||
o.value(hosts[mac].ipv4, '%s (%s)'.format(
|
||||
hosts[mac].ipv4,
|
||||
hosts[mac].name || mac
|
||||
));
|
||||
});
|
||||
|
||||
return m.render();
|
||||
}
|
||||
});
|
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,102 @@
|
|||
'use strict';
|
||||
'require form';
|
||||
'require network';
|
||||
'require tools.widgets as widgets';
|
||||
|
||||
return L.view.extend({
|
||||
load: function() {
|
||||
return network.getDevices();
|
||||
},
|
||||
|
||||
render: function(netdevs) {
|
||||
var m, s, o;
|
||||
|
||||
m = new form.Map('network', _('Routes'), _('Routes specify over which interface and gateway a certain host or network can be reached.'));
|
||||
m.tabbed = true;
|
||||
|
||||
for (var i = 4; i <= 6; i += 2) {
|
||||
s = m.section(form.GridSection, (i == 4) ? 'route' : 'route6', (i == 4) ? _('Static IPv4 Routes') : _('Static IPv6 Routes'));
|
||||
s.anonymous = true;
|
||||
s.addremove = true;
|
||||
s.sortable = true;
|
||||
|
||||
s.tab('general', _('General Settings'));
|
||||
s.tab('advanced', _('Advanced Settings'));
|
||||
|
||||
o = s.taboption('general', widgets.NetworkSelect, 'interface', _('Interface'));
|
||||
o.rmempty = false;
|
||||
o.nocreate = true;
|
||||
|
||||
o = s.taboption('general', form.Value, 'target', _('Target'), (i == 4) ? _('Host-<abbr title="Internet Protocol Address">IP</abbr> or Network') : _('<abbr title="Internet Protocol Version 6">IPv6</abbr>-Address or Network (CIDR)'));
|
||||
o.datatype = (i == 4) ? 'ip4addr' : 'ip6addr';
|
||||
o.rmempty = false;
|
||||
|
||||
if (i == 4) {
|
||||
o = s.taboption('general', form.Value, 'netmask', _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Netmask'), _('if target is a network'));
|
||||
o.placeholder = '255.255.255.255';
|
||||
o.datatype = 'ip4addr';
|
||||
o.rmempty = true;
|
||||
}
|
||||
|
||||
o = s.taboption('general', form.Value, 'gateway', (i == 4) ? _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Gateway') : _('<abbr title="Internet Protocol Version 6">IPv6</abbr>-Gateway'));
|
||||
o.datatype = (i == 4) ? 'ip4addr' : 'ip6addr';
|
||||
o.rmempty = true;
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'metric', _('Metric'));
|
||||
o.placeholder = 0;
|
||||
o.datatype = (i == 4) ? 'range(0,255)' : 'range(0,65535)';
|
||||
o.rmempty = true;
|
||||
o.textvalue = function(section_id) {
|
||||
return this.cfgvalue(section_id) || 0;
|
||||
};
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'mtu', _('MTU'));
|
||||
o.placeholder = 1500;
|
||||
o.datatype = 'range(64,9000)';
|
||||
o.rmempty = true;
|
||||
o.modalonly = true;
|
||||
|
||||
o = s.taboption('advanced', form.ListValue, 'type', _('Route type'));
|
||||
o.value('', 'unicast');
|
||||
o.value('local');
|
||||
o.value('broadcast');
|
||||
o.value('multicast');
|
||||
o.value('unreachable');
|
||||
o.value('prohibit');
|
||||
o.value('blackhole');
|
||||
o.value('anycast');
|
||||
o.default = '';
|
||||
o.rmempty = true;
|
||||
o.modalonly = true;
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'table', _('Route table'));
|
||||
o.value('local', 'local (255)');
|
||||
o.value('main', 'main (254)');
|
||||
o.value('default', 'default (253)');
|
||||
o.rmempty = true;
|
||||
o.modalonly = true;
|
||||
o.cfgvalue = function(section_id) {
|
||||
var cfgvalue = this.super('cfgvalue', [section_id]);
|
||||
return cfgvalue || 'main';
|
||||
};
|
||||
|
||||
o = s.taboption('advanced', form.Value, 'source', _('Source Address'));
|
||||
o.placeholder = E('em', _('automatic'));
|
||||
for (var j = 0; j < netdevs.length; j++) {
|
||||
var addrs = netdevs[j].getIPAddrs();
|
||||
for (var k = 0; k < addrs.length; k++)
|
||||
o.value(addrs[k].split('/')[0]);
|
||||
}
|
||||
o.datatype = (i == 4) ? 'ip4addr' : 'ip6addr';
|
||||
o.default = '';
|
||||
o.rmempty = true;
|
||||
o.modalonly = true;
|
||||
|
||||
o = s.taboption('advanced', form.Flag, 'onlink', _('On-Link route'));
|
||||
o.default = o.disabled;
|
||||
o.rmempty = true;
|
||||
}
|
||||
|
||||
return m.render();
|
||||
}
|
||||
});
|
|
@ -0,0 +1,372 @@
|
|||
'use strict';
|
||||
'require ui';
|
||||
'require rpc';
|
||||
'require uci';
|
||||
'require form';
|
||||
'require network';
|
||||
|
||||
function parse_portvalue(section_id) {
|
||||
var ports = L.toArray(uci.get('network', section_id, 'ports'));
|
||||
|
||||
for (var i = 0; i < ports.length; i++) {
|
||||
var m = ports[i].match(/^(\d+)([tu]?)/);
|
||||
|
||||
if (m && m[1] == this.option)
|
||||
return m[2] || 'u';
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
function validate_portvalue(section_id, value) {
|
||||
if (value != 'u')
|
||||
return true;
|
||||
|
||||
var sections = this.section.cfgsections();
|
||||
|
||||
for (var i = 0; i < sections.length; i++) {
|
||||
if (sections[i] == section_id)
|
||||
continue;
|
||||
|
||||
if (this.formvalue(sections[i]) == 'u')
|
||||
return _('%s is untagged in multiple VLANs!').format(this.title);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function update_interfaces(old_ifname, new_ifname) {
|
||||
var interfaces = uci.sections('network', 'interface');
|
||||
|
||||
for (var i = 0; i < interfaces.length; i++) {
|
||||
var old_ifnames = L.toArray(interfaces[i].ifname),
|
||||
new_ifnames = [],
|
||||
changed = false;
|
||||
|
||||
for (var j = 0; j < old_ifnames.length; j++) {
|
||||
if (old_ifnames[j] == old_ifname) {
|
||||
new_ifnames.push(new_ifname);
|
||||
changed = true;
|
||||
}
|
||||
else {
|
||||
new_ifnames.push(old_ifnames[j]);
|
||||
}
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
uci.set('network', interfaces[i]['.name'], 'ifname', new_ifnames.join(' '));
|
||||
|
||||
ui.addNotification(null, E('p', _('Interface %q device auto-migrated from %q to %q.')
|
||||
.replace(/%q/g, '"%s"').format(interfaces[i]['.name'], old_ifname, new_ifname)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function render_port_status(node, portstate) {
|
||||
if (!node)
|
||||
return null;
|
||||
|
||||
if (!portstate || !portstate.link)
|
||||
L.dom.content(node, [
|
||||
E('img', { src: L.resource('icons/port_down.png') }),
|
||||
E('br'),
|
||||
_('no link')
|
||||
]);
|
||||
else
|
||||
L.dom.content(node, [
|
||||
E('img', { src: L.resource('icons/port_up.png') }),
|
||||
E('br'),
|
||||
'%d'.format(portstate.speed) + _('baseT'),
|
||||
E('br'),
|
||||
portstate.duplex ? _('full-duplex') : _('half-duplex')
|
||||
]);
|
||||
|
||||
return node;
|
||||
}
|
||||
|
||||
function update_port_status(topologies) {
|
||||
var tasks = [];
|
||||
|
||||
for (var switch_name in topologies)
|
||||
tasks.push(callSwconfigPortState(switch_name).then(L.bind(function(switch_name, ports) {
|
||||
for (var i = 0; i < ports.length; i++) {
|
||||
var node = document.querySelector('[data-switch="%s"][data-port="%d"]'.format(switch_name, ports[i].port));
|
||||
render_port_status(node, ports[i]);
|
||||
}
|
||||
}, topologies[switch_name], switch_name)));
|
||||
|
||||
return Promise.all(tasks);
|
||||
}
|
||||
|
||||
var callSwconfigFeatures = rpc.declare({
|
||||
object: 'luci',
|
||||
method: 'getSwconfigFeatures',
|
||||
params: [ 'switch' ],
|
||||
expect: { '': {} }
|
||||
});
|
||||
|
||||
var callSwconfigPortState = rpc.declare({
|
||||
object: 'luci',
|
||||
method: 'getSwconfigPortState',
|
||||
params: [ 'switch' ],
|
||||
expect: { result: [] }
|
||||
});
|
||||
|
||||
return L.view.extend({
|
||||
load: function() {
|
||||
return network.getSwitchTopologies().then(function(topologies) {
|
||||
var tasks = [];
|
||||
|
||||
for (var switch_name in topologies) {
|
||||
tasks.push(callSwconfigFeatures(switch_name).then(L.bind(function(features) {
|
||||
this.features = features;
|
||||
}, topologies[switch_name])));
|
||||
tasks.push(callSwconfigPortState(switch_name).then(L.bind(function(ports) {
|
||||
this.portstate = ports;
|
||||
}, topologies[switch_name])));
|
||||
}
|
||||
|
||||
return Promise.all(tasks).then(function() { return topologies });
|
||||
});
|
||||
},
|
||||
|
||||
render: function(topologies) {
|
||||
var m, s, o;
|
||||
|
||||
m = new form.Map('network', _('Switch'), _('The network ports on this device can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.'));
|
||||
|
||||
var switchSections = uci.sections('network', 'switch');
|
||||
|
||||
for (var i = 0; i < switchSections.length; i++) {
|
||||
var switchSection = switchSections[i],
|
||||
sid = switchSection['.name'],
|
||||
switch_name = switchSection.name || sid,
|
||||
topology = topologies[switch_name];
|
||||
|
||||
if (!topology) {
|
||||
ui.addNotification(null, _('Switch %q has an unknown topology - the VLAN settings might not be accurate.').replace(/%q/, switch_name));
|
||||
|
||||
topologies[switch_name] = topology = {
|
||||
features: {},
|
||||
netdevs: {
|
||||
5: 'eth0'
|
||||
},
|
||||
ports: [
|
||||
{ num: 0, label: 'Port 1' },
|
||||
{ num: 1, label: 'Port 2' },
|
||||
{ num: 2, label: 'Port 3' },
|
||||
{ num: 3, label: 'Port 4' },
|
||||
{ num: 4, label: 'Port 5' },
|
||||
{ num: 5, label: 'CPU (eth0)', device: 'eth0', need_tag: false }
|
||||
]
|
||||
};
|
||||
}
|
||||
|
||||
var feat = topology.features,
|
||||
min_vid = feat.min_vid || 0,
|
||||
max_vid = feat.max_vid || 16,
|
||||
num_vlans = feat.num_vlans || 16,
|
||||
switch_title = _('Switch %q').replace(/%q/, '"%s"'.format(switch_name)),
|
||||
vlan_title = _('VLANs on %q').replace(/%q/, '"%s"'.format(switch_name));
|
||||
|
||||
if (feat.switch_title) {
|
||||
switch_title += ' (%s)'.format(feat.switch_title);
|
||||
vlan_title += ' (%s)'.format(feat.switch_title);
|
||||
}
|
||||
|
||||
s = m.section(form.NamedSection, sid, 'switch', switch_title);
|
||||
s.addremove = false;
|
||||
|
||||
if (feat.vlan_option)
|
||||
s.option(form.Flag, feat.vlan_option, _('Enable VLAN functionality'));
|
||||
|
||||
if (feat.learning_option) {
|
||||
o = s.option(form.Flag, feat.learning_option, _('Enable learning and aging'));
|
||||
o.default = o.enabled;
|
||||
}
|
||||
|
||||
if (feat.jumbo_option) {
|
||||
o = s.option(form.Flag, feat.jumbo_option, _('Enable Jumbo Frame passthrough'));
|
||||
o.enabled = '3';
|
||||
o.rmempty = true;
|
||||
}
|
||||
|
||||
if (feat.mirror_option) {
|
||||
s.option(form.Flag, 'enable_mirror_rx', _('Enable mirroring of incoming packets'));
|
||||
s.option(form.Flag, 'enable_mirror_tx', _('Enable mirroring of outgoing packets'));
|
||||
|
||||
var sp = s.option(form.ListValue, 'mirror_source_port', _('Mirror source port')),
|
||||
mp = s.option(form.ListValue, 'mirror_monitor_port', _('Mirror monitor port'));
|
||||
|
||||
sp.depends('enable_mirror_rx', '1');
|
||||
sp.depends('enable_mirror_tx', '1');
|
||||
|
||||
mp.depends('enable_mirror_rx', '1');
|
||||
mp.depends('enable_mirror_tx', '1');
|
||||
|
||||
for (var j = 0; j < topology.ports.length; j++) {
|
||||
sp.value(topology.ports[j].num, topology.ports[j].label);
|
||||
mp.value(topology.ports[j].num, topology.ports[j].label);
|
||||
}
|
||||
}
|
||||
|
||||
s = m.section(form.TableSection, 'switch_vlan', vlan_title);
|
||||
s.anonymous = true;
|
||||
s.addremove = true;
|
||||
s.addbtntitle = _('Add VLAN');
|
||||
s.topology = topology;
|
||||
s.device = switch_name;
|
||||
|
||||
s.filter = function(section_id) {
|
||||
var device = uci.get('network', section_id, 'device');
|
||||
return (device == switch_name);
|
||||
};
|
||||
|
||||
s.cfgsections = function() {
|
||||
var sections = form.TableSection.prototype.cfgsections.apply(this);
|
||||
|
||||
return sections.sort(function(a, b) {
|
||||
var vidA = feat.vid_option ? uci.get('network', a, feat.vid_option) : null,
|
||||
vidB = feat.vid_option ? uci.get('network', b, feat.vid_option) : null;
|
||||
|
||||
vidA = +(vidA != null ? vidA : uci.get('network', a, 'vlan') || 9999);
|
||||
vidB = +(vidB != null ? vidB : uci.get('network', b, 'vlan') || 9999);
|
||||
|
||||
return (vidA - vidB);
|
||||
});
|
||||
};
|
||||
|
||||
s.handleAdd = function(ev) {
|
||||
var sections = uci.sections('network', 'switch_vlan'),
|
||||
section_id = uci.add('network', 'switch_vlan'),
|
||||
max_vlan = 0,
|
||||
max_vid = 0;
|
||||
|
||||
for (var j = 0; j < sections.length; j++) {
|
||||
if (sections[j].device != s.device)
|
||||
continue;
|
||||
|
||||
var vlan = +sections[j].vlan,
|
||||
vid = feat.vid_option ? +sections[j][feat.vid_option] : null;
|
||||
|
||||
if (vlan > max_vlan)
|
||||
max_vlan = vlan;
|
||||
|
||||
if (vid > max_vid)
|
||||
max_vid = vid;
|
||||
}
|
||||
|
||||
uci.set('network', section_id, 'device', s.device);
|
||||
uci.set('network', section_id, 'vlan', max_vlan + 1);
|
||||
|
||||
if (feat.vid_option)
|
||||
uci.set('network', section_id, feat.vid_option, max_vid + 1);
|
||||
|
||||
return this.map.save(null, true);
|
||||
};
|
||||
|
||||
var port_opts = [];
|
||||
|
||||
o = s.option(form.Value, feat.vid_option || 'vlan', 'VLAN ID');
|
||||
o.rmempty = false;
|
||||
o.forcewrite = true;
|
||||
o.vlan_used = {};
|
||||
o.datatype = 'range(%u,%u)'.format(min_vid, feat.vid_option ? 4094 : num_vlans - 1);
|
||||
o.description = _('Port status:');
|
||||
|
||||
o.validate = function(section_id, value) {
|
||||
var v = +value,
|
||||
m = feat.vid_option ? 4094 : num_vlans - 1;
|
||||
|
||||
if (isNaN(v) || v < min_vid || v > m)
|
||||
return _('Invalid VLAN ID given! Only IDs between %d and %d are allowed.').format(min_vid, m);
|
||||
|
||||
var sections = this.section.cfgsections();
|
||||
|
||||
for (var i = 0; i < sections.length; i++) {
|
||||
if (sections[i] == section_id)
|
||||
continue;
|
||||
|
||||
if (this.formvalue(sections[i]) == v)
|
||||
return _('Invalid VLAN ID given! Only unique IDs are allowed');
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
o.write = function(section_id, value) {
|
||||
var topology = this.section.topology,
|
||||
values = [];
|
||||
|
||||
for (var i = 0; i < port_opts.length; i++) {
|
||||
var tagging = port_opts[i].formvalue(section_id),
|
||||
portspec = Array.isArray(topology.ports) ? topology.ports[i] : null;
|
||||
|
||||
if (tagging == 't')
|
||||
values.push(port_opts[i].option + tagging);
|
||||
else if (tagging == 'u')
|
||||
values.push(port_opts[i].option);
|
||||
|
||||
if (portspec && portspec.device) {
|
||||
var old_tag = port_opts[i].cfgvalue(section_id),
|
||||
old_vid = this.cfgvalue(section_id);
|
||||
|
||||
if (old_tag != tagging || old_vid != value) {
|
||||
var old_ifname = portspec.device + (old_tag != 'u' ? '.' + old_vid : ''),
|
||||
new_ifname = portspec.device + (tagging != 'u' ? '.' + value : '');
|
||||
|
||||
if (old_ifname != new_ifname)
|
||||
update_interfaces(old_ifname, new_ifname);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (feat.vlan4k_option)
|
||||
uci.set('network', sid, feat.vlan4k_option, '1');
|
||||
|
||||
uci.set('network', section_id, 'ports', values.join(' '));
|
||||
|
||||
return form.Value.prototype.write.apply(this, [section_id, value]);
|
||||
};
|
||||
|
||||
o.cfgvalue = function(section_id) {
|
||||
var value = feat.vid_option ? uci.get('network', section_id, feat.vid_option) : null;
|
||||
return (value || uci.get('network', section_id, 'vlan'));
|
||||
};
|
||||
|
||||
s.option(form.Value, 'description', _('Description'));
|
||||
|
||||
for (var j = 0; Array.isArray(topology.ports) && j < topology.ports.length; j++) {
|
||||
var portspec = topology.ports[j],
|
||||
portstate = Array.isArray(topology.portstate) ? topology.portstate[portspec.num] : null;
|
||||
|
||||
o = s.option(form.ListValue, String(portspec.num), portspec.label);
|
||||
o.value('', _('off'));
|
||||
|
||||
if (!portspec.need_tag)
|
||||
o.value('u', _('untagged'));
|
||||
|
||||
o.value('t', _('tagged'));
|
||||
|
||||
o.cfgvalue = parse_portvalue;
|
||||
o.validate = validate_portvalue;
|
||||
o.write = function() {};
|
||||
|
||||
o.description = render_port_status(E('small', {
|
||||
'data-switch': switch_name,
|
||||
'data-port': portspec.num
|
||||
}), portstate);
|
||||
|
||||
port_opts.push(o);
|
||||
}
|
||||
|
||||
port_opts.sort(function(a, b) {
|
||||
return a.option > b.option;
|
||||
});
|
||||
}
|
||||
|
||||
L.Poll.add(L.bind(update_port_status, m, topologies));
|
||||
|
||||
return m.render();
|
||||
}
|
||||
});
|
File diff suppressed because it is too large
Load diff
22
luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full
Executable file
22
luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full
Executable file
|
@ -0,0 +1,22 @@
|
|||
#!/bin/sh
|
||||
|
||||
if [ "$(uci -q get luci.diag)" != "internal" ]; then
|
||||
host=""
|
||||
|
||||
if [ -s /etc/os-release ]; then
|
||||
. /etc/os-release
|
||||
host="${HOME_URL:-${BUG_URL:-$OPENWRT_DEVICE_MANUFACTURER_URL}}"
|
||||
host="${host#*://}"
|
||||
host="${host%%/*}"
|
||||
fi
|
||||
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
set luci.diag=internal
|
||||
set luci.diag.dns='${host:-openwrt.org}'
|
||||
set luci.diag.ping='${host:-openwrt.org}'
|
||||
set luci.diag.route='${host:-openwrt.org}'
|
||||
commit luci
|
||||
EOF
|
||||
fi
|
||||
|
||||
exit 0
|
46
luci-mod-network/root/usr/libexec/luci-peeraddr
Executable file
46
luci-mod-network/root/usr/libexec/luci-peeraddr
Executable file
|
@ -0,0 +1,46 @@
|
|||
#!/bin/sh
|
||||
|
||||
NL="
|
||||
"
|
||||
|
||||
function ifaces_by_device() {
|
||||
ubus call network.interface dump 2>/dev/null | \
|
||||
jsonfilter -e "@.interface[@.device='$1' || @.l3_device='$1'].interface"
|
||||
}
|
||||
|
||||
function device_by_addr() {
|
||||
set -- $(ip route get "$1" ${2:+from "$2"} 2>/dev/null)
|
||||
echo "$5"
|
||||
}
|
||||
|
||||
for inbound_device in $(device_by_addr "$REMOTE_ADDR" "$SERVER_ADDR"); do
|
||||
inbound_devices="$inbound_device"
|
||||
inbound_interfaces=""
|
||||
|
||||
for iface in $(ifaces_by_device "$inbound_device"); do
|
||||
inbound_interfaces="${inbound_interfaces:+$inbound_interfaces$NL}$iface"
|
||||
|
||||
for peeraddr in $(uci get "network.$iface.peeraddr"); do
|
||||
for ipaddr in $(resolveip -t 1 "$peeraddr" 2>/dev/null); do
|
||||
for peerdev in $(device_by_addr "$ipaddr"); do
|
||||
for iface in $(ifaces_by_device "$peerdev"); do
|
||||
inbound_devices="${inbound_devices:+$inbound_devices$NL}$peerdev"
|
||||
inbound_interfaces="${inbound_interfaces:+$inbound_interfaces$NL}$iface"
|
||||
done
|
||||
done
|
||||
done
|
||||
done
|
||||
done
|
||||
done
|
||||
|
||||
inbound_devices="$(echo "$inbound_devices" | sort -u | sed ':a;N;$!ba;s/\n/", "/g')"
|
||||
inbound_interfaces="$(echo "$inbound_interfaces" | sort -u | sed ':a;N;$!ba;s/\n/", "/g')"
|
||||
|
||||
cat <<JSON
|
||||
{
|
||||
"remote_addr": "$REMOTE_ADDR",
|
||||
"server_addr": "$SERVER_ADDR",
|
||||
"inbound_devices": [ ${inbound_devices:+\"$inbound_devices\"} ],
|
||||
"inbound_interfaces": [ ${inbound_interfaces:+\"$inbound_interfaces\"} ]
|
||||
}
|
||||
JSON
|
|
@ -0,0 +1,85 @@
|
|||
{
|
||||
"admin/network/switch": {
|
||||
"title": "Switch",
|
||||
"order": 20,
|
||||
"action": {
|
||||
"type": "view",
|
||||
"path": "network/switch"
|
||||
},
|
||||
"depends": {
|
||||
"fs": { "/sbin/swconfig": "executable" },
|
||||
"uci": { "network": { "@switch": true } }
|
||||
}
|
||||
},
|
||||
|
||||
"admin/network/wireless": {
|
||||
"title": "Wireless",
|
||||
"order": 15,
|
||||
"action": {
|
||||
"type": "view",
|
||||
"path": "network/wireless"
|
||||
},
|
||||
"depends": {
|
||||
"uci": { "wireless": { "@wifi-device": true } }
|
||||
}
|
||||
},
|
||||
|
||||
"admin/network/remote_addr/*": {
|
||||
"action": {
|
||||
"type": "call",
|
||||
"module": "luci.controller.admin.network",
|
||||
"function": "remote_addr"
|
||||
}
|
||||
},
|
||||
|
||||
"admin/network/network": {
|
||||
"title": "Interfaces",
|
||||
"order": 10,
|
||||
"action": {
|
||||
"type": "view",
|
||||
"path": "network/interfaces"
|
||||
}
|
||||
},
|
||||
|
||||
"admin/network/dhcp": {
|
||||
"title": "DHCP and DNS",
|
||||
"order": 30,
|
||||
"action": {
|
||||
"type": "view",
|
||||
"path": "network/dhcp"
|
||||
},
|
||||
"depends": {
|
||||
"uci": { "dhcp": true }
|
||||
}
|
||||
},
|
||||
|
||||
"admin/network/hosts": {
|
||||
"title": "Hostnames",
|
||||
"order": 40,
|
||||
"action": {
|
||||
"type": "view",
|
||||
"path": "network/hosts"
|
||||
},
|
||||
"depends": {
|
||||
"uci": { "dhcp": true }
|
||||
}
|
||||
},
|
||||
|
||||
"admin/network/routes": {
|
||||
"title": "Static Routes",
|
||||
"order": 50,
|
||||
"action": {
|
||||
"type": "view",
|
||||
"path": "network/routes"
|
||||
}
|
||||
},
|
||||
|
||||
"admin/network/diagnostics": {
|
||||
"title": "Diagnostics",
|
||||
"order": 60,
|
||||
"action": {
|
||||
"type": "view",
|
||||
"path": "network/diagnostics"
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue