diff options
| author | Manuel Munz <freifunk@somakoma.de> | 2013-01-29 23:34:01 +0000 |
|---|---|---|
| committer | Manuel Munz <freifunk@somakoma.de> | 2013-01-29 23:34:01 +0000 |
| commit | d9d70629c4cb9b6900642b85d83e3030a9d26103 (patch) | |
| tree | 7b2b6c87abe7481b4c82571f30b9d40ea9c01d7e /contrib/package/meshwizard/files | |
| parent | 13a7013acd78c41200e127c9e7558c17ce135d79 (diff) | |
contrib/meshwizard: Enable connection tracking for the interfaces when masquerading is disabled because the dhcp subnet is inside the mesh subnet. this fixes the plash in this kind of setup.
Diffstat (limited to 'contrib/package/meshwizard/files')
| -rwxr-xr-x | contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh index fc664430fe..11c351b0dd 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh @@ -72,7 +72,12 @@ if [ -n "$dhcprange" ]; then meshnet="$(uci get profile_$community.profile.mesh_network)" # check if the dhcprange is inside meshnet dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)" - if [ ! "$dhcpinmesh" == 1 ]; then + if [ "$dhcpinmesh" == 1 ]; then + # needed or splash will not work + if [ "$has_luci_splash" == TRUE ]; then + uci set firewall.zone_freifunk.contrack="1" + fi + else uci set firewall.zone_freifunk.masq=1 [ -z "$(echo $currms |grep ${netrenamed}dhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}dhcp" fi |