local route
net.routes6(function(rt)
- if rt.dest:prefix() == 0 and rt.device ~= "lo" and
+ if rt.dest:prefix() == 0 and rt.device ~= "lo" and
(not route or route.metric > rt.metric)
then
route = rt
"([a-f0-9]+) +([^%s]+)"
)
- src_ip = luci.ip.Hex(
- src_ip, tonumber(src_prefix, 16), luci.ip.FAMILY_INET6, false
- )
-
- dst_ip = luci.ip.Hex(
- dst_ip, tonumber(dst_prefix, 16), luci.ip.FAMILY_INET6, false
- )
-
- nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false )
-
- local rt = {
- source = src_ip,
- dest = dst_ip,
- nexthop = nexthop,
- metric = tonumber(metric, 16),
- refcount = tonumber(refcnt, 16),
- usecount = tonumber(usecnt, 16),
- flags = tonumber(flags, 16),
- device = dev,
-
- -- lua number is too small for storing the metric
- -- add a metric_raw field with the original content
- metric_raw = metric
- }
+ if dst_ip and dst_prefix and
+ src_ip and src_prefix and
+ nexthop and metric and
+ refcnt and usecnt and
+ flags and dev
+ then
+ src_ip = luci.ip.Hex(
+ src_ip, tonumber(src_prefix, 16), luci.ip.FAMILY_INET6, false
+ )
+
+ dst_ip = luci.ip.Hex(
+ dst_ip, tonumber(dst_prefix, 16), luci.ip.FAMILY_INET6, false
+ )
+
+ nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false )
+
+ local rt = {
+ source = src_ip,
+ dest = dst_ip,
+ nexthop = nexthop,
+ metric = tonumber(metric, 16),
+ refcount = tonumber(refcnt, 16),
+ usecount = tonumber(usecnt, 16),
+ flags = tonumber(flags, 16),
+ device = dev,
+
+ -- lua number is too small for storing the metric
+ -- add a metric_raw field with the original content
+ metric_raw = metric
+ }
- if callback then
- callback(rt)
- else
- routes[#routes+1] = rt
+ if callback then
+ callback(rt)
+ else
+ routes[#routes+1] = rt
+ end
end
end
--- Retrieve the current user password hash.
-- @param username String containing the username to retrieve the password for
-- @return String containing the hash or nil if no password is set.
+-- @return Password database entry
function user.getpasswd(username)
local pwe = nixio.getsp and nixio.getsp(username) or nixio.getpw(username)
local pwh = pwe and (pwe.pwdp or pwe.passwd)
if not pwh or #pwh < 1 or pwh == "!" or pwh == "x" then
- return nil
+ return nil, pwe
else
- return pwh
+ return pwh, pwe
end
end
-- @param pass String containing the password to compare
-- @return Boolean indicating wheather the passwords are equal
function user.checkpasswd(username, pass)
- local pwh = user.getpasswd(username)
- if pwh and nixio.crypt(pass, pwh) ~= pwh then
- return false
- else
- return true
+ local pwh, pwe = user.getpasswd(username)
+ if pwe then
+ return (pwh == nil or nixio.crypt(pass, pwh) == pwh)
end
+ return false
end
--- Change the password of given user.
return names
end
---- Test whether the given init script is enabled
+--- Get the index of he given init script
-- @param name Name of the init script
--- @return Boolean indicating whether init is enabled
-function init.enabled(name)
+-- @return Numeric index value
+function init.index(name)
if fs.access(init.dir..name) then
- return ( call(init.dir..name.." enabled >/dev/null") == 0 )
+ return call("env -i sh -c 'source %s%s enabled; exit ${START:-255}' >/dev/null"
+ %{ init.dir, name })
end
- return false
end
---- Get the index of he given init script
--- @param name Name of the init script
--- @return Numeric index value
-function init.index(name)
+local function init_action(action, name)
if fs.access(init.dir..name) then
- return call("source "..init.dir..name.." enabled >/dev/null; exit $START")
+ return call("env -i %s%s %s >/dev/null" %{ init.dir, name, action })
end
end
+--- Test whether the given init script is enabled
+-- @param name Name of the init script
+-- @return Boolean indicating whether init is enabled
+function init.enabled(name)
+ return (init_action("enabled", name) == 0)
+end
+
--- Enable the given init script
-- @param name Name of the init script
-- @return Boolean indicating success
function init.enable(name)
- if fs.access(init.dir..name) then
- return ( call(init.dir..name.." enable >/dev/null") == 1 )
- end
+ return (init_action("enable", name) == 1)
end
--- Disable the given init script
-- @param name Name of the init script
-- @return Boolean indicating success
function init.disable(name)
- if fs.access(init.dir..name) then
- return ( call(init.dir..name.." disable >/dev/null") == 0 )
- end
+ return (init_action("disable", name) == 0)
+end
+
+--- Start the given init script
+-- @param name Name of the init script
+-- @return Boolean indicating success
+function init.start(name)
+ return (init_action("start", name) == 0)
+end
+
+--- Stop the given init script
+-- @param name Name of the init script
+-- @return Boolean indicating success
+function init.stop(name)
+ return (init_action("stop", name) == 0)
end
projects / project / luci.git / blobdiff