bbfdm: delete config section with SetSSID remove

(cherry picked from commit 65fbf9958d)

bbfdm/Config_bbfdm.in

@@ -1,3 +1,7 @@
+config BBF_VENDOR_EXTENSION
+	bool "Enable Vendor Extension"
+	default y
+
 config BBF_VENDOR_LIST
 	string "Vendor List"
 	default "iopsys"

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.5.9
+PKG_VERSION:=1.4.23.15
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=147168fcd5f5b5e9f648c28b936e69562ac8964c
+PKG_SOURCE_VERSION:=3007f6fc86e84b6b460dbea0bf77c4cf522d06c1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,7 +21,6 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-include bbfdm.mk
 
 define Package/libbbfdm-api
   SECTION:=utils
@@ -32,13 +31,45 @@ define Package/libbbfdm-api
   ABI_VERSION:=1.0
 endef
 
-define Package/libbbfdm
+define Package/libbbfdm/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
-	    +BBF_TR471:obudpst +libopenssl
+	    +BBF_TR471:obudpst
+endef
+
+define Package/libbbfdm
+  $(Package/libbbfdm/default)
+  TITLE += (default)
+  VARIANT:=default
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  DEFAULT_VARIANT:=1
+endef
+
+define Package/libbbfdm-mbedtls
+  $(Package/libbbfdm/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
+  VARIANT:=mbedtls
+  CONFLICTS := libbbfdm libbbfdm-openssl libbbfdm-wolfssl
+endef
+
+define Package/libbbfdm-openssl
+  $(Package/libbbfdm/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  VARIANT:=openssl
+  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-wolfssl
+endef
+
+define Package/libbbfdm-wolfssl
+  $(Package/libbbfdm/default)
+  TITLE += (wolfssl)
+  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
+  VARIANT:=wolfssl
+  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-openssl
 endef
 
 define Package/bbfdmd
@@ -46,7 +77,9 @@ define Package/bbfdmd
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +PACKAGE_libbbfdm-mbedtls:libbbfdm-mbedtls \
+		   +PACKAGE_libbbfdm-openssl:libbbfdm-openssl +PACKAGE_libbbfdm-wolfssl:libbbfdm-wolfssl \
+		   +PACKAGE_libbbfdm:libbbfdm
 endef
 
 define Package/userinterface
@@ -92,11 +125,33 @@ CMAKE_OPTIONS += \
 	-DBBF_TR471=ON
 endif
 
+ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
+CMAKE_OPTIONS += \
+	-DBBF_VENDOR_EXTENSION=ON
+
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
 	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
 
+endif ##CONFIG_BBF_VENDOR_EXTENSION
+
+ifeq ($(BUILD_VARIANT),default)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),openssl)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),wolfssl)
+CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+endif
+
 ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
 CMAKE_OPTIONS += \
 	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
@@ -107,7 +162,7 @@ define Package/libbbfdm-api/install
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
 endef
 
-define Package/libbbfdm/install
+define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
@@ -120,9 +175,6 @@ define Package/libbbfdm/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/99-link-core-plugins $(1)/etc/uci-defaults/99-link-core-plugins
 	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
 	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
-ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
-	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so)
-endif	
 ifeq ($(CONFIG_BBF_TR143),y)
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
@@ -131,7 +183,7 @@ ifeq ($(CONFIG_BBF_TR143),y)
 endif
 endef
 
-define Package/libbbfdm/prerm
+define Package/libbbfdm/default/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
@@ -164,16 +216,36 @@ define Package/userinterface/install
 	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
 endef
 
+Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
+
+Package/libbbfdm/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/tr181/device.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/vendor.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	# Work around for backward compatibility
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbf_api/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/libbbfdm_api.h $(1)/usr/include/libbbf_api.h
 endef
 
 $(eval $(call BuildPackage,libbbfdm-api))
 $(eval $(call BuildPackage,libbbfdm))
+$(eval $(call BuildPackage,libbbfdm-openssl))
+$(eval $(call BuildPackage,libbbfdm-wolfssl))
+$(eval $(call BuildPackage,libbbfdm-mbedtls))
 $(eval $(call BuildPackage,bbfdmd))
 
 $(eval $(call BuildPackage,userinterface))

bbfdm/files/etc/firewall.portmap

@@ -2,71 +2,40 @@
 
 . /lib/functions.sh
 
-log() {
-	echo "${@}"|logger -t firewall.dnat -p info
-}
-
-exec_cmd() {
-	if ! eval "$*"; then
-		log "Failed to run [$*]"
-	fi
-}
-
 reorder_dnat_rules() {
 	nat_chains=$(iptables -t nat -S | grep -E "^-N zone[a-zA-Z0-9_]+prerouting$" | cut -d' ' -f 2)
 
 	for chain in ${nat_chains}; do
 		# Collect empty remote host & empty dport rules
 		EMPTY_HOST_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep -v "\-s ")
-		if [ -n "${EMPTY_HOST_PORT}" ]; then
-			echo "${EMPTY_HOST_PORT}" | while read cmd; do
-				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
-				exec_cmd $cmd1
-			done
-		fi
 
 		# Collect empty remote host but non empty dport rules
 		EMPTY_HOST=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep "\-\-dport" | grep -v "\-s ")
-		if [ -n "${EMPTY_HOST}" ]; then
-			echo "${EMPTY_HOST}" | while read cmd; do
-				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
-				exec_cmd $cmd1
-			done
-		fi
 
 		# Collect non empty remote host but empty dport rules
 		EMPTY_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep "\-s ")
-		if [ -n "${EMPTY_PORT}" ]; then
-			echo "${EMPTY_PORT}" | while read cmd; do
-				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
-				exec_cmd $cmd1
-			done
-		fi
 
-		# Now add rules as per datamodel precedence shown below
-		## Non empty remote host, empty dport
-		## empty remote host, non empty dport
-		## empty remote host, empty dport
-		if [ -n "${EMPTY_PORT}" ]; then
-			echo "${EMPTY_PORT}" | while read cmd; do
-				cmd1="iptables -t nat $(echo $cmd)"
-				exec_cmd $cmd1
-			done
-		fi
+		# Skip this chain if no matching rules were found
+		[ -n "${EMPTY_HOST_PORT}" -o -n "${EMPTY_HOST}" -o -n "${EMPTY_PORT}" ] || continue
 
-		if [ -n "${EMPTY_HOST}" ]; then
-			echo "${EMPTY_HOST}" | while read cmd; do
-				cmd1="iptables -t nat $(echo $cmd)"
-				exec_cmd $cmd1
-			done
-		fi
+		(
+			echo '*nat'
 
-		if [ -n "${EMPTY_HOST_PORT}" ]; then
-			echo "${EMPTY_HOST_PORT}" | while read cmd; do
-				cmd1="iptables -t nat $(echo $cmd)"
-				exec_cmd $cmd1
-			done
-		fi
+			# Delete collected rules
+			[ -n "${EMPTY_HOST_PORT}" ] && echo "${EMPTY_HOST_PORT}" | sed 's/^-A /-D /'
+			[ -n "${EMPTY_HOST}" ] && echo "${EMPTY_HOST}" | sed 's/^-A /-D /'
+			[ -n "${EMPTY_PORT}" ] && echo "${EMPTY_PORT}" | sed 's/^-A /-D /'
+
+			# Now add rules as per datamodel precedence shown below
+			## Non empty remote host, empty dport
+			## empty remote host, non empty dport
+			## empty remote host, empty dport
+			[ -n "${EMPTY_PORT}" ] && echo "${EMPTY_PORT}"
+			[ -n "${EMPTY_HOST}" ] && echo "${EMPTY_HOST}"
+			[ -n "${EMPTY_HOST_PORT}" ] && echo "${EMPTY_HOST_PORT}"
+
+			echo 'COMMIT'
+		) | iptables-restore -w -n
 	done
 }
 

bbfdm/files/etc/firewall.service

@@ -7,7 +7,7 @@ log() {
 }
 
 exec_cmd() {
-	if ! eval "$*"; then
+	if ! "$@"; then
 		log "Failed to run [$*]"
 		echo "-1"
 		return 0
@@ -73,7 +73,7 @@ add_iptable_rule() {
 		fi
 
 		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd "iptables ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
+			res=$(exec_cmd iptables -w ${cmd} -m comment --comment IPtables_service_rule -j "${action}")
 		else
 			#Add ipv4 sources if any
 			src_list=""
@@ -86,7 +86,7 @@ add_iptable_rule() {
 
 			if [ -n "$src_list" ]; then
 				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd "iptables -s $src_list ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
+				res=$(exec_cmd iptables -w -s "$src_list" ${cmd} -m comment --comment IPtables_service_rule -j "${action}")
 			fi
 		fi
 	fi
@@ -97,7 +97,7 @@ add_iptable_rule() {
 		fi
 
 		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd "ip6tables ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
+			res=$(exec_cmd ip6tables -w ${cmd} -m comment --comment IP6tables_service_rule -j "${action}")
 		else
 			#Add ipv6 sources if any
 			src_list=""
@@ -110,7 +110,7 @@ add_iptable_rule() {
 
 			if [ -n "$src_list" ]; then
 				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd "ip6tables -s $src_list ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
+				res=$(exec_cmd ip6tables -w -s "$src_list" ${cmd} -m comment --comment IP6tables_service_rule -j "${action}")
 			fi
 		fi
 	fi

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.5
+PKG_VERSION:=2.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=f03fb8682aa7efe760294e54c422f2eab856e08c
+PKG_SOURCE_VERSION:=f556410b51a2248f11358793f11ae54d3e53e85e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

capiagent/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=capiagent
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=136cab3a9f1eec0132db9fa3f7bb1c8748ce1449
+PKG_SOURCE_VERSION:=3e671db8f567b19c109fc13b25bc571c4c73a962
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/capiagent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/capiagent
   TITLE+= capiagent (daemon implementing Wi-Fi Alliance's CAPI commands)
   DEPENDS= +libubox +libuci +libubus +libnl-genl +libeasy +libwifi \
-	   +libjson-c +libblobmsg-json +ubus +libieee1905 +libwifiutils
+	   +libjson-c +libblobmsg-json +ubus +libieee1905
 endef
 
 define Package/capiagent/description

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.2.1.2
+PKG_VERSION:=4.2.1.1.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=58be2803c9cfbb365ea6eae6f33d31391599a482
+PKG_SOURCE_VERSION:=7e75bf1fc5fa328d91c071f1f243df6951bb397e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -29,7 +29,7 @@ define Package/decollector
   CATEGORY:=Utilities
   TITLE:=WiFi DataElements Collector Proxy
   DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \
-	   +libeasy +libwifiutils +libieee1905 +ieee1905-map-plugin
+	   +libeasy +libwifiutils +libieee1905 +map-plugin
 endef
 
 define Package/decollector/description

dectmngr/Makefile

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

ethmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.2
+PKG_VERSION:=2.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e5cccdd45a93d969d51c4085cb52b543df544811
+PKG_SOURCE_VERSION:=5b40a8167d3e0e5c8fc9229abccd5c6acecbe814
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -26,7 +26,7 @@ define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/ethmngr/description

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3fad612eeb849b1b8ecd58e747124c0033aaeeb2
+PKG_SOURCE_VERSION:=79a6649995752da3501808debeed9e3ddfdf4d59
 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
@@ -31,8 +31,7 @@ define Package/hostmngr
   DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
 	   +libnetfilter-conntrack \
-	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api \
-	   +libwifiutils
+	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api
 
 endef
 
@@ -58,7 +57,7 @@ endif
 MAKE_PATH:=src
 
 define Package/hostmngr/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/etc $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/hostmngr/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.6.2
+PKG_VERSION:=9.5.29.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=3e2d5bd86e82a24ab5027cba0f6ebb54b5a0c54e
+PKG_SOURCE_VERSION:=27231b20dc75075786efa5a122bdefab93669bc9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -26,21 +26,68 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include ../bbfdm/bbfdm.mk
 
-define Package/icwmp
+define Package/icwmp/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api
 endef
 
+define Package/icwmp
+  $(Package/icwmp/default)
+  VARIANT:=default
+  DEFAULT_VARIANT:=1
+  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
+endef
+
+define Package/icwmp-openssl
+  $(Package/icwmp/default)
+  TITLE += (openssl)
+  VARIANT:=openssl
+  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
+  CONFLICTS := icwmp icwmp-mbedtls icwmp-wolfssl
+endef
+
+define Package/icwmp-wolfssl
+  $(Package/icwmp/default)
+  TITLE += (wolfssl)
+  VARIANT:=wolfssl
+  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
+  CONFLICTS := icwmp icwmp-mbedtls icwmp-openssl
+endef
+
+define Package/icwmp-mbedtls
+  $(Package/icwmp/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_icwmp-mbedtls:libmbedtls
+  VARIANT:=mbedtls
+  CONFLICTS := icwmp icwmp-wolfssl icwmp-openssl
+endef
+
+ifeq ($(BUILD_VARIANT),default)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),openssl)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),wolfssl)
+CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-define Package/icwmp/install
+define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
@@ -62,4 +109,12 @@ define Package/icwmp/install
 	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libcwmpdm.so)
 endef
 
+Package/icwmp/install = $(Package/icwmp/default/install)
+Package/icwmp-openssl/install = $(Package/icwmp/default/install)
+Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
+Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
+
 $(eval $(call BuildPackage,icwmp))
+$(eval $(call BuildPackage,icwmp-openssl))
+$(eval $(call BuildPackage,icwmp-wolfssl))
+$(eval $(call BuildPackage,icwmp-mbedtls))

icwmp/files/etc/config/cwmp

@@ -21,7 +21,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 'DEBUG'
+	option log_severity 'ERROR'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER

icwmp/files/etc/init.d/icwmpd

@@ -436,14 +436,13 @@ validate_cpe_section()
 		'notification:bool' \
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
-		'enable:bool:1' \
+		'enable:bool' \
 		'periodic_notify_interval:uinteger' \
 		'fw_upgrade_keep_settings:bool'
 }
 
 validate_defaults() {
-	local ssl_capath enable url dhcp_url
-
+	local ssl_capath
 	config_load cwmp
 
 	validate_acs_section || {
@@ -451,11 +450,6 @@ validate_defaults() {
 		return 1;
 	}
 
-	if [ -z "${url}" ] && [ -z "${dhcp_url}" ]; then
-		log "No ACS URL is configured"
-		return 1
-	fi
-
 	ssl_capath="${ssl_capath%/}"
 	# Put the cert pem file in keep list
 	if [ -d "${ssl_capath}" ]; then
@@ -471,11 +465,6 @@ validate_defaults() {
 		return 1;
 	}
 
-	if [ "$enable" = "0" ]; then
-		log "CWMP service disabled"
-		return 1
-	fi
-
 	return 0;
 }
 
@@ -523,17 +512,30 @@ boot() {
 }
 
 start_service() {
+	local enable_cwmp url dhcp_url
+
+	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+	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_set_param command "$PROG"
-	procd_append_param command -b
+	if [ -n "${url}" ] || [ -n "${dhcp_url}" ]; then
+		procd_set_param command "$PROG"
+		procd_append_param command -b
+	fi
 
 	procd_set_param respawn \
 		"${respawn_threshold:-5}" \
@@ -550,14 +552,16 @@ stop_service()
 reload_service() {
 	local ret
 
+	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+
 	log "Reload service $ret"
 	ret="0"
-
-	validate_defaults || {
+	if [ "$enable_cwmp" = "0" ]; then
 		stop
 		start
-		return 0;
-	}
+		return 0
+	fi
 
 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 	if [ "$ret" != "true" ]; then

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.5
+PKG_VERSION:=8.3.4.10
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b61e10a2e2690acd06565e0b23d01b6504e7df99
+PKG_SOURCE_VERSION:=4231e9496e63fb6d0ab74870c06f9345b001c5bf
 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
@@ -60,12 +60,12 @@ define Package/libieee1905/description
 endef
 
 plugins := \
-	$(if $(CONFIG_PACKAGE_ieee1905-map-plugin),map) \
-	$(if $(CONFIG_PACKAGE_ieee1905-snoop-plugin),snoop) \
-	$(if $(CONFIG_PACKAGE_ieee1905-topology-plugin),topology)
+	$(if $(CONFIG_PACKAGE_map-plugin),map) \
+	$(if $(CONFIG_PACKAGE_snoop-plugin),snoop) \
+	$(if $(CONFIG_PACKAGE_topology-plugin),topology)
 
 
-ppkg:=$(patsubst plugins/%.mk,ieee1905-%-plugin,$(wildcard plugins/*.mk))
+ppkg:=$(patsubst plugins/%.mk,%-plugin,$(wildcard plugins/*.mk))
 
 
 TARGET_CFLAGS += \

ieee1905/plugins/map.mk

@@ -1,12 +1,12 @@
-define Package/ieee1905-map-plugin
+define Package/map-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/ieee1905-map-plugin/config
-	if (PACKAGE_ieee1905-map-plugin)
+define Package/map-plugin/config
+	if (PACKAGE_map-plugin)
 
 		menu "Configuration"
 
@@ -32,7 +32,7 @@ ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
 TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
 endif
 
-define Build/InstallDev/ieee1905-map-plugin
+define Build/InstallDev/map-plugin
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
@@ -43,7 +43,7 @@ define Build/InstallDev/ieee1905-map-plugin
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
 endef
 
-define Package/ieee1905-map-plugin/install
+define Package/map-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so

ieee1905/plugins/snoop.mk

@@ -1,11 +1,11 @@
-define Package/ieee1905-snoop-plugin
+define Package/snoop-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Show all received 1905 CMDUs over UBUS
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/ieee1905-snoop-plugin/install
+define Package/snoop-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/snoop/snoop.so $(1)/usr/lib/ieee1905/snoop.so

ieee1905/plugins/topology.mk

@@ -1,11 +1,11 @@
-define Package/ieee1905-topology-plugin
+define Package/topology-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Build full network topology of the 1905 nodes only
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/ieee1905-topology-plugin/install
+define Package/topology-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/topology/topology.so $(1)/usr/lib/ieee1905/topology.so

iop/config

@@ -71,7 +71,7 @@ CONFIG_PACKAGE_wifimngr=y
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
 CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
-CONFIG_PACKAGE_ieee1905-topology-plugin=y
+CONFIG_PACKAGE_topology-plugin=y
 CONFIG_PACKAGE_decollector=y
 CONFIG_PACKAGE_map-agent=y
 CONFIG_PACKAGE_map-controller=y
@@ -79,6 +79,7 @@ CONFIG_PACKAGE_map-controller=y
 # Network #
 CONFIG_PACKAGE_hostmngr=y
 CONFIG_PACKAGE_netmode=y
+CONFIG_PACKAGE_testnet=y
 CONFIG_PACKAGE_urlfilter=y
 
 # System #
@@ -142,7 +143,6 @@ CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_xl2tpd=y
 
 # Services #
-CONFIG_PACKAGE_atftp=y
 CONFIG_PACKAGE_atftpd=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_dnsmasq=y

iop/iop.completion

@@ -33,8 +33,7 @@ _iop()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
-             feeds_update feeds_update-legacy genconfig genconfig-legacy \
-             generate_tarballs install_key \
+             feeds_update genconfig generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
              update_package update_feed_branches ssh_upgrade smoketest"
 

iop/scripts/feeds_update-legacy.sh

@@ -1,88 +0,0 @@
-#!/bin/bash
-
-function feeds_update-legacy {
-	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
-		case $opt in
-		i)
-			heads=0
-			;;
-		n)
-			override=0
-			;;
-		F)
-			force=0
-			;;
-		h|\?)
-			echo "Usage: ./iop feeds_update-legacy  [-i] [-n] [-F] [-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
-			;;
-		esac
-	done
-
-	git remote -v | grep -qE '(git@|ssh://)' && developer=1
-
-	cp .config .genconfig_config_bak
-
-	if [ $heads == 1 ]; then
-		if [ $developer == 1 ]; then
-			./scripts/feeds update -g || update_failure
-		else
-			./scripts/feeds update || update_failure
-		fi
-	fi
-	./scripts/feeds update -ai || exit 1
-
-	# replace core packages with iopsys versions
-	if [ $override == 1 ]; then
-		./scripts/feeds install -f -p openwrt_core -a || exit 1
-		./scripts/feeds install -f -p qualcomm -a || exit 1
-	fi
-
-	(
-		echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update'
-		echo 'FEED_DEVICES_DIRS:='
-		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h\n'
-	) > target/linux/feed-devices/feed-devices-list.mk || exit 1
-
-	# targets need to be installed explicitly
-	for target in $(ls ./feeds/targets); do
-		./scripts/feeds install -f -p targets $target || exit 1
-	done
-
-	# install all packages
-	./scripts/feeds install -a || exit 1
-
-	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete || exit 1
-
-	cp .genconfig_config_bak .config
-	make defconfig || exit 1
-
-	# record when we last run this script
-	touch tmp/.iop_bootstrap || exit 1
-
-	# always return true
-	exit 0
-}
-
-register_command "feeds_update-legacy" "Update feeds to point to commit hashes from feeds.conf - legacy mode"

iop/scripts/feeds_update.sh

@@ -1,9 +1,88 @@
 #!/bin/bash
 
 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
+		case $opt in
+		i)
+			heads=0
+			;;
+		n)
+			override=0
+			;;
+		F)
+			force=0
+			;;
+		h|\?)
+			echo "Usage: ./iop feeds_update [-i] [-n] [-F] [-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
+			;;
+		esac
+	done
+
+	git remote -v | grep -qE '(git@|ssh://)' && developer=1
+
+	cp .config .genconfig_config_bak
+
+	if [ $heads == 1 ]; then
+		if [ $developer == 1 ]; then
+			./scripts/feeds update -g || update_failure
+		else
+			./scripts/feeds update || update_failure
+		fi
+	fi
+	./scripts/feeds update -ai || exit 1
+
+	# replace core packages with iopsys versions
+	if [ $override == 1 ]; then
+		./scripts/feeds install -f -p openwrt_core -a || exit 1
+		./scripts/feeds install -f -p qualcomm -a || exit 1
+	fi
+
+	(
+		echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update'
+		echo 'FEED_DEVICES_DIRS:='
+		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h\n'
+	) > target/linux/feed-devices/feed-devices-list.mk || exit 1
+
+	# targets need to be installed explicitly
+	for target in $(ls ./feeds/targets); do
+		./scripts/feeds install -f -p targets $target || exit 1
+	done
+
+	# install all packages
+	./scripts/feeds install -a || exit 1
+
+	# remove broken symlinks ( for packages that are no longer in the feed )
+	find -L package/feeds -maxdepth 2 -type l -delete || exit 1
+
+	cp .genconfig_config_bak .config
+	make defconfig || exit 1
+
+	# record when we last run this script
+	touch tmp/.iop_bootstrap || exit 1
 
 	# always return true
 	exit 0
 }
 
-register_command "feeds_update" "Compatibility function only"
+register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"

iop/scripts/genconfig.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function genconfig-legacy {
+function genconfig {
 	export CLEAN=0
 	export DIRTY="--dirty"
 	export IMPORT=1
@@ -196,7 +196,7 @@ function genconfig-legacy {
 
 	usage() {
 		echo
-		echo 1>&2 "Usage: $0 genconfig-legacy [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
+		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"
@@ -210,7 +210,7 @@ function genconfig-legacy {
 		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-legacy eg400 OPERATORX"
+		echo "Example ./iop genconfig eg400 OPERATORX"
 		echo "(if no customerconfig is chosen, iopsys config will be used)"
 		echo
 		exit 0
@@ -399,8 +399,6 @@ function genconfig-legacy {
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			;;
 		*)
 			echo "CONFIG_TARGET_${target}=y" >> .config
@@ -433,6 +431,15 @@ function genconfig-legacy {
 				fi
 			done
 		fi
+		# Ensure strict file permissions, for when provided through the above
+		if [ -f "$FILEDIR/etc/shadow" ]; then
+			v "chmod 0600 $FILEDIR/etc/shadow"
+			chmod 0600 "$FILEDIR/etc/shadow"
+		fi
+		if [ -d "$FILEDIR/etc/ssl/private" ]; then
+			v "find $FILEDIR/etc/ssl/private -type d -exec chmod 0700 '{}' ';' -o -type f -exec chmod 0600 '{}' ';'"
+			find "$FILEDIR/etc/ssl/private" -type d -exec chmod 0700 '{}' ';' -o -type f -exec chmod 0600 '{}' ';'
+		fi
 
 		# Set target version
 		local git_version
@@ -496,7 +503,7 @@ function genconfig-legacy {
 	if [ $# -eq 0 ]; then
 		echo Current profile:
 		cat $CURRENT_CONFIG_FILE
-		echo "Try ./iop genconfig-legacy -h' to get instructions if you want to change current config"
+		echo "Try ./iop genconfig -h' to get instructions if you want to change current config"
 		exit 0
 	else
 		while [ -n "$1" ]; do
@@ -532,4 +539,4 @@ function genconfig-legacy {
 	fi
 }
 
-register_command "genconfig-legacy" "Generate configuration for board and customer - legacy mode"
+register_command "genconfig" "Generate configuration for board and customer"

iop/scripts/genconfig_min.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function genconfig_min-legacy {
+function genconfig_min {
 	export CLEAN=0
 	export DIRTY="--dirty"
 	export SRCTREEOVERR=0
@@ -195,7 +195,7 @@ function genconfig_min-legacy {
 
 	usage() {
 		echo
-		echo 1>&2 "Usage: $0 genconfig_min-legacy [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
+		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"
@@ -209,7 +209,7 @@ function genconfig_min-legacy {
 		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_min-legacy eg400 OPERATORX"
+		echo "Example ./iop genconfig eg400 OPERATORX"
 		echo "(if no customerconfig is chosen, iopsys config will be used)"
 		echo
 		exit 0
@@ -373,8 +373,6 @@ function genconfig_min-legacy {
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			;;
 		*)
 			echo "CONFIG_TARGET_${target}=y" >> .config
@@ -407,6 +405,15 @@ function genconfig_min-legacy {
 				fi
 			done
 		fi
+		# Ensure strict file permissions, for when provided through the above
+		if [ -f "$FILEDIR/etc/shadow" ]; then
+			v "chmod 0600 $FILEDIR/etc/shadow"
+			chmod 0600 "$FILEDIR/etc/shadow"
+		fi
+		if [ -d "$FILEDIR/etc/ssl/private" ]; then
+			v "find $FILEDIR/etc/ssl/private -type d -exec chmod 0700 '{}' ';' -o -type f -exec chmod 0600 '{}' ';'"
+			find "$FILEDIR/etc/ssl/private" -type d -exec chmod 0700 '{}' ';' -o -type f -exec chmod 0600 '{}' ';'
+		fi
 
 		# Set target version
 		local git_version
@@ -464,7 +471,7 @@ function genconfig_min-legacy {
 	if [ $# -eq 0 ]; then
 		echo Current profile:
 		cat $CURRENT_CONFIG_FILE
-		echo "Try ./iop genconfig_min-legacy -h' to get instructions if you want to change current config"
+		echo "Try ./iop genconfig -h' to get instructions if you want to change current config"
 		exit 0
 	else
 		while [ -n "$1" ]; do
@@ -500,4 +507,4 @@ function genconfig_min-legacy {
 	fi
 }
 
-register_command "genconfig_min-legacy" "Generate configuration for customer with manual board configuration - legacy mode"
+register_command "genconfig_min" "Generate configuration for customer with manual board configuration"

iop/scripts/genconfig_wrap.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Function to convert parameters to lowercase
-function to_lowercase {
-    local params=()
-    for param in "$@"; do
-        params+=("$(echo "$param" | tr '[:upper:]' '[:lower:]')")
-    done
-    echo "${params[@]}"
-}
-
-function genconfig {
-    target_script="./scripts/gen_config.py"
-
-    # First convert all to lowercase
-    args=$(to_lowercase "$@")
-
-    # Check if an option is provided
-    if [[ ${args[0]} == -* ]]; then
-      # Convert options for target script
-      if [[ ${args[0]}  == "-b" || ${args[0]}  == "--boards" ]]; then
-        args=()
-        args[0]="-l"
-      elif [[ ${args[0]}  == "-c" || ${args[0]}  == "--clean" ]]; then
-        args=()
-        args[0]="-c"
-      fi
-    fi
-
-    ${target_script} ${args[*]}
-
-}
-
-register_command "genconfig" "Generate configuration for board and customer"

iop/scripts/update_package.sh

@@ -1,10 +1,646 @@
-# Exported interface
-update_package() {
-	echo "update_package is no longer supported." >&2
-	echo "Its replacement will come soon." >&2
-	echo >&2
-	echo "For now update references in profiles/include/*.yml and feeds.conf.io manually." >&2
-	return 1
+#!/bin/bash
+
+print_git_update()
+{
+    echo "pkg -> ${PKG_NAME}"
+    echo "	PKG_BUILD_DIR	=	${PKG_BUILD_DIR}"
+    echo "	PKG_DIR		=	${PKG_DIR}"
+    echo "	PKG_SOURCE	=	${PKG_SOURCE}"
+    echo "	PKG_NAME	=	${PKG_NAME}"
+    echo "	PKG_SOURCE_URL	=	${PKG_SOURCE_URL}"
+    echo "	PKG_SOURCE_PROTO=	${PKG_SOURCE_PROTO}"
+    echo "	PKG_SOURCE_VERSION=	${PKG_SOURCE_VERSION}"
+    echo "	PKG_SOURCE	=	${PKG_SOURCE}"
+    echo "	PKG_SOURCE_VERSION_FILE=${PKG_SOURCE_VERSION_FILE}"
 }
 
-register_command "update_package" "No longer used command"
+is_git_same()
+{
+    git_last=$(cd ${PKG_BUILD_DIR}; git rev-parse HEAD)
+    #echo "$PKG_NAME $git_last = ${PKG_SOURCE_VERSION}"
+    if [ "$git_last" == "${PKG_SOURCE_VERSION}" ]
+    then
+	return 0
+    fi
+    return 1
+}
+
+update_this_pkg()
+{
+    mk_hash=$(get_makefile_hash)
+
+    if [ "$mk_hash" != "${PKG_SOURCE_VERSION}" ]
+    then
+	echo "${PKG_NAME}:"
+	echo "	build dir     = ${PKG_BUILD_DIR}"
+	echo "	feed makefile = ${mk_hash}"
+	echo "	stale hash    = ${PKG_SOURCE_VERSION}"
+	echo "	build git     = $(cd ${PKG_BUILD_DIR}; git rev-parse HEAD)"
+	echo "	Git hash in package makefile and the git hash recorded from last compile of"
+	echo "	package is different. You probably want to recompile the package"
+	echo "	to get an up to date version in ${PKG_BUILD_DIR}/.git_update"
+	echo ""
+
+	echo -n "	Should we continue with the update anyway? [y/N]:"
+	read answer
+	echo ""
+
+	case $answer in
+	    y|Y)
+		;;
+	    n|N|*)
+		return 1;;
+	esac
+    fi
+
+    echo "${PKG_NAME}:"
+    echo "	build dir     = ${PKG_BUILD_DIR}"
+    echo "	pkg dir       = ${PKG_DIR}"
+    echo "	feed makefile = ${PKG_SOURCE_VERSION}"
+    echo "	build git     = $(cd ${PKG_BUILD_DIR}; git rev-parse HEAD)"
+    echo "	package is at a different git commit in build compared to feed"
+    echo -n "	Should we update the feed and top project to reflect the new version ? [y/N]:"
+    read answer
+    echo ""
+
+    case $answer in
+	y|Y)
+	    return 0;;
+	*)
+	    echo ""
+	    return 1;;
+    esac
+}
+
+get_makefile_hash()
+{
+    if [ -n "$PKG_SOURCE_VERSION_FILE" ]
+    then
+	name="$PKG_SOURCE_VERSION_FILE"
+    else
+	name=Makefile
+    fi
+    grep "PKG_SOURCE_VERSION:=" ${PKG_DIR}/${name} | sed -e "s/\(^PKG_SOURCE_VERSION:=\)\(.*\)/\2/"
+}
+
+insert_hash_in_feed_makefile()
+{
+    if [ -n "$PKG_SOURCE_VERSION_FILE" ]
+    then
+	name="$PKG_SOURCE_VERSION_FILE"
+    else
+	name=Makefile
+    fi
+
+    git_last=$(cd ${PKG_BUILD_DIR}; git rev-parse HEAD)
+
+    sed -i -e "s/\(^PKG_SOURCE_VERSION:=\).*/\1${git_last}/" ${PKG_DIR}/${name}
+    (cd ${PKG_DIR}; git add ${name})
+}
+
+insert_version_in_feed_makefile()
+{
+    if [ -n "$PKG_SOURCE_VERSION_FILE" ]
+    then
+	name="$PKG_SOURCE_VERSION_FILE"
+    else
+	name=Makefile
+    fi
+
+    last_version=$(awk -F '=' '/PKG_VERSION:=/ {print $2}' ${PKG_DIR}/${name})
+
+	echo -n "please enter version: "
+	read -ei "$last_version" answer
+
+	if [ -z ${answer} ]; then
+		return
+	fi
+
+    sed -i -e "s/\(^PKG_VERSION:=\).*/\1${answer}/" ${PKG_DIR}/${name}
+    (cd ${PKG_DIR}; git add ${name})
+}
+
+
+# BUG: fix if only local branche name!
+branch_uptodate()
+{
+    # $1 git repo
+    # $2 if it exist dont abort do the pull
+    (cd $1
+     git remote update 2>&1 >/dev/null
+
+     LOCAL=$(git rev-parse @)
+     REMOTE=$(git rev-parse @{u})
+     BASE=$(git merge-base @ @{u})
+
+     if [ -z "$REMOTE" ]; then
+	 BRANCH=$(basename $(git symbolic-ref -q HEAD))
+	 echo "You need to setup a tracking branch for $BRANCH"
+	 exit 99
+     fi
+
+     if [ $LOCAL = $REMOTE ]; then
+	 return
+     elif [ $LOCAL = $BASE ]; then
+	 if [ -n "$2" ]
+	 then
+	     echo "Doing automatic pull on [ $1 ]"
+	     if git pull
+	     then
+		 return
+	     else
+		 echo "Something wrong with pull. aborting, repo at"
+		 echo "    [ $1 ]"
+		 exit 99
+	     fi
+	 else
+	     echo "Local repo behind remote:"
+	     echo "do git pull at repo"
+	     echo "    [ $1 ]"
+	     exit 99
+	 fi
+     elif [ $REMOTE = $BASE ]; then
+	 echo "Local repo ahead of remote. A push is needed"
+	 echo "Repo is at: $1"
+	 echo ""
+	 echo -n "Should we try a push ? [Y/n]:"
+	 read answer
+	 echo ""
+
+	 case $answer in
+	     n|N|q|Q)
+		 exit 99;;
+	     *)
+		 echo -e "${Yellow}"
+		 if ! git push origin HEAD
+		 then
+		     echo -e "${Color_Off}"
+		     exit 99
+		 fi
+		 echo -e "${Color_Off}Push done."
+		 ;;
+	 esac
+
+     else
+	 echo "Diverged. not sure what you did but there is no tracking branch. "
+	 echo "repo at [ $1 ]. fix it so that there is a tracking branch remote."
+	 echo "Often this is related to somebody having commited to the same branch"
+	 echo "on the server so a simple push wont work, try a 'git rebase'."
+	 exit 99
+     fi
+    )
+}
+
+on_a_branch()
+{
+    local repo=$1
+    local type=$2
+    (
+	cd $repo
+	name=$(git symbolic-ref -q HEAD)
+	if [ -z "$name" ]
+	then
+	    echo "git $type repo [ $repo ] is detached."
+
+	    branches=($(git branch -r --contains $(git rev-parse HEAD)))
+	    if [ 0 == ${#branches[@]} ]
+	    then
+		echo "It needs to be on a branch but git could not find any associated branch"
+		echo ""
+		echo "you need to make sure that the commit is not on a detached branch"
+		echo "and that the branch exist in the remote repo also. it can not be a local name"
+		echo "as it is about to get pushed so it can be part of system release"
+		exit 99
+	    fi
+
+	    echo "It needs to be on a branch. Please select one or quit if it is not in list."
+	    echo ""
+
+	    i=0
+	    for branch in ${branches[*]}
+	    do
+		echo "$i: $branch"
+		i=$((i + 1))
+	    done
+
+	    echo ""
+	    echo -n "Select what branch to checkout. Q/q or N/n to quit? "
+	    read answer
+
+	    case $answer in
+		q|Q|n|N)
+		    echo "Aborting!"
+		    exit 99;;
+	    esac
+
+	    echo -e "${Yellow}"
+	    pwd
+	    echo "git checkout ${branches[$answer]}"
+	    if ! git checkout -t ${branches[$answer]}
+	    then
+		local_branch=$(basename ${branches[$answer]})
+		if ! git checkout ${local_branch}
+		then
+		    echo -e "${Color_Off}"
+		    echo "update_git aborting! something was wrong changing to branch ${branches[$answer]}"
+		    echo "go to [ $repo ] and fix it."
+		    exit 99
+		fi
+	    fi
+	    echo -e "${Color_Off}"
+	fi
+    )
+}
+
+git_repos_uptodate()
+{
+    on_a_branch ${PKG_BUILD_DIR} package
+    on_a_branch ${PKG_DIR} feed
+    on_a_branch ${PWD} top
+    branch_uptodate ${PKG_BUILD_DIR}
+    branch_uptodate ${PKG_DIR} do_pull
+    branch_uptodate ${PWD} do_pull
+}
+
+get_feed_name()
+{
+
+    echo $1 |sed  -e "s|.*feeds/\([^/]*\).*|\1|"
+
+    # rest=$(dirname $1)
+    # base=$(basename $1)
+    # prev=$base
+
+    # while [ -n "$rest" ]
+    # do
+    # 	if [ "$base" == "feeds" ]
+    # 	then
+    # 	    echo "$prev"
+    # 	fi
+    # done
+}
+
+create_message()
+{
+    FORMAT="commit %H%n\
+Author: %aN <%aE>%n\
+Date: %ai%n\
+%n\
+%w(80,4,4)%s%n
+%b%n\
+%w()Base directory -> ${repo_PATH}/"
+    local FROM=${PKG_SOURCE_VERSION}
+    local TO=$(cd ${PKG_BUILD_DIR}; git rev-parse HEAD)
+
+    local commits=$(cd ${PKG_BUILD_DIR};git rev-list ${FROM}..${TO})
+
+    local feed=$(get_feed_name ${PKG_DIR})
+
+    echo "Update feed [ $feed ] package [ $PKG_NAME ]"
+    echo ""
+    echo "-------------------------------------------------------------------------------"
+    (cd ${PKG_BUILD_DIR}; git log --graph --oneline ${FROM}..${TO})
+    echo "-------------------------------------------------------------------------------"
+
+    for commit in $commits
+    do
+	(cd ${PKG_BUILD_DIR}; git show --stat --pretty=format:"$FORMAT"  $commit)
+	echo "-------------------------------------------------------------------------------"
+    done
+}
+
+edit_file()
+{
+    echo -en "${Red}"
+    echo "Here is the commit message we are going to use!"
+    echo "-------------------------------------------------------------------------------"
+    echo -en "${Color_Off}"
+    cat $1
+    echo -en "${Red}"
+    echo "-------------------------------------------------------------------------------"
+    echo -en "${Color_Off}"
+
+    echo -n "Do you want to edit the message [y/N]? "
+    read answer
+
+    case $answer in
+	y|Y)
+	       $EDITOR $1;;
+    esac
+}
+
+
+commit_feed()
+{
+    template=$(readlink -f $1)
+    edit_file $template
+
+    echo -e "${Yellow}"
+    (
+	cd ${PKG_DIR}
+	if git commit -F $template
+	then
+	    if git push origin HEAD
+	    then
+		echo -e "${Color_Off} Feed Updated!"
+		return
+	    else
+		echo -e "${Color_Off}"
+		echo "something wrong push feed git ${PKG_DIR}"
+		exit 99
+	    fi
+	else
+	    echo -e "${Color_Off}"
+	    echo "something wrong committing to feed git ${PKG_DIR}"
+	    exit 99
+	fi
+    )
+}
+
+commit_feeds_config()
+{
+    template=$(readlink -f $1)
+    edit_file $template
+
+    echo -e "${Yellow}"
+    if git commit -F $template
+    then
+	if git push origin HEAD
+	then
+	    echo -e "${Color_Off}Feeds.conf updated!"
+	    return
+	else
+	    echo -e "${Color_Off}"
+	    echo "something wrong push change to feeds.conf"
+	    echo "try \"git remote update ; git stash ;git rebase; git push;git stash pop\""
+	    exit 99
+	fi
+    else
+	echo -e "${Color_Off}"
+	echo "something wrong committing to feed git"
+	exit 99
+    fi
+}
+
+insert_hash_in_feeds_config()
+{
+    local feed=$(get_feed_name ${PKG_DIR})
+    local TO=$(cd ${PKG_DIR}; git rev-parse HEAD)
+
+    sed -i feeds.conf -e "/ ${feed} / s/\(.*\)[;^].*/\1^${TO}/"
+    git add feeds.conf
+}
+
+check_packages()
+{
+    echo -e "${Green}_______________________________________________________________________________${Color_Off}"
+    echo "Now checking if any changes have been done to the packages."
+    echo -e "${Green}_______________________________________________________________________________${Color_Off}"
+
+    # only scan in the build directory that is currently in use.
+    CPU=$(grep  "CONFIG_CPU_TYPE=" .config| cut -f2 -d\")
+    LIBC=$(grep "CONFIG_LIBC=" .config| cut -f2 -d\")
+    
+    # First scan all files in build dir for packages that have .git directories.
+    all_pkgs=$(find build_dir/*${CPU}*${LIBC}* -name ".git")
+    
+    for pkg in `echo "$all_pkgs"`
+    do
+	pkg=$(dirname $pkg)
+
+	# check if the git in build is at same commit id as the feed makefile points out
+	if [ -e ${pkg}/.git_update ]
+	then
+	    source ${pkg}/.git_update
+	fi
+
+#	print_git_update
+
+	if [ -n "${PKG_NAME}" ]
+	then
+	    if ! is_git_same
+	    then
+		if update_this_pkg
+		then
+		    #  print_git_update
+		    git_repos_uptodate
+		    insert_hash_in_feed_makefile
+		    [ ${UPDATE} -eq 1 ] && insert_version_in_feed_makefile
+		    create_message >tmp/msg
+		    commit_feed tmp/msg
+		    insert_hash_in_feeds_config
+		    commit_feeds_config tmp/msg
+		fi
+	    fi
+	fi
+    done
+}
+
+# now handle the target git. we have only one
+
+
+feeds_hash()
+{
+    grep -v "^#" feeds.conf | grep " $1 " | grep "\^" | sed -e "s/.*[;^]\(.*\)/\1/"
+}
+
+insert_feed_hash_in_feeds_config()
+{
+    local feed=$1
+    local TO=$(cd feeds/${feed}; git rev-parse HEAD)
+
+    sed -i feeds.conf -e "/ ${feed} / s/\(.*\)[;^].*/\1^${TO}/"
+    git add feeds.conf
+}
+
+create_feed_message()
+{
+    local feed=$1
+    local FROM=$2
+    local TO=$3
+
+    local FORMAT="commit %H%n\
+Author: %aN <%aE>%n\
+Date: %ai%n\
+%n\
+%w(80,4,4)%s%n
+%b%n\
+%w()Base directory -> feeds/$feed/"
+
+
+    local commits=$(cd feeds/$feed;git rev-list ${FROM}..${TO})
+
+    echo "Update feed [ $feed ]"
+    echo ""
+    echo "-------------------------------------------------------------------------------"
+    (cd feeds/$feed; git log --graph --oneline ${FROM}..${TO})
+    echo "-------------------------------------------------------------------------------"
+
+    for commit in $commits
+    do
+	(cd feeds/$feed; git show --stat --pretty=format:"$FORMAT"  $commit)
+	echo "-------------------------------------------------------------------------------"
+    done
+}
+
+
+
+
+check_feeds()
+{
+    echo -e "${Green}_______________________________________________________________________________${Color_Off}"
+    echo "Now checking if any changes have been done to the feeds."
+    echo -e "${Green}_______________________________________________________________________________${Color_Off}"
+
+    feeds="$1"
+    [ -n "$feeds" ] || feeds=$(grep -v "^#" feeds.conf| awk '{print $2}')
+    for feed in `echo $feeds`
+    do
+		feed_hash=$(feeds_hash $feed)
+		[ -n "$feed_hash" ] || continue
+		if [ -d feeds/$feed ]; then
+			in_git=$(cd feeds/$feed; git rev-parse HEAD)
+
+			if [ "$feed_hash" != "$in_git" ]
+			then
+
+				name=$(cd feeds/$feed;git symbolic-ref -q HEAD)
+				if [ -z "$name" ]
+				then
+					echo "Feed feeds/${feed} is at a git commit which is different from feeds.conf"
+					#echo "git id from feeds.conf [$feed_hash] git id from feeds/${feed} [$in_git]"
+					on_a_branch feeds/${feed} feed
+
+					#redo the test here and see if the feeds.conf and git is still different.
+					in_git=$(cd feeds/$feed; git rev-parse HEAD)
+					if [ "$feed_hash" = "$in_git" ]
+					then
+						continue
+					fi
+				fi
+
+				LOCAL=$(cd feeds/$feed;git rev-parse @)
+				REMOTE=$(cd feeds/$feed;git rev-parse @{u})
+				BASE=$(cd feeds/$feed;git merge-base @ @{u})
+
+				# if we are behind the remote automatically do a pull
+				if [ $LOCAL = $BASE ]; then
+					(cd feeds/$feed ; git pull 1>/dev/null)
+
+					#redo the test here and see if the feeds.conf and git is still different.
+					in_git=$(cd feeds/$feed; git rev-parse HEAD)
+					if [ "$feed_hash" = "$in_git" ]
+					then
+						continue
+					fi
+				fi
+
+				echo "Feed feeds/${feed} is at different commit than what is in feeds.conf"
+				#echo "git id from feeds.conf [$feed_hash] git id from feeds/${feed} [$in_git]"
+				echo -n "Should we update feeds.conf to reflect the new version ? [y/N]:"
+				read answer
+
+				case $answer in
+					n|N|'')
+						continue;;
+				esac
+				branch_uptodate feeds/${feed}
+				create_feed_message ${feed} $feed_hash $in_git  >tmp/msg
+				insert_feed_hash_in_feeds_config ${feed}
+				commit_feeds_config tmp/msg
+			fi
+		fi
+    done
+}
+
+is_local_and_remote_same()
+{
+    git remote update 2>/dev/null 1>/dev/null
+    LOCAL=$(git rev-parse @)
+    REMOTE=$(git rev-parse @{u})
+
+    if [ $LOCAL = $REMOTE ]
+    then
+	return
+    fi
+
+    local_name=$(git rev-parse --abbrev-ref @ )
+    remote_name=$(git rev-parse --abbrev-ref @{u} )
+    
+    echo "Top repo local branch \"$local_name\" is not at same point as remote \"$remote_name\""
+    echo "This update script will update the feeds.conf file and for that to work it needs to"
+    echo "be up to date with the remote."
+    echo ""
+    echo "please run:"
+    echo "  git pull"
+    echo "  ./iop feeds_update"
+    echo ""
+    echo "do not forget the bootstrap. but do not run make it can delete your package in build"
+    exit 0
+}
+
+usage(){
+	echo -e "$0 [flags]"
+	echo -e "flags:"
+	echo -e "  -f\tFeed to update"
+	echo -e "  -h\tShow this help"
+	echo -e "  -u\tUpdate package version\n"
+}
+
+# Exported interface
+function update_package {
+
+    UPDATE=0
+
+    Color_Off='\033[0m'       # Text Reset
+
+    # Regular Colors
+    Black='\033[0;30m'        # Black
+    Red='\033[0;31m'          # Red
+    Green='\033[0;32m'        # Green
+    Yellow='\033[0;33m'       # Yellow
+    Blue='\033[0;34m'         # Blue
+    Purple='\033[0;35m'       # Purple
+    Cyan='\033[0;36m'         # Cyan
+    White='\033[0;37m'        # White
+
+    while getopts "f:hu" opt; do
+	case $opt in
+	    f)
+		feed=$OPTARG
+		;;
+	    h)
+		usage
+		exit 1
+		;;
+	    u)
+		UPDATE=1
+		;;
+	    \?)
+		echo "Invalid option: -$OPTARG" >&2
+		exit 1
+		;;
+	esac
+    done
+
+    if [ -z "$EDITOR" ]
+    then
+	if [ -f /usr/bin/vi ]; then
+	    EDITOR=vi
+	else
+	    echo "env variable EDITOR needs to be set"
+	    exit 1
+	fi
+    fi
+
+
+    # allow subshells to abort the whole program by exiting with "exit 99"
+    set -E
+    trap '[ "$?" -ne 99 ] || exit 99' ERR
+
+    is_local_and_remote_same
+    [ -n "$feed" ] || check_packages
+    check_feeds $feed
+}
+
+register_command "update_package" "Publish changes to packages and feeds"

iopsys-analytics/Makefile

@@ -1,50 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=iopsys-analytics
-PKG_RELEASE:=$(COMMITCOUNT)
-PKG_LICENSE:=PROPRIETARY
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=88dd7997ed78b1ab02c2904ed90518c46a8fa26b
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopsys-analytics.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  CATEGORY:=Utilities
-  TITLE:=Analytics tweaks for IOPSYS CI/CD purposes
-
-  # setting core dump limit
-  DEPENDS+=                                             \
-    +prlimit                                            \
-  # monitoring
-  DEPENDS+=                                             \
-    +collectd                                           \
-    +collectd-mod-cpu                                   \
-    +collectd-mod-exec                                  \
-    +collectd-mod-load                                  \
-    +collectd-mod-memory                                \
-    +collectd-mod-network                               \
-    +collectd-mod-processes                             \
-    +collectd-mod-write-http                            \
-    +@PACKAGE_COLLECTD_ENCRYPTED_NETWORK                \
-  # remote syslog
-  DEPENDS+=                                             \
-    +syslog-ng                                          \
-    +@SYSLOGNG_LOGROTATE                                \
-
-endef
-
-define Package/$(PKG_NAME)/description
-        Analytics tweaks for IOPSYS internal CI/CD purposes
-        e.g. syslog, system health, coredumps...
-endef
-
-Build/Compile=
-
-define Package/$(PKG_NAME)/install
-	$(CP) -r $(PKG_BUILD_DIR)/files/*  $(1)/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

libeasy/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.4.3
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ba80dcc51056772c906cac8022a2537b74959e6a
+PKG_SOURCE_VERSION:=0f16f1bd7d995427f0c4601b4e1e595224321df2
 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
@@ -28,12 +28,6 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/openssl \
 	-I$(STAGING_DIR)/usr/include/libnl3
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/libeasy/ $(PKG_BUILD_DIR)/
-endef
-endif
-
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS) -Wall"
 
@@ -62,7 +56,6 @@ define Build/InstallDev/libeasy
 	$(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/
-	$(CP) $(PKG_BUILD_DIR)/timestamp.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/libeasy*.so* $(1)/usr/lib/
 endef
 

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.107
+PKG_VERSION:=7.2.109
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9c0e9ecd62b79d4e89b4f013f04124870d237395
+PKG_SOURCE_VERSION:=cc72f5ab0171cd0fc29bb48dafff6751ab2f0d9c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.12
 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:=e6ba6fca814f6c83a3d6ff4a5b7560fbc36d3101
+PKG_SOURCE_VERSION:=a9ea70b6c0adb246685f7632e38853e0d803a7c3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-airoha/files/etc/uci-defaults/99-asterisk

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+hasVoice=$(db -q get hw.board.hasVoice)
+
+[ "$hasVoice" = "1" ] || { rm -f "/etc/config/asterisk"; return; }
+
+source /lib/voice/config_asterisk.sh
+
+default_asterisk_config
+
+SLIC=`cat /proc/device-tree/airoha-voice/slic-type`
+[ "${SLIC#pef}" != "${SLIC}" ] || return
+
+echo Configure TxGain and RxGain for MXL SLIC $SLIC
+
+ports=$(db -q get hw.board.VoicePorts)
+for p in $(seq 0 $((ports-1))); do
+    uci set asterisk.extension${p}.txgain='10'
+    uci set asterisk.extension${p}.rxgain='-15'
+done
+uci commit asterisk

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.9
 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:=e1de60c2c05935fb2f4adfc1f73feba0bb32ade6
+PKG_SOURCE_VERSION:=99ed0ea5ef83cebb444d135909573ccb2b37fe45
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-broadcom/files/etc/uci-defaults/99-asterisk

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+hasVoice=$(db -q get hw.board.hasVoice)
+
+[ "$hasVoice" = "1" ] || { rm -f "/etc/config/asterisk"; return; }
+
+source /lib/voice/config_asterisk.sh
+
+default_asterisk_config
+

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.25
+PKG_VERSION:=7.4.16.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=050d255b2c296e0fd3d5a24cac6e2f33020bd8cc
+PKG_SOURCE_VERSION:=0965d52a20207dc2a3ed6b4c669fc3483c8a1194
 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
@@ -143,7 +143,7 @@ define Package/libwifi/config
 
 	config LIBWIFI_USE_CTRL_IFACE
 		bool "Create UNIX sockets to interface with hostapd/wpa_supplicant"
-		default y
+		default n
   endif
 endef
 

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.1.3
+PKG_VERSION:=4.5.0.18
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cb935f12a2a425646885651f5285f7fae904e5d3
+PKG_SOURCE_VERSION:=261632ff5dbcf5ad0827b49b4e2fd97483d3d616
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -28,7 +28,7 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	   +ieee1905-map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp
+	   +map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp
 endef
 
 ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)
@@ -40,7 +40,7 @@ define Package/dynbhd
   CATEGORY:=Utilities
   TITLE:=Dynamic Backhaul Daemon
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +ieee1905-map-plugin +map-agent
+	  +map-plugin +map-agent
 endef
 
 

map-agent/files/etc/config/mapagent

@@ -1,14 +1,14 @@
 config agent 'agent'
-	option enabled '0'
+	option enabled '1'
 	option debug '0'
 	option profile '3'
 	option al_bridge 'br-lan'
-	option netdev 'wlan'
-	option island_prevention '0'
+	option island_prevention '1'
 	option eth_onboards_wifi_bhs '1'
 	option scan_on_boot_only '0'
 	option chan_ch_relay_mcast '1'
 	option guest_isolation '1'
+	option dyn_cntlr_sync '0'
 	list map_port 'all'
 #	option controller_macaddr '0a:1b:2c:3d:4e:50'
 

map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul

@@ -1,17 +1,19 @@
 #!/bin/sh
 
-. /lib/network/utils.sh
-
 conn_ports_file="/var/run/multiap/map.connected.ports"
 map_bh_file="/var/run/multiap/multiap.backhaul"
+
+# Exit if AL Bridge is not configured to be a bridge device
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
-al_brnet="${al_bridge:3}"
 
 # Exit if the PORT is not member of the AL Bridge
-[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0
+port_bridge_sec="$(uci show network | grep -w $PORT | grep '\.ports' | cut -d'.' -f2)"
+port_bridge_name="$(uci -q get network.$port_bridge_sec.name)"
+[ "$port_bridge_name" = "$al_bridge" ] || exit 0
 
 # Exit if the device is not operating in extender/repeater mode
+al_brnet="${al_bridge:3}"
 [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
 
 ############## Dynamic Backhaul Daemon ##############
@@ -69,7 +71,7 @@ fi
 
 remove_from_bridge() {
 	config_get ifname "$section" ifname
-	[ -n "$ifname" ] && ubus call network.interface.${al_brnet} remove_device '{"name":"$ifname"}'
+	[ -n "$ifname" ] && brctl delif ${al_bridge} ${ifname}
 }
 
 update_bstas() {

map-agent/files/lib/multiap/map_genconfig

@@ -5,8 +5,8 @@
 generate_mapagent_config=0
 generate_wireless_sta_config=0
 
-network_mode="$(fw_printenv -n netmode)"
-multiap_mode="$(fw_printenv -n multiap_mode)"
+network_mode="$(fw_printenv -n netmode)" # default is layer3
+multiap_mode="$(fw_printenv -n multiap_mode)" # default is full
 
 is_airoha() {
 	[ -f /proc/device-tree/compatible ] || return
@@ -181,16 +181,15 @@ map_genconf () {
 		elif [ "$multiap_mode" == "auto" ]; then
 			uci -q set mapagent.@controller_select[0].autostart=1
 			uci -q set mapagent.@controller_select[0].local=0
-		elif [ "$multiap_mode" == "full" ]; then
-			uci -q set mapagent.@controller_select[0].autostart=1
-			uci -q set mapagent.@controller_select[0].local=1
 		elif [ "$multiap_mode" == "none" ]; then
 			uci set mapagent.agent.enabled="0"
+		else # default to full
+			uci -q set mapagent.@controller_select[0].autostart=1
+			uci -q set mapagent.@controller_select[0].local=1
 		fi
 		uci -q commit mapagent
 	fi
 
-
 	if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
 		uci set mapcontroller.controller.enabled="0"
 	else

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.6.0.3
+PKG_VERSION:=4.5.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e15b3252bb25b29f6127f01428dc157b3272180c
+PKG_SOURCE_VERSION:=c852c9c9a706becd30237484153286f39841ef23
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0
@@ -27,7 +27,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +ieee1905-map-plugin \
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin \
 	   +CONTROLLER_USE_LIBDPP:libdpp
 endef
 

mcastmngr/files/broadcom/lib/mcast/broadcom.sh

@@ -49,7 +49,7 @@ config_snooping_upstream_interface() {
 			*.*)
 				port="$(echo "$dev" | cut -d'.' -f 1)"
 				if [ $port == $ethwan ]; then
-					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
+					ifconfig $dev | grep RUNNING >/dev/null && snooping_upstream_intf="$dev" && break
 				fi
 				;;
 		esac

mcastmngr/files/common/lib/mcast/common.sh

@@ -62,7 +62,7 @@ read_snooping() {
 	local proto
 
 	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
+	config_get proto "$config" proto "igmp"
 
 	if [ "$sec_enable" == "0" ]; then
 		return
@@ -103,7 +103,7 @@ read_proxy() {
 	local proto
 
 	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
+	config_get proto "$config" proto "igmp"
 
 	if [ "$sec_enable" == "0" ]; then
 		return

mcastmngr/files/linux/lib/mcast/linux.sh

@@ -15,7 +15,7 @@ snooping_bridges=
 
 __device_is_bridge() {
 	local device="$2"
-	local devsec__="$(uci show network | grep name=.*$device | grep -v ifname | cut -d'.' -f2)"
+	local devsec__="$(uci show network | grep -F ".name='$device'" | cut -d'.' -f2)"
 	local sectype="$(uci -q get network.$devsec__)"
 	local devtype="$(uci -q get network.$devsec__.type)"
 	[ "$sectype" != "device" -o "$devtype" != "bridge" ] && return 1
@@ -46,9 +46,6 @@ device_has_ip() {
 	# Read the openwrt interface for the device.
 	# Device can have multiple logical interfaces like wan and wan6
 	# but same l3 device
-	# NB. Don't use 'get_network_of' here.
-	# This function fails in some uci configurations for interfaces that refer
-	# to a device indirectly.
 	local ifaces=$(ubus call network.interface dump | jsonfilter -e "@.interface[@.device='$device'].interface")
 	for iface in $ifaces; do
 		local ip=
@@ -302,7 +299,12 @@ config_mcproxy_instance() {
 	# for snooping to work we should enable it on the bridge, doing it from
 	# here instead of from inside network config
 	if [ "$downstreams" != "$snooping_bridges" ]; then
-		config_sysfs_mcast_snooping "$downstreams" 1
+		if [ "$mcast_mode" == "0" ]; then
+			config_sysfs_mcast_snooping "$downstreams" 0
+		else
+			config_sysfs_mcast_snooping "$downstreams" 1
+		fi
+
 		[ -n $fast_leave ] &&
 			config_sysfs_mcast_fastleave "$downstreams" "$fast_leave"
 		config_sysfs_mcast_flood "$downstreams" "$mcast_mode"

netmode/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=0.3.0
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only

netmode/files/etc/config/netmode

@@ -1,10 +1,3 @@
 config netmode global
 	option enabled 0
 #	option mode 'router'
-
-#config testnet testnet
-#	option enabled 1
-#	option destination '8.8.8.8'
-	
-#config shiftrange shiftrange
-#	option enabled 1

netmode/files/etc/hotplug.d/iface/70-shiftrange

@@ -1,252 +0,0 @@
-#!/bin/sh
-# this scripts shifts the lan network prefixes
-# if a wan interface has the same network prefix.
-
-# do not shift range if the feature is explicitly disabled
-[ "$(uci -q get netmode.shiftrange.enabled)" == "0" ] && exit 0
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-
-LOCKFILE="/tmp/70-shiftrange.lock"
-RESTRICTED_NETS=""
-ALL_NETS=""
-
-#####
-##### initial functions
-#####
-
-initial_check()
-{
-	# run only on ifup
-	[ "$ACTION" == "ifup" ] || exit 0
-
-	# run only for uplink (not is_lan) interfaces
-	local islan="$(uci -q get network.$INTERFACE.is_lan)"
-	[ "$islan" != "1" ] || exit 0
-
-	# run only if the uplink interface has a configured protocol
-	local proto="$(uci -q get network.$INTERFACE.proto)"
-	[ "$proto" != "none" ] || exit 0
-}
-
-finish()
-{
-    lock -u $LOCKFILE
-    rm -f $LOCKFILE
-}
-
-# just one instance of this script at a time
-just_one_instance()
-{
-	local counter=0
-	local limit=10
-
-	#wait for the lock to become free
-	while [ -e $LOCKFILE ] ; do
-		sleep 1
-		counter=$((counter + 1))
-		[ "$counter" -gt "$limit" ] && exit 1
-	done
-
-	lock $LOCKFILE
-	trap finish EXIT INT TERM
-}
-
-
-#####
-##### helper functions
-#####
-
-#given a an ip and a mask in the form of "192.168.1.1/24"
-#return the network address like "192.168.1.0/24"
-get_network_address()
-{
-	local ip="$1"
-	[ -z "$ip" ] && return
-
-	local prefix=${ip##*/}
-
-	local ip1=${ip%%.*} ; ip=${ip#*.*}
-	local ip2=${ip%%.*} ; ip=${ip#*.*}
-	local ip3=${ip%%.*} ; ip=${ip#*.*}
-	local ip4=${ip%%/*}
-
-	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
-	local mask=$((0xFFFFFFFF >> (32 - $prefix) << (32 - $prefix)))
-	local network=$(($ip & $mask))
-
-	local n1=$((($network & 0xFF000000) >> 24))
-	local n2=$((($network & 0x00FF0000) >> 16))
-	local n3=$((($network & 0x0000FF00) >> 8))
-	local n4=$(( $network & 0x000000FF))
-
-	echo "$n1.$n2.$n3.$n4/$prefix"
-}
-
-#given a network address (192.168.1.0/24)
-#find the next network address (192.168.2.0/24)
-next_network_address()
-{
-	local ip=$1
-	local prefix=${ip##*/}
-
-	local ip1=${ip%%.*} ; ip=${ip#*.*}
-	local ip2=${ip%%.*} ; ip=${ip#*.*}
-	local ip3=${ip%%.*} ; ip=${ip#*.*}
-	local ip4=${ip%%/*}
-
-	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
-	local one="$((1 << (32-$prefix)))"
-	local new=$(($ip + $one))
-
-	local n1=$((($new & 0xFF000000) >> 24))
-	local n2=$((($new & 0x00FF0000) >> 16))
-	local n3=$((($new & 0x0000FF00) >> 8))
-	local n4=$(( $new & 0x000000FF))
-
-	echo "$n1.$n2.$n3.$n4/$prefix"
-}
-
-# given a network address and a prefix (192.168.2.0/24)
-# return the first host ip available   (192.168.2.1)
-first_host_in_network ()
-{
-	local ip=$1
-	local prefix=${ip##*/}
-
-	local ip1=${ip%%.*} ; ip=${ip#*.*}
-	local ip2=${ip%%.*} ; ip=${ip#*.*}
-	local ip3=${ip%%.*} ; ip=${ip#*.*}
-	local ip4=${ip%%/*}
-
-	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
-	local new=$(($ip + 1))
-
-	local n1=$((($new & 0xFF000000) >> 24))
-	local n2=$((($new & 0x00FF0000) >> 16))
-	local n3=$((($new & 0x0000FF00) >> 8))
-	local n4=$(( $new & 0x000000FF))
-
-	echo "$n1.$n2.$n3.$n4"
-}
-
-# given a network address,
-# find the next available network address.
-shift_range()
-{
-	local net="$1"
-	while true ; do
-		if [ "$RESTRICTED_NETS" == "${RESTRICTED_NETS//$net/}" ] && [ "$ALL_NETS" == "${ALL_NETS//$net/}" ]; then
-			# found a net that is not in restricted nets nor in all nets
-			break
-		fi
-		net=$(next_network_address $net)
-	done
-
-	echo "$net"
-}
-
-
-#####
-##### parse all interfaces section
-#####
-
-# RESTRICTED_NETS = all the IPs on wan interfaces
-# ALL_NETS = all the IPs on any interface
-parse_interface()
-{
-	local interface=$1
-	local nets=""		# "192.168.1.1/24"
-	local networks=""	# "192.168.1.0/24"
-
-	config_get is_lan $interface is_lan
-	network_get_subnets nets $interface
-
-	for n in $nets ; do
-		networks="$networks $(get_network_address $n)"
-	done
-
-	[ "$is_lan" != "1" ] && RESTRICTED_NETS="$RESTRICTED_NETS $networks"
-	ALL_NETS="$ALL_NETS $networks"
-}
-
-# parse all the interfaces
-# get all the IPs on wan interfaces and store them in restrict_nets
-# get all the IPs on all interfaces and store them in ALL_NETS
-parse_interfaces()
-{
-	config_foreach parse_interface "interface"
-}
-
-
-#####
-##### parse all lan interfaces section
-#####
-
-parse_lan()
-{
-	local interface=$1
-	local nets=""
-	local ips=""
-	local newips=""
-	local ips_changed=0
-
-	[ "$interface" == "loopback" ] && return
-	config_get is_lan $interface is_lan
-	[ "$is_lan" == "1" ] || return
-
-	network_get_subnets ips $interface
-
-	for ip in $ips ; do
-		net="$(get_network_address $ip)"
-
-		if [ "$RESTRICTED_NETS" == "${RESTRICTED_NETS//$net/}" ] ; then
-			# net is not in restricted nets
-			# append ip to newips
-			[ -z "$newips" ] && newips="${ip%/*}" ||  newips="$newips ${ip%/*}"
-			continue
-		fi
-
-		#net is in RESTRICTED_NETS
-		local newnet=$(shift_range $net)
-		local newip="$(first_host_in_network $newnet)"
-		# append newip to newips
-		[ -z "$newips" ] && newips="$newip" ||  newips="$newips $newip"
-
-		ips_changed=1
-		logger "$0: Changing the ip on interface $interface from $ip to $newip/${newnet##*/}"
-		echo "$0: Changing the ip on interface $interface from $ip to $newip/${newnet##*/}" >/dev/console
-	done
-
-	#assign the new ips
-	if [ "$ips_changed" == "1" ] ; then
-		uci -q set network.$interface.ipaddr="$newips"
-	fi
-}
-
-# parse all the interface with is_lan=1
-parse_lans()
-{
-	config_foreach parse_lan "interface"
-}
-
-#####
-##### main
-#####
-
-main()
-{
-	initial_check
-	just_one_instance
-
-	config_load network
-	parse_interfaces
-	parse_lans
-
-	if [ -n "$(uci changes network)" ] ; then
-		ubus call uci commit '{"config":"network"}'
-	fi
-}
-
-main $@

netmode/files/etc/uci-defaults/netmode.l2mode

@@ -0,0 +1,114 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+source "/etc/device_info"
+
+l2_mcast_config() {
+	# configure L2 mcast config for snooping
+	logger -s -p user.info -t "netmode" "Generating L2 mcast configuration"
+
+	# remove proxy sections
+	uci -q delete mcast.igmp_proxy_1
+	uci -q delete mcast.mc_proxy_MLD
+
+	# add igmp_snooping section
+	uci -q set mcast.igmp_snooping_1=snooping
+	uci -q set mcast.igmp_snooping_1.enable='1'
+	uci -q set mcast.igmp_snooping_1.proto='igmp'
+	uci -q set mcast.igmp_snooping_1.version='2'
+	uci -q set mcast.igmp_snooping_1.robustness='2'
+	uci -q set mcast.igmp_snooping_1.query_interval='125'
+	uci -q set mcast.igmp_snooping_1.query_response_interval='100'
+	uci -q set mcast.igmp_snooping_1.last_member_query_interval='10'
+	uci -q set mcast.igmp_snooping_1.fast_leave='1'
+	uci -q set mcast.igmp_snooping_1.snooping_mode='2'
+	uci -q set mcast.igmp_snooping_1.interface='br-lan'
+	uci -q add_list mcast.igmp_snooping_1.filter='239.0.0.0/8'
+
+	# add mld_snooping section
+	uci -q set mcast.mld_snooping_1=snooping
+	uci -q set mcast.mld_snooping_1.enable='1'
+	uci -q set mcast.mld_snooping_1.proto='mld'
+	uci -q set mcast.mld_snooping_1.version='2'
+	uci -q set mcast.mld_snooping_1.robustness='2'
+	uci -q set mcast.mld_snooping_1.query_interval='125'
+	uci -q set mcast.mld_snooping_1.query_response_interval='100'
+	uci -q set mcast.mld_snooping_1.last_member_query_interval='10'
+	uci -q set mcast.mld_snooping_1.fast_leave='1'
+	uci -q set mcast.mld_snooping_1.snooping_mode='2'
+	uci -q set mcast.mld_snooping_1.interface='br-lan'
+
+	uci -q commit mcast
+}
+
+l2_network_config() {
+	logger -s -p user.info -t "netmode" "Generating L2 network configuration"
+
+	# Configure L2 Network Mode
+	uci -q delete network.lan
+	uci -q delete network.wan
+	uci -q delete network.wan6
+	uci -q set network.lan=interface
+	uci -q set network.lan.proto='dhcp'
+	uci -q set network.lan.device='br-lan'
+	uci -q set network.lan.force_link='1'
+	uci -q set network.lan6=interface
+	uci -q set network.lan6.proto='dhcpv6'
+	uci -q set network.lan6.device='@lan'
+	uci -q set network.lan6.reqprefix='no'
+	uci -q delete network.br_lan.ports
+	uci -q set network.br_lan.bridge_empty='1'
+
+	add_port_to_br_lan() {
+		port="$1"
+		[ -n "$port" -a -d /sys/class/net/$port ] || continue
+		uci add_list network.br_lan.ports="$port"
+	}
+
+	if [ -f /etc/board.json ]; then
+		json_load_file /etc/board.json
+		json_select network
+		json_select lan
+		if json_is_a ports array; then
+			json_for_each_item add_port_to_br_lan ports
+		else
+			json_get_var device device
+			[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		fi
+		json_select ..
+		json_select wan 2>/dev/null
+		json_get_var device device
+		[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		json_cleanup
+	fi
+
+	uci -q commit network
+
+	# Disable DHCP Server
+	uci -q set dhcp.lan.ignore=1
+	uci -q commit dhcp
+	/etc/init.d/odhcpd disable
+
+	# Disable SSDPD
+	uci -q set ssdpd.ssdp.enabled="0"
+	uci -q commit ssdpd
+
+	# Update CWMP Agent WAN Interface
+	uci -q set cwmp.cpe.default_wan_interface="lan"
+	uci -q commit cwmp
+
+	# disable firewall
+	uci -q set firewall.globals.enabled="0"
+	uci -q commit firewall
+}
+
+network_mode="$(fw_printenv -n netmode 2>/dev/null)"
+	
+case "$network_mode" in
+	layer2|extender)
+		l2_network_config
+		l2_mcast_config
+	;;	
+esac

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.11
+PKG_VERSION:=7.0.5.5.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=5200ce0b3b4b3390e241d62a9e0a0999c3861282
+PKG_SOURCE_VERSION:=e4ca88a603ff84fdf54107b9b34c82b44a658fc1
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -32,7 +32,7 @@ define Package/obuspa
   SUBMENU:=TRx69
   TITLE:=USP agent
   MENU:=1
-  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
+  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl +ca-certificates
 endef
 
 define Package/obuspa/description
@@ -87,8 +87,8 @@ endif
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-        $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
-        $(Build/Patch)
+	$(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
+	$(Build/Patch)
 endef
 endif
 

obuspa/files/etc/config/obuspa

@@ -7,7 +7,7 @@ config obuspa 'global'
 	option db_file '/etc/obuspa/usp.db'
 	option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
-	#option trust_cert '/etc/obuspa/rootCA.pem'
+	#option trust_cert '/etc/ssl/cert.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/tmp/obuspa.log'
 

obuspa/files/etc/obuspa/roles.json

@@ -581,8 +581,7 @@
         {
           "object": "Device.",
           "perm": [
-            "PERMIT_NONE",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_NONE"
           ]
         },
         {
@@ -595,66 +594,6 @@
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         },
-        {
-          "object":"Device.Time.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.UPnP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Bridging.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Ethernet.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv4.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv6.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
         {
           "object":"Device.Hosts.",
           "perm": [
@@ -665,37 +604,6 @@
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         },
-        {
-          "object":"Device.NAT.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.PPP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Routing.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
         {
           "object":"Device.IEEE1905.",
           "perm": [
@@ -706,16 +614,6 @@
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         },
-        {
-          "object":"Device.InterfaceStack.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
         {
           "object":"Device.DynamicDNS.",
           "perm": [
@@ -726,56 +624,6 @@
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         },
-        {
-          "object":"Device.LANConfigSecurity.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Security.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.RouterAdvertisement.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Services.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.UserInterface.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
         {
           "object":"Device.PeriodicStatistics.",
           "perm": [
@@ -812,30 +660,16 @@
           ]
         },
         {
-          "object": "Device.DNS.",
+          "object": "Device.WiFi.AccessPoint.{i}.WPS.InitiateWPSPBC()",
           "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
             "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         },
         {
-          "object": "Device.IP.",
+          "object": "Device.WiFi.DataElements.Network.SetSSID()",
           "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
             "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         }

obuspa/patches/0003-set-internal-role-fix.patch

@@ -1,8 +1,6 @@
-diff --git a/src/core/cli_server.c b/src/core/cli_server.c
-index 1e33727..108caa2 100644
 --- a/src/core/cli_server.c
 +++ b/src/core/cli_server.c
-@@ -784,6 +784,7 @@ int ExecuteCli_Set(char *arg1, char *arg2, char *usage)
+@@ -780,6 +780,7 @@ int ExecuteCli_Set(char *arg1, char *arg
          goto exit;
      }
  
@@ -10,7 +8,7 @@ index 1e33727..108caa2 100644
      // Exit if unable to start a transaction
      err = DM_TRANS_Start(&trans);
      if (err != USP_ERR_OK)
-@@ -869,6 +870,7 @@ int ExecuteCli_Add(char *arg1, char *arg2, char *usage)
+@@ -865,6 +866,7 @@ int ExecuteCli_Add(char *arg1, char *arg
          goto exit;
      }
  
@@ -18,7 +16,7 @@ index 1e33727..108caa2 100644
      // Exit if unable to start a transaction
      err = DM_TRANS_Start(&trans);
      if (err != USP_ERR_OK)
-@@ -980,6 +982,7 @@ int ExecuteCli_Del(char *arg1, char *arg2, char *usage)
+@@ -976,6 +978,7 @@ int ExecuteCli_Del(char *arg1, char *arg
          goto exit;
      }
  
@@ -26,26 +24,44 @@ index 1e33727..108caa2 100644
      // Exit if unable to start a transaction
      err = DM_TRANS_Start(&trans);
      if (err != USP_ERR_OK)
-diff --git a/src/core/data_model.h b/src/core/data_model.h
-index efe4bde..4201f81 100755
 --- a/src/core/data_model.h
 +++ b/src/core/data_model.h
-@@ -325,6 +325,7 @@ void DATA_MODEL_DumpSchema(void);
+@@ -325,6 +325,8 @@ void DATA_MODEL_DumpSchema(void);
  void DATA_MODEL_DumpInstances(void);
  char DATA_MODEL_GetJSONParameterType(char *path);
  int DATA_MODEL_SetParameterInDatabase(char *path, char *value);
 +void SetControllerRoleForInternal();
++void SetControllerDummyID();
  
  int DM_PRIV_InitSetRequest(dm_req_t *req, dm_node_t *node, char *path, dm_instances_t *inst, char *new_value);
  void DM_PRIV_RequestInit(dm_req_t *req, dm_node_t *node, char *path, dm_instances_t *inst);
-diff --git a/src/core/msg_handler.c b/src/core/msg_handler.c
-index 8313342..b5e6d59 100644
+--- a/src/core/dm_exec.c
++++ b/src/core/dm_exec.c
+@@ -1207,6 +1207,7 @@ void ProcessMessageQueueSocketActivity(s
+         return;
+     }
+ 
++    SetControllerDummyID(); // To make sure session handler does not break with internal services
+     switch(msg.type)
+     {
+         case kDmExecMsg_ProcessUspRecord:
 --- a/src/core/msg_handler.c
 +++ b/src/core/msg_handler.c
-@@ -891,6 +891,21 @@ char *MtpSendItemToString(mtp_send_item_t *msi)
-     return TEXT_UTILS_EnumToString(msi->content_type, mtp_content_types, NUM_ELEM(mtp_content_types));
- }
+@@ -902,6 +902,34 @@ char *MtpSendItemToString(mtp_send_item_
  
+ /*********************************************************************//**
+ **
++** SetControllerDummyID
++**
++** Sets the role for internal user
++**
++**
++**************************************************************************/
++void SetControllerDummyID()
++{
++    cur_msg_controller_info.endpoint_id = "CLI_Utility";
++}
++
 +/*********************************************************************//**
 +**
 +** SetControllerRoleForInternal
@@ -58,9 +74,11 @@ index 8313342..b5e6d59 100644
 +{
 +    cur_msg_combined_role.inherited = kCTrustRole_Untrusted;
 +    cur_msg_combined_role.assigned = kCTrustRole_FullAccess;
-+    cur_msg_controller_info.endpoint_id = "";
++    SetControllerDummyID();
 +}
 +
- /*********************************************************************//**
- **
++/*********************************************************************//**
++**
  ** CacheControllerRoleForCurMsg
+ **
+ ** Retrieves the role to use for the specified controller, and caches it locally, so that

obuspa/patches/0012-check_mqtt_host_alive.patch

@@ -0,0 +1,95 @@
+diff --git a/src/core/mqtt.c b/src/core/mqtt.c
+index 04a1a9c..00b95a4 100644
+--- a/src/core/mqtt.c
++++ b/src/core/mqtt.c
+@@ -2124,6 +2124,75 @@ exit:
+     }
+ }
+ 
++static int _check_host_rechability(CURL *handle, curl_infotype type, char *data, size_t size, void *userp)
++{
++    bool *palive = (bool *)userp;
++
++    USP_ASSERT(palive != NULL);
++    switch(type) {
++        case CURLINFO_HEADER_OUT:
++        case CURLINFO_HEADER_IN:
++            *palive = true;
++            break;
++        case CURLINFO_TEXT:
++        {
++            USP_LOG_Debug("CURL DATA:: [%s]", data);
++            if (strstr(data, "Connected to ") != NULL) {
++                *palive = true;
++            }
++            break;
++        }
++        default:
++            break;
++    }
++
++    return 0;
++}
++
++int check_mqtt_host_reachability(mqtt_client_t *client)
++{
++    CURL *curl;
++    mqtt_conn_params_t *cparam = &client->conn_params;
++    char buffer[128] = {0};
++    int ret = USP_ERR_INTERNAL_ERROR;
++    bool is_alive = false;
++
++    curl = curl_easy_init();
++    if(curl) {
++        USP_SNPRINTF(buffer, 128, "mqtt://%s:%d", cparam->host, cparam->port);
++        curl_easy_setopt(curl, CURLOPT_URL, buffer);
++
++        if (strlen(cparam->username) > 0) {
++            curl_easy_setopt(curl, CURLOPT_USERNAME, cparam->username);
++        }
++
++        if (strlen(cparam->password) > 0) {
++            curl_easy_setopt(curl, CURLOPT_PASSWORD, cparam->password);
++        }
++
++        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
++        curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &is_alive);
++        curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, _check_host_rechability);
++
++        /* complete within 2 seconds */
++        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 2L);
++
++        ret = curl_easy_perform(curl);
++        /* Check for errors */
++        if(ret == CURLE_OK || ret == CURLE_URL_MALFORMAT || is_alive == true) {
++            USP_LOG_Debug("CURL MQTT host %s, ret %d, alive %d ...", buffer, ret, is_alive);
++            ret = USP_ERR_OK;
++        } else {
++            USP_LOG_Info("# CURL MQTT host %s unreachable: %d=>%s ...", buffer, ret, curl_easy_strerror(ret));
++        }
++
++        /* always cleanup */
++        curl_easy_cleanup(curl);
++    }
++
++    return ret;
++}
++
+ /*********************************************************************//**
+ **
+ ** PerformMqttClientConnect
+@@ -2193,6 +2262,14 @@ int PerformMqttClientConnect(mqtt_client_t *client)
+         keep_alive = 5;
+     }
+ 
++    // Below function is a workaround to check the host reachability with a timeout
++    // mosquitto_connect_* API block the thread for 2 mins if host is not reachable,
++    // which halts other clients connectivity
++    err = check_mqtt_host_reachability(client);
++    if (err != USP_ERR_OK) {
++        err = USP_ERR_INTERNAL_ERROR;
++        goto exit;
++    }
+     // Release the access mutex temporarily whilst performing the connect call
+     // We do this to prevent the data model thread from potentially being blocked, whilst the connect call is taking place
+     OS_UTILS_UnlockMutex(&mqtt_access_mutex);

periodicstats/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.5.3
+PKG_VERSION:=1.5.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

periodicstats/files/etc/config/periodicstats

@@ -1,4 +1,4 @@
 config globals 'globals'
-	option enable '0'
+	option enable '1'
 	option base_interval '5'
 

periodicstats/files/etc/init.d/periodicstats

@@ -17,16 +17,19 @@ start_service() {
 	
 	bbfdm_add_service "bbfdm.periodicstats" "${PERIODICSTATS_JSON_INPUT}"
 
-	if [ "${enable}" -ne "1" ]; then
-		return 0;
-	fi
-
 	procd_open_instance periodicstatsd
-	procd_set_param command ${PROG}
-	procd_set_param respawn
+	if [ "${enable}" -eq "1" ]; then
+		procd_set_param command ${PROG}
+		procd_set_param respawn
+	fi
 	procd_close_instance
 }
 
+reload_service() {
+	stop
+	start
+}
+
 service_triggers() {
 	procd_add_reload_trigger periodicstats
 }

ponmngr/files/airoha/lib/xpon/airoha.sh

@@ -3,39 +3,34 @@
 . /lib/functions.sh
 
 set_serial_number() {
-	vendor_id=$1
-	vssn=$2
+	local vendor_id="$1"
+	local vssn="$2"
 
 	# Vendor id is not taken from serial automatically, propagate it as well
-	/userfs/bin/omcicfgCmd set vendorId ${vendor_id}
-	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
+	/userfs/bin/omcicfgCmd set vendorId "${vendor_id}"
+	/userfs/bin/omcicfgCmd set sn "${vendor_id}${vssn}"
 }
 
 set_equipment_id() {
-	local eqid=$1
-	local eq_id_default="KE2.119.241R2B"
+	local eqid="$1"
 
-	if [ -z "$eqid"  ]; then
+	if [ -z "${eqid}" ]; then
 		return
 	fi
 
-	if [ "$eqid" = "$eq_id_default" ]; then
-		return
-	fi
-
-        /userfs/bin/omcicfgCmd set equipmentId ${eqid}
+	/userfs/bin/omcicfgCmd set equipmentId "${eqid}"
 }
 
 set_loid_authentication() {
-	local loid=$1
-	local loid_pwd=$2
+	local loid="$1"
+	local loid_pwd="$2"
 
-	[ -z "$loid" ] && return
+	[ -z "${loid}" ] && return
 
-	/userfs/bin/omcicfgCmd set loid ${loid}
+	/userfs/bin/omcicfgCmd set loid "${loid}"
 
-	if [ -n "$loid_pwd" ]; then
-		/userfs/bin/omcicfgCmd set loid_password ${loid_pwd}
+	if [ -n "${loid_pwd}" ]; then
+		/userfs/bin/omcicfgCmd set loidPasswd "${loid_pwd}"
 	fi
 }
 

ponmngr/files/broadcom/lib/xpon/broadcom.sh

@@ -3,37 +3,39 @@
 . /lib/functions.sh
 
 set_serial_number() {
-	vendor_id=$1
-	vssn=$2
+	local vendor_id="$1"
+	local vssn="$2"
 
-	vendor_id="$(echo $vendor_id | hexdump -e '4/1 "%02X" "\n"')"
-	vendor_id=${vendor_id:0:8}
+	vendor_id="$(echo "${vendor_id}" | hexdump -e '4/1 "%02X" "\n"')"
+	vendor_id="${vendor_id:0:8}"
 
 	bs /b/c gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vssn}
 }
 
 set_equipment_id() {
-	equipment_id=$1
+	local equipment_id="$1"
 	[ -z "$equipment_id" ] && return
 
-	json_add_string "equipment_id" $equipment_id
+	json_add_string "equipment_id" "$equipment_id"
 }
 
 set_loid_authentication() {
-	loid=$1
-	loid_password=$2
+	local loid="$1"
+	local loid_password="$2"
+
 	[ -z "$loid" ] && return
 
-	json_add_string "loid" $loid
-	json_add_string "loid_password" $loid_password
+	json_add_string "loid" "$loid"
+	json_add_string "loid_password" "$loid_password"
 }
 
 apply_xpon_uci_config() {
+	local sn
 
 	json_init
 	json_add_object 'ani'
 	sn="$(uci -q get xpon.ani.serial_number)"
-	json_add_string "serial_number" $sn
+	json_add_string "serial_number" "$sn"
 	configure_loid_authentication
 	configure_equipment_id
 	json_close_object

ponmngr/files/common/etc/init.d/xpon

@@ -11,21 +11,21 @@ include /lib/xpon
 configure_serial_number() {
 	# serial number generation is taken care in the uci defaults, so if
 	# serial number is not found here its a misconfig
-	serial_number="$(uci -q get xpon.ani.serial_number)"
+	local serial_number="$(uci -q get xpon.ani.serial_number)"
 	if [ ${#serial_number} -eq 12 ]; then
-		vendor_id="${serial_number:0:4}"
-		vssn="${serial_number:4:8}"
+		local vendor_id="${serial_number:0:4}"
+		local vssn="${serial_number:4:8}"
 	else
-		logger -s -t "xpon" "Serial number not found in uci, ont will probably not be registered at the olt"
-		logger -s -t "xpon" "Please configure a valid serial number"
+		logger -s -t "xpon" "Serial number not found in UCI, ONT will probably not be registered at the OLT."
+		logger -s -t "xpon" "Please configure a valid serial number."
 		return
 	fi
 
-	set_serial_number $vendor_id $vssn
+	set_serial_number "${vendor_id}" "${vssn}"
 }
 
 start_service() {
-	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
+	if [ "$(uci -q get xpon.ani.enable)" = "1" ]; then
 		configure_serial_number
 		apply_xpon_uci_config
 		init_xpon

ponmngr/files/common/etc/uci-defaults/60-xpon-generate

@@ -3,14 +3,15 @@
 
 configure_serial_number() {
 	# check if serial number is present in the production data
-	production_sn="$(fw_printenv -n gponsn)"
+	local production_sn="$(fw_printenv -n gponsn)"
 	if [ ${#production_sn} -eq 12 ]; then
-		uci set xpon.ani.serial_number=$production_sn
+		uci set xpon.ani.serial_number="${production_sn}"
 	else
-		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-		vendor_id="IOPS"
-		vssn="${macaddr:4:8}"
-		uci set xpon.ani.serial_number=$vendor_id$vssn
+		local macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
+		local vendor_id="IOPS"
+		local vssn="${macaddr:4:8}"
+
+		uci set xpon.ani.serial_number="${vendor_id}${vssn}"
 	fi
 }
 
@@ -18,37 +19,38 @@ configure_loid_authentication() {
 	local production_loid
 	local production_loidpwd
 
-	loid="$(uci -q get xpon.ani.loid)"
-	loidpwd="$(uci -q get xpon.ani.loid_password)"
-        if [ -z $loid ]; then
+	local loid="$(uci -q get xpon.ani.loid)"
+	local loidpwd="$(uci -q get xpon.ani.loid_password)"
+
+	if [ -z "${loid}" ]; then
 		production_loid="$(fw_printenv -n gponloid)"
 	fi
-	if [ -z $loidpwd ]; then
+	if [ -z "${loidpwd}" ]; then
 		production_loidpwd="$(fw_printenv -n gponloid_password)"
 	fi
 
-	if [ -n $production_loid ]; then
-		uci set xpon.ani.loid=$production_loid
+	if [ -n "${production_loid}" ]; then
+		uci set xpon.ani.loid="${production_loid}"
 	fi
-	if [ -n $production_loidpwd ]; then
-		uci set xpon.ani.loid_password=$production_loidpwd
+	if [ -n "${production_loidpwd}" ]; then
+		uci set xpon.ani.loid_password="${production_loidpwd}"
 	fi
 
 }
 
 if [ -s "/etc/config/xpon" ]; then
-        if uci -q get xpon.ani >/dev/null; then
-                # generate serial number in case its not present and return
-		serial_number="$(uci -q get xpon.ani.serial_number)"
-		if [ ${#serial_number} -ne 12 ]; then
+	if uci -q get xpon.ani >/dev/null; then
+		# generate serial number in case its not present and return
+		SERIAL_NUMBER="$(uci -q get xpon.ani.serial_number)"
+		if [ ${#SERIAL_NUMBER} -ne 12 ]; then
 			configure_serial_number
 		fi
 		configure_loid_authentication
-                exit                                  
-        else                                          
-                rm -f /etc/config/xpon
-        fi                           
-fi                                   
+		exit
+	else
+		rm -f /etc/config/xpon
+	fi
+fi
 touch /etc/config/xpon
 
 uci set xpon.ani=ani

ponmngr/files/common/lib/xpon/get_uci_config.sh

@@ -1,13 +1,15 @@
 #!/bin/sh
 
-configure_equipment_id() {                                                      
-        eqid="$(uci -q get xpon.ani.equipment_id)"                              
-        set_equipment_id $eqid                                                  
-}                                                                               
-                                                                                
-configure_loid_authentication() {                                               
-        loid="$(uci -q get xpon.ani.loid)"                                      
-        loid_pwd="$(uci -q get xpon.ani.loid_password)"                         
-        set_loid_authentication $loid $loid_pwd                                 
+configure_equipment_id() {
+	local eqid="$(uci -q get xpon.ani.equipment_id)"
+
+	set_equipment_id "${eqid}"
+}
+
+configure_loid_authentication() {
+	local loid="$(uci -q get xpon.ani.loid)"
+	local loid_pwd="$(uci -q get xpon.ani.loid_password)"
+
+	set_loid_authentication "${loid}" "${loid_pwd}"
 }
 

stunc/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.4.0
+PKG_VERSION:=1.3.3.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=335f52d51b3b988917f0130303d571ac1fd9636c
+PKG_SOURCE_VERSION:=242326500576f644e7c730f556ce4a896c47be8c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,25 +27,77 @@ include ../bbfdm/bbfdm.mk
 
 MAKE_PATH:=src
 
-define Package/stunc
+define Package/stunc/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbfdm-api +libopenssl
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbfdm-api
+endef
+
+define Package/stunc
+  $(Package/stunc/default)
+  TITLE += (default)
+  DEPENDS += +libopenssl
+  VARIANT:=default
+  DEFAULT_VARIANT:=1
+endef
+
+define Package/stunc-mbedtls
+  $(Package/stunc/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_stunc-mbedtls:libmbedtls
+  VARIANT:=mbedtls
+  CONFLICTS := stunc stunc-openssl stunc-wolfssl
+endef
+
+define Package/stunc-openssl
+  $(Package/stunc/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_stunc-openssl:libopenssl
+  VARIANT:=openssl
+  CONFLICTS := stunc stunc-mbedtls stunc-wolfssl
+endef
+
+define Package/stunc-wolfssl
+  $(Package/stunc/default)
+  TITLE += (wolfssl)
+  DEPENDS += +PACKAGE_stunc-wolfssl:libwolfssl
+  VARIANT:=wolfssl
+  CONFLICTS := stunc stunc-openssl stunc-mbedtls
 endef
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
+ifeq ($(BUILD_VARIANT),default)
+  MAKE_FLAGS += \
+	USE_OPENSSL="yes"
+endif
+
+ifeq ($(BUILD_VARIANT),wolfssl)
+  MAKE_FLAGS += \
+	USE_WOLFSSL="yes"
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+  MAKE_FLAGS += \
+	USE_MBEDTLS="yes"
+endif
+
+ifeq ($(BUILD_VARIANT),openssl)
+  MAKE_FLAGS += \
+	USE_OPENSSL="yes"
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/stunc/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-define Package/stunc/install
+define Package/stunc/default/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -55,4 +107,12 @@ define Package/stunc/install
 	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/src/libstunc.so)
 endef
 
+Package/stunc/install = $(Package/stunc/default/install)
+Package/stunc-openssl/install = $(Package/stunc/default/install)
+Package/stunc-wolfssl/install = $(Package/stunc/default/install)
+Package/stunc-mbedtls/install = $(Package/stunc/default/install)
+
 $(eval $(call BuildPackage,stunc))
+$(eval $(call BuildPackage,stunc-openssl))
+$(eval $(call BuildPackage,stunc-wolfssl))
+$(eval $(call BuildPackage,stunc-mbedtls))

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=3.1.48
+PKG_VERSION:=3.1.53
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=5debc3b288afdce678f906f70aa25129d5a45d1e
+PKG_SOURCE_VERSION:=0108f9c192a168936ee223dbf4d85a7ceba7093d
 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.48
+PKG_VERSION:=3.1.53
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=cf80e7df81b840765297cf776baaceba38e462de
+PKG_SOURCE_VERSION:=5d0336f678a116cdf4c73fec7c0d8ab06c0f65d6
 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.27
+PKG_VERSION:=3.1.52
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=6b1d30d7918adeb19c5177dd7c5472cb0dac9896
+PKG_SOURCE_VERSION:=af612edb4ea186d9c71fc2157883bf686b14e376
 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.42
+PKG_VERSION:=3.1.52
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=e209cbc04a92494b96c74cee443e1b385c6687fe
+PKG_SOURCE_VERSION:=ac4a73768844796be5678559b64269e6fe073192
 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.38
+PKG_VERSION:=3.1.52
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=dd9dab9fb8aca87991cd2cc02c5fedd8baee3b97
+PKG_SOURCE_VERSION:=e1c5b4473fba9d42ef7d1e95e634416585bf5887
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

testnet/Makefile

@@ -0,0 +1,27 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=testnet
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
+include $(INCLUDE_DIR)/package.mk
+
+define Package/testnet
+  CATEGORY:=Utilities
+  TITLE:=Check WAN IP Connection
+  DEPENDS:=+ndisc6
+endef
+
+define Package/testnet/description
+	Check WAN IP connection
+endef
+
+define Build/Compile
+endef
+
+define Package/testnet/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,testnet))

testnet/files/etc/hotplug.d/iface/05-testnet

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # do not start testnet if the feature is explicitly disabled
-[ "$(uci -q get netmode.testnet.enabled)" = "0" ] && exit 0
+[ "$(uci -q get testnet.global.enabled)" = "0" ] && exit 0
 
 [ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 0
 
@@ -14,8 +14,4 @@ interface_check() {
 }
 
 interface_check
-if [ -n "$(pgrep -f testnet)" ]; then
-	testnet once
-else
-	testnet &
-fi
+/etc/init.d/testnet reload

testnet/files/etc/init.d/testnet

@@ -0,0 +1,23 @@
+#!/bin/sh /etc/rc.common
+
+START=21
+STOP=10
+USE_PROCD=1
+
+TESTNET=$(which testnet)
+
+start_service() {
+	# do not start testnet if the feature is explicitly disabled
+	[ "$(uci -q get testnet.global.enabled)" = "0" ] && return 0
+
+	[ -n "$TESTNET" ] && {
+		procd_open_instance
+		procd_set_param command "$TESTNET"
+		procd_set_param respawn
+		procd_close_instance
+	}
+}
+
+reload_service() {
+	procd_send_signal testnet
+}

testnet/files/sbin/testnet

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-. /lib/functions.sh
-. /lib/network/utils.sh
+RELOAD=0
+WAITING=0
 
 NETCON=0
 LASTSTATUS=""
@@ -14,29 +14,32 @@ test_connection() {
 	local defroute="$(ip r | grep default | awk '{print$3}' | head -1)"
 	local def6route="$(ip -f inet6 r | grep default | awk '{print$3}')"
 	local ping6dev="$(ip -f inet6 r | grep default | awk '{print$5}')"
+	local resolvfile="$(uci -q get 'dhcp.@dnsmasq[0].resolvfile')"
 
 	if [ -n "$addr" ]; then
-		ping -q -w 5 -c 1 $addr >/dev/null 2>&1 && return 0
+		ping -q -w 5 -c 1 "$addr" >/dev/null 2>&1 && return 0
 	elif [ -n "$defroute" ]; then
-		ping -q -w 5 -c 1 $defroute >/dev/null 2>&1 && return 0
-		for nmsrv in $(grep nameserver /var/resolv.conf.auto | awk '{print$2}'); do
-			ping -q -w 5 -c 1 $nmsrv >/dev/null 2>&1 && return 0
-		done
+		ping -q -w 5 -c 1 "$defroute" >/dev/null 2>&1 && return 0
+		if [ -e "$resolvfile" ]; then
+			for nmsrv in $(grep nameserver "$resolvfile" | awk '{print$2}'); do
+				ping -q -w 5 -c 1 "$nmsrv" >/dev/null 2>&1 && return 0
+			done
+		fi
 	elif [ -n "$def6route" -a -n "$ping6dev" ]; then
-		ndisc6 -w 5 -1 $def6route $ping6dev >/dev/null 2>&1 && return 0
+		ndisc6 -w 5 -1 "$def6route" "$ping6dev" >/dev/null 2>&1 && return 0
 	fi
 	return 1
 }
 
 internet_test() {
-	local link dest
+	local dest
 
 	# use the destination address given in config for connectivity check
-	dest="$(uci -q get netmode.testnet.destination)"
+	dest="$(uci -q get testnet.global.destination)"
 	# for backwards compatibility
-	[ -n "$dest" ] || dest="$(uci -q get diagnostics.@connectivity[0].destination)"
+	[ -n "$dest" ] || dest="$(uci -q get 'system.@system[0].netping_addr')"
 
-	test_connection $dest
+	test_connection "$dest"
 
 	if [ "$?" -eq 0 ]; then
 		NETCON=1
@@ -50,7 +53,7 @@ internet_test() {
 connectivity_test() {
 	internet_test
 
-	if [ $NETCON -eq 1 ]; then
+	if [ "$NETCON" -eq 1 ]; then
 		CURSTATUS=1
 		[ "$CURSTATUS" == "$LASTSTATUS" ] || ubus send internet '{"status" : "online"}'
 		LASTSTATUS=1
@@ -61,12 +64,14 @@ connectivity_test() {
 	fi
 }
 
-if [ "$1" == "once" ]; then
-	connectivity_test
-	exit 0
-fi
+trap RELOAD=1 HUP
 
 while true; do
+	if [ "$WAITING" -eq 0 ]; then
+		sleep "$SLEEP_TIME" &
+		WAITING=1
+	fi
+	RELOAD=0
 	connectivity_test
-	sleep $SLEEP_TIME
+	[ "$RELOAD" -eq 0 ] && wait && WAITING=0
 done

tr104/Config.in

@@ -1,7 +1,7 @@
 config TR104_RUNAS_BBFDM_MICROSERVICE
 	bool "Use bbfdmd datamodel microservice to run tr104, preferred if TR104 and BBFDMD are on different base"
 	depends on PACKAGE_tr104
-	default n
+	default y
 
 config TR104_VENDOR_EXTENSIONS
 	bool "Use TR104 vendor extensions"

tr104/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.15
+PKG_VERSION:=1.0.13.3
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=95a3162347afb2fc3b79718b918f8cbc39be0c5f
+PKG_SOURCE_VERSION:=38ef8533501af818638339acce21fc1fdfc95ee2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -32,7 +32,7 @@ define Package/$(PKG_NAME)
   SUBMENU:=TRx69
   TITLE:=TR104 Datamodel Daemon
   MENU:=1
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +asterisk
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +asterisk +libcurl +PACKAGE_libbbfdm-api:libbbfdm-api
 endef
 
 define Package/$(PKG_NAME)/description
@@ -54,7 +54,7 @@ CMAKE_OPTIONS += \
 	-DTR104_EXTENSION_DIR:String="iowrt"
 endif
 
-ifeq ($(CONFIG_RUNAS_BBFDM_MICROSERVICE),y)
+ifeq ($(CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE),y)
 MAKE_PATH:=libdm
 EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/libbbfdm-api
 CMAKE_OPTIONS += -DRUNAS_BBFDM_MICROSERVICE:BOOL=ON
@@ -76,7 +76,7 @@ define Package/$(PKG_NAME)/install
 ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1)/etc/tr104/plugins/
 endif
-ifeq ($(CONFIG_RUNAS_BBFDM_MICROSERVICE),y)
+ifeq ($(CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE),y)
 	$(INSTALL_BIN) ./files/etc/init.d/tr104d.bbfdm $(1)/etc/init.d/tr104d
 else
 	$(INSTALL_DIR) $(1)/usr/sbin

twamp/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/twamp-light.git
-PKG_SOURCE_VERSION:=d31b2128e6ea4ab42538b88db91b2cc84091ef4d
+PKG_SOURCE_VERSION:=f3d35a5499e8815721ba384e79fda8181f76b8f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

urlfilter/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.9
+PKG_VERSION:=1.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
-PKG_SOURCE_VERSION:=75077256211644443ca30cc994ef16b013c4131c
+PKG_SOURCE_VERSION:=a726e4ce9fa3322e135cb0dd961f31b4fd7ae22a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

urlfilter/files/etc/init.d/urlfilter

@@ -21,7 +21,7 @@ configure_firewall()
 		iptables -w -I INPUT 2 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 
 		# disable acceleration for https packet so that they can be read by urlfilter
-		ebtables -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
+		ebtables -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG
 	fi
 	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
 	if [ "$?" -ne 0 ]; then
@@ -62,7 +62,7 @@ stop_service() {
 		iptables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -D INPUT -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -D INPUT -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ebtables -D FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
+		ebtables -D FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG
 	fi
 	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
 	if [ "$?" -eq 0 ]; then

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.12
+PKG_VERSION:=1.2.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=b09414824b95f2a73e6f02b06d4efd15bfab77e0
+PKG_SOURCE_VERSION:=4f429e25c6e7a69c5171186731bc560befa5a660
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

usp-js/Makefile

@@ -6,11 +6,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usp-js
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git
-PKG_SOURCE_VERSION:=61cf7adb3258820f12f5dc02c69c5bdd612ed4cd
+PKG_SOURCE_VERSION:=fa4586a0fc5fe13bc83165c8401e63d84db89e72
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

voicemngr/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.8
 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:=4005a01b0b1c4a9ab6e2109aca3fdc204f444048
+PKG_SOURCE_VERSION:=3eff99d3bd62cbbc176c71f77a2df495f4e46e62
 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.2.5
+PKG_VERSION:=16.2.1.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c52161b6b34e0b3a0abf14260bb22815ae1d655
+PKG_SOURCE_VERSION:=a95b5a3d0c87ad486752c2a7423b017c8bb0d0e6
 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.4
+PKG_VERSION:=2.2.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=543c7a780544d195dd8d0357e453c0ce4fa62454
+PKG_SOURCE_VERSION:=23a7f6005b84fc4d4a1432057ecd2b5a74f9ea3e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif