* luci/olsr: added config-support and translations for Hna4, Hna6 and IpcConnect configuration

3 files changed, 72 insertions, 3 deletions

diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.lua b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
index 28dd740ce4..1357f64cc6 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.de.lua
+++ b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
@@ -37,4 +37,27 @@ olsr_interface_midinterval = "MID-Intervall"
 olsr_interface_midvaliditytime = "MID-Gültigkeit"
 olsr_interface_hnainterval = "HNA-Intervall"
 olsr_interface_hnavaliditytime = "HNA-Gültigkeit"
-olsr_loadplugin = "Plugins"
\ No newline at end of file
+olsr_loadplugin = "Plugins"
+
+olsr_hna4 = "IPv4 HNA-Ankündigungen"
+olsr_hna4_desc = "Hna4-Entries ermöglichen die Ankündigung von lokalen IPv4 Host- und Netz-Routen im Mesh-Netzwerk"
+olsr_hna4_netaddr = "Netzwerk-Adresse"
+olsr_hna4_netaddr_desc = "IPv4 Adresse"
+olsr_hna4_prefix  = "Netzmaske"
+olsr_hna4_prefix_desc = "IPv4 Adresse"
+
+olsr_hna6 = "IPv6 HNA-Ankündigungen"
+olsr_hna6_desc = "Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk"
+olsr_hna6_netaddr = "Netzwerk-Adresse"
+olsr_hna6_netaddr_desc = "IPv6 Adresse"
+olsr_hna6_prefix  = "Netzmaske"
+olsr_hna6_prefix_desc = "IPv6 Adresse"
+
+olsr_ipcconnect = "IPC-Einstellungen"
+olsr_ipcconnect_desc = "IPC-Verbindungen ermöglichen die Fernsteuerung des lokalen OLSR-Prozesses durch externe Programme"
+olsr_ipcconnect_maxconnections = "maximale Anzahl von Verbindungen"
+olsr_ipcconnect_maxconnections_desc = "0 deaktiviert IPC"
+olsr_ipcconnect_host = "erlaubte Hostadressen"
+olsr_ipcconnect_host_desc = "mehrere mit Leerzeichen trennen"
+olsr_ipcconnect_net = "erlaubte Netzbereiche"
+olsr_ipcconnect_net_desc = "Adresse Maske; mehrere mit Leerzeichen"
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.lua b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
index 2b2dd0adbe..2e15f908d6 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.en.lua
+++ b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
@@ -35,4 +35,28 @@ olsr_interface_midinterval = "MID-Interval"
 olsr_interface_midvaliditytime = "MID-Validity"
 olsr_interface_hnainterval = "HNA-Interval"
 olsr_interface_hnavaliditytime = "HNA-Validity"
-olsr_loadplugin = "Plugins"
\ No newline at end of file
+olsr_loadplugin = "Plugins"
+
+olsr_hna4 = "IPv4 HNA-Announcements"
+olsr_hna4_desc = "Hna4-entries are used to announce local ipv4 host- and net-routes within the mesh-network"
+olsr_hna4_netaddr = "Network-Address"
+olsr_hna4_netaddr_desc = "ipv4 address"
+olsr_hna4_prefix  = "Netmask"
+olsr_hna4_prefix_desc = "ipv4 address"
+
+olsr_hna4 = "IPv6 HNA-Announcements"
+olsr_hna6_desc = "Hna6-entries are used to announce local ipv6 host- and net-routes within the mesh-network"
+olsr_hna6_netaddr = "Network-Address"
+olsr_hna6_netaddr_desc = "ipv6 address"
+olsr_hna6_prefix  = "Netmask"
+olsr_hna6_prefix_desc = "ipv6 address"
+
+olsr_ipcconnect = "IPC-Settings"
+olsr_ipcconnect_desc = "IPC-connections allow external programs to remote-control the local OLSR process"
+olsr_ipcconnect_maxconnections = "max. allowed connections"
+olsr_ipcconnect_maxconnections_desc = "0 disables IPC"
+olsr_ipcconnect_host = "Allowed hosts"
+olsr_ipcconnect_host_desc = "multiple separated by space"
+olsr_ipcconnect_net = "Allowed networks"
+olsr_ipcconnect_net_desc = "address netmask; separated by space"
+
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index b89fb253d7..67b3169a0b 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -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