From: Manuel Munz Date: Tue, 29 Jan 2013 23:34:01 +0000 (+0000) Subject: contrib/meshwizard: Enable connection tracking for the interfaces when masquerading... X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=d9d70629c4cb9b6900642b85d83e3030a9d26103;p=project%2Fluci.git 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. --- 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 fc664430f..11c351b0d 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