dynapoint: Updated to latest version (Fixes to make it actually work)

Signed-off-by: hmronline <hmronline@gmail.com>
This commit is contained in:
hmronline 2017-05-18 10:59:01 -03:00
parent 675585a66f
commit 68fa7fe87e
2 changed files with 19 additions and 11 deletions

View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dynapoint
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Tobias Ilte <tobias.ilte@campus.tu-berlin.de>
PKG_LICENSE:=GPL-3.0+

View File

@ -52,8 +52,22 @@ local curl = tonumber(uci_cursor:get("dynapoint", "internet", "use_curl"))
if (curl == 1) then
curl_interface = uci_cursor:get("dynapoint", "internet", "curl_interface")
end
function get_system_sections(t)
for pos,val in pairs(t) do
if (type(val)=="table") then
get_system_sections(val);
elseif (type(val)=="string") then
if (pos == "hostname") then
localhostname = val
end
end
end
end
if (tonumber(uci_cursor:get("dynapoint", "internet", "add_hostname_to_ssid")) == 1 ) then
localhostname = uci_cursor:get("system", "system", "hostname")
get_system_sections(getConfType("system","system"))
if (not localhostname) then
error("Failed to obtain system hostname")
end
end
local table_names_rule = {}
@ -72,8 +86,8 @@ function get_dynapoint_sections(t)
elseif (val == "!internet") then
table_names_not_rule[#table_names_not_rule+1] = t[".name"]
if (localhostname) then
ssids_not_rule[#ssids_not_rule+1] = t[".ssid"]
ssids_with_hostname[#ssids_with_hostname+1] = t[".ssid"].."_"..localhostname
ssids_not_rule[#ssids_not_rule+1] = uci_cursor:get("wireless", t[".name"], "ssid")
ssids_with_hostname[#ssids_with_hostname+1] = uci_cursor:get("wireless", t[".name"], "ssid").."_"..localhostname
end
end
end
@ -81,7 +95,6 @@ function get_dynapoint_sections(t)
end
end
--print(table.getn(hosts))
get_dynapoint_sections(getConfType("wireless","wifi-iface"))
@ -126,21 +139,16 @@ end
function change_wireless_config(switch_to_offline)
if (switch_to_offline == 1) then
log.syslog("info","Switched to OFFLINE")
for i = 1, #table_names_not_rule do
uci_cursor:set("wireless",table_names_not_rule[i], "disabled", "0")
if (localhostname) then
uci_cursor:set("wireless", table_names_not_rule[i], "ssid", ssids_with_hostname[i])
log.syslog("info","Bring up new AP "..ssids_with_hostname[i])
else
log.syslog("info","Bring up new AP "..ssids_not_rule[i])
end
log.syslog("info","Bring up new AP "..uci_cursor:get("wireless", table_names_not_rule[i], "ssid"))
end
for i = 1, #table_names_rule do
uci_cursor:set("wireless",table_names_rule[i], "disabled", "1")
end
else
log.syslog("info","Switched to ONLINE")
for i = 1, #table_names_not_rule do