map-controller: 4.2.6

This reverts commit 67169eff2a.

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=4.3.8
+PKG_VERSION:=5.0.8
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a66dc8bc52d8eeddb01fae8d187502487898964b
+PKG_SOURCE_VERSION:=3b1b7b37e0bc0eeec5c3da69773f16b9e4efa60b
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -57,11 +57,9 @@ define Build/Prepare
 endef
 endif
 
-TARGET_CFLAGS += -DBBF_VENDOR_LIST=\\\"$(CONFIG_BBF_VENDOR_LIST)\\\"
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
-
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
+	-D_GNU_SOURCE \
+	-Wall -Werror \
 
 ifeq ($(CONFIG_BBF_TR181),y)
 CONFIGURE_ARGS += \
@@ -93,7 +91,8 @@ CONFIGURE_ARGS += \
 	--enable-vendor-extension
 
 CONFIGURE_ARGS += \
-	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)"
+	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)" \
+	BBF_VENDOR_PREFIX="$(CONFIG_BBF_VENDOR_PREFIX)"
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 

bulkdata/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
-PKG_SOURCE_VERSION:=e4f39d1bf4678fc05b9d02e81b194c70719909e4
+PKG_SOURCE_VERSION:=150eb3122c969d1646c8ca8c8152154990f91823
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
 

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.1.9
+PKG_VERSION:=3.1.17
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f9095eca8404a8121cb4a1c56a25577f5a58773d
+PKG_SOURCE_VERSION:=0a0b9cb7ef5f82c6f129681a76d8ebc671b7cbd2
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
- 	DEPENDS:= +libubox +ubus
+	DEPENDS:= +libubox +ubus +uci
 endef
 
 define Package/$(PKG_NAME)/description

dectmngr/files/etc/config/dect

@@ -0,0 +1,2 @@
+config dect 'global'
+	option log_dect_cmbs '0'

dectmngr/files/etc/init.d/dectmngr

@@ -40,8 +40,18 @@ start_service() {
 	model_id="01.02.03"
 	[ -n "$model_id" -a ${#model_id} -eq 8 ] && opt_ext="$opt_ext -model $model_id"
 
+	config_load dect
+	config_get_bool log_dect_cmbs global log_dect_cmbs 0
+
 	procd_open_instance
-	procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
+	if [ $log_dect_cmbs -eq 0 ]; then
+		echo "Starting dectmngr with cmbs logging disabled"
+		procd_set_param command $PROG -comname ttyH0 $opt_ext
+		rm -f $LOG_PATH/*
+	else
+		echo "Starting dectmngr with cmbs logging enabled"
+		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
+	fi
 	procd_set_param respawn 6 2 3
 	procd_set_param term_timeout 20
 	procd_set_param triggers asterisk
@@ -62,7 +72,7 @@ reload_service() {
 
 service_triggers()
 {
-	procd_add_reload_trigger asterisk
+	procd_add_reload_trigger asterisk dect
 }
 
 boot() {

dslmngr/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b7aa02e86a383e2f9eedd1333b2148270daf5242
+PKG_SOURCE_VERSION:=bb754ae620a9fc66fd6fc0745f0fead0708c7a17
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.2.33
+PKG_VERSION:=6.3.4
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=abd678a8c716572ff0f15ab994dc715c061f8e4a
+PKG_SOURCE_VERSION:=a82d64c15dec32e032ff36f6b9bbbb707010c93e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

easy-soc-libs/qos.mk

@@ -16,7 +16,7 @@ endef
 define Build/InstallDev/libqos
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/qos.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libqos/include/qos.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/libqos/libqos.so $(1)/usr/lib/
 endef
 

endptmngr/Makefile

@@ -9,11 +9,14 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=endptmngr
 PKG_VERSION:=0.5
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=f50a507a1a8d1dbf83ecf1e5f27dc18a318ef492
+PKG_SOURCE_VERSION:=debfc47348d6e1fc1c8b126ad50a7f5f8db3e19d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+endif
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@@ -47,6 +50,12 @@ define Package/endptmngr/description
 	endptmngr
 endef
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        rsync -av --exclude=.* ~/git/endptmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/endptmngr/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin

fdtextract/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=573bf9543f8dc792b6d5dc8760cb69c64f11e932
+PKG_SOURCE_VERSION:=45575262de7a9690bcb2c760f35e2c74e88e1176
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=7.4.1-2021-07-05
+PKG_VERSION:=8.1.10-2021-09-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=40b08ae2f1500a3a3c8029486c062738d4f49b67
+PKG_SOURCE_VERSION:=2e55c12d13af617f9c5b1551e9d67287efd52715
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -29,8 +29,6 @@ PKG_CONFIG_DEPENDS:= \
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -57,24 +55,8 @@ endef
 endif
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
-
-ifneq ($(CWMP_REVISION)_,_)
-ifneq ($(CWMP_REVISION),exported)
-ifneq ($(CWMP_REVISION),Unversioned directory)
-TARGET_CFLAGS += "-DCWMP_REVISION=\\\"$(CWMP_REVISION)\\\""
-TARGET_LDFLAGS += "-DCWMP_REVISION=\\\"$(CWMP_REVISION)\\\""
-endif
-endif
-endif
-
-TARGET_LDFLAGS += \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS += \
-	--with-uci-include-path=$(STAGING_DIR)/usr/include \
-	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
-	--with-libubus-include-path=$(STAGING_DIR)/usr/include
+	-D_GNU_SOURCE \
+	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
 
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
@@ -99,26 +81,20 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/$(PKG_NAME)/postinst
-	#!/bin/sh
-	if [ -z "$${IPKG_INSTROOT}" ]; then
-		echo "Enabling rc.d symlink for icwmpd"
-		/etc/init.d/icwmpd enable
-	fi
-	exit 0
-endef
-
-define Package/$(PKG_NAME)/prerm
-	#!/bin/sh
-	if [ -z "$${IPKG_INSTROOT}" ]; then
-		echo "Disabling rc.d symlink for icwmpd"
-		/etc/init.d/icwmpd disable
-	fi
-	exit 0
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/icwmpd
+	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
+	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/90-icwmp $(1)/etc/hotplug.d/iface/90-icwmp
+	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
+	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

icwmp/files/etc/config/cwmp

@@ -39,6 +39,7 @@ config cpe 'cpe'
 	option exec_download '0'
 	option periodic_notify_enable '1'
 	option periodic_notify_interval '10'
+	option incoming_rule 'Port_Only'
 	
 config lwn 'lwn'
 	option enable '1'

icwmp/files/etc/firewall.cwmp

@@ -1,6 +1,15 @@
-#created by the icwmp package 
-zone_name=""
-port=""
+#created by the icwmp package
+
+if [ ! -f "/var/state/cwmp" ]; then
+	exit 0;
+fi
+
+zone_name=$(uci -P /var/state -q get cwmp.acs.zonename)
+port=$(uci -P /var/state -q get cwmp.acs.port)
+ipaddr=$(uci -P /var/state -q get cwmp.acs.ip)
+ipv6enable=$(uci -P /var/state -q get cwmp.acs.ipv6enable)
+incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
+
 if [ "$zone_name" = "" ]; then
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
@@ -18,4 +27,45 @@ else
 	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
 	iptables -X zone_icwmp_input 2> /dev/null
 fi
-#iptables -I FW_ZONE -p tcp -s ACS_ADDRESS --dport PORT -j ACCEPT --comment "Open ACS port"
+
+cmd=""
+
+if [ "${ipv6enable}" = "1" ]; then
+	cmd="ip6tables"
+else
+	cmd="iptables"
+fi
+
+cmd="${cmd} -I zone_${zone_name}_input -p tcp"
+
+# default incoming rule is Port only
+if [ -z "${incoming_rule}" ]; then
+	incoming_rule="port_only"
+fi
+
+if [ "${incoming_rule}" = "ip_only" ]; then
+	if [ -n "${ipaddr}" ]; then
+		cmd="${cmd} -s ${ipaddr}"
+	fi
+elif [ "${incoming_rule}" = "port_only" ]; then
+	if [ -n "${port}" ]; then
+		cmd="${cmd} --dport ${port}"
+	fi
+else
+	if [ -n "${ipaddr}" ]; then
+		cmd="${cmd} -s ${ipaddr}"
+	fi
+
+	if [ -n "${port}" ]; then
+		cmd="${cmd} --dport ${port}"
+	fi
+fi
+
+echo ${cmd}|grep -q "\-\-dport \|\-s "
+if [ "$?" -ne 0 ]; then
+	exit 0;
+fi
+
+cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+
+${cmd}

icwmp/files/etc/hotplug.d/iface/90-icwmp

@@ -81,6 +81,8 @@ handle_icwmp_restart() {
 		[ -z "$prevopt43url" ] && exit 0
 	}
 
+	echo "Restarting icwmp"|logger -t cwmp.hotplug -p info
+
 	/etc/init.d/icwmpd reload &
 }
 

icwmp/files/etc/init.d/icwmpd

@@ -154,6 +154,10 @@ set_wan_interface() {
 	fi
 }
 
+service_running() {
+	ubus wait_for usp.raw
+}
+
 start_service() {
 	if [ ! -f /tmp/.icwmpd_boot ]; then
 		touch /etc/icwmpd/.icwmpd_boot
@@ -165,6 +169,9 @@ start_service() {
 		[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
 		[ -f /usr/sbin/asterisk ] && log "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
 
+		log "Waiting for usp.raw to be started"
+		ubus wait_for usp.raw
+
 		config_load cwmp
 		set_wan_interface
 		wait_for_option43 20
@@ -180,7 +187,7 @@ start_service() {
 		procd_set_param respawn \
 			${respawn_threshold:-5} \
 			${respawn_timeout:-10} ${respawn_retry:-3}
-			
+
 		procd_close_instance
 	fi
 }

icwmp/files/lib/upgrade/post-rootfs-fixup.d/215-icwmp

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# As part of sysupgrade we copy CWMP Backup Session XML file.
-
-
-# Abort on any error.
-set -e
-
-
-# Do nothing if user want to discard old settings.
-if [ -n "$SAVE_CONFIG" ] && [ $SAVE_CONFIG -eq 0 ]; then
-	exit 0
-fi
-
-# Source functions.
-for f in /lib/upgrade/iopsys*.sh; do
-	[ -r "$f" -a -s "$f" ] || continue
-	source $f
-done
-
-
-if [ -s "${2}/etc/icwmpd/.icwmpd_backup_session.xml" ]; then
-	cat "${2}/etc/icwmpd/.icwmpd_backup_session.xml" > "/etc/icwmpd/.icwmpd_backup_session.xml"
-fi
-
-# Report success.
-log "post-hooks" "CWMP Backup Session XML file migrated"
-
-exit 0

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=3.3.2
+PKG_VERSION:=3.3.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b7c3f2b45ff232415d32eb97badeb43845ae878d
+PKG_SOURCE_VERSION:=3fc90a1597bd06360e62fd70f4f7301a2499e267
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/scripts/feeds_update.sh

@@ -14,7 +14,7 @@ function feeds_update {
     done
 
 
-    git remote -v | grep -q http || developer=1
+    git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
     cp .config .genconfig_config_bak
 

iop/scripts/genconfig.sh

@@ -206,12 +206,6 @@ function genconfig {
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
 		DEVELOPER=1
-
-		bcmAllowed=0
-		endptAllowed=0
-
-		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 	}
 
 	v() {
@@ -371,16 +365,12 @@ function genconfig {
 			subtarget="xrx500"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			device=$(echo $BOARDTYPE | tr a-z A-Z)
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
 		elif [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		elif [ "$target" = "iopsys_mediatek" ]; then
 			subtarget="mt7622"
@@ -391,13 +381,10 @@ function genconfig {
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		elif [ "$target" = "iopsys_bcm27xx" ]; then
 			subtarget="iopsys_bcm2711"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
@@ -437,11 +424,14 @@ function genconfig {
 
 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
+		local GIT_REV=$(git rev-parse --short HEAD)
+		local GIT_VER="$GIT_TAG"
+		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
+		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
-		# Enable Pckage source tree override if selected
+		# Enable Package source tree override if selected
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
 
 		# developer mode selected ?
@@ -449,12 +439,8 @@ function genconfig {
 		if [ $DEVELOPER -eq 1 ]; then
 			# rewrite url to clone with ssh instead of http
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
-			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
-			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 		else
 			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
-			echo "CONFIG_BCM_OPEN=y" >> .config
-			echo "CONFIG_ENDPT_OPEN=y" >> .config
 		fi
 
 		if [ -n "$BRCM_MAX_JOBS" ]

iop/scripts/genconfig_min.sh

@@ -9,13 +9,14 @@ function genconfig_min {
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
-	#always use the mirror
 	export DEVELOPER=0
 	target="bogus"
-	config_path=""
+	target_config_path=""
 	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
+	mediatek="target/linux/iopsys-mediatek"
+	econet="target/linux/iopsys-econet"
 	intel_mips="target/linux/intel_mips"
 	x86="target/linux/iopsys-x86"
 	armvirt="target/linux/iopsys-armvirt"
@@ -80,7 +81,7 @@ function genconfig_min {
 
 	# Takes a board name and returns the target name in global var $target
 	set_target() {
-	    local profile=$1
+		local profile=$1
 
 		[ -n "$profile" ] || return
 
@@ -102,7 +103,7 @@ function genconfig_min {
 
 			if [ $pfound -eq 1 ]; then
 				target="$(echo $TARGET | tr '-' '_')"
-				config_path="$targetpath/config"
+				target_config_path="$targetpath/config"
 			fi
 
 			return
@@ -112,6 +113,10 @@ function genconfig_min {
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
+		[ -e $mediatek/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek; ./genconfig)
+		[ -e $econet/genconfig ] &&
+			iopsys_econet=$(cd $econet; ./genconfig)
 		[ -e $intel_mips/genconfig ] &&
 			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
@@ -122,7 +127,7 @@ function genconfig_min {
 			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -134,7 +139,7 @@ function genconfig_min {
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			config_path="$brcm63xx_arm/config"
+			target_config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -142,7 +147,23 @@ function genconfig_min {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			config_path="$ramips/config"
+			target_config_path="$ramips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_mediatek; do
+		if [ $p == $profile ]; then
+		    target="iopsys_mediatek"
+			target_config_path="$mediatek/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_econet; do
+		if [ $p == $profile ]; then
+		    target="iopsys_econet"
+			target_config_path="$econet/config"
 		    return
 		fi
 	    done
@@ -150,7 +171,7 @@ function genconfig_min {
 	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
-			config_path="$intel_mips/config"
+			target_config_path="$intel_mips/config"
 		    return
 		fi
 	    done
@@ -158,7 +179,7 @@ function genconfig_min {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			config_path="$x86/config"
+			target_config_path="$x86/config"
 		    return
 		fi
 	    done
@@ -166,7 +187,7 @@ function genconfig_min {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			config_path="$armvirt/config"
+			target_config_path="$armvirt/config"
 		    return
 		fi
 	    done
@@ -174,14 +195,14 @@ function genconfig_min {
 	    for p in $iopsys_bcm27xx; do
 		if [ $p == $profile ]; then
 		    target="iopsys_bcm27xx"
-		        config_path="$bcm27xx/config"
+			target_config_path="$bcm27xx/config"
 		    return
 		fi
 	    done
 
 	}
 
-	git remote -v | grep -q http || {
+	git remote -v | grep -qE '(git@|ssh://)' && {
 		DEVELOPER=1
 
 		bcmAllowed=0
@@ -210,7 +231,8 @@ function genconfig_min {
 		echo -e "  -a|--list-all\t\tList all Customers and their board types"
 		echo -e "  -b|--boards\t\tList all board types"
 		echo
-		echo "Example ./iop genconfig dg400prime IOPSYS"
+		echo "Example ./iop genconfig eg400 OPERATORX"
+		echo "(if no customerconfig is chosen, iopsys config will be used)"
 		echo
 		exit 0
 	}
@@ -260,12 +282,12 @@ function genconfig_min {
 
 	generate_config()
 	{
-	DIFFFILE="$1"
-	MASTERFILE="$2"
-	while read p; do
-		v "$p"
-		sed -r -i "$p" $MASTERFILE
-	done < $DIFFFILE
+		DIFFFILE="$1"
+		MASTERFILE="$2"
+		while read p; do
+			v "$p"
+			sed -r -i "$p" $MASTERFILE
+		done < $DIFFFILE
 	}
 
 	setup_dirs()
@@ -312,11 +334,13 @@ function genconfig_min {
 		v "cp $CONFIGPATH/config .config"
 		cp $CONFIGPATH/config .config
 
-		if [ -f $config_path/config ]; then
-		    cat $config_path/config >> .config
+		if [ -f $target_config_path/config ]; then
+		    cat $target_config_path/config >> .config
+		    echo "" >> .config
 		fi
-		if [ -f $config_path/$BOARDTYPE/config ]; then
-		    cat $config_path/$BOARDTYPE/config >> .config
+		if [ -f $target_config_path/$BOARDTYPE/config ]; then
+		    cat $target_config_path/$BOARDTYPE/config >> .config
+		    echo "" >> .config
 		fi
 
 		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
@@ -324,23 +348,29 @@ function genconfig_min {
 			subtarget="xrx500"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			device=$(echo $BOARDTYPE | tr a-z A-Z)
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
 		elif [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_mediatek" ]; then
+			subtarget="mt7622"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_econet" ]; then
+			subtarget="en7562"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 		elif [ "$target" = "iopsys_bcm27xx" ]; then
 			subtarget="iopsys_bcm2711"
-                        echo "CONFIG_TARGET_${target}=y" >> .config
-                        echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-                        echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-                        echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-                        device=$(echo $BOARDTYPE | tr a-z A-Z)
-                        echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -362,21 +392,25 @@ function genconfig_min {
 				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
 					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
+					echo "" >> .config
 				fi
 				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
 					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
+					echo "" >> .config
 				fi
 			done
 		fi
 
 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
+		local GIT_REV=$(git rev-parse --short HEAD)
+		local GIT_VER="$GIT_TAG"
+		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
+		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
-
 		# Enable Package source tree override if selected
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
 
@@ -449,6 +483,8 @@ function genconfig_min {
 			shift;
 		done
 
+		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
+
 		setup_dirs
 		create_and_copy_files "$@"
 	fi

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=5.0.2
+PKG_VERSION:=5.4.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=bb9da8c46308570b36449dcb73e3df1e8c145d30
+PKG_SOURCE_VERSION:=399c283a3e488b031c2f7a5af0fc51e7d473adea
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS

map-agent/files/etc/init.d/mapagent

@@ -5,6 +5,47 @@ STOP=20
 
 USE_PROCD=1
 
+MAP_DEV="map_dev"
+MAP_IF="map"
+MAP_VETH="lei"
+
+create_map() {
+	uci -q set network.${MAP_DEV}=device
+	uci -q set network.${MAP_DEV}.name=br-map
+	uci -q set network.${MAP_DEV}.type=bridge
+	uci -q set network.${MAP_DEV}.bridge_empty=1
+
+	uci -q set network.${MAP_IF}=interface
+	uci -q set network.${MAP_IF}.device=br-map
+	uci -q set network.${MAP_IF}.is_lan=1
+
+	uci -q set mapagent.agent.al_bridge=br-map
+
+	uci -q commit
+
+	ubus call network reload
+	ubus -t 5 wait_for network.device
+
+	ip link add ${MAP_VETH} type veth peer name ${MAP_VETH}_lan 2>/dev/null
+	brctl addif br-map ${MAP_VETH} 2>/dev/null
+	brctl addif br-lan ${MAP_VETH}_lan 2>/dev/null
+	ip link set ${MAP_VETH} up 2>/dev/null
+	ip link set ${MAP_VETH}_lan up 2>/dev/null
+}
+
+remove_map() {
+	ip link delete ${MAP_VETH} &>/dev/null
+
+	uci -q delete network.${MAP_DEV}
+	uci -q delete network.${MAP_IF}
+
+	uci -q set mapagent.agent.al_bridge=br-lan
+
+	uci -q commit
+
+	ubus call network reload
+}
+
 start_service() {
 	config_load "mapagent"
 
@@ -16,6 +57,10 @@ start_service() {
 	config_get_bool enabled agent enabled 1
 	[ "$enabled" -eq 0 ] && return 1
 
+	local ts
+	config_get_bool ts agent vlan_segregation 0
+	[ "$ts" -eq 1 ] && create_map #|| remove_map
+
 	procd_open_instance
         procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
@@ -24,6 +69,10 @@ start_service() {
 	procd_close_instance
 }
 
+#stop_service() {
+#	remove_map
+#}
+
 service_triggers()
 {
 	procd_add_reload_trigger "ieee1905"

map-agent/files/lib/wifi/multiap

@@ -7,6 +7,7 @@
 # write_credentials - write bBSS credentials to fBSS
 
 . /lib/functions.sh
+. /lib/wifi/traffic_separation
 
 diff=0
 
@@ -136,9 +137,11 @@ brcm_write_credentials() {
 
 		config_get device $section device
 		config_get multi_ap $section multi_ap "0"
+		config_get enabled $section enabled "1"
 
 		#echo found dev=$dev device=$device map=$multi_ap
 
+		[ "$enabled" == "0" ] && return
 		[ "$device" != "$dev" ] && return
 		[ "$multi_ap" != "1" ] && return
 
@@ -166,12 +169,29 @@ brcm_write_credentials() {
 	uci commit wireless
 }
 
+brcm_set_network() {
+	local ifname=$1
+	local num=$2
+	local bssid=$3
+
+	wpa_cli -i $ifname set_n $num bssid $bssid
+}
+
 bsta_steer() {
 	local ifname=$1
 	local bssid=$2
 
-	wpa_cli -i $ifname set_n 0 bssid $bssid
-	wpa_cli -i $ifname roam $bssid
+	rc=$(wpa_cli -i $ifname set_n 0 bssid $bssid)
+	[ "$rc" == "FAIL" ] && {
+		echo "1"
+		return;
+	}
+
+	rc=$(wpa_cli -i $ifname roam $bssid)
+	[ "$rc" == "FAIL" ] && {
+		echo "1"
+		return;
+	}
 }
 
 write_bsta_config() {
@@ -226,6 +246,169 @@ write_bsta_config() {
 
 }
 
+brcm_teardown_iface() {
+	config_load mapagent
+
+	local iface=$1
+
+	mapagent_teardown_wireless() {
+		write_wireless() {
+			local section=$1
+			local map_ifname=$2
+
+			config_get ifname $section ifname
+
+			[ "$ifname" != "$map_ifname" ] && return
+
+			uci -q set wireless.${section}.start_disabled="1"
+			uci -q set wireless.${section}.ssid="DISABLED-SSID"
+			uci -q set wireless.${section}.key="DISABLED-KEY"
+			uci -q delete wireless.${section}.multi_ap_backhaul_ssid
+			uci -q delete wireless.${section}.multi_ap_backhaul_key
+		}
+
+		config_load wireless
+
+		config_foreach write_wireless wifi-iface $1
+	}
+
+	mapagent_teardown_bss() {
+		local section=$1
+		local iface=$2
+
+		config_get ifname $section ifname
+
+		[ "$iface" != "$ifname" ] && return
+
+		config_get ifname $section ifname
+		uci -q set mapagent.${section}.enabled="0"
+		uci -q set mapagent.${section}.ssid="DISABLED-SSID"
+		uci -q set mapagent.${section}.key="DISABLED-KEY"
+
+		# subshell in hopes to maintain mapagent config loaded
+		$(mapagent_teardown_wireless $ifname)
+	}
+
+
+	config_foreach mapagent_teardown_bss fh-iface $iface
+
+	uci commit wireless
+	uci commit mapagent
+}
+
+brcm_bsta_to_wireless() {
+	config_load mapagent
+
+	mapagent_find_lowest_prio_onboarded() {
+		mapagent_process_bk() {
+			config_get priority $1 priority "2"
+			config_get onboarded $1 onboarded "0"
+
+			[ "$onboarded" = "0" ] && return
+
+			if [ -z "$sec" -o "$prio" = "-1" -o "$priority" -lt "$prio" ]; then
+				sec=$1
+				prio=$priority
+			fi
+		}
+
+		local sec=""
+		local prio="-1"
+
+		config_foreach mapagent_process_bk bk-iface
+		echo $sec
+	}
+
+	mapagent_enable_best() {
+		#echo 1=$1 best=$best > /dev/console
+		if [ "$1" = "$best" ]; then
+			uci -q set mapagent.$1.enabled='1'
+		else
+			uci -q set mapagent.$1.enabled='0'
+		fi
+	}
+
+	mapagent_bsta_to_wireless() {
+		mapagent_apply_wl_bsta() {
+			apply_config() {
+				local section=$1
+				local bsta=$2
+				local ssid=$3
+				local key=$4
+				local encryption=$5
+				local enabled=$6
+				local disabled="0"
+
+				config_get ifname $section ifname
+
+				[ -z "$enabled" -o "$enabled" = "0" ] && disabled="1"
+
+				[ "$bsta" == "$ifname" ] || return
+
+				uci set wireless.${section}.ssid=$ssid
+				uci set wireless.${section}.key=$key
+				uci set wireless.${section}.encryption=$encryption
+				uci set wireless.${section}.disabled=$disabled
+				echo 1
+			}
+
+			config_load wireless
+
+			config_foreach apply_config wifi-iface $@
+			uci commit wireless
+		}
+
+		mapagent_find_other_creds() {
+			#echo "trying to find other creds for $2" > /dev/console
+			config_get band $1 band
+			config_get onboarded $1 onboarded "0"
+
+			[ "$3" != "$band" -o "$onboarded" = "0" ] && return
+
+			config_get ssid $1 ssid
+			config_get key $1 key
+			config_get encryption $1 encryption
+			config_get enabled $1 enabled "0"
+
+			echo "$(mapagent_apply_wl_bsta $2 $ssid $key $encryption $4)"
+		}
+
+		config_get band $1 band
+		config_get ifname $1 ifname
+		config_get onboarded $1 onboarded "0"
+		config_get enabled $1 enabled "0"
+
+		if [ "$onboarded" = "0" ]; then
+			config_foreach mapagent_find_other_creds bk-iface $ifname $band $enabled
+		else
+			config_get ssid $1 ssid
+			config_get key $1 key
+			config_get encryption $1 encryption
+
+			echo "$(mapagent_apply_wl_bsta $ifname $ssid $key $encryption $enabled)"
+		fi
+	}
+
+	best=$(mapagent_find_lowest_prio_onboarded)
+
+	[ -z "$best" ] && return
+
+	band=$1
+	sec=""
+	prio=""
+
+	config_foreach mapagent_enable_best bk-iface $best
+	uci commit mapagent
+	config_load mapagent
+
+	diff=$(config_foreach mapagent_bsta_to_wireless bk-iface)
+
+	[ "$diff" != "" ] && {
+		ubus call uci commit '{"config":"wireless"}'
+	}
+}
+
+
 func=$1
 shift
 
@@ -236,7 +419,11 @@ case "$func" in
 	write_credentials) brcm_write_credentials;;
 	sync_credentials) brcm_sync_credentials;;
 	bsta_steer) bsta_steer $@;;
+	set_network) brcm_set_network $@;;
 	write_bsta_config) write_bsta_config $@;;
+	teardown_iface) brcm_teardown_iface $@;;
+	bsta_to_wireless) brcm_bsta_to_wireless $@;;
+	ts) ts_sub $@;;
 	--help|help) usage;;
 	*) usage; exit 1;;
 esac

map-agent/files/lib/wifi/traffic_separation

@@ -0,0 +1,381 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+### Traffic Separation ###
+
+ts_sub() {
+
+	ts_usage() {
+		cat <<EOF
+Usage: $0 [create|delete|populate]
+Traffic Separation related functions.
+create fh <iface> <vid>			- create vlan device and rules for wifi fronthaul
+create bh <iface> <vid> <profile>	- create vlan device and rules for wifi backhaul
+create eth <iface> <vid> <pbits>	- create vlan device and rules for logical ethernet interface
+delete <iface>				- delete vlan device
+populate eth <iface> <vid>		- add secondary network rules for logical ethernet interface
+primary get <iface>			- read primary VID for interface from driver (from Association Response frame IE)
+     
+EOF
+	exit 1
+	}
+
+	_get_bridge() {
+		local bridge=$(ip link show $1 | grep -o "master [^\s]*" | cut -d ' ' -f 2)
+		echo $bridge
+	}
+
+	ts_create() {
+
+		_create_vlan_dev() {
+			iface=$1				# real iface
+			vid=$2					# Vlan ID
+			bridge="$(_get_bridge $iface)"		# bridge iface is connected to
+			vlan_dev=${iface}_vlan${vid}		# name of vlan device to create
+
+			# remove interface from bridge if it is in one
+			[ -n "$bridge" ] && brctl delif $bridge $iface &> /dev/null
+
+			# create vlan device
+			vlanctl --mcast --if-create-name $iface $vlan_dev --if $iface --set-if-mode-rg
+
+			# bring the vlan device up and add back to bridge if it was in one
+			[ -n "$bridge" ] && brctl addif $bridge $vlan_dev &> /dev/null
+			ip link set dev $vlan_dev up
+
+			echo $vlan_dev
+		}
+
+		ts_create_fh() {
+			iface=$1				# fh iface
+			vid=$2					# SSID specific (secondary) or primary vid
+
+			[ -n "$iface" ] && [ -n "$vid" ] || {
+				cat <<EOF
+Adding FH device requires IFACE and VID.
+EOF
+				exit 1
+			}
+
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
+
+			# add rules
+			# Note: removing these for now since these packets are read directly from the iface anyway
+#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x888e --set-rxif $vlan_dev --rule-append		# incoming EAPOL
+#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x886c --set-rxif $vlan_dev --rule-append		# incoming brcm
+			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
+			vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --filter-vid $vid 0 --pop-tag --dscp2pbits 0 --rule-append
+		}
+
+# Note: Currently not used (will be needed for Profile 1)
+		ts_create_bh() {
+			iface=$1				# bh iface
+			vid=$2					# primary vid
+			profile=$3				# agent profile (1 or 2)
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
+				cat <<EOF
+Adding BH device requires IFACE, VID and PROFILE (1 or 2).
+EOF
+				exit 1
+			}
+
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
+
+			# add rules
+			case "$profile" in
+				1 | profile_1 | profile1 | Profile_1 | Profile1)
+					vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
+					vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --pop-tag --rule-append
+					;;
+				2 | profile_2 | profile2 | Profile_2 | Profile2)
+					vlanctl --if $iface --rx --tags 1 --set-rxif $vlan_dev --rule-append
+					vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --rule-append								# note: already default
+					vlanctl --if $iface --tx --tags 0 --filter-ethertype 0x893a --filter-txif $vlan_dev --push-tag --set-vid $vid 0 --rule-append	# note: outgoing IEEE1905.1
+					vlanctl --if $iface --tx --tags 0 --filter-ethertype 0x888e --filter-txif $vlan_dev --push-tag --set-vid $vid 0 --rule-append	# note: outgoing EAPOL
+					;;
+				*)
+					ts_delete $iface
+					ts_usage
+					exit 1
+					;;
+			esac
+		}
+
+		ts_create_bh_drv() {
+			iface=$1				# bh iface
+			vid=$2					# primary vid
+			profile=$3				# agent profile (1 or 2)
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
+				cat <<EOF
+Adding BH device requires IFACE, VID and PROFILE (1 or 2).
+EOF
+				exit 1
+			}
+
+			wl vlan_mode 0 &> /dev/null				# make sure this is OFF, else driver won't handle vlan
+			wl -i $iface down &> /dev/null
+			wl -i $iface map_profile $profile &> /dev/null		# only has effect on profile 2
+			wl -i $iface map_8021q_settings $vid &> /dev/null	# can only be set on bBSS (read-only on bSTA)
+			wl -i $iface up &> /dev/null
+		}
+
+		ts_create_eth() {
+
+			_ts_setup() {
+				vlan_bridge=$1
+				lan_bridge=$2
+				vlan_dev=$3
+				lan_dev=${vlan_dev}_lan
+
+				ip link show $vlan_dev &> /dev/null || ip link add $vlan_dev type veth peer name $lan_dev
+				brctl addif $vlan_bridge $vlan_dev &> /dev/null
+				brctl addif $lan_bridge $lan_dev &> /dev/null
+				ip link set $vlan_dev up
+				ip link set $lan_dev up
+			}
+
+			iface=$1				# Multi-AP Logical Ethernet Interface
+			vid=$2					# primary vid
+			pbits=$3				# default pbits to apply
+			vlan_bridge=$4				# name of ts subsystem bridge
+			lan_bridge=$5				# name of node local bridge
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$pbits" ] && [ -n "$vlan_bridge" ] && [ -n "$lan_bridge" ] || {
+				cat <<EOF
+Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
+EOF
+				exit 1
+			}
+
+			# create virtual eth device between bridges (if it doesn't exist))
+			_ts_setup $vlan_bridge $lan_bridge $iface
+
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
+
+			# TODO: how to disable returning traffic back to incoming interface?
+
+			# add rules
+			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --set-pbits $pbits 0 --rule-append
+			vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --pop-tag --rule-append
+		}
+
+		ts_create_dhcp() {
+			_br_setup() {
+				local name=$1
+				local sinkname=$2
+				local vid=$3
+				local diff=""
+
+				[ -z "$(uci -q get network.${name}_dev)" ] && {
+					uci -q set network.${name}_dev="device"
+					uci -q set network.${name}_dev.name="br-${name}"
+					uci -q set network.${name}_dev.type="bridge"
+					uci -q set network.${name}_dev.bridge_empty="1"
+					uci -q add_list network.${name}_dev.ports="${sinkname}"
+
+					diff="1"
+				}
+
+				[ -z "$(uci -q get network.${name})" ] && {
+					uci -q set network.${name}="interface"
+					uci -q set network.${name}.device="br-${name}"
+					uci -q set network.${name}.is_lan="1"
+					uci -q set network.${name}.proto="static"
+					uci -q set network.${name}.ipaddr="192.168.${vid}.1"
+					uci -q set network.${name}.netmask="255.255.255.0"
+
+					diff="1"
+				}
+
+				[ "$diff" = "1" ] && {
+					uci -q commit network
+					ubus call network reload
+					ubus -t 5 wait_for network.device
+				}
+			}
+
+			_dhcp_setup() {
+				local name=$1
+
+				[ -n "$(uci -q get dhcp.${name})" ] && return
+
+				uci -q set dhcp.${name}=dhcp
+				uci -q set dhcp.${name}.interface="${name}"
+				uci -q set dhcp.${name}.start="100"
+				uci -q set dhcp.${name}.limit="150"
+				uci -q set dhcp.${name}.leasetime="1h"
+				uci -q set dhcp.${name}.dhcpv4="server"
+				uci -q set dhcp.${name}.dhcpv6="server"
+				uci -q set dhcp.${name}.ra="server"
+				uci -q set dhcp.${name}.ra_slaac="1"
+				uci -q add_list dhcp.${name}.ra_flags="managed-config"
+				uci -q add_list dhcp.${name}.ra_flags="other-config"
+
+				uci -q commit dhcp
+				ubus call uci commit '{"config":"dhcp"}'
+			}
+
+			_wan_setup() {
+				local name=$1
+
+				config_load firewall
+
+				_process_zone() {
+					local section=$1
+					local sink=$2
+					local name
+					local exists=false
+
+					config_get name $section name
+
+					[ "$name" == "lan" ] || return
+
+					_process_list() {
+						local value=$1
+
+						[ "$value" == "$sink" ] && exists=true && return 1
+					}
+
+					config_list_foreach "$section" network _process_list 
+
+					[ $exists = false ] && {
+						uci -q add_list firewall.${section}.network="${sink}"
+						uci -q commit firewall
+						ubus call uci commit '{"config":"firewall"}'
+					}
+
+					return 1
+				}
+
+				config_foreach _process_zone zone $name
+			}
+
+			vid=$1					# primary vid
+
+			[ -n "$vid" ] || {
+				cat <<EOF
+VID required to configure DHCP.
+EOF
+				exit 1
+			}
+
+			br_dev=sink_vlan${vid}			# name of vlan device to create
+
+
+			ip l a sink1_vlan${vid} type veth peer name sink2_vlan${vid}
+			vlanctl --mcast --if-create-name sink2_vlan${vid} sink3_vlan${vid} --if sink2_vlan${vid} --set-if-mode-rg
+			vlanctl --if sink2_vlan${vid} --rx --tags 1 --filter-vid ${vid} 0 --set-rxif sink3_vlan${vid} --pop-tag --rule-append
+			vlanctl --if sink2_vlan${vid} --tx --tags 0 --filter-txif sink3_vlan${vid} --push-tag --set-vid ${vid} 0 --rule-append
+			ip l s sink1_vlan${vid} up
+			ip l s sink2_vlan${vid} up
+			ip l s sink3_vlan${vid} up
+
+			_br_setup $br_dev sink3_vlan${vid} $vid
+			_dhcp_setup $br_dev
+			_wan_setup $br_dev
+		}
+
+	local type=$1
+	shift
+
+	case "$type" in
+		fh) ts_create_fh $@;;
+#		bh) ts_create_bh $@;;
+		bh) ts_create_bh_drv $@;;
+		eth) ts_create_eth $@;;
+		dhcp) ts_create_dhcp $@;;
+		--help|help) ts_usage;;
+		*) ts_usage; exit 1;;
+	esac
+	}
+
+	ts_delete() {
+		iface=$1
+
+		path=$(ls -d /sys/class/net/${iface}/upper_*)
+		[ -z "$path" ] && exit 0
+		vlan_dev=${path##*upper_}
+		bridge="$(_get_bridge $vlan_dev)"
+
+		vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
+
+		brctl addif $bridge $iface &> /dev/null
+	}
+
+	ts_populate() {
+		local type=$1
+		shift
+
+		[ "$type" == "eth" ] || {
+			cat <<EOF
+Populating ETH rules requires IFACE and VID.
+EOF
+			exit 1
+		}
+
+		iface=$1				# Multi-AP Logical Ethernet Interface
+		vid=$2					# secondary vid
+
+		path=$(ls -d /sys/class/net/${iface}/upper_*)
+		[ -z "$path" ] && exit 1
+		vlan_dev=${path##*upper_}
+
+		# add rules
+		vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append		# note: retain secondary vids
+		vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append		# note: already default
+	}
+
+	ts_primary() {
+		local func=$1
+		shift
+
+		case "$func" in
+			get) vid=$(wl -i $1 map_8021q_settings); echo ${vid##* };;
+			*) ts_usage; exit 1;;
+		esac
+	}
+
+	ts_unicast() {
+		local mac=$1
+		local iface=$2
+
+		# TODO: improve?
+		res=$(ebtables -t broute -L | grep -i "$mac" | grep "$iface")
+		[ -n "$res" ] && return
+
+		ebtables -t broute -D BROUTING -d "$mac" -p 0x893a -j DROP
+		ebtables -t broute -I BROUTING -i "$iface" -d "$mac" -p 0x893a -j DROP
+	}
+
+	ts_multicast() {
+		local iface=$1
+
+		# TODO: improve?
+		res=$(ebtables -t broute -L | grep -i "1:80:C2:00:00:13" | grep "$iface")
+		[ -n "$res" ] && return
+
+		ebtables -t broute -D BROUTING -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+		ebtables -t broute -D BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+		ebtables -t broute -I BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+	}
+
+	local func=$1
+	shift
+
+	case "$func" in
+		create) ts_create $@;;
+		delete) ts_delete $@;;
+		populate) ts_populate $@;;
+		primary) ts_primary $@;;
+		unicast) ts_unicast $@;;
+		multicast) ts_multicast $@;;
+		--help|help) ts_usage;;
+		*) ts_usage; exit 1;;
+	esac
+}

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.0.1
+PKG_VERSION:=4.2.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3e6e113fdbfdb8a2e230fc74ebe8a36f9696ede2
+PKG_SOURCE_VERSION:=a6f1c53de257f8f857bbadbcc9a2598e33a50637
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE

map-controller/files/etc/config/mapcontroller

@@ -2,43 +2,66 @@ config controller 'controller'
 	option enabled '1'
 	option registrar '5 2'	    #bands on which wps registrar supported
 	option debug '6'
-	option al_bridge 'br-lan'
+	option enable_sta_steer '0'
+	option enable_bsta_steer '0'
+	option primary_vid '1'
+	option primary_pcp '0'
 
-config vlan 'lan'
-	option network 'lan'
-	option id '1'
+config interface 'lan'
+	option 'dhcp'
 
-config fh-credentials
+config ap
 	option band '5'
-	option encryption 'psk2'
+	option encryption 'sae-mixed'
 	option key '1234567890'
 	option ssid 'map-net5'
-	option vlan '1'
+	option vid '1'
+	option type 'fronthaul'
+	option network 'lan'
 
-config fh-credentials
+config ap
 	option band '2'
-	option encryption 'psk2'
+	option encryption 'sae-mixed'
 	option key '1234567890'
 	option ssid 'map-net2'
-#	option bk_ssid 'multiap_ssid123'
-#	option bk_key 'multiap_key123'
-	option vlan '1'
+	option vid '1'
+	option type 'fronthaul'
+	option network 'lan'
 
-config bk-credentials
+config ap
 	option band '5'
-	option encryption 'psk2'
+	option encryption 'sae'
 	option key '5555555555'
 	option ssid 'map-bkhaul-5'
-	option multi_ap '2'
+	option type 'backhaul'
 	option disallow_bsta '1'		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
-	option vlan '1'
+	option vid '1'
+	option network 'lan'
 
-
-config bk-credentials
+config ap
 	option band '2'
-	option encryption 'psk2'
+	option encryption 'sae'
 	option key '2222222222'
 	option ssid 'map-bkhaul-2'
-	option multi_ap '2'
-	option disallow_bsta '0'                # 0 or 1 profile-1 bSTA
-	option vlan '1'
+	list disallow_bsta '0'                # 0 or 1 profile-1 bSTA
+	option vid '1'
+	option type 'backhaul'
+	option network 'lan'
+
+config policy 'policy'
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_sta_assocfails_rate '2'      # reporting rate for STA assoc fails (attempts per minute)
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option rcpi_hysteresis_margin '0'          # 0, or > 0 - hysteresis margin
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.1.4
+PKG_VERSION:=2.1.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=eb6500963156865b74c2373c11366861ad75bf45
+PKG_SOURCE_VERSION:=a00f747fafa5b029d24e2a571841f4cf92431bc7
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

mcastmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

mcastmngr/files/etc/uci-defaults/61-mcast_config_generate

@@ -22,7 +22,7 @@ generate_igmp_global_params(){
 
 generate_mcast_config(){
 
-	up_itf="$(uci -q get network.wan.ifname)"
+	up_itf="$(uci -q get network.wan.device)"
 
 	uci add mcast proxy
 	uci rename mcast.@proxy[-1]="igmp_proxy_1"

obudpst/Makefile

@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2020, Broadband Forum
+# Copyright (c) 2020, AT&T Communications
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=obudpst
+PKG_VERSION:=7.2.1
+PKG_SOURCE_VERSION:=9c448095c9773bd7e5cea143af07817ad9f3c6ba
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/BroadbandForum/obudpst.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/obudpst
+	CATEGORY:=Utilities
+	DEPENDS+=+libopenssl
+	TITLE:=Open Broadband-UDP Speed Test (OB-UDPST)
+endef
+
+define Build/Install
+	:
+endef
+
+define Package/obudpst/description
+	Open Broadband-UDP Speed Test (OB-UDPST) is a client/server software utility to demonstrate
+	one approach of doing IP capacity measurements described by Broadband Forum TR-471.
+endef
+
+define Package/obudpst/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/udpst $(1)/usr/sbin/obudpst
+endef
+
+$(eval $(call BuildPackage,obudpst))

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=4.0.0.10
+PKG_VERSION:=4.1.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=56dca342de0704b479f408b72712e282a413557a
+PKG_SOURCE_VERSION:=817cb955fe010e2c3a1cdcc22c4daac3b9064126
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

obuspa/files/etc/hotplug.d/iface/85-obuspa

@@ -5,5 +5,7 @@
 [ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
 [ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" ] && exit 0
 
+echo "Restarting obuspa"|logger -t obuspa.hotplug -p debug
+
 /etc/init.d/obuspa reload
 

obuspa/files/etc/init.d/obuspa

@@ -1,14 +1,12 @@
 #!/bin/sh /etc/rc.common
 
 START=99
+STOP=2
 USE_PROCD=1
 PROG=/usr/sbin/obuspa
 
-EXTRA_COMMANDS="remove_db"
-EXTRA_HELP="	remove_db Removes obuspa persistent db before restarting, self trigger with uci change"
-
-PARAM_FILE="/tmp/obuspa_param_reset.txt"
 CONFIGURATION=obuspa
+PARAM_FILE="/tmp/obuspa_param_reset.txt"
 KEEP_FILES="/lib/upgrade/keep.d/obuspa"
 USP_TEMP_FILE="/tmp/usp.tmp"
 controller_num=0
@@ -19,6 +17,7 @@ subs_num=0
 challenge_num=0
 index=0
 role_def_file=""
+PROFILE="/root/.profile"
 
 . /lib/functions/network.sh
 . /usr/share/libubox/jshn.sh
@@ -43,6 +42,19 @@ db_set() {
 	fi
 }
 
+update_keep() {
+	keep_file=${1}
+
+	if [ -z "${keep_file}" ]; then
+		return;
+	fi
+
+	grep -q "${keep_file}" ${KEEP_FILES}
+	if [ "$?" -ne 0 ]; then
+		echo ${keep_file} >> ${KEEP_FILES}
+	fi
+}
+
 get_index() {
 	index=$(( index + 1 ))
 	if [ "$1" = "$2" ]; then
@@ -580,28 +592,38 @@ configure_obuspa() {
 	fi
 
 	if [ -n "${interface}" ]; then
-		network_get_device ifname ${interface}
+		network_get_physdev ifname ${interface}
 		log "ifname from ${interface} is ${ifname}"
 	fi
 
 	# Set this variable for root user and obuspa -c tool
-	grep -q "export USP_BOARD_IFNAME=${ifname}" /root/.profile || \
-		echo "export USP_BOARD_IFNAME=${ifname}" >> /root/.profile
+	if [ -f "${PROFILE}" ]; then
+		grep -q "export USP_BOARD_IFNAME=${ifname}" ${PROFILE}
+		if [ "$?" -ne 0 ]; then
+			grep -q "export USP_BOARD_IFNAME" ${PROFILE}
+			if [ "$?" -eq 0 ]; then
+				sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
+			fi
+			echo "export USP_BOARD_IFNAME=${ifname}" >> ${PROFILE}
+		fi
+	else
+		echo "export USP_BOARD_IFNAME=${ifname}" > ${PROFILE}
+	fi
 
 	if [ -n "${db_file}" ]; then
-		echo "${db_file}" >>${KEEP_FILES}
+		update_keep "${db_file}"
 		procd_append_param command -f ${db_file}
 	fi
 
 	if [ -n "${trust_cert}" ]; then
-		echo "${trust_cert}" >>${KEEP_FILES}
+		update_keep "${trust_cert}"
 		if [ -f "${trust_cert}" ]; then
 			procd_append_param command -t ${trust_cert}
 		fi
 	fi
 
 	if [ -n "${client_cert}" ]; then
-		echo "${client_cert}" >>${KEEP_FILES}
+		update_keep "${client_cert}"
 		if [ -f "${client_cert}" ]; then
 			procd_append_param command -a ${client_cert}
 		fi
@@ -612,10 +634,6 @@ configure_obuspa() {
 
 # Create factory reset file
 db_init() {
-	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
-	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db
-	[ -f ${KEEP_FILES} ] && rm -f ${KEEP_FILES}
-
 	# Load configuration
 	config_load $CONFIGURATION
 	config_foreach configure_obuspa obuspa
@@ -630,25 +648,8 @@ db_init() {
 	db_set Internal.Reboot.Cause "LocalFactoryReset"
 }
 
-# if uci changes for obuspa remove persistent db and then reload
-remove_db() {
-	local db_file
-
-	config_load obuspa
-	config_get db_file global db_file
-
-	log "Removing db file (${db_file})"
-	[ -f ${db_file} ] && rm -f ${db_file}
-
-	sed -i "g/export USP_BOARD_IFNAME/d" /root/.profile
-
-	log "Restarting service"
-	stop
-	start
-}
-
 service_running() {
-	ubus -t 10 wait_for usp.raw
+	ubus wait_for usp.raw
 	procd_running ${CONFIGURATION}
 }
 
@@ -664,10 +665,6 @@ start_service() {
 	fi
 
 	ubus wait_for usp.raw
-	if [ "$?" -ne 0 ]; then
-		log "OBUSPA failed to start usp.raw not available"
-		return 0
-	fi
 
 	procd_open_instance ${CONFIGURATION}
 	procd_set_param command ${PROG}
@@ -682,7 +679,19 @@ start_service() {
 }
 
 stop_service() {
+	local db_file
+
+	config_load obuspa
+	config_get db_file global db_file
+
 	${PROG} -c stop 2>&1 >/dev/null
+
+	if [ -z "${db_file}" ]; then
+		db_file="/tmp/usp.db"
+	fi
+
+	[ -f ${db_file} ] && rm -f ${db_file}
+	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
 }
 
 reload_service() {
@@ -691,8 +700,7 @@ reload_service() {
 }
 
 service_triggers() {
-	procd_add_reload_trigger "uspd" "mosquitto"
-	procd_add_config_trigger "config.change" "${CONFIGURATION}" /etc/init.d/obuspa remove_db
+	procd_add_reload_trigger "obuspa" "mosquitto"
 
 	# Create a reload trigger if schema update avaialble
 	procd_open_trigger
@@ -711,13 +719,7 @@ service_triggers() {
 					json_add_string "" "reload"
 				json_close_array
 			json_close_array
-			json_add_int "" "1000"
+			json_add_int "" "2000"
 		json_close_array
 	procd_close_trigger
-
-
-#	local interface
-#	config_load obuspa
-#	config_get interface global interface
-#	[ -n "$interface" ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/obuspa reload
 }

owsd/files/owsd.hotplug

@@ -2,19 +2,6 @@
 
 [ "$ACTION" = ifup ] || exit 0
 
-handle_interface() {
-	ifname=$(uci get network.$1.ifname)
-
-	case "$ifname" in
-		@*)
-			alias_interface="$1 $alias_interface"
-			;;
-	esac
-}
-
-config_load network
-config_foreach handle_interface "interface"
-
 compare_owsd_iface() {
 	local interface
 
@@ -24,13 +11,6 @@ compare_owsd_iface() {
 		/etc/init.d/owsd reload
 		exit
 	fi
-
-	for i in $alias_interface; do
-	if [ "$INTERFACE" == "$i" ]; then
-			/etc/init.d/owsd reload
-			exit
-		fi
-	done
 }
 
 config_load owsd

periodicstats/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d53b540a89165753922707ed624b315d58abd10a
+PKG_SOURCE_VERSION:=312573b91b2ae10d0fe04a4d11ae37898f526fdb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

qosmngr/Makefile

@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=03df56c6eb7c6737ce95576e89c915df77396953
+PKG_SOURCE_VERSION:=460327011d932580f55c7b70acb1e652dd3c95a3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

qosmngr/files/etc/init.d/qos

@@ -23,11 +23,6 @@ start_service() {
 	fi
 }
 
-stop() {
-	#stop_service() is called after procd killed the service
-	echo ;
-}
-
 boot() {
 	setup_qos
 	start
@@ -37,12 +32,8 @@ service_triggers() {
 	procd_add_reload_trigger qos
 }
 
-reload_service() {
-	# Call functions to configure QoS
-	start
-}
-
 restart() {
+	stop
 	setup_qos
 	start
 }

qosmngr/files/lib/qos/broadcom.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . /lib/functions.sh
+. /lib/network/port.sh
 
 IP_RULE=""
 BR_RULE=""
@@ -13,6 +14,7 @@ PREV_ORDER=""
 CURR_ORDER=""
 MAX_ORDER=""
 
+
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {
@@ -52,7 +54,7 @@ configure_precedence_to_file() {
 	line="$2"
 	order_file="$3"
 
-	if [ $order == $PREV_ORDER ]; then
+	if [ $order == "$PREV_ORDER" ]; then
 		queue_id=${line#*_}
 		val=${CURR_ORDER}_${queue_id}
 		echo $val >> $order_file
@@ -122,7 +124,7 @@ handle_queue() {
 	fi
 
 	# This is to get the qid per interface.
-	if [ $INTF_NAME == $ifname ]; then
+	if [ "$INTF_NAME" == $ifname ]; then
 		Q_COUNT=$((Q_COUNT + 1))
 	else
 		Q_COUNT='0'
@@ -251,17 +253,17 @@ setup_qos() {
 		ebtables -t broute -I BROUTING -j qos
 	fi
 
-	iptables -t mangle -N qos_forward
+	iptables -w -t mangle -N qos_forward
 	ret=$?
-	[ $ret -eq 0 ] && iptables -t mangle -I FORWARD -j qos_forward
+	[ $ret -eq 0 ] && iptables -w -t mangle -I FORWARD -j qos_forward
 
-	iptables -t mangle -N qos_prerouting
+	iptables -w -t mangle -N qos_prerouting
 	ret=$?
-	[ $ret -eq 0 ] && iptables -t mangle -I PREROUTING -j qos_prerouting
+	[ $ret -eq 0 ] && iptables -w -t mangle -I PREROUTING -j qos_prerouting
 
-	iptables -t mangle -N qos_output
+	iptables -w -t mangle -N qos_output
 	ret=$?
-	[ $ret -eq 0 ] && iptables -t mangle -I OUTPUT -j qos_output
+	[ $ret -eq 0 ] && iptables -w -t mangle -I OUTPUT -j qos_output
 
 	ip6tables -t mangle -N qos_forward
 	ret=$?
@@ -279,13 +281,13 @@ setup_qos() {
 flush_chains() {
 	echo "ebtables -t broute -F qos" > /tmp/qos/classify.ebtables
 
-	echo "iptables -t mangle -F qos_forward" > /tmp/qos/classify.iptables
-	echo "iptables -t mangle -F qos_prerouting" >> /tmp/qos/classify.iptables
-	echo "iptables -t mangle -F qos_output" >> /tmp/qos/classify.iptables
+	echo "iptables -w -t mangle -F qos_forward" > /tmp/qos/classify.iptables
+	echo "iptables -w -t mangle -F qos_prerouting" >> /tmp/qos/classify.iptables
+	echo "iptables -w -t mangle -F qos_output" >> /tmp/qos/classify.iptables
 
-	echo "ip6tables -t mangle -F qos_forward" > /tmp/qos/classify.ip6tables
-	echo "ip6tables -t mangle -F qos_prerouting" >> /tmp/qos/classify.ip6tables
-	echo "ip6tables -t mangle -F qos_output" >> /tmp/qos/classify.ip6tables
+	echo "ip6tables -w -t mangle -F qos_forward" > /tmp/qos/classify.ip6tables
+	echo "ip6tables -w -t mangle -F qos_prerouting" >> /tmp/qos/classify.ip6tables
+	echo "ip6tables -w -t mangle -F qos_output" >> /tmp/qos/classify.ip6tables
 }
 
 init_broute_rule() {
@@ -534,12 +536,12 @@ iptables_set_traffic_class() {
 
 append_rule_to_mangle_table() {
 	if [ $2 == 4 ]; then
-		echo "iptables -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
+		echo "iptables -w -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
 	elif [ $2 == 6 ]; then
-		echo "ip6tables -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
+		echo "ip6tables -w -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
 	elif [ $2 == 1 ]; then
-		echo "iptables -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
-		echo "ip6tables -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
+		echo "iptables -w -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
+		echo "ip6tables -w -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
 	fi
 }
 
@@ -763,7 +765,10 @@ config_ingress_rate_limit() {
 		in_burst_size=$((in_burst_size / 1000))
 	fi
 
-	ethswctl -c rxratectrl -n 1 -p $ifname -x $ingress_rate -y $in_burst_size
+	local unitport="$(get_port_number $ifname)"
+        local unit=$(echo $unitport | cut -d ' ' -f 1)
+        local port=$(echo $unitport | cut -d ' ' -f 2)
+	ethswctl -c rxratectrl -n $unit -p $port -x $ingress_rate -y $in_burst_size
 }
 
 #function to handle a classify section
@@ -854,10 +859,14 @@ configure_policer() {
 	# the old config if any and return
 	if [ $POLICER_SKIP -eq 0 ]; then
 		for intf in $(db get hw.board.ethernetPortOrder); do
+			local unitport="$(get_port_number $intf)"
+			local unit=$(echo $unitport | cut -d ' ' -f 1)
+			local port=$(echo $unitport | cut -d ' ' -f 2)
 			# setting rate and burst size to 0 disables rate limiting
-			ethswctl -c rxratectrl -n 1 -p $intf -x 0 -y 0
+			if [ $port != "" -a $unit != "" ]; then
+				ethswctl -c rxratectrl -n $unit -p $intf -x 0 -y 0
+			fi
 		done
-		return
 	fi
 
 	# Delete policer
@@ -885,8 +894,11 @@ configure_policer() {
 }
 
 configure_qos() {
-	configure_queue
+	#queue configuration is being done after shaper configuration,
+	#If port shapingrate configuration on DISC device is called after queue configuration then
+	#driver overwrites the queue shaping rate with default value of port shaping rate.
 	configure_shaper
+	configure_queue
 	configure_policer
 	configure_classify
 }

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=0.2.18
+PKG_VERSION:=0.2.19
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
-PKG_SOURCE_VERSION:=06411282a6c2d02d21599786c0dd12c00c711847
+PKG_SOURCE_VERSION:=86de40b6ebdf937419290f6a0c5c0fb79eaa5ed1
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

swmodd/Makefile

@@ -6,14 +6,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7971057300f315acda9ed1090e9a02fda7f5e5d5
+PKG_SOURCE_VERSION:=db004cb46f45e893a566e648d1e45c5cbcb45677
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -25,7 +25,9 @@ define Package/swmodd
 	SECTION:=utils
 	CATEGORY:=Utilities
 	TITLE:= Software Modules Daemon
-	DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +PACKAGE_liblxc:liblxc
+	DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +opkg \
+	    +PACKAGE_liblxc:liblxc +PACKAGE_liblxc:cgroupfs-mount \
+	    +@BUSYBOX_CONFIG_BUSYBOX +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
 endef
 
 define Package/swmodd/description
@@ -52,10 +54,15 @@ define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/etc/swmod
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_CONF) ./files/map_du $(1)/etc/swmod/map_du
 	$(INSTALL_BIN) ./files/swmodd.init $(1)/etc/init.d/swmodd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swmodd $(1)/usr/sbin/swmodd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libswmodd.so $(1)/usr/lib/bbfdm/libswmodd.so
+ifeq ($(CONFIG_PACKAGE_liblxc),y)
+	$(INSTALL_DIR) $(1)/usr/share/lxc/templates/
+	$(INSTALL_DIR) $(1)/usr/share/swmodd/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/templates/lxc-iopsys $(1)/usr/share/lxc/templates/lxc-iopsys
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/opkg_offline.sh $(1)/usr/share/swmodd/opkg_offline
+endif
 endef
 
 $(eval $(call BuildPackage,swmodd))

twamp/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
-PKG_SOURCE_VERSION:=f6e914508aa1f7458f87bd68026f56262595d9a5
+PKG_SOURCE_VERSION:=dbddaa0c4d826dfdf37bb92f98a2b2ad23035ca3
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp.git
 

uspd/Config.in

@@ -0,0 +1,9 @@
+config USPD_MAX_MSG_LEN
+    int "Maximum message length"
+    default 10485760
+    help
+        Set the maximum data length allowed over ubus in Bytes.
+
+	This value should not be larger than UBUS_MAX_MSGLEN from ubusd.
+	The maximum blob message length allowed is:
+	(configured value - 128) bytes

uspd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.1.22
+PKG_VERSION:=2.1.27
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c07225ef8e138597c5da0d2c8041d2eab096b659
+PKG_SOURCE_VERSION:=98b10ab2cf3109d11c728e99829b042d1f6e4942
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -34,10 +34,14 @@ define Package/uspd/description
  running on top of it.
 endef
 
+define Package/uspd/config
+	source "$(SOURCE)/Config.in"
+endef
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
-
+	-D_GNU_SOURCE \
+	-DUSPD_MAX_MSG_LEN=$(CONFIG_USPD_MAX_MSG_LEN)
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare

uspd/files/uspd.init

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=98
+START=96
 STOP=10
 
 USE_PROCD=1
@@ -59,5 +59,5 @@ reload_service() {
 
 service_triggers()
 {
-	procd_add_config_trigger "config.change" "uspd" /etc/init.d/uspd restart
+	procd_add_reload_trigger "uspd"
 }

wfa-capi/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2021 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wfa-capi
+PKG_VERSION:=0.0.17
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=1079c7a76b3439f8f96ea478f34c59be4aaa99c6
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+
+#define Package/wfa-capi/config
+#  source "$(SOURCE)/Config.in"
+#endef
+
+define Package/wfa-capi
+  TITLE+= wfa-capi (agent daemon for Wi-Fi Alliance's CAPI commands)
+  DEPENDS= +libubox +libuci +libubus +libnl-genl +libeasy +libwifi \
+	   +libjson-c +libblobmsg-json +ubus +libieee1905
+endef
+
+define Package/wfa-capi/description
+ This package provides agent for WiFi Alliance's CAPI specification.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+MAKE_PATH:=src
+
+
+define Package/wfa-capi/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/lib/wifi/capi
+	$(CP) $(PKG_BUILD_DIR)/src/capiagent $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/src/scripts/* $(1)/lib/wifi/capi
+endef
+
+$(eval $(call BuildPackage,wfa-capi))

wfa-capi/files/etc/init.d/capiagent

@@ -0,0 +1,26 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=20
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+        procd_set_param command "/usr/sbin/capiagent"
+	procd_set_param limits core="unlimited"
+#	procd_set_param respawn
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "capiagent"
+}
+
+reload_service() {
+	stop
+	start
+}

wfadatad/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=4.0.6
+PKG_VERSION:=4.0.10
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=43a3a5fd64d6476f07640e1b7ba1a2c5f242cb78
+PKG_SOURCE_VERSION:=bb7d6e5ee04803bca2391c30cc035a7fab0f1353
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=11.2.0
+PKG_VERSION:=13.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=505bc2c4f6f126f3d35d36d8db5a8d42b149d9c2
+PKG_SOURCE_VERSION:=6b1f24c940efdc563e0bfec06fdb803235494b6f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

wifimngr/files/etc/hotplug.d/button/05-wifi

@@ -60,17 +60,45 @@ supp_status() {
 	echo "UNCONFIGURED"
 }
 
+supp_configured() {
+	wpasupp=$1
+
+	for wpa in $wpasupp
+	do
+		logger -t button "WPS $wpa check if configured"
+		status=$(supp_status $wpa)
+		if [ "$status" = "CONFIGURED" ]; then
+			logger -t button "WPS $wpa CONFIGURED"
+			echo "CONFIGURED"
+			return
+		fi
+	done
+
+	echo "UNCONFIGURED"
+}
+
+supp_wps() {
+	wpasupp=$1
+
+	for wpa in $wpasupp
+	do
+		logger -t button "WPS $wpa start"
+		ubus -t 1 call $wpa wps_start
+	done
+}
+
 wps_button() {
 	logger -t button "WPS button is pressed"
-	wpasupp="$(ubus list wpa_supplicant.* 2>/dev/null | head -1)"
+	wpasupp="$(ubus list wpa_supplicant.* 2>/dev/null)"
+
+	logger -t button "WPS checking: $wpasupp"
 	if [ -n "$wpasupp" ]; then
-		status=$(supp_status $wpasupp)
+		status=$(supp_configured "$wpasupp")
 		logger -t button "status $status"
 		if [ "$status" = "CONFIGURED" ]; then
 			start_ap_wps
 		else
-			logger -t button "WPS start $wpasupp"
-			ubus -t 1 call $wpasupp wps_start
+			supp_wps "$wpasupp"
 		fi
 	else
 		start_ap_wps

xmppc/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
-PKG_SOURCE_VERSION:=a98cdda759418dab1c12a18c345112d94ed4c02e
+PKG_SOURCE_VERSION:=4a09b8689d67dcbf3fd1b7e80e53816b7cd12614
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/xmppc.git