bbfdm: Added SelfTestDiagnostics()

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.4.9
+PKG_VERSION:=1.4.4
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=ea08860a345ed77ac2a139812dff98e0ac90bb09
+PKG_SOURCE_VERSION:=3c0f416653781f04e2b73e7da6ccaddf6ab691de
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.2.0.8
+PKG_VERSION:=4.2.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3d24f88de24150299eb5e4524f1d9987fb5b7f14
+PKG_SOURCE_VERSION:=3e54fa519defa462d08d4107c115905abb929c1a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.2
+PKG_VERSION:=3.5.19
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0ec179798236cc435819f80b16c13661a5f00fb5
+PKG_SOURCE_VERSION:=1fd0b11ad34f8f59b40c3a12e0cc07aa212eb87b
 PKG_MIRROR_HASH:=skip
 endif
 

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=208a904170d270404215ee6707204cc84c31de5c
+PKG_SOURCE_VERSION:=975549e01df338a90e1d1a356d22a2c7f5bf2387
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

hostmngr/files/lib/hosts/hosts_acl.sh

@@ -144,11 +144,6 @@ process_ac_schedule() {
 	IP_RULE=""
 	IP_RULE1=""
 
-	config_get is_enabled "$access_control" "enable" 1
-	if [ "$is_enabled" == "0" ]; then
-		return
-	fi
-
 	mac=$(uci -q get hosts.$access_control.macaddr)
 	access_policy=$(uci -q get hosts.$access_control.access_policy)
 

icwmp/Makefile

@@ -8,16 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.17
+PKG_VERSION:=9.5.13
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=d01799af9a1043b60de0f118ebb974628d57c9b3
+PKG_SOURCE_VERSION:=ade480d2b090e3fba952605596c9e9276e4cbd02
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -81,9 +80,10 @@ ifeq ($(BUILD_VARIANT),mbedtls)
 CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif
 
-ifeq ($(LOCAL_DEV),1)
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 endif
 

icwmp/files/etc/config/cwmp

@@ -20,7 +20,7 @@ config cpe 'cpe'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'ERROR'
+	option log_severity 'INFO'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER

icwmp/files/etc/init.d/icwmpd

@@ -510,19 +510,16 @@ start_service() {
 	config_get url acs url ""
 	config_get dhcp_url acs dhcp_url ""
 
-	procd_open_instance icwmp
-
 	if [ "$enable_cwmp" = "0" ]; then
-		procd_close_instance
 		return 0
 	fi
 
 	validate_defaults || {
 		log "Validation of defaults failed"
-		procd_close_instance
 		return 1;
 	}
 
+	procd_open_instance icwmp
 	if [ -n "${url}" ] || [ -n "${dhcp_url}" ]; then
 		procd_set_param command "$PROG"
 		procd_append_param command -b
@@ -547,7 +544,6 @@ reload_service() {
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
 
-	log "Reload service $ret"
 	ret="0"
 	if [ "$enable_cwmp" = "0" ]; then
 		stop
@@ -557,9 +553,9 @@ reload_service() {
 
 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 	if [ "$ret" != "true" ]; then
-		log "Reloading cwmp service ..."
 		stop
 		start
+		return 0
 	fi
 }
 

ieee1905/Config.in

@@ -20,6 +20,7 @@ config IEEE1905_WIFI_EASYMESH
 
 config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
+	default y
 
 endmenu
 

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.3
+PKG_VERSION:=8.2.22
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=526690993c93720ee1707bba6b7a08e8c28f2dd9
+PKG_SOURCE_VERSION:=78ab0f41b76773a446bd64d6d981e2b91302c02b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -123,6 +123,7 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/

ieee1905/files/etc/config/ieee1905

@@ -4,7 +4,6 @@ config ieee1905 'ieee1905'
 	list extmodule 'map'
 	list extmodule 'topology'
 	option registrar '2 5 6'
-	list exclude_tagging '/eth.*'
 #	option macaddress '0a:1b:2c:3d:4e:50'
 
 config al-iface

iop/config

@@ -94,7 +94,6 @@ CONFIG_PACKAGE_udpecho-server=y
 CONFIG_PACKAGE_userinterface=y
 CONFIG_PACKAGE_xmppc=y
 CONFIG_PACKAGE_timemngr=y
-CONFIG_PACKAGE_self-diagnostics=y
 
 # WebGUI #
 CONFIG_PACKAGE_sulu=y
@@ -243,6 +242,7 @@ CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
+# CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
 # CONFIG_BUSYBOX_CONFIG_HTTPD is not set

iop/scripts/feeds_update.sh

@@ -4,18 +4,7 @@ function feeds_update {
 	heads=1
 	developer=0
 	override=1
-	force=1
-
-	function update_failure {
-		if [ $force == 1 ]; then
-			echo "WARNING: Failed to update feed(s). Forced update, proceeding anyway." >&2
-		else
-			echo "ERROR: Failed to update feed(s). Omit -F to proceed anyway." >&2
-			exit 1
-		fi
-	}
-
-	while getopts "inFh" opt; do
+	while getopts "inh" opt; do
 		case $opt in
 		i)
 			heads=0
@@ -23,16 +12,12 @@ function feeds_update {
 		n)
 			override=0
 			;;
-		F)
-			force=0
-			;;
 		h|\?)
-			echo "Usage: ./iop feeds_update [-i] [-n] [-F] [-h]"
+			echo "Usage: ./iop feeds_update [-i] [-n] [-h]"
 			echo
 			echo "OPTIONS:"
 			echo "  -i - Only update index. Do not change HEAD in feeds."
 			echo "  -n - Do not replace core packages with iopsys versions."
-			echo "  -F - Do not force update if there are inaccessible feeds."
 			echo "  -h - Display this help message and exit."
 			exit 1
 			;;
@@ -45,9 +30,9 @@ function feeds_update {
 
 	if [ $heads == 1 ]; then
 		if [ $developer == 1 ]; then
-			./scripts/feeds update -g || update_failure
+			./scripts/feeds update -g
 		else
-			./scripts/feeds update || update_failure
+			./scripts/feeds update
 		fi
 	fi
 	./scripts/feeds update -ai || exit 1

iop/scripts/genconfig.sh

@@ -2,7 +2,6 @@
 
 function genconfig {
 	export CLEAN=0
-	export DIRTY="--dirty"
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
@@ -199,7 +198,6 @@ function genconfig {
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
 		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
 		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
 		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
@@ -418,7 +416,7 @@ function genconfig {
 
 		# Set target version
 		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
 			echo "ERROR: Failed getting version via git describe, exiting." >&2
 			return 1
 		fi
@@ -485,7 +483,6 @@ function genconfig {
 			case "$1" in
 
 			-c|--clean) export CLEAN=1;;
-			-D|--no-dirty) export DIRTY="";;
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
 			-t|--target) export TARGET="$2"; shift;;

iop/scripts/genconfig_min.sh

@@ -2,7 +2,6 @@
 
 function genconfig_min {
 	export CLEAN=0
-	export DIRTY="--dirty"
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
 	CURRENT_CONFIG_FILE=".current_config_file"
@@ -198,7 +197,6 @@ function genconfig_min {
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
 		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
 		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
 		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
@@ -392,7 +390,7 @@ function genconfig_min {
 
 		# Set target version
 		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
 			echo "ERROR: Failed getting version via git describe, exiting." >&2
 			return 1
 		fi
@@ -453,7 +451,6 @@ function genconfig_min {
 			case "$1" in
 
 			-c|--clean) export CLEAN=1;;
-			-D|--no-dirty) export DIRTY="";;
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
 			-t|--target) export TARGET="$2"; shift;;

libdpp/Makefile

@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2020-2023 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdpp
-PKG_VERSION:=2.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22959b107a8bf443d04d6261d00074b5514dfe8
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
-PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
-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_LICENSE:=LGPL-2.1-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/libdpp/description
-  Library providing APIs for DPP EasyConnect frame generation and handling
-endef
-
-define Package/libdpp
-  TITLE:= DPP EasyConnect library (libdpp)
-  DEPENDS:= +libeasy +libopenssl +libgcrypt +libubox
-endef
-
-MAKE_PATH:=lib
-
-
-define Build/InstallDev/libdpp
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/dpp_api.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/dpputils.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/libdpp.so* $(1)/usr/lib/
-endef
-
-
-define Build/InstallDev
-	$(call Build/InstallDev/libdpp,$(1),$(2))
-endef
-
-define Package/libdpp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libdpp.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdpp))

libeasy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.0
+PKG_VERSION:=7.2.100
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fb217608830e7549d5721fd80100295e07a15dbe
+PKG_SOURCE_VERSION:=32db1b79bd88eba85a3e7518dbbbd1e29f4b06d9
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libeasy.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -50,9 +50,6 @@ define Build/InstallDev/libeasy
 	$(CP) $(PKG_BUILD_DIR)/easy.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/event.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/bufutil.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/cryptutil.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/ecc_cryptutil.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/if_utils.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/debug.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/hlist.h $(1)/usr/include/easy/

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.9
+PKG_VERSION:=1.0.8
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=5a41deb7339dd189da6a30a382c3018350a6555c
+PKG_SOURCE_VERSION:=a6a70c7259ba440f7587f4f79d29e8caecafa544
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.0.6
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=dcf0b378ff9e89f16429f1096e271385529a8122
+PKG_SOURCE_VERSION:=14e626db4e8943c100602e6e73e0b1652ff3faca
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.15
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=dc4173c8baaf59f59f27c50a3aa7c4988187e97c
+PKG_SOURCE_VERSION:=499abc3c7932bf5187bce6cabeffdc0c0f6eada8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.8
+PKG_VERSION:=7.4.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3c878eecd8404591cd139c986850b4d21efd1dea
+PKG_SOURCE_VERSION:=57348d9a901c33650ebfe8b5d8f35a0b57d12a89
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

map-agent/Config.in

@@ -52,8 +52,5 @@ config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
 	bool "Use config opt to determine if Oper Channel Report CMDU is send as relayed multicast or directly to controller"
 	default y
 
-config AGENT_USE_LIBDPP
-	bool "Depend on libdpp for DPP EasyConnect"
-
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.0.4
+PKG_VERSION:=4.3.7.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=242b73965cc3cce74de36d0ee758d98bd0640cd6
+PKG_SOURCE_VERSION:=406b484e33f5f9862f2adcc95c8e8231a7bde87c
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -28,12 +28,9 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	   +map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp
+	  +map-plugin +ip-bridge
 endef
 
-ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)
-  TARGET_CFLAGS += -DUSE_LIBDPP
-endif
 
 define Package/dynbhd
   SECTION:=utils

map-agent/files/etc/config/mapagent

@@ -1,7 +1,7 @@
 config agent 'agent'
 	option enabled '0'
 	option debug '0'
-	option profile '3'
+	option profile '4'
 	option al_bridge 'br-lan'
 	option netdev 'wlan'
 	option island_prevention '0'

map-agent/files/lib/multiap/map_genconfig

@@ -80,7 +80,6 @@ generate_multiap_config() {
 			ifprefix="wlan0%-"
 			ifname="wlan${devidx}"
 			ifname_bh="wlan${devidx}-1"
-			ap_follow_sta_dfs="1"
 		else
 			ifprefix="wlan%-"
 			ifname="wlan$devidx"
@@ -90,7 +89,6 @@ generate_multiap_config() {
 		if [ $generate_mapagent_config -eq 1 ]; then
 			uci set mapagent.agent.ifprefix="$ifprefix"
 			uci set mapagent.agent.brcm_setup="$brcm_setup"
-			uci set mapagent.agent.ap_follow_sta_dfs="$ap_follow_sta_dfs"
 			uci add mapagent radio
 			uci set mapagent.@radio[-1].device="$device"
 			uci set mapagent.@radio[-1].band="$mode_band"

map-controller/Config.in

@@ -26,9 +26,5 @@ config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 	enabled through CONTROLLER_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
-config CONTROLLER_USE_LIBDPP
-	bool "Depend on libdpp for DPP EasyConnect"
-
-
 endmenu
 endif

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.5.0.1
+PKG_VERSION:=4.3.3.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=43e993f9f42ba0d3c49e87ea3fbad0c9d827668e
+PKG_SOURCE_VERSION:=1faf0fce0d524f626638e08bd45348d11631f390
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0
@@ -27,15 +27,9 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin \
-	   +CONTROLLER_USE_LIBDPP:libdpp
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin
 endef
 
-ifeq ($(CONFIG_CONTROLLER_USE_LIBDPP),y)
-  TARGET_CFLAGS += -DUSE_LIBDPP
-endif
-
-
 define Package/map-controller/description
  This package provides WiFi MultiAP Controller as per the EasyMesh-R2 specs.
 endef

map-controller/files/etc/config/mapcontroller

@@ -1,6 +1,6 @@
 config controller 'controller'
 	option enabled '1'	# may be modified by other package start-up scripts (i.e. map-agent)
-	option profile '3'
+	option profile '4'
 	option registrar '2 5 6'
 	option debug '0'
 	option bcn_metrics_max_num '10'

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.4.13
+PKG_VERSION:=7.0.4.11
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=5f73b6ab057d31a53e1f72d9fb129d65b73cbf55
+PKG_SOURCE_VERSION:=1211494650d170cc23e7d041dd5bff260530080e
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

self-diagnostics/Makefile

@@ -1,35 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.3
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-2.0-only
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/self-diagnostics
-  CATEGORY:=Utilities
-  TITLE:=System Report
-  DEPENDS:=+@CONFIG_BUSYBOX_CONFIG_TIMEOUT +@CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PATH +@CONFIG_BUSYBOX_CONFIG_TEE \
-           +@CONFIG_BUSYBOX_CONFIG_GZIP
-endef
-
-define Package/self-diagnostics/description
-	Generate Self test diagnostics report
-endef
-
-#define Build/Prepare
-#	mkdir -p $(PKG_BUILD_DIR)
-#	$(CP) ./files/* $(PKG_BUILD_DIR)/
-#endef
-
-define Build/Compile
-endef
-
-define Package/self-diagnostics/install
-	$(INSTALL_DIR) $(1)/etc/self-diagnostics/spec/
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,self-diagnostics))

self-diagnostics/README.md

@@ -1,188 +0,0 @@
-# Self Test Diagnostics and Reports
-
-Self test diagnostics package provides a set of tools and recipes to run diagnostics/commands and collect logs.
-
-It provides a cli utility called `self-diagnostics`, which executes recipes defined in json files and collect logs.
-```bash
-# self-diagnostics -h
-Generate self diagnostics report
-
-Syntax: /usr/sbin/self-diagnostics [-m|h|l|j]
-
-Options:
-  l     List available module(s)
-  m     Generate system report of specific module(s)
-  j     Enable JSON output
-  h     Print this help
-```
-
-It also has an uci file to configure the various parameters:
-
-```bash
-# cat /etc/config/self-diagnostics
-config globals 'globals'
-        option extended_spec_dir '/etc/self-diagnostics/spec'
-        option exec_timeout '5'
-        option report_name 'self-diagnostics-report-$MODEL-$SERIAL'
-        option verbose '0'
-        option compression_level '9'
-```
-
-Here:
-
-| Options            |  Description                    |
-| ------------------ | ------------------------------- |
-| extended_spec_dir  | Directory path to store 3rd-party/user diagnostics recipes |
-| exec_timeout       | Timeout used for each command |
-| report_name        | Name of the generated report file, here $MODEL and $SERIAL replaced with ProductModel and SerialNumber |
-| verbose            | Logs everythings to logread as well |
-| commpression_level | Gzip compression_level 0-9, if not set, then report will not gziped |
-
-
-It also provide, a rpcd script to expose `self-diagnostics` over ubus
-
-```bash
-# ubus -v list self-diagnostics
-'self-diagnostics' @2c0b768d
-        "list":{}
-        "generate":{"modules":"String"}
-```
-
-## Recipe(s)
-
-It has core modules and extended modules.
-
-Core module recipes are present in `/usr/share/self-diagnostics/spec/` path, where as
-extended module recipes are defined in uci option 'self-diagnostics.globals.extended_spec_dir'
-
-Both the spec directories has recipes to run diagnostics and collect logs, these recipes are defined in json files.
-
-```bash
-# ls /usr/share/self-diagnostics/spec/
-config.json   network.json  trx69.json    wifi.json
-multiap.json  system.json   voice.json
-```
-
-Each json file need to follow below structure:
-
-```json
-{
-  "description": "<Description of module>",
-  "dependency": [
-    {
-      "type": "file",
-      "file": "<filepath>"
-    }
-  ],
-  "exec": [
-    {
-      "description": "<Description of command>",
-      "cmd": "<command To Execute>",
-      "dependency": [
-        {
-          "type": "file",
-          "file": "<filepath>"
-        }
-      ]
-    },
-    {
-      "description": "<Next command description>",
-      "cmd": "<command to execute>"
-    }
-  ]
-}
-```
-
-## How to use
-
-This can be run from command line, ubus , USP-Controller and ACS.
-
-### List available core/extension modules
-
-```bash
-# self-diagnostics -l
-
-Core Module(s):
- - config
- - multiap
- - network
- - system
- - trx69
- - voice
- - wifi
-
-Extension Module(s):
-```
-
-### Run and collect logs
-
-```bash
-# self-diagnostics
-/tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz
-```
-
-### List available core/extension modules over ubus
-
-```bash
-# ubus call self-diagnostics list
-{
-        "CoreModules": [
-                "config",
-                "multiap",
-                "network",
-                "system",
-                "trx69",
-                "voice",
-                "wifi"
-        ],
-        "ExtensionModules": [
-
-        ]
-}
-```
-
-### Run specific module from ubus
-
-```bash
-# ubus call self-diagnostics generate '{"modules":"config"}'
-{
-        "result": "/tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz"
-}
-```
-
-## TR-181 Integration
-
-
-TR-181 (USP) provides an Operate command `Device.SelfTestDiagnostics()` to execute it from USP-controllers.
-TR-181 (CWMP) provides a diagnostics object `Device.SelfTestDiagnostics.` for the same, so its can be triggered from ACS as well.
-
-```bash
-# ubus call bbfdm operate '{"command":"Device.SelfTestDiagnostics()"}'
-{
-        "results": [
-                {
-                        "path": "Device.SelfTestDiagnostics()",
-                        "data": "",
-                        "output": [
-                                {
-                                        "Results": "Device.DeviceInfo.VendorLogFile.2",
-                                        "Status": "Complete"
-                                }
-                        ]
-                }
-        ]
-}
-```
-
-
-Once the opreate command is done, it generate a new entry in VendorLogFile, like below:
-
-```bash
-# bbfdmd -c get Device.DeviceInfo.VendorLogFile.2.
-Device.DeviceInfo.VendorLogFile.2.Alias => cpe-2
-Device.DeviceInfo.VendorLogFile.2.Name => /tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz
-Device.DeviceInfo.VendorLogFile.2.MaximumSize => 0
-Device.DeviceInfo.VendorLogFile.2.Persistent => 0
-```
-
-Which is then can be uploaded to a server using `Device.DeviceInfo.VendorLogFile.{i}.Upload()` operate command.

self-diagnostics/files/etc/config/self-diagnostics

@@ -1,6 +0,0 @@
-config globals 'globals'
-	option extended_spec_dir '/etc/self-diagnostics/spec'
-	option exec_timeout '5'
-	option report_name 'self-diagnostics-report-$MODEL-$SERIAL'
-	option verbose '0'
-	option compression_level '9'

self-diagnostics/files/usr/libexec/rpcd/self-diagnostics

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-BIN="/usr/sbin/self-diagnostics"
-. /usr/share/libubox/jshn.sh
-
-case "$1" in
-	list)
-		echo '{"list": {}, "generate" : {"modules":"String"}}'
-	;;
-	call)
-		case "$2" in
-			generate)
-				read -t 1 -r input
-
-				json_load "${input}"
-				json_get_var modules modules
-				if [ -z "${modules}" ]; then
-					${BIN} -j
-				else
-					${BIN} -j -m "${modules}"
-				fi
-			;;
-			list)
-				${BIN} -j -l
-			;;
-		esac
-	;;
-esac

self-diagnostics/files/usr/sbin/self-diagnostics

@@ -1,383 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-
-JSON_OUT=0
-SPEC_DIR="/usr/share/self-diagnostics/spec"
-SPEC_EXT_DIR="/etc/self-diagnostics/spec"
-REPORT_DIR="$(mktemp -d)"
-REPORT_NAME="self-test-diagnostics"
-VERBOSE=0
-COMPOPTS=""
-TIMEOUT=5
-
-cleanup()
-{
-	[ -d "${REPORT_DIR}" ] && \
-		rm -rf ${REPORT_DIR}
-}
-
-trap cleanup EXIT
-
-help()
-{
-	echo "Generate self diagnostics report"
-	echo
-	echo "Syntax: $0 [-m|h|l|j]"
-	echo
-	echo "Options:"
-	echo "  l     List available module(s)"
-	echo "  m     Generate system report of specific module(s)"
-	echo "  j     Enable JSON output"
-	echo "  h     Print this help"
-	echo
-}
-
-log()
-{
-	log_file="${REPORT_DIR}/execution.log"
-	if [ "$VERBOSE" -eq 1 ]; then
-		logger -t $0 "$*"
-	fi
-	echo "[$(date +%Y:%m:%d-%H:%M:%S)] $*" >> ${log_file}
-}
-
-# Alias ubus to have a smaller 5-second timeout on all subsequent calls
-ubus()
-{
-	if [ "${1}" == "call" ]; then
-		if command ubus list $2 >/dev/null 2>&1; then
-			command ubus "$@";
-		fi
-	else
-		command ubus "$@";
-	fi
-
-}
-
-config_load()
-{
-	local temp
-	local MODEL SERIAL
-
-	log "# Starting Self diagnostics tests #"
-
-	MODEL="$(db get device.deviceinfo.ModelName)"
-	SERIAL="$(db get device.deviceinfo.SerialNumber)"
-
-	temp="$(uci -q get self-diagnostics.globals.extended_spec_dir)"
-	[ -d "${temp}" ] && \
-		SPEC_EXT_DIR="${temp}"
-
-	temp="$(uci -q get self-diagnostics.globals.exec_timeout)"
-	[ -n "${temp}" ] && \
-		TIMEOUT="${temp}"
-
-	temp="$(uci -q get self-diagnostics.globals.report_name)"
-	[ -n "${temp}" ] && \
-		REPORT_NAME="$(eval echo ${temp})"
-
-	REPORT_NAME="${REPORT_NAME//[ \/]/_}"
-
-	temp="$(uci -q get self-diagnostics.globals.compression_level)"
-	[ -n "${temp}" ] && \
-		COMPOPTS="${temp}"
-
-	temp="$(uci -q get self-diagnostics.globals.verbose)"
-	[ -n "${temp}" ] && \
-		VERBOSE="${temp}"
-}
-
-exec_spec()
-{
-	local json_file exec_skip name timeout exec_timeout rc
-
-	json_file="$1"
-	[ -z "$json_file" ] && {
-		log "No/invalid spec json_file"
-		return 1
-	}
-
-	log "Loading $json_file ..."
-
-	json_init
-	json_load_file "${json_file}" || {
-		log "Failed to load ${json_file} spec file"
-		return 1
-	}
-
-	name="$(basename ${json_file})"
-	export_path="${REPORT_DIR}/${name//.json/.log}"
-
-	exec_skip=0
-	if json_is_a dependency array; then
-		json_select "dependency"
-		json_get_keys ekeys
-
-		for key in $ekeys; do
-			if json_is_a $key object; then
-				json_select $key
-				json_get_var type type
-
-				if [ "$type" == "file" ]; then
-					json_get_var file file
-					if [ ! -e "$file" ]; then
-						log "${json_file} has unmet file dependency $file"
-						exec_skip=1
-						json_select ..
-						continue
-					fi
-				fi
-				json_select ..
-			fi
-		done
-		json_select ..
-	fi
-
-	[ "${exec_skip}" -eq 1 ] && {
-		log "Dependency not satisfied for ${json_file}"
-		return 0
-	}
-
-	json_get_var description description
-	log "Description: $description"
-
-	if json_is_a exec array; then
-		json_select "exec"
-		json_get_keys keys
-
-		for key in $keys; do
-			if json_is_a $key object; then
-				json_select $key
-				cmd_skip=0
-				if json_is_a dependency array; then
-					json_select "dependency"
-					json_get_keys d_keys
-
-					for d_key in $d_keys; do
-						if json_is_a $d_key object; then
-							json_select $d_key
-							json_get_var type type
-							if [ "$type" == "file" ]; then
-								json_get_var file file
-								if [ ! -e $file ]; then
-									json_select ..
-									cmd_skip=1
-									continue
-								fi
-							fi
-							json_select ..
-						fi
-					done
-					json_select ..
-				fi
-
-				[ $cmd_skip -eq 1 ] && {
-					json_select ..
-					log "Dependency not satisfied for ${file}"
-					continue
-				}
-
-				json_get_var description description
-				json_get_var cmd cmd
-				json_get_var timeout timeout
-
-				if [ -n "$timeout" ]; then
-					exec_timeout=$timeout
-				else
-					exec_timeout=$TIMEOUT
-				fi
-				log "Executing $cmd with timeout $exec_timeout"
-				echo "##########################################" >> $export_path
-				echo "# $description #">> $export_path
-				echo "# Exec [$cmd], timeout [$exec_timeout] #" >> $export_path
-				echo "##########################################" >> $export_path
-				if [ "$VERBOSE" -eq 1 ]; then
-					if [[ "$cmd" == *"logread "* ]]; then
-						eval timeout ${exec_timeout} $cmd 2>&1 | tee -a $export_path
-						rc=$?
-					else
-						eval timeout ${exec_timeout} $cmd 2>&1 | tee -a $export_path | logger -t self-diagnostics
-						rc=$?
-					fi
-				else
-					eval timeout ${exec_timeout} $cmd >> $export_path 2>&1
-					rc=$?
-				fi
-				echo "######## Execution return code $rc ######" >> $export_path
-
-				if [ "$rc" -eq 0 ]; then
-					log "Execution [$cmd] completed"
-				else
-					log "Execution [$cmd] Failed/Timeout with $rc exit code"
-				fi
-
-				echo >> $export_path
-				json_select ..
-			fi
-		done
-		json_select ..
-	fi
-
-	log "Handling of $json_file done"
-	log ""
-}
-
-generate_module()
-{
-	local modules="${@}"
-	local file module
-
-	config_load
-
-	log "Modules [$@]"
-	for module in $modules; do
-		module="${module/.json/}"
-		file="$(find $SPEC_DIR -type f -name ${module}.json)"
-		[ -z "$file" ] && {
-			[ -d "${SPEC_EXT_DIR}" ] && \
-				file="$(find $SPEC_EXT_DIR -type f -name ${module}.json)"
-		}
-
-		[ -f "$file" ] && \
-			exec_spec "$file"
-	done
-}
-
-generate_all()
-{
-	local files
-
-	config_load
-
-	files="$(find ${SPEC_DIR} -type f -name *.json)"
-	[ -d "${SPEC_EXT_DIR}" ] && \
-		files="${files} $(find $SPEC_EXT_DIR -type f -name *.json)"
-
-	[ -z "$files" ] && {
-		return 0
-	}
-
-	for file in $files; do
-		exec_spec "$file"
-	done
-
-}
-
-list_modules()
-{
-	local files
-
-	if [ "${JSON_OUT}" -eq 1 ]; then
-		json_init
-		json_add_array "CoreModules"
-	else
-		echo
-		echo "Core Module(s):"
-	fi
-
-	cd ${SPEC_DIR} && {
-		for file in $(ls); do
-			if [ "${JSON_OUT}" -eq 1 ]; then
-				json_add_string "" "${file/.json/}"
-			else
-				echo " - ${file/.json/}"
-			fi
-		done
-	}
-
-	if [ "${JSON_OUT}" -eq 1 ]; then
-		json_close_array
-		json_add_array "ExtensionModules"
-	else
-		echo
-		echo "Extension Module(s):"
-	fi
-
-	cd ${SPEC_EXT_DIR} && {
-		for file in $(ls); do
-			if [ "${JSON_OUT}" -eq 1 ]; then
-				json_add_string "" "${file/.json/}"
-			else
-				echo " - ${file/.json/}"
-			fi
-		done
-	}
-
-	if [ "${JSON_OUT}" -eq 1 ]; then
-		json_close_array
-		json_dump
-	else
-		echo
-	fi
-}
-
-generate_report()
-{
-	local filename report_path
-
-	report_path="$(dirname "${REPORT_DIR}")"
-	filename="${report_path}/${REPORT_NAME}"
-
-	[ -f "${filename}.tar" ] && rm "${filename}.tar"
-	[ -f "${filename}.tar.gz" ] && rm "${filename}.tar.gz"
-
-	log "# Report generation completed #"
-	cd ${REPORT_DIR} && {
-		filename="${filename}.tar"
-		tar -cf "${filename}" *
-	}
-
-	rm -r "$REPORT_DIR"
-
-	if [ -n "$COMPOPTS" ]; then
-		gzip -${COMPOPTS} -f "${filename}"
-		filename="${filename}.gz"
-	fi
-
-	if [ "${JSON_OUT}" -eq 1 ]; then
-		json_init
-		json_add_string result "${filename}"
-		json_dump
-	else
-		echo "${filename}"
-	fi
-}
-
-[ ! -d "${SPEC_DIR}" ] && {
-	log "# ${SPEC_DIR} does not exits"
-	exit 1
-}
-
-list=0
-modules=""
-
-while getopts "m:hlj" opts; do
-	case $opts in
-		h)
-			help
-			exit;;
-		j)
-			JSON_OUT=1
-			;;
-		l)
-			list=1
-			;;
-		m)
-			modules="$modules ${OPTARG}"
-			;;
-	esac
-done
-
-if [ "${list}" -eq 1 ]; then
-	list_modules
-	exit 0
-fi
-
-if [ -z "${modules}" ]; then
-	generate_all
-else
-	generate_module ${modules}
-fi
-
-generate_report

self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_assoclist.sh

@@ -1,11 +0,0 @@
-interfaces=$(uci show wireless | grep "ifname=" |  awk -F'[.,=]' '{print$2}')
-for int in $interfaces; do
-	mode=$(uci get "wireless.${int}.mode")
-	if [ "$mode" = "ap" ] ; then
-		ap_int=$(uci get "wireless.${int}.ifname")
-		echo "Get assoc list for ${ap_int}"
-		ubus call "wifi.ap.${ap_int}" assoclist
-		echo "Get station info for ${ap_int}"
-		ubus call "wifi.ap.${ap_int}" stations
-	fi
-done

self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_radio_scan.sh

@@ -1,5 +0,0 @@
-for radio_if in $(ubus list 'wifi.radio.*'); do
-	ubus call "${radio_if}" scan
-	sleep 2
-	ubus call "${radio_if}" scanresults
-done

self-diagnostics/files/usr/share/self-diagnostics/spec/config.json

@@ -1,29 +0,0 @@
-{
-	"description": "Gathering configuration data",
-	"exec" : [
-		{
-			"description": "OS Release",
-			"cmd": "cat /etc/os-release"
-		},
-		{
-			"description": "Installed Packages",
-			"cmd": "opkg list-installed"
-		},
-		{
-			"description": "Database",
-			"cmd": "db export"
-		},
-		{
-			"description": "Configuration",
-			"cmd": "uci export"
-		},
-		{
-			"description": "Runtime Configuration",
-			"cmd": "cat /var/state/*"
-		},
-		{
-			"description": "Firmware Environment",
-			"cmd": "fw_printenv"
-		}
-	]
-}

self-diagnostics/files/usr/share/self-diagnostics/spec/multiap.json

@@ -1,71 +0,0 @@
-{
-	"description": "Gathering EasyMesh state",
-	"dependency" : [
-		{
-			"type": "file",
-			"file": "/etc/config/mapagent"
-		},
-		{
-			"type": "file",
-			"file": "/etc/config/ieee1905"
-		}
-	],
-	"exec" : [
-		{
-			"description": "Hosts Show",
-			"cmd": "ubus call hosts show"
-		},
-		{
-			"description": "Hosts Dump",
-			"cmd": "ubus call hosts dump"
-		},
-		{
-			"description": "IEEE1905 Info",
-			"cmd": "ubus call ieee1905 info"
-		},
-		{
-			"description": "IEEE1905 Links",
-			"cmd": "ubus call ieee1905 links"
-		},
-		{
-			"description": "IEEE1905 Neighbors",
-			"cmd": "ubus call ieee1905 neighbors"
-		},
-		{
-			"description": "IEEE1905 Others",
-			"cmd": "ubus call ieee1905 others"
-		},
-		{
-			"description": "IEEE1905 Topology",
-			"cmd": "ubus call ieee1905.topology dump"
-		},
-		{
-			"description": "MAP Agent Info",
-			"cmd": "ubus call map.agent info"
-		},
-		{
-			"description": "MAP Agent Status",
-			"cmd": "ubus call map.agent status"
-		},
-		{
-			"description": "MAP Agent Backhaul Info",
-			"cmd": "ubus call map.agent backhaul_info"
-		},
-		{
-			"description": "MAP Controller Status",
-			"cmd": "ubus call map.controller status"
-		},
-		{
-			"description": "MAP Controller List MACs",
-			"cmd": "ubus call map.controller.dbg list_macs"
-		},
-		{
-			"description": "MAP Controller BH Topology Dump",
-			"cmd": "ubus call map.controller.dbg bh_topology_dump"
-		},
-		{
-			"description": "Data Elements Dump",
-			"cmd": "ubus call wifi.dataelements.collector refresh; sleep 2; ubus call wifi.dataelements.collector dump2"
-		}
-	]
-}

self-diagnostics/files/usr/share/self-diagnostics/spec/network.json

@@ -1,89 +0,0 @@
-{
-	"description": "Gathering network state",
-	"exec" : [
-		{
-			"description": "Network Device Status",
-			"cmd": "ubus call network.device status"
-		},
-		{
-			"description": "Network Interface Dump",
-			"cmd": "ubus call network.interface dump"
-		},
-		{
-			"description": "Linux Network Interface Config",
-			"cmd": "ifconfig -a"
-		},
-		{
-			"description": "IPv4 Routes",
-			"cmd": "ip -d r"
-		},
-		{
-			"description": "IPv6 Routes",
-			"cmd": "ip -d -6 r"
-		},
-		{
-			"description": "Neighbor Table",
-			"cmd": "ip n"
-		},
-		{
-			"description": "ARP Table",
-			"cmd": "cat /proc/net/arp"
-		},
-		{
-			"description": "Conntrack Table",
-			"cmd": "cat /proc/net/nf_conntrack"
-		},
-		{
-			"description": "Network Interface Status",
-			"cmd": "ip -d a"
-		},
-		{
-			"description": "IPv4 Firewall Status",
-			"cmd": "iptables -xvnL"
-		},
-		{
-			"description": "IPv6 Firewall Status",
-			"cmd": "ip6tables -xvnL"
-		},
-		{
-			"description": "Bridge Info",
-			"cmd": "brctl show"
-		},
-		{
-			"description": "Bridge Link",
-			"cmd": "bridge link"
-		},
-		{
-			"description": "Bridge VLAN",
-			"cmd": "bridge vlan"
-		},
-		{
-			"description": "Bridge FDB",
-			"cmd": "bridge fdb"
-		},
-		{
-			"description": "TCP listened ports",
-			"cmd": "netstat -tlnp"
-		},
-		{
-			"description": "UDP listened ports",
-			"cmd": "netstat -ulnp"
-		},
-		{
-			"description": "MAC layer firewall status list",
-			"cmd": "ebtables -L"
-		},
-		{
-			"description": "MAC layer firewall status",
-			"cmd": "ebtables -t broute -L"
-		},
-		{
-			"description": "QoS queue stats",
-			"cmd": "ubus call qos queue_stats"
-		},
-		{
-			"description": "IGMP Snooping Table",
-			"cmd": "ubus call mcast stats"
-		}
-	]
-}

self-diagnostics/files/usr/share/self-diagnostics/spec/system.json

@@ -1,67 +0,0 @@
-{
-	"description": "Gathering system information",
-	"exec" : [
-		{
-			"description": "Firmware banks",
-			"cmd": "ubus call fwbank dump"
-		},
-		{
-			"description": "System Info",
-			"cmd": "ubus call system info"
-		},
-		{
-			"description": "Board Info",
-			"cmd": "ubus call system board"
-		},
-		{
-			"description": "Running Processes",
-			"cmd": "top -b -n 1"
-		},
-		{
-			"description": "Kernel Parameters",
-			"cmd": "sysctl -A  2>/dev/null"
-		},
-		{
-			"description": "System Log",
-			"cmd": "timeout 5 logread -l 1000"
-		},
-		{
-			"description": "Driver Message",
-			"cmd": "timeout 5 dmesg"
-		},
-		{
-			"description": "PCI Devices",
-			"cmd": "lspci -k"
-		},
-		{
-			"description": "Installed Modules",
-			"cmd": "lsmod"
-		},
-		{
-			"description": "CPU Info",
-			"cmd": "cat /proc/cpuinfo"
-		},
-		{
-			"description": "Memory Info",
-			"cmd": "cat /proc/meminfo"
-		},
-		{
-			"description": "Slab Info",
-			"cmd": "cat /proc/slabinfo"
-		},
-		{
-			"description": "eMMC Partition/Volume Info",
-			"cmd": "fdisk -l",
-			"dependency" : {
-				"file": "/sbin/fdisk"
-			}
-		},
-		{
-			"description": "NAND Partition/Volume Info",
-			"cmd": "ubinfo --all",
-			"dependency" : {
-				"file": "/usr/sbin/ubinfo"
-			}
-		}
-	]
-}

self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json

@@ -1,56 +0,0 @@
-{
-	"description": "Gathering TR-x69 state",
-	"dependency" : [
-		{
-			"type": "file",
-			"file": "/etc/config/cwmp"
-		}
-	],
-	"exec" : [
-		{
-			"description": "TR-181 DM MAP",
-			"cmd": "uci -c /etc/bbfdm/dmmap export"
-		},
-		{
-			"description": "TR-181 Parameters via BBFDM",
-			"cmd": "bbfdmd -c get Device."
-		},
-		{
-			"description": "TR-181 Parameters via CWMP",
-			"cmd": "icwmpd -c get Device."
-		},
-		{
-			"description": "TR-069 status",
-			"cmd": "ubus call tr069 status"
-		},
-		{
-			"description": "TR-069 Logs",
-			"cmd": "cat /var/log/icwmpd.log",
-			"dependency" : [
-				{
-					"type": "file",
-					"file": "/var/log/icwmpd.log"
-				}
-			]
-		},
-		{
-			"description": "TR-181 Parameters via USP",
-			"cmd": "obuspa -c get Device.",
-			"timeout": 10
-		},
-		{
-			"description": "USP Agent Database",
-			"cmd": "obuspa -f $(uci -q get obuspa.global.db_file) -c show database"
-		},
-		{
-			"description": "USP Logs",
-			"cmd": "cat /var/log/obuspa.log",
-			"dependency" : [
-				{
-					"type": "file",
-					"file": "/var/log/obuspa.log"
-				}
-			]
-		}
-	]
-}

self-diagnostics/files/usr/share/self-diagnostics/spec/voice.json

@@ -1,43 +0,0 @@
-{
-	"description": "Gathering Voice state",
-	"dependency" : [
-		{
-			"type": "file",
-			"file": "/etc/config/asterisk"
-		}
-	],
-	"exec" : [
-		{
-			"description": "Endpoint Status",
-			"cmd": "ubus call endpt status"
-		},
-		{
-			"description": "Endpoint Count",
-			"cmd": "ubus call endpt count"
-		},
-		{
-			"description": "Voice Status",
-			"cmd": "ubus call voice.asterisk status"
-		},
-		{
-			"description": "DECT Status",
-			"cmd": "ubus call dect status",
-			"dependency" : [
-				{
-					"type": "file",
-					"file": "/etc/config/dect"
-				}
-			]
-		},
-		{
-			"description": "DECT Handsets",
-			"cmd": "ubus call dect handsets",
-			"dependency" : [
-				{
-					"type": "file",
-					"file": "/etc/config/dect"
-				}
-			]
-		}
-	]
-}

self-diagnostics/files/usr/share/self-diagnostics/spec/wifi.json

@@ -1,31 +0,0 @@
-{
-	"description": "Gathering WiFi state",
-	"dependency" : [
-		{
-			"type": "file",
-			"file": "/sys/class/ieee80211"
-		}
-	],
-	"exec" : [
-		{
-			"description": "Wireless Status",
-			"cmd": "ubus call network.wireless status"
-		},
-		{
-			"description": "Wireless Radio Status",
-			"cmd": "ubus call wifi status"
-		},
-		{
-			"description": "Get radio scan",
-			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_radio_scan.sh"
-		},
-		{
-			"description": "Get Assoc List",
-			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_assoclist.sh"
-		},
-		{
-			"description": "iwinfo interface details",
-			"cmd": "/usr/bin/iwinfo"
-		}
-	]
-}

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=3.1.26
+PKG_VERSION:=3.1.21
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=403f4513a19e80ae5c753d40e37a2b6d1843376e
+PKG_SOURCE_VERSION:=b52092230833fffdec881ed1b91386399f5e2310
 PKG_MIRROR_HASH:=skip
 
 SULU_MOD:=core

sulu/sulu-builder/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=3.1.26
+PKG_VERSION:=3.1.21
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=7e39aba959cd01e518ad039729ac807dcb25bd1e
+PKG_SOURCE_VERSION:=eb44f85f1a819f4d5fd6e74d7e2dfd7011381c63
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION)

sulu/sulu-lcm/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-lcm
-PKG_VERSION:=3.1.24
+PKG_VERSION:=3.1.21
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=403c646c21a323cff9ed628c4d74c15445557663
+PKG_SOURCE_VERSION:=acb0853935ff1f465bb8dc0108b52b26029a61a1
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

sulu/sulu-multi-ap/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=3.1.26
+PKG_VERSION:=3.1.21
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=64d47ff721a197c2cf757df8885a0c109cbb7cd3
+PKG_SOURCE_VERSION:=e9a6d5e8e14b59afb588140b2f7ff4367c361f84
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

sulu/sulu-parental-control/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=3.1.23
+PKG_VERSION:=3.1.21
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=4c27c3c8e6220d41992d51fb7b400c0d8a90a4ae
+PKG_SOURCE_VERSION:=ac898cf7c1d03eff29991d3850ba0911d803c06f
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

timemngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=timemngr
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=5fd5bb7a94ffba689c1d73502ec564b67394aaef
+PKG_SOURCE_VERSION:=b90e33743155735f8df9e86f2e053fed7601adb2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.5
+PKG_VERSION:=1.2.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=46be05288cf5645cf24d25dbbe038cf37de5d320
+PKG_SOURCE_VERSION:=58c29e91659e79413048b1fd4d8724b89426846d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

voicemngr/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.0.12
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
@@ -19,7 +19,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=e09bf00b37fd987018c590a61f0021d403fb90cf
+PKG_SOURCE_VERSION:=774409486a4afdcff5ca0d31c1a2f8088bd55015
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=16.1.5
+PKG_VERSION:=16.1.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6f5a9f55dadb1dd2a366f954f1ab152b50fae9b9
+PKG_SOURCE_VERSION:=91f7746b618c9eb259b9a3d030aad92cb21b1b9b
 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

xmppc/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.3
+PKG_VERSION:=2.2.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=23a7f6005b84fc4d4a1432057ecd2b5a74f9ea3e
+PKG_SOURCE_VERSION:=205d6879807b40c184c457df3cc841440515731b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -35,7 +35,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api +@CONFIG_BUSYBOX_CONFIG_PIDOF
+  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api
 endef
 
 define Package/$(PKG_NAME)/description

xmppc/files/etc/config/xmpp

@@ -1,5 +1,37 @@
 
 config xmpp 'xmpp'
+	option conn_req_connection 'connection_1'
+	option allowed_jid ''
 	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
 	option loglevel '3'
 
+config connection 'connection_1'
+	option enable '0'
+	option username ''
+	option password ''
+	option domain 	''
+	option resource ''
+	option usetls '0'
+	option interval '30'
+	option attempt '16'
+	option initial_retry_interval '1'
+	option retry_interval_multiplier '1000'
+	option retry_max_interval '1'
+	option serveralgorithm 'DNS-SRV'
+	
+config connection_server 'connection_1_srv_1'
+	option con_name 'connection_1'
+	option enable '0'
+	option priority '0'
+	option weight '-1'
+	option port '5222'
+	option server_address ''
+
+config connection_server 'connection_1_srv_2'
+	option con_name 'connection_1'
+	option enable '0'
+	option priority '0'
+	option weight '-1'
+	option port '5222'
+	option server_address ''
+

xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp

@@ -17,8 +17,5 @@ PROTO="$(uci -q get network."${INTERFACE}".proto)"
 IFNAME="$(uci -q get network."${INTERFACE}".ifname)"
 [ "${IFNAME:0:1}" = "@" ] && exit 0
 
-# reload xmppc if not running already
-if ! pidof xmppc; then
-	/etc/init.d/xmppc reload &
-fi
+/etc/init.d/xmppc reload &
 

xmppc/files/etc/init.d/xmppc

@@ -9,12 +9,12 @@ PROG="/usr/sbin/xmppc"
 start_service() {
 	local con_name=$(uci -q get xmpp.xmpp.conn_req_connection)
 	local con_enable=$(uci -q get xmpp."${con_name}".enable)
-
-	procd_open_instance
 	if [ "$con_enable" = "1" ]; then
+		procd_open_instance
 		procd_set_param command "$PROG"
+		procd_set_param respawn "3" "7" "0"
+		procd_close_instance
 	fi
-	procd_close_instance
 }
 
 reload_service() {