From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 22 Dec 2008 03:01:09 +0000 (+0000)
Subject: applications/siitwizard:
X-Git-Tag: 0.9.0~874
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=1ff1a107b192f28e4ca159d2201510d28bee7a38;p=project%2Fluci.git

applications/siitwizard:
	- fixup olsrd txtinfo accept parameter
	- use network-, not host-ip for gateway-side siit ipv4 route
---

diff --git a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
index dbaaa17acc..de4fab001b 100644
--- a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
+++ b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
@@ -169,7 +169,7 @@ function mode.write(self, section, value)
 
 		uci:section("network", "route", nil, {
 			interface = "siit0",
-			target    = gv4_net:host():string(),
+			target    = gv4_net:network():string(),
 			netmask   = gv4_net:mask():string()
 		})
 
@@ -314,6 +314,14 @@ function mode.write(self, section, value)
 		prefix  = siit_route:prefix()
 	})
 
+	-- txtinfo v6
+	uci:foreach("olsrd", "LoadPlugin",
+		function(s)
+			if s.library == "olsrd_txtinfo.so.0.1" then
+				uci:set("olsrd", s['.name'], "accept", "::1")
+			end
+		end)
+
 	uci:save("wireless")
 	uci:save("firewall")
 	uci:save("network")