projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
68349d5
)
applications/luci-olsr: Update CBI model for upstream compatibility with 0.5.6-rc7
author
Steven Barth
<steven@midlink.org>
Wed, 9 Jul 2008 07:46:18 +0000
(07:46 +0000)
committer
Steven Barth
<steven@midlink.org>
Wed, 9 Jul 2008 07:46:18 +0000
(07:46 +0000)
applications/luci-olsr/luasrc/i18n/olsr.de.lua
patch
|
blob
|
history
applications/luci-olsr/luasrc/i18n/olsr.en.lua
patch
|
blob
|
history
applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
patch
|
blob
|
history
diff --git
a/applications/luci-olsr/luasrc/i18n/olsr.de.lua
b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
index
1357f64
..
5ab77c6
100644
(file)
--- a/
applications/luci-olsr/luasrc/i18n/olsr.de.lua
+++ b/
applications/luci-olsr/luasrc/i18n/olsr.de.lua
@@
-23,12
+23,22
@@
olsr_general_tcredundancy_1 = "MPR-Selektoren und MPR"
olsr_general_tcredundancy_2 = "Alle Nachbarn"
olsr_general_mprcoverage = "MPR-Erfassung"
olsr_general_linkqualitylevel = "VQ-Level"
olsr_general_tcredundancy_2 = "Alle Nachbarn"
olsr_general_mprcoverage = "MPR-Erfassung"
olsr_general_linkqualitylevel = "VQ-Level"
+olsr_general_linkqualityaging = "VQ-Alterung"
+olsr_general_linkqualityalgorithm = "VQ-Algorithmus"
+olsr_etx_fpm = "Festkomma"
+olsr_etx_float = "Gleitkomma"
+olsr_etx_ff = "Freifunk"
olsr_general_linkqualitylevel_1 = "MPR-Auswahl"
olsr_general_linkqualitylevel_2 = "MPR-Auswahl und Routing"
olsr_general_linkqualityfisheye = "VQ-Fisheye"
olsr_general_linkqualitywinsize = "VQ-Fenstergröße"
olsr_general_linkqualitydijkstralimit = "VQ-Dijkstralimit"
olsr_general_usehysteresis = "Hysterese aktivieren"
olsr_general_linkqualitylevel_1 = "MPR-Auswahl"
olsr_general_linkqualitylevel_2 = "MPR-Auswahl und Routing"
olsr_general_linkqualityfisheye = "VQ-Fisheye"
olsr_general_linkqualitywinsize = "VQ-Fenstergröße"
olsr_general_linkqualitydijkstralimit = "VQ-Dijkstralimit"
olsr_general_usehysteresis = "Hysterese aktivieren"
+olsr_general_fibmetric = "FIB-Metrik"
+olsr_general_clearscreen = "Ansicht zurücksetzen"
+olsr_general_willingness = "Bereitschaft"
+
+olsr_interface_ip4broadcast = "IPv4 Broadcast"
olsr_interface_hellointerval = "Hello-Intervall"
olsr_interface_hellovaliditytime = "Hello-Gültigkeit"
olsr_interface_tcinterval = "TC-Intervall"
olsr_interface_hellointerval = "Hello-Intervall"
olsr_interface_hellovaliditytime = "Hello-Gültigkeit"
olsr_interface_tcinterval = "TC-Intervall"
diff --git
a/applications/luci-olsr/luasrc/i18n/olsr.en.lua
b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
index
2e15f90
..
8dd50b6
100644
(file)
--- a/
applications/luci-olsr/luasrc/i18n/olsr.en.lua
+++ b/
applications/luci-olsr/luasrc/i18n/olsr.en.lua
@@
-21,12
+21,22
@@
olsr_general_tcredundancy_1 = "MPR-Selectors and MPR"
olsr_general_tcredundancy_2 = "All Neighbors"
olsr_general_mprcoverage = "MPR-Coverage"
olsr_general_linkqualitylevel = "LQ-Level"
olsr_general_tcredundancy_2 = "All Neighbors"
olsr_general_mprcoverage = "MPR-Coverage"
olsr_general_linkqualitylevel = "LQ-Level"
+olsr_general_linkqualityaging = "LQ-Aging"
+olsr_general_linkqualityalgorithm = "LQ-Algorithm"
+olsr_etx_fpm = "Fixed Point"
+olsr_etx_float = "Floating Point"
+olsr_etx_ff = "Freifunk"
olsr_general_linkqualitylevel_1 = "MPR-Selection"
olsr_general_linkqualitylevel_2 = "MPR-Selection and Routing"
olsr_general_linkqualityfisheye = "LQ-Fisheye"
olsr_general_linkqualitywinsize = "LQ-Windowsize"
olsr_general_linkqualitydijkstralimit = "LQ-Dijkstralimit"
olsr_general_usehysteresis = "Use hysteresis"
olsr_general_linkqualitylevel_1 = "MPR-Selection"
olsr_general_linkqualitylevel_2 = "MPR-Selection and Routing"
olsr_general_linkqualityfisheye = "LQ-Fisheye"
olsr_general_linkqualitywinsize = "LQ-Windowsize"
olsr_general_linkqualitydijkstralimit = "LQ-Dijkstralimit"
olsr_general_usehysteresis = "Use hysteresis"
+olsr_general_fibmetric = "FIB-Metric"
+olsr_general_clearscreen = "Clear Screen"
+olsr_general_willingness = "Willingness"
+
+olsr_interface_ip4broadcast = "IPv4 Broadcast"
olsr_interface_hellointerval = "Hello-Interval"
olsr_interface_hellovaliditytime = "Hello-Validity"
olsr_interface_tcinterval = "TC-Interval"
olsr_interface_hellointerval = "Hello-Interval"
olsr_interface_hellovaliditytime = "Hello-Validity"
olsr_interface_tcinterval = "TC-Interval"
diff --git
a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index
67b3169
..
c57d3c8
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"))
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")
lqfish = s:option(Flag, "LinkQualityFishEye")
s:option(Value, "LinkQualityWinSize")
@@
-54,6
+62,22
@@
hyst = s:option(Flag, "UseHysteresis")
hyst.enabled = "yes"
hyst.disabled = "no"
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
i = m:section(TypedSection, "Interface", translate("interfaces"))
i.anonymous = true
@@
-69,6
+93,7
@@
luci.model.uci.foreach("network", "interface",
end
end)
end
end)
+i:option(Value, "Ip4Broadcast")
i:option(Value, "HelloInterval")
i:option(Value, "HelloValidityTime")
i:option(Value, "TcInterval")
i:option(Value, "HelloInterval")
i:option(Value, "HelloValidityTime")
i:option(Value, "TcInterval")