contrib/freifunk-p2pblock: Fix non-working whitelist which was reported on irc, also fix whitespace issues and a typo in comment

This commit is contained in:
Manuel Munz 2012-10-10 19:16:44 +00:00
parent 5a0dbb895e
commit 52855e8e78

View file

@ -16,7 +16,7 @@ start() {
if [ ! -s "$LOCK" ]; then if [ ! -s "$LOCK" ]; then
logger -s -t "$ME" 'starting p2pblock...' logger -s -t "$ME" 'starting p2pblock...'
config_load network config_load network
config_get wan wan ifname config_get wan wan ifname
@ -34,7 +34,7 @@ start() {
# create new p2p-chain # create new p2p-chain
iptables -N p2pblock iptables -N p2pblock
# pipe all incomming FORWARD with source-/destination-port 1024-65535 throu p2p-chain # pipe all incoming FORWARD with source-/destination-port 1024-65535 throu p2p-chain
ipt_add "FORWARD -i $wan -p tcp --sport $portrange --dport $portrange -j p2pblock" ipt_add "FORWARD -i $wan -p tcp --sport $portrange --dport $portrange -j p2pblock"
ipt_add "FORWARD -i $wan -p udp --sport $portrange --dport $portrange -j p2pblock" ipt_add "FORWARD -i $wan -p udp --sport $portrange --dport $portrange -j p2pblock"
@ -55,13 +55,13 @@ start() {
done done
# insert whitelisted ips # insert whitelisted ips
for ip in $WHITELIST; do for ip in $whitelist; do
ipt_add "p2pblock -d $ip -j RETURN" ipt_add "p2pblock -d $ip -j RETURN"
done done
logger -s -t "$ME" 'Done.'; return 0 logger -s -t "$ME" 'Done.'; return 0
else else
logger -s -t "$ME" 'No wan interface present.'; return 0 logger -s -t "$ME" 'No wan interface present.'; return 0
fi fi
else else
logger -s -t "$ME" 'WARNING! already running - Aborting!'; return 2 logger -s -t "$ME" 'WARNING! already running - Aborting!'; return 2