treewide: avoid double-escaping CBI section labels

[project/luci.git] / contrib / package / meshwizard / files / usr / bin / meshwizard / helpers / setup_firewall_interface.sh

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 896329be6041d1d740b51ce9ce9c08ceeb9515eb..8ca5d3b77ba0e8096a00ce927c708fe7684f69af 100755 (executable)
--- 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
@@ -4,7 +4,7 @@
 # Arg $1 = $net
 
 net=$1
-. /etc/functions.sh
+. /lib/functions.sh
 . $dir/functions.sh
 config_load firewall
 
@@ -45,7 +45,7 @@ network=$(echo $network) # Removes leading and trailing whitespaces
 
 [ -n "$netrenamed" ] && [ -z "$(echo $network | grep $netrenamed)" ] && network="$network $netrenamed"
 
-if [ "$type" == "atheros" -a "$vap" == 1 ]; then
+if [ "$supports_vap" == "1" -a "$vap" == 1 ]; then
         [ -n "$netrenamed" ] && [ "$network" == "${network/${netrenamed}dhcp/}" ] && network="$network ${netrenamed}dhcp"
 fi
 
@@ -56,18 +56,56 @@ uci_commitverbose "Add '$netrenamed' to freifunk firewall zone" firewall
 currms=$(uci -q get firewall.zone_freifunk.masq_src)
 
 # If interfaces are outside of the mesh network they should be natted
-for i in $networks; do
-        # Get dhcprange and meshnet
-        dhcprange=$(uci -q get meshwizard.netconfig.$i\_dhcprange)
+
+if [ "$vap" == 1 ]; then
+       # Get dhcprange and meshnet for the dhcp interface
+       if_ip="$(uci -q get network.${netrenamed}dhcp.ipaddr)"
+       if_mask="$(uci -q get network.${netrenamed}dhcp.netmask)"
+
+       [ -n "$if_ip" -a "$if_mask" ] && export $(ipcalc.sh $if_ip $if_mask)
+       [ -n "$NETWORK" -a "$PREFIX" ] && dhcprange="$NETWORK/$PREFIX"
+
        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
-                       uci set firewall.zone_freifunk.masq="1"
-                       [ -z "$(echo $currms |grep ${netrenamed}dhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}dhcp"
-               fi
+               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
+                       # 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
        fi
+fi
+
+# Get dhcprange and meshnet for the adhoc dhcp interface
+if_ip="$(uci -q get network.${netrenamed}ahdhcp.ipaddr)"
+if_mask="$(uci -q get network.${netrenamed}ahdhcp.netmask)"
+
+[ -n "$if_ip" -a "$if_mask" ] && export $(ipcalc.sh $if_ip $if_mask)
+[ -n "$NETWORK" -a "$PREFIX" ] && dhcprangeah="$NETWORK/$PREFIX"
+
+if [ -n "$dhcprangeah" ]; then
+       meshnet="$(uci get profile_$community.profile.mesh_network)"
+       # check if the dhcprange is inside meshnet
+       dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprangeah $meshnet)"
+       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}ahdhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}ahdhcp"
+       fi
+fi
+
+
+for i in IP NETMASK BROADCAST NETWORK PREFIX; do
+       unset $i
 done
 
 uci_commitverbose "Setup masquerading rules for '$netrenamed'" firewall