From 9ac4ba5fa760b1180c53c5dc22f2fcadb08c5bda Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 27 Nov 2008 00:11:26 +0000 Subject: [PATCH] applications/luci-olsr: fix handling of hna6 announcements --- applications/luci-olsr/luasrc/i18n/olsr.de.lua | 4 ++-- applications/luci-olsr/luasrc/i18n/olsr.de.xml | 4 ++-- applications/luci-olsr/luasrc/i18n/olsr.en.lua | 4 ++-- applications/luci-olsr/luasrc/i18n/olsr.en.xml | 4 ++-- .../luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua | 27 ++++++++++++++-------- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.lua b/applications/luci-olsr/luasrc/i18n/olsr.de.lua index dc0cfafab..4ebcf0e2e 100644 --- a/applications/luci-olsr/luasrc/i18n/olsr.de.lua +++ b/applications/luci-olsr/luasrc/i18n/olsr.de.lua @@ -75,8 +75,8 @@ olsrd_hna6 = 'IPv6 HNA-Ankündigungen' olsrd_hna6_desc = 'Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk' olsrd_hna6_netaddr = 'Netzwerk-Adresse' olsrd_hna6_netaddr_desc = 'IPv6 Adresse' -olsrd_hna6_netmask = 'Netzmaske' -olsrd_hna6_netmask_desc = 'IPv6 Adresse' +olsrd_hna6_prefix = 'Prefix' +olsrd_hna6_prefix_desc = 'IPv6 Prefix' olsrd_loadplugin = 'Pluginkonfiguration' olsrd_loadplugin_ignore = 'Plugin aktivieren' olsrd_loadplugin_library = 'Bibliothek' diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.xml b/applications/luci-olsr/luasrc/i18n/olsr.de.xml index 3d9763dc9..3d8b5a211 100644 --- a/applications/luci-olsr/luasrc/i18n/olsr.de.xml +++ b/applications/luci-olsr/luasrc/i18n/olsr.de.xml @@ -112,8 +112,8 @@ Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk Netzwerk-Adresse IPv6 Adresse -Netzmaske -IPv6 Adresse +Prefix +IPv6 Prefix diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.lua b/applications/luci-olsr/luasrc/i18n/olsr.en.lua index fbba7653f..b8621d3f7 100644 --- a/applications/luci-olsr/luasrc/i18n/olsr.en.lua +++ b/applications/luci-olsr/luasrc/i18n/olsr.en.lua @@ -75,8 +75,8 @@ olsrd_hna6 = 'IPv6 HNA announcements' olsrd_hna6_desc = 'Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network' olsrd_hna6_netaddr = 'Network address' olsrd_hna6_netaddr_desc = 'IPv6 address' -olsrd_hna6_netmask = 'Netmask' -olsrd_hna6_netmask_desc = 'IPv6 address' +olsrd_hna6_prefix = 'Prefix' +olsrd_hna6_prefix_desc = 'IPv6 prefix' olsrd_loadplugin = 'Plugin configuration' olsrd_loadplugin_ignore = 'Enable plugin' olsrd_loadplugin_library = 'Library' diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.xml b/applications/luci-olsr/luasrc/i18n/olsr.en.xml index 546b7a849..4dc7d5c94 100644 --- a/applications/luci-olsr/luasrc/i18n/olsr.en.xml +++ b/applications/luci-olsr/luasrc/i18n/olsr.en.xml @@ -112,8 +112,8 @@ Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network Network address IPv6 address -Netmask -IPv6 address +Prefix +IPv6 prefix diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua index 632a4d4a4..ea2f88d79 100644 --- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua +++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua @@ -14,14 +14,23 @@ $Id$ mh = Map("olsrd", translate("olsrd_hna", "OLSR - HNA-Ankündigungen")) -for i, sect in ipairs({ "Hna4", "Hna6" }) do - hna = mh:section(TypedSection, sect) - hna.addremove = true - hna.anonymous = true - hna.template = "cbi/tblsection" - - net = hna:option(Value, "netaddr") - msk = hna:option(Value, "netmask") -end + +hna4 = mh:section(TypedSection, "Hna4") +hna4.addremove = true +hna4.anonymous = true +hna4.template = "cbi/tblsection" + +net4 = hna4:option(Value, "netaddr") +msk4 = hna4:option(Value, "netmask") + + +hna6 = mh:section(TypedSection, "Hna6") +hna6.addremove = true +hna6.anonymous = true +hna6.template = "cbi/tblsection" + +net6 = hna6:option(Value, "netaddr") +msk6 = hna6:option(Value, "prefix") + return mh -- 2.11.0