Merge 0ef4ddad92
into 93e48e0a9c
This commit is contained in:
commit
e6fc47805a
|
@ -0,0 +1,32 @@
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=gluon-luci-wifi-config
|
||||||
|
PKG_VERSION:=0.1
|
||||||
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
|
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
define Package/gluon-luci-wifi-config
|
||||||
|
SECTION:=gluon
|
||||||
|
CATEGORY:=Gluon
|
||||||
|
DEPENDS:=+gluon-luci-admin
|
||||||
|
TITLE:=UI for switching wifi on/off
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Prepare
|
||||||
|
mkdir -p $(PKG_BUILD_DIR)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Configure
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Compile
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/gluon-luci-wifi-config/install
|
||||||
|
$(CP) ./files/* $(1)/
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call BuildPackage,gluon-luci-wifi-config))
|
|
@ -0,0 +1,5 @@
|
||||||
|
module("luci.controller.admin.wifi-config", package.seeall)
|
||||||
|
|
||||||
|
function index()
|
||||||
|
entry({"admin", "wifi-config"}, cbi("admin/wifi-config"), "WLAN-Config", 20)
|
||||||
|
end
|
|
@ -0,0 +1,90 @@
|
||||||
|
local f, s, o
|
||||||
|
local uci = luci.model.uci.cursor()
|
||||||
|
local config = 'wireless'
|
||||||
|
|
||||||
|
--set the heading, button and stuff
|
||||||
|
f = SimpleForm("wifi", "WLAN-Config")
|
||||||
|
f.reset = false
|
||||||
|
f.template = "admin/expertmode"
|
||||||
|
f.submit = "Speichern"
|
||||||
|
|
||||||
|
-- text, which describes what the package does to the user
|
||||||
|
s = f:section(SimpleSection, nil, [[
|
||||||
|
Viele Freifunk-Communitys betreiben ein sogenanntes Dachnetz. Das bedeutet, dass
|
||||||
|
manche Router sich über große Strecken miteinander verbinden, um viele kleine
|
||||||
|
Mesh-Netze miteinander zu verbinden. Um diese weiten Verbindungen effektiver zu
|
||||||
|
gestalten hast du hier die Möglichkeit die SSID, mit der sich die Clients verbinden,
|
||||||
|
zu deaktivieren.
|
||||||
|
]])
|
||||||
|
|
||||||
|
|
||||||
|
local radios = {}
|
||||||
|
|
||||||
|
-- look for wifi interfaces and add them to the array
|
||||||
|
uci:foreach('wireless', 'wifi-device',
|
||||||
|
function(s)
|
||||||
|
table.insert(radios, s['.name'])
|
||||||
|
end
|
||||||
|
)
|
||||||
|
|
||||||
|
--add a client and mesh checkbox for each interface
|
||||||
|
for index, radio in ipairs(radios) do
|
||||||
|
--get the hwmode to seperate 2.4GHz and 5Ghz radios
|
||||||
|
local hwmode = uci:get('wireless', radio, 'hwmode')
|
||||||
|
|
||||||
|
if hwmode == '11g' or hwmode == '11ng' then --if 2.4GHz
|
||||||
|
--box for the clientnet
|
||||||
|
o = s:option(Flag, 'clientbox' .. index, "2,4GHz Client Netz aktivieren")
|
||||||
|
o.default = (uci:get_bool(config, 'client_' .. radio, "disabled")) and o.disabled or o.enabled
|
||||||
|
o.rmempty = false
|
||||||
|
--box for the meshnet
|
||||||
|
o = s:option(Flag, 'meshbox' .. index, "2,4GHz Mesh Netz aktivieren")
|
||||||
|
o.default = (uci:get_bool(config, 'client_' .. radio, "disabled")) and o.disabled or o.enabled
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
elseif hwmode == '11a' or hwmode == '11na' then --if 5GHz
|
||||||
|
--box for the clientnet
|
||||||
|
o = s:option(Flag, 'clientbox' .. index, "5GHz Client Netz aktivieren")
|
||||||
|
o.default = (uci:get_bool(config, 'client_' .. radio, "disabled")) and o.disabled or o.enabled
|
||||||
|
o.rmempty = false
|
||||||
|
--box for the meshnet
|
||||||
|
o = s:option(Flag, 'meshbox' .. index, "5GHz Mesh Netz aktivieren")
|
||||||
|
o.default = (uci:get_bool(config, 'client_' .. radio, "disabled")) and o.disabled or o.enabled
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
--if the save-button is pushed
|
||||||
|
function f.handle(self, state, data)
|
||||||
|
if state == FORM_VALID then
|
||||||
|
|
||||||
|
for index, radio in ipairs(radios) do
|
||||||
|
|
||||||
|
local clientstate, meshstate
|
||||||
|
-- get the data from the boxes and invert it
|
||||||
|
if data["clientbox"..index] == '0' then
|
||||||
|
clientenabled = 'true'
|
||||||
|
else
|
||||||
|
clientenabled = 'false'
|
||||||
|
end
|
||||||
|
-- write the data to the config file
|
||||||
|
uci:set(config, 'client_' .. radio, "disabled", clientenabled)
|
||||||
|
|
||||||
|
|
||||||
|
if data["meshbox"..index] == '0' then
|
||||||
|
meshenabled = 'true'
|
||||||
|
else
|
||||||
|
meshenabled = 'false'
|
||||||
|
end
|
||||||
|
|
||||||
|
uci:set(config, 'mesh_' .. radio, "disabled", meshenabled)
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
uci:save(config)
|
||||||
|
uci:commit(config)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return f
|
|
@ -7,6 +7,8 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do
|
||||||
need_string(config .. '.mesh_ssid')
|
need_string(config .. '.mesh_ssid')
|
||||||
need_string_match(config .. '.mesh_bssid', '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$')
|
need_string_match(config .. '.mesh_bssid', '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$')
|
||||||
need_number(config .. '.mesh_mcast_rate')
|
need_number(config .. '.mesh_mcast_rate')
|
||||||
|
need_boolean(config .. '.ssid_disabled')
|
||||||
|
need_boolean(config .. '.mesh_disabled')
|
||||||
end
|
end
|
||||||
|
|
||||||
need_boolean('mesh_on_wan', false)
|
need_boolean('mesh_on_wan', false)
|
||||||
|
|
|
@ -22,6 +22,7 @@ local function configure_radio(radio, index, config)
|
||||||
mode = 'ap',
|
mode = 'ap',
|
||||||
ssid = config.ssid,
|
ssid = config.ssid,
|
||||||
macaddr = util.generate_mac(2, index),
|
macaddr = util.generate_mac(2, index),
|
||||||
|
disabled = config.ssid_disabled,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -45,6 +46,7 @@ local function configure_radio(radio, index, config)
|
||||||
bssid = config.mesh_bssid,
|
bssid = config.mesh_bssid,
|
||||||
macaddr = util.generate_mac(3, index),
|
macaddr = util.generate_mac(3, index),
|
||||||
mcast_rate = config.mesh_mcast_rate,
|
mcast_rate = config.mesh_mcast_rate,
|
||||||
|
disabled = config.mesh_disabled,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue