luci-0.11: merge outstanding trunk changes

[project/luci.git] / contrib / package / freifunk-p2pblock / files / freifunk-p2pblock.init

diff --git a/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init b/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
index b615962b0a8b02b48ca51e1ae9415d605024b3bf..5ca60c891696ea6c6c461c7eba3b475a07dc5050 100644 (file)
--- a/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
+++ b/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
@@ -16,7 +16,7 @@ start() {
 
        if [ ! -s "$LOCK" ]; then
                logger -s -t "$ME" 'starting p2pblock...'
-               
+
                config_load network
                config_get wan wan ifname
 
@@ -26,6 +26,7 @@ start() {
                        config_get ipp2p p2pblock ipp2p
                        config_get portrange p2pblock portrange
                        config_get blocktime p2pblock blocktime
+                       config_get whitelist p2pblock whitelist
 
                        # load modules
                        insmod ipt_ipp2p 2>&-
@@ -34,7 +35,7 @@ start() {
 
                        # create new p2p-chain
                        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 udp --sport $portrange --dport $portrange -j p2pblock"
 
@@ -55,13 +56,13 @@ start() {
                        done
 
                        # insert whitelisted ips
-                       for ip in $WHITELIST; do
+                       for ip in $whitelist; do
                                ipt_add "p2pblock -d $ip -j RETURN"
                        done
 
                        logger -s -t "$ME" 'Done.'; return 0
                else
-                       logger -s -t "$ME" 'No wan interface present.'; return 0        
+                       logger -s -t "$ME" 'No wan interface present.'; return 0
                fi
        else
                logger -s -t "$ME" 'WARNING! already running - Aborting!'; return 2