applications/luci-olsr: Update CBI model for upstream compatibility with 0.5.6-rc7

[project/luci.git] / applications / luci-olsr / luasrc / model / cbi / olsr / olsrd.lua

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index b89fb253d74dbf81bb73a46f8b5c3543394add9b..c57d3c8cb75760d720571767b2bc090fc1b5d22c 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -44,6 +44,14 @@ lql:value("0", translate("disable"))
 lql:value("1", translate("olsr_general_linkqualitylevel_1"))
 lql:value("2", translate("olsr_general_linkqualitylevel_2"))
 
+s:option(Value, "LinkQualityAging").optional = true
+
+lqa = s:option(ListValue, "LinkQualityAlgorithm")
+lqa.optional = true
+lqa:value("etx_fpm", translate("olsr_etx_fpm"))
+lqa:value("etx_float", translate("olsr_etx_float"))
+lqa:value("etx_ff", translate("olsr_etx_ff"))
+
 lqfish = s:option(Flag, "LinkQualityFishEye")
 
 s:option(Value, "LinkQualityWinSize")
@@ -54,6 +62,22 @@ hyst = s:option(Flag, "UseHysteresis")
 hyst.enabled = "yes"
 hyst.disabled = "no"
 
+fib = s:option(ListValue, "FIBMetric")
+fib.optional = true
+fib:value("flat")
+fib:value("correct")
+fib:value("approx")
+
+clrscr = s:option(Flag, "ClearScreen")
+clrscr.enabled = "yes"
+clrscr.disabled = "no"
+
+willingness = s:option(ListValue, "Willingness")
+for i=0,7 do
+       willingness:value(i)
+end
+
+
 
 i = m:section(TypedSection, "Interface", translate("interfaces"))
 i.anonymous = true
@@ -69,6 +93,7 @@ luci.model.uci.foreach("network", "interface",
                end
        end)
 
+i:option(Value, "Ip4Broadcast")
 i:option(Value, "HelloInterval")
 i:option(Value, "HelloValidityTime")
 i:option(Value, "TcInterval")
@@ -91,4 +116,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