applications/siitwizard:

- fix calculation of available hosts addresses in pool
	- also calculate dhcp start and limit addresses
	- tune siit defaults to use Freifunk PI addresses
	- change bssid to avoid collision with Freifunk mesh
This commit is contained in:
Jo-Philipp Wich 2008-12-27 01:44:56 +00:00
parent 870397a3cd
commit 71b8fd5ddf
2 changed files with 7 additions and 5 deletions

View file

@ -65,7 +65,7 @@ f = SimpleForm("siitwizward", "SIIT-Wizzard",
f:field(DummyValue, "info_ula", "Mesh ULA address").value = ula:string() f:field(DummyValue, "info_ula", "Mesh ULA address").value = ula:string()
f:field(DummyValue, "ipv4_pool", "IPv4 allocation pool").value = 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 = f:field(DummyValue, "ipv4_size", "IPv4 LAN network prefix").value =
"%i bit (%i hosts)" %{ ipv4_netsz, 2 ^ ( 32 - ipv4_netsz ) - 2 } "%i bit (%i hosts)" %{ ipv4_netsz, 2 ^ ( 32 - ipv4_netsz ) - 2 }
@ -364,7 +364,9 @@ function mode.write(self, section, value)
-- lan dns -- lan dns
uci:tset("dhcp", "lan", { 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 -- hostname

View file

@ -1,6 +1,6 @@
config siit ipv4 config siit ipv4
option pool "172.23.0.0/16" option pool "77.87.48.0/23"
option netsize "24" option netsize "29"
config siit ipv6 config siit ipv6
option ula_prefix "fd00::" option ula_prefix "fd00::"
@ -10,5 +10,5 @@ config siit ipv6
config siit wifi config siit wifi
option essid "6mesh.freifunk.net" option essid "6mesh.freifunk.net"
option bssid "02:ca:ff:ee:ba:be" option bssid "02:25:c3:ca:ff:ee"
option channel "1" option channel "1"