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

Merge pull request #1126 from chris5560/master

Browse source 
luci-app-ddns: fix to correct system status
This commit is contained in:
Hannu Nyman 2017-04-26 23:00:04 +03:00 committed by GitHub
commit 8eeb663f63
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-app-ddns/Makefile
View file

@ -2,7 +2,7 @@
# Copyright 2008 Steven Barth <steven@midlink.org> # Copyright 2008 Steven Barth <steven@midlink.org>
# Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> # Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
# Copyright 2013 Manuel Munz <freifunk at somakoma dot de> # Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
# Copyright 2014-2016 Christian Schoenebeck <christian dot schoenebeck at gmail dot com> # Copyright 2014-2017 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
# #
# This is free software, licensed under the Apache License, Version 2.0 # This is free software, licensed under the Apache License, Version 2.0
@ -16,7 +16,7 @@ PKG_VERSION:=2.4.8
# Release == build # Release == build
# increase on changes of translation files # increase on changes of translation files
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com> PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>

12
applications/luci-app-ddns/luasrc/controller/ddns.lua
View file

@ -1,7 +1,7 @@
-- Copyright 2008 Steven Barth <steven@midlink.org> -- Copyright 2008 Steven Barth <steven@midlink.org>
-- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> -- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2013 Manuel Munz <freifunk at somakoma dot de> -- Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
-- Copyright 2014-2016 Christian Schoenebeck <christian dot schoenebeck at gmail dot com> -- Copyright 2014-2017 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-- Licensed to the public under the Apache License 2.0. -- Licensed to the public under the Apache License 2.0.
module("luci.controller.ddns", package.seeall) module("luci.controller.ddns", package.seeall)
@ -24,7 +24,7 @@ local srv_ver_min = "2.7.6" -- minimum version of service required
local srv_ver_cmd = luci_helper .. [[ -V | awk {'print $2'}]] local srv_ver_cmd = luci_helper .. [[ -V | awk {'print $2'}]]
local app_name = "luci-app-ddns" local app_name = "luci-app-ddns"
local app_title = "Dynamic DNS" local app_title = "Dynamic DNS"
local app_version = "2.4.8-1" local app_version = "2.4.8-2"
function index() function index()
local nxfs = require "nixio.fs" -- global definitions not available local nxfs = require "nixio.fs" -- global definitions not available
@ -180,12 +180,10 @@ local function _get_status()
end end
-- get/set monitored interface and IP version -- get/set monitored interface and IP version
local iface = s["interface"] or "_nonet_" local iface = s["interface"] or "wan"
local use_ipv6 = tonumber(s["use_ipv6"]) or 0 local use_ipv6 = tonumber(s["use_ipv6"]) or 0
if iface ~= "_nonet_" then local ipv = (use_ipv6 == 1) and "IPv6" or "IPv4"
local ipv = (use_ipv6 == 1) and "IPv6" or "IPv4" iface = ipv .. " / " .. iface
iface = ipv .. " / " .. iface
end
-- try to get registered IP -- try to get registered IP
local lookup_host = s["lookup_host"] or "_nolookup_" local lookup_host = s["lookup_host"] or "_nolookup_"