update

2025-12-25 19:44:30 +08:00 · 2024-08-13 11:56:09 +02:00 · 2024-08-13 11:51:29 +02:00 · 2024-08-13 11:50:31 +02:00 · 2024-08-13 11:48:59 +02:00 · 2024-08-13 11:47:16 +02:00
45 changed files with 1236 additions and 580 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.11.0
+PKG_VERSION:=1.10.0

 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=1537993fc84f9abf367d39c2b83676c5c6d5c58c
+PKG_SOURCE_VERSION:=75195a112e3aef2b07e224afbbffcb15368be58f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -32,14 +32,6 @@ define Package/libbbfdm-api
  ABI_VERSION:=1.0
 endef

-define Package/libbbfdm-ubus
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  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/libbbfdm
  SECTION:=utils
  CATEGORY:=Utilities
@@ -54,7 +46,7 @@ define Package/bbfdmd
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm-ubus +libbbfdm +jq +bbf_configmngr
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm +jq +bbf_configmngr
 endef

 define Package/bbf_configmngr
@@ -78,10 +70,6 @@ define Package/libbbfdm-api/description
 Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef

-define Package/libbbfdm-ubus/description
- Library contains the APIs to expose data model over ubus
-endef
-
 define Package/libbbfdm/description
 Library contains the data model tree, It includes basic TR181 nodes.
 endef
@@ -124,11 +112,6 @@ define Package/libbbfdm-api/install
 	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
 endef

-define Package/libbbfdm-ubus/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/lib/
-endef
-
 define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap

@@ -187,16 +170,11 @@ 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-ubus))
 $(eval $(call BuildPackage,libbbfdm))
 $(eval $(call BuildPackage,bbfdmd))
--- a/bbfdm/files/etc/config/bbfdm
+++ b/bbfdm/files/etc/config/bbfdm
@@ -1,6 +1,8 @@
 config bbfdmd 'bbfdmd'
 	option enable '1'
-	option loglevel '3'
+	option loglevel '1'
+	option refresh_time '120'
+	option transaction_timeout '30'
 	option subprocess_level '2'

 config micro_services 'micro_services'
--- a/bbfdm/files/etc/init.d/bbf_configd
+++ b/bbfdm/files/etc/init.d/bbf_configd
@@ -6,20 +6,10 @@ 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"
 }
--- a/bbfdm/files/etc/init.d/bbfdmd
+++ b/bbfdm/files/etc/init.d/bbfdmd
@@ -22,6 +22,8 @@ validate_bbfdm_bbfdmd_section()
 		'sock:string' \
 		'debug:bool:false' \
 		'loglevel:uinteger:1' \
+		'refresh_time:uinteger:0' \
+		'transaction_timeout:uinteger:30' \
 		'subprocess_level:uinteger'
 }

@@ -39,7 +41,7 @@ configure_bbfdmd()
 	[ "${enable}" -eq 0 ] && return 0

 	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
+		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}
--- a/decollector/Makefile
+++ b/decollector/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=decollector
-PKG_VERSION:=6.0.1.0
+PKG_VERSION:=6.0.0.13

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a94894a827259471a1ed528c20eae85596a56743
+PKG_SOURCE_VERSION:=d75639d9ae82538103123b32fc0de9280e84cabb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/dectmngr/Makefile
+++ b/dectmngr/Makefile
@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.9
+PKG_VERSION:=3.6.7

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=82d5bae7ef1d54b41029c9f87e8c821cde38a28e
+PKG_SOURCE_VERSION:=98999eb75755f79a3c8a7e802e024b42914d1efc
 PKG_MIRROR_HASH:=skip
 endif

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

 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
-PKG_SOURCE_VERSION:=93f756f80a9391afd9b01f2608e031c4db3ca48b
+PKG_SOURCE_VERSION:=4c89a3f12686343e3cca23819255744ac06dfb22
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,9 +28,7 @@ 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 +odhcpd
-  DEPENDS+=+DNSMNGR_DNS_SD:umdns
-  DEPENDS+=+DNSMNGR_BACKEND_DNSMASQ:dnsmasq
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq
 endef

 define Package/dhcpmngr/description
@@ -46,10 +44,6 @@ 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

--- a/dhcpmngr/files/etc/uci-defaults/unbound.odhcpd.uci_default
+++ b/dhcpmngr/files/etc/uci-defaults/unbound.odhcpd.uci_default
@@ -1,18 +0,0 @@
-#!/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
--- a/dnsmngr/Config.in
+++ b/dnsmngr/Config.in
@@ -1,30 +0,0 @@
-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
--- a/dnsmngr/Makefile
+++ b/dnsmngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.8

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=dd7a285798b48e199f5e5d90d9c20cb5e0c14888
+PKG_SOURCE_VERSION:=e46f27dd2be08775909a69ac58917213549c7704
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,47 +27,23 @@ MAKE_PATH:=src
 define Package/dnsmngr
  SECTION:=net
  CATEGORY:=Network
-  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
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq +umdns
+  TITLE:=Package to add Device.DNS. datamodel support
 endef

 define Package/dnsmngr/description
-  Package to configure DNS backend and TR-181 support.
+  Package to add Device.DNS. datamodel 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))
--- a/fluent-bit/Makefile
+++ b/fluent-bit/Makefile
@@ -13,7 +13,7 @@ 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:=9a0730ee9b181b0514d50b32700fa29d711d1f44c6e3a78d67e4e5d830962d0f
+PKG_MIRROR_HASH:=9bedfabf859b88a2cfcf51cc17669b83a170e85427ce562131366cb1542b52ae
 endif

 PKG_LICENSE:=Apache-2.0
--- a/fluent-bit/patches/0002-add_hostname_to_log_dump.patch
+++ b/fluent-bit/patches/0002-add_hostname_to_log_dump.patch
@@ -1,45 +0,0 @@
-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;
-     }
- 
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.9
+PKG_VERSION:=9.8.8

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

 PKG_NAME:=ieee1905
-PKG_VERSION:=8.5.6
+PKG_VERSION:=8.5.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=25925684c21de7494d4973b1799f5bd121014518
+PKG_SOURCE_VERSION:=b0e9ef0934888281ba7db7843738e56e6541665a
 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
--- a/iopsys-analytics/Makefile
+++ b/iopsys-analytics/Makefile
@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f448cfe9264b4079f616b065244c4be24b516aba
+PKG_SOURCE_VERSION:=aea91816de703cf1c72490f51c2aa73c2f61640d
 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
--- a/libethernet/Makefile
+++ b/libethernet/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.111
+PKG_VERSION:=7.2.110

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6e7216e657dfb59e869e393ef58e6b4593c16fc7
+PKG_SOURCE_VERSION:=d94e3029e4e9d14907fd6b283218defb4d319f5a
 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
--- a/libvoice-d2/Makefile
+++ b/libvoice-d2/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.13
+PKG_VERSION:=1.1.12
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE

@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=0b00d6e2772bf31e696fc974df071e6fcf972fa3
+PKG_SOURCE_VERSION:=772955d814af8bbf91cf5c76f128cd1d17755625
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libwifi/Makefile
+++ b/libwifi/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libwifi
-PKG_VERSION:=7.5.3
+PKG_VERSION:=7.5.2

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9a17fc7c9857f5976707322469a0e8581ead88a6
+PKG_SOURCE_VERSION:=e93fcd63354489846e5bb2450c7e8059774577d5
 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
--- a/logmngr/files/lib/logmngr/fluent-bit.sh
+++ b/logmngr/files/lib/logmngr/fluent-bit.sh
@@ -184,9 +184,7 @@ 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 "    format       template" >> ${TMP_CONF_FILE}
-	echo "    template     {time} {hostname} {ident}: {message}" >> ${TMP_CONF_FILE}
+	echo "    file        $file" >> ${TMP_CONF_FILE}
 }

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

 PKG_NAME:=map-agent
-PKG_VERSION:=6.1.1.12
+PKG_VERSION:=6.1.1.9
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=2f83ba1aa0655c07a2d3e40df034f4f81139a571
+PKG_SOURCE_VERSION:=8779b993dc8075aa48525340b9e86e13fa7ac54b
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 PKG_LICENSE:=BSD-3-Clause
--- a/map-agent/files/lib/multiap/map_genconfig
+++ b/map-agent/files/lib/multiap/map_genconfig
@@ -86,6 +86,12 @@ 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
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=6.1.1.8
+PKG_VERSION:=6.1.1.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c947d0783032cc2eb6e627bf8d1d32c38196ab8b
+PKG_SOURCE_VERSION:=cb27de727b787bdb58bc4bf42fdef8732cb78134
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 LOCAL_DEV=0
--- a/map-controller/files/etc/config/mapcontroller
+++ b/map-controller/files/etc/config/mapcontroller
@@ -27,9 +27,6 @@ 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
--- a/netmngr/Makefile
+++ b/netmngr/Makefile
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2020-2024 iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=netmngr
-PKG_VERSION:=1.0.0
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/network/netmngr.git
-PKG_SOURCE_VERSION:=775bd689558266380691207e1809b650ed90cee2
-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
-
-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))
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=8.0.8.4
+PKG_VERSION:=8.0.5.4

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=d315304de3a704a37673807d5b02b04243487764
+PKG_SOURCE_VERSION:=eb7bddb8c0bd00b7e5d33daa9d51725309ac50b9
 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 +libbbfdm-api +libjson-c
+		+OBUSPA_ENABLE_TEST_CONTROLLER:mosquitto-auth-shadow
 endef

 define Package/obuspa/description
@@ -127,7 +127,7 @@ define Package/obuspa/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/
 	$(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_MS_DM) $(PKG_BUILD_DIR)/libuspagentdm.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_CORE_PLUGIN) ./files/etc/bbfdm/json/USPAgent.json $(1)
 ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
 	$(INSTALL_BIN) ./files/etc/uci-defaults/54-test-usp-remote $(1)/etc/uci-defaults/
 endif
--- a/obuspa/files/etc/bbfdm/json/USPAgent.json
+++ b/obuspa/files/etc/bbfdm/json/USPAgent.json
--- a/obuspa/files/etc/init.d/obuspa
+++ b/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}")
--- a/obuspa/patches/0011-max_controllers.patch
+++ b/obuspa/patches/0011-max_controllers.patch
@@ -1,6 +1,6 @@
 --- a/src/core/mqtt.c
 +++ b/src/core/mqtt.c
-@@ -254,6 +254,8 @@ void QueueUspRecord_MQTT(mqtt_client_t *
+@@ -241,6 +241,8 @@ void AddConnackSubscription(mqtt_client_
 #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);\
 }
 
-@@ -264,6 +266,11 @@ DEFINE_MQTT_TrustCertVerifyCallbackIndex
+@@ -251,6 +253,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
 
 //------------------------------------------------------------------------------------
-@@ -274,10 +281,15 @@ ssl_verify_callback_t* mqtt_verify_callb
+@@ -261,10 +268,15 @@ ssl_verify_callback_t* mqtt_verify_callb
     MQTT_TrustCertVerifyCallbackIndex(2),
     MQTT_TrustCertVerifyCallbackIndex(3),
     MQTT_TrustCertVerifyCallbackIndex(4),
--- a/obuspa/patches/0014-persist-connack-clientid.patch
+++ b/obuspa/patches/0014-persist-connack-clientid.patch
@@ -0,0 +1,82 @@
+--- 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);
+         }
+ 
--- a/obuspa/patches/0021-fix_e2e_session_init.patch
+++ b/obuspa/patches/0021-fix_e2e_session_init.patch
@@ -1,32 +0,0 @@
--- 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;
- 
--- a/qosmngr/files/airoha/lib/qos/airoha.sh
+++ b/qosmngr/files/airoha/lib/qos/airoha.sh
@@ -26,17 +26,7 @@ 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
 }

@@ -160,8 +150,6 @@ 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
@@ -217,33 +205,4 @@ 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
 }
--- a/qosmngr/files/airoha/lib/qos/chains.ebtables.sh
+++ b/qosmngr/files/airoha/lib/qos/chains.ebtables.sh
@@ -26,7 +26,6 @@ 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

@@ -37,7 +36,6 @@ 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
@@ -59,7 +57,6 @@ 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

@@ -70,7 +67,6 @@ 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
--- a/sshmngr/Makefile
+++ b/sshmngr/Makefile
@@ -63,18 +63,6 @@ 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))
--- a/sshmngr/files/dropbear_backend/fail2ban/sshmngr.conf
+++ b/sshmngr/files/dropbear_backend/fail2ban/sshmngr.conf
@@ -1,52 +0,0 @@
-# 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
--- a/sshmngr/files/dropbear_backend/fail2ban/sshmngr.local
+++ b/sshmngr/files/dropbear_backend/fail2ban/sshmngr.local
@@ -1,9 +0,0 @@
-[dropbear]
-enabled = true
-port = ssh
-filter = sshmngr
-logpath = /var/log/messages
-maxretry = 3
-findtime = 10
-bantime = 120
-ignoreip = 127.0.0.1
--- a/sshmngr/files/openssh_backend/fail2ban/sshmngr.conf
+++ b/sshmngr/files/openssh_backend/fail2ban/sshmngr.conf
@@ -1,138 +0,0 @@
-# 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.
--- a/sshmngr/files/openssh_backend/fail2ban/sshmngr.local
+++ b/sshmngr/files/openssh_backend/fail2ban/sshmngr.local
@@ -1,9 +0,0 @@
-[sshd]
-enabled = true
-port = ssh
-filter = sshmngr
-logpath = /var/log/messages
-maxretry = 3
-findtime = 10
-bantime = 120
-ignoreip = 127.0.0.1
--- a/timemngr/Makefile
+++ b/timemngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=timemngr
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.22

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=524495fc46987eab80eacdd5f2349b2fbd5efb23
+PKG_SOURCE_VERSION:=d0dedf229e24535b5b6a284662f1560868fdcd7c
 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 +libbbfdm-api +libbbfdm-ubus +@BUSYBOX_CONFIG_PGREP
+  DEPENDS:=+bbfdmd +ntpd +libuci +libubox +ubus
  MENU:=1
 endef

@@ -59,10 +59,11 @@ 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
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/timemngr $(1)/usr/sbin/timemngr
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/dm_time.so $(1) $(PKG_NAME)
 ifeq ($(CONFIG_TIMEMNGR_MIGRATE_SYSTEM),y)
 	$(INSTALL_BIN) ./files/etc/uci-defaults/96-system-ntp-migrate $(1)/etc/uci-defaults/
 endif
@@ -80,4 +81,5 @@ ifeq ($(CONFIG_TIMEMNGR_VENDOR_EXTENSIONS),y)
 endif
 endef

+
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/timemngr/files/etc/init.d/timemngr
+++ b/timemngr/files/etc/init.d/timemngr
@@ -9,7 +9,7 @@ USE_PROCD=1
 PROG_UBUS=/usr/sbin/timemngr

 log() {
-	echo "${@}"|logger -t timemngr.init -p info
+	echo "${@}"|logger -t time.init -p info
 }

 validate_global_section() {
@@ -20,38 +20,42 @@ validate_global_section() {
 }

 start_service() {
-	local enable loglevel server_enable mdns
+	local enable loglevel server_enable

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

-	config_load time
+	validate_global_section || {
+		return 1
+	}

-	validate_global_section
+	if [ "$enable" != 1 ]; then
+		return 1
+	fi

-	# Start timemngr_dm instance
-	procd_open_instance timemngr_dm
+	procd_open_instance timemngr_ubus
 	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

-	# Generate Config & Start timemngr instance
+	procd_set_param respawn
+	procd_close_instance
+
 	generate_config
 	create_service
 }

 reload_service() {
-	log "Reloading timemngr instance"
-	stop "timemngr"
+	log "Restarting timemngr"
+	stop
 	start
 }

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

 PKG_NAME:=tr143
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.4

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -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 +netmngr
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
 endef

 define Package/tr143/description
@@ -35,7 +35,7 @@ endef
 MAKE_PATH:=src

 define Package/tr143/install
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libtr143d.so $(1) netmngr
+	$(BBFDM_INSTALL_MS_DM) -u Diagnostics $(PKG_BUILD_DIR)/src/libtr143d.so $(1) $(PKG_NAME)
 	$(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)
--- a/tr471/Makefile
+++ b/tr471/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=tr471
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.4

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -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 +netmngr
+ DEPENDS:=+obudpst +libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
 endef

 define Package/tr471/description
@@ -35,7 +35,7 @@ endef
 MAKE_PATH:=src

 define Package/tr471/install
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libtr471d.so $(1) netmngr
+	$(BBFDM_INSTALL_MS_DM) -u IPLayerCapacity $(PKG_BUILD_DIR)/src/libtr471d.so $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/iplayercap $(1)
 endef

--- a/twamp/Makefile
+++ b/twamp/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=twamp
-PKG_VERSION:=1.4.6
+PKG_VERSION:=1.4.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -28,7 +28,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=TWAMP Light Client(TR-390)
-  DEPENDS:=+libuci +ubox +libubus +libbbfdm-api +netmngr
+  DEPENDS:=+libuci +ubox +libubus +libbbfdm-api
 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_MS_PLUGIN) $(PKG_BUILD_DIR)/libtwamp.so $(1) netmngr
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libtwamp.so $(1)
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/udpecho/Makefile
+++ b/udpecho/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=udpecho
-PKG_VERSION:=2.2.3
+PKG_VERSION:=2.2.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -35,7 +35,7 @@ define Package/$(PKG_NAME)-server
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF UDP Echo Server
-  DEPENDS:=+libuci +libbbfdm-api +netmngr
+  DEPENDS:=+libuci +libbbfdm-api
 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_PLUGIN) $(PKG_BUILD_DIR)/src/libudpechoserver.so $(1) netmngr
+	$(BBFDM_INSTALL_MS_DM) -u UDPEchoConfig $(PKG_BUILD_DIR)/src/libudpechoserver.so $(1) $(PKG_NAME)
 endef

 define Package/$(PKG_NAME)-client/install
--- a/voicemngr/Makefile
+++ b/voicemngr/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.14
+PKG_VERSION:=1.1.13
 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:=1fd5bc3f19c534c82601b1e95fb0e8d3e3cc46a4
+PKG_SOURCE_VERSION:=14b34f42063004151aed8165fda81b094c9dbadc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifimngr
-PKG_VERSION:=17.3.6
+PKG_VERSION:=17.3.3

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=488957bdd5da67329b84e71c6852e9e5df9fbbdf
+PKG_SOURCE_VERSION:=fe089207eb9050dbee7dd1e214e4ce1eeeb97851
 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
Author	SHA1	Message	Date
Sukru Senli	ae9135e1b0	update	2024-08-13 11:56:09 +02:00
Sukru Senli	59d05ff3b0	update	2024-08-13 11:51:29 +02:00
Sukru Senli	87d9d5d8b7	update	2024-08-13 11:50:31 +02:00
Sukru Senli	b9333b7c0c	update	2024-08-13 11:48:59 +02:00
Sukru Senli	402ec1db7c	netmode: add README	2024-08-13 11:47:16 +02:00