luci-0.11: merge r9362 and r9363

diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile
index d264a1760837cf6f56d8dd7940f6f36af7290fd7..2dbe1fa7cac065019bd7536a6e873225c49e6403 100644 (file)
--- a/contrib/package/freifunk-p2pblock/Makefile
+++ b/contrib/package/freifunk-p2pblock/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-p2pblock
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init b/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
index b615962b0a8b02b48ca51e1ae9415d605024b3bf..aa8b1c8bcbf3d16b678d5d87634b79fcec03bc6f 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
 
@@ -34,7 +34,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 +55,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