Delete trailing white spaces

easy-qos/files/etc/init.d/easy_qos.ebtables

@@ -1,5 +1,7 @@
 #!/bin/sh /etc/rc.common
 
+. /lib/functions/iopsys-repeated-macs.sh
+
 START=99
 USE_PROCD=1
 
@@ -89,6 +91,31 @@ create_rule() {
 	exec_log ebtables -t broute -A BROUTING ${cmd}
 }
 
+create_rules() {
+	protocol=$1; shift
+	macaddr=$1; shift
+	prio_num=$1; shift
+	port=$1
+
+	for p in $port; do
+		if [ "$protocol" == "none" ]; then
+			create_rule tcp $macaddr $prio_num $p
+			create_rule udp $macaddr $prio_num $p
+		else
+			create_rule $protocol $macaddr $prio_num $p
+		fi
+	done
+	# Create rule for all ports if port is not mentioned in uci
+	if [ -z "$port" ]; then
+		if [ "$protocol" == "none" ]; then
+			create_rule tcp $macaddr $prio_num
+			create_rule udp $macaddr $prio_num
+		else
+			create_rule $protocol $macaddr $prio_num
+		fi
+	fi
+}
+
 manage_rule() {
 	local cfg="$1"
 	local priority macaddr proto port comment prio_num protocol
@@ -100,25 +127,15 @@ manage_rule() {
 
 	protocol=$(echo ${proto}|tr [A-Z] [a-z])
 	prio_num=$(get_priority ${priority})
-	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
-		for p in ${port}; do
-			if [ "${protocol}" == "none" ]; then
-				create_rule tcp ${macaddr} ${prio_num} ${p}
-				create_rule udp ${macaddr} ${prio_num} ${p}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num} ${p}
-			fi
-		done
-		# Create rule for all ports if port is not mentioned in uci
-		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" ]; then
-				create_rule tcp ${macaddr} ${prio_num}
-				create_rule udp ${macaddr} ${prio_num}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num}
-			fi
-		fi
-	fi
+	[ -n "${macaddr}" -a -n "${prio_num}" ] || return
+
+	create_rules ${protocol} ${macaddr} ${prio_num} ${port}
+	repeated_macs=$(mac_to_repeated ${macaddr})
+	for mac in $repeated_macs; do
+		[ "$mac" = "${macaddr}" ] && continue
+		create_rules ${protocol} $mac ${prio_num} ${port}
+	done
+
 }
 
 reload_service() {

endptmngr/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=fb453f8c89463c8cd323f15e369c5d69f73bd1e8
+PKG_SOURCE_VERSION:=bafc4f9e81de567965a0d8f2897d390cfb14636b
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-05-06
+PKG_VERSION:=4.0-2019-05-08
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d3aea85146d21db0fc2bd0bcca58dd80d08908b6
+PKG_SOURCE_VERSION:=da50b98f5b0a9539edf97b3ffda4bf5a030dfa18
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

icwmp/README

@@ -9,7 +9,7 @@
 	- libz.so
 	- libcrypto.so
 	the librairies should be present in the "staging_dir/target-i386_uClibc-0.9.30.1/usr/lib/"  or "staging_dir/toolchain-mips_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/lib"
-	
+
 	header files and folders:
 	- expat.h
 	- expat_external.h
@@ -33,7 +33,7 @@ this software is composed of 3 packages:
 - cwmp kernel package: contains cwmp kernel module. This module could be used by other kernel modules to notify the icwmpd daemon  when kernel parameter changes
 
 The three packages should be selected in the make menu config in order to get the three packages compiled.
-To compile the three packages: $ make package/cwmpd/compile 
+To compile the three packages: $ make package/cwmpd/compile
 
 3) OpenWRT settings
 in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script file:
@@ -49,7 +49,7 @@ in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script
 	- libopenssl package should be installed
 	- libz package should be installed
 	- libcrypto package should be installed
-    
+
     Configure the acs url in the /etc/config/icwmp
     and then start the cwmpd service: /etc/init.d/icwmpd start
     for the help: /etc/init.d/icwmpd

netmode/files/etc/netmodes/bridged/wireless

@@ -47,10 +47,10 @@ config wifi-iface
 	option cipher 'auto'
 	option key '$WPAKEY'
 	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
+	option macfilter 'disable'
+	option wps_pushbutton '1'
 	option wmf_bss_enable '1'
-	option bss_max '32'
+	option maxassoc '32'
 	option ifname 'wl0'
 
 config wifi-device 'wl1'
@@ -87,9 +87,9 @@ config wifi-iface
 	option cipher 'auto'
 	option key '$WPAKEY'
 	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
+	option macfilter 'disable'
+	option wps_pushbutton '1'
 	option wmf_bss_enable '1'
-	option bss_max '32'
+	option maxassoc '32'
 	option ifname 'wl1'
 

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/wireless

@@ -27,7 +27,7 @@ config wifi-iface
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	ra0
-	option wps_pbc	1
+	option wps_pushbutton	1
 
 config wifi-device  rai0
 	option band a
@@ -46,7 +46,7 @@ config wifi-iface
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	rai0
-	option wps_pbc	1
+	option wps_pushbutton	1
 
 config wifi-iface
 	option device   rai0

netmode/files/etc/netmodes/routed_brcm/wireless

@@ -47,10 +47,10 @@ config wifi-iface
 	option cipher 'auto'
 	option key '$WPAKEY'
 	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
+	option macfilter 'disable'
+	option wps_pushbutton '1'
 	option wmf_bss_enable '1'
-	option bss_max '32'
+	option maxassoc '32'
 	option ifname 'wl0'
 
 config wifi-device 'wl1'
@@ -87,9 +87,9 @@ config wifi-iface
 	option cipher 'auto'
 	option key '$WPAKEY'
 	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
+	option macfilter 'disable'
+	option wps_pushbutton '1'
 	option wmf_bss_enable '1'
-	option bss_max '32'
+	option maxassoc '32'
 	option ifname 'wl1'
 

netmode/files/etc/netmodes/routed_mtk/wireless

@@ -27,7 +27,7 @@ config wifi-iface
 	option ssid     iopsys-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
-	option wps_pbc	1
+	option wps_pushbutton	1
 	option ifname	ra0
 
 config wifi-device  rai0
@@ -47,6 +47,6 @@ config wifi-iface
 	option ssid     iopsys-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
-	option wps_pbc	1
+	option wps_pushbutton	1
 	option ifname	rai0
 

uspd/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=uspd
 PKG_VERSION:=1.0.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e9aa8a42f1da90b44fbd6bca3f4131a24fe79efb
+PKG_SOURCE_VERSION:=a5fba2890d05e868605431dacd32ffda4bdc232d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz