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

luci-app-bmx6: change tunInNet for tunIn (according to new bmx6 tunnels/gateways configuration). Some minor changes.

Browse source
This commit is contained in:
p4u 2013-08-28 01:17:39 +02:00
parent 46593fbdc1
commit 5b57a2035f
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/tunnels.lua
View file

@ -25,7 +25,7 @@ local bmx6json = require("luci.model.bmx6json")
m = Map("bmx6", "bmx6") m = Map("bmx6", "bmx6")
-- tunOut -- tunOut
local tunnelsOut = m:section(TypedSection,"tunOut",translate("Networks to fetch"),translate("Tunnel announcements to fetch if possible")) local tunnelsOut = m:section(TypedSection,"tunOut",translate("Networks to fetch"),translate("Gateways announcements to fetch"))
tunnelsOut.addremove = true tunnelsOut.addremove = true
tunnelsOut.anonymous = true tunnelsOut.anonymous = true
tunnelsOut:option(Value,"tunOut","Name") tunnelsOut:option(Value,"tunOut","Name")
@ -42,23 +42,19 @@ for _,o in ipairs(tunoptions) do
end end
--tunIn -- tunOut
local tunnelsIn = m:section(TypedSection,"tunInNet",translate("Networks to offer"),translate("Tunnels to announce in the network")) local tunnelsIn = m:section(TypedSection,"tunIn",translate("Networks to offer"),translate("Gateways to announce in the network"))
tunnelsIn.addremove = true tunnelsIn.addremove = true
tunnelsIn.anonymous = true tunnelsIn.anonymous = true
tunnelsIn:option(Value,"tunIn","Name")
tunnelsIn:option(Value,"network", translate("Network to offer"))
local net = tunnelsIn:option(Value,"tunInNet", translate("Network to offer")) local tunInoptions = bmx6json.getOptions("tunIn")
net.default = "10.0.0.0/8"
local bwd = tunnelsIn:option(Value,"bandwidth",translate("Bandwidth (Bytes)"))
bwd.default = "1000000"
local tuninoptions = bmx6json.getOptions("tunInNet")
local _,o local _,o
for _,o in ipairs(tuninoptions) do for _,o in ipairs(tunInoptions) do
if o.name ~= nil and o.name ~= "tunInNet" and o.name ~= "bandwidth" then if o.name ~= nil and o.name ~= "network" then
help = bmx6json.getHtmlHelp(o) help = bmx6json.getHtmlHelp(o)
value = tunnelsIn:option(Value,o.name,o.name,help) value = tunnelsOut:option(Value,o.name,o.name,help)
value.optional = true value.optional = true
end end
end end
@ -72,4 +68,3 @@ function m.on_commit(self,map)
end end
return m return m