porttrigger: implementation of porttrigger

Added init script Makefile and library for rule installation
inbd: remove package
2025-12-26 03:53:58 +08:00 · 2024-01-18 10:01:26 +05:30 · 2024-01-16 17:36:57 +05:30 · 2024-01-16 16:14:05 +05:30 · 2024-01-16 16:09:36 +05:30 · 2024-01-16 16:06:48 +05:30
55 changed files with 907 additions and 554 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.4.17
+PKG_VERSION:=1.5.4

 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=7e708fba4046eb41ea109265328b9d89cd4dafa9
+PKG_SOURCE_VERSION:=cd2066de6781ace66d3165937a138a0f12353d8c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -31,45 +31,13 @@ define Package/libbbfdm-api
  ABI_VERSION:=1.0
 endef

-define Package/libbbfdm/default
+define Package/libbbfdm
  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
-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
+	    +BBF_TR471:obudpst +libopenssl
 endef

 define Package/bbfdmd
@@ -77,9 +45,7 @@ define Package/bbfdmd
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Datamodel ubus backend
-  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
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm
 endef

 define Package/userinterface
@@ -136,22 +102,6 @@ CMAKE_OPTIONS += \

 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
@@ -162,7 +112,7 @@ define Package/libbbfdm-api/install
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
 endef

-define Package/libbbfdm/default/install
+define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
@@ -183,7 +133,7 @@ ifeq ($(CONFIG_BBF_TR143),y)
 endif
 endef

-define Package/libbbfdm/default/prerm
+define Package/libbbfdm/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
@@ -216,16 +166,6 @@ 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
@@ -243,9 +183,6 @@ 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))
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.2
+PKG_VERSION:=2.1.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=d83c42070e7f10178dc1c2d0ce078e3d6d42d889
+PKG_SOURCE_VERSION:=f03fb8682aa7efe760294e54c422f2eab856e08c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 iopsys Software Solutions AB
+# Copyright (C) 2018-2024 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.2.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=43dec92b1c86be7859521da337e7bd1168848b26
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
+PKG_SOURCE_VERSION:=cb8b8fd2549751bcd38808391b76a1a9a908c4de
+PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
 endif

@@ -59,7 +60,7 @@ MAKE_FLAGS += \

 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
+	rsync -r --exclude=.* ./dslmngr/ $(PKG_BUILD_DIR)/
 endef
 endif

--- a/ethmngr/Makefile
+++ b/ethmngr/Makefile
@@ -1,18 +1,21 @@
 #
-# Copyright (C) 2020 Iopsys
+# Copyright (C) 2020-2024 Iopsys
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.2

+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b81d06867d895245ef47004c6949f9d6dedd10ef
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
-
+PKG_SOURCE_VERSION:=e5cccdd45a93d969d51c4085cb52b543df544811
+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
 PKG_MIRROR_HASH:=skip
+endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
@@ -32,6 +35,12 @@ define Package/ethmngr/description
 It uses APIs from the libethernet.so library.
 endef

+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
--- a/hostmngr/Makefile
+++ b/hostmngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=hostmngr
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.1.4

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=41f6fb9a26ae9882bff748e47c69cefea2cadbf5
+PKG_SOURCE_VERSION:=edb5bbe57c5bc83035e217c73071c9b3e878dc22
 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
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.23
+PKG_VERSION:=9.6.1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=35228b84fbb4349ef22ef9f18b2cc19e97a8b43f
+PKG_SOURCE_VERSION:=601708dd0a2ca4fad5213e78cc456e0f355f45bc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -26,68 +26,21 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include ../bbfdm/bbfdm.mk

-define Package/icwmp/default
+define Package/icwmp
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
 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/default/install
+define Package/icwmp/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
@@ -103,18 +56,10 @@ define Package/icwmp/default/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
 	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
 	$(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))
--- a/icwmp/files/etc/config/cwmp
+++ b/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 'ERROR'
+	option log_severity 'DEBUG'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
@@ -39,6 +39,7 @@ config cpe 'cpe'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
 	option disable_gatewayinfo '0'
+	option fw_upgrade_keep_settings '1'
 	
 config lwn 'lwn'
 	option enable '0'
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -436,12 +436,14 @@ validate_cpe_section()
 		'notification:bool' \
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
-		'enable:bool' \
-		'periodic_notify_interval:uinteger'
+		'enable:bool:1' \
+		'periodic_notify_interval:uinteger' \
+		'fw_upgrade_keep_settings:bool'
 }

 validate_defaults() {
-	local ssl_capath
+	local ssl_capath enable url dhcp_url
+
 	config_load cwmp

 	validate_acs_section || {
@@ -449,6 +451,11 @@ 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
@@ -464,6 +471,11 @@ validate_defaults() {
 		return 1;
 	}

+	if [ "$enable" = "0" ]; then
+		log "CWMP service disabled"
+		return 1
+	fi
+
 	return 0;
 }

@@ -511,36 +523,22 @@ 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;
 	}

-	if [ -n "${url}" ] || [ -n "${dhcp_url}" ]; then
-		procd_set_param command "$PROG"
-		procd_append_param command -b
-	fi
+	procd_set_param command "$PROG"
+	procd_append_param command -b

 	procd_set_param respawn \
 		"${respawn_threshold:-5}" \
 		"${respawn_timeout:-10}" "${respawn_retry:-3}"

-	procd_set_param watch network.interface
 	procd_close_instance
 }

@@ -552,22 +550,34 @@ stop_service()
 reload_service() {
 	local ret

-	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-
 	log "Reload service $ret"
 	ret="0"
-	if [ "$enable_cwmp" = "0" ]; then
+
+	validate_defaults || {
 		stop
 		start
-		return 0
-	fi
+		return 0;
+	}

 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 	if [ "$ret" != "true" ]; then
 		log "Reloading cwmp service ..."
 		stop
 		start
+		return 0
+	fi
+
+	tr069_status="$(ubus -t 1 call tr069 status)"
+	ret="$?"
+	if [ "$ret" = "7" ]; then
+		# ubus timed out may be due to uloop is busy in some task so return
+		log "Skipping ubus reload due to ubus timeout"
+		return 0
+	fi
+
+	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
+	if [ "$status" = "up" ]; then
+		ubus -t 1 call tr069 command '{"command":"reload"}'
 	fi
 }

--- a/icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
+++ b/icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+CLASS=""
+OUI=""
+SERIAL=""
+
+get_vivsoi() {
+	# opt125 environment variable has data in below format
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |	 enterprise-number1	  |
+	# |				  |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |   data-len1   |		  |
+	# +-+-+-+-+-+-+-+-+ option-data1  |
+	# /				  /
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+	# |	 enterprise-number2	  |   ^
+	# |				  |   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# |   data-len2   |		  | optional
+	# +-+-+-+-+-+-+-+-+ option-data2  |   |
+	# /				  /   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# ~	       ...		  ~   V
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+
+	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data	  Sub Op  SLen Data
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+	# |	id    |  n  |	1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+
+	local opt125="$1"
+	local len="$2"
+	local ent_id
+
+	#hex-string 2 character=1 Byte
+	# length in hex string will be twice of actual Byte length
+	[ "$len" -gt "8" ] || return
+
+	data="${opt125}"
+	rem_len="${len}"
+	while [ $rem_len -gt 0 ]; do
+		ent_id=${data:0:8}
+		ent_id=$(printf "%d\n" "0x$ent_id")
+
+		if [ $ent_id -ne  3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - $data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		data_len=$(printf "%d\n" "0x$len_val")
+		# add 4 byte for ent_id and 1 byte for len
+		data_len=$(( data_len * 2 + 10 ))
+
+		opt_len=$(printf "%d\n" "0x$len_val")
+		[ $opt_len -eq 0 ] && return
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# get the value of sub option starting 4 means starting after length
+			sub_opt_val=${sub_data:4:${sub_opt_len}}
+
+			# assign the value found in sub option
+			case "${sub_opt_id}" in
+				"4") OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"5") SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"6") CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+			esac
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+		done
+
+		# move ahead data to next enterprise id
+		data=${data:"${data_len}":"${rem_len}"}
+		rem_len=$(( rem_len - data_len ))
+	done
+}
+
+config_load cwmp
+config_get_bool enable_cwmp cpe enable 1
+config_get wan_intf cpe default_wan_interface "wan"
+
+if [ "$enable_cwmp" = "0" ]; then
+	return 0
+fi
+
+if [ "${wan_intf}" == "${INTERFACE}" ]; then
+	if [ -n "$opt125" ]; then
+		len=$(printf "$opt125"|wc -c)
+		get_vivsoi "$opt125" "$len"
+	fi
+
+	mkdir -p /var/state
+	touch /var/state/icwmp
+	sec=$(uci -q -c /var/state get icwmp.gatewayinfo)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q -c /var/state add icwmp gatewayinfo)
+		uci -q -c /var/state rename icwmp."${sec}"="gatewayinfo"
+	fi
+
+	uci -q -c /var/state set icwmp.gatewayinfo.class="$CLASS"
+	uci -q -c /var/state set icwmp.gatewayinfo.oui="$OUI"
+	uci -q -c /var/state set icwmp.gatewayinfo.serial="$SERIAL"
+	uci -q -c /var/state commit icwmp
+fi
--- a/icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
+++ b/icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
@@ -0,0 +1,141 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+DHCP_ACS_URL=""
+DHCP_PROV_CODE=""
+MIN_WAIT_INVL=""
+INVL_MULTIPLIER=""
+
+log() {
+	echo "$@" |logger -t cwmp.update -p info
+}
+
+get_opt43() {
+	# Check if option value is in encapsulated form
+	local opt43="$1"
+	local len="$2"
+
+	[ "$len" -gt "2" ] || return
+
+	first_byte=${opt43:0:2}
+	first_byte=$(printf "%d\n" "0x$first_byte")
+
+	if [ $len -ge 4 ] && [ $first_byte -ge 1 ] && [ $first_byte -le 4 ]; then
+		# it is in encapsulated form
+		# opt43 encapsulated vendor-specific option has data in below format
+		#  Code   Len   Data item        Code   Len   Data item        Code
+		# +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+		# |  T1 |  n  |  d1 |  d2 | ... |  T2 |  n  |  D1 |  D2 | ... | ... |
+		# +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+
+		#hex-string 2 character=1 Byte
+		# length in hex string will be twice of actual Byte length
+
+		data="${opt43}"
+		rem_len="${len}"
+		# parsing of suboption of option 43
+		while [ $rem_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+
+			# get the length of suboption
+			sub_opt_len=${data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# get the value of sub option starting 4 means starting after length
+			sub_opt_val=${data:4:${sub_opt_len}}
+
+			# assign the value found in sub option
+			case "${sub_opt_id}" in
+				"1") DHCP_ACS_URL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"2") DHCP_PROV_CODE=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"3") MIN_WAIT_INVL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"4") INVL_MULTIPLIER=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+			esac
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# fetch next sub option hex string
+			data=${data:${sub_opt_end}:${len}}
+
+			# update the remaining sub option hex string length
+			rem_len=$((rem_len - sub_opt_end))
+		done
+	else
+		DHCP_ACS_URL=$(echo -n $opt43 | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+	fi
+}
+
+config_load cwmp
+config_get wan_intf cpe default_wan_interface "wan"
+config_get dhcp_discovery acs dhcp_discovery "0"
+config_get dhcp_url acs dhcp_url ""
+config_get min_wait_intvl acs dhcp_retry_min_wait_interval "0"
+config_get intvl_multi acs dhcp_retry_interval_multiplier "0"
+
+config_change=0
+discovery_enable=0
+
+if [ "$dhcp_discovery" = "1" ] || [ "$dhcp_discovery" = "true" ] || [ "$dhcp_discovery" = "enable" ]; then
+	discovery_enable=1
+fi
+
+if [ "$discovery_enable" = "0" ]; then
+	return 0
+fi
+
+if [ "${wan_intf}" == "${INTERFACE}" ]; then
+	if [ -n "$opt43" ]; then
+		len=$(printf "$opt43"|wc -c)
+		get_opt43 "$opt43" "$len"
+	fi
+
+	if [ -z "$DHCP_ACS_URL" ]; then
+		return 0
+	fi
+
+	sec=$(uci -q get cwmp.acs)
+
+	if [ -z "${sec}" ]; then
+		return 0
+	fi
+
+	if [ "${dhcp_url}" != "${DHCP_ACS_URL}" ]; then
+		uci -q set cwmp.acs.dhcp_url="$DHCP_ACS_URL"
+		config_change=1
+	fi
+
+	if [ -n "$MIN_WAIT_INVL" ] && [ "${MIN_WAIT_INVL}" != "${min_wait_intvl}" ]; then
+		uci -q set cwmp.acs.dhcp_retry_min_wait_interval="$MIN_WAIT_INVL"
+		config_change=1
+	fi
+
+	if [ -n "$INVL_MULTIPLIER" ] && [ "${INVL_MULTIPLIER}" != "${intvl_multi}" ]; then
+		uci -q set cwmp.acs.dhcp_retry_interval_multiplier="$INVL_MULTIPLIER"
+		config_change=1
+	fi
+
+	sec=$(uci -q get cwmp.cpe)
+
+	if [ -n "${sec}" ] && [ -n "$DHCP_PROV_CODE" ]; then
+		uci -q set cwmp.cpe.dhcp_provisioning_code="$DHCP_PROV_CODE"
+		config_change=1
+	fi
+
+	if [ $config_change -eq 0 ]; then
+		return 0
+	fi
+
+	# ACS url has been set, inform icwmpd to reload new configuration
+	sleep 10 # wait for some time to avoid interface fluctuation
+
+	ubus call uci commit '{"config":"cwmp"}'
+fi
--- a/inbd/Makefile
+++ b/inbd/Makefile
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2016 iopsys
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=inbd
-PKG_VERSION:=1.2.3
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=d4e910a31039e0c0b7a539311eafcd716c36be77
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-# support parallel build
-PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/inbd
-	CATEGORY:=Utilities
-	TITLE:=iopsys Netlink Bridge Daemon
-	URL:=
-	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
-endef
-
-define Package/inbd/description
-	Application handling netlink messages from kernel and sending them out on ubus.
-endef
-
-define Package/inbd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inbd $(1)/usr/bin/
-	cp $(PKG_BUILD_DIR)/files/etc/init.d/inbd $(1)/etc/init.d/
-endef
-
-$(eval $(call BuildPackage,inbd))
--- a/iop/config
+++ b/iop/config
@@ -18,6 +18,12 @@ CONFIG_INCLUDE_CONFIG=y
 CONFIG_TARGET_CUSTOMER="IOPSYS"
 CONFIG_TARGET_ROOTFS_TARGZ=y

+# Although UBIFS and EXT4 images work on all non-secure-boot devices,
+# squashfs is the only officially supported rootfs filesystem.
+# A writable rootfs is useful for developping an debugging preinit code.
+# CONFIG_TARGET_ROOTFS_UBIFS is not set
+# CONFIG_TARGET_ROOTFS_EXT4FS is not set
+
 # /etc/banner and /etc/device_info #
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
@@ -58,7 +64,6 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 ################

 # EasySoC HAL #
-CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_qosmngr=y
 CONFIG_PACKAGE_libwifiutils=y
 CONFIG_PACKAGE_wifimngr=y
@@ -173,6 +178,8 @@ CONFIG_PACKAGE_iptables-mod-ipmark=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
 CONFIG_PACKAGE_iptables-mod-nflog=y
 CONFIG_PACKAGE_iptables-mod-nfqueue=y
+CONFIG_PACKAGE_iputils-arping=y
+CONFIG_PACKAGE_iputils-ping=y
 CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_rdisc6=y
 CONFIG_PACKAGE_resolveip=y
@@ -189,6 +196,7 @@ CONFIG_PACKAGE_at=y
 CONFIG_PACKAGE_ca-certificates=y
 CONFIG_PACKAGE_crun=y
 CONFIG_PACKAGE_getopt=y
+CONFIG_PACKAGE_gpiod-tools=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_jq=y
 CONFIG_PACKAGE_libcap-bin=y
@@ -241,7 +249,6 @@ CONFIG_PACKAGE_nginx-mod-luci=y

 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
-CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
@@ -322,3 +329,8 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
+# CONFIG_BUSYBOX_CONFIG_ARPING is not set
+# CONFIG_BUSYBOX_CONFIG_PING is not set
+# CONFIG_BUSYBOX_CONFIG_PING6 is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING is not set
--- a/iop/scripts/feeds_update.sh
+++ b/iop/scripts/feeds_update.sh
@@ -61,7 +61,7 @@ function feeds_update {
 	(
 		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'
+		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
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -365,11 +365,27 @@ function genconfig {
 		    echo "" >> .config
 		fi
 		# hack to support custom-devices until we have deprecated this genconfig-script...
-		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
-			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
-			echo "" >> .config
-		fi
-		
+		local custom_found=false
+		local used_config_file
+
+		for config_file in feeds/*/devices/$target/config/$BOARDTYPE/config; do
+			if [ "$custom_found" = "true" ]; then
+				echo
+				echo "Error was found!"
+				echo "Please use only one path."
+				echo "Two instances of $target/config/$BOARDTYPE exists:"
+				echo "Path 1: $used_config_file"
+				echo "Path 2: $config_file"
+				return 1
+			fi
+			if [ -f "$config_file" ]; then
+				cat "$config_file" >> .config
+				echo "" >> .config
+				custom_found=true
+				used_config_file=$config_file
+			fi
+		done
+
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
 		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
@@ -383,6 +399,8 @@ function genconfig {
 			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
--- a/iop/scripts/genconfig_min.sh
+++ b/iop/scripts/genconfig_min.sh
@@ -339,10 +339,26 @@ function genconfig_min {
 		    echo "" >> .config
 		fi
 		# hack to support custom-devices until we have deprecated this genconfig-script...
-		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
-			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
-			echo "" >> .config
-		fi
+		local custom_found=false
+		local used_config_file
+
+		for config_file in feeds/*/devices/$target/config/$BOARDTYPE/config; do
+			if [ "$custom_found" = "true" ]; then
+				echo
+				echo "Error was found!"
+				echo "Please use only one path."
+				echo "Two instances of $target/config/$BOARDTYPE exists:"
+				echo "Path 1: $used_config_file"
+				echo "Path 2: $config_file"
+				return 1
+			fi
+			if [ -f "$config_file" ]; then
+				cat "$config_file" >> .config
+				echo "" >> .config
+				custom_found=true
+				used_config_file=$config_file
+			fi
+		done

 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
@@ -357,6 +373,8 @@ function genconfig_min {
 			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
--- a/libdsl/Makefile
+++ b/libdsl/Makefile
@@ -24,8 +24,9 @@ include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
-  CHIP_ID=$(subst BCM,,$(call toupper,$(patsubst "%",%,$(CONFIG_TARGET_SUBTARGET))))
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM$(CHIP_ID) \
+  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
+  CHIP_ID=$(CONFIG_ID:BCM9%=%)
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_x86),y)
--- a/libethernet/Makefile
+++ b/libethernet/Makefile
@@ -24,8 +24,9 @@ include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
-  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
+  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
+  CHIP_ID=$(CONFIG_ID:BCM9%=%)
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
--- a/libqos/Makefile
+++ b/libqos/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libqos
-PKG_VERSION:=7.2.105
+PKG_VERSION:=7.2.106

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=61b15e0fe345186d36d0ca3212a08f384af3609b
+PKG_SOURCE_VERSION:=02dba6571fddd9b4c5b4b671270604b4c0faf9ae
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -24,8 +24,9 @@ include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
-  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
+  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
+  CHIP_ID=$(CONFIG_ID:BCM9%=%)
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_x86),y)
--- a/libvoice-broadcom/Makefile
+++ b/libvoice-broadcom/Makefile
@@ -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:=d93226ae8db776a445ed94e2be706d6539cd09bc
+PKG_SOURCE_VERSION:=e1de60c2c05935fb2f4adfc1f73feba0bb32ade6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,7 @@ PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD

 LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)

-export CONFIG_BCM_CHIP_ID
+export BCM_CHIP_ID:=$(SUBTARGET)

 include $(INCLUDE_DIR)/package.mk

--- a/libwifi/Makefile
+++ b/libwifi/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.12
+PKG_VERSION:=7.4.18

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1b7717a2ca767846b0612156eaecb48f535bbb62
+PKG_SOURCE_VERSION:=4f6d22e0afa199bcff63f084a022c6142883973f
 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
@@ -26,8 +26,9 @@ include $(INCLUDE_DIR)/package.mk
 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
  TARGET_WIFI_TYPE=BROADCOM
-  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
+  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
+  CHIP_ID=$(CONFIG_ID:BCM9%=%)
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_x86),y)
@@ -142,7 +143,7 @@ define Package/libwifi/config

 	config LIBWIFI_USE_CTRL_IFACE
 		bool "Create UNIX sockets to interface with hostapd/wpa_supplicant"
-		default n
+		default y
  endif
 endef

--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.0.9
+PKG_VERSION:=4.5.1.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=eca967705c571a06a112f182e4abb011a29a9034
+PKG_SOURCE_VERSION:=6d74ca3c6a4a2893160a5de2f7f455a8d8596fec
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 PKG_LICENSE:=BSD-3-Clause
--- a/map-agent/files/etc/hotplug.d/ieee80211/30-generate-map-config
+++ b/map-agent/files/etc/hotplug.d/ieee80211/30-generate-map-config
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-strings /proc/device-tree/compatible | grep -qE '^(econet,|airoha,)' && \
-/lib/wifi/multiap conf
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=4.5.0.2
+PKG_VERSION:=4.5.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3c915f5f17ff339487a3b8533d384a23888b9c9a
+PKG_SOURCE_VERSION:=59a3bb0e2cbd0f37f60bd121e4b30289a64d310e
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 LOCAL_DEV=0
--- a/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate
+++ b/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate
@@ -89,15 +89,24 @@ interfaces_ok(){
 	# check if upstream untagged
 	IFS=" "
 	for itf in $up_interf; do
-		# check if there exist a device section for this upstream interface, if yes the
-		# do nothing, if no then split the it at . and use the native interface as
-		# upstream interface
-		dev_section=$(ubus call uci get '{"config":"network", "type":"device", "match":{"name":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])
+		# check if there exist a interface section for this upstream interface, if yes the
+		# do nothing, if no then generate config as mcast config is outdated
+		local dev_section=$(uci show network | grep -E "\.device=\'$itf\'" | cut -d'.' -f2)

 		# mcast config is outdated, simply generate as per new logic
 		if [ -z "$dev_section" ]; then
 		       # check if the itf is a native interface	&& return 1
-			[ -f "/proc/net/vlan/$itf" ] || return 1
+			return 1
+		else
+			section_type=$(uci get network.$dev_section)
+			if [ "$section_type" == "interface" ]; then
+				# interface section exits, hence, sync has already happened
+				# nothing to do further, just return
+				return 0
+			else
+				# mcast config is outdated
+				return 1
+			fi
 		fi
 	done
 	return 0
--- a/mcastmngr/files/linux/lib/mcast/linux.sh
+++ b/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 | cut -d'.' -f2)"
+	local devsec__="$(uci show network | grep name=.*$device | grep -v ifname | 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
@@ -311,6 +311,16 @@ config_mcproxy_instance() {
 	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
 }

+disable_snooping_iface() {
+	local iface="$(uci -q get network.$1.name)"
+	config_sysfs_mcast_snooping "$iface" 0
+}
+
+disable_snooping() {
+	config_load network
+	config_foreach disable_snooping_iface device
+}
+
 config_snooping() {
 	local protocol="$1"

@@ -383,6 +393,7 @@ config_snooping() {
 }

 config_mcproxy() {
+	disable_snooping
 	if [ "$igmp_p_enable" == "1" ]; then
 		config_mcproxy_instance igmp "$igmp_p_version"
 	elif [ "$igmp_s_enable" == "1" ]; then
--- a/mosquitto-auth-shadow/src/mosquitto_auth_shadow.c
+++ b/mosquitto-auth-shadow/src/mosquitto_auth_shadow.c
@@ -11,6 +11,7 @@
 *   Erik Karlsson - initial implementation
 */

+#define _GNU_SOURCE
 #include <string.h>
 #include <shadow.h>
 #include <crypt.h>
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.2
+PKG_VERSION:=7.0.5.8

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=1d1d058fe9772df5e31c8236d91b7e3daae08d33
+PKG_SOURCE_VERSION:=d11c8505ffddb4c840d630632b0bb7dda04ca5b2
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/obuspa/files/etc/obuspa/roles.json
+++ b/obuspa/files/etc/obuspa/roles.json
@@ -71,6 +71,28 @@
            "PERMIT_SUBS_EVT_OPER_COMP"
          ]
        },
+        {
+          "object": "Device.Reboot()",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
+        {
+          "object": "Device.FactoryReset()",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
        {
          "object": "Device.DeviceInfo.",
          "perm": [
@@ -161,6 +183,23 @@
            "PERMIT_SUBS_EVT_OPER_COMP"
          ]
        },
+        {
+          "object":"Device.DHCPv4.Server.Pool.{i}.StaticAddress.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_SET",
+            "PERMIT_ADD",
+            "PERMIT_DEL",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
        {
          "object":"Device.DHCPv6.",
          "perm": [
@@ -505,6 +544,23 @@
            "PERMIT_SUBS_OBJ_DEL",
            "PERMIT_SUBS_EVT_OPER_COMP"
          ]
+        },
+        {
+          "object":"Device.SSH.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_SET",
+            "PERMIT_ADD",
+            "PERMIT_DEL",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
        }
      ]
    },
@@ -719,27 +775,6 @@
            "PERMIT_SUBS_EVT_OPER_COMP"
          ]
        },
-        {
-          "object":"Device.SoftwareModules.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Users.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
        {
          "object": "Device.LocalAgent.Subscription.",
          "perm": [
--- a/obuspa/patches/0007-bdc_csv_format.patch
+++ b/obuspa/patches/0007-bdc_csv_format.patch
@@ -1,6 +1,6 @@
 --- a/src/core/bdc_exec.c
 +++ b/src/core/bdc_exec.c
-@@ -547,11 +547,19 @@ int StartSendingReport(bdc_connection_t
+@@ -547,11 +547,19 @@
 
     // Set the list of headers
     bc->headers = NULL;
@@ -25,7 +25,7 @@
     {
 --- a/src/core/bdc_exec.h
 +++ b/src/core/bdc_exec.h
-@@ -53,6 +53,9 @@ void BDC_EXEC_ScheduleExit(void);
+@@ -53,6 +53,9 @@
 #define BDC_FLAG_PUT            0x00000001  // If set, HTTP PUT should be used instead of HTTP POST when sending the report to the BDC server
 #define BDC_FLAG_GZIP           0x00000002  // If set, the reports contants are Gzipped
 #define BDC_FLAG_DATE_HEADER    0x00000004  // If set, the date header should be included in the HTTP post.
@@ -52,7 +52,7 @@
 
 
 // Definitions for Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
-@@ -153,6 +156,7 @@ static char *profile_push_event_args[] =
+@@ -153,6 +156,7 @@
 typedef struct
 {
     int num_retained_failed_reports;
@@ -60,7 +60,7 @@
     char report_timestamp[33];
     char url[1025];
     char username[257];
-@@ -161,6 +165,11 @@ typedef struct
+@@ -161,6 +165,11 @@
     char method[9];
     bool use_date_header;
     char report_format[20];
@@ -72,7 +72,7 @@
 } profile_ctrl_params_t;
 
 //------------------------------------------------------------------------------
-@@ -208,6 +217,7 @@ int Validate_BulkDataEncodingType(dm_req
+@@ -208,6 +217,7 @@
 int Validate_BulkDataReportingInterval(dm_req_t *req, char *value);
 int Validate_BulkDataReference(dm_req_t *req, char *value);
 int Validate_BulkDataReportFormat(dm_req_t *req, char *value);
@@ -80,7 +80,7 @@
 int Validate_BulkDataReportTimestamp(dm_req_t *req, char *value);
 int Validate_BulkDataCompression(dm_req_t *req, char *value);
 int Validate_BulkDataHTTPMethod(dm_req_t *req, char *value);
-@@ -236,6 +246,8 @@ bulkdata_profile_t *bulkdata_find_profil
+@@ -236,6 +246,8 @@
 int bulkdata_calc_report_map(bulkdata_profile_t *bp, kv_vector_t *report_map);
 int bulkdata_reduce_to_alt_name(char *spec, char *path, char *alt_name, char *out_buf, int buf_len);
 char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp, char *report_format);
@@ -89,15 +89,16 @@
 unsigned char *bulkdata_compress_report(profile_ctrl_params_t *ctrl, char *input_buf, int input_len, int *p_output_len);
 int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_profile_t *bp, unsigned char *json_report, int report_len);
 int bulkdata_start_profile(bulkdata_profile_t *bp);
-@@ -250,6 +262,7 @@ char *bulkdata_platform_calc_uri_query_s
+@@ -250,6 +262,8 @@
 int bulkdata_platform_get_param_refs(int profile_id, param_ref_vector_t *param_refs);
 void bulkdata_expand_param_ref(param_ref_entry_t *pr, group_get_vector_t *ggv);
 void bulkdata_append_to_result_map(param_ref_entry_t *pr, group_get_vector_t *ggv, kv_vector_t *report_map);
 +void append_string_to_target(char *str, char **output);
+char *csv_encode(const char *str);
 
 /*********************************************************************//**
 **
-@@ -282,7 +295,7 @@ int DEVICE_BULKDATA_Init(void)
+@@ -282,7 +296,7 @@
     err |= USP_REGISTER_VendorParam_ReadOnly("Device.BulkData.Status", Get_BulkDataGlobalStatus, DM_STRING);
     err |= USP_REGISTER_Param_Constant("Device.BulkData.MinReportingInterval", BULKDATA_MINIMUM_REPORTING_INTERVAL_STR, DM_UINT);
     err |= USP_REGISTER_Param_SupportedList("Device.BulkData.Protocols", bdc_protocols, NUM_ELEM(bdc_protocols));
@@ -106,7 +107,7 @@
     err |= USP_REGISTER_Param_Constant("Device.BulkData.ParameterWildCardSupported", "true", DM_BOOL);
     err |= USP_REGISTER_Param_Constant("Device.BulkData.MaxNumberOfProfiles", BULKDATA_MAX_PROFILES_STR, DM_INT);
     err |= USP_REGISTER_Param_Constant("Device.BulkData.MaxNumberOfParameterReferences", "-1", DM_INT);
-@@ -297,7 +310,7 @@ int DEVICE_BULKDATA_Init(void)
+@@ -297,7 +311,7 @@
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Name", "", NULL, NULL, DM_STRING);
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.NumberOfRetainedFailedReports", "0", Validate_NumberOfRetainedFailedReports, NULL, DM_INT);
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Protocol", BULKDATA_PROTOCOL_HTTP, Validate_BulkDataProtocol, NULL, DM_STRING);
@@ -115,7 +116,7 @@
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.ReportingInterval", "86400", Validate_BulkDataReportingInterval, NotifyChange_BulkDataReportingInterval, DM_UINT);
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.TimeReference", UNKNOWN_TIME_STR, NULL, NotifyChange_BulkDataTimeReference, DM_DATETIME);
 
-@@ -312,6 +325,13 @@ int DEVICE_BULKDATA_Init(void)
+@@ -312,6 +326,13 @@
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.JSONEncoding.ReportFormat", BULKDATA_JSON_REPORT_FORMAT_NAME_VALUE, Validate_BulkDataReportFormat, NULL, DM_STRING);
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp", BULKDATA_JSON_TIMESTAMP_FORMAT_EPOCH, Validate_BulkDataReportTimestamp, NULL, DM_STRING);
 
@@ -129,7 +130,7 @@
     // Device.BulkData.Profile.{i}.HTTP
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.URL", "", NULL, NotifyChange_BulkDataURL, DM_STRING);
     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.Username", "", NULL, NULL, DM_STRING);
-@@ -591,9 +611,10 @@ int Validate_BulkDataProtocol(dm_req_t *
+@@ -591,9 +612,10 @@
 int Validate_BulkDataEncodingType(dm_req_t *req, char *value)
 {
     // Exit if trying to set a value outside of the range we accept
@@ -142,7 +143,7 @@
         return USP_ERR_INVALID_VALUE;
     }
 
-@@ -676,6 +697,32 @@ int Validate_BulkDataReportFormat(dm_req
+@@ -676,6 +698,32 @@
 
 /*********************************************************************//**
 **
@@ -175,7 +176,7 @@
 ** Validate_BulkDataReportTimestamp
 **
 ** Validates Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
-@@ -1970,6 +2017,14 @@ int bulkdata_platform_get_profile_contro
+@@ -1970,6 +2018,14 @@
         return err;
     }
 
@@ -190,7 +191,7 @@
     // Exit if unable to get ReportTimestamp
     USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportTimestamp", bp->profile_id);
     err = DATA_MODEL_GetParameterValue(path, ctrl_params->report_timestamp, sizeof(ctrl_params->report_timestamp), 0);
-@@ -1986,6 +2041,46 @@ int bulkdata_platform_get_profile_contro
+@@ -1986,6 +2042,46 @@
         return err;
     }
 
@@ -237,7 +238,7 @@
     return USP_ERR_OK;
 }
 
-@@ -2222,7 +2317,7 @@ void bulkdata_process_profile_http(bulkd
+@@ -2222,7 +2318,7 @@
 {
     int err;
     report_t *cur_report;
@@ -246,7 +247,7 @@
     profile_ctrl_params_t ctrl;
     unsigned char *compressed_report;
     int compressed_len;
-@@ -2261,10 +2356,23 @@ void bulkdata_process_profile_http(bulkd
+@@ -2261,10 +2357,23 @@
     }
 
     // Exit if unable to generate the report
@@ -274,7 +275,7 @@
         return;
     }
 
-@@ -2273,14 +2381,14 @@ void bulkdata_process_profile_http(bulkd
+@@ -2273,14 +2382,14 @@
     USP_LOG_Info("BULK DATA: using compression method=%s", ctrl.compression);
     if (enable_protocol_trace)
     {
@@ -293,7 +294,7 @@
     }
     // NOTE: From this point on, only the compressed_report exists
 
-@@ -2310,9 +2418,15 @@ void bulkdata_process_profile_usp_event(
+@@ -2310,9 +2419,15 @@
     kv_vector_t event_args;
     kv_pair_t kv;
     report_t *cur_report;
@@ -310,7 +311,7 @@
 
     // Exit if the MTP has not been connected to successfully after bootup
     // This is to prevent BDC events being enqueued before the Boot! event is sent (the Boot! event is only sent after successfully connecting to the MTP).
-@@ -2321,20 +2435,62 @@ void bulkdata_process_profile_usp_event(
+@@ -2321,20 +2436,62 @@
         goto exit;
     }
 
@@ -384,7 +385,7 @@
     }
 
     // When sending via USP events, only one report is ever sent in each USP event
-@@ -2354,10 +2510,16 @@ void bulkdata_process_profile_usp_event(
+@@ -2354,10 +2511,16 @@
     bp->num_retained_reports = 1;
 
     // Exit if unable to generate the report
@@ -404,7 +405,7 @@
         return;
     }
 
-@@ -2365,15 +2527,15 @@ void bulkdata_process_profile_usp_event(
+@@ -2365,15 +2528,15 @@
 
     // Construct event_args manually to avoid the overhead of a malloc and copy of the report in KV_VECTOR_Add()
     kv.key = "Data";
@@ -423,10 +424,37 @@
 
     // From the point of view of this code, the report(s) have been successfully sent, so don't retain them
     // NOTE: Sending of the reports successfully is delegated to the USP notification retry mechanism
-@@ -2835,6 +2997,219 @@ char *bulkdata_generate_json_report(bulk
+@@ -2835,6 +2998,319 @@
 
 /*********************************************************************//**
 **
+**  safe_asprintf
+**
+** Wrapper around asprintf that calls terminate in case of error
+**
+** \param   strp -- pointer to the output string
+** \param   fmt -- printing format
+**
+** \return  None
+**
+**************************************************************************/
+static void safe_asprintf(char **strp, const char *fmt, ...)
+{
+	int ret;
+	va_list argp;
+
+	va_start(argp, fmt);
+	ret = vasprintf(strp, fmt, argp);
+	va_end(argp);
+
+	if (ret == -1) {
+		USP_ERR_Terminate("%s (%d): asprintf(%s) failed",
+				  __FUNCTION__, __LINE__, fmt);
+	}
+}
+
+/*********************************************************************//**
+**
 +** append_string_to_target
 +**
 +** concatenates the src string with target string in newly allocated memory
@@ -454,10 +482,70 @@
 +    }
 +
 +    assert(tmp != NULL);
-+    asprintf(output, "%s%s", tmp, str);
+    safe_asprintf(output, "%s%s", tmp, str);
 +    free(tmp);
 +}
 +
+/*************************************************************************
+**
+** csv_encode
+**
+** encodes the src string to CSV specification RFC4180 compliance string
+** and assign back the new pointer.
+**
+** \param   str - pointer to the src string
+** \return  address of the pointer that points to the target string or NULL
+**
+**************************************************************************/
+char *csv_encode(const char *str)
+{
+    if (str == NULL)
+        return NULL;
+
+    int len = strlen(str);
+    if (len == 0)
+        return strdup(str);
+
+    char *temp = NULL;
+    // Get the number of '\"' present in the string
+    int quote_count = 0;
+
+    temp = strchr(str, '\"');
+    while (temp) {
+        quote_count++;
+        temp = strchr(temp+1, '\"');
+    }
+
+    int encode_size = len + quote_count + 3; // added 3 for initial quote, end quote & null at end
+    temp = (char *)malloc(sizeof(char) * encode_size);
+
+    if (!temp)
+        return NULL;
+
+    memset(temp, 0, sizeof(char) * encode_size);
+
+    int i = 0, j = 0;
+
+    temp[j++] = '\"';
+    for (i = 0; i < len; i++) {
+        if (str[i] == '\"') {
+            if (j > (encode_size - 3))
+                break;
+
+            temp[j++] = '\"';
+        }
+
+        if (j > (encode_size - 3))
+            break;
+
+        temp[j++] = str[i];
+    }
+
+    temp[j] = '\"';
+
+    return temp;
+}
+
 +/*********************************************************************//**
 +**
 +**  bulkdata_generate_csv_report
@@ -502,9 +590,9 @@
 +
 +    if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
 +        if (strcmp(row_timestamp, "None") == 0)
-+            asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
+            safe_asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
 +        else
-+            asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
+            safe_asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
 +
 +        assert(str != NULL);
 +        append_string_to_target(str, &output);
@@ -521,14 +609,18 @@
 +        // Add Collection time to each csv report element (only if specified and not 'None')
 +        if (strcmp(row_timestamp, "Unix-Epoch")==0)
 +        {
-+            asprintf(&timestamp, "%lld", (long long int)report->collection_time);
+            safe_asprintf(&timestamp, "%lld", (long long int)report->collection_time);
 +        }
 +        else if (strcmp(row_timestamp, "ISO-8601")==0)
 +        {
 +            char *result = iso8601_from_unix_time(report->collection_time, buf, sizeof(buf));
 +            if (result != NULL)
 +            {
-+                asprintf(&timestamp, "%s", buf);
+                char *val = csv_encode(buf);
+                if (val) {
+                    safe_asprintf(&timestamp, "%s", buf);
+                    free(val);
+                }
 +            }
 +        }
 +
@@ -579,11 +671,14 @@
 +            }
 +
 +            if (type) {
+                char *p_path = csv_encode(param_path);
+                char *p_value = csv_encode(param_value);
+
 +                if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
 +                    if (timestamp == NULL)
-+                        asprintf(&str, "%s%c%s%c%s%c", param_path, separator, param_value, separator, type, rowseparator);
+                        safe_asprintf(&str, "%s%c%s%c%s%c", p_path, separator, p_value, separator, type, rowseparator);
 +                    else
-+                        asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, param_path, separator, param_value, separator, type, rowseparator);
+                        safe_asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, p_path, separator, p_value, separator, type, rowseparator);
 +
 +                    assert(str != NULL);
 +                    append_string_to_target(str, &output);
@@ -591,9 +686,9 @@
 +                    str = NULL;
 +                } else {
 +                    if (str1 == NULL || strlen(str1) == 0)
-+                        asprintf(&str, "%s", param_path);
+                        safe_asprintf(&str, "%s", p_path);
 +                    else
-+                        asprintf(&str, "%c%s", separator, param_path);
+                        safe_asprintf(&str, "%c%s", separator, p_path);
 +
 +                    assert(str != NULL);
 +                    append_string_to_target(str, &str1);
@@ -601,15 +696,21 @@
 +                    str = NULL;
 +
 +                    if (str2 == NULL || strlen(str2) == 0)
-+                        asprintf(&str, "%s", param_value);
+                        safe_asprintf(&str, "%s", p_value);
 +                    else
-+                        asprintf(&str, "%c%s", separator, param_value);
+                        safe_asprintf(&str, "%c%s", separator, p_value);
 +
 +                    assert(str != NULL);
 +                    append_string_to_target(str, &str2);
 +                    free(str);
 +                    str = NULL;
 +                }
+
+                if (p_path)
+                    free(p_path);
+
+                if (p_value)
+                    free(p_value);
 +            }
 +        }
 +
@@ -620,7 +721,7 @@
 +    }
 +
 +    if (strcasecmp(csv_format, "ParameterPerColumn") == 0) {
-+        asprintf(&str, "%c", rowseparator);
+        safe_asprintf(&str, "%c", rowseparator);
 +        assert(str != NULL);
 +        append_string_to_target(str, &str1);
 +        append_string_to_target(str, &str2);
@@ -643,7 +744,7 @@
 **  bulkdata_compress_report
 **
 **  Compresses the report to send
-@@ -2986,9 +3361,18 @@ int bulkdata_schedule_sending_http_repor
+@@ -2986,9 +3462,18 @@
         flags |= BDC_FLAG_DATE_HEADER;
     }
 
--- a/obuspa/patches/0009-Implement-non-failing-version-of-asprintf-and-use-it.patch
+++ b/obuspa/patches/0009-Implement-non-failing-version-of-asprintf-and-use-it.patch
@@ -1,121 +0,0 @@
-diff --git a/src/core/device_bulkdata.c b/src/core/device_bulkdata.c
-index 8e44f59..a77bd71 100755
--- a/src/core/device_bulkdata.c
-+++ b/src/core/device_bulkdata.c
-@@ -2995,6 +2995,33 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
-     return result;
- }
- 
-+/*********************************************************************//**
-+**
-+**  safe_asprintf
-+**
-+** Wrapper around asprintf that calls terminate in case of error
-+**
-+** \param   strp -- pointer to the output string
-+** \param   fmt -- printing format
-+**
-+** \return  None
-+**
-+**************************************************************************/
-+static void safe_asprintf(char **strp, const char *fmt, ...)
-+{
-+	int ret;
-+	va_list argp;
-+
-+	va_start(argp, fmt);
-+	ret = vasprintf(strp, fmt, argp);
-+	va_end(argp);
-+
-+	if (ret == -1) {
-+		USP_ERR_Terminate("%s (%d): asprintf(%s) failed",
-+				  __FUNCTION__, __LINE__, fmt);
-+	}
-+}
-+
- /*********************************************************************//**
- **
- ** append_string_to_target
-@@ -3024,7 +3051,7 @@ void append_string_to_target(char *str, char **output)
-     }
- 
-     assert(tmp != NULL);
-    asprintf(output, "%s%s", tmp, str);
-+    safe_asprintf(output, "%s%s", tmp, str);
-     free(tmp);
- }
- 
-@@ -3072,9 +3099,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
- 
-     if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
-         if (strcmp(row_timestamp, "None") == 0)
-            asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-+            safe_asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-         else
-            asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
-+            safe_asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
- 
-         assert(str != NULL);
-         append_string_to_target(str, &output);
-@@ -3091,14 +3118,14 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-         // Add Collection time to each csv report element (only if specified and not 'None')
-         if (strcmp(row_timestamp, "Unix-Epoch")==0)
-         {
-            asprintf(&timestamp, "%lld", (long long int)report->collection_time);
-+            safe_asprintf(&timestamp, "%lld", (long long int)report->collection_time);
-         }
-         else if (strcmp(row_timestamp, "ISO-8601")==0)
-         {
-             char *result = iso8601_from_unix_time(report->collection_time, buf, sizeof(buf));
-             if (result != NULL)
-             {
-                asprintf(&timestamp, "%s", buf);
-+                safe_asprintf(&timestamp, "%s", buf);
-             }
-         }
- 
-@@ -3151,9 +3178,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-             if (type) {
-                 if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
-                     if (timestamp == NULL)
-                        asprintf(&str, "%s%c%s%c%s%c", param_path, separator, param_value, separator, type, rowseparator);
-+                        safe_asprintf(&str, "%s%c%s%c%s%c", param_path, separator, param_value, separator, type, rowseparator);
-                     else
-                        asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, param_path, separator, param_value, separator, type, rowseparator);
-+                        safe_asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, param_path, separator, param_value, separator, type, rowseparator);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &output);
-@@ -3161,9 +3188,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-                     str = NULL;
-                 } else {
-                     if (str1 == NULL || strlen(str1) == 0)
-                        asprintf(&str, "%s", param_path);
-+                        safe_asprintf(&str, "%s", param_path);
-                     else
-                        asprintf(&str, "%c%s", separator, param_path);
-+                        safe_asprintf(&str, "%c%s", separator, param_path);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &str1);
-@@ -3171,9 +3198,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-                     str = NULL;
- 
-                     if (str2 == NULL || strlen(str2) == 0)
-                        asprintf(&str, "%s", param_value);
-+                        safe_asprintf(&str, "%s", param_value);
-                     else
-                        asprintf(&str, "%c%s", separator, param_value);
-+                        safe_asprintf(&str, "%c%s", separator, param_value);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &str2);
-@@ -3190,7 +3217,7 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-     }
- 
-     if (strcasecmp(csv_format, "ParameterPerColumn") == 0) {
-        asprintf(&str, "%c", rowseparator);
-+        safe_asprintf(&str, "%c", rowseparator);
-         assert(str != NULL);
-         append_string_to_target(str, &str1);
-         append_string_to_target(str, &str2);
--- a/porttrigger/Makefile
+++ b/porttrigger/Makefile
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2021-2023 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=porttrigger
+PKG_VERSION:=1.0.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+LOCAL_DEV:=1
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/port-trigger.git
+PKG_SOURCE_VERSION:=
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+define Package/porttrigger
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Port Trigger Daemon
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api
+endef
+
+define Package/porttrigger/description
+	Manage port trigger
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./port-trigger/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/porttrigger/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/lib/porttrigger
+                                                                                
+	$(INSTALL_BIN) ./files/etc/init.d/porttrigger $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/config/porttrigger $(1)/etc/config/
+	$(INSTALL_DATA) ./files/lib/port_trigger.sh $(1)/lib/porttrigger/
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/bbf_plugin/libporttrigger.so)
+endef
+
+$(eval $(call BuildPackage,porttrigger))
--- a/porttrigger/files/etc/config/porttrigger
+++ b/porttrigger/files/etc/config/porttrigger
@@ -0,0 +1 @@
+#port trigger uci file
--- a/porttrigger/files/etc/init.d/porttrigger
+++ b/porttrigger/files/etc/init.d/porttrigger
@@ -0,0 +1,20 @@
+#!/bin/sh /etc/rc.common
+
+START=65
+STOP=20
+USE_PROCD=1
+
+. /lib/porttrigger/port_trigger.sh
+
+start_service() {
+	port_trigger_handling
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "firewall"
+}
+
+reload_service() {
+	start
+}
--- a/porttrigger/files/lib/port_trigger.sh
+++ b/porttrigger/files/lib/port_trigger.sh
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+process_port_trigger() {
+	local rule_id="$1"
+	local is_enabled=""
+	local duration=""
+	local trigger_dport=""
+	local trigger_dport_end=""
+	local protocol=""
+	local interface=""
+	local open_dport=""
+	local open_dport_end=""
+	local open_protocol=""
+	local ptg_id=""
+
+	config_get ptg_id "$rule_id" "dm_parent"
+
+	is_enabled=$(uci -q get porttrigger."$ptg_id".enable)
+
+	if [ -z "$is_enabled" ] || [ "$is_enabled" = "0" ]; then
+		return
+	fi
+
+	IP_RULE=""
+	protocol=$(uci -q get porttrigger."$ptg_id".protocol)
+	[ -z "$protocol" ] && return
+
+	if [ "$protocol" = "UDP" ] || [ "$protocol" = "udp" ]; then
+		IP_RULE="$IP_RULE -p udp"
+	elif [ "$protocol" = "TCP" ] || [ "$protocol" = "tcp" ]; then
+		IP_RULE="$IP_RULE -p tcp"
+	else
+		return
+	fi
+
+	trigger_dport=$(uci -q get porttrigger."$ptg_id".port)
+	[ -z "$trigger_dport" ] && return
+	IP_RULE="$IP_RULE --dport $trigger_dport"
+
+	trigger_dport_end=$(uci -q get porttrigger."$ptg_id".end_port_range)
+	if [ -n "$trigger_dport_end" ]; then
+		IP_RULE="$IP_RULE:$trigger_dport"
+	fi
+
+	config_get open_protocol "$rule_id" "protocol"
+	if [ "$open_protocol" = "UDP" ] || [ "$open_protocol" = "udp" ]; then
+		IP_RULE="$IP_RULE -j TRIGGER --trigger-type out --trigger-proto udp"
+	elif [ "$open_protocol" = "TCP" ] || [ "$open_protocol" = "tcp" ]; then
+		IP_RULE="$IP_RULE -j TRIGGER --trigger-type out --trigger-proto tcp"
+	else
+		return
+	fi
+
+	config_get open_dport "$rule_id" "port"
+	[ -z "$open_dport" ] && return
+	IP_RULE="$IP_RULE --trigger-match $open_dport"
+
+	config_get open_dport_end "$rule_id" "end_port_range"
+	if [ -z "$open_dport_end" ]; then
+		IP_RULE="$IP_RULE --trigger-relate $open_dport"
+	else
+		IP_RULE="$IP_RULE-$open_dport_end --trigger-relate $open_dport-$open_dport_end"
+	fi
+
+	duration=$(uci -q get porttrigger."$ptg_id".auto_disable_duration)
+        if [ -n "$duration" ]; then
+                IP_RULE="$IP_RULE --trigger-timeout $duration"
+        fi
+
+	interface=$(uci -q get porttrigger."$ptg_id".src)
+	[ -z "$interface" ] && return
+	device=$(uci show network | grep -w "name='.*$interface'" | cut -d'.' -f2)
+	ports=$(uci -q get network."$device".ports)
+	for port in ${ports}; do
+        	IP_RULE_1="iptables -t nat -A prerouting_porttrigger -i $port $IP_RULE"
+        	echo "$IP_RULE_1">>/tmp/port_trigger_iptables
+	done
+}
+
+port_trigger_handling() {
+	rm /tmp/port_trigger_iptables
+	iptables -w -t nat -F prerouting_porttrigger
+
+	touch /tmp/port_trigger_iptables
+	prerouting_porttrigger=$(iptables -t nat --list | grep prerouting_porttrigger)
+	if [ -z "$prerouting_porttrigger" ]; then
+		iptables -w -t nat -N prerouting_porttrigger
+		ret=$?
+		[ $ret -eq 0 ] && iptables -w -t nat -I PREROUTING -j prerouting_porttrigger
+	fi
+
+	# Load /etc/config/porttrigger UCI file
+	config_load porttrigger
+	config_foreach process_port_trigger rule
+
+	sh /tmp/port_trigger_iptables
+}
--- a/rulengd/Makefile
+++ b/rulengd/Makefile
@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=rulengd
-PKG_VERSION:=1.2.9
+PKG_VERSION:=1.2.10
 PKG_RELEASE:=1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=1a3bf130d99ed275152c7d29b309d12c4400613d
+PKG_SOURCE_VERSION:=a32e325090d4303fe9aec786f81f0699006d21ab
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/self-diagnostics/Makefile
+++ b/self-diagnostics/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 PKG_RELEASE:=1

 PKG_LICENSE:=GPL-2.0-only
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
@@ -13,7 +13,7 @@
 		},
 		{
 			"description": "TR-181 Parameters via BBFDM",
-			"cmd": "bbfdmd -c get Device."
+			"cmd": "bbfdmd -c schema Device."
 		},
 		{
 			"description": "TR-181 Parameters via CWMP",
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.3.2
+PKG_VERSION:=1.4.0

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=3e56818cd219f285263d6d1a7d41f751bbb0fe08
+PKG_SOURCE_VERSION:=335f52d51b3b988917f0130303d571ac1fd9636c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,77 +27,25 @@ include ../bbfdm/bbfdm.mk

 MAKE_PATH:=src

-define Package/stunc/default
+define Package/stunc
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF STUN Client
-  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
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbfdm-api +libopenssl
 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/default/install
+define Package/stunc/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -107,12 +55,4 @@ define Package/stunc/default/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))
--- a/sulu/sulu-base/Makefile
+++ b/sulu/sulu-base/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-base
-PKG_VERSION:=3.1.33
+PKG_VERSION:=3.1.45

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=45068fc4fe1de7672adcbb2909d66e24fdd9d9ee
+PKG_SOURCE_VERSION:=9f3525957ac203c8900996c467032c2be6343ae5
 PKG_MIRROR_HASH:=skip

 SULU_MOD:=core
--- a/sulu/sulu-builder/Makefile
+++ b/sulu/sulu-builder/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-builder
-PKG_VERSION:=3.1.33
+PKG_VERSION:=3.1.45
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=b1c9c37c8eb1256658ddaa2245a5fcda67669099
+PKG_SOURCE_VERSION:=32f297540eca2d80aea425968d3503b3c41d86eb
 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)
@@ -179,7 +179,13 @@ endef

 define Package/sulu-builder/install
 	$(Package/sulu/install/Default)
+	$(INSTALL_DIR) $(1)/sulu/presets
+	$(INSTALL_DIR) $(1)/sulu/settings
+	$(INSTALL_DIR) $(1)/sulu/widget-presets
 	$(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/device/presets/*.json $(1)/sulu/presets/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/device/settings/*.json $(1)/sulu/settings/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/device/widget-presets/*.json $(1)/sulu/widget-presets/
 	$(Package/sulu/install/Post)
 endef

--- a/sulu/sulu-multi-ap/Makefile
+++ b/sulu/sulu-multi-ap/Makefile
@@ -4,11 +4,11 @@

 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=3.1.33
+PKG_VERSION:=3.1.42

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=e4efd156d786de3754114221674559aacf312b99
+PKG_SOURCE_VERSION:=e209cbc04a92494b96c74cee443e1b385c6687fe
 PKG_MIRROR_HASH:=skip

 include ../sulu-builder/sulu.mk
--- a/sulu/sulu-parental-control/Makefile
+++ b/sulu/sulu-parental-control/Makefile
@@ -4,11 +4,11 @@

 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=3.1.27
+PKG_VERSION:=3.1.38

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=af88e253a4e047a9a7f829f020a506849c39c21b
+PKG_SOURCE_VERSION:=dd9dab9fb8aca87991cd2cc02c5fedd8baee3b97
 PKG_MIRROR_HASH:=skip

 include ../sulu-builder/sulu.mk
--- a/timemngr/Makefile
+++ b/timemngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=timemngr
-PKG_VERSION:=1.0.9
+PKG_VERSION:=1.0.13

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=14987805fa7f85ca8e9cbcc22c3fae55619f2c29
+PKG_SOURCE_VERSION:=7552c44b6fb4561687e0ce50639fd80396836d51
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,6 +21,8 @@ PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk

+#RSTRIP:=:
+
 define Package/$(PKG_NAME)
  SECTION:=utils
  CATEGORY:=Utilities
--- a/timemngr/files/etc/hotplug.d/iface/21-timemngr
+++ b/timemngr/files/etc/hotplug.d/iface/21-timemngr
@@ -1,15 +1,17 @@
 #!/bin/sh

-NAME=time
-
 . /usr/share/libubox/jshn.sh

+log() {
+	echo "${@}"|logger -t time.iface -p info
+}
+
 configure_ntp_servers()
 {
 	local ntp_interface

 	# Only change the ntp servers if interface matches with the defined interface
-	ntp_interface="$(uci -q get ${NAME}.dhcp_driven.interface)"
+	ntp_interface="$(uci -q get time.dhcp_driven.interface)"

 	if [ "${ntp_interface}" != "${1}" ]; then
 		return 0
@@ -19,13 +21,14 @@ configure_ntp_servers()
 	json_select data
 	json_get_var servers ntpserver ""

-	exist_dhcp_ntp_server="$(uci -q get ${NAME}.dhcp_driven.server)"
+	exist_dhcp_ntp_server="$(uci -q get time.dhcp_driven.server)"
 	if [ "${servers}" != "${exist_dhcp_ntp_server}" ]; then
-		uci -q del ${NAME}.dhcp_driven.server
+		uci -q del time.dhcp_driven.server
 		for server in ${servers}; do
-			uci -q add_list ${NAME}.dhcp_driven.server="${server}"
+			uci -q add_list time.dhcp_driven.server="${server}"
 		done
-		eval ubus call uci commit '{\"config\":\"$NAME\"}'
+		log "Restarting timemngr"
+		ubus call uci commit '{"config":"time"}'
 	fi
 }

--- a/timemngr/files/etc/init.d/timemngr
+++ b/timemngr/files/etc/init.d/timemngr
@@ -11,17 +11,21 @@ PROG_UBUS=/usr/sbin/timemngr

 DM_INPUT="/etc/timemngr/input.json"

+log() {
+	echo "${@}"|logger -t time.init -p info
+}
+
 validate_global_section() {
 	uci_validate_section time global global \
 	    'enable:bool:1' \
-	    'loglevel:uinteger:1'
+	    'loglevel:uinteger:4'
 }

 start_service() {
 	local enable loglevel

 	if uci -q get system.ntp >/dev/null 2>&1; then
-		logger -t timemngr.init "Not starting timemngr, legacy ntp definition detected"
+		log "Not starting timemngr, legacy ntp definition detected"
 		return 1
 	fi

@@ -36,6 +40,7 @@ start_service() {
 	procd_open_instance timemngr_ubus
 	procd_set_param command $PROG_UBUS
 	procd_append_param command -l ${loglevel}
+	procd_set_param respawn
 	procd_close_instance

 	generate_config
@@ -45,6 +50,7 @@ start_service() {
 }

 reload_service() {
+	log "Restarting timemngr"
 	stop
 	start
 }
@@ -58,8 +64,9 @@ service_triggers() {
 	}

 	if [ "$enable" != 0 ] && [ "$mode" = "Broadcast" ] && [ -n "$interface" ]; then
+		log "Service trigger for interface up event"
 		procd_open_trigger
-		procd_add_interface_trigger "interface.*.up" $interface /etc/init.d/timemngr restart
+		procd_add_interface_trigger "interface.*.up" $interface /etc/init.d/timemngr reload
 		procd_close_trigger
 	fi
 }
--- a/timemngr/files/etc/timemngr/ntpd_config.sh
+++ b/timemngr/files/etc/timemngr/ntpd_config.sh
@@ -180,5 +180,6 @@ generate_config() {
 create_service() {
 	procd_open_instance timemngr
 	procd_set_param command "/sbin/ntpd" -g -u ntp:ntp -n -c ${CONF_FILE}
+	procd_set_param respawn
 	procd_close_instance
 }
--- a/tr104/Config.in
+++ b/tr104/Config.in
@@ -1,4 +1,4 @@
-config RUNAS_BBFDM_MICROSERVICE
+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
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -5,18 +5,18 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=tr104
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.14

 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=701dd0d7b034ceb8f50fe7edab080f9a5a4b0bf2
+PKG_SOURCE_VERSION:=fa19217fbd589d064e1f32ec20d0df53e31fb610
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

-PKG_CONFIG_DEPENDS:=CONFIG_RUNAS_BBFDM_MICROSERVICE CONFIG_TR104_VENDOR_EXTENSIONS
+PKG_CONFIG_DEPENDS:=CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE CONFIG_TR104_VENDOR_EXTENSIONS
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

@@ -73,7 +73,9 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/tr104/plugins/
 	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1)/etc/tr104/
+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)
 	$(INSTALL_BIN) ./files/etc/init.d/tr104d.bbfdm $(1)/etc/init.d/tr104d
 else
--- a/twamp/Makefile
+++ b/twamp/Makefile
@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=twamp
-PKG_VERSION:=1.4.2
+PKG_VERSION:=1.4.3

 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:=f3d35a5499e8815721ba384e79fda8181f76b8f8
+PKG_SOURCE_VERSION:=d31b2128e6ea4ab42538b88db91b2cc84091ef4d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/urlfilter/Makefile
+++ b/urlfilter/Makefile
@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.7
+PKG_VERSION:=1.1.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
-PKG_SOURCE_VERSION:=a726e4ce9fa3322e135cb0dd961f31b4fd7ae22a
+PKG_SOURCE_VERSION:=75077256211644443ca30cc994ef16b013c4131c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,6 +21,7 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk

 define Package/urlfilter
  SECTION:=utils
@@ -43,9 +44,13 @@ endef
 endif

 define Package/urlfilter/install
-	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/urlfilter $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/etc/init.d/urlfilter $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/config/urlfilter $(1)/etc/config/
+	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/plugins/urlfilter.json)
 endef

 $(eval $(call BuildPackage,urlfilter))
--- a/urlfilter/files/etc/bbfdm/plugins/urlfilter.json
+++ b/urlfilter/files/etc/bbfdm/plugins/urlfilter.json
--- a/urlfilter/files/etc/init.d/urlfilter
+++ b/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
+		ebtables -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
 	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
+		ebtables -D FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
 	fi
 	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
 	if [ "$?" -eq 0 ]; then
--- a/usermngr/Makefile
+++ b/usermngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.9
+PKG_VERSION:=1.2.12

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=44e656695513cac24b51b7fb2ed70d0822091cac
+PKG_SOURCE_VERSION:=b09414824b95f2a73e6f02b06d4efd15bfab77e0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifimngr
-PKG_VERSION:=16.1.7
+PKG_VERSION:=16.2.3

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=39817dfb13d317e8bb949b29296c698ea703cf77
+PKG_SOURCE_VERSION:=3e5799f9cae80b3f9a1bc1fa6503020005f76aa9
 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
--- a/xmppc/Makefile
+++ b/xmppc/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.3
+PKG_VERSION:=2.2.4

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=23a7f6005b84fc4d4a1432057ecd2b5a74f9ea3e
+PKG_SOURCE_VERSION:=543c7a780544d195dd8d0357e453c0ce4fa62454
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
Author	SHA1	Message	Date
Amit Kumar	b8bada4cf3	porttrigger: implementation of porttrigger Added init script Makefile and library for rule installation	2024-01-18 10:01:26 +05:30
Rahul Thakur	ec165a9042	inbd: remove package Package removed from feed since it has been deprecated.	2024-01-16 17:36:57 +05:30
Rahul Thakur	d4b2d251d6	iop: deprecate inbd The package inbd is deprecated with the logic for generation of hotplug events for dsl and ethernet ports having been moved to dslmngr and ethmngr respectively.	2024-01-16 16:14:05 +05:30
Rahul Thakur	78aecb52ca	dslmngr: add support for hotplug event Changes done: 1. Add support for hotplug event generation 2. Fix pipeline and static code analysis error/warnings 3. Rectify package source URL.	2024-01-16 16:09:36 +05:30
Rahul Thakur	8eb17ec066	ethmngr: add support for generation hotplug event Changes: 1. Add support for generating hotplug event 2. Update makefile to have prepare section for local development. 3. Update URL to point to updated location for ethmngr	2024-01-16 16:06:48 +05:30
Arne Jonsson	01c1899208	iopsys: fix issues related to updated genconfig	2024-01-15 14:52:38 +00:00
Arne Jonsson	bec7eeaa33	iopsys: fix issue in feeds_update.sh in order to handle multiple custom feeds	2024-01-15 14:52:38 +00:00
Vivek Kumar Dutta	dc49178002	tr104: Support CallControl.NumberingPlan.{i}.TerminationDigit	2024-01-15 12:55:51 +05:30
Janusz Dziedzic	ddf59c0756	libwifi: 7.4.18	2024-01-13 17:18:08 +00:00
Janusz Dziedzic	6dc1e0de1c	wifimngr: 16.2.3	2024-01-13 10:43:29 +00:00
Janusz Dziedzic	4dd401a0cb	libwifi: 7.4.17	2024-01-13 10:42:05 +00:00
Arne Jonsson	e60ef9d02e	iopsys: update genconfig.sh to support new path to customer directories	2024-01-12 17:15:11 +01:00
Arne Jonsson	9f2a6f3265	iop: add TARGET definitions to genconfig.sh	2024-01-12 16:07:57 +00:00
Andreas Gnau	36db9285f6	libwifi: Enable LIBWIFI_USE_CTRL_IFACE by default CONFIG_LIBWIFI_USE_CTRL_IFACE has been the enabled for nearly all devices for quite some time. Enable it by default. Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>	2024-01-12 14:48:04 +01:00
Jakob Olsson	559ea53e69	map-agent: 4.5.1.0	2024-01-12 12:40:39 +01:00
Jakob Olsson	f7ade9751e	map-controller: 4.5.0.4	2024-01-12 12:40:08 +01:00
Janusz Dziedzic	963e1ecc6c	map-agent: 4.5.0.12	2024-01-12 08:48:42 +00:00
Amin Ben Romdhane	35ca583dc1	usermngr: 1.2.12	2024-01-11 17:27:49 +01:00
Vivek Kumar Dutta	8b12debefe	sulu: 3.1.45	2024-01-10 19:57:16 +05:30
Vivek Kumar Dutta	a0caa174d0	bulkdata: Added compliance to RFC4180 for CSV report	2024-01-10 19:40:35 +05:30
Suvendhu Hansa	8bd2d74316	obuspa: Add CSV report compliance to RFC4180 for bulkdata	2024-01-10 14:03:21 +00:00
Amin Ben Romdhane	e6015f5db2	bbfdm: 1.5.4	2024-01-10 13:40:26 +01:00
Amin Ben Romdhane	a227490dcb	twamp: 1.4.3	2024-01-10 12:18:10 +01:00
Amin Ben Romdhane	c0c5cf032d	usermngr: 1.2.11	2024-01-09 17:03:29 +01:00
Amin Ben Romdhane	25c09589f2	bulkdata: 2.1.4	2024-01-09 17:02:36 +01:00
Amin Ben Romdhane	22b273faf0	xmppc: 2.2.4	2024-01-09 17:01:28 +01:00
Amin Ben Romdhane	fd850636a5	obuspa: 7.0.5.8	2024-01-09 17:00:19 +01:00
Amin Ben Romdhane	2568cba699	bbfdm: 1.5.3	2024-01-09 16:59:10 +01:00
Sukru Senli	2968ad5dd8	iop: config: switch to using iputils arping and ping instead of busybox arping and ping	2024-01-09 15:13:56 +01:00
Janusz Dziedzic	6311e0f8b0	map-controller: 4.5.0.3	2024-01-09 08:26:49 +00:00
Jakob Olsson	7449779f37	map-agent: 4.5.0.11	2024-01-08 16:17:12 +01:00
Vivek Kumar Dutta	459bc4f9ff	sulu: 3.1.44	2024-01-08 10:40:45 +05:30
Amin Ben Romdhane	a574514a41	bbfdm: 1.5.2	2024-01-04 13:45:05 +01:00
Vivek Kumar Dutta	ceb70ecefb	tr104: Fix defaults for SIP.Network.RegisterExpires and RegistrationPeriod	2024-01-04 18:01:42 +05:30
Vivek Kumar Dutta	bc0e021b3c	rulengd: execute action when no match expression defined	2024-01-04 17:36:53 +05:30
Janusz Dziedzic	19d372a4ad	wifimngr: 16.2.2	2024-01-02 15:51:00 +00:00
Vivek Kumar Dutta	8a08dd3916	bbfdm: Optimize the instance updater	2023-12-29 18:36:19 +05:30
Vivek Kumar Dutta	a672e1708f	icwmp: Fix setting empty parameterkey	2023-12-29 10:15:48 +05:30
Vivek Kumar Dutta	4b4407c3f9	bbfdm: Removed wolfssl and mbedtls variant	2023-12-28 18:00:06 +05:30
Vivek Kumar Dutta	2d1c7428b6	stunc: Removed wolfssl and mbedtls variant	2023-12-28 17:43:11 +05:30
suvendhu	ad28f56744	icwmp: Removed wolfssl and mbedtls variant	2023-12-28 16:37:10 +05:30
Vivek Kumar Dutta	a8c1c6b25f	icwmp: fix logging and acs_change detection	2023-12-27 20:55:28 +05:30
Rahul Thakur	4a89da8067	urlfilter: suppress unnecessary error on reload	2023-12-27 11:51:49 +00:00
Suvendhu Hansa	386649b0bb	obuspa: Update admin/user datamodel permissions	2023-12-27 11:27:54 +00:00
Vivek Kumar Dutta	e050489073	icwmp: revert uci stuck workaround	2023-12-26 22:45:24 +05:30
suvendhu	94895ef110	icwmpd: Avoid process restart on ACS url change	2023-12-26 22:22:04 +05:30
Vivek Kumar Dutta	4c93c01d22	icwmp: fix cwmp stuck in init state	2023-12-26 17:07:04 +05:30
Vivek Kumar Dutta	9228b44a94	bbfdm: Top down config support DHCPv4 Server pool	2023-12-26 15:55:58 +05:30
Vivek Kumar Dutta	7ace7892b1	icwmp: fix upload rpc random failures	2023-12-26 13:00:30 +05:30
Vivek Kumar Dutta	f4dfdc46f1	sulu: use multi-part download for local firmware	2023-12-25 19:44:47 +05:30
Vivek Kumar Dutta	cc8b0f70d6	obuspa: support multi-part download	2023-12-25 19:18:32 +05:30
Vivek Kumar Dutta	d943a0e0d1	icwmp: 9.5.29	2023-12-20 12:33:35 +05:30
Vivek Kumar Dutta	c25c241008	icwmp: workaround for uci stuck in varstate	2023-12-19 20:38:07 +05:30
Jakob Olsson	59aad46280	map-agent: remove airoha hotplug script workaround for genconf	2023-12-18 18:07:59 +01:00
Amin Ben Romdhane	65a754935e	bbfdm: 1.4.23	2023-12-18 16:59:25 +01:00
Vivek Kumar Dutta	99f0cc9a01	sulu: 3.1.42	2023-12-18 10:51:45 +05:30
Janusz Dziedzic	371e27e92e	wifimngr: 16.2.1	2023-12-14 12:54:06 +00:00
Janusz Dziedzic	724c62684f	libwifi: 7.4.16	2023-12-14 12:52:04 +00:00
Vivek Kumar Dutta	040123d2b1	tr104: 1.0.12	2023-12-14 15:49:05 +05:30
Marina Maslova	c5f26d1217	libqos: use proc file for airoha, fix pipeline	2023-12-14 11:00:10 +04:00
Rahul Thakur	55e87e47f1	mcastmngr: fix uci-default script to not overwrite on upgrade This commit fixes the bug in the uci-default script due to which the upstream interface in the proxy section was getting overwritten on sysupgrades. The uci-default scripts now validates that if the interface that is set as the upstream_interface is a valid interface in the network uci file, then config does not need to be updated.	2023-12-14 06:37:04 +00:00
Amin Ben Romdhane	bb9b397caa	bbfdm: 1.4.22	2023-12-13 18:05:55 +01:00
Janusz Dziedzic	e1c9006b2d	mapagent: mediatek, generate MAP WiFi config Do similar workaround we have for airoha extender.	2023-12-13 15:46:49 +00:00
Vivek Kumar Dutta	b7a95f200f	bbfdm: 1.4.21 - Minimized tools dependency - Fix Ethernet link FlowControl uci options	2023-12-13 20:50:00 +05:30
Vivek Kumar Dutta	fb15ed7deb	icwmp: 9.5.27	2023-12-13 20:43:19 +05:30
Vivek Kumar Dutta	9535b226ce	timemngr: fix status parameter	2023-12-13 19:40:12 +05:30
Vivek Kumar Dutta	48e6c149a6	sulu: 3.1.41	2023-12-13 19:04:05 +05:30
Vivek Kumar Dutta	068307171c	sulu: 3.1.40	2023-12-13 18:51:38 +05:30
Vivek Kumar Dutta	b7957f5dd4	obuspa: 7.0.5.5	2023-12-13 18:50:26 +05:30
Vivek Kumar Dutta	4c40999c71	timemngr: Fix random crashes	2023-12-13 18:09:33 +05:30
Vivek Kumar Dutta	ff786da6a2	self-diagnostics: Added datamodel schema get	2023-12-13 16:32:10 +05:30
Vivek Kumar Dutta	25955bfeca	obuspa: 7.0.5.4	2023-12-13 16:27:33 +05:30
Jakob Olsson	b9f25bcd90	hostmngr: 1.1.4	2023-12-13 11:26:20 +01:00
Vivek Kumar Dutta	b8dfa5eebe	sulu: 3.1.39	2023-12-13 09:28:09 +05:30
Janusz Dziedzic	10719b6c92	wifimngr: 16.2.0	2023-12-12 13:40:50 +00:00
Janusz Dziedzic	cdb029dcb8	libwifi: 7.4.15	2023-12-12 13:40:50 +00:00
Andreas Gnau	55fa399ea6	iop: config: Fix GPIO tools package name Fixes: `1c68b9bba0` ("iop: Add gpiotool package") Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>	2023-12-12 14:29:43 +01:00
Vivek Kumar Dutta	c0bdff6a1c	timemngr: 1.0.11	2023-12-12 18:46:45 +05:30
Vivek Kumar Dutta	48d35004d4	sulu: 3.1.38	2023-12-12 15:16:06 +05:30
Andreas Gnau	e95cc9a39d	iop: config: Disable UBIFS and ext4 rootfs build by default UBIFS and ext4 can still be re-enabled by interested developers, when it is required for development. All production images should use squashfs only. Produce only one image (squashfs) in all cases to reduce confusion. Previously, this had also already been set for some targets, but setting it here globally ensures, this applies to all targets. Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>	2023-12-12 09:28:06 +00:00
Amit Kumar	c260fb4c61	mcastmngr: disable snooping when proxy instance is disabled * snooping on bridge interfaces should be changed to disable when igmp proxy has been disabled. * updated the function __device_is_bridge() that read the device section of network config. "grep name=.*$device" was resulting into matching of ifname option as well that was resulting in a two line output and causing error while using the output in uci command later.	2023-12-12 05:53:42 +00:00
Vivek Kumar Dutta	4b279a83a9	icwmp: Support 2 web content filetype	2023-12-12 09:58:53 +05:30
Vivek Kumar Dutta	3cebc8aee5	stunc: 1.3.3	2023-12-12 09:45:22 +05:30
Marek Puzyniak	58035970a4	wifimngr: 16.1.9	2023-12-11 21:42:05 +00:00
Janusz Dziedzic	707a62b678	libwifi: 7.4.14	2023-12-11 16:31:59 +00:00
Vivek Kumar Dutta	2c738bb96c	sulu: 3.1.37	2023-12-11 19:23:10 +05:30
Janusz Dziedzic	fa24932e7c	wifimngr: 16.1.8	2023-12-11 13:00:21 +00:00
Janusz Dziedzic	b8fc416fed	libwifi: 7.4.13	2023-12-11 12:22:55 +00:00
Janusz Dziedzic	7ad065a756	map-agent: 4.5.0.10	2023-12-11 08:59:14 +00:00
Vivek Kumar Dutta	54a54d048c	tr104: 1.0.11	2023-12-11 10:03:13 +05:30
Amin Ben Romdhane	28fef8f5ea	bulkdata: 2.1.3	2023-12-10 19:24:59 +01:00
Amin Ben Romdhane	92a1c1e25d	bbfdm: 1.4.20	2023-12-10 19:22:43 +01:00
Vivek Kumar Dutta	34c5ae9c71	obuspa: 7.0.5.3	2023-12-10 21:20:33 +05:30
Andreas Gnau	1c68b9bba0	iop: Add gpiotool package This can be useful for troubleshooting and debugging GPIOs. Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>	2023-12-08 15:05:23 +01:00
Vivek Kumar Dutta	6b7d2d7c69	usermngr: 1.2.10	2023-12-08 18:40:35 +05:30
Erik Karlsson	3482a3e94f	iop: use SHA512 as the default password hash in busybox The default in OpenWRT is MD5 which is unacceptably insecure.	2023-12-08 13:03:40 +00:00
Michael Polyntsov	b96d6a5a1b	mosquitto-auth-shadow: Define _GNU_SOURCE before using crypt_r In glibc crypt_r is available only if _GNU_SOURCE is defined, so defining it since we're going to compile with glibc	2023-12-08 10:16:16 +00:00
Vivek Kumar Dutta	01625e3382	sulu: 3.1.36	2023-12-07 21:55:22 +05:30
Vivek Kumar Dutta	8243861c49	hostmngr: 1.1.3	2023-12-07 20:17:58 +05:30
Vivek Kumar Dutta	744c5828a5	sulu: 3.1.35	2023-12-07 20:12:17 +05:30
Vivek Kumar Dutta	a33b438ddc	bbfdm: 1.4.19	2023-12-07 19:16:41 +05:30
Piotr Kubik	445e50f011	libvoice-broadcom: Update src hash (get rid of CONFIG_BCM_CHIP_ID)	2023-12-07 12:40:50 +01:00
Piotr Kubik	e845aa2a51	libvoice-broadcom: remove CONFIG_BCM_CHIP_ID Use SUBTARGET variable that already contains CHIP_ID.	2023-12-07 11:38:11 +00:00
Piotr Kubik	39aebfc782	libqos: remove CONFIG_BCM_CHIP_ID Use SUBTARGET variable that already contains CHIP_ID.	2023-12-07 10:45:22 +00:00
Piotr Kubik	6441d2fd01	libwifi: remove CONFIG_BCM_CHIP_ID Use SUBTARGET variable that already contains CHIP_ID.	2023-12-07 10:44:33 +00:00
Piotr Kubik	36f02fa5f8	libethernet: remove CONFIG_BCM_CHIP_ID Use SUBTARGET variable that already contains CHIP_ID.	2023-12-07 10:43:53 +00:00
Piotr Kubik	e80ca4319b	libdsl: fix remove CONFIG_BCM_CHIP_ID Pass down "original" CHIP_6xxx value. Improve CHIP_ID substitution.	2023-12-07 10:43:20 +00:00
Amin Ben Romdhane	350186614e	icwmp: Rename 'keep_settings' to 'fw_upgrade_keep_settings'	2023-12-07 11:23:36 +01:00
Vivek Kumar Dutta	6caec3ea06	urlfilter: 1.1.8	2023-12-07 12:42:40 +05:30
Vivek Kumar Dutta	f45ec2b32b	sulu: 3.1.34	2023-12-07 09:06:05 +05:30
Vivek Kumar Dutta	c361b4e589	bbfdm: 1.4.18	2023-12-06 19:59:06 +05:30
Vivek Kumar Dutta	ef4e5fbef6	timemngr: 1.0.10	2023-12-06 19:56:37 +05:30
Amin Ben Romdhane	d9fe7d6927	icwmp: Option to keep config with '1 Firmware Upgrade Image'	2023-12-06 09:15:55 +05:30
Jakob Olsson	920832c5c7	hostmngr: 1.1.2	2023-12-05 15:52:19 +01:00