Revert "* luci/applications: olsr: convert general settings to dynamic section with most parameters removed to ease the compatibility pain"

This reverts commit ec51f83957827f0dfa58dd2c211253aa61ee3bfe.

1 files changed, 52 insertions, 1 deletions

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index b5da4e71dd..80fe53ccdb 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -17,7 +17,6 @@ require("luci.fs")
 m = Map("olsr", "OLSR")
 
 s = m:section(NamedSection, "general", "olsr")
-s.dynamic = true
 
 debug = s:option(ListValue, "DebugLevel")
 for i=0, 9 do
@@ -28,6 +27,58 @@ ipv = s:option(ListValue, "IpVersion")
 ipv:value("4", "IPv4")
 ipv:value("6", "IPv6")
 
+noint = s:option(Flag, "AllowNoInt")
+noint.enabled = "yes"
+noint.disabled = "no"
+
+s:option(Value, "Pollrate")
+
+tcr = s:option(ListValue, "TcRedundancy")
+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"))
+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")
+
+s:option(Value, "LinkQualityDijkstraLimit")
+
+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