X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-olsr%2Fluasrc%2Fmodel%2Fcbi%2Folsr%2Folsrd.lua;h=67b3169a0bd74e36323bedbb07f78903c37a5e61;hp=c5f86d089b25f224815b3f19d9724462187b53f4;hb=50fd29841540bb8b1735291b72853454679e9e62;hpb=0d4b628c7bb72b3785fd9ce7d71f85ddb6b250a0

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index c5f86d089b..67b3169a0b 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -33,16 +33,16 @@ noint.disabled = "no"
 s:option(Value, "Pollrate")
 
 tcr = s:option(ListValue, "TcRedundancy")
-tcr:value("0", translate("olsr_general_tcredundancy_0", "MPR-Selektoren"))
-tcr:value("1", translate("olsr_general_tcredundancy_1", "MPR-Selektoren und MPR"))
-tcr:value("2", translate("olsr_general_tcredundancy_2", "Alle Nachbarn"))
+tcr:value("0", translate("olsr_general_tcredundancy_0"))
+tcr:value("1", translate("olsr_general_tcredundancy_1"))
+tcr:value("2", translate("olsr_general_tcredundancy_2"))
 
 s:option(Value, "MprCoverage")
 
 lql = s:option(ListValue, "LinkQualityLevel")
-lql:value("0", translate("disable", "deaktivieren"))
-lql:value("1", translate("olsr_general_linkqualitylevel_1", "MPR-Auswahl"))
-lql:value("2", translate("olsr_general_linkqualitylevel_2", "MPR-Auswahl und Routing"))
+lql:value("0", translate("disable"))
+lql:value("1", translate("olsr_general_linkqualitylevel_1"))
+lql:value("2", translate("olsr_general_linkqualitylevel_2"))
 
 lqfish = s:option(Flag, "LinkQualityFishEye")
 
@@ -55,12 +55,12 @@ hyst.enabled = "yes"
 hyst.disabled = "no"
 
 
-i = m:section(TypedSection, "Interface", translate("interfaces", "Schnittstellen"))
+i = m:section(TypedSection, "Interface", translate("interfaces"))
 i.anonymous = true
 i.addremove = true
 i.dynamic = true
 
-network = i:option(ListValue, "Interface", translate("network", "Netzwerk"))
+network = i:option(ListValue, "Interface", translate("network"))
 network:value("")
 luci.model.uci.foreach("network", "interface",
 	function (section)
@@ -83,7 +83,7 @@ p = m:section(TypedSection, "LoadPlugin")
 p.addremove = true
 p.dynamic = true
 
-lib = p:option(ListValue, "Library", translate("library", "Bibliothek"))
+lib = p:option(ListValue, "Library", translate("library"))
 lib:value("")
 for k, v in pairs(luci.fs.dir("/usr/lib")) do
 	if v:sub(1, 6) == "olsrd_" then
@@ -91,4 +91,26 @@ for k, v in pairs(luci.fs.dir("/usr/lib")) do
 	end
 end
 
-return m
\ No newline at end of file
+
+for i, sect in ipairs({ "Hna4", "Hna6" }) do
+	hna = m:section(TypedSection, sect)
+	hna.addremove = true
+	hna.anonymous = true
+
+	net = hna:option(Value, "NetAddr")
+	msk = hna:option(Value, "Prefix")
+end
+
+
+ipc = m:section(NamedSection, "IpcConnect")
+conns = ipc:option(Value, "MaxConnections")
+conns.isInteger = true
+
+nets  = ipc:option(Value, "Net")
+nets.optional = true
+
+hosts = ipc:option(Value, "Host")
+hosts.optional = true
+
+
+return m