X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-siitwizard%2Fluasrc%2Fmodel%2Fcbi%2Fsiitwizard.lua;h=c1dbb0efd38f9b10fbfb55e4c54cea9bc943f673;hb=71b8fd5ddf9d7f23ada97a1910bafd1f8711a76b;hp=12d9ff998d95ee7079e283a12686b44d554b8f7b;hpb=1b23d79b3adfe33d71e0974e10276b4ea0d812c1;p=project%2Fluci.git

diff --git a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
index 12d9ff998..c1dbb0efd 100644
--- a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
+++ b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
@@ -65,7 +65,7 @@ f = SimpleForm("siitwizward", "SIIT-Wizzard",
 f:field(DummyValue, "info_ula", "Mesh ULA address").value = ula:string()
 
 f:field(DummyValue, "ipv4_pool", "IPv4 allocation pool").value =
-	"%s (%i hosts)" %{ gv4_net:string(), 2 ^ gv4_net:prefix() - 2 }
+	"%s (%i hosts)" %{ gv4_net:string(), 2 ^ ( 32 - gv4_net:prefix() ) - 2 }
 
 f:field(DummyValue, "ipv4_size", "IPv4 LAN network prefix").value =
 	"%i bit (%i hosts)" %{ ipv4_netsz, 2 ^ ( 32 - ipv4_netsz ) - 2 }
@@ -161,6 +161,8 @@ function mode.write(self, section, value)
 	uci:section("wireless", "wifi-iface", nil, {
 		encryption = "none",
 		mode       = "adhoc",
+		txpower    = 10,
+		sw_merge   = 1,
 		network    = wifi_device,
 		device     = wifi_device,
 		ssid       = wifi_essid,
@@ -362,7 +364,9 @@ function mode.write(self, section, value)
 
 	-- lan dns
 	uci:tset("dhcp", "lan", {
-		dhcp_option = "6," .. dns_server
+		dhcp_option = "6," .. dns_server,
+		start       = bit.band(lan_net:minhost():add(1)[2][2], 0xFF),
+		limit       = ( 2 ^ ( 32 - lan_net:prefix() ) ) - 3
 	})
 
 	-- hostname