projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-app-ddns: pass the is_glue option value to the helper
[project/luci.git]
/
applications
/
luci-app-ddns
/
luasrc
/
controller
/
ddns.lua
diff --git
a/applications/luci-app-ddns/luasrc/controller/ddns.lua
b/applications/luci-app-ddns/luasrc/controller/ddns.lua
index
abaf1c7
..
d6ccf9c
100755
(executable)
--- a/
applications/luci-app-ddns/luasrc/controller/ddns.lua
+++ b/
applications/luci-app-ddns/luasrc/controller/ddns.lua
@@
-1,7
+1,7
@@
-- Copyright 2008 Steven Barth <steven@midlink.org>
-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
-- Copyright 2008 Steven Barth <steven@midlink.org>
-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
--- Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+-- Copyright 2014
-2016
Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.ddns", package.seeall)
-- Licensed to the public under the Apache License 2.0.
module("luci.controller.ddns", package.seeall)
@@
-18,11
+18,11
@@
local UTIL = require "luci.util"
local DDNS = require "luci.tools.ddns" -- ddns multiused functions
local srv_name = "ddns-scripts"
local DDNS = require "luci.tools.ddns" -- ddns multiused functions
local srv_name = "ddns-scripts"
-local srv_ver_min = "2.
5.0
" -- minimum version of service required
+local srv_ver_min = "2.
7.1
" -- minimum version of service required
local srv_ver_cmd = [[/usr/lib/ddns/dynamic_dns_updater.sh --version | awk {'print $2'}]]
local app_name = "luci-app-ddns"
local app_title = "Dynamic DNS"
local srv_ver_cmd = [[/usr/lib/ddns/dynamic_dns_updater.sh --version | awk {'print $2'}]]
local app_name = "luci-app-ddns"
local app_title = "Dynamic DNS"
-local app_version = "2.
3.1
-1"
+local app_version = "2.
4.4
-1"
function index()
local nxfs = require "nixio.fs" -- global definitions not available
function index()
local nxfs = require "nixio.fs" -- global definitions not available
@@
-96,11
+96,11
@@
function app_title_main()
end
function service_version()
local ver = nil
end
function service_version()
local ver = nil
- IPKG.list_installed(srv_name, function(n, v
er
, d)
- -- nothing to do
+ IPKG.list_installed(srv_name, function(n, v, d)
+ if v and (#v > 0) then ver = v end
end
)
end
)
- if not ver then
+ if not ver
or (#ver == 0)
then
ver = UTIL.exec(srv_ver_cmd)
if #ver == 0 then ver = nil end
end
ver = UTIL.exec(srv_ver_cmd)
if #ver == 0 then ver = nil end
end
@@
-190,9
+190,11
@@
local function _get_status()
local dnsserver = s["dns_server"] or ""
local force_ipversion = tonumber(s["force_ipversion"] or 0)
local force_dnstcp = tonumber(s["force_dnstcp"] or 0)
local dnsserver = s["dns_server"] or ""
local force_ipversion = tonumber(s["force_ipversion"] or 0)
local force_dnstcp = tonumber(s["force_dnstcp"] or 0)
+ local is_glue = tonumber(s["is_glue"] or 0)
local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh]]
command = command .. [[ get_registered_ip ]] .. lookup_host .. [[ ]] .. use_ipv6 ..
local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh]]
command = command .. [[ get_registered_ip ]] .. lookup_host .. [[ ]] .. use_ipv6 ..
- [[ ]] .. force_ipversion .. [[ ]] .. force_dnstcp .. [[ ]] .. dnsserver
+ [[ ]] .. force_ipversion .. [[ ]] .. force_dnstcp .. [[ ]] .. dnsserver ..
+ [[ ]] .. is_glue
local reg_ip = SYS.exec(command)
if reg_ip == "" then
reg_ip = "_nodata_"
local reg_ip = SYS.exec(command)
if reg_ip == "" then
reg_ip = "_nodata_"