return L.view.extend({
callHostHints: rpc.declare({
object: 'luci',
- method: 'host_hints'
+ method: 'getHostHints',
+ expect: { '': {} }
}),
load: function() {
return L.view.extend({
callHostHints: rpc.declare({
object: 'luci',
- method: 'host_hints'
+ method: 'getHostHints',
+ expect: { '': {} }
}),
load: function() {
load: function() {
return Promise.all([
- this.callConntrackHelpers()
+ this.callConntrackHelpers(),
+ firewall.getDefaults()
]);
},
render: function(data) {
var ctHelpers = data[0],
+ fwDefaults = data[1],
m, s, o, inp, out;
m = new form.Map('firewall', _('Firewall - Zone Settings'),
p[i].editable = true;
}
+ p[0].default = fwDefaults.getInput();
+ p[1].default = fwDefaults.getOutput();
+ p[2].default = fwDefaults.getForward();
+
o = s.taboption('general', form.Flag, 'masq', _('Masquerading'));
o.editable = true;
var callLuciNetdevs = rpc.declare({
object: 'luci',
- method: 'netdevs'
+ method: 'getNetworkDevices',
+ expect: { '': {} }
});
var callLuciIfaddrs = rpc.declare({
object: 'luci',
- method: 'ifaddrs',
+ method: 'getIfaddrs',
expect: { result: [] }
});
var callLuciBoardjson = rpc.declare({
object: 'luci',
- method: 'boardjson'
+ method: 'getBoardJSON'
});
var callIwinfoInfo = rpc.declare({
end
local methods = {
- initList = {
+ getInitList = {
args = { name = "name" },
call = function(args)
local sys = require "luci.sys"
return { error = "No such init script" }
end
end
- return { result = scripts }
+ return scripts
end
},
- initCall = {
+ setInitAction = {
args = { name = "name", action = "action" },
call = function(args)
local sys = require "luci.sys"
getLocaltime = {
call = function(args)
- return { localtime = os.time() }
+ return { result = os.time() }
end
},
sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d' >/dev/null" %{ date.year, date.month, date.day, date.hour, date.min, date.sec })
sys.call("/etc/init.d/sysfixtime restart >/dev/null")
end
- return { localtime = args.localtime }
+ return { result = args.localtime }
end
},
- timezone = {
+ getTimezones = {
call = function(args)
local util = require "luci.util"
local zones = require "luci.sys.zoneinfo"
active = (res and res.value == zone[1]) and true or nil
}
end
- return { result = result }
+ return result
end
},
- leds = {
+ getLEDs = {
call = function()
local iter = fs.dir("/sys/class/leds")
local result = { }
end
},
- usb = {
+ getUSBDevices = {
call = function()
local fs = require "nixio.fs"
local iter = fs.glob("/sys/bus/usb/devices/[0-9]*/manufacturer")
local p
for p in iter do
- local id = p:match("%d+-%d+")
+ local id = p:match("/([^/]+)/manufacturer$")
result.devices[#result.devices+1] = {
id = id,
end
end
- iter = fs.glob("/sys/bus/usb/devices/*/usb[0-9]*-port[0-9]*")
+ iter = fs.glob("/sys/bus/usb/devices/*/*-port[0-9]*")
if iter then
result.ports = {}
local p
for p in iter do
- local bus, port = p:match("usb(%d+)-port(%d+)")
+ local port = p:match("([^/]+)$")
+ local link = fs.readlink(p.."/device")
result.ports[#result.ports+1] = {
- hub = tonumber(bus),
- port = tonumber(port)
+ port = port,
+ device = link and fs.basename(link)
}
end
end
end
},
- ifaddrs = {
+ getIfaddrs = {
call = function()
return { result = nixio.getifaddrs() }
end
},
- host_hints = {
+ getHostHints = {
call = function()
local sys = require "luci.sys"
return sys.net.host_hints()
end
},
- duid_hints = {
+ getDUIDHints = {
call = function()
local fp = io.open('/var/hosts/odhcpd')
local result = { }
end
},
- leases = {
+ getDHCPLeases = {
args = { family = 0 },
call = function(args)
local s = require "luci.tools.status"
end
},
- netdevs = {
+ getNetworkDevices = {
call = function(args)
local dir = fs.dir("/sys/class/net")
local result = { }
end
},
- boardjson = {
+ getBoardJSON = {
call = function(args)
local jsc = require "luci.jsonc"
return jsc.parse(fs.readfile("/etc/board.json") or "")
end
},
- conntrack_helpers = {
+ getConntrackHelpers = {
call = function()
- local fd = io.open("/usr/share/fw3/helpers.conf", "r")
+ local ok, fd = pcall(io.open, "/usr/share/fw3/helpers.conf", "r")
local rv = {}
- local line, entry
- while true do
- line = fd:read("*l")
- if not line then
- break
- end
+ if ok then
+ local entry
- if line:match("^%s*config%s") then
- if entry then
- rv[#rv+1] = entry
+ while true do
+ local line = fd:read("*l")
+ if not line then
+ break
end
- entry = {}
- else
- local opt, val = line:match("^%s*option%s+(%S+)%s+(%S.*)$")
- if opt and val then
- opt = opt:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1")
- val = val:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1")
- entry[opt] = val
+
+ if line:match("^%s*config%s") then
+ if entry then
+ rv[#rv+1] = entry
+ end
+ entry = {}
+ else
+ local opt, val = line:match("^%s*option%s+(%S+)%s+(%S.*)$")
+ if opt and val then
+ opt = opt:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1")
+ val = val:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1")
+ entry[opt] = val
+ end
end
end
- end
- if entry then
- rv[#rv+1] = entry
+ if entry then
+ rv[#rv+1] = entry
+ end
+
+ fd:close()
end
- return { helpers = rv }
+ return { result = rv }
end
},
"read": {
"ubus": {
"iwinfo": [ "info" ],
- "luci": [ "boardjson", "duid_hints", "host_hints", "ifaddrs", "initList", "getLocaltime", "leases", "leds", "netdevs", "usb" ],
+ "luci": [ "getBoardJSON", "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getDHCPLeases", "getLEDs", "getNetworkDevices", "getUSBDevices" ],
"network.device": [ "status" ],
"network.interface": [ "dump" ],
"network.wireless": [ "status" ],
},
"write": {
"ubus": {
- "luci": [ "initCall", "setLocaltime", "timezone" ],
+ "luci": [ "setInitAction", "setLocaltime" ],
"uci": [ "add", "apply", "confirm", "delete", "order", "set" ]
},
"uci": [ "*" ]
"description": "Grant access to firewall procedures",
"read": {
"ubus": {
- "luci": [ "conntrack_helpers" ]
+ "luci": [ "getConntrackHelpers" ]
},
"uci": [ "firewall" ]
},
callHostHints = rpc.declare({
object: 'luci',
- method: 'host_hints'
+ method: 'getHostHints',
+ expect: { '': {} }
});
callDUIDHints = rpc.declare({
object: 'luci',
- method: 'duid_hints'
+ method: 'getDUIDHints',
+ expect: { '': {} }
});
callDHCPLeases = rpc.declare({
object: 'luci',
- method: 'leases',
+ method: 'getDHCPLeases',
params: [ 'family' ],
expect: { dhcp_leases: [] }
});
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'));
- m.tabbed = true;
s = m.section(form.TypedSection, 'dnsmasq', _('Server Settings'));
s.anonymous = true;
return L.view.extend({
callHostHints: rpc.declare({
object: 'luci',
- method: 'host_hints'
+ method: 'getHostHints',
+ expect: { '': {} }
}),
load: function() {
'require rpc';
'require form';
-var callInitAction, callLeds, callUSB, callNetdevs;
-
-callInitAction = rpc.declare({
- object: 'luci',
- method: 'initCall',
- params: [ 'name', 'action' ],
- expect: { result: false }
-});
+var callLeds, callUSB, callNetdevs;
callLeds = rpc.declare({
object: 'luci',
- method: 'leds'
+ method: 'getLEDs',
+ expect: { '': {} }
});
callUSB = rpc.declare({
object: 'luci',
- method: 'usb'
+ method: 'getUSBDevices',
+ expect: { '': {} }
});
callNetdevs = rpc.declare({
object: 'luci',
- method: 'ifaddrs',
+ method: 'getIfaddrs',
expect: { result: [] },
filter: function(res) {
var devs = {};
value = String(value || '').split(/\s+/);
for (var i = 0; i < value.length; i++)
- if (value[i].match(/^usb(\d+)-port(\d+)$/))
- ports.push(value[i]);
- else if (value[i].match(/^(\d+)-(\d+)$/))
+ if (value[i].match(/^(\d+)-(\d+)$/))
ports.push('usb%d-port%d'.format(Regexp.$1, Regexp.$2));
+ else
+ ports.push(value[i]);
return ports;
};
usb.ports.forEach(function(usbport) {
- o.value('usb%d-port%d'.format(usbport.hub, usbport.port),
- 'Hub %d, Port %d'.format(usbport.hub, usbport.port));
+ var dev = (usbport.device && Array.isArray(usb.devices))
+ ? usb.devices.filter(function(d) { return d.id == usbport.device })[0] : null;
+
+ var label = _('Port %s').format(usbport.port);
+
+ if (dev)
+ label += ' (%s - %s)'.format(dev.vendor || '?', dev.product || '?');
+
+ o.value(usbport.port, label);
});
}
callInitList = rpc.declare({
object: 'luci',
- method: 'initList',
+ method: 'getInitList',
params: [ 'name' ],
- expect: { result: {} },
+ expect: { '': {} },
filter: function(res) {
for (var k in res)
return +res[k].enabled;
callInitAction = rpc.declare({
object: 'luci',
- method: 'initCall',
+ method: 'setInitAction',
params: [ 'name', 'action' ],
expect: { result: false }
});
callGetLocaltime = rpc.declare({
object: 'luci',
method: 'getLocaltime',
- expect: { localtime: 0 }
+ expect: { result: 0 }
});
callSetLocaltime = rpc.declare({
object: 'luci',
method: 'setLocaltime',
params: [ 'localtime' ],
- expect: { localtime: 0 }
+ expect: { result: 0 }
});
callTimezone = rpc.declare({
object: 'luci',
- method: 'timezone',
- expect: { result: {} }
+ method: 'getTimezones',
+ expect: { '': {} }
});
CBILocalTime = form.DummyValue.extend({
_('Here you can configure the basic aspects of your device like its hostname or the timezone.'));
m.chain('luci');
- m.tabbed = true;
s = m.section(form.TypedSection, 'system', _('System Properties'));
s.anonymous = true;
projects / oweals / luci.git / commitdiff