contrib/meshwizard: Enable connection tracking for the interfaces when masquerading...
authorManuel Munz <freifunk@somakoma.de>
Tue, 29 Jan 2013 23:34:01 +0000 (23:34 +0000)
committerManuel Munz <freifunk@somakoma.de>
Tue, 29 Jan 2013 23:34:01 +0000 (23:34 +0000)
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh

index fc66443..11c351b 100755 (executable)
@@ -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