Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

meshwizard: Fix setting of masqueraded networks

Browse source
This commit is contained in:
Manuel Munz 2011-10-27 12:45:10 +00:00
parent 84db98f50e
commit bbab736642
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh
View file

@ -56,18 +56,26 @@ uci_commitverbose "Add '$netrenamed' to freifunk firewall zone" firewall
currms=$(uci -q get firewall.zone_freifunk.masq_src) currms=$(uci -q get firewall.zone_freifunk.masq_src)
# If interfaces are outside of the mesh network they should be natted # If interfaces are outside of the mesh network they should be natted
for i in $networks; do
# Get dhcprange and meshnet # Get dhcprange and meshnet
dhcprange=$(uci -q get meshwizard.netconfig.$i\_dhcprange) if_ip="$(uci -q get network.${netrenamed}dhcp.ipaddr)"
if [ -n "$dhcprange" ]; then 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)" meshnet="$(uci get profile_$community.profile.mesh_network)"
# check if the dhcprange is inside meshnet # check if the dhcprange is inside meshnet
dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)" dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)"
if [ ! "$dhcpinmesh" == 1 ]; then if [ ! "$dhcpinmesh" == 1 ]; then
uci set firewall.zone_freifunk.masq="1" uci set firewall.zone_freifunk.masq=1
[ -z "$(echo $currms |grep ${netrenamed}dhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}dhcp" [ -z "$(echo $currms |grep ${netrenamed}dhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}dhcp"
fi fi
fi fi
for i in IP NETMASK BROADCAST NETWORK PREFIX; do
unset $i
done done
uci_commitverbose "Setup masquerading rules for '$netrenamed'" firewall uci_commitverbose "Setup masquerading rules for '$netrenamed'" firewall