xmppc: switch to libstrophe-libxml2

It was used to update branches of feeds according to the commit hashes
in feeds.conf. Mostly used when doing release branches for the
first time. We do it manually now, so it is not needed anymore.

bbfdm/Config_bbfdmd.in

@@ -1,7 +1,7 @@
-if PACKAGE_libbbfdm
-config BBF_VENDOR_LIST
-	string "Vendor List"
-	default "iopsys"
+if PACKAGE_bbfdmd
+config BBF_VENDOR_EXTENSION
+	bool "Enable Vendor Extension"
+	default y
 
 config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.9.16
+PKG_VERSION:=1.12.6
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=93a6f6f51c3edb88aa63f150ef077d9f70cb883b
+PKG_SOURCE_VERSION:=0a33d96b693ac5cc34ba57f6fd53417d6eaeac61
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -32,21 +32,28 @@ define Package/libbbfdm-api
   ABI_VERSION:=1.0
 endef
 
-define Package/libbbfdm
+define Package/libbbfdm-ubus
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl
-  MENU:=1
+  TITLE:=BBF datamodel ubus library, provides API to expose datamodel over ubus
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api
 endef
 
 define Package/bbfdmd
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm +jq +bbf_configmngr
+  TITLE:=Datamodel ubus backend to expose core tree
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl +libbbfdm-ubus +bbf_configmngr
+endef
+
+define Package/dm-service
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Datamodel ubus backend to expose micro-service tree
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libbbfdm-ubus +bbf_configmngr
 endef
 
 define Package/bbf_configmngr
@@ -55,11 +62,10 @@ define Package/bbf_configmngr
   SUBMENU:=TRx69
   TITLE:= BBF Config Manager
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
-  MENU:=1
 endef
 
-define Package/libbbfdm/config
-	source "$(SOURCE)/Config_bbfdm.in"
+define Package/bbfdmd/config
+	source "$(SOURCE)/Config_bbfdmd.in"
 endef
 
 define Package/bbf_configmngr/config
@@ -70,8 +76,16 @@ define Package/libbbfdm-api/description
  Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
 
-define Package/libbbfdm/description
- Library contains the data model tree, It includes basic TR181 nodes.
+define Package/libbbfdm-ubus/description
+ Library contains the APIs to expose data model over ubus
+endef
+
+define Package/bbfdmd/description
+ Daemon to expose Datamodel core tree
+endef
+
+define Package/dm-service/description
+ Daemon to expose Datamodel micro-service tree
 endef
 
 define Package/bbf_configmngr/description
@@ -85,17 +99,9 @@ endef
 endif
 
 CMAKE_OPTIONS += \
-	-DBBF_TR181=ON
-
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
-
-ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
-CMAKE_OPTIONS += \
+	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES) \
 	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
-endif
 
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
@@ -112,45 +118,49 @@ define Package/libbbfdm-api/install
 	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
 endef
 
-define Package/libbbfdm/install
+define Package/libbbfdm-ubus/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/lib/
+endef
+
+define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/share/bbfdm/libbbfdm.so
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+	$(INSTALL_CONF) ./files/etc/config/schedules $(1)/etc/config/schedules
 
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
+	
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
-
+	
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
 
-ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
-	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so $(1)
+ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/vendor/vendor.json $(1)
 endif
 
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_activate_handler.sh $(1)/usr/share/bbfdm/scripts/
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_check_idle.sh $(1)/usr/share/bbfdm/scripts/
 endef
 
-define Package/libbbfdm/prerm
-	#!/bin/sh
-	rm -rf /etc/bbfdm/dmmap/*
-	exit 0
-endef
-
-define Package/bbfdmd/install
+define Package/dm-service/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
-	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
-	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdm.services $(1)/etc/init.d/
-	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-service/dm-service $(1)/usr/sbin/
 endef
 
 define Package/bbf_configmngr/install
@@ -166,15 +176,26 @@ ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
 endif
 endef
 
+define Package/bbfdmd/prerm
+	#!/bin/sh
+	rm -rf /etc/bbfdm/dmmap/*
+	exit 0
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-ubus
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-ubus/bbfdm-ubus.h $(1)/usr/include/libbbfdm-ubus/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,bbf_configmngr))
 $(eval $(call BuildPackage,libbbfdm-api))
-$(eval $(call BuildPackage,libbbfdm))
+$(eval $(call BuildPackage,libbbfdm-ubus))
 $(eval $(call BuildPackage,bbfdmd))
+$(eval $(call BuildPackage,dm-service))

bbfdm/files/etc/bbfdm/input.json

@@ -1,28 +0,0 @@
-{
-        "daemon": {
-                "config": {
-                },
-                "input": {
-                        "type": "DotSo",
-                        "name": "/usr/share/bbfdm/libbbfdm.so",
-                        "plugin_dir": "/usr/share/bbfdm/plugins"
-                },
-                "output": {
-                        "type": "UBUS",
-                        "name": "bbfdm"
-                }
-        },
-        "cli": {
-                "config": {
-                        "proto": "both",
-                        "instance_mode": 0
-                },
-                "input": {
-                        "type": "UBUS",
-                        "name": "bbfdm"
-                },
-                "output": {
-                        "type": "CLI"
-                }
-        }
-}

bbfdm/files/etc/config/bbfdm

@@ -1,11 +1,8 @@
 config bbfdmd 'bbfdmd'
 	option enable '1'
-	option loglevel '1'
-	option refresh_time '120'
-	option transaction_timeout '30'
-	option subprocess_level '2'
+	option debug '0'
+	option loglevel '3'
 
 config micro_services 'micro_services'
 	option enable '1'
 	option enable_core '0'
-	option enable_respawn '1'

bbfdm/files/etc/config/schedules

@@ -0,0 +1,2 @@
+config global 'global'
+	option enable '1'

bbfdm/files/etc/init.d/bbf_configd

@@ -1,15 +1,25 @@
 #!/bin/sh /etc/rc.common
 
-START=64
+START=80
 STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbf_configd
 
+create_needed_directories()
+{
+	mkdir -p /tmp/bbfdm/.cwmp
+	mkdir -p /tmp/bbfdm/.usp
+	mkdir -p /tmp/bbfdm/.bbfdm
+}
+
 start_service()
 {
+	create_needed_directories
+
 	procd_open_instance "bbf_configd"
 	procd_set_param command ${PROG}
+	#procd_append_param command -d
 	procd_set_param respawn
 	procd_close_instance "bbf_configd"
 }

bbfdm/files/etc/init.d/bbfdm.services

@@ -1,10 +1,10 @@
 #!/bin/sh /etc/rc.common
 
-START=40
+START=85
 STOP=8
 
 USE_PROCD=1
-PROG=/usr/sbin/bbfdmd
+PROG=/usr/sbin/dm-service
 
 BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
 
@@ -18,33 +18,38 @@ validate_bbfdm_micro_service_section()
 {
 	uci_validate_section bbfdm micro_services "micro_services" \
 		'enable:bool:true' \
-		'enable_core:bool:false' \
-		'enable_respawn:bool:true'
+		'enable_core:bool:false'
 }
 
 _add_microservice()
 {
-	local name path
-	local enable enable_core enable_respawn
+	local name path loglevel
+	local enable enable_core
 
 	# Check enable from micro-service
 	path="${1}"
-	enable_respawn="${2}"
-	enable_core="${3}"
+	enable_core="${2}"
 
 	name="$(basename ${path})"
 	name="${name//.json}"
 
-	enable="$(jq -r '.daemon.enable//1' ${path})"
+	json_load_file "${path}"
+	json_select daemon
+
+	json_get_var enable enable 1
 	if [ "${enable}" -eq "0" ]; then
 		log "datamodel micro-service ${name} not enabled"
 		return 0
 	fi
+	
+	json_select config
+	json_get_var loglevel loglevel 3
 
 	procd_open_instance "${name}"
 
 	procd_set_param command ${PROG}
 	procd_append_param command -m "${name}"
+	procd_append_param command -l "${loglevel}"
 
 	if [ "${enable_core}" -eq "1" ]; then
 		procd_set_param limits core="unlimited"
@@ -52,15 +57,13 @@ _add_microservice()
 		procd_set_param stderr 1
 	fi
 
-	if [ "${enable_respawn}" -eq "1" ]; then
-		procd_set_param respawn "3600" "5" "5"
-	fi
+	procd_set_param respawn
 	procd_close_instance "${name}"
 }
 
 configure_bbfdm_micro_services()
 {
-	local enable enable_core enable_respawn
+	local enable enable_core
 
 	config_load bbfdm
 	validate_bbfdm_micro_service_section || {
@@ -77,7 +80,7 @@ configure_bbfdm_micro_services()
 		do
 			[ -e "$file" ] || continue
 
-			_add_microservice $file "${enable_respawn}" "${enable_core}"
+			_add_microservice $file "${enable_core}"
 		done
 	fi
 }
@@ -92,7 +95,7 @@ _start_single_service()
 		file="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/${service}.json)"
 		[ -e "$file" ] || return
 
-		_add_microservice $file "0" "0"
+		_add_microservice $file "0"
 	fi
 }
 

bbfdm/files/etc/init.d/bbfdmd

@@ -1,14 +1,11 @@
 #!/bin/sh /etc/rc.common
 
-START=65
+START=90
 STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
-BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_DIR="/tmp/bbfdm"
-
 . /usr/share/libubox/jshn.sh
 
 log() {
@@ -19,17 +16,13 @@ validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enable:bool:true' \
-		'sock:string' \
 		'debug:bool:false' \
-		'loglevel:uinteger:1' \
-		'refresh_time:uinteger:0' \
-		'transaction_timeout:uinteger:30' \
-		'subprocess_level:uinteger'
+		'loglevel:uinteger:3'
 }
 
 configure_bbfdmd()
 {
-	local enable debug sock
+	local enable debug
 	local jlog jrefresh jtimeout jlevel
 
 	config_load bbfdm
@@ -40,25 +33,17 @@ configure_bbfdmd()
 
 	[ "${enable}" -eq 0 ] && return 0
 
-	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
-	fi
-
 	procd_set_param command ${PROG}
+	procd_append_param command -l "${loglevel}"
+
 	if [ "${debug}" -eq 1 ]; then
 		procd_set_param stdout 1
 		procd_set_param stderr 1
 	fi
-
-	if [ -f "${sock}" ]; then
-		procd_append_param command -s "${sock}"
-	fi
 }
 
 start_service()
 {
-	mkdir -p ${BBFDM_TEMP_DIR}
-
 	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn

bbfdm/tools/bbfdm.sh

@@ -2,7 +2,7 @@
 
 BBFDM_BASE_DM_PATH="usr/share/bbfdm"
 BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
-INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"1"}}}'
+INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"3"}}}'
 OUT_NAME=""
 
 MICRO_SERVICE=0

bulkdata/Makefile

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

ddnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.0.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
-PKG_SOURCE_VERSION:=4b0c679c4dc3e3725de5c0c55ed60f24b87c6edd
+PKG_SOURCE_VERSION:=68c54ad5b537a7dfff7c939707bfe8f1a3023c46
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.0.0.13
+PKG_VERSION:=6.1.0.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d75639d9ae82538103123b32fc0de9280e84cabb
+PKG_SOURCE_VERSION:=6fa2e4c29fcaba554211b82ba93c608eeb9356f3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

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

dhcpmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
-PKG_SOURCE_VERSION:=4c89a3f12686343e3cca23819255744ac06dfb22
+PKG_SOURCE_VERSION:=93f756f80a9391afd9b01f2608e031c4db3ca48b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,9 @@ define Package/dhcpmngr
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Package to add Device.DHCPv4 and v6 data model support.
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +odhcpd
+  DEPENDS+=+DNSMNGR_DNS_SD:umdns
+  DEPENDS+=+DNSMNGR_BACKEND_DNSMASQ:dnsmasq
 endef
 
 define Package/dhcpmngr/description
@@ -44,6 +46,10 @@ endif
 define Package/dhcpmngr/install
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_lease_start_time.user $(1)/etc/udhcpc.user.d/udhcpc_lease_start_time.user
+ifeq ($(CONFIG_DNSMNGR_BACKEND_UNBOUND),y)
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/etc/uci-defaults/unbound.odhcpd.uci_default $(1)/etc/uci-defaults/16-set-unbound-as-odhcpd-leasetrigger
+endif
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdhcpmngr.so $(1) $(PKG_NAME)
 endef
 

dhcpmngr/files/etc/uci-defaults/unbound.odhcpd.uci_default

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# update odhcpd uci to use unbound's script as leasetrigger
+uci -q get dhcp.odhcpd >/dev/null 2>&1 && {
+	maindhcp="$(uci -q get dhcp.odhcpd.maindhcp)"
+
+	# if odhcpd is the main dhcp
+	[ "$maindhcp" = "1" ] || [ "$maindhcp" = "true" ] || [ "$maindhcp" = "on" ] && {
+		# if unbound daemon and unbound script file is present
+		[ -e /usr/lib/unbound/odhcpd.sh ] && [ -e /usr/sbin/unbound ] && {
+			# then set unbound script as leasetrigger in dhcp UCI
+			uci -q set dhcp.odhcpd.leasetrigger='/usr/lib/unbound/odhcpd.sh'
+			uci commit dhcp
+		}
+	}
+}
+
+exit 0

dnsmngr/Config.in

@@ -0,0 +1,30 @@
+if PACKAGE_dnsmngr
+
+menu "Configuration"
+
+config DNSMNGR_DNS_SD
+	bool "Include Device.DNS.SD. TR-181 support"
+	default y
+	help
+	   Set this option to include support for TR-181 DNS.SD. object.
+
+choice
+	prompt "Select backend for DNS management"
+	default DNSMNGR_BACKEND_DNSMASQ
+	depends on PACKAGE_dnsmngr
+	help
+		Select which backend daemon to use for DNS
+
+config DNSMNGR_BACKEND_DNSMASQ
+	bool "Use dnsmasq for dns and dhcp"
+	help
+	   Enable this option to use dnsmasq + odhcpd for dns and dhcp.
+
+config DNSMNGR_BACKEND_UNBOUND
+	bool "Use unbound with odhcpd-full for dns and dhcp"
+	help
+	   Enable this option to use unbound + odhcpd for dns and dhcp.
+
+endchoice
+endmenu
+endif

dnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=f6223f6034a57753ae9d1552ab1334194b1deaff
+PKG_SOURCE_VERSION:=dd7a285798b48e199f5e5d90d9c20cb5e0c14888
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,23 +27,47 @@ MAKE_PATH:=src
 define Package/dnsmngr
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq +umdns
-  TITLE:=Package to add Device.DNS. datamodel support
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +odhcpd
+  DEPENDS+=+DNSMNGR_DNS_SD:umdns
+  DEPENDS+=+DNSMNGR_BACKEND_DNSMASQ:dnsmasq
+  DEPENDS+=+DNSMNGR_BACKEND_UNBOUND:unbound-daemon +DNSMNGR_BACKEND_UNBOUND:unbound-control
+  TITLE:=Package to configure DNS backend and TR-181 support
 endef
 
 define Package/dnsmngr/description
-  Package to add Device.DNS. datamodel support.
+  Package to configure DNS backend and TR-181 support.
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_DNSMNGR_DNS_SD),y)
+define Build/Compile
+	$(call Build/Compile/Default,all)
+endef
+else
+define Build/Compile
+	$(call Build/Compile/Default,dns)
+endef
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/dnsmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
+ifeq ($(CONFIG_DNSMNGR_BACKEND_DNSMASQ),y)
+        TARGET_CFLAGS += -DDNSMASQ_BACKEND
+endif
+
 define Package/dnsmngr/install
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/nslookup $(1)
+ifeq ($(CONFIG_DNSMNGR_DNS_SD),y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libdns_sd.so $(1) $(PKG_NAME)
+endif
 endef
 
 $(eval $(call BuildPackage,dnsmngr))

dslmngr/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.6
+PKG_VERSION:=1.2.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
-PKG_SOURCE_VERSION:=2b1ecbd2079dbd88ed6d58b277b91dcf5038d869
+PKG_SOURCE_VERSION:=5340cb31f759301f5aca3fd848fc3a63b0b4663f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip

fluent-bit/Makefile

@@ -6,14 +6,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
 PKG_VERSION:=3.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
-PKG_SOURCE_VERSION=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=9bedfabf859b88a2cfcf51cc17669b83a170e85427ce562131366cb1542b52ae
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/v$(PKG_VERSION)
+PKG_HASH:=7a49e110cf3050b6c29c911063494b8081f3c743274d1d95e52562d0476ba1eb
 endif
 
 PKG_LICENSE:=Apache-2.0

fluent-bit/patches/0002-add_hostname_to_log_dump.patch

@@ -0,0 +1,45 @@
+diff --git a/plugins/out_file/file.c b/plugins/out_file/file.c
+index 2e47c9666..95d28e438 100644
+--- a/plugins/out_file/file.c
++++ b/plugins/out_file/file.c
+@@ -27,6 +27,7 @@
+ #include <msgpack.h>
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -55,6 +56,7 @@ struct flb_file_conf {
+     int csv_column_names;
+     int mkdir;
+     struct flb_output_instance *ins;
++    char hostname[256];
+ };
+ 
+ static char *check_delimiter(const char *str)
+@@ -141,6 +143,9 @@ static int cb_file_init(struct flb_output_instance *ins,
+         }
+     }
+ 
++    if (gethostname(ctx->hostname, sizeof(ctx->hostname)) != 0)
++	    snprintf(ctx->hostname, sizeof(ctx->hostname), "%s", "localhost");
++
+     tmp = flb_output_get_property("delimiter", ins);
+     ret_str = check_delimiter(tmp);
+     if (ret_str != NULL) {
+@@ -233,12 +238,8 @@ static int template_output_write(struct flb_file_conf *ctx,
+     int i;
+     msgpack_object_kv *kv;
+ 
+-    /*
+-     * Right now we treat "{time}" specially and fill the placeholder
+-     * with the metadata timestamp (formatted as float).
+-     */
+-    if (!strncmp(key, "time", size)) {
+-        fprintf(fp, "%f", flb_time_to_double(tm));
++    if (!strncmp(key, "hostname", size)) {
++        fprintf(fp, "%s", ctx->hostname);
+         return 0;
+     }
+ 

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.6
+PKG_VERSION:=9.8.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=798dfcf2a206b2603d64e92a9ce8cc69dd481ced
+PKG_SOURCE_VERSION:=78e522060b0f1adf563cd709215532508db6e9f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -64,6 +64,7 @@ define Package/icwmp/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
+	$(INSTALL_BIN) ./files/etc/critical_services.json $(1)/etc/icwmpd/critical_services.json
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/

icwmp/files/etc/critical_services.json

@@ -0,0 +1,11 @@
+{
+	"services_list": [
+			"firewall",
+			"network",
+			"dhcp",
+			"stunc",
+			"xmpp",
+			"wireless",
+			"time"
+	]
+}

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.5.1
+PKG_VERSION:=8.5.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b0e9ef0934888281ba7db7843738e56e6541665a
+PKG_SOURCE_VERSION:=171fa1b3886547765b2c223edfe195c26fcda28d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/iop.completion

@@ -36,7 +36,7 @@ _iop()
              feeds_update genconfig \
              generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
-             update_feed_branches ssh_upgrade smoketest"
+             ssh_upgrade smoketest"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/annexconfig.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-function disable_add_config () {
-	local COPTION="$1"
-
-	HAVE_OPTION=`grep $COPTION .config | wc -l`
-	HAVE_OPTION_DISABLED=`grep "# $COPTION" .config | wc -l`
-	if [ "$HAVE_OPTION" = "1" ]
-	then
-		if [ "$HAVE_OPTION_DISABLED" = "0" ]
-		then
-			sed -i -e "s,$COPTION=y,# $COPTION is not set,g" .config
-		fi
-	else
-		echo "# $COPTION is not set" >> .config
-	fi
-}
-
-function enable_option () {
-	local COPTION="$1"
-#	cat .config| grep DSL
-	sed -i -e "s,# $COPTION is not set,$COPTION=y,g" .config
-#	cat .config| grep DSL
-}
-
-function annexconfig {
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	local ANNEX="$1"
-
-	disable_add_config CONFIG_TARGET_NO_DSL
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_A
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_B
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_C
-	disable_add_config CONFIG_TARGET_DSL_SADSL
-	disable_add_config CONFIG_TARGET_DSL_GFAST
-
-
-	if [ "$ANNEX" = "no" ]
-	then
-		echo "No DSL"
-		enable_option CONFIG_TARGET_NO_DSL
-	elif [ "$ANNEX" = "a" ]
-	then
-		echo "Annex A"
-		enable_option CONFIG_TARGET_DSL_ANNEX_A
-	elif [ "$ANNEX" = "b" ]
-	then
-		echo "Annex B"
-		enable_option CONFIG_TARGET_DSL_ANNEX_B
-	elif [ "$ANNEX" = "c" ]
-	then
-		echo "Annex C"
-		enable_option CONFIG_TARGET_DSL_ANNEX_C
-	elif [ "$ANNEX" = "sadsl" ]
-	then
-		echo "sadsl"
-		enable_option CONFIG_TARGET_DSL_SADSL
-	elif [ "$ANNEX" = "gfast" ]
-	then
-		echo "G.fast"
-		enable_option CONFIG_TARGET_DSL_GFAST
-	else
-		echo "Only option no,a,b,c,sadsl,gfast supported"
-	fi
-
-}
-
-register_command "annexconfig" "Select configuration annex"

iop/scripts/cfe_upgrade.sh

@@ -1,42 +0,0 @@
-# this is a developer helper script to install firmware on a remote host running in CFE mode
-
-function usage {
-	echo "usage: $0 cfe_upgrade <host> <file>"
-}
-
-function cfe_upgrade {
-	if [ -z "$1" ] ; then
-		usage
-		echo "Error: host required"
-		exit 1
-	fi
-	if [ -z "$2" ] ; then
-		usage
-		echo "Error: firmware filename required"
-		exit 1
-	fi
-	if [ ! -e $2 ] ; then
-		usage
-		echo "Error: firmware file does not exist"
-		exit 1
-	fi
-	IMAGE=`basename $2`
-	echo "CFE upgrade host: $1 with file $IMAGE"
-	[ "$2" ] && [ -e "$2" ] &&  curl -i -F filedata=@$2  http://$1/upload.cgi && echo "upgrade done!"
-}
-
-register_command "cfe_upgrade" "<host> <file>  Install firmware on remote host in CFE mode"
-
-function cfe_upgrade_latest {
-	if [ -z "$1" ] ; then
-		echo "usage: $0 cfe_upgrade_latest <host>"
-		echo "Error: host required"
-		exit 1
-	fi
-	{ cd `dirname $0`
-		IMAGE=`ls -Art bin/*/*.w | tail -n1`
-		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop cfe_upgrade $1 $IMAGE
-	}
-}
-
-register_command "cfe_upgrade_latest" "<host>  Install latest firmware on remote host in CFE mode"

iop/scripts/genconfig_wrap.sh

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

iop/scripts/iopupgrade.sh

@@ -1,283 +0,0 @@
-# this is a developer helper script to install firmware on a remote host with SSH
-
-function upd_usage {
-	echo "usage: $0 ssh_upgrade [-t <host>] [-f <file>] [opts] "
-	echo ""
-	echo "   Default host is 192.168.1.1"
-	echo "   Default firmware file is the latest one (last.{itb,pkgtb})"
-	echo "   Default is to not keep configuration"
-	echo "opts:"
-	echo ""
-	echo "	-i	Interactive use, allows to select firmware file"
-	echo "	-n	Do not do the final reboot of the target board"
-	echo "	-c	Keep configuration"
-	echo "	-x	Force install even if firmware is not for this board"
-	echo "	-b	Force install of bootloader regardless of version installed"
-}
-
-function set_config_string {
-	eval $(grep $1 .config)
-}
-
-function upd_ask_ok {
-	echo "Will continue with the following settings:"
-	echo "-----------------------------------------"
-	printf "%20s: %s\n" "Firmware file" "$upd_fw_base"
-	printf "%20s: %s\n" "Host IP" "$upd_host"
-	printf "%20s: " "Reboot"
-	if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Keep config"
-	if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force bootloader"
-	if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force image upgrade"
-	if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	echo "-----------------------------------------"
-
-	echo -n "Continue? [Y/n/q]:"
-	read answer
-
-	case $answer in
-	n | N)
-		return 1
-		;;
-	q | Q)
-		exit 1
-		;;
-	y | Y | *)
-		return 0
-		;;
-	esac
-}
-
-function upd_select_file {
-	dialog --keep-tite --title "To select a file, use TAB/ARROW to highlight then press SPACEBAR -> RETURN" \
-		--fselect "${upd_fw:-bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/}" \
-		$((lines - 10)) $((cols - 5)) \
-		2>$tempfile
-
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_fw="$new_file"
-		upd_fw_base=$(basename $upd_fw)
-	fi
-}
-
-function upd_select_target {
-	dialog --keep-tite --title "Input the hostname/IP of the target board" \
-		--inputbox "Name/IP" \
-		$((lines - 10)) $((cols - 5)) \
-		"$upd_host" \
-		2>$tempfile
-
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_host="$new_file"
-	fi
-}
-
-function upd_select_reboot {
-	dialog --keep-tite --radiolist "Should the board reboot after download finished" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Reboot" "Restart board after done" $(if [ "$upd_noreboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		"No reboot" "Continue running old system" $(if [ "$upd_noreboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"No reboot")
-		upd_noreboot=1
-		;;
-	"Reboot")
-		upd_noreboot=0
-		;;
-	esac
-}
-
-function upd_select_config {
-	dialog --keep-tite --radiolist "Should the configuration be kept" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Keep" "Keep the config from old system" $(if [ "$upd_keepconf" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Default" "Use default config for new system" $(if [ "$upd_keepconf" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Keep")
-		upd_keepconf=1
-		;;
-	"Default")
-		upd_keepconf=0
-		;;
-	esac
-}
-
-function upd_select_forceboot {
-	dialog --keep-tite --radiolist "Should the boot loader be updated regardless of the version installed" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Always update boot loader" $(if [ "$upd_forceboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Version check" "Only upgrade if version is newer" $(if [ "$upd_forceboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Force")
-		upd_forceboot=1
-		;;
-	"Version check")
-		upd_forceboot=0
-		;;
-	esac
-}
-
-function upd_select_forceimage {
-	dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Disable sanity check and force use of image (dangerous)" $(if [ "$upd_forceimage" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Only compatible" "Normal checks apply" $(if [ "$upd_forceimage" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Force")
-		upd_forceimage=1
-		;;
-	"Only compatible")
-		upd_forceimage=0
-		;;
-	esac
-}
-
-function upd_select {
-	dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select item to change" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Firmware file" "$upd_fw_base" \
-		"Host IP" "$upd_host" \
-		"Reboot" $(if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Keep config" $(if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force bootloader" $(if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force image upgrade" $(if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		2>$tempfile
-
-	case $(cat $tempfile) in
-	"Firmware file")
-		upd_select_file
-		;;
-	"Host IP")
-		upd_select_target
-		;;
-	"Reboot")
-		upd_select_reboot
-		;;
-	"Keep config")
-		upd_select_config
-		;;
-	"Force bootloader")
-		upd_select_forceboot
-		;;
-	"Force image upgrade")
-		upd_select_forceimage
-		;;
-	*)
-		return
-		;;
-	esac
-	upd_select
-}
-function upd_select_start {
-	lines=$(tput lines)
-	cols=$(tput cols)
-	tempfile="$(mktemp)"
-	trap "rm -f $tempfile" 0 1 2 5 15
-	upd_select
-
-}
-
-function ssh_upgrade {
-	upd_noreboot=0
-	upd_forceboot=0
-	upd_keepconf=0
-	upd_forceimage=0
-	upd_fw_base=""
-	upd_fw=""
-	upd_host="192.168.1.1"
-	do_dialog=0
-
-	while getopts "f:hnxt:icb" opt; do
-		case $opt in
-		n)
-			upd_noreboot=1
-			;;
-		x)
-			upd_forceimage=1
-			;;
-		b)
-			upd_forceboot=1
-			;;
-		c)
-			upd_keepconf=1
-			;;
-		v)
-			verbose=$OPTARG
-			;;
-		f)
-			upd_fw=$OPTARG
-			;;
-		t)
-			upd_host=$OPTARG
-			;;
-		i)
-			do_dialog=1
-			;;
-		h)
-			upd_usage
-			exit 1
-			;;
-		\?)
-			echo "Invalid option: -$OPTARG" >&2
-			exit 1
-			;;
-		esac
-	done
-
-	if [ -z "$upd_fw" ]; then
-		set_config_string CONFIG_TARGET_BOARD
-		set_config_string CONFIG_TARGET_SUBTARGET
-		upd_fw="$(realpath -q --canonicalize-existing --relative-to=. "bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/"last.{pkgtb,itb})"
-		if [ -z "$upd_fw" ] && [ $do_dialog -eq 0 ]; then
-			echo "Could not find image. Check that last.{itb,pkgtb} exists or specify an image using -f <image> or -i (interactive)." >&2
-			return 1
-		fi
-	fi
-	upd_fw_base="$(basename "$upd_fw")"
-
-	[ $do_dialog -eq 1 ] && upd_select_start
-
-	if ! upd_ask_ok; then
-		upd_select_start
-		if ! upd_ask_ok; then
-			exit 1
-		fi
-	fi
-
-	if [ ! -f $upd_fw ]; then
-		echo "Firmware file $firmware does not exist."
-		exit 1
-	fi
-
-	extra_args=""
-	[ $upd_noreboot -eq 1 ] && extra_args="$extra_args --no-reboot"
-	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args --force"
-	[ $upd_keepconf -eq 0 ] && extra_args="$extra_args -n"
-	[ $upd_forceboot -eq 1 ] && extra_args="$extra_args --force-loader-upgrade"
-
-	pv "$upd_fw" |
-		ssh \
-			-o ConnectTimeout=60 \
-			-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-			root@"$upd_host" \
-			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
-		echo "Sysupgrade failed" >&2 && return 1
-}
-
-register_command "ssh_upgrade" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"

iop/scripts/taas.sh

@@ -1,89 +0,0 @@
-
-# Shorthand command for doing a HIL runtime smoketest on the
-# latest built image. Does the image boot up correctly?
-# More info here:
-# https://dev.iopsys.eu/iopsys/iopsys-taas
-
-
-#--------------------------------------------------------------
-function taas-init() {
-	local f
-
-	# Path to TaaS binarys. Try some likely ones.
-	if ! which taas-smoketest >/dev/null; then
-		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
-		PATH="${PATH}:${PWD}/../taas/bin"
-		PATH="${PATH}:${HOME}/iopsys-taas/bin"
-		PATH="${PATH}:${HOME}/taas/bin"
-		PATH="${PATH}:${HOME}/bin"
-		PATH="${PATH}:/opt/iopsys-taas/bin"
-		PATH="${PATH}:/opt/taas/bin"
-	fi
-
-	if ! which taas-smoketest >/dev/null; then
-		echo "Error; TaaS is missing! Install it with:"
-		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
-		exit 1
-	fi
-
-	# Create a list of all images which might be of use.
-	for f in ${PWD}/bin/targets/iopsys-*/generic/last.*; do
-		[[ -s "$f" ]] && images+=("$f")
-	done
-
-	# Convert Iopsys target name to the TaaS product name format
-	# according to what is available in the remote lab for HIL.
-	# Also find a suitable image.
-	product=$(grep CONFIG_TARGET_PROFILE .config | \
-		tr -s "=\"" " " | cut -d " " -f 2) || exit
-	case "$product" in
-		smarthub3)
-			export product="SmartHub3a"
-			;;
-		dg400prime|eg400|ex600)
-			export product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
-			;;
-		*)
-			echo "Unsupported target; skipping!"
-			exit 0
-			;;
-	esac
-
-	if [[ ${#images[@]} -eq 0 ]]; then
-		echo "No image found"
-		exit 1
-	fi
-}
-
-
-
-#--------------------------------------------------------------
-function taas-smoketest {
-	declare -a images
-
-	taas-init || return
-	echo "Testing a $product with ${images[@]}..."
-	command taas-smoketest "${images[@]}" "$product" "$@"
-}
-
-
-
-#--------------------------------------------------------------
-function taas-bootstrap {
-	declare -a images
-
-	if [[ -n "$1" ]]; then
-		taas-init || return
-		echo "Flashing $1..."
-		command taas-bootstrap "${images[@]}" "$@"
-	else
-		echo "Usage: ./iop taas-bootstrap dutX"
-		exit 1
-	fi
-}
-
-
-
-register_command "taas-bootstrap" "Write image to a remote lab device."
-register_command "taas-smoketest" "Write image to a remote lab device and test it."
-

iop/scripts/update_feed_branches.sh

@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# Exported interface
-function update_feed_branches {
-	local release="$1"
-	local ipath="$(pwd)"
-	local branch="$2"
-	local curbranch
-
-	[ -n "$release" ] || {
-		echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
-		echo ""
-		echo "If you do not give a branch as argument,"
-		echo "<RELEASE> branch will be updated to commit"
-		echo "hash given in feeds.conf for each feed repo"
-		exit 1
-	}
-
-	if [ -n "$branch" ]; then
-		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
-		if git diff-index --quiet HEAD; then
-			curbranch=`git symbolic-ref HEAD 2>/dev/null`
-			curbranch=${curbranch##refs/heads/}
-			if [ -z $curbranch ]; then
-				curbranch=`git log -1 --pretty=format:"%H"`
-			fi
-			git checkout $branch || {
-				echo "couldn't checkout branch $branch"
-				exit 99
-			}
-		else
-			echo "You have unsaved changes."
-			exit 99
-		fi
-	else
-		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
-	fi
-
-	ifeeds="$(grep -r 'dev.iopsys.eu' feeds.conf | awk '{print$2}' | tr '\n' ' ')"
-
-	for f in $ifeeds; do
-		commith=$(grep $f feeds.conf | cut -d'^' -f2)
-		cd $ipath/feeds/$f
-		git branch -D $release 2>/dev/null
-		echo "$f: updating release branch $release to commit $commith"
-		git checkout $commith
-		git push origin :$release
-		git checkout -b $release
-		git push --set-upstream origin $release
-		cd $ipath
-	done
-
-	if [ -n "$branch" ]; then
-		echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
-		git checkout $curbranch
-	else
-		echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
-	fi
-}
-
-register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"

iopsys-analytics/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aea91816de703cf1c72490f51c2aa73c2f61640d
+PKG_SOURCE_VERSION:=f448cfe9264b4079f616b065244c4be24b516aba
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopsys-analytics.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -29,6 +29,11 @@ define Package/$(PKG_NAME)
     +collectd-mod-processes                             \
     +collectd-mod-write-http                            \
     +@PACKAGE_COLLECTD_ENCRYPTED_NETWORK                \
+  # remote syslog
+  DEPENDS+=                                             \
+    +syslog-ng                                          \
+    +@SYSLOGNG_LOGROTATE                                \
+
 endef
 
 define Package/$(PKG_NAME)/description

libdsl/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdsl
-PKG_VERSION:=7.2.99
+PKG_VERSION:=7.2.100
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f9f3fcd0f4140540db5bd41059bcca7ded083024
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libdsl.git
+PKG_SOURCE_VERSION:=20875ec79fcc7c546c2f1253c867d6afbc8bff75
+PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libdsl.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,6 +27,8 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
   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/broadcom/include/bcm963xx \
+	-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
 else ifeq ($(CONFIG_TARGET_x86),y)
@@ -55,12 +57,19 @@ define Package/libdsl
   SUBMENU:=IOPSYS HAL libs
   MENU:=1
   TITLE:= xDSL library (libdsl)
+  DEPENDS+=TARGET_brcmbca:bcm963xx-bsp
 endef
 
 define Package/libdsl/description
   Library provides xDSL/GFAST HAL APIs
 endef
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./libdsl/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/libdsl/config
   if PACKAGE_libdsl
 	  config LIBDSL_DEBUG

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.110
+PKG_VERSION:=7.2.111
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d94e3029e4e9d14907fd6b283218defb4d319f5a
+PKG_SOURCE_VERSION:=6e7216e657dfb59e869e393ef58e6b4593c16fc7
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.0.15
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=7fde62b9634c63b9bc71d1c20541798971a78dc8
+PKG_SOURCE_VERSION:=baf5ebfb45404714bbfcc3068080f93265934d8a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -38,7 +38,7 @@ define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
 	TITLE:=IOPSYS libvoice for Broadcom
 	URL:=
-	DEPENDS:=
+	DEPENDS:=+bcm963xx-voice
 endef
 
 define Package/$(PKG_NAME)/description
@@ -56,4 +56,3 @@ define Package/$(PKG_NAME)/install
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
-

libvoice-d2/Makefile

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

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.5.2
+PKG_VERSION:=7.6.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e93fcd63354489846e5bb2450c7e8059774577d5
+PKG_SOURCE_VERSION:=7479e5b9a4e106b2603d16028eedaca645936a39
 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
@@ -51,10 +51,6 @@ else ifeq ($(CONFIG_TARGET_ipq53xx),y)
   TARGET_PLATFORM=IPQ53XX
   TARGET_WIFI_TYPE=QUALCOMM MAC80211
   TARGET_CFLAGS +=-DIPQ53XX
-else ifeq ($(CONFIG_TARGET_mediatek),y)
-  TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MEDIATEK MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211

logmngr/files/lib/logmngr/fluent-bit.sh

@@ -184,7 +184,9 @@ handle_log_file() {
 	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
 	echo "    name         file" >> ${TMP_CONF_FILE}
 	echo "    match        $match" >> ${TMP_CONF_FILE}
-	echo "    file        $file" >> ${TMP_CONF_FILE}
+	echo "    file         $file" >> ${TMP_CONF_FILE}
+	echo "    format       template" >> ${TMP_CONF_FILE}
+	echo "    template     {time} {hostname} {ident}: {message}" >> ${TMP_CONF_FILE}
 }
 
 handle_log_remote() {

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.1.1.7
+PKG_VERSION:=6.2.1.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ce4bbb86e02c7c083c8bdd6bf05a5f83a4cbda0f
+PKG_SOURCE_VERSION:=05f073655187c1400c8a6bd7189f4aeba0028a25
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-agent/files/lib/multiap/map_genconfig

@@ -86,12 +86,6 @@ generate_multiap_config() {
 			[ "$disable_mlo" == "1" ] || {
 				uci set wireless.$dev.mlo="1"
 				uci set wireless.$dev.mlo_capable="1"
-
-				# Prevent driver crash for extender - remove it after fix
-				[ "$network_mode" == "extender" -a "$mode_band" == "6" ] && {
-					uci set wireless.$dev.mlo="0"
-					uci set wireless.$dev.mlo_capable="0"
-				}
 				uci commit wireless
 
 				# Disable for MLD/MLO

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.1.1.5
+PKG_VERSION:=6.1.2.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cb27de727b787bdb58bc4bf42fdef8732cb78134
+PKG_SOURCE_VERSION:=3251215d020cb27ab86504d847b3b45900582b57
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

map-controller/files/etc/config/mapcontroller

@@ -27,6 +27,9 @@ config sta_steering
 	option report_rcpi_threshold_2g '80'
 	option report_rcpi_threshold_5g '96'
 	option report_rcpi_threshold_6g '96'
+	option steer_retry_int '30'
+	option steer_int '180'
+	option steer_disable_int '600'
 
 ###################
 # Default AP sections credentials will by updated

mcastmngr/Makefile

@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/mcastmngr.git
-PKG_SOURCE_VERSION:=117acf7a29e3a343756aab9b0ae330022892c15b
+PKG_SOURCE_VERSION:=7e114a0313a61f967324ac9f89cacafdbffe74aa
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

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

@@ -128,14 +128,14 @@ configure_mcpd_snooping() {
 		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
 		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
 		config_snooping_upstream_interface "$igmp_s_iface"
-		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
+		config_snooping_on_bridge $protocol "$igmp_s_iface" $igmp_s_mode
 		exceptions=$igmp_s_exceptions
 		fast_leave=$igmp_s_fast_leave
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
 		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
 		config_snooping_upstream_interface "$mld_s_iface"
-		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
+		config_snooping_on_bridge $protocol "$mld_s_iface" $mld_s_mode
 		exceptions=$mld_s_exceptions
 		fast_leave=$mld_s_fast_leave
 	fi
@@ -171,14 +171,14 @@ configure_mcpd_proxy() {
 		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_p_mode
 		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$igmp_p_up_interfaces"
-		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $igmp_p_mode
+		config_snooping_on_bridge $protocol "$igmp_p_down_interfaces" $igmp_p_mode
 		fast_leave=$igmp_fast_leave
 		exceptions=$igmp_p_exceptions
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_p_mode
 		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$mld_p_up_interfaces"
-		config_snooping_on_bridge $protocol $mld_p_down_interfaces $mld_p_mode
+		config_snooping_on_bridge $protocol "$mld_p_down_interfaces" $mld_p_mode
 		fast_leave=$mld_fast_leave
 		exceptions=$mld_p_exceptions
 	fi

mcastmngr/files/broadcom/usr/libexec/rpcd/mcast

@@ -64,23 +64,11 @@ read_mcast_stats() {
 
 	json_init
 	json_add_array "snooping"
-	json_add_object ""
 	IFS=" "
 	for intf in $ifaces; do
-		while read line; do
-		# reading each line
-			case $line in
-			br-*)
-				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-				if [ "$snoop_iface" != "$intf" ]; then
-					continue
-				fi
-				json_add_string "interface" "$intf"
-				json_add_array "groups"
-				break
-				;;
-			esac
-		done < /tmp/igmp_stats
+		json_add_object ""
+		json_add_string "interface" "$intf"
+		json_add_array "groups"
 		IFS=" "
 		for gip_addr in $mcast_addrs; do
 			grp_obj_added=0
@@ -116,12 +104,14 @@ read_mcast_stats() {
 					;;
 				esac
 			done < /tmp/igmp_stats
-			json_close_array #close the associated devices array
-			json_close_object # close the groups object
+			if [ $grp_obj_added -eq 1 ]; then
+				json_close_array #close the associated devices array
+				json_close_object # close the groups object
+			fi
 		done # close the loop for group addresses
 		json_close_array #close the groups array
+		json_close_object # close the snooping object
 	done # close the loop for interfaces
-	json_close_object # close the snooping object
 	json_close_array # close the snooping array
 	json_dump
 
@@ -135,7 +125,12 @@ case "$1" in
 	call)
 		case "$2" in
 			stats)
-				read_mcast_stats
+				out="$(read_mcast_stats)"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo ${out}
+				fi
 				;;
 		esac
 		;;

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

@@ -85,9 +85,8 @@ config_mcproxy_interfaces() {
 
 	echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
 
+	local filter=""
 	for excp in $exceptions; do
-		local filter=""
-
 		case $excp in
 		*/*)
 			ip_start="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
@@ -98,16 +97,16 @@ config_mcproxy_interfaces() {
 			filter="$filter ($excp | *)"
 			;;
 		esac
+	done
 
-		for upstream in $str_up; do
-			echo "pinstance main upstream $upstream in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main upstream $upstream out blacklist table{$filter };" >> $CONFFILE
-		done
+	for upstream in $str_up; do
+		echo "pinstance main upstream $upstream in blacklist table{$filter };" >> $CONFFILE
+		echo "pinstance main upstream $upstream out blacklist table{$filter };" >> $CONFFILE
+	done
 
-		for downstream in $str_down; do
-			echo "pinstance main downstream $downstream in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main downstream $downstream out blacklist table{$filter };" >> $CONFFILE
-		done
+	for downstream in $str_down; do
+		echo "pinstance main downstream $downstream in blacklist table{$filter };" >> $CONFFILE
+		echo "pinstance main downstream $downstream out blacklist table{$filter };" >> $CONFFILE
 	done
 }
 

mcastmngr/files/linux/usr/libexec/rpcd/mcast

@@ -85,23 +85,11 @@ read_mcast_stats() {
 
 	json_init
 	json_add_array "snooping"
-	json_add_object ""
 	IFS=" "
 	for intf in $ifaces; do
-		while read line; do
-		# reading each line
-			case $line in
-			br-*)
-				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-				if [ "$snoop_iface" != "$intf" ]; then
-					continue
-				fi
-				json_add_string "interface" "$intf"
-				json_add_array "groups"
-				break
-				;;
-			esac
-		done < "$temp_igmp_file"
+		json_add_object ""
+		json_add_string "interface" "$intf"
+		json_add_array "groups"
 		IFS=" "
 		for gip_addr in $mcast_addrs; do
 			grp_obj_added=0
@@ -137,12 +125,14 @@ read_mcast_stats() {
 					;;
 				esac
 			done < "$temp_igmp_file"
-			json_close_array #close the associated devices array
-			json_close_object # close the groups object
+			if [ $grp_obj_added -eq 1 ]; then
+				json_close_array #close the associated devices array
+				json_close_object # close the groups object
+			fi
 		done # close the loop for group addresses
 		json_close_array #close the groups array
+		json_close_object # close the snooping object
 	done # close the loop for interfaces
-	json_close_object # close the snooping object
 	json_close_array # close the snooping array
 	json_dump
 
@@ -156,7 +146,12 @@ case "$1" in
 	call)
 		case "$2" in
 			stats)
-				read_mcast_stats
+				out="$(read_mcast_stats)"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "${out}"
+				fi
 				;;
 		esac
 		;;

netmngr/Makefile

@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2020-2024 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=netmngr
+PKG_VERSION:=1.0.4
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/netmngr.git
+PKG_SOURCE_VERSION:=ad4825bc6349d1cd68680aaaa6c5b217227c90fe
+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/netmngr
+ CATEGORY:=Utilities
+ TITLE:=Network Data Model Support
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+endef
+
+define Package/netmngr/description
+	Package to add Network data model support.
+endef
+
+MAKE_PATH:=src
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=$(CONFIG_BBF_VENDOR_PREFIX)
+
+define Package/netmngr/install
+	$(BBFDM_INSTALL_MS_DM) -u Network $(PKG_BUILD_DIR)/src/libnetmngr.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/src/libinterface_stack.so $(1)
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) ~/git/netmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+$(eval $(call BuildPackage,netmngr))

netmode/README.md

@@ -0,0 +1,109 @@
+# Creating Custom Netmodes in IOWRT
+
+This guide provides developers with detailed instructions on how to create and manage custom network modes (netmodes) in IOWRT. The `netmode` script allows for flexible network configuration, and developers can define their own modes by structuring the necessary files and scripts within the `/etc/netmodes/` directory.
+
+## Table of Contents
+1. [Overview of Netmodes](#overview-of-netmodes)
+2. [Directory Structure](#directory-structure)
+3. [Creating a Custom Netmode](#creating-a-custom-netmode)
+   - [Step 1: Pre-Execution Scripts](#step-1-pre-execution-scripts)
+   - [Step 2: UCI Configuration Files](#step-2-uci-configuration-files)
+   - [Step 3: Custom Execution Scripts](#step-3-custom-execution-scripts)
+   - [Step 4: Post-Execution Scripts](#step-4-post-execution-scripts)
+4. [Enabling and Switching Netmodes](#enabling-and-switching-netmodes)
+
+## Overview of Netmodes
+
+Netmodes in IOWRT provide a way to switch between different network configurations based on the needs of the environment. Developers can create custom netmodes by organizing scripts and configuration files in specific directories under `/etc/netmodes/<NETMODE_NAME>`.
+
+## Directory Structure
+
+A custom netmode is defined within the `/etc/netmodes/<NETMODE_NAME>` directory, which should contain the following subdirectories:
+
+- **/lib/netmode/pre/**: Generic scripts executed before the netmode-specific configurations are applied.
+- **/etc/netmodes/<NETMODE_NAME>/uci/**: Contains UCI configuration files that will be copied to `/etc/config/` during the application of the netmode.
+- **/etc/netmodes/<NETMODE_NAME>/scripts/**: Custom scripts specific to the netmode that are executed after the UCI configurations are applied.
+- **/lib/netmode/post/**: Generic scripts executed after the netmode-specific configurations are completed.
+
+## Creating a Custom Netmode
+
+To create a new netmode, follow these steps:
+
+### Step 1: Pre-Execution Scripts
+
+Scripts located in `/lib/netmode/pre/` are executed before any mode-specific actions. These are typically used for preparing the system or cleaning up configurations from the previous netmode.
+
+- **Create Pre-Execution Scripts**:
+  - Place your generic pre-execution scripts in `/lib/netmode/pre/`.
+  - Example script (`/lib/netmode/pre/cleanup.sh`):
+    ```bash
+    #!/bin/sh
+    echo "Cleaning up old network configurations..."
+    # Add commands here
+    ```
+
+### Step 2: UCI Configuration Files
+
+The UCI configuration files stored in `/etc/netmodes/<NETMODE_NAME>/uci/` will be copied to `/etc/config/`, effectively applying the desired network configuration.
+
+- **Place UCI Config Files**:
+  - Create UCI configuration files under `/etc/netmodes/<NETMODE_NAME>/uci/`.
+  - Example (`/etc/netmodes/bridge/uci/network`):
+````bash
+config device 'br_lan'
+        option name 'br-lan'
+        option type 'bridge'
+        option multicast_to_unicast '0'
+        option bridge_empty '1'
+        list ports 'eth1'
+        list ports 'eth3'
+        list ports 'eth4'
+
+config interface 'lan'
+        option proto 'dhcp'
+        option device 'br-lan'
+        option force_link '1'
+        option reqopts '43 125'
+````
+
+### Step 3: Custom Execution Scripts
+
+After the UCI files are applied, any scripts in `/etc/netmodes/<NETMODE_NAME>/scripts/` are executed. These can be used to perform additional configuration tasks that are specific to the netmode.
+
+- **Create Custom Scripts**:
+  - Add scripts to `/etc/netmodes/<NETMODE_NAME>/scripts/`.
+  - Example (`/etc/netmodes/bridge/scripts/setup_bridge.sh`):
+    ```bash
+    #!/bin/sh
+    echo "Setting up bridge mode..."
+    # Additional configuration commands here
+    ```
+
+### Step 4: Post-Execution Scripts
+
+Finally, the generic scripts in `/lib/netmode/post/` are executed. These scripts typically finalize the setup or perform any necessary cleanups.
+
+- **Create Post-Execution Scripts**:
+  - Place scripts in `/lib/netmode/post/`.
+  - Example script (`/lib/netmode/post/restart_services.sh`):
+    ```bash
+    #!/bin/sh
+    echo "Restarting network services..."
+    # Add commands here
+    ```
+
+## Enabling and Switching Netmodes
+
+The netmode mechanism can be enabled or disabled via the UCI configuration, and you can switch between netmodes using UCI commands.
+
+- **Enable Netmode**:
+  ```bash
+  uci set netmode.global.enabled=1
+  uci commit netmode
+    ```
+    
+- **Switch Netmode**:
+  ```bash
+  uci set netmode.global.mode='<NETMODE_NAME>'
+  uci commit netmode
+    ```

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=8.0.5.4
+PKG_VERSION:=9.0.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=eb7bddb8c0bd00b7e5d33daa9d51725309ac50b9
+PKG_SOURCE_VERSION:=4aba89c67ba57322d112d11e038bc6071252cbd8
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -34,7 +34,7 @@ define Package/obuspa
   MENU:=1
   DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl +ca-certificates \
 		+OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL:mosquitto-ssl +OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL:mosquitto-client-ssl \
-		+OBUSPA_ENABLE_TEST_CONTROLLER:mosquitto-auth-shadow
+		+OBUSPA_ENABLE_TEST_CONTROLLER:mosquitto-auth-shadow +libbbfdm-api +libjson-c
 endef
 
 define Package/obuspa/description
@@ -114,7 +114,6 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/users/roles
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
@@ -125,9 +124,10 @@ define Package/obuspa/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/60-generate-ctrust-defaults $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/92-obuspa_firewall $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/firewall.usp $(1)/etc/
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
-	$(INSTALL_BIN) ./files/obuspa.hotplug $(1)/etc/hotplug.d/iface/21-obuspa
-	$(BBFDM_INSTALL_CORE_PLUGIN) ./files/etc/bbfdm/json/USPAgent.json $(1)
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libuspagentdm.so $(1) $(PKG_NAME)
 ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
 	$(INSTALL_BIN) ./files/etc/uci-defaults/54-test-usp-remote $(1)/etc/uci-defaults/
 endif

obuspa/files/etc/config/obuspa

@@ -5,6 +5,9 @@ config obuspa 'global'
 	option log_level '2'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
+	#option max_group_sep '2'
+	#option ipc_timeout '30'
+	#option max_cache_time '600'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/ca.pem'
 	#option client_cert '/etc/obuspa/client.pem'

obuspa/files/etc/firewall.usp

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+log() {
+	echo "$*"|logger -t obuspa.firewall -p debug
+}
+
+config_load obuspa
+config_get_bool enable_obuspa global enabled 1
+
+if [ "$enable_obuspa" = "0" ]; then
+	return 0;
+fi
+
+sleep 1
+log "ForceReconnect MQTT clients, due firewall reload"
+obuspa -c operate "Device.MQTT.Client.*.ForceReconnect()"

obuspa/files/etc/init.d/obuspa

@@ -352,9 +352,9 @@ configure_controller()
 		db_set "${BASEPATH}.PeriodicNotifInterval" "${PeriodicNotifInterval}"
 	fi
 
-	#if [ -n "${SessionMode}" ]; then
-	#	db_set "${BASEPATH}.E2ESession.SessionMode" "${SessionMode}"
-	#fi
+	if [ -n "${SessionMode}" ]; then
+		db_set "${BASEPATH}.E2ESession.SessionMode" "${SessionMode}"
+	fi
 
 	if [ -n "${assigned_role_name}" ]; then
 		AssignedRole=$(get_role_index "${assigned_role_name}")
@@ -907,6 +907,12 @@ db_init()
 	config_get SQL_DB_FILE global db_file "/tmp/obuspa/usp.db"
 	config_get role_file global role_file ""
 
+	if [ -f "${SQL_DB_FILE}" ]; then
+		if [ "${reason}" != "update" ]; then
+			return 0;
+		fi
+	fi
+
 	if [ -f "${SQL_DB_FILE}.old" ] && [ ! -f "${SQL_DB_FILE}" ]; then
 		log "Copying old db, since new db not present ..."
 		mv ${SQL_DB_FILE}.old ${SQL_DB_FILE}

obuspa/files/etc/obuspa/dmcaching_exclude.json

@@ -2,6 +2,7 @@
   "dmcaching_exclude": [
     "Device.Hosts.Host.",
     "Device.IEEE1905.",
-    "Device.WiFi.DataElements."
+    "Device.WiFi.DataElements.",
+    "Device.NAT.InterfaceSetting."
   ]
 }

obuspa/files/etc/uci-defaults/92-obuspa_firewall

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+uci -q batch <<-EOT
+        delete firewall.usp
+        set firewall.usp=include
+        set firewall.usp.path=/etc/firewall.usp
+        set firewall.usp.reload=1
+        commit firewall
+EOT
+
+exit 0
+

obuspa/files/obuspa.hotplug

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-get_access_role() {
-	local mode lan_proto
-
-	lan_proto="$(uci -q get network.lan.proto)"
-
-	if [ "${lan_proto}" == "dhcp" ]; then
-		mode="extender"
-	else
-		mode="full_access"
-	fi
-
-	echo "$mode"
-}
-
-config_load obuspa
-config_get_bool enable_obuspa global enabled 1
-config_get intf global interface
-
-if [ "$enable_obuspa" = "0" ]; then
-	return 0;
-fi
-
-if [ -z "${intf}" ]; then
-	role="$(get_access_role)"
-
-	if [ "${role}" = "extender" ]; then
-		intf="lan"
-	else
-		intf="wan"
-	fi
-fi
-
-[ "$ACTION" = "ifup" -a "${intf}" = "${INTERFACE}" ] && {
-	sleep 1
-	obuspa -c event Device.LocalAgent.WakeUp!
-}
-

obuspa/patches/0011-max_controllers.patch

@@ -1,6 +1,6 @@
 --- a/src/core/mqtt.c
 +++ b/src/core/mqtt.c
-@@ -241,6 +241,8 @@ void AddConnackSubscription(mqtt_client_
+@@ -254,6 +254,8 @@ void QueueUspRecord_MQTT(mqtt_client_t *
  #define DEFINE_MQTT_TrustCertVerifyCallbackIndex(index) \
  int MQTT_TrustCertVerifyCallback_##index (int preverify_ok, X509_STORE_CTX *x509_ctx) \
  {\
@@ -9,7 +9,7 @@
      return DEVICE_SECURITY_TrustCertVerifyCallbackWithCertChain(preverify_ok, x509_ctx, &mqtt_clients[index].cert_chain);\
  }
  
-@@ -251,6 +253,11 @@ DEFINE_MQTT_TrustCertVerifyCallbackIndex
+@@ -264,6 +266,11 @@ DEFINE_MQTT_TrustCertVerifyCallbackIndex
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(2);
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(3);
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(4);
@@ -21,7 +21,7 @@
  // Add more, with incrementing indexes here, if you change MAX_MQTT_CLIENTS
  
  //------------------------------------------------------------------------------------
-@@ -261,10 +268,15 @@ ssl_verify_callback_t* mqtt_verify_callb
+@@ -274,10 +281,15 @@ ssl_verify_callback_t* mqtt_verify_callb
      MQTT_TrustCertVerifyCallbackIndex(2),
      MQTT_TrustCertVerifyCallbackIndex(3),
      MQTT_TrustCertVerifyCallbackIndex(4),

obuspa/patches/0014-persist-connack-clientid.patch

@@ -1,82 +0,0 @@
---- a/src/core/mqtt.c
-+++ b/src/core/mqtt.c
-@@ -63,6 +63,8 @@
- #include "retry_wait.h"
- #include "text_utils.h"
- #include "msg_handler.h"
-+#include "data_model.h"
-+#include "usp_api.h"
- 
- // Defines for MQTT Property Values
- #define PUBLISH 0x30
-@@ -2613,6 +2615,37 @@ exit:
- 
- /*********************************************************************//**
- **
-+** handle_db_set_client_id
-+**
-+** Allows the caller to set client Id in DB from the data model thread
-+**
-+** \param   arg1 - pointer to the client id path
-+** \param   arg2 - pointer to the client id value
-+**
-+** \return  None
-+**
-+**************************************************************************/
-+void handle_db_set_client_id(void *arg1, void *arg2)
-+{
-+    if ((arg1 == NULL) || (arg2 == NULL)) {
-+        USP_SAFE_FREE(arg1);
-+        USP_SAFE_FREE(arg2);
-+        return;
-+    }
-+
-+    char *param_path = (char *)arg1;
-+    char *param_val = (char *)arg2;
-+
-+    if (USP_ERR_OK != DATA_MODEL_SetParameterInDatabase(param_path, param_val)) {
-+        USP_LOG_Debug("%s: Failed to set %s=>%s from CONNACK", __FUNCTION__, param_path, param_val);
-+    }
-+
-+    USP_SAFE_FREE(param_path);
-+    USP_SAFE_FREE(param_val);
-+}
-+
-+/*********************************************************************//**
-+**
- ** ConnectV5Callback
- **
- ** Called by Libmosquitto when the CONNACK packet is received on an MQTTv5 connection
-@@ -2685,10 +2718,28 @@ void ConnectV5Callback(struct mosquitto
-               &client_id_ptr, false /* skip first */) != NULL)
-         {
-             USP_LOG_Debug("%s: Received client_id: \"%s\"", __FUNCTION__, client_id_ptr);
--            USP_SAFE_FREE(client->conn_params.client_id);
--            client->conn_params.client_id = USP_STRDUP(client_id_ptr);
--            USP_SAFE_FREE(client->next_params.client_id);
--            client->next_params.client_id = USP_STRDUP(client_id_ptr);
-+
-+            if (client->conn_params.client_id == NULL || strcmp(client->conn_params.client_id, client_id_ptr) != 0) {
-+                USP_SAFE_FREE(client->conn_params.client_id);
-+                client->conn_params.client_id = USP_STRDUP(client_id_ptr);
-+                USP_SAFE_FREE(client->next_params.client_id);
-+                client->next_params.client_id = USP_STRDUP(client_id_ptr);
-+
-+                // Persist client id from CONNACK in DB
-+                char buf[128] = {0}, *param_path = NULL, *param_val = NULL;
-+
-+                snprintf(buf, 128, "Device.MQTT.Client.%d.ClientID", instance);
-+
-+                param_path = USP_STRDUP(buf);
-+                param_val = USP_STRDUP(client_id_ptr);
-+
-+                if (USP_ERR_OK != USP_PROCESS_DoWork(handle_db_set_client_id, param_path, param_val)) {
-+                    USP_LOG_Debug("%s: Failed to schedule set in data model thread for client id from CONNACK", __FUNCTION__);
-+                    USP_SAFE_FREE(param_path);
-+                    USP_SAFE_FREE(param_val);
-+                }
-+            }
-+
-             free(client_id_ptr);
-         }
- 

obuspa/patches/0021-fix_e2e_session_init.patch

@@ -0,0 +1,32 @@
+--- a/src/core/device_controller.c	2024-08-23 18:22:55.378560809 +0530
++++ b/src/core/device_controller.c	2024-08-23 19:09:07.130278193 +0530
+@@ -4282,6 +4282,14 @@
+         goto exit;
+     }
+ 
++#if defined(E2ESESSION_EXPERIMENTAL_USP_V_1_2)
++    err = ProcessControllerE2ESessionAdded(cont);
++    if (err != USP_ERR_OK)
++    {
++        goto exit;
++    }
++#endif
++
+     // Exit if unable to get the object instance numbers present in this controller's MTP table
+     USP_SNPRINTF(path, sizeof(path), "%s.%d.MTP", device_cont_root, cont_instance);
+     err = DATA_MODEL_GetInstances(path, &iv);
+@@ -4323,14 +4331,6 @@
+     DEVICE_MQTT_UpdateControllerTopics();
+ #endif
+ 
+-#if defined(E2ESESSION_EXPERIMENTAL_USP_V_1_2)
+-    err = ProcessControllerE2ESessionAdded(cont);
+-    if (err != USP_ERR_OK)
+-    {
+-        goto exit;
+-    }
+-#endif
+-
+     // If the code gets here, then we successfully retrieved all data about the controller (even if some of the MTPs were not added)
+     err = USP_ERR_OK;
+ 

obuspc/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspc
-PKG_VERSION:=1.0.1.7
+PKG_VERSION:=1.0.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa-test-controller.git
-PKG_SOURCE_VERSION:=61f14c5a1fba8c251cf1cfb18c163eab62d5674d
+PKG_SOURCE_VERSION:=1cf32fa4cb5c07906b1e061a394cf0413a6ad750
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

packet-capture-diagnostics/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=packet-capture-diagnostics
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/packet-capture-diagnostics.git
-PKG_SOURCE_VERSION:=6c64e11d78b3be9990714bf5fcd97752cc15c4a8
+PKG_SOURCE_VERSION:=d1115ed0c129614192b9c4e68e7b81b52e08ea4f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

periodicstats/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.5.12
+PKG_VERSION:=1.5.13
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=e59f980306e9ef4c1e3e56839906b8c5cba18338
+PKG_SOURCE_VERSION:=72974d0e22a64b2cec51857c3f17dc239fec079f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

qosmngr/files/airoha/lib/qos/airoha.sh

@@ -26,7 +26,17 @@ hw_intf_init() {
 
 # Initialize the hardware setup library
 hw_init_all() {
+    local tc=0
+
     export TMP_HW_QUEUE_LIST=""
+    echo clear > /proc/ifc_debug
+    echo reinit > /proc/ifc_debug
+
+    for tc in $(seq 0 7); do
+        rm -rf "/tmp/qos/dscp_values_${tc}_4"
+        rm -rf "/tmp/qos/dscp_values_${tc}_6"
+    done
+
     return 0
 }
 
@@ -150,6 +160,8 @@ hw_commit_all() {
     local shape_rate="$TMP_HW_SHAPE_RATE"
     local q_count="0"
     local mac_qos_flag=""
+    local pbit=0
+    local tc=0
 
     # Reorder queues
     for q in ${sorted_list} ; do
@@ -205,4 +217,33 @@ hw_commit_all() {
     else
         /userfs/bin/qosrule discpline Enable 0
     fi
+
+    if [ -x /userfs/bin/blapi_cmd ]; then
+        echo 1 > /proc/ifc_send_to_ppe
+        for tc in $(seq 0 7); do
+            if [ -s "/tmp/qos/dscp_values_${tc}_4" ]; then
+                sort -un "/tmp/qos/dscp_values_${tc}_4" | awk 'NR==1{first=$1;last=$1;next}
+                                                               $1 == last+1 {last=$1;next}
+                                                               {system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 1");first=$1;last=first}
+                                                               END{system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 1")}'
+            fi
+            if [ -s "/tmp/qos/dscp_values_${tc}_6" ]; then
+                [ -s "/tmp/qos/dscp_values_${tc}_4" ] && sort -un "/tmp/qos/dscp_values_${tc}_6" | awk 'NR==1{first=$1;last=$1;next}
+                                                                                                        $1 == last+1 {last=$1;next}
+                                                                                                        {system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 0");first=$1;last=first}
+                                                                                                        END{system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 0")}'
+                sort -un "/tmp/qos/dscp_values_${tc}_6" | awk 'NR==1{first=$1;last=$1;next}
+                                                               $1 == last+1 {last=$1;next}
+                                                               {system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 1");first=$1;last=first}
+                                                               END{system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 1")}'
+            fi
+        done
+    fi
+
+    if [ -x /userfs/bin/ifc ]; then
+        echo 1 > /proc/ifc_send_to_ppe
+        for pbit in $(seq 0 7); do
+            /userfs/bin/ifc add vip pbit $pbit
+        done
+    fi
 }

qosmngr/files/airoha/lib/qos/chains.ebtables.sh

@@ -26,6 +26,7 @@ broute_ipv4_rule_options()
     config_get protocol "$cid" "proto"
     config_get dscp_filter "$cid" "dscp_filter"
     config_get icmp_type "$cid" "icmp_type"
+    config_get traffic_class "$cid" "traffic_class"
 
     set_ip_addr "$cid" ebt_match_src_ip ebt_match_dst_ip
 
@@ -36,6 +37,7 @@ broute_ipv4_rule_options()
         tos_val=$((dscp_filter<<2))
         tos_hex=$(printf "%x" $tos_val)
         broute_filter_on_dscp "$tos_hex"
+        [ -n "$traffic_class" -a "$dscp_filter" != "0" ] && echo "$((dscp_filter))" >> "/tmp/qos/dscp_values_${traffic_class}_4"
     fi
 
     if [ -n "$protocol" ]; then
@@ -57,6 +59,7 @@ broute_ipv6_rule_options()
     config_get protocol "$cid" "proto"
     config_get dscp_filter "$cid" "dscp_filter"
     config_get icmp_type "$cid" "icmp_type"
+    config_get traffic_class "$cid" "traffic_class"
 
     set_ip_addr "$cid" ebt_match_ipv6_src_ip ebt_match_ipv6_dst_ip
 
@@ -67,6 +70,7 @@ broute_ipv6_rule_options()
         tos_val=$((dscp_filter<<2))
         tos_hex=$(printf "%x" $tos_val)
         ebt_match_ipv6_dscp "$tos_hex"
+        [ -n "$traffic_class" -a "$dscp_filter" != "0" ] && echo "$((dscp_filter))" >> "/tmp/qos/dscp_values_${traffic_class}_6"
     fi
 
     if [ -n "$protocol" ]; then

self-diagnostics/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.9
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0-only

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

@@ -11,17 +11,28 @@ case "$1" in
 		case "$2" in
 			generate)
 				read -t 1 -r input
+				local out
 
 				json_load "${input}"
 				json_get_var modules modules
 				if [ -z "${modules}" ]; then
-					${BIN} -j
+					out="$(${BIN} -j)"
 				else
-					${BIN} -j -m "${modules}"
+					out="$(${BIN} -j -m "${modules}")"
+				fi
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "${out}"
 				fi
 			;;
 			list)
-				${BIN} -j -l
+				out="$(${BIN} -j -l)"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "${out}"
+				fi
 			;;
 		esac
 	;;

sshmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sshmngr
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -63,6 +63,18 @@ else
 	$(INSTALL_DATA) ./files/openssh_backend/lib/sshmngr/backend.sh $(1)/lib/sshmngr/
 endif
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libsshmngr.so $(1) $(PKG_NAME)
+
+ifeq ($(CONFIG_PACKAGE_fail2ban),y)
+	$(INSTALL_DIR) $(1)/etc/fail2ban/jail.d
+	$(INSTALL_DIR) $(1)/etc/fail2ban/filter.d/
+ifeq ($(CONFIG_SSHMNGR_BACKEND_DROPBEAR),y)
+	$(INSTALL_CONF) ./files/dropbear_backend/fail2ban/sshmngr.local $(1)/etc/fail2ban/jail.d/
+	$(INSTALL_DATA) ./files/dropbear_backend/fail2ban/sshmngr.conf $(1)/etc/fail2ban/filter.d/
+else
+	$(INSTALL_CONF) ./files/openssh_backend/fail2ban/sshmngr.local $(1)/etc/fail2ban/jail.d/
+	$(INSTALL_DATA) ./files/openssh_backend/fail2ban/sshmngr.conf $(1)/etc/fail2ban/filter.d/
+endif
+endif
 endef
 
 $(eval $(call BuildPackage,sshmngr))

sshmngr/files/common/usr/libexec/rpcd/sshmngr

@@ -69,7 +69,7 @@ case "$1" in
 					server_pid="$(get_pid "$server")"
 
 					if [ "$server_pid" -eq 0 ]; then
-						return
+						break
 					fi
 
 					# get all current sessions
@@ -119,7 +119,10 @@ case "$1" in
 				if [ "$session_pid" -gt 0 ]; then
 					kill -15 "$session_pid"
 				else
-					[ -n "$server_name" ] || return
+					if [ -z "$server_name" ]; then
+						echo '{}'
+						exit 0
+					fi
 
 					# if server_name is present
 					# get all current sessions
@@ -127,7 +130,8 @@ case "$1" in
 					server_pid="$(get_pid "$server_name")"
 
 					if [ "$server_pid" -eq 0 ]; then
-						return
+						echo '{}'
+						exit 0
 					fi
 
 					# get all current sessions
@@ -146,6 +150,7 @@ case "$1" in
 						fi
 					done
 				fi
+				echo '{}'
 			;;
 
 			list_keys)
@@ -191,6 +196,7 @@ case "$1" in
 						echo "${new_key}" >> ${KEY_FILE}
 					fi
 				fi
+				echo '{}'
 			;;
 
 			remove_pubkey)
@@ -216,6 +222,7 @@ case "$1" in
 
 					mv TEMP_KEY_FILE "$KEY_FILE"
 				fi
+				echo '{}'
 			;;
 		esac
 	;;

sshmngr/files/dropbear_backend/fail2ban/sshmngr.conf

@@ -0,0 +1,52 @@
+# Fail2Ban filter for dropbear
+#
+# NOTE: The regex below is ONLY intended to work with a patched
+# version of Dropbear as described here:
+# http://www.unchartedbackwaters.co.uk/pyblosxom/static/patches
+#            ^%(__prefix_line)sexit before auth from <HOST>.*\s*$
+#
+# The standard Dropbear output doesn't provide enough information to
+# ban all types of attack.  The Dropbear patch adds IP address
+# information to the 'exit before auth' message which is always
+# produced for any form of non-successful login. It is that message
+# which this file matches.
+#
+# More information: http://bugs.debian.org/546913
+
+[INCLUDES]
+
+# Read common prefixes. If any customizations available -- read them from
+# common.local
+before = common.conf
+
+[Definition]
+
+datepattern = ^%%b %%d %%H:%%M:%%S
+
+_daemon = dropbear
+
+prefregex = ^%(__prefix_line)s<F-CONTENT>(?:[Ll]ogin|[Bb]ad|[Ee]xit).+</F-CONTENT>$
+
+failregex = ^[Ll]ogin attempt for nonexistent user ('.*' )?from <HOST>:\d+$
+            ^[Bb]ad (PAM )?password attempt for .+ from <HOST>(:\d+)?$
+            ^[Ee]xit before auth \(user '.+', \d+ fails\): Max auth tries reached - user '.+' from <HOST>:\d+\s*$
+
+ignoreregex = 
+
+# DEV Notes:
+#
+# The first two regexs here match the unmodified dropbear messages. It isn't
+# possible to match the source of the 'exit before auth' messages from dropbear
+# as they don't include the "from <HOST>" bit.
+#
+# The second last failregex line we need to match with the modified dropbear.
+#
+# For the second regex the following apply:
+#
+# http://www.netmite.com/android/mydroid/external/dropbear/svr-authpam.c
+# http://svn.dd-wrt.com/changeset/16642#file64
+#
+# http://svn.dd-wrt.com/changeset/16642/src/router/dropbear/svr-authpasswd.c
+#
+# Author: Francis Russell
+#         Zak B. Elep

sshmngr/files/dropbear_backend/fail2ban/sshmngr.local

@@ -0,0 +1,9 @@
+[dropbear]
+enabled = true
+port = ssh
+filter = sshmngr
+logpath = /var/log/messages
+maxretry = 3
+findtime = 10
+bantime = 120
+ignoreip = 127.0.0.1

sshmngr/files/openssh_backend/fail2ban/sshmngr.conf

@@ -0,0 +1,138 @@
+# Fail2Ban filter for openssh
+#
+# If you want to protect OpenSSH from being bruteforced by password
+# authentication then get public key authentication working before disabling
+# PasswordAuthentication in sshd_config.
+#
+#
+# "Connection from <HOST> port \d+" requires LogLevel VERBOSE in sshd_config
+#
+
+[INCLUDES]
+
+# Read common prefixes. If any customizations available -- read them from
+# common.local
+before = common.conf
+
+[DEFAULT]
+
+_daemon = sshd
+
+# optional prefix (logged from several ssh versions) like "error: ", "error: PAM: " or "fatal: "
+__pref = (?:(?:error|fatal): (?:PAM: )?)?
+# optional suffix (logged from several ssh versions) like " [preauth]"
+#__suff = (?: port \d+)?(?: \[preauth\])?\s*
+__suff = (?: (?:port \d+|on \S+|\[preauth\])){0,3}\s*
+__on_port_opt = (?: (?:port \d+|on \S+)){0,2}
+# close by authenticating user:
+__authng_user = (?: (?:invalid|authenticating) user <F-USER>\S+|.*?</F-USER>)?
+
+# for all possible (also future) forms of "no matching (cipher|mac|MAC|compression method|key exchange method|host key type) found",
+# see ssherr.c for all possible SSH_ERR_..._ALG_MATCH errors.
+__alg_match = (?:(?:\w+ (?!found\b)){0,2}\w+)
+
+# PAM authentication mechanism, can be overridden, e. g. `filter = sshd[__pam_auth='pam_ldap']`:
+__pam_auth = pam_[a-z]+
+
+[Definition]
+
+datepattern = ^%%b %%d %%H:%%M:%%S
+
+prefregex = ^<F-MLFID>%(__prefix_line)s</F-MLFID>%(__pref)s<F-CONTENT>.+</F-CONTENT>$
+
+cmnfailre = ^[aA]uthentication (?:failure|error|failed) for <F-USER>.*</F-USER> from <HOST>( via \S+)?%(__suff)s$
+            ^User not known to the underlying authentication module for <F-USER>.*</F-USER> from <HOST>%(__suff)s$
+            <cmnfailre-failed-pub-<publickey>>
+            ^Failed <cmnfailed> for (?P<cond_inv>invalid user )?<F-USER>(?P<cond_user>\S+)|(?(cond_inv)(?:(?! from ).)*?|[^:]+)</F-USER> from <HOST>%(__on_port_opt)s(?: ssh\d*)?(?(cond_user): |(?:(?:(?! from ).)*)$)
+            ^<F-USER>ROOT</F-USER> LOGIN REFUSED FROM <HOST>
+            ^[iI](?:llegal|nvalid) user <F-USER>.*?</F-USER> from <HOST>%(__suff)s$
+            ^User <F-USER>\S+|.*?</F-USER> from <HOST> not allowed because not listed in AllowUsers%(__suff)s$
+            ^User <F-USER>\S+|.*?</F-USER> from <HOST> not allowed because listed in DenyUsers%(__suff)s$
+            ^User <F-USER>\S+|.*?</F-USER> from <HOST> not allowed because not in any group%(__suff)s$
+            ^refused connect from \S+ \(<HOST>\)
+            ^Received <F-MLFFORGET>disconnect</F-MLFFORGET> from <HOST>%(__on_port_opt)s:\s*3: .*: Auth fail%(__suff)s$
+            ^User <F-USER>\S+|.*?</F-USER> from <HOST> not allowed because a group is listed in DenyGroups%(__suff)s$
+            ^User <F-USER>\S+|.*?</F-USER> from <HOST> not allowed because none of user's groups are listed in AllowGroups%(__suff)s$
+            ^<F-NOFAIL>%(__pam_auth)s\(sshd:auth\):\s+authentication failure;</F-NOFAIL>(?:\s+(?:(?:logname|e?uid|tty)=\S*)){0,4}\s+ruser=<F-ALT_USER>\S*</F-ALT_USER>\s+rhost=<HOST>(?:\s+user=<F-USER>\S*</F-USER>)?%(__suff)s$
+            ^maximum authentication attempts exceeded for <F-USER>.*</F-USER> from <HOST>%(__on_port_opt)s(?: ssh\d*)?%(__suff)s$
+            ^User <F-USER>\S+|.*?</F-USER> not allowed because account is locked%(__suff)s
+            ^<F-MLFFORGET>Disconnecting</F-MLFFORGET>(?: from)?(?: (?:invalid|authenticating)) user <F-USER>\S+</F-USER> <HOST>%(__on_port_opt)s:\s*Change of username or service not allowed:\s*.*\[preauth\]\s*$
+            ^Disconnecting: Too many authentication failures(?: for <F-USER>\S+|.*?</F-USER>)?%(__suff)s$
+            ^<F-NOFAIL>Received <F-MLFFORGET>disconnect</F-MLFFORGET></F-NOFAIL> from <HOST>%(__on_port_opt)s:\s*11:
+            <mdre-<mode>-other>
+            ^<F-MLFFORGET><F-MLFGAINED>Accepted \w+</F-MLFGAINED></F-MLFFORGET> for <F-USER>\S+</F-USER> from <HOST>(?:\s|$)
+
+cmnfailed-any = \S+
+cmnfailed-ignore = \b(?!publickey)\S+
+cmnfailed-invalid = <cmnfailed-ignore>
+cmnfailed-nofail = (?:<F-NOFAIL>publickey</F-NOFAIL>|\S+)
+cmnfailed = <cmnfailed-<publickey>>
+
+mdre-normal =
+# used to differentiate "connection closed" with and without `[preauth]` (fail/nofail cases in ddos mode)
+mdre-normal-other = ^<F-NOFAIL><F-MLFFORGET>(Connection closed|Disconnected)</F-MLFFORGET></F-NOFAIL> (?:by|from)%(__authng_user)s <HOST>(?:%(__suff)s|\s*)$
+
+mdre-ddos = ^Did not receive identification string from <HOST>
+            ^kex_exchange_identification: (?:[Cc]lient sent invalid protocol identifier|[Cc]onnection closed by remote host)
+            ^Bad protocol version identification '.*' from <HOST>
+            ^<F-NOFAIL>SSH: Server;Ltype:</F-NOFAIL> (?:Authname|Version|Kex);Remote: <HOST>-\d+;[A-Z]\w+:
+            ^Read from socket failed: Connection <F-MLFFORGET>reset</F-MLFFORGET> by peer
+# same as mdre-normal-other, but as failure (without <F-NOFAIL>) and [preauth] only:
+mdre-ddos-other = ^<F-MLFFORGET>(Connection (?:closed|reset)|Disconnected)</F-MLFFORGET> (?:by|from)%(__authng_user)s <HOST>%(__on_port_opt)s\s+\[preauth\]\s*$
+
+mdre-extra = ^Received <F-MLFFORGET>disconnect</F-MLFFORGET> from <HOST>%(__on_port_opt)s:\s*14: No(?: supported)? authentication methods available
+            ^Unable to negotiate with <HOST>%(__on_port_opt)s: no matching <__alg_match> found.
+            ^Unable to negotiate a <__alg_match>
+            ^no matching <__alg_match> found:
+# part of mdre-ddos-other, but user name is supplied (invalid/authenticating) on [preauth] phase only:
+mdre-extra-other = ^<F-MLFFORGET>Disconnected</F-MLFFORGET>(?: from)?(?: (?:invalid|authenticating)) user <F-USER>\S+|.*?</F-USER> <HOST>%(__on_port_opt)s \[preauth\]\s*$
+
+mdre-aggressive = %(mdre-ddos)s
+                  %(mdre-extra)s
+# mdre-extra-other is fully included within mdre-ddos-other:
+mdre-aggressive-other = %(mdre-ddos-other)s
+
+# Parameter "publickey": nofail (default), invalid, any, ignore
+publickey = nofail
+# consider failed publickey for invalid users only:
+cmnfailre-failed-pub-invalid = ^Failed publickey for invalid user <F-USER>(?P<cond_user>\S+)|(?:(?! from ).)*?</F-USER> from <HOST>%(__on_port_opt)s(?: ssh\d*)?(?(cond_user): |(?:(?:(?! from ).)*)$)
+# consider failed publickey for valid users too (don't need RE, see cmnfailed):
+cmnfailre-failed-pub-any =
+# same as invalid, but consider failed publickey for valid users too, just as no failure (helper to get IP and user-name only, see cmnfailed):
+cmnfailre-failed-pub-nofail = <cmnfailre-failed-pub-invalid>
+# don't consider failed publickey as failures (don't need RE, see cmnfailed):
+cmnfailre-failed-pub-ignore =
+
+cfooterre = ^<F-NOFAIL>Connection from</F-NOFAIL> <HOST>
+
+failregex = %(cmnfailre)s
+            <mdre-<mode>>
+            %(cfooterre)s
+
+# Parameter "mode": normal (default), ddos, extra or aggressive (combines all)
+# Usage example (for jail.local):
+#   [sshd]
+#   mode = extra
+#   # or another jail (rewrite filter parameters of jail):
+#   [sshd-aggressive]
+#   filter = sshd[mode=aggressive]
+#
+mode = normal
+
+#filter = sshd[mode=aggressive]
+
+ignoreregex = 
+
+maxlines = 1
+
+journalmatch = _SYSTEMD_UNIT=sshd.service + _COMM=sshd
+
+# DEV Notes:
+#
+#   "Failed \S+ for .*? from <HOST>..." failregex uses non-greedy catch-all because
+#   it is coming before use of <HOST> which is not hard-anchored at the end as well,
+#   and later catch-all's could contain user-provided input, which need to be greedily
+#   matched away first.
+#
+# Author: Cyril Jaquier, Yaroslav Halchenko, Petr Voralek, Daniel Black and Sergey Brester aka sebres
+# Rewritten using prefregex (and introduced "mode" parameter) by Serg G. Brester.

sshmngr/files/openssh_backend/fail2ban/sshmngr.local

@@ -0,0 +1,9 @@
+[sshd]
+enabled = true
+port = ssh
+filter = sshmngr
+logpath = /var/log/messages
+maxretry = 3
+findtime = 10
+bantime = 120
+ignoreip = 127.0.0.1

stunc/Makefile

@@ -7,14 +7,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.5
 PKG_RELEASE:=1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=92fd3d9d59b3c660266b0411b653fee9dcfda1ed
+PKG_SOURCE_VERSION:=741ef6aa2f07e77bb4e5d12f3c3bc6cad8d04a61
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -36,7 +36,6 @@ define Package/stunc
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
 	-Wall -Werror
 
 ifeq ($(LOCAL_DEV),1)

swmodd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.5.16
+PKG_VERSION:=2.5.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/swmodd.git
-PKG_SOURCE_VERSION:=c36ff3594ed20d9bbc90d52adbdf7d6c186c4ce1
+PKG_SOURCE_VERSION:=f14859ab9a5e829ebbe9b3736c2677ee7e7c36cf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

timemngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=timemngr
-PKG_VERSION:=1.0.22
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=d0dedf229e24535b5b6a284662f1560868fdcd7c
+PKG_SOURCE_VERSION:=a6c3926d7d1bb4031d3bc9865d4648abe173ad93
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -29,7 +29,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Time manager daemon based on ntpd
-  DEPENDS:=+bbfdmd +ntpd +libuci +libubox +ubus
+  DEPENDS:=+bbfdmd +ntpd +libuci +libubox +ubus +libbbfdm-api +libbbfdm-ubus +@BUSYBOX_CONFIG_PGREP
   MENU:=1
 endef
 
@@ -59,11 +59,10 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/timemngr $(1)/usr/sbin/timemngr
 ifeq ($(CONFIG_TIMEMNGR_LEGACY_DM),y)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/dm_time_legacy.so $(1) $(PKG_NAME)
 else
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/dm_time.so $(1) $(PKG_NAME)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/timemngr $(1)/usr/sbin/timemngr
 ifeq ($(CONFIG_TIMEMNGR_MIGRATE_SYSTEM),y)
 	$(INSTALL_BIN) ./files/etc/uci-defaults/96-system-ntp-migrate $(1)/etc/uci-defaults/
 endif
@@ -81,5 +80,4 @@ ifeq ($(CONFIG_TIMEMNGR_VENDOR_EXTENSIONS),y)
 endif
 endef
 
-
 $(eval $(call BuildPackage,$(PKG_NAME)))

timemngr/files/etc/config/time

@@ -1,5 +1,7 @@
 config global 'global'
         option enable '1'
+        option dst '1'
+        option loglevel '2'
 
 config client 'client'
         option enable '1'

timemngr/files/etc/init.d/timemngr

@@ -9,53 +9,66 @@ USE_PROCD=1
 PROG_UBUS=/usr/sbin/timemngr
 
 log() {
-	echo "${@}"|logger -t time.init -p info
+	echo "${@}"|logger -t timemngr.init -p info
 }
 
 validate_global_section() {
 	uci_validate_section time global global \
 	    'enable:bool:1' \
-	    'loglevel:uinteger:4' \
+	    'loglevel:uinteger:3' \
 	    'mdns:bool:1'
 }
 
+boot() {
+	config_load time
+	config_get_bool dst_enable global dst 1
+
+	if [ "${dst_enable}" -eq 1 ]; then
+		if ! grep -qF "#timemngr-dst" /etc/crontabs/root; then
+			echo "0 0 * * *   service system restart #timemngr-dst" >> /etc/crontabs/root
+		fi
+	else
+		sed -i '/#timemngr-dst/d' /etc/crontabs/root
+	fi
+
+	start
+}
+
 start_service() {
-	local enable loglevel server_enable
+	local enable loglevel server_enable mdns
 
 	if uci -q get system.ntp >/dev/null 2>&1; then
 		log "Not starting timemngr, legacy ntp definition detected"
 		return 1
 	fi
 
-	validate_global_section || {
-		return 1
-	}
+	config_load time
 
-	if [ "$enable" != 1 ]; then
-		return 1
-	fi
+	validate_global_section
 
-	procd_open_instance timemngr_ubus
+	# Start timemngr_dm instance
+	procd_open_instance timemngr_dm
 	procd_set_param command $PROG_UBUS
 	procd_append_param command -l ${loglevel}
+	procd_set_param respawn
+	procd_close_instance
 
-	config_load time
 	config_get_bool server_enable server enable 0
 
 	if [ "${server_enable}" -eq 1 ]; then
 		[ "${mdns}" -ne 0 ] && procd_add_mdns "ntp" "udp" "123" "daemon=ntpd"
 	fi
 
-	procd_set_param respawn
-	procd_close_instance
-
-	generate_config
-	create_service
+	# Generate Config & Start timemngr instance
+	if [ "${enable}" -eq 1 ]; then
+		generate_config
+		create_service
+	fi
 }
 
 reload_service() {
-	log "Restarting timemngr"
-	stop
+	log "Reloading timemngr instance"
+	stop "timemngr"
 	start
 }
 

tr104/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.32
+PKG_VERSION:=1.0.34
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=5632a71e0da8d498c214469dec76d2774f3a8a15
+PKG_SOURCE_VERSION:=51c55b680f02c75cf329871f33d9a4ae43731f50
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

tr143/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr143
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr143d.git
-PKG_SOURCE_VERSION:=54302dec291726b0e765e56b4d72ac53655e0f29
+PKG_SOURCE_VERSION:=71d6f4d3b3ba1a3d771b99cc39cdb41e1c197d02
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,7 +25,7 @@ include ../bbfdm/bbfdm.mk
 define Package/tr143
  CATEGORY:=Utilities
  TITLE:=TR-143 Data Model Support
- DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +netmngr
 endef
 
 define Package/tr143/description
@@ -35,7 +35,7 @@ endef
 MAKE_PATH:=src
 
 define Package/tr143/install
-	$(BBFDM_INSTALL_MS_DM) -u Diagnostics $(PKG_BUILD_DIR)/src/libtr143d.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libtr143d.so $(1) netmngr
 	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/download $(1)
 	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/traceroute $(1)
 	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/upload $(1)

tr471/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr471
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr471d.git
-PKG_SOURCE_VERSION:=69b4d324f2b2c78d858b0446dcb90dba9d5f60c3
+PKG_SOURCE_VERSION:=589c71e07a5e8044bdd03d3d5b161d9ef1270a6d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,7 +25,7 @@ include ../bbfdm/bbfdm.mk
 define Package/tr471
  CATEGORY:=Utilities
  TITLE:=TR-471 Data Model Support
- DEPENDS:=+obudpst +libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+ DEPENDS:=+obudpst +libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +netmngr
 endef
 
 define Package/tr471/description
@@ -35,7 +35,7 @@ endef
 MAKE_PATH:=src
 
 define Package/tr471/install
-	$(BBFDM_INSTALL_MS_DM) -u IPLayerCapacity $(PKG_BUILD_DIR)/src/libtr471d.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libtr471d.so $(1) netmngr
 	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/iplayercap $(1)
 endef
 

twamp/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.4.5
+PKG_VERSION:=1.4.7
 
 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:=678a980b9433e34c3ea24af003e6ee987f2bce75
+PKG_SOURCE_VERSION:=26950dd25b8091f0da40c177ebb89976be69f9cf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TWAMP Light Client(TR-390)
-  DEPENDS:=+libuci +ubox +libubus +libbbfdm-api
+  DEPENDS:=+libuci +ubox +libubus +libbbfdm-api +netmngr
 endef
 
 define Package/$(PKG_NAME)/description
@@ -56,7 +56,7 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) ./files/etc/firewall.twamp $(1)/etc/firewall.twamp
 	$(INSTALL_BIN) ./files/etc/uci-defaults/92-twampfirewall $(1)/etc/uci-defaults/92-twampfirewall
 	$(INSTALL_BIN) ./files/etc/uci-defaults/93-twamp_fix_reflector $(1)/etc/uci-defaults/93-twamp_fix_reflector
-	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libtwamp.so $(1)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libtwamp.so $(1) netmngr
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

udpecho/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.2.2
+PKG_VERSION:=2.2.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/udpecho.git
-PKG_SOURCE_VERSION:=abffd08f3c2d333137ce6757619e08f986d89906
+PKG_SOURCE_VERSION:=5d28eabd1772813f89ab23a5f15818d223c228d7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -35,7 +35,7 @@ define Package/$(PKG_NAME)-server
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF UDP Echo Server
-  DEPENDS:=+libuci +libbbfdm-api
+  DEPENDS:=+libuci +libbbfdm-api +netmngr
 endef
 
 define Package/$(PKG_NAME)-client
@@ -70,7 +70,7 @@ define Package/$(PKG_NAME)-server/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/udpechoserverd $(1)/usr/sbin/
 	$(INSTALL_DATA) ./files/etc/config/udpechoserver $(1)/etc/config/udpechoserver
 	$(INSTALL_BIN) ./files/etc/init.d/udpechoserverd $(1)/etc/init.d/udpechoserverd
-	$(BBFDM_INSTALL_MS_DM) -u UDPEchoConfig $(PKG_BUILD_DIR)/src/libudpechoserver.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libudpechoserver.so $(1) netmngr
 endef
 
 define Package/$(PKG_NAME)-client/install

urlfilter/Makefile

@@ -3,16 +3,15 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.15
+PKG_VERSION:=2.0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/urlfilter.git
-PKG_SOURCE_VERSION:=b68c9bb94c24a7394997522e982e37d85e172e0c
+PKG_SOURCE_VERSION:=08044747036259db23d6581fcbaa51750516749e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -45,13 +44,20 @@ endif
 
 define Package/urlfilter/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/etc/urlfilter
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/urlfilter $(1)/usr/sbin
+
+	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/urlfilter $(1)/etc/init.d/
+
+	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DATA) ./files/etc/config/urlfilter $(1)/etc/config/
+
+	$(INSTALL_DIR) $(1)/etc/
+	$(INSTALL_DATA) ./files/etc/firewall.urlfilter $(1)/etc/
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-urlfilter_add_firewall_rule $(1)/etc/uci-defaults
+
 	$(BBFDM_INSTALL_MS_DM) ./files/etc/urlfilter/urlfilter.json $(1) $(PKG_NAME)
 endef
 

urlfilter/files/etc/firewall.urlfilter

@@ -0,0 +1,31 @@
+
+iptables -w -nL FORWARD|grep -iqE "NFQUEUE"
+if [ "$?" -ne 0 ]; then
+	# setup netfilter queue 0, use queue bypass so that if no application is
+	# listening to this queue then traffic is unaffected.
+	iptables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	iptables -w -I FORWARD 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	
+	iptables -w -I INPUT 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	iptables -w -I INPUT 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	
+	# disable acceleration for https packet so that they can be read by urlfilter
+	ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
+	ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
+	ebtables --concurrent -A FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
+fi
+
+ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
+if [ "$?" -ne 0 ]; then
+	#ip6table rules
+	ip6tables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	ip6tables -w -I FORWARD 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	
+	ip6tables -w -I INPUT 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	ip6tables -w -I INPUT 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	
+	# disable acceleration for https packet so that they can be read by urlfilter
+	ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
+	ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
+	ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
+fi

urlfilter/files/etc/init.d/urlfilter

@@ -1,62 +1,17 @@
 #!/bin/sh /etc/rc.common
 
-START=21
+START=95
 STOP=10
 
 USE_PROCD=1
 NAME=urlfilter
 PROG=/usr/sbin/urlfilter
 
-configure_firewall()
-{
-	iptables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -ne 0 ]; then
-		# setup netfilter queue 0, use queue bypass so that if no application is
-		# listening to this queue then traffic is unaffected.
-		iptables -w -I FORWARD 1 -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 2 -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 3 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 4 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 5 -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 6 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I INPUT 1 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I INPUT 2 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I INPUT 3 -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I INPUT 4 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		# disable acceleration for https packet so that they can be read by urlfilter
-		ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-	fi
-	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -ne 0 ]; then
-		#ip6table rules
-		ip6tables -w -I FORWARD 1 -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 2 -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 3 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 4 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 5 -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 6 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I INPUT 1 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I INPUT 2 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I INPUT 3 -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I INPUT 4 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		# disable acceleration for https packet so that they can be read by urlfilter
-		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-	fi
-
-}
-
 start_service() {
 
 	if [ "$(uci -q get urlfilter.globals.enable)" == "1" ]; then
 		procd_open_instance urlfilter
 		procd_set_param command ${PROG}
-		configure_firewall
 		procd_set_param respawn
 		procd_close_instance
 
@@ -69,48 +24,11 @@ start_service() {
 	fi
 }
 
-stop_service() {
-	iptables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -eq 0 ]; then
-		iptables -w -D FORWARD -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p tcp --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
-		iptables -w -D INPUT -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D INPUT -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ebtables --concurrent -D FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-	fi
-	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -eq 0 ]; then
-		#ip6table rules
-		ip6tables -w -D FORWARD -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D INPUT -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D INPUT -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D INPUT -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D INPUT -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-	fi
-}
 reload_service() {
 	stop
 	start
 }
 
-
 service_triggers() {
 	procd_add_reload_trigger "urlfilter"
-	procd_add_reload_trigger "firewall"
 }

urlfilter/files/etc/uci-defaults/95-urlfilter_add_firewall_rule

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+
+if uci -q get firewall.urlfilter >/dev/null; then
+	exit
+fi
+
+uci set firewall.urlfilter=include
+uci set firewall.urlfilter.reload=1
+uci set firewall.urlfilter.path=/etc/firewall.urlfilter
+uci commit firewall

usbmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbmngr
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/usbmngr.git
-PKG_SOURCE_VERSION:=8854939163cc60154a52834fa70677b3d1a53d46
+PKG_SOURCE_VERSION:=387298c97e384502d1df786346ec6a96e98be057
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

userinterface/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=userinterface
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/userinterface.git
-PKG_SOURCE_VERSION:=98f016c93c162f0f4c4854398ff5936f040e5a77
+PKG_SOURCE_VERSION:=02bedd40e083cc456b2abed8f711b45c93061815
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

userinterface/files/backend/nginx/userinterface_rpc

@@ -70,7 +70,12 @@ case "$1" in
 	call)
 		case "$2" in
 			http_session)
-				get_nginx_session_list
+				out="$(get_nginx_session_list)"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "$out"
+				fi
 			;;
 			http_status)
 				read -r input
@@ -79,7 +84,12 @@ case "$1" in
 				json_get_var port "port"
 				json_cleanup
 
-				get_nginx_status "${port}"
+				out="$(get_nginx_status "${port})"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "$out"
+				fi
 			;;
 		esac
 	;;

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.18
+PKG_VERSION:=1.2.19
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=3756e698d6debe4b5038a942e7332dc733f6f816
+PKG_SOURCE_VERSION:=99bf586d4facbf10239acf013f5c235b41fdcb5b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,7 @@ define Package/usermngr
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  DEPENDS:= +shadow-utils +libbbfdm-api
+  DEPENDS:= +shadow-utils +libbbfdm-api +libopenssl
   TITLE:=Package to add Device.Users. datamodel support
 endef
 

voicemngr/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.13
+PKG_VERSION:=1.1.14
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
@@ -19,7 +19,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=14b34f42063004151aed8165fda81b094c9dbadc
+PKG_SOURCE_VERSION:=1fd5bc3f19c534c82601b1e95fb0e8d3e3cc46a4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -41,7 +41,7 @@ define Package/$(PKG_NAME)
 	TITLE:=IOPSYS Voice Manager
 	URL:=
 
-	DEPENDS:= +libubox +libblobmsg-json +ubus +!TARGET_brcmbca:libpicoevent +TARGET_brcmbca:libpicoevent-bcm \
+	DEPENDS:= +libubox +libblobmsg-json +ubus +libopenssl +!TARGET_brcmbca:libpicoevent +TARGET_brcmbca:libpicoevent-bcm \
 		+!TARGET_brcmbca:uci +TARGET_brcmbca:uci-bcm \
 		+TARGET_brcmbca:bcm963xx-bsp +TARGET_brcmbca:libvoice-broadcom \
 		+TARGET_ipq95xx:libvoice-d2 +TARGET_ipq95xx:kmod-d2-voice \

wifidmd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=6523c92cc2880ec5eebfc60d09bb5084ec504b6e
+PKG_SOURCE_VERSION:=20a367d52d84ad253736075d6dab30c4bf51a20d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=17.3.3
+PKG_VERSION:=17.4.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fe089207eb9050dbee7dd1e214e4ce1eeeb97851
+PKG_SOURCE_VERSION:=7937ad854b45d445a9e6109eba14a57ad92a3f69
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

xmppc/Makefile

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