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

contrib/package/meshwizard: Use the newly introduced symbolic names for masquerading setup

Browse source
This commit is contained in:
Manuel Munz 2011-06-23 19:10:51 +00:00
parent ab87896104
commit 02333f730c
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh
View file

@ -11,8 +11,6 @@ config_load firewall
# Get some variables # Get some variables
type="$(uci -q get wireless.$net.type)" type="$(uci -q get wireless.$net.type)"
vap="$(uci -q get meshwizard.netconfig.$net\_vap)" vap="$(uci -q get meshwizard.netconfig.$net\_vap)"
lan_ip="$(uci -q get network.lan.ipaddr)"
lan_mask="$(uci -q get network.lan.netmask)"
# Delete old firewall zone for freifunk # Delete old firewall zone for freifunk
handle_fwzone() { handle_fwzone() {
@ -95,8 +93,6 @@ echo " network: $network
echo " + Setup masquerading rules" echo " + Setup masquerading rules"
eval $(ipcalc.sh $lan_ip $lan_mask)
handle_interface() { handle_interface() {
config_get interface "$1" interface config_get interface "$1" interface
if [ "$interface" == "lan" ]; then if [ "$interface" == "lan" ]; then
@ -117,7 +113,7 @@ config_foreach handle_hna Hna4
currms=$(uci -q get firewall.zone_freifunk.masq_src) currms=$(uci -q get firewall.zone_freifunk.masq_src)
if [ ! "$no_masq_lan" == "1" ]; then if [ ! "$no_masq_lan" == "1" ]; then
uci set firewall.zone_freifunk.masq="1" && echo " Enabled masquerading." || echo -e "\033[1mWarning:\033[0m: Could not enable masquerading." uci set firewall.zone_freifunk.masq="1" && echo " Enabled masquerading." || echo -e "\033[1mWarning:\033[0m: Could not enable masquerading."
[ -z "$(echo $currms |grep $NETWORK/$PREFIX)" ] && uci add_list firewall.zone_freifunk.masq_src="$NETWORK/$PREFIX" [ -z "$(echo $currms |grep lan)" ] && uci add_list firewall.zone_freifunk.masq_src="lan"
fi fi
# If wifi-interfaces are outside of the mesh network they should be natted # If wifi-interfaces are outside of the mesh network they should be natted
@ -128,7 +124,7 @@ for i in $networks; do
# 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
[ -z "$(echo $currms |grep $dhcprange)" ] && uci add_list firewall.zone_freifunk.masq_src="$dhcprange" [ -z "$(echo $currms |grep ${net}dhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${net}dhcp"
fi fi
done done