From: Manuel Munz <freifunk@somakoma.de>
Date: Wed, 10 Oct 2012 19:24:38 +0000 (+0000)
Subject: luci-0.11: merge r9362 and r9363
X-Git-Tag: 0.11.0~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=25a1e70804d51f36145f4e8aca800f273a533a29;p=oweals%2Fluci.git

luci-0.11: merge r9362 and r9363
---

diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile
index d264a1760..2dbe1fa7c 100644
--- 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 b615962b0..aa8b1c8bc 100644
--- 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