fluent-bit: convert kmsg pri field from char to string

In order to support filtering based on serverity and facility in
logmngr config, we need to be able to configure regex on the
priority field, but kmsg input plugin sends the priority field as
char, on which regex does not work. We also cannot use the type
converter filter which is present in fluent bit, because it does
not support the source data type to be char. Therefore, we change
priority from a char to a string field.

bbfdm/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.18.23
+PKG_VERSION:=1.17.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:=f13c2a5a9aeec8219039ed11b7d25fb117348a50
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=c9af4e50cef5336e7842578d3d10f1f7bce2d8b0
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -55,7 +55,7 @@ define Package/dm-service
   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 +libeasy
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libbbfdm-ubus +bbf_configmngr
 endef
 
 define Package/bbf_configmngr
@@ -107,7 +107,7 @@ endif
 
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBFDMD_MAX_MSG_LEN:Integer=20971520 \
+	-DBBFDMD_MAX_MSG_LEN:Integer=10485760 \
 	-DCMAKE_BUILD_TYPE:String="Debug" \
 
 
@@ -183,7 +183,6 @@ define Package/bbf_configmngr/install
 
 	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_default_reload.sh $(1)/etc/bbfdm/
 	$(INSTALL_DATA) ./files/etc/bbfdm/critical_services.json $(1)/etc/bbfdm/
 endef
 

bbfdm/bbfdm_service.json

@@ -25,6 +25,10 @@
         "parent_dm": "Device.",
         "object": "SelfTestDiagnostics"
       },
+      {
+        "parent_dm": "Device.",
+        "object": "Syslog"
+      },
       {
         "parent_dm": "Device.",
         "object": "{BBF_VENDOR_PREFIX}OpenVPN",

bbfdm/files/etc/bbfdm/critical_services.json

@@ -1,47 +1,23 @@
 {
 	"usp": [
-			"/etc/config/firewall",
-			"/etc/bbfdm/dmmap/dmmap_firewall",
-			"/etc/config/network",
-			"/etc/bbfdm/dmmap/IP",
-			"/etc/bbfdm/dmmap/Ethernet",
-			"/etc/bbfdm/dmmap/GRE",
-			"/etc/bbfdm/dmmap/IPv6rd",
-			"/etc/bbfdm/dmmap/PPP",
-			"/etc/bbfdm/dmmap/Routing",
-			"/etc/config/dhcp",
-			"/etc/bbfdm/dmmap/DHCPv4",
-			"/etc/bbfdm/dmmap/DHCPv6",
-			"/etc/config/time",
-			"/etc/bbfdm/dmmap/dmmap_time",
-			"/etc/config/mapcontroller",
-			"/etc/config/wireless",
-			"/etc/bbfdm/dmmap/WiFi",
-			"/etc/config/ieee1905",
-			"/etc/config/mosquitto",
-			"/etc/config/nginx",
-			"/etc/config/netmode",
-			"/etc/bbfdm/dmmap/dmmap_netmode"
+			"firewall",
+			"network",
+			"dhcp",
+			"time",
+			"wireless",
+			"ieee1905",
+			"mapcontroller",
+			"mosquitto",
+			"nginx",
+			"netmode"
 	],
 	"cwmp": [
-			"/etc/config/firewall",
-			"/etc/bbfdm/dmmap/dmmap_firewall",
-			"/etc/config/network",
-			"/etc/bbfdm/dmmap/IP",
-			"/etc/bbfdm/dmmap/Ethernet",
-			"/etc/bbfdm/dmmap/GRE",
-			"/etc/bbfdm/dmmap/IPv6rd",
-			"/etc/bbfdm/dmmap/PPP",
-			"/etc/bbfdm/dmmap/Routing",
-			"/etc/config/dhcp",
-			"/etc/bbfdm/dmmap/DHCPv4",
-			"/etc/bbfdm/dmmap/DHCPv6",
-			"/etc/config/mapcontroller",
-			"/etc/config/wireless",
-			"/etc/bbfdm/dmmap/WiFi",
-			"/etc/config/time",
-			"/etc/bbfdm/dmmap/dmmap_time",
-			"/etc/config/netmode",
-			"/etc/bbfdm/dmmap/dmmap_netmode"
+			"firewall",
+			"network",
+			"dhcp",
+			"mapcontroller",
+			"wireless",
+			"time",
+			"netmode"
 	]
 }

bbfdm/files/etc/init.d/bbf_configd

@@ -27,6 +27,6 @@ start_service()
 service_triggers() {
 	for config_file in /etc/config/*; do
 		config_name=$(basename "$config_file")
-		procd_add_config_trigger "config.change" "$config_name" /usr/share/bbfdm/scripts/bbf_config_notify.sh "$config_name"
+		procd_add_config_trigger "config.change" "$config_name" /usr/share/bbfdm/scripts/bbf_config_notify.sh
 	done
 }

bbfdm/tools/bbfdm.sh

@@ -94,11 +94,7 @@ bbfdm_install_dm()
 	if [ "${src##*.}" = "json" ]; then
 		echo "Compacting BBFDM JSON file"
 		minfile=$(mktemp)
-		if ! jq -c 'del(..|.description?)' ${src} > ${minfile}; then
-			echo "Compression of json input file (${src}) failed"
-			rm "${minfile}"
-			exit 1
-		fi
+		jq -c 'del(..|.description?)' ${src} > ${minfile}
 
 		if [ -n "${VENDOR_EXTN}" ]; then
 			sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${minfile}

bbk_cli/Makefile

@@ -9,7 +9,7 @@ PKG_SOURCE_VERSION:=7b810a696c78b746185c11282bdbe3fb7f8c5d4b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/dotse/bbk.git
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

bootchart2/Makefile

@@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mmeeks/bootchart.git
 PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPLv2

bridgemngr/Config.in

@@ -5,12 +5,6 @@ config BRIDGEMNGR_BRIDGE_VLAN
 	help
 	   Set this option to use bridge-vlan as backend for VLAN objects.
 
-config BRIDGEMNGR_COPY_PBITS
-	bool "Copy pbits from cvlan to svlan"
-	default y
-	help
-	   Set this option to copy cvlan pbits to svlan pbits by default (driver vlan).
-
 config BRIDGEMNGR_BRIDGE_VENDOR_EXT
 	bool "Use bridge BBF vendor extensions"
 	default y
@@ -20,9 +14,4 @@ config BRIDGEMNGR_BRIDGE_VENDOR_EXT
 config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX
 	string "Package specific datamodel Vendor Prefix for TR181 extensions"
 	default ""
-
-config BRIDGEMNGR_USE_DM_FRAMEWORK
-	bool "Use new DM framework support"
-	default n
-
 endif

bridgemngr/Makefile

@@ -5,14 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.1.1
 
+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/network/bridgemngr.git
-PKG_SOURCE_VERSION:=855cc400279b750f057bc50ea1f2aea1a5a1fa47
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr
+PKG_SOURCE_VERSION:=b6a657e1c83b49f09323b4012ef229c604b82854
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -21,14 +22,12 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include ../bbfdm/bbfdm.mk
-include ../dm-framework/dm-framework.mk
 
 define Package/bridgemngr
  CATEGORY:=Utilities
  TITLE:=Bridge Manager
  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
- DEPENDS+= +BRIDGEMNGR_USE_DM_FRAMEWORK:dm-framework
 endef
 
 define Package/bridgemngr/description
@@ -39,9 +38,7 @@ define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config.in"
 endef
 
-ifneq ($(CONFIG_BRIDGEMNGR_USE_DM_FRAMEWORK),y)
 MAKE_PATH:=src
-endif
 
 ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
 VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
@@ -55,29 +52,15 @@ ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
 	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
 endif
 
-ifeq ($(CONFIG_BRIDGEMNGR_COPY_PBITS),y)
-	TARGET_CFLAGS+=-DBRIDGEMNGR_COPY_PBITS
-endif
-
-ifeq ($(CONFIG_BRIDGEMNGR_USE_DM_FRAMEWORK),y)
-define Build/Compile
-	$(call Build/Compile/DM,$(PKG_BUILD_DIR)/dmf,$(PKG_BUILD_DIR)/dmf,$(VENDOR_PREFIX))
-endef
-endif
-
 define Package/bridgemngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 
-ifeq ($(CONFIG_BRIDGEMNGR_USE_DM_FRAMEWORK),y)
-	$(call Build/Install/DM,$(PKG_BUILD_DIR)/dmf,$(PKG_BUILD_DIR)/dmf,$(1),bridgemngr)
-else
 	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
 ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y)
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME) 10
 	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME) 11
-endif
 endif
 
 	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/

bulkdata/Makefile

@@ -7,14 +7,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.23
+PKG_VERSION:=2.1.20
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=f54550f2d587a701c0a8d5cac4a0910a99ce92cf
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=a5e57962938ca143ede65d92be90b6e9fce66e15
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

bulut/Makefile

@@ -11,7 +11,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bulut/bulut-gw-client.git
 PKG_SOURCE_VERSION:=227700c44817afa2c392fa08bf4cf70fa6177f01
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

ddnsmngr/Makefile

@@ -12,7 +12,7 @@ ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
 PKG_SOURCE_VERSION:=44af9a7b3fec3929f8554af9633a5b8068189b48
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

decollector/Config.in

@@ -4,16 +4,4 @@ config DECOLLECTOR_EASYMESH_VERSION
 	int "Support Easymesh version"
 	default 6
 
-config DECOLLECTOR_BUILD_TR181_PLUGIN
-	bool "Build TR-181 mapping module (responsible for Device.WiFi.DataElements.)"
-	default y
-
-config DECOLLECTOR_VENDOR_EXTENSIONS
-	bool "Iopsys vendor extensions for Device.WiFi.DataElements."
-	default y
-
-config DECOLLECTOR_VENDOR_PREFIX
-	string "Package specific datamodel Vendor Prefix for TR181 extensions"
-	default ""
-
 endmenu

decollector/Makefile

@@ -6,14 +6,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.2.3.9
+PKG_VERSION:=6.2.1.10
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d1d948a48952fe2091e84af1293a6e77857439cf
+PKG_SOURCE_VERSION:=c9fad0fafad290bc19b7ad1a8e6c7e2cc4f55ad1
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -24,7 +24,6 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/decollector
   SECTION:=utils
@@ -32,7 +31,6 @@ define Package/decollector
   TITLE:=WiFi DataElements Collector Proxy
   DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \
 	   +libeasy +libwifiutils +libieee1905 +ieee1905-map-plugin
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus
 endef
 
 define Package/decollector/description
@@ -68,18 +66,6 @@ MAKE_PATH:=src
 
 TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
 
-ifeq ($(CONFIG_DECOLLECTOR_BUILD_TR181_PLUGIN),y)
-MAKE_FLAGS += DECOLLECTOR_BUILD_TR181_PLUGIN=y
-ifeq ($(CONFIG_DECOLLECTOR_VENDOR_EXTENSIONS),y)
-TARGET_CFLAGS += -DDECOLLECTOR_VENDOR_EXTENSIONS
-ifeq ($(CONFIG_DECOLLECTOR_VENDOR_PREFIX),"")
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
-else
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_DECOLLECTOR_VENDOR_PREFIX)\\\"
-endif
-endif
-endif
-
 EXECS := \
 	$(if $(CONFIG_PACKAGE_decollector),decollector)
 
@@ -90,7 +76,6 @@ define Package/decollector/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/decollector $(1)/usr/sbin/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,decollector))

decollector/bbfdm_service.json

@@ -1,26 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "decollector",
-    "unified_daemon": true,
-    "services": [
-      {
-        "parent_dm": "Device.WiFi.",
-        "object": "DataElements"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    },
-    "apply_handler": {
-      "uci": [
-        {
-          "file": [
-            "mapcontroller"
-          ],
-          "external_handler": "/etc/wifidmd/bbf_config_reload.sh"
-        }
-      ]
-    }
-  }
-}

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.7.13
+PKG_VERSION:=3.7.11
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5c2720563b3ed889e9d4de6fdb9b0f6a9d584094
+PKG_SOURCE_VERSION:=815ee44808169b8e1efa2cac44bd7d238ad33cdc
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -20,7 +20,7 @@ export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk

dhcpmngr/Config.in

@@ -1,12 +0,0 @@
-if PACKAGE_dhcpmngr
-
-config DHCPMNGR_ENABLE_VENDOR_EXT
-	bool "Use datamodel vendor extensions"
-	default y
-	help
-	   Set this option to use bridge BBF vendor extensions.
-
-config DHCPMNGR_VENDOR_PREFIX
-	string "Package specific datamodel Vendor Prefix for TR181 extensions"
-	default ""
-endif

dhcpmngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.1.6
+PKG_VERSION:=1.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
-PKG_SOURCE_VERSION:=74d96cd70119e4ea08767d68b45b4922162d0328
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=986f66608959f4f589009d580b046e250d8c620d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -39,22 +39,6 @@ define Package/dhcpmngr/description
   Package to add Device.DHCPv4. and Device.DHCPv6. data model support.
 endef
 
-define Package/$(PKG_NAME)/config
-        source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_DHCPMNGR_ENABLE_VENDOR_EXT),y)
-MAKE_FLAGS += DHCPMNGR_ENABLE_VENDOR_EXT=y
-endif
-
-ifeq ($(CONFIG_DHCPMNGR_VENDOR_PREFIX),"")
-VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
-else
-VENDOR_PREFIX = $(CONFIG_DHCPMNGR_VENDOR_PREFIX)
-endif
-
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/dhcpmngr/* $(PKG_BUILD_DIR)/

dm-framework/Makefile

@@ -1,91 +0,0 @@
-#
-# Copyright (c) 2025 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dm-framework
-PKG_VERSION:=1.0.4
-PKG_RELEASE:=1
-
-USE_LOCAL:=0
-ifneq ($(USE_LOCAL),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/dm-framework.git
-PKG_SOURCE_VERSION:=3ac1679d08fd102cdb5365b41eb049c972e47b38
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk
-
-define Package/dm-framework
-  CATEGORY:=Genexis
-  TITLE:=DM JS Framework
-  URL:=http://www.genexis.eu
-  DEPENDS:=+libsqlite3 +libjson-c +libstdcpp +quickjs +libubus +libubox +libuci +ubus
-  PKG_LICENSE:=GENEXIS
-endef
-
-define Package/dm-framework/description
- JS based TR181 datamodel framework
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-ifeq ($(USE_LOCAL),1)
-define Build/Prepare
-	$(CP) ~/git/dm-framework/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/dm-framework/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/etc/init.d/dmf $(1)/etc/init.d/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-api/libdmapi.so $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/etc/bbfdm/dmf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-api/quickjs/uci.js $(1)/etc/bbfdm/dmf/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-api/quickjs/utils.js $(1)/etc/bbfdm/dmf/
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-agent/dm-agent $(1)/usr/sbin
-
-	$(INSTALL_DIR) $(1)/etc/dm-framework
-	$(INSTALL_BIN) ./files/etc/dm-framework/dmf_apply_handler.sh $(1)/etc/dm-framework/
-	$(INSTALL_BIN) ./files/etc/dm-framework/dmf_revert_handler.sh $(1)/etc/dm-framework/
-
-	$(BBFDM_REGISTER_SERVICES) ./dmf_service.json $(1) dmf
-endef
-
-
-# Development Installation (headers and libraries)
-define Build/InstallDev
-	# DM-API development files - headers are now in dm-api/include/
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/dm-api/include/dm_types.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/dm-api/include/dm_node.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/dm-api/core/dm_api.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/dm-api/core/dm_linker.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/dm-api/core/dbmgr.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/dm-api/include/dm_log.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/dm-api/utils/dm_list.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/dm-api/libdmapi.so $(1)/usr/lib/
-
-	# Install json2code.js script and package.json to staging for other packages to use
-	$(INSTALL_DIR) $(1)/usr/lib/dm-framework/scripts
-	$(CP) $(PKG_BUILD_DIR)/scripts/json2code.js $(1)/usr/lib/dm-framework/scripts/
-	$(CP) $(PKG_BUILD_DIR)/scripts/package.json $(1)/usr/lib/dm-framework/scripts/
-endef
-
-$(eval $(call BuildPackage,dm-framework))

dm-framework/dm-framework.mk

@@ -1,33 +0,0 @@
-# dm-framework.mk - Common rules for DM Framework
-
-DM_SCRIPT_DIR ?= $(STAGING_DIR)/usr/lib/dm-framework/scripts
-JSON2CODE = $(DM_SCRIPT_DIR)/json2code.js
-
-# Macro to generate code
-# $(1): Input directory (datamodels)
-# $(2): Output directory (where generated files go)
-# $(3): Vendor Prefix (optional)
-define Build/Compile/DM
-	$(INSTALL_DIR) $(2)
-	@# Install npm dependencies if not already installed
-	@if [ ! -d "$(DM_SCRIPT_DIR)/node_modules" ]; then \
-		cd $(DM_SCRIPT_DIR) && npm install --production; \
-	fi
-	node $(JSON2CODE) -i $(1) -o $(2) $(if $(3),--vendor-prefix $(3))
-	$(TARGET_CC) $(TARGET_CFLAGS) -I$(2) -I$(STAGING_DIR)/usr/include/ -fPIC -c $(2)/dm.c -o $(2)/dm.o
-	$(TARGET_CC) $(TARGET_LDFLAGS) -shared -o $(2)/lib$(PKG_NAME).so $(2)/dm.o
-endef
-
-# Macro to install DM
-# $(1): Input directory (datamodels)
-# $(2): Output directory (build dir)
-# $(3): Destination directory (rootfs)
-# $(4): Package Name (subdir in /etc/bbfdm/dmf)
-define Build/Install/DM
-	$(INSTALL_DIR) $(3)/etc/bbfdm/dmf/$(4)
-	$(CP) $(2)/lib$(PKG_NAME).so $(3)/etc/bbfdm/dmf/$(4)/
-	$(CP) $(1)/*.js $(3)/etc/bbfdm/dmf/$(4)/
-	$(CP) $(2)/default.db $(3)/etc/bbfdm/dmf/default_dm.db
-	$(CP) $(2)/exports.js $(3)/etc/bbfdm/dmf/$(4)/exports.js
-	$(CP) $(2)/dm_consts.js $(3)/etc/bbfdm/dmf/$(4)/dm_consts.js
-endef

dm-framework/dmf_service.json

@@ -1,36 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "dmf",
-    "unified_daemon": true,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "Bridging"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    },
-    "apply_handler": {
-      "dmmap": [
-        {
-          "file": [
-            "Bridging"
-          ],
-          "external_handler": "/etc/dm-framework/dmf_apply_handler.sh"
-        }
-      ]
-    },
-    "revert_handler": {
-      "dmmap": [
-        {
-          "file": [
-            "Bridging"
-          ],
-          "external_handler": "/etc/dm-framework/dmf_revert_handler.sh"
-        }
-      ]
-    }
-  }
-}

dm-framework/files/etc/dm-framework/dmf_apply_handler.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-. /usr/share/libubox/jshn.sh
-
-logger -t dmf.commit_handler "Inputs [$@]"
-
-json_init
-json_add_string "cmd" "commit"
-json_compact
-
-data="$(json_dump)"
-ubus -t 5 call bbfdm.dmf transaction "${data}"
-sleep 2
-
-# Check if delta exists
-delta="$(uci -c /etc/config/ -t /tmp/bbfdm/.usp/config/ changes network 2>&1)"
-
-# In case of delta commit and reload service
-if [ -n "${delta}" ]; then
-	uci -c /etc/config/ -t /tmp/bbfdm/.usp/config/ commit network
-	ubus call uci commit '{"config":"network"}'
-	sleep 5
-fi

dm-framework/files/etc/dm-framework/dmf_revert_handler.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-. /usr/share/libubox/jshn.sh
-
-logger -t dmf.revert_handler "Inputs [$@]"
-
-json_init
-json_add_string "cmd" "abort"
-json_compact
-
-data="$(json_dump)"
-ubus -t 5 call bbfdm.dmf transaction "${data}"

dm-framework/files/etc/init.d/dmf

@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=85
-STOP=05
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance dmf
-	procd_set_param command "/usr/sbin/dm-agent"
-	procd_set_param respawn
-	procd_close_instance
-}

dmcli-plugins/Makefile

@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2023 Genexis Netherlands B.V. All rights reserved.
-# This Software and its content are protected by the Dutch Copyright Act
-# ('Auteurswet'). All and any copying and distribution of the software
-# and its content without authorization by Genexis Netherlands B.V. is
-# prohibited. The prohibition includes every form of reproduction and
-# distribution.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dmcli-plugins
-PKG_LICENSE:=PROPRIETARY GENEXIS
-PKG_VERSION:=2.2.6
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/gnx/dmcli-plugin-easydm.git
-PKG_SOURCE_VERSION:=bc8b8527e8a41bdba73cb277a3c6c3b42b045153
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dmcli-plugins
-  SECTION:=tools
-  CATEGORY:=Genexis
-  TITLE:=Easy-to-use data model on top of TR181
-  URL:=http://genexis.eu
-  DEPENDS:=+dmcli
-endef
-
-define Package/dmcli-plugins/description
-  EasyDM offers a user-friendly approach to configuring TR-181
-  simplifying the process with its intuitive interface.
-endef
-
-define Build/Compile
-	true
-endef
-
-define Package/dmcli-plugins/install
-	$(INSTALL_DIR) $(1)/usr/lib/dmcli/plugins
-	$(CP) $(PKG_BUILD_DIR)/src/*.js $(1)/usr/lib/dmcli/plugins/
-endef
-
-$(eval $(call BuildPackage,dmcli-plugins))

dmcli/Config.in

@@ -1,9 +0,0 @@
-if PACKAGE_dmcli
-
-config DMCLI_REMOTE_CONNECTION
-        bool "Add dmcli remote controller configuration"
-        default n
-        help
-                This adds a usp controller configuration for dmcli remote connection from different machine/laptop/server.
-
-endif

dmcli/Makefile

@@ -1,76 +0,0 @@
-#
-# Copyright (c) 2021 Genexis Netherlands B.V. All rights reserved.
-# This Software and its content are protected by the Dutch Copyright Act
-# ('Auteurswet'). All and any copying and distribution of the software
-# and its content without authorization by Genexis Netherlands B.V. is
-# prohibited. The prohibition includes every form of reproduction and
-# distribution.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dmcli
-PKG_LICENSE:=PROPRIETARY GENEXIS
-PKG_VERSION:=1.9.9
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/gnx/dmcli.git
-PKG_SOURCE_VERSION:=3e2cdeab76552df2c63a74fe74e5d7f1e6749f9b
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dmcli
-  SECTION:=tools
-  CATEGORY:=Genexis
-  TITLE:=DMCLI (datamodel-based CLI)
-  URL:=http://genexis.eu
-  DEPENDS:=+usp-js +DMCLI_REMOTE_CONNECTION:mosquitto-auth-plugin +shadow-utils +@BUSYBOX_CONFIG_ADDUSER
-endef
-
-define Package/dmcli/description
-  CLI to view and configure datamodels of CPE
-endef
-
-define Package/dmcli/conffiles
-/etc/dmcli/dmcli.conf
-endef
-
-define Package/dmcli/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/dmcli/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dmcli $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/usr/lib/dmcli
-	$(CP) $(PKG_BUILD_DIR)/common $(1)/usr/lib/dmcli/
-	mv $(1)/usr/lib/dmcli/common/os_qjs.js $(1)/usr/lib/dmcli/common/os.js
-	rm $(1)/usr/lib/dmcli/common/os_node.js
-	$(CP) $(PKG_BUILD_DIR)/core $(1)/usr/lib/dmcli/
-	$(CP) $(PKG_BUILD_DIR)/cli $(1)/usr/lib/dmcli/
-	$(CP) $(PKG_BUILD_DIR)/data $(1)/usr/lib/dmcli/
-	$(CP) $(PKG_BUILD_DIR)/plugins $(1)/usr/lib/dmcli/
-
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DATA) ./files/etc/uci-defaults/36-dmcli $(1)/etc/uci-defaults/
-ifeq ($(CONFIG_DMCLI_REMOTE_CONNECTION),y)
-	$(INSTALL_DATA) ./files/etc/uci-defaults/36-dmcli-remote $(1)/etc/uci-defaults/
-else
-	$(INSTALL_DATA) ./files/etc/uci-defaults/36-dmcli-remote-remove $(1)/etc/uci-defaults/
-endif
-
-	$(INSTALL_DIR) $(1)/etc/dmcli
-	$(CP) ./files/etc/dmcli/dmcli.acl $(1)/etc/dmcli/
-	$(CP) ./files/etc/dmcli/dmcli.conf $(1)/etc/dmcli/
-
-	$(INSTALL_DIR) $(1)/etc/users/roles/
-	$(INSTALL_DATA) ./files/etc/users/roles/operator.json $(1)/etc/users/roles/
-endef
-
-$(eval $(call BuildPackage,dmcli))

dmcli/files/etc/dmcli/dmcli.acl

@@ -1,4 +0,0 @@
-user operator
-topic read /usp/operator/controller/reply-to
-topic read /usp/operator/controller
-topic write /usp/operator/endpoint

dmcli/files/etc/dmcli/dmcli.conf

@@ -1,45 +0,0 @@
-{
-   "Settings": {
-      "USP": {
-         "ActiveConnectionProfile": "local",
-         "ConnectionProfile": [
-            {
-               "Name": "local",
-               "Host": "127.0.0.1",
-               "Port": 9002,
-               "Username": "operator",
-               "Protocol": "ws",
-               "FromId": "oui:000F94:device-controller-operator",
-               "PublishEndpoint": "/usp/operator/endpoint",
-               "SubscribeEndpoint": "/usp/operator/controller"
-            }
-         ],
-         "Session": {
-            "AutoStart": false
-         },
-         "Notification": {
-            "LogTo": "console",
-            "Format": "brief",
-            "LogFile": "usp-notification.log"
-         }
-      },
-      "CLI": {
-         "Home": "/",
-         "Color": "true",
-         "Mode": "Command",
-         "ShowCommandTime": false,
-         "SortDMTree": false
-      },
-      "Prompt": {
-         "Auto": true,
-         "Color": "default",
-         "SelectedBackgroundColor": "yellow",
-         "PageSize": "3",
-         "AutoPromptOnEmptyCommand": false,
-         "AutoPromptInstanceNumbers": false
-      },
-      "Log": {
-         "Level": "Error"
-      }
-   }
-}

dmcli/files/etc/uci-defaults/36-dmcli

@@ -1,120 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/functions/iopsys-environment.sh
-. /usr/share/libubox/jshn.sh
-
-DMCLI_CONF="/etc/dmcli/dmcli.conf"
-CONTROLLER_ID='oui:000F94:device-controller-operator'
-DMCLI_RESP_TOPIC="/usp/operator/endpoint"
-DMCLI_CTRL_TOPIC="/usp/operator/controller"
-DMCLI_PORT="9002"
-
-grep -q "^operator:" /etc/passwd || {
-	adduser -g 'Operator' -D -H -s /usr/bin/dmcli --home '/usr/lib/dmcli' 'operator'
-	hash=""
-	if type get_operator_password_hash > /dev/null 2>&1; then
-		hash=$(get_operator_password_hash)
-	fi
-	if [ -z "$hash" ]; then
-		hash='$6$zP4Wk/VQJOLwwofC$teuhnYFQBcA8YUZo/Q0quDMi4SsOHmfBcyvt5VNchPnzgwF1nfNNliC3yBVW22NwmwttPEWeBEBfnMTBB0rYs/'
-	fi
-	echo "operator:${hash}" | chpasswd -e
-}
-
-grep -q "^/usr/bin/dmcli$" /etc/shells || {
-	echo '/usr/bin/dmcli' >> /etc/shells
-}
-
-uci -q del_list sshd.@sshd[0].AllowUsers='operator'
-uci -q add_list sshd.@sshd[0].AllowUsers='operator'
-
-uci -q delete users.operator
-uci -q set users.operator=user
-uci -q set users.operator.enabled=1
-uci -q set users.operator.shell='dmcli'
-uci -q set users.operator.member_roles='operator'
-
-if [ -f "/etc/config/mosquitto" ]; then
-	uci_add mosquitto listener dmcli_local
-	uci_set mosquitto dmcli_local enabled 1
-	uci_set mosquitto dmcli_local port "${DMCLI_PORT}"
-	uci_set mosquitto dmcli_local protocol 'websockets'
-	uci_set mosquitto dmcli_local acl_file '/etc/dmcli/dmcli.acl'
-	uci_set mosquitto dmcli_local no_remote_access '1'
-	uci_set mosquitto dmcli_local allow_anonymous '1'
-fi
-
-if [ -f "/etc/config/obuspa" ]; then
-	uci_add obuspa mqtt mqtt_operator
-	uci_set obuspa mqtt_operator BrokerAddress '127.0.0.1'
-	uci_set obuspa mqtt_operator BrokerPort '1883'
-	uci_set obuspa mqtt_operator TransportProtocol 'TCP/IP'
-
-	uci_add obuspa mtp mtp_operator
-	uci_set obuspa mtp_operator Protocol 'MQTT'
-	uci_set obuspa mtp_operator ResponseTopicConfigured "${DMCLI_RESP_TOPIC}"
-	uci_set obuspa mtp_operator mqtt 'mqtt_operator'
-
-	uci_add obuspa controller controller_operator
-	uci_set obuspa controller_operator EndpointID "${CONTROLLER_ID}"
-	uci_set obuspa controller_operator Protocol 'MQTT'
-	uci_set obuspa controller_operator Topic "${DMCLI_CTRL_TOPIC}"
-	uci_set obuspa controller_operator mqtt 'mqtt_operator'
-	uci_set obuspa controller_operator assigned_role_name 'operator'
-fi
-
-_get_endpoint_id() {
-	local id serial oui
-
-	id="$(uci -q get obuspa.localagent.EndpointID)"
-	if [ -n "${id}" ]; then
-		echo "${id}"
-		return 0
-	fi
-
-	serial="$(db -q get device.deviceinfo.SerialNumber)"
-	oui="$(db -q get device.deviceinfo.ManufacturerOUI)"
-
-	echo "os::${oui}-${serial//+/%2B}"
-}
-
-update_dmcli_conf() {
-	local endpointid confTmpFile
-	local port fromid publish subscribe toid
-
-	if [ -f "${DMCLI_CONF}" ]; then
-		endpointid="$(_get_endpoint_id)"
-		json_load_file "${DMCLI_CONF}" || return
-		json_select "Settings" || return
-			json_select "USP" || return
-				json_select "ConnectionProfile" || return
-					json_select "1" || return
-						json_get_var port "Port"
-						json_get_var fromid "FromId"
-						json_get_var publish "PublishEndpoint"
-						json_get_var subscribe "SubscribeEndpoint"
-						json_get_var toid "ToId"
-
-						json_add_int "Port" "${DMCLI_PORT}"
-						json_add_string "FromId" "${CONTROLLER_ID}"
-						json_add_string "PublishEndpoint" "${DMCLI_RESP_TOPIC}"
-						json_add_string "SubscribeEndpoint" "${DMCLI_CTRL_TOPIC}"
-						json_add_string "ToId" "${endpointid}"
-					json_select ..
-				json_select ..
-			json_select ..
-		json_select ..
-
-		if [ "${port}" != "${DMCLI_PORT}" ] || [ "${fromid}" != "${CONTROLLER_ID}" ] || \
-			[ "${publish}" != "${DMCLI_RESP_TOPIC}" ] || [ "${subscribe}" != "${DMCLI_CTRL_TOPIC}" ] || \
-			[ "${toid}" != "${endpointid}" ]; then
-			confTmpFile="$(mktemp -u -p "$(dirname "$DMCLI_CONF")" "$(basename "$DMCLI_CONF").XXXXXXX")"
-			json_pretty
-			json_dump > "${confTmpFile}" || return
-			mv -f "${confTmpFile}" "${DMCLI_CONF}" || return
-		fi
-	fi
-}
-
-update_dmcli_conf || exit

dmcli/files/etc/uci-defaults/36-dmcli-remote

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-if [ -f "/etc/config/mosquitto" ]; then
-	uci_add mosquitto listener dmcli
-	uci_set mosquitto dmcli enabled 1
-	uci_set mosquitto dmcli port '9003'
-	uci_set mosquitto dmcli protocol 'websockets'
-	uci_set mosquitto dmcli auth_plugin '/usr/lib/mosquitto_auth_plugin.so'
-	uci_set mosquitto dmcli acl_file '/etc/dmcli/dmcli.acl'
-fi
-
-exit 0

dmcli/files/etc/uci-defaults/36-dmcli-remote-remove

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-if [ -f "/etc/config/mosquitto" ]; then
-	uci_remove mosquitto dmcli
-fi
-
-exit 0

dmcli/files/etc/users/roles/operator.json

@@ -1,14 +0,0 @@
-{
-  "tr181": {
-    "name": "operator",
-    "instance": 6,
-    "permission": [
-      {
-        "object": "Device.",
-        "perm": [
-          "PERMIT_ALL"
-        ]
-      }
-    ]
-  }
-}

dmcli/src/Makefile

@@ -1,7 +0,0 @@
-all: dmcli
-
-dmcli: main.c
-	$(CC) $(CFLAGS) -Wall -Werror -o $@ $^
-
-clean:
-	rm -f dmcli

dmcli/src/main.c

@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2021 Genexis Netherlands B.V. All rights reserved.
-* This Software and its content are protected by the Dutch Copyright Act
-* ('Auteurswet'). All and any copying and distribution of the software
-* and its content without authorization by Genexis Netherlands B.V. is
-* prohibited. The prohibition includes every form of reproduction and
-* distribution.
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-/* C Wrapper for operator to login to the CLI via ssh: the shell in
- * the passwd file cannot be a script that requires an interpreter. */
-int main(int argc, char *argv[])
-{
-	char *cmd[3 + (argc > 1 ? argc - 1 : 0)];
-
-	cmd[0] = "/usr/bin/qjs";
-	cmd[1] = "/usr/lib/dmcli/cli/main.js";
-	cmd[2] = NULL;
-
-	if (argc > 1) {
-		memcpy(&cmd[2], &argv[1], (argc - 1) * sizeof(char *));
-		cmd[2 + argc - 1] = NULL;
-	}
-
-	execv(cmd[0], cmd);
-	fprintf(stderr, "%s: command not found\n", cmd[0]);
-	return 127;
-}

dnsmngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.21
+PKG_VERSION:=1.0.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=ef3714cc7555f763dfab626add8f90d7bc0a33b5
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=80fa147e6f1f0d9c1a62a62a693ff3adaef45363
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

dslmngr/Makefile

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

dslmngr/files/airoha/sbin/xdsl_wan

@@ -5,8 +5,6 @@ source "/lib/functions/network.sh"
 source "/lib/functions/system.sh"
 
 PREVLINK=""
-LINK=""
-LINKSPEED=""
 PREVWANMODE=""
 WANMODE=""
 CONFIGURED=0
@@ -152,12 +150,6 @@ while [ true ]; do
 
 	if [ "$LINK" != "$PREVLINK" -a \( "$LINK" = "down" -o "$LINK" = "up" \) ]; then
 		if [ "$LINK" = "down" ]; then
-			if [ ! -s /tmp/qos/wan_link_shape_rate ]; then
-				rm -rf /tmp/qos/wan_link_shape_rate
-				rm -rf /tmp/qos/wan_link_speed
-				/usr/sbin/qos-uplink-bandwidth
-			fi
-
 			[ "$CONFIGURED" -eq 0 ] && configure_lines # Needs to be done once the slave SoC is in down state and we've not been able to auto-sync.
 			if [ -n "$WANMODE" ]; then
 				if [ "$WANMODE" = "PTM" ]; then
@@ -234,26 +226,6 @@ while [ true ]; do
 
 			call_wan_hotplug "up" "$WANPORT"
 			PREVWANMODE="$WANMODE"
-
-			if [ ! -s /tmp/qos/wan_link_shape_rate ]; then
-				LINKSPEED="$(awk '/far-end interleaved channel bit rate/{print $6}' /proc/tc3162/adsl_stats)"
-				LINKSPEED=$((LINKSPEED))
-				if [ "$LINKSPEED" -eq 0 ]; then
-					LINKSPEED="$(awk '/far-end fast channel bit rate/{print $6}' /proc/tc3162/adsl_stats)"
-					LINKSPEED=$((LINKSPEED))
-				fi
-
-				if [ "$LINKSPEED" -ne 0 ]; then
-					mkdir -p /tmp/qos
-					touch /tmp/qos/wan_link_shape_rate
-
-					/userfs/bin/qosrule discpline Rate uplink-bandwidth ${LINKSPEED}
-					hw_nat -! > /dev/null 2>&1
-				else
-					rm -rf /tmp/qos/wan_link_speed
-					/usr/sbin/qos-uplink-bandwidth
-				fi
-			fi
 		fi
 
 		# Toggle link state

ebtables-extensions/Makefile

@@ -14,7 +14,7 @@ ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
 PKG_SOURCE_VERSION:=7357622d806833d93d317164dc6673fbf5fd1629
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

ethmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=3.1.4
+PKG_VERSION:=3.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
-PKG_SOURCE_VERSION:=0283fb5cb74a7baca46c4360da680757c57c86ac
+PKG_SOURCE_VERSION:=da6b25430123f03a74b59369b36dc4a777207d3f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

fatrace/Makefile

@@ -16,7 +16,7 @@ PKG_SOURCE_VERSION:=98af6019a4a1b478a6fa35f74528cb3cd404ae40
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.launchpad.net/fatrace
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

fdtextract/Makefile

@@ -10,15 +10,20 @@ PKG_NAME:=fdtextract
 PKG_RELEASE:=1
 PKG_VERSION:=1.0
 
-PKG_SOURCE_URL:=https://dev.iopsys.eu/system/fdtextract.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7917dbcb29724476cd46164eec29848df1e5fb67
+PKG_SOURCE_VERSION:=e3cefda3b26c9aea3021b20725ce7b31b33eebc4
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+RSTRIP:=true
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -35,7 +40,9 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
+
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdtextract $(1)/usr/sbin/
+	$(STRIP) $(1)/usr/sbin/fdtextract
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

firewallmngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.12
+PKG_VERSION:=1.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
-PKG_SOURCE_VERSION:=30319c67fb4db285a2bcd272b1c10bc040eecf19
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=05ad0d6f7f21520eecd05429c14d1963de2a8463
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

fluent-bit/Makefile

@@ -1,13 +1,21 @@
+#
+# Copyright (C) 2024-2025 IOPSYS
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
-PKG_VERSION:=4.2.0
-PKG_RELEASE:=1
+PKG_VERSION:=4.0.4
+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:=cad2d94cf7a720a3910c781f80187e2c399aa8acbfa1046aa7445a4d1495fafd
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -16,55 +24,52 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/fluent-bit
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=Fast and Lightweight Logs and Metrics processor
-  URL:=https://fluentbit.io/
-  DEPENDS:= +libyaml +libopenssl +libcurl +libstdcpp +libatomic +musl-fts +flex +bison \
-	    +libsasl2 +@OPENSSL_WITH_NPN
+	CATEGORY:=Utilities
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison +libstdcpp +@OPENSSL_WITH_NPN
+	TITLE:=Fluent-Bit
+	URL:=https://fluentbit.io/
 endef
 
 define Package/fluent-bit/description
-  Fluent Bit is a super fast, lightweight, and highly scalable logging
-  and metrics processor and forwarder.
+	Fluent Bit is a super fast, lightweight, and highly scalable logging and metrics processor and forwarder.
 endef
 
-define Package/fluent-bit/conffiles
-/etc/fluent-bit/parsers.conf
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./fluent-bit/* $(PKG_BUILD_DIR)/
 endef
+endif
 
+# General options
 TARGET_LDFLAGS +=-lfts -latomic
 
 CMAKE_OPTIONS+= \
 	-DFLB_RELEASE=Yes \
+	-DFLB_SMALL=No \
 	-DEXCLUDE_FROM_ALL=true \
+	-DFLB_SHARED_LIB=Yes \
+	-DFLB_DEBUG=Yes \
+	-DFLB_ALL=No \
+	-DFLB_JEMALLOC=No \
 	-DFLB_EXAMPLES=No \
 	-DFLB_CHUNK_TRACE=No \
 	-DFLB_BACKTRACE=No \
+	-DFLB_KAFKA=No \
 	-DFLB_WASM=No \
-	-DFLB_LUAJIT=Yes \
-	-DWITH_SASL=No \
-	-DWITH_ZLIB=No \
-	-DWITH_ZSTD=No
-
-CMAKE_OPTIONS += \
-	-DFLB_SMALL=Yes \
-	-DFLB_ALL=No \
-	-DFLB_DEBUG=Yes \
-	-DFLB_JEMALLOC=No \
-	-DFLB_KAFKA=No
+	-DFLB_LUAJIT=No
 
+# In plugins
 CMAKE_OPTIONS += \
 	-DFLB_IN_SYSLOG=Yes \
 	-DFLB_IN_CPU=Yes \
 	-DFLB_IN_MEM=Yes \
 	-DFLB_IN_DISK=Yes \
+	-DFLB_IN_EXEC=Yes \
 	-DFLB_IN_HEAD=Yes \
 	-DFLB_IN_KMSG=Yes \
 	-DFLB_IN_TAIL=Yes \
-	-DFLB_IN_PROC=No \
-	-DFLB_IN_EXEC=No \
 	-DFLB_IN_FORWARD=No \
+	-DFLB_IN_PROC=No \
 	-DFLB_IN_RANDOM=No \
 	-DFLB_IN_SERIAL=No \
 	-DFLB_IN_MQTT=No \
@@ -80,6 +85,7 @@ CMAKE_OPTIONS += \
 	-DFLB_IN_KUBERNETES_EVENTS=No \
 	-DFLB_IN_KAFKA=No \
 	-DFLB_IN_LIB=No \
+	-DFLB_IN_SYSTEMD=No \
 	-DFLB_IN_DUMMY=No \
 	-DFLB_IN_NETIF=No \
 	-DFLB_IN_COLLECTD=No \
@@ -90,18 +96,18 @@ CMAKE_OPTIONS += \
 	-DFLB_IN_OPENTELEMETRY=No \
 	-DFLB_IN_ELASTICSEARCH=No \
 	-DFLB_IN_CALYPTIA_FLEET=No \
-	-DFLB_IN_SPLUNK=No \
+	-DFLB_IN_SPLUNK=No
 	-DFLB_IN_HEALTH=No \
 	-DFLB_IN_WINLOG=No \
 	-DFLB_IN_WINEVTLOG=No
 
+
+# Filter options
 CMAKE_OPTIONS += \
-	-DFLB_FILTER_LUA=Yes \
-	-DFLB_FILTER_SYSINFO=Yes \
-	-DFLB_FILTER_MODIFY=Yes \
 	-DFLB_FILTER_AWS=No \
 	-DFLB_FILTER_ECS=No \
 	-DFLB_FILTER_KUBERNETES=No \
+	-DFLB_FILTER_LUA=No \
 	-DFLB_FILTER_NEST=No \
 	-DFLB_FILTER_RECORD_MODIFIER=No \
 	-DFLB_FILTER_THROTTLE=No \
@@ -111,8 +117,10 @@ CMAKE_OPTIONS += \
 	-DFLB_FILTER_GEOIP2=No \
 	-DFLB_FILTER_NIGHTFALL=No
 
+# out plugins
 CMAKE_OPTIONS += \
 	-DFLB_OUT_EXIT=Yes \
+	-DFLB_OUT_FORWARD=Yes \
 	-DFLB_OUT_HTTP=Yes \
 	-DFLB_OUT_NATS=Yes \
 	-DFLB_OUT_TCP=Yes \
@@ -121,7 +129,6 @@ CMAKE_OPTIONS += \
 	-DFLB_OUT_STDOUT=Yes \
 	-DFLB_OUT_SYSLOG=Yes \
 	-DFLB_OUT_NULL=Yes \
-	-DFLB_OUT_FORWARD=No \
 	-DFLB_OUT_PLOT=No \
 	-DFLB_OUT_AZURE=No \
 	-DFLB_OUT_AZURE_BLOB=No \
@@ -135,7 +142,6 @@ CMAKE_OPTIONS += \
 	-DFLB_OUT_GELF=No \
 	-DFLB_OUT_INFLUXDB=No \
 	-DFLB_OUT_KAFKA=No \
-	-DFLB_OUT_KAFKA_REST=No \
 	-DFLB_OUT_NRLOGS=No \
 	-DFLB_OUT_OPENSEARCH=No \
 	-DFLB_OUT_TD=No \
@@ -147,6 +153,8 @@ CMAKE_OPTIONS += \
 	-DFLB_OUT_FLOWCOUNTER=No \
 	-DFLB_OUT_LOGDNA=No \
 	-DFLB_OUT_LOKI=No \
+	-DFLB_OUT_KAFKA=No \
+	-DFLB_OUT_KAFKA_REST=No \
 	-DFLB_OUT_CLOUDWATCH_LOGS=No \
 	-DFLB_OUT_KINESIS_FIREHOSE=No \
 	-DFLB_OUT_KINESIS_STREAMS=No \
@@ -162,10 +170,11 @@ CMAKE_OPTIONS += \
 
 define Package/fluent-bit/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/fluent-bit $(1)/usr/sbin/
-
 	$(INSTALL_DIR) $(1)/etc/fluent-bit
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/parsers.conf $(1)/etc/fluent-bit/parsers.conf
+	$(INSTALL_DIR) $(1)/etc/fluent-bit/conf.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/fluent-bit $(1)/usr/sbin/
+	$(INSTALL_DATA) ./files/fluent-bit.conf $(1)/etc/fluent-bit/fluent-bit.conf
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/parsers.conf $(1)/etc/fluent-bit/parsers.conf
 endef
 
 $(eval $(call BuildPackage,fluent-bit))

fluent-bit/patches/0020-fix_kmsg.patch

@@ -1,5 +1,5 @@
 diff --git a/plugins/in_kmsg/in_kmsg.c b/plugins/in_kmsg/in_kmsg.c
-index fe372a9a2..6acb34893 100644
+index cd5c4cd17..15f105451 100644
 --- a/plugins/in_kmsg/in_kmsg.c
 +++ b/plugins/in_kmsg/in_kmsg.c
 @@ -36,7 +36,6 @@
@@ -10,24 +10,15 @@ index fe372a9a2..6acb34893 100644
  
  #include "in_kmsg.h"
  
-@@ -114,7 +113,7 @@ static inline int process_line(const char *line,
-     struct timeval tv;       /* time value                  */
-     int line_len;
-     uint64_t val;
--    long pri_val;
-+    unsigned long pri_val;
-     const char *p = line;
-     char *end = NULL;
-     struct flb_time ts;
-@@ -124,12 +123,17 @@ static inline int process_line(const char *line,
+@@ -123,12 +122,17 @@ static inline int process_line(const char *line,
      ctx->buffer_id++;
  
      errno = 0;
--    pri_val = strtol(p, &end, 10);
--    if ((errno == ERANGE && (pri_val == INT_MAX || pri_val == INT_MIN))
-+    pri_val = strtoul(p, &end, 10);
-+    if ((errno == ERANGE && pri_val == ULONG_MAX)
-         || (errno != 0 && pri_val == 0)) {
+-    val = strtol(p, &end, 10);
+-    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
++    val = strtoul(p, &end, 10);
++    if ((errno == ERANGE && val == ULONG_MAX)
+         || (errno != 0 && val == 0)) {
          goto fail;
      }
  
@@ -37,9 +28,17 @@ index fe372a9a2..6acb34893 100644
 +    }
 +
      /* Priority */
-     priority = FLB_KLOG_PRI(pri_val);
+     priority = FLB_KLOG_PRI(val);
  
-@@ -152,6 +156,12 @@ static inline int process_line(const char *line,
+@@ -144,24 +148,35 @@ static inline int process_line(const char *line,
+     }
+     p++;
+ 
+-    val = strtoul(p, &end, 10);
+-    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
++    val = strtoull(p, &end, 10);
++    if ((errno == ERANGE && val == ULLONG_MAX)
+         || (errno != 0 && val == 0)) {
          goto fail;
      }
  
@@ -52,7 +51,12 @@ index fe372a9a2..6acb34893 100644
      sequence = val;
      p = ++end;
  
-@@ -162,8 +172,14 @@ static inline int process_line(const char *line,
+     /* Timestamp */
+-    val = strtoul(p, &end, 10);
+-    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
++    val = strtoull(p, &end, 10);
++    if ((errno == ERANGE && val == ULLONG_MAX)
+         || (errno != 0 && val == 0)) {
          goto fail;
      }
  
@@ -64,7 +68,6 @@ index fe372a9a2..6acb34893 100644
      tv.tv_sec  = val/1000000;
 -    tv.tv_usec = val - (tv.tv_sec * 1000000);
 +    tv.tv_usec = val - ((uint64_t)tv.tv_sec * 1000000);
-+
  
      flb_time_set(&ts, ctx->boot_time.tv_sec + tv.tv_sec, tv.tv_usec * 1000);
  

fluent-bit/patches/0030-kmsg_pri_as_string.patch

@@ -0,0 +1,20 @@
+diff --git a/plugins/in_kmsg/in_kmsg.c b/plugins/in_kmsg/in_kmsg.c
+index cd5c4cd17..04bbe2b2e 100644
+--- a/plugins/in_kmsg/in_kmsg.c
++++ b/plugins/in_kmsg/in_kmsg.c
+@@ -182,11 +182,14 @@ static inline int process_line(const char *line,
+                 &ts);
+     }
+ 
++    char priority_str[4] = {0}; /* enough for "255" + NUL */
++    snprintf(priority_str, sizeof(priority_str), "%u", (unsigned char) priority);
++
+     if (ret == FLB_EVENT_ENCODER_SUCCESS) {
+         ret = flb_log_event_encoder_append_body_values(
+                 &ctx->log_encoder,
+                 FLB_LOG_EVENT_CSTRING_VALUE("priority"),
+-                FLB_LOG_EVENT_CHAR_VALUE(priority),
++                FLB_LOG_EVENT_STRING_VALUE(priority_str, strlen(priority_str)),
+ 
+                 FLB_LOG_EVENT_CSTRING_VALUE("sequence"),
+                 FLB_LOG_EVENT_UINT64_VALUE(sequence),

gateway-info/Makefile

@@ -15,7 +15,7 @@ ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/gateway-info.git
 PKG_SOURCE_VERSION:=dd15893a8291e556a8c49ff9e143c763db0379b5
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

gateway-info/files/etc/uci-defaults/86-set-gateway-device-info

@@ -110,7 +110,7 @@ configure_send_op125() {
 
 
 	if [ "${uci}" = "network" ]; then
-		[ -n "${sendopt}" ] && new_send_opt="$sendopt $opt125" || new_send_opt="$opt125"
+		new_send_opt="$sendopt $opt125"
 		uci -q set network."${intf}".sendopts="$new_send_opt"
 	else
 		new_send_opt="$sendopt$opt125"
@@ -228,7 +228,7 @@ enable_dhcp_option125() {
 
 	if [ "${proto}" = "dhcp" ]; then
 		if [ ${req125_present} -eq 0 ]; then
-			[ -n "${reqopts}" ] && newreqopts="$reqopts 125" || newreqopts="125"
+			newreqopts="$reqopts 125"
 			uci -q set network."${wan}".reqopts="$newreqopts"
 		fi
 

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.4.4
+PKG_VERSION:=1.3.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=65a26df1e0ebaa74e18775b67a10b800463764bf
+PKG_SOURCE_VERSION:=3663ca4d001508509774115d6797b932f9ed4f69
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

icwmp/Config.in

@@ -19,8 +19,4 @@ config ICWMP_VENDOR_PREFIX
 config ICWMP_ENABLE_SMM_SUPPORT
 	bool "Enable software module management support"
 	default n
-
-config ICWMP_ENABLE_ANNEX_F_INFORM_PARAM
-	bool "Enable Device.Gateway. and Device.ManagementServer.ManageableDevice. as inform parameter"
-	default y
 endmenu

icwmp/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.10.16
+PKG_VERSION:=9.10.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=f5064dadcf1511c1002330ca712e37a9e2712472
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=b4db243c1d057d0242a4badae53e9c57e442d27a
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -84,15 +84,11 @@ 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/init.d/icwmpd $(1)/etc/init.d/icwmpd
-	$(INSTALL_BIN) ./files/etc/uci-defaults/50-cwmp-align-keep-config $(1)/etc/uci-defaults/
 	$(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/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-migrate-gw-info $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/999-cwmp-conn-config $(1)/etc/uci-defaults/
-ifeq ($(CONFIG_ICWMP_ENABLE_ANNEX_F_INFORM_PARAM),y)
-	$(INSTALL_BIN) ./files/etc/uci-defaults/99-cwmp-annex-f-config $(1)/etc/uci-defaults/
-endif
 	$(INSTALL_BIN) ./files/etc/icwmpd/vendor_log.sh $(1)/etc/icwmpd/vendor_log.sh
 	$(INSTALL_BIN) ./files/etc/icwmpd/firewall.cwmp $(1)/etc/icwmpd/firewall.cwmp
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp

icwmp/files/etc/config/cwmp

@@ -42,9 +42,7 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
-	#option KeepConfig '1'
-	#option KeepOpConf '1'
-	#option ConfigScope 'UserOnly'
+	option fw_upgrade_keep_settings '1'
 	option clock_sync_timeout '128'
 	option disable_datatype_check '0'
 	#list allowed_cr_ip '10.5.1.0/24'

icwmp/files/etc/init.d/icwmpd

@@ -97,9 +97,7 @@ validate_cpe_section()
 		'periodic_notify_enable:bool' \
 		'enable:bool:1' \
 		'periodic_notify_interval:uinteger' \
-		'KeepConfig:bool' \
-		'KeepOpConf:bool' \
-		'ConfigScope:string'
+		'fw_upgrade_keep_settings:bool'
 }
 
 validate_defaults() {
@@ -170,21 +168,13 @@ start_service() {
 
 stop_service()
 {
-	local switch_bank KeepConfig KeepOpConf ConfigScope
+	local switch_bank
 
 	copy_cwmp_varstate_files_to_etc
+	
 	switch_bank=$(uci -q -c /var/state/ get icwmp.cpe.switch_bank)
-	if [ "$switch_bank" = "1" ] && [ -x /etc/sysmngr/fwbank ]; then
-		KeepConfig="$(uci -q get cwmp.cpe.KeepConfig)"
-		KeepOpConf="$(uci -q get cwmp.cpe.KeepOpConf)"
-		ConfigScope="$(uci -q get cwmp.cpe.ConfigScope)"
-
-		json_init
-		[ -n "${KeepConfig}" ] && json_add_boolean "keep_config" "${KeepConfig}"
-		[ -n "${KeepOpConf}" ] && json_add_boolean "keep_opconf" "${KeepOpConf}"
-		[ -n "${ConfigScope}" ] && json_add_string "config_scope" "${ConfigScope}"
-
-		json_dump| /etc/sysmngr/fwbank call copy_config
+	if [ -n "$switch_bank" ] && [ "$switch_bank" = "1" ]; then
+		[ -x /etc/sysmngr/fwbank ] && /etc/sysmngr/fwbank call copy_config
 	fi
 }
 

icwmp/files/etc/uci-defaults/50-cwmp-align-keep-config

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-keep_settings="$(uci -q get cwmp.cpe.fw_upgrade_keep_settings)"
-if [ -n "${keep_settings}" ]; then
-	uci -q delete cwmp.cpe.fw_upgrade_keep_settings
-	uci -q set cwmp.cpe.KeepConfig="${keep_settings}"
-fi

icwmp/files/etc/uci-defaults/99-cwmp-annex-f-config

@@ -1,53 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-validate_inform_parameter() {
-	local section="${1}"
-	local target_param="${2}"
-	local parameter_name
-
-	config_get parameter_name "${section}" parameter_name
-	if [ "${parameter_name}" = "${target_param}" ]; then
-		return 0
-	fi
-
-	return 1
-}
-
-check_param_exists() {
-	local target_param="${1}" 
-	local found=1
-
-	check_section() {
-		local section="${1}"
-		if validate_inform_parameter "${section}" "${target_param}"; then
-			found=0
-		fi
-	}
-
-	config_foreach check_section inform_parameter
-	return "${found}"
-}
-
-configure_annex_f_inform_param() {
-	[ -f /etc/config/gateway ] || return 0
-
-	config_load cwmp
-
-	if ! check_param_exists "Device.GatewayInfo."; then
-		uci -q set cwmp.gw_info_param=inform_parameter
-		uci -q set cwmp.gw_info_param.enable='1'
-		uci -q set cwmp.gw_info_param.events_list='0 BOOTSTRAP,1 BOOT'
-		uci -q set cwmp.gw_info_param.parameter_name='Device.GatewayInfo.'
-	fi
-
-	if ! check_param_exists "Device.ManagementServer.ManageableDevice."; then
-		uci -q set cwmp.mng_dev_param=inform_parameter
-		uci -q set cwmp.mng_dev_param.enable='1'
-		uci -q set cwmp.mng_dev_param.events_list='0 BOOTSTRAP,1 BOOT'
-		uci -q set cwmp.mng_dev_param.parameter_name='Device.ManagementServer.ManageableDevice.'
-	fi
-}
-
-configure_annex_f_inform_param

icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user

@@ -77,7 +77,6 @@ get_opt43() {
 config_load cwmp
 config_get wan_intf cpe default_wan_interface "wan"
 config_get dhcp_discovery acs dhcp_discovery "0"
-config_get_bool insecure_enable acs insecure_enable "0"
 config_get dhcp_url acs dhcp_url ""
 config_get min_wait_intvl acs dhcp_retry_min_wait_interval "0"
 config_get intvl_multi acs dhcp_retry_interval_multiplier "0"
@@ -103,17 +102,6 @@ if [ "${wan_intf}" = "${INTERFACE}" ]; then
 		return 0
 	fi
 
-	if [ "${insecure_enable}" -eq "0" ]; then
-		case $DHCP_ACS_URL in
-		https://*)
-			log "ACS url $DHCP_ACS_URL has https"
-			;;
-		*)
-			return 0
-			;;
-		esac
-	fi
-
 	sec=$(uci -q get cwmp.acs)
 
 	if [ -z "${sec}" ]; then

ieee1905/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.7.44
+PKG_VERSION:=8.7.34
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=29ba8f04dc6bd7e77683352c0c71988f51fbadf8
+PKG_SOURCE_VERSION:=81c99af824bd5bd217213e4e731798a6469157b8
 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

imonitor/Makefile

@@ -13,7 +13,7 @@ PKG_INSTALL:=1
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
 PKG_SOURCE_VERSION:=4beb1d5d6925507f1850a84c0b83aaf12a082f7f
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1

iopsys-analytics/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5ad41ca8eb5de887487feb7148b5dce44943218c
+PKG_SOURCE_VERSION:=25e32ac5a860aec6e53e3449565b71595073e014
 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
@@ -34,9 +34,6 @@ define Package/$(PKG_NAME)
     +@PACKAGE_syslog-ng:SYSLOGNG_LOGROTATE              \
     +PACKAGE_fluent-bit:logrotate                       \
     +@DMCLI_REMOTE_CONNECTION
-  # tools used in development/testing
-  DEPENDS+=                                             \
-    +iperf3
 
 endef
 

ipt-trigger/Makefile

@@ -14,7 +14,7 @@ ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=ac1beae4794f99533b28db7d0e6e80f4c268a3e8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ipt-trigger.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

libdpp/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdpp
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fdfe23e51ff77ca6d2661ad6208d097758524147
+PKG_SOURCE_VERSION:=6024efd3db9dd490c07465ea9b0c15120063165c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

libeasy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libeasy
-PKG_VERSION:=7.5.1
+PKG_VERSION:=7.5.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b981f7e1bd51f66041cd0c25d15af74ae1e3bc75
+PKG_SOURCE_VERSION:=18f93677bb4d33ebb6249324a5043294f0eae16c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libeasy.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libpicoevent-bcm/Makefile

@@ -17,7 +17,7 @@ PKG_NAME:=libpicoevent-bcm
 PKG_LICENSE:=LGPL-2.1-only
 PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 include $(INCLUDE_DIR)/package.mk

libpicoevent/Makefile

@@ -17,7 +17,7 @@ PKG_NAME:=libpicoevent
 PKG_LICENSE:=LGPL-2.1-only
 PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 include $(INCLUDE_DIR)/package.mk

libqos/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libqos
-PKG_VERSION:=7.2.111
+PKG_VERSION:=7.2.109
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
-PKG_SOURCE_VERSION:=2e4c6a9c27e0f4f68dfe7a5c930afefd8dc7119a
+PKG_SOURCE_VERSION:=4948d372c3d7e43a0ba9aee517dbb83b94bba3dc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -65,7 +65,7 @@ define Package/libqos
   SUBMENU:=IOPSYS HAL libs
   MENU:=1
   TITLE:= QoS library (libqos)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcm963xx-bsp +TARGET_airoha:libuci
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcm963xx-bsp
 endef
 
 define Package/libqos/config

libtrace/Makefile

@@ -6,7 +6,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/apietila/libtrace.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_VERSION:=e4b4c5cce35a52da152776a00532aa0b80879c5b
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.8
+PKG_VERSION:=1.1.7
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,8 +17,8 @@ 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:=9763c574ec69e2aa492db4f1296d4bcd53776fba
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=3a30086a68a3409f0396acb01380f91daabf7a2f
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

libvoice-airoha/files/etc/uci-defaults/991-libvoice-airoha

@@ -25,5 +25,6 @@ db commit
 # configure the PCM for DECT/DCX81
 [ -f "/proc/device-tree/aliases/dcx81-uart" ] && {
     uci set dect.global.pcm_fsync='SHORT_LF'
+    uci set dect.global.pcm_slot_start='8'
     uci set dect.global.dect_channel_start='3'
 }

libvoice-broadcom/Makefile

@@ -18,7 +18,7 @@ ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
 PKG_SOURCE_VERSION:=baf5ebfb45404714bbfcc3068080f93265934d8a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

libvoice-d2/Makefile

@@ -18,7 +18,7 @@ ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
 PKG_SOURCE_VERSION:=0b2bef862fb5aea0b285e339459f46779224e2d0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

libwifi/Makefile

@@ -1,32 +1,28 @@
 #
-# Copyright (C) 2019-2024 Iopsys
-# Copyright (C) 2025 Genexis Sweden AB
+# Copyright (C) 2020-2023 Iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.22.13
+PKG_VERSION:=7.14.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c754c0386bb1a3eace51f925fe8539258b6affd2
-PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libwifi.git
+PKG_SOURCE_VERSION:=b4b8f524a93d03fd1f89d4c32b8eaca90d9ccc1a
+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
 PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=LGPL-2.1-only
-PKG_LICENSE_FILES:=
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
-
-MAKE_VERBOSE := 1
+PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/cmake.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
@@ -53,14 +49,8 @@ else ifeq ($(CONFIG_TARGET_airoha),y)
   endif
 else ifeq ($(CONFIG_TARGET_mediatek),y)
   TARGET_PLATFORM=MEDIATEK
-  TARGET_WIFI_TYPE=MAC80211
-  ifeq ($(CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_cx750),y)
-    TARGET_WIFI_TYPE=MEDIATEK
-    TARGET_CFLAGS +=-DCONFIG_MTK -I$(LINUX_DIR)/include/uapi/linux/mtk_nl80211_inc
-  else ifeq ($(CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_mediatek_mt7987a-spim-nand-an8801sb),y)
-    TARGET_WIFI_TYPE=MEDIATEK
-    TARGET_CFLAGS +=-DCONFIG_MTK -I$(LINUX_DIR)/include/uapi/linux/mtk_nl80211_inc
-  endif
+  TARGET_WIFI_TYPE=MEDIATEK
+  TARGET_CFLAGS +=-DCONFIG_MTK -I$(LINUX_DIR)/include/uapi/linux/mtk_nl80211_inc
 else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
   TARGET_WIFI_TYPE=QUALCOMM
@@ -76,13 +66,13 @@ else
 endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-mt7915e_en7523),)
-  TARGET_CFLAGS +=-DMT7915_VENDOR_EXT
+  TARGET_CFLAGS=-DMT7915_VENDOR_EXT
 endif
 
 PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e_en7523:mt76_en7523
 
 ifneq ($(CONFIG_PACKAGE_libwifi),)
-  CMAKE_OPTIONS +=-DHAS_WIFI=ON
+TARGET_CFLAGS +=-DHAS_WIFI
 endif
 
 ifeq ($(CONFIG_LIBWIFI_USE_CTRL_IFACE),y)
@@ -93,8 +83,18 @@ ifeq ($(CONFIG_LIBWIFI_SKIP_PROBES),y)
   TARGET_CFLAGS +=-DLIBWIFI_BRCM_SKIP_PROBES
 endif
 
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
 
-CMAKE_OPTIONS += -DPLATFORM=$(TARGET_PLATFORM) -DWIFI_TYPE=$(TARGET_WIFI_TYPE)
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	WIFI_TYPE="$(TARGET_WIFI_TYPE)" \
+	subdirs="$(subdirs)"
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -102,39 +102,43 @@ define Build/Prepare
 endef
 endif
 
-define Package/libwifiutils
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:= WiFi utility library (libwifiutils.so)
-	DEPENDS+=+libnl +libnl-route +libeasy +libopenssl
-endef
-
-define Package/libwifiutils/description
-	Library provides WiFi utility functions
-endef
-
-define Package/libwifi
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:= WiFi HAL library (libwifi-7.so.m)
-	DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcm963xx-bsp
+define Package/libwifi-common
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=libwifi
+  SUBMENU:=IOPSYS HAL libs
+  DEPENDS:=+libopenssl
+  MENU:=1
 endef
 
 define Package/libwifi/description
-	Library provides WiFi HAL APIs
+  Library provides WiFi HAL APIs and WiFi common utility functions
+endef
+
+define Package/libwifiutils
+  $(call Package/libwifi-common)
+  TITLE:= WiFi utility library (libwifiutils.so)
+  DEPENDS+=+libnl +libnl-route +libeasy
 endef
 
 define Build/InstallDev/libwifiutils
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifiutils/wifidefs.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifiutils/wifiutils.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifiutils/libwifiutils*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/wifidefs.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/wifiutils.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifiutils*.so* $(1)/usr/lib/
 endef
 
 define Package/libwifiutils/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifiutils/libwifiutils*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifiutils*.so* $(1)/usr/lib/
+endef
+
+
+define Package/libwifi
+  $(call Package/libwifi-common)
+  TITLE:= WiFi library (libwifi)
+  DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcm963xx-bsp
 endef
 
 define Package/libwifi/config
@@ -155,12 +159,13 @@ define Package/libwifi/config
   endif
 endef
 
+
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifiops.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/wifiops.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/wifi.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifi-7*.so* $(1)/usr/lib/
 endef
 
 
@@ -173,7 +178,7 @@ endef
 
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi-7*.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libwifiutils))

logmngr/Config.in

@@ -19,13 +19,6 @@ config LOGMNGR_BACKEND_SYSLOG_NG
 
 endchoice
 
-config LOGMNGR_SYSLOG
-	bool "Device.Syslog. support"
-	depends on PACKAGE_logmngr
-	default y
-	help
-		It adds support for Device.Syslog. datamodel using bbfdm micro-services.
-
 config LOGMNGR_LOGROTATE
 	bool "Logrotate support"
 	depends on PACKAGE_logmngr

logmngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
-PKG_SOURCE_VERSION:=62441fdfe14a39bff8fff7c62307bd7b54d7240f
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.zst
+PKG_SOURCE_VERSION:=ad043d5d2e96c1b203a9c5b22ad6e6e1488ad8f2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -59,21 +59,14 @@ define Package/logmngr/install
 	$(INSTALL_DATA) ./files/etc/config/logmngr $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/uci-defaults/10-logmngr_config_migrate $(1)/etc/uci-defaults/
 
-ifeq ($(CONFIG_LOGMNGR_SYSLOG),y)
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) $(PKG_NAME)
-endif
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) core 10
 
 	# Install logmngr service backend
 	$(INSTALL_DIR) $(1)/lib/logmngr
 ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
 	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_DIR) $(1)/etc/fluent-bit
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/ntp/
-	$(INSTALL_BIN) ./files/etc/fluent-bit/syslog_facility.lua $(1)/etc/fluent-bit/syslog_facility.lua
 	$(INSTALL_BIN) ./files/logread $(1)/sbin/
 	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/
-	$(INSTALL_BIN) ./files/etc/hotplug.d/ntp/20-reload_fluent_bit $(1)/etc/hotplug.d/ntp/
 else ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
 	$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/
 endif

logmngr/bbfdm_service.json

@@ -1,16 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "logmngr",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "Syslog"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

logmngr/files/etc/config/logmngr

@@ -8,7 +8,7 @@ config source 'default_source'
 
 config template 'default_template'
 	option name 'default_template'
-	option expression '{time} {hostname} {facility}.{severity} {ident}[{pid}]: {message}'
+	option expression '{time} {hostname} {ident}: {message}'
 
 config action 'default_action'
 	option name 'default_action'

logmngr/files/etc/fluent-bit/syslog_facility.lua

@@ -1,30 +0,0 @@
-function map_facility_severity(tag, timestamp, record)
-    local priority = record["priority"] or record["pri"]
-    
-    if not priority then
-        record["facility"] = "user"
-        record["severity"] = "info"
-        return 2, timestamp, record
-    end
-    
-    local facility_map = {
-        [0] = "kern", [1] = "user", [2] = "mail", [3] = "daemon",
-        [4] = "auth", [5] = "syslog", [6] = "lpr", [7] = "news",
-        [8] = "uucp", [9] = "cron", [10] = "authpriv", [11] = "ftp",
-        [16] = "local0", [17] = "local1", [18] = "local2", [19] = "local3",
-        [20] = "local4", [21] = "local5", [22] = "local6", [23] = "local7"
-    }
-    
-    local severity_map = {
-        [0] = "emerg", [1] = "alert", [2] = "crit", [3] = "err",
-        [4] = "warn", [5] = "notice", [6] = "info", [7] = "debug"
-    }
-    
-    local facility_num = math.floor(priority / 8)
-    local severity_num = priority % 8
-    
-    record["facility"] = facility_map[facility_num] or "user"
-    record["severity"] = severity_map[severity_num] or "info"
-    
-    return 2, timestamp, record
-end

logmngr/files/etc/hotplug.d/ntp/20-reload_fluent_bit

@@ -1,14 +0,0 @@
-#!/bin/sh
-# This hotplug script reloads fluent-bit, so that kmsg logs' timestamp gets in sync
-
-[ "$ACTION" = stratum ] || exit 0
-
-# only once
-if ! uci -q get time.global.first_use_date > /dev/null 2>&1; then
-	flb_pid="$(pidof fluent-bit)"
-
-	if [ -n "$flb_pid" ]; then
-		logger -t "logmngr.hotplug" -p info "reload fluent-bit due to ntp sync"
-		kill -SIGHUP "$flb_pid"
-	fi
-fi

logmngr/files/etc/init.d/logmngr

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=09
+START=12
 
 USE_PROCD=1
 

logmngr/files/etc/uci-defaults/10-logmngr_config_migrate

@@ -11,7 +11,7 @@ fi
 if ! uci -q get logmngr.default_template > /dev/null; then
 	uci -q set logmngr.default_template=template
 	uci -q set logmngr.default_template.name='default_template'
-	uci -q set logmngr.default_template.expression='{time} {hostname} {ident}[{pid}]: {message}'
+	uci -q set logmngr.default_template.expression='{time} {hostname} {ident}: {message}'
 fi
 
 if uci -q get logmngr.a1 >/dev/null; then

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

@@ -63,23 +63,12 @@ create_service_section() {
 	append_conf "    flush        1"
 	append_conf "    daemon       off"
 	append_conf "    log_level    info"
-	append_conf "    coro_stack_size    1048576"
+	append_conf "    coro_stack_size    24576"
 	append_conf "    parsers_file /etc/fluent-bit/parsers.conf"
 	append_conf "    hot_reload        on"
 	append_conf ""
 }
 
-create_lua_filter_for_severity_facility() {
-	match_regex="$1"
-
-	append_conf "[FILTER]"
-	append_conf "    name            lua"
-	append_conf "    match_regex     ${match_regex}"
-	append_conf "    script          /etc/fluent-bit/syslog_facility.lua"
-	append_conf "    call            map_facility_severity"
-	append_conf ""
-}
-
 create_default_filters() {
 	append_conf "[FILTER]"
 	append_conf "    name            modify"
@@ -88,12 +77,6 @@ create_default_filters() {
 	append_conf "    rename          msg     message"
 	append_conf ""
 
-	append_conf "[FILTER]"
-	append_conf "    name            modify"
-	append_conf "    match           *"
-	append_conf "    add             pid     0"
-	append_conf ""
-
 	append_conf "[FILTER]"
 	append_conf "    name            sysinfo"
 	append_conf "    match           *"
@@ -109,180 +92,157 @@ create_input_section() {
 	# check if this source section has already been processed
 	syslog_tag_already_processed "$tag" && return
 
+	# the input in our case is always syslog, hence, this section of the
+	# fluent-bit.conf file has hardcoded values as well that do not depend
+	# on any uci value
 	append_conf "[INPUT]"
 	append_conf "    name        syslog"
-	append_conf "    unix_perm   0666"
 	append_conf "    tag         $tag"
 	append_conf "    path        /dev/log"
 	append_conf ""
 }
 
-populate_allowed_logs() {
-	local facility_level sev_level
-	local section="$1"
-
-	[ -z "$section" ] && return
-
-	# reset
-	match_pattern=""
-	facilities=""
-	all_facilities=0
-	kern_facility=0
-	severities=""
-	sev_compare=1
-	sev_action=0
-
-	# read config
-	config_get match_pattern $section pattern_match
-
-	config_get facility_level $section facility_level
-	config_get sev_level $section severity_level
-	config_get sev_compare $section severity_compare 1
-	config_get sev_action $section severity_action 0
-
-	# normalize facilities
-	if [ -n "$facility_level" ]; then
-		for f in $facility_level; do
-			if [ "$f" = "24" ]; then
-				all_facilities=1
-				# xargs is used to convert from new line separated numbers to space separated numbers
-				facilities="$(seq 0 23 | xargs)"
-				break
-			fi
-
-			if [ "$f" = "0" ]; then
-				kern_facility=1
-			fi
-		done
-
-		if [ "$all_facilities" -eq 0 ]; then
-			facilities="$facility_level"
-		fi
-	else
-		# default to "all facilities" when unset
-        	all_facilities=1
-	        facilities="$(seq 0 23 | xargs)"
-	fi
-
-	# normalize severities
-	case "$sev_level" in
-		8)  	# all severities
-			severities="$(seq 0 7 | xargs)"
-			;;
-		9)  	# none
-			severities="none"
-			;;
-		"") 	# unset, treat as "all"
-			severities="$(seq 0 7 | xargs)"
-			;;
-		*)
-			if [ "$sev_compare" = "0" ]; then
-				# equal
-				severities="$sev_level"
-			else
-				# equl or higher
-				severities="$(seq 0 $sev_level | xargs)"
-			fi
-			;;
-	esac
-}
-
-create_filter_section() {
-	local match_regex="$1"
-	local pattern="$2"
-
-	[ -z "$match_regex" ] && return
-
-	append_conf "[FILTER]"
-	append_conf "    name        grep"
-	append_conf "    match_regex       $match_regex"
-
-	# we need "logical_op or" only in non-pattern sections
-	if [ "$pattern" = "0" ]; then
-		append_conf "    logical_op  or" # handle multiple filters
-	fi
-}
-
 create_kmsg_input_section() {
 	local tag="$1"
-	local max_sev=7
 
 	[ -z "$tag" ] && return
+
+	# check if this source section has already been processed
 	kmsg_tag_already_processed "$tag" && return
 
 	if [ -c "/dev/kmsg" ]; then
 		append_conf "[INPUT]"
 		append_conf "    name       kmsg"
 		append_conf "    tag        $tag"
-
-		# check kern facility (0)
-		if [ "$all_facilities" -eq 1 ] || [ "$kern_facility" -eq 1 ]; then
-			if [ "$severities" != "none" ]; then
-				# severity filtering
-				# only EqualOrHigher is supported by Prio_Level
-				# and only Log action is supported
-				# so set Prio_Level = max severity
-				if [ "$sev_action" = "0" ] && [ "$sev_compare" = "1" ]; then
-					if [ -n "$severities" ]; then
-						max_sev=$(echo $severities | tr ' ' '\n' | sort -n | tail -1)
-					fi
-
-					append_conf "    prio_level $max_sev"
-				fi
-			fi
-		fi
-
 		append_conf ""
-
-		# if severities is none, or
-		# if kern facility has been excluded
-		# then we need to stop kernel logs
-		# sev_action and sev_compare is being checked because we don't want to work with rules that exclude logs
-		if [ "$severities" = "none" ] || { [ "$kern_facility" -eq 0 ] && [ "$all_facilities" -eq 0 ] && [ "$sev_action" = "0" ] && [ "$sev_compare" = "1" ]; }; then
-			# block all
-			# create a filter section that matches on KM* tag
-			# and excludes all messages
-			create_filter_section "KM*" "0"
-			append_conf "    exclude    message ^.*$"
-			append_conf ""
-		fi
 	fi
 }
 
-generate_syslog_filter() {
-	local param="regex"
+generate_facility_regex() {
+	local facility_level=$1
+	local pri=0
 
-	[ "$sev_action" = "1" ] && param="exclude"
-
-	# start adding the fluent-bit filter section
-	create_filter_section "SL*" "0"
-
-	if [ "$severities" = "none" ]; then
-		append_conf "    exclude    pri ^.*$"
+	if [ "$facility_level" == "24" ]; then
+		# value 24 means all facility level, which is as good as not
+		# generating a filter section, so return
 		return
 	fi
 
-	for fval in $facilities; do
-		for sval in $severities; do
-			local pri=$((fval * 8 + sval))
-			append_conf "    $param        pri ^${pri}$"
+	# facility_level is a list value, hence, generate regex for
+	# each value
+	IFS=" "
+	for val in $facility_level; do
+		# as per rfc 5424 and 3164, pri in syslog msg is
+		# facility*8+severity. Severity value can range from 0-7 hence
+		# generate regex for each.
+		for sval in 0 1 2 3 4 5 6 7; do
+			pri=`expr $val \* 8 + $sval`
+			append_conf "    regex        pri $pri"
 		done
 	done
-
-	append_conf ""
 }
 
-generate_pattern_filter() {
+generate_severity_regex() {
+	local sev_level="$1"
+	local sev_compare="$2"
+	local sev_action="$3"
+
+	local pri=0
+	local param="exclude"
+
+	if [ "$sev_action" == "0" ]; then
+		param="regex"
+	fi
+
+	local fval=0
+	if [ "$sev_compare" == "0" ]; then
+		# generate regex for all facility values, with severity=sev_level
+		while [ $fval -le 23 ] ; do
+			pri=`expr $fval \* 8 + $sev_level`
+			append_conf "    $param        pri $pri"
+			fval=$((fval + 1))
+		done
+	elif [ "$sev_compare" == "1" ]; then
+		# generate regex for all severity value greater than or equal to
+		# sev_level. please, lower value have higher precedence, so sev_level
+		# 0 which is emergency has higher precedence than error which is 3
+		while [ $fval -le 23 ] ; do
+			sval=0
+			while [ $sev_level -ge $sval ]; do
+				pri=`expr $fval \* 8 + $sval`
+				append_conf "    $param        pri $pri"
+				sval=$((sval + 1))
+			done
+			fval=$((fval + 1))
+		done
+	fi
+}
+
+handle_filter_conf() {
+	local section="$1" # config filter
+	local filter_name="$2"
+	local name
+
+	# no need to proceed if name of filter section is not one of the values
+	# listed in option filter in config action section
+	config_get name $section name
+	if [ "$name" != "$filter_name" ]; then
+		return
+	fi
+
+	# as per data model, at a time either facility_level or severity_level can
+	# be specified along with pattern_match. hence, first process and generate
+	# regex for pattern_match which is common in both condition. Next, we will
+	# process facility_level and return if facility level is defined and not
+	# process severity related params at all.
+
+	local pattern_match
+	config_get pattern_match $section pattern_match
+	if [ -n "$pattern_match" ]; then
+		append_conf "    regex        $pattern_match"
+	fi
+
+	local facility_level
+	config_get facility_level $section facility_level
+
+	if [ -n "$facility_level" ]; then
+		generate_facility_regex $facility_level
+		# return from here since if facility_level is defined, then no
+		# need to process severity_level
+		return
+	fi
+
+	local sev_level
+	local sev_compare
+	local sev_action
+	config_get sev_level $section severity_level
+
+	if [ -n "$sev_level" ]; then
+		# value 1 of severity compare corresponds to data model
+		# and system default which is EqualorHigher
+		config_get sev_compare $section severity_compare 1
+		# value 0 of severity action corresponds to data model
+		# and system default that is log
+		config_get sev_action $section severity_action 0
+
+		generate_severity_regex $sev_level $sev_compare $sev_action
+	fi
+}
+
+create_filter_section() {
 	local match_regex="$1"
-	local match_pattern="$2"
 
 	[ -z "$match_regex" ] && return
-	[ -z "$match_pattern" ] && return
 
-	# start adding the fluent-bit filter section
-	create_filter_section "$match_regex" "1"
-	append_conf "    regex        message $match_pattern"
-	append_conf ""
+	append_conf "[FILTER]"
+	append_conf "    name        grep"
+	append_conf "    match_regex       $match_regex"
+	append_conf "    logical_op  or" # handle multiple filters
+}
+
+handle_filter_ref() {
+	local filter_name="$1"
+	config_foreach handle_filter_conf filter "$filter_name"
 }
 
 handle_log_file() {
@@ -315,7 +275,6 @@ handle_log_file() {
 	append_conf "    match_regex  $match_regex"
 	append_conf "    file         $file"
 
-
 	if [ -n "$template" ]; then
 		append_conf "    format       template"
 		append_conf "    template     ${template}"
@@ -390,7 +349,7 @@ handle_log_remote() {
 resolve_source_section() {
 	local src_section="$1"
 	local linker="$2"
-	local src_name syslog_en kernel_en
+	local src_name syslog_en kernel_en source_tag_syslog source_tag_kmsg
 
 	config_get src_name "$src_section" name
 	[ "$src_name" = "$linker" ] || return
@@ -405,11 +364,13 @@ resolve_source_section() {
 	if [ "$syslog_en" = "1" ]; then
 		source_tag_syslog="SL$src_name"
 		create_input_section "$source_tag_syslog"
+		action_tags="$source_tag_syslog $action_tags"
 	fi
 
 	if [ "$kernel_en" = "1" ]; then
 		source_tag_kmsg="KM$src_name"
 		create_kmsg_input_section "$source_tag_kmsg"
+		action_tags="$source_tag_kmsg $action_tags"
 	fi
 }
 
@@ -445,30 +406,10 @@ build_match_regex() {
 	echo "$regex"
 }
 
-handle_filter_conf() {
-	local section="$1" # config filter
-	local filter_name="$2"
-	local name
-
-	config_get name $section name
-	[ "$name" = "$filter_name" ] || return
-
-	populate_allowed_logs "$filter_name"
-}
-
 handle_action() {
-	local tag_regex filter source_ref template_ref source_sec log_template finst
+	local tag_regex filter source_ref template_ref source_sec log_template
 	local action_section="$1"
-	local source_tag_syslog source_tag_kmsg
-
-	# shared variables set by populate_allowed_logs
-	match_pattern=""
-	facilities=""
-	all_facilities=0
-	kern_facility=1
-	severities=""
-	sev_compare=1
-	sev_action=0
+	local action_tags=""
 
 	config_get action_name "$action_section" name
 	config_get filter "$action_section" filter
@@ -478,33 +419,32 @@ handle_action() {
 	[ -z "$action_name" ] && return
 	[ -z "$source_ref" ] && return
 
-	# read filter section and populate relevant variables
-	# these variables will be used by create_kmsg_input_section
-	# generate_syslog_filter, and generate_pattern_filter functions
-	if [ -n "$filter" ]; then
-		for finst in $filter; do
-			config_foreach handle_filter_conf filter "$finst"
-		done
-	fi
-
 	# Resolve referenced source sections
 	for source_sec in $source_ref; do
 		config_foreach resolve_source_section source "$source_sec"
 	done
 
 	# build a regex that will match all the sources for this action
-	tag_regex=$(build_match_regex "$source_tag_syslog $source_tag_kmsg")
+	tag_regex=$(build_match_regex "$action_tags")
 
 	if [ -n "$filter" ]; then
-		generate_pattern_filter "$tag_regex" "$match_pattern"
-		generate_syslog_filter
+		# the only fluentbit filter that is useful for the datamodel is
+		# grep. Also, fluentbit does not seem to handle multiple instances
+		# of FILTER of same kind. Hence, each filter section corresponding
+		# to an action entry in the uci would translate for us into a set of
+		# regex/exclude values instead of individual FILTER section per uci
+		# section filter is a list, treat according
+		create_filter_section "$tag_regex"
+
+		IFS=" "
+		for finst in $filter; do
+			handle_filter_ref $finst
+		done
 	fi
 
 	# get the template expression if any is present
 	log_template="$(get_template_expression "$template_ref")"
 
-	create_lua_filter_for_severity_facility "$tag_regex"
-
 	# handle output, each action can be associated with an out_log and out_syslog
 	# section so figure out if any out_log or out_syslog section is associated
 	# with this and action and setup output accordingly.

loop-detector/Makefile

@@ -13,7 +13,7 @@ PKG_SOURCE_VERSION:=d0fb770eacd6691b98df138b60f5116e02f71a9b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/loop-detector
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

map-agent/Config.in

@@ -55,10 +55,6 @@ config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
 config AGENT_USE_LIBDPP
 	bool "Depend on libdpp for DPP EasyConnect"
 
-config AGENT_ZEROTOUCH_DPP
-	bool "Enable Zero-touch DPP bootstrapping. Depends on libztdpp.so"
-	default n
-
 config AGENT_CHECK_PARTIAL_WIFI_RELOAD
 	bool "Option that allow SSID/PSK simple reload"
 	default y

map-agent/Makefile

@@ -1,14 +1,13 @@
 #
-# Copyright (C) 2020-2024 IOPSYS Software Solutions AB
-# Copyright (C) 2025 Genexis Sweden AB
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.5.0.10
+PKG_VERSION:=6.4.1.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=1a9763bd4e520975e6951f77e85f369487cf1318
+PKG_SOURCE_VERSION:=ed2e65007c2a0bacb642b0e72b803df64ef826ed
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -27,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/map-agent
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=Wi-Fi Multi-AP Agent (EasyMesh R6)
+  TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
 	   +ieee1905-map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp \
 	   +uuidgen +openssl-util +!TARGET_brcmbca:ebtables-legacy \
@@ -38,12 +37,8 @@ ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)
   TARGET_CFLAGS += -DUSE_LIBDPP
 endif
 
-ifeq ($(CONFIG_AGENT_ZEROTOUCH_DPP),y)
-  TARGET_CFLAGS += -DZEROTOUCH_DPP
-endif
-
 define Package/map-agent/description
-  This package provides EasyMesh R6 compliant Wi-Fi Multi-AP Agent.
+ This package implements EasyMesh R2 compliant WiFi Agent.
 endef
 
 define Package/map-agent/config

map-agent/files/etc/init.d/mapagent

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=97
+START=98
 STOP=20
 
 USE_PROCD=1

map-agent/files/lib/multiap/map_genconfig

@@ -49,16 +49,19 @@ generate_multiap_config() {
 			2g)
 				mode_band=2
 				priority=2
+				dpp_chan="81/1"
 				channels="1 6 11"
 			;;
 			5g)
 				mode_band=5
 				priority=1
+				dpp_chan="128/36"
 				channels="36-64 100-112"
 			;;
 			6g)
 				mode_band=6
 				priority=0
+				dpp_chan="133/49"
 			;;
 		esac
 
@@ -70,8 +73,7 @@ generate_multiap_config() {
 
 		ifprefix_radio=""
 		if is_logan; then
-			uci set mapagent.agent.mld_ap_prefix="bss"
-			uci set mapagent.agent.mld_sta_prefix="sta"
+			uci set mapagent.agent.mld_prefix="bss"
 			ifname_sta=""
 			case "$band" in
 				2g)
@@ -160,17 +162,13 @@ generate_multiap_config() {
 				uci set mapagent.@bsta[-1].band="$mode_band"
 				uci set mapagent.@bsta[-1].priority="$priority"
 
-				# add dpp_chirp section for 2.4GHz bSTA
-				if [ $mode_band -eq 2 ]; then
-					uci add mapagent dpp_chirp
-					uci set mapagent.@dpp_chirp[-1].type="qrcode"
-					uci set mapagent.@dpp_chirp[-1].device="$device"
-					uci set mapagent.@dpp_chirp[-1].ifname="$ifname"
-					uci set mapagent.@dpp_chirp[-1].band="$mode_band"
-					for channel in $channels; do
-						uci add_list mapagent.@dpp_chirp[-1].channel="$channel"
-					done
-				fi
+				#uci add mapagent dpp_uri
+				#uci set mapagent.@dpp_uri[-1].type="qrcode"
+				#uci set mapagent.@dpp_uri[-1].device="$device"
+				#uci set mapagent.@dpp_uri[-1].ifname="$ifname"
+				#uci set mapagent.@dpp_uri[-1].band="$mode_band"
+				#uci set mapagent.@dpp_uri[-1].chirp_interval="10"
+				#uci add_list mapagent.@dpp_uri[-1].dpp_chan="$dpp_chan"
 
 				if [ $generate_wireless_sta_config -eq 1 ]; then
 					secname="default_sta_${device}"

map-controller/Config.in

@@ -39,10 +39,6 @@ config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 config CONTROLLER_USE_LIBDPP
 	bool "Depend on libdpp for DPP EasyConnect"
 
-config CONTROLLER_ZEROTOUCH_DPP
-	bool "Enable Zero-touch DPP bootstrapping via passphrase."
-	default n
-
 config CONTROLLER_PROPAGATE_PROBE_REQ
 	depends on CONTROLLER_EASYMESH_VENDOR_EXT
 	bool "Enable publishing probe requests vendor specific messages as UBUS events"

map-controller/Makefile

@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.4.5.1
+PKG_VERSION:=6.4.1.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=26d8351a1185d89c94946ddb361a7ab6137952e6
+PKG_SOURCE_VERSION:=45355bd49d9260c666b4d1e629184878cec3f72d
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
 
 LOCAL_DEV=0
@@ -36,9 +36,6 @@ ifeq ($(CONFIG_CONTROLLER_USE_LIBDPP),y)
   TARGET_CFLAGS += -DUSE_LIBDPP
 endif
 
-ifeq ($(CONFIG_CONTROLLER_ZEROTOUCH_DPP),y)
-  TARGET_CFLAGS += -DZEROTOUCH_DPP
-endif
 
 define Package/map-controller/description
  This package provides WiFi MultiAP Controller as per the EasyMesh-R2 specs.
@@ -84,7 +81,6 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/src/cntlr_commands_impl.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/cntlr_commands.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/cntlr_apis.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/cntlr_plugin.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/wifi_opclass.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/steer_module.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/timer.h $(1)/usr/include/map-controller

map-controller/files/etc/config/mapcontroller

@@ -4,16 +4,16 @@ config controller 'controller'
 	option registrar '2 5 6'
 	option debug '2'
 	option bcn_metrics_max_num '10'
+	option initial_channel_scan '0'
 	option enable_ts '0'
 	option primary_vid '1'
 	option primary_pcp '0'
 	option stale_sta_timeout '20d'
 	option de_collect_interval '60'
-	list plugin 'zerotouch'
 
-config sta_steering 'sta_steering'
+config sta_steering
 	option enable_sta_steer '1'
-	option enable_bsta_steer '1'
+	option enable_bsta_steer '0'
 	option rcpi_threshold_2g '70'
 	option rcpi_threshold_5g '86'
 	option rcpi_threshold_6g '86'
@@ -23,10 +23,8 @@ config sta_steering 'sta_steering'
 	option plugins_enabled '1'
 	option plugins_policy 'any'
 	list plugins 'rcpi'
-	list plugins 'rate'
-	list plugins 'bsteer'
 
-config channel_plan 'channel_plan'
+config channel_plan
 	option preclear_dfs '0'
 	option acs '0'
 

map-controller/files/etc/init.d/mapcontroller

@@ -20,6 +20,7 @@ validate_controller_section() {
 		'registrar:string' \
 		'debug:range(0,16)' \
 		'bcn_metrics_max_num:range(1,256)' \
+		'initial_channel_scan:bool:true' \
 		'resend_num:uinteger:0' \
 		'allow_bgdfs:range(0,2629744)' \
 		'stale_sta_timeout:string' \

map-controller/files/etc/uci-defaults/99-mapcntlr-add-qos-rule-id

@@ -1,66 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-cfg="mapcontroller"
-config_load "$cfg"
-
-used_ids=""
-
-collect_used_ids() {
-	local section="$1"
-	local id
-
-	id=$(uci -q get ${cfg}.${section}.id)
-	if [ -n "$id" ] && printf "%s" "$id" | grep -qE '^[0-9]+$'; then
-		used_ids="$used_ids $id"
-	fi
-}
-
-# Find first available ID from 0 to INT32_MAX
-find_first_available_id() {
-	local max_int=2147483647
-	local expected=0
-	local id
-
-	# Convert list to sorted unique list
-	sorted_ids=$(printf "%s\n" $used_ids | sort -n | uniq)
-
-	for id in $sorted_ids; do
-		if [ "$id" -eq "$expected" ]; then
-			expected=$((expected + 1))
-		elif [ "$id" -gt "$expected" ]; then
-			# Found a gap -> return the gap
-			echo "$expected"
-			return
-		fi
-	done
-
-	# If no gaps, next available is `expected`
-	if [ "$expected" -le "$max_int" ]; then
-		echo "$expected"
-	else
-		echo -1
-	fi
-}
-
-# Assign ID if missing
-add_qos_rule_id() {
-	local section="$1"
-	local id
-
-	id=$(uci -q get ${cfg}.${section}.id)
-	if [ -z "$id" ]; then
-		new_id=$(find_first_available_id)
-		[ "$new_id" -ge 0 ] || return # No available ID
-		uci -q set ${cfg}.${section}.id="$new_id"
-
-		used_ids="$used_ids $new_id"
-	fi
-}
-
-# Step 1: Collect all existing IDs
-config_foreach collect_used_ids qos_rule
-
-# Step 2: Assign IDs to rules missing them
-config_foreach add_qos_rule_id qos_rule

map-controller/files/etc/uci-defaults/99-mapcntlr-uci-rename-singletons

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-cfg=mapcontroller
-
-# singleton sections
-sections="channel_plan sta_steering"
-
-for sec in $sections; do
-    # find unnamed section of given type, only index 0
-    s=$(uci show $cfg | grep -oE "@${sec}\[0\]" | sort -u)
-    [ "$s" = "" ] && continue
-
-    uci rename $cfg.$s=$sec
-done

map-plugins/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-plugins
-PKG_VERSION:=1.2.8
+PKG_VERSION:=0.0.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ed9204f02b5d2a988e04d671d31c578fc88e4099
+PKG_SOURCE_VERSION:=74bf151851112ecee731d447af016c8dc668adcf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-plugins.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -27,18 +27,11 @@ include $(INCLUDE_DIR)/package.mk
 
 include $(wildcard plugins/*.mk)
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS) -Wall"
 
 plugins := \
-	$(if $(CONFIG_PACKAGE_map-plugins-steer-rate),steer-rate)   \
-	$(if $(CONFIG_PACKAGE_map-plugins-bsteer),bsteer) \
-	$(if $(CONFIG_PACKAGE_map-plugins-zero-touch),zero-touch)
+	$(if $(CONFIG_PACKAGE_map-plugins-steer-rate),steer-rate)
 
 ppkg:=$(patsubst plugins/%.mk,map-plugins-%,$(wildcard plugins/*.mk))
 
@@ -59,8 +52,7 @@ define Package/map-plugins
 endef
 
 define Package/map-plugins/description
-	Provides extra Multi-AP services viz. steering, channel-planning,
-	self-organizing network, zero-touch onboarding etc.
+	Provides extra Multi-AP services viz. steering, channel-planning etc.
 endef
 
 define Package/map-plugins/install
@@ -68,14 +60,9 @@ define Package/map-plugins/install
 endef
 
 define Build/Compile
-	$(foreach p,$(plugins),$(call Build/Compile/map-plugins-$(p), $(1)))
+	$(foreach p,$(ppkg),$(call Build/Compile/$(p),$(1)))
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/map-plugins/ $(PKG_BUILD_DIR)/
-endef
-endif
 
 $(eval $(call BuildPackage,map-plugins))
 $(eval $(foreach p,$(ppkg),$(call BuildPackage,$(p))))

map-plugins/plugins/bsteer.mk

@@ -1,20 +0,0 @@
-define Package/map-plugins-bsteer
-	$(call Package/map-plugins/Default)
-	TITLE:=Wi-Fi backhaul steering plugin based on maximizing backhaul throughput
-	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-		 +libjson-c +libblobmsg-json +map-controller \
-		 +map-plugins
-endef
-
-define Package/map-plugins-bsteer/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
-	$(CP) $(PKG_BUILD_DIR)/steer/bsteer/bsteer.so $(1)/usr/lib/mapcontroller/bsteer.so
-endef
-
-define Build/Compile/map-plugins-bsteer
-	$(MAKE) -C $(PKG_BUILD_DIR)/steer/bsteer \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)";
-endef

map-plugins/plugins/steer-rate.mk

@@ -16,5 +16,5 @@ define Build/Compile/map-plugins-steer-rate
 	$(MAKE) -C $(PKG_BUILD_DIR)/steer/rate \
 		CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)";
+		LDFLAGS="$(TARGET_LDFLAGS)"
 endef

map-plugins/plugins/zero-touch.mk

@@ -1,22 +0,0 @@
-define Package/map-plugins-zero-touch
-	$(call Package/map-plugins/Default)
-	TITLE:=Full Zero-touch bootstrapping of Wi-Fi Repeater device(s)
-	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-		 +libjson-c +libblobmsg-json +map-controller \
-		 +map-plugins
-endef
-
-define Package/map-plugins-zero-touch/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
-	$(CP) $(PKG_BUILD_DIR)/zero-touch/zerotouch.so $(1)/usr/lib/mapcontroller/zerotouch.so
-	$(CP) $(PKG_BUILD_DIR)/zero-touch/libztdpp.so $(1)/usr/lib/libztdpp.so
-
-endef
-
-define Build/Compile/map-plugins-zero-touch
-	$(MAKE) -C $(PKG_BUILD_DIR)/zero-touch \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)";
-endef

mcastmngr/Makefile

@@ -14,7 +14,7 @@ ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/mcastmngr.git
 PKG_SOURCE_VERSION:=17d73b8f1947823a0d32ed589a240a2642904fe1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

mosquitto-auth-plugin/Config.in

@@ -1,7 +0,0 @@
-if PACKAGE_mosquitto-auth-plugin
-
-config MOSQUITTO_AUTH_PAM_SUPPORT
-	bool "Enable support of Linux PAM module for Authentication"
-	default y
-
-endif

mosquitto-auth-plugin/src/mosquitto_auth_plugin.c

@@ -1,670 +0,0 @@
-/*
- * Copyright (c) 2022 Genexis B.V.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   Erik Karlsson - initial implementation
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <shadow.h>
-#include <crypt.h>
-#include <stdlib.h>
-#include <arpa/inet.h>
-#include <mosquitto.h>
-#include <mosquitto_broker.h>
-#include <mosquitto_plugin.h>
-
-#ifdef ENABLE_PAM_SUPPORT
-#include <security/pam_appl.h>
-#endif
-
-#define MAX_USERS 256
-#define MAX_SUBNETS_PER_USER 32
-
-typedef struct {
-	union {
-		uint32_t ipv4_network;
-		uint8_t ipv6_network[16];
-	};
-	union {
-		uint32_t ipv4_netmask;
-		uint8_t ipv6_netmask[16];
-	};
-	int is_ipv6;
-} subnet_t;
-
-typedef struct {
-	char username[64];
-	subnet_t allow_subnets[MAX_SUBNETS_PER_USER];
-	int allow_count;
-	subnet_t deny_subnets[MAX_SUBNETS_PER_USER];
-	int deny_count;
-} user_acl_t;
-
-typedef struct {
-	user_acl_t users[MAX_USERS];
-	int user_count;
-	mosquitto_plugin_id_t *identifier;
-	char *config_file;
-} plugin_data_t;
-
-/* Parse CIDR notation for IPv4 or IPv6 (e.g., "192.168.1.0/24" or "2001:db8::/32") */
-static int parse_subnet(const char *cidr, subnet_t *subnet)
-{
-	char ip_str[128];
-	char *slash;
-	int prefix_len;
-	struct in_addr addr4;
-	struct in6_addr addr6;
-
-	strncpy(ip_str, cidr, sizeof(ip_str) - 1);
-	ip_str[sizeof(ip_str) - 1] = '\0';
-
-	slash = strchr(ip_str, '/');
-	if (slash != NULL) {
-		*slash = '\0';
-		prefix_len = atoi(slash + 1);
-	}
-
-	/* Try IPv4 first */
-	if (inet_pton(AF_INET, ip_str, &addr4) == 1) {
-		subnet->is_ipv6 = 0;
-		if (slash == NULL)
-			prefix_len = 32;
-		if (prefix_len < 0 || prefix_len > 32)
-			return -1;
-
-		subnet->ipv4_network = ntohl(addr4.s_addr);
-		subnet->ipv4_netmask = prefix_len == 0 ? 0 : (~0U << (32 - prefix_len));
-		subnet->ipv4_network &= subnet->ipv4_netmask;
-		return 0;
-	}
-
-	/* Try IPv6 */
-	if (inet_pton(AF_INET6, ip_str, &addr6) == 1) {
-		subnet->is_ipv6 = 1;
-		if (slash == NULL)
-			prefix_len = 128;
-		if (prefix_len < 0 || prefix_len > 128)
-			return -1;
-
-		/* Copy network address */
-		memcpy(subnet->ipv6_network, addr6.s6_addr, 16);
-
-		/* Generate netmask */
-		memset(subnet->ipv6_netmask, 0, 16);
-		for (int i = 0; i < prefix_len / 8; i++)
-			subnet->ipv6_netmask[i] = 0xff;
-		if (prefix_len % 8)
-			subnet->ipv6_netmask[prefix_len / 8] = ~((1 << (8 - (prefix_len % 8))) - 1);
-
-		/* Apply netmask to network address */
-		for (int i = 0; i < 16; i++)
-			subnet->ipv6_network[i] &= subnet->ipv6_netmask[i];
-
-		return 0;
-	}
-
-	return -1;
-}
-
-/* Check if IPv4 address is in subnet */
-static int ipv4_in_subnet(uint32_t ip, const subnet_t *subnet)
-{
-	if (subnet->is_ipv6)
-		return 0;
-	return (ip & subnet->ipv4_netmask) == subnet->ipv4_network;
-}
-
-/* Check if IPv6 address is in subnet */
-static int ipv6_in_subnet(const uint8_t *ip, const subnet_t *subnet)
-{
-	if (!subnet->is_ipv6)
-		return 0;
-	for (int i = 0; i < 16; i++) {
-		if ((ip[i] & subnet->ipv6_netmask[i]) != subnet->ipv6_network[i])
-			return 0;
-	}
-	return 1;
-}
-
-/* Check if IP is in any subnet in the list */
-static int ip_in_subnet_list(const char *client_address, const subnet_t *subnets, int count)
-{
-	struct in_addr addr4;
-	struct in6_addr addr6;
-	uint32_t ipv4;
-
-	/* Try IPv4 */
-	if (inet_pton(AF_INET, client_address, &addr4) == 1) {
-		ipv4 = ntohl(addr4.s_addr);
-		for (int i = 0; i < count; i++) {
-			if (ipv4_in_subnet(ipv4, &subnets[i]))
-				return 1;
-		}
-		return 0;
-	}
-
-	/* Try IPv6 */
-	if (inet_pton(AF_INET6, client_address, &addr6) == 1) {
-		for (int i = 0; i < count; i++) {
-			if (ipv6_in_subnet(addr6.s6_addr, &subnets[i]))
-				return 1;
-		}
-		return 0;
-	}
-
-	return 0;
-}
-
-/* Find or create user ACL entry */
-static user_acl_t* find_or_create_user_acl(plugin_data_t *pdata, const char *username)
-{
-	user_acl_t *user;
-
-	/* Find existing user */
-	for (int i = 0; i < pdata->user_count; i++) {
-		if (strcmp(pdata->users[i].username, username) == 0)
-			return &pdata->users[i];
-	}
-
-	/* Create new user if not found */
-	if (pdata->user_count >= MAX_USERS) {
-		mosquitto_log_printf(MOSQ_LOG_ERR,
-			"subnet_acl: Max users exceeded");
-		return NULL;
-	}
-
-	user = &pdata->users[pdata->user_count];
-	strncpy(user->username, username, sizeof(user->username) - 1);
-	user->username[sizeof(user->username) - 1] = '\0';
-	user->allow_count = 0;
-	user->deny_count = 0;
-	pdata->user_count++;
-
-	return user;
-}
-
-/* Parse subnet ACL file with simplified format
- * Format:
- * # Comment lines
- * subnet allow <username> <cidr>
- * subnet deny <username> <cidr>
- */
-static int load_subnet_acl_config(plugin_data_t *pdata, const char *config_file)
-{
-	FILE *fp;
-	char line[512];
-	int line_num = 0;
-
-	/* Initialize user count */
-	pdata->user_count = 0;
-
-	/* Config file is optional - if not provided, no subnet filtering */
-	if (config_file == NULL) {
-		mosquitto_log_printf(MOSQ_LOG_INFO,
-			"subnet_acl: No subnet ACL file specified, subnet filtering disabled");
-		return 0;
-	}
-
-	/* If config file is specified but cannot be opened, this is a fatal error */
-	fp = fopen(config_file, "r");
-	if (fp == NULL) {
-		mosquitto_log_printf(MOSQ_LOG_ERR,
-			"subnet_acl: Failed to open subnet ACL file '%s'", config_file);
-		return -1;
-	}
-
-	while (fgets(line, sizeof(line), fp) != NULL) {
-		char *token, *saveptr;
-		char *action, *username, *cidr;
-		user_acl_t *user;
-		subnet_t subnet;
-
-		line_num++;
-
-		/* Remove newline and comments */
-		line[strcspn(line, "\r\n")] = '\0';
-		char *comment = strchr(line, '#');
-		if (comment)
-			*comment = '\0';
-
-		/* Trim leading whitespace */
-		char *line_start = line;
-		while (*line_start == ' ' || *line_start == '\t')
-			line_start++;
-
-		/* Skip empty lines */
-		if (*line_start == '\0')
-			continue;
-
-		/* Parse: subnet allow|deny <username> <cidr> */
-		token = strtok_r(line_start, " \t", &saveptr);
-		if (token == NULL)
-			continue;
-
-		/* Must start with "subnet" */
-		if (strcmp(token, "subnet") != 0) {
-			mosquitto_log_printf(MOSQ_LOG_ERR,
-				"subnet_acl: Invalid directive '%s' at line %d (expected 'subnet')",
-				token, line_num);
-			fclose(fp);
-			return -1;
-		}
-
-		/* Get allow/deny */
-		action = strtok_r(NULL, " \t", &saveptr);
-		if (action == NULL) {
-			mosquitto_log_printf(MOSQ_LOG_ERR,
-				"subnet_acl: Missing allow/deny at line %d", line_num);
-			fclose(fp);
-			return -1;
-		}
-
-		if (strcmp(action, "allow") != 0 && strcmp(action, "deny") != 0) {
-			mosquitto_log_printf(MOSQ_LOG_ERR,
-				"subnet_acl: Invalid action '%s' at line %d (use 'allow' or 'deny')",
-				action, line_num);
-			fclose(fp);
-			return -1;
-		}
-
-		/* Get username */
-		username = strtok_r(NULL, " \t", &saveptr);
-		if (username == NULL) {
-			mosquitto_log_printf(MOSQ_LOG_ERR,
-				"subnet_acl: Missing username at line %d", line_num);
-			fclose(fp);
-			return -1;
-		}
-
-		/* Get CIDR */
-		cidr = strtok_r(NULL, " \t", &saveptr);
-		if (cidr == NULL) {
-			mosquitto_log_printf(MOSQ_LOG_ERR,
-				"subnet_acl: Missing CIDR at line %d", line_num);
-			fclose(fp);
-			return -1;
-		}
-
-		/* Parse subnet */
-		if (parse_subnet(cidr, &subnet) != 0) {
-			mosquitto_log_printf(MOSQ_LOG_ERR,
-				"subnet_acl: Invalid CIDR '%s' at line %d", cidr, line_num);
-			fclose(fp);
-			return -1;
-		}
-
-		/* Find or create user */
-		user = find_or_create_user_acl(pdata, username);
-		if (user == NULL) {
-			mosquitto_log_printf(MOSQ_LOG_ERR,
-				"subnet_acl: Max users (%d) exceeded at line %d", MAX_USERS, line_num);
-			fclose(fp);
-			return -1;
-		}
-
-		/* Add to appropriate list */
-		if (strcmp(action, "allow") == 0) {
-			if (user->allow_count >= MAX_SUBNETS_PER_USER) {
-				mosquitto_log_printf(MOSQ_LOG_ERR,
-					"subnet_acl: Max allow subnets (%d) exceeded for user '%s' at line %d",
-					MAX_SUBNETS_PER_USER, user->username, line_num);
-				fclose(fp);
-				return -1;
-			}
-			user->allow_subnets[user->allow_count] = subnet;
-			user->allow_count++;
-
-			mosquitto_log_printf(MOSQ_LOG_DEBUG,
-				"subnet_acl: User '%s' allow subnet %s",
-				user->username, cidr);
-
-		} else { /* deny */
-			if (user->deny_count >= MAX_SUBNETS_PER_USER) {
-				mosquitto_log_printf(MOSQ_LOG_ERR,
-					"subnet_acl: Max deny subnets (%d) exceeded for user '%s' at line %d",
-					MAX_SUBNETS_PER_USER, user->username, line_num);
-				fclose(fp);
-				return -1;
-			}
-			user->deny_subnets[user->deny_count] = subnet;
-			user->deny_count++;
-
-			mosquitto_log_printf(MOSQ_LOG_DEBUG,
-				"subnet_acl: User '%s' deny subnet %s",
-				user->username, cidr);
-		}
-	}
-
-	fclose(fp);
-
-	/* Log summary */
-	for (int i = 0; i < pdata->user_count; i++) {
-		user_acl_t *user = &pdata->users[i];
-		if (user->allow_count > 0 || user->deny_count > 0) {
-			mosquitto_log_printf(MOSQ_LOG_INFO,
-				"subnet_acl: User '%s' has %d allow and %d deny subnet rules",
-				user->username, user->allow_count, user->deny_count);
-		}
-	}
-
-	mosquitto_log_printf(MOSQ_LOG_NOTICE,
-		"subnet_acl: Loaded subnet restrictions for %d user(s)", pdata->user_count);
-
-	return 0;
-}
-
-/* Find user ACL entry */
-static const user_acl_t* find_user_acl(const plugin_data_t *pdata, const char *username)
-{
-	for (int i = 0; i < pdata->user_count; i++) {
-		if (strcmp(pdata->users[i].username, username) == 0)
-			return &pdata->users[i];
-	}
-	return NULL;
-}
-
-/* Check subnet access on authentication (connection time)
- * Returns: MOSQ_ERR_SUCCESS if allowed, MOSQ_ERR_AUTH if denied
- */
-static int check_subnet_on_auth(plugin_data_t *pdata, struct mosquitto_evt_basic_auth *ed)
-{
-	const user_acl_t *user_acl;
-	const char *client_address;
-
-	/* Skip if no subnet config loaded */
-	if (pdata == NULL || pdata->user_count == 0)
-		return MOSQ_ERR_SUCCESS;
-
-	/* Skip anonymous users */
-	if (ed->username == NULL)
-		return MOSQ_ERR_SUCCESS;
-
-	/* Find user's subnet ACL */
-	user_acl = find_user_acl(pdata, ed->username);
-
-	/* If user not in config or has no subnet rules, allow */
-	if (user_acl == NULL || (user_acl->allow_count == 0 && user_acl->deny_count == 0))
-		return MOSQ_ERR_SUCCESS;
-
-	/* Get client IP address */
-	client_address = mosquitto_client_address(ed->client);
-	if (client_address == NULL) {
-		mosquitto_log_printf(MOSQ_LOG_WARNING,
-			"subnet_acl: Could not get client address for user '%s', denying connection",
-			ed->username);
-		return MOSQ_ERR_AUTH;
-	}
-
-	/* Check deny list first - deny takes precedence */
-	if (user_acl->deny_count > 0) {
-		if (ip_in_subnet_list(client_address, user_acl->deny_subnets, user_acl->deny_count)) {
-			mosquitto_log_printf(MOSQ_LOG_NOTICE,
-				"subnet_acl: User '%s' from %s DENIED by deny rule",
-				ed->username, client_address);
-			return MOSQ_ERR_AUTH;
-		}
-	}
-
-	/* If there are allow rules, IP must match one of them */
-	if (user_acl->allow_count > 0) {
-		if (ip_in_subnet_list(client_address, user_acl->allow_subnets, user_acl->allow_count)) {
-			mosquitto_log_printf(MOSQ_LOG_DEBUG,
-				"subnet_acl: User '%s' from %s allowed by allow rule",
-				ed->username, client_address);
-			return MOSQ_ERR_SUCCESS;
-		} else {
-			mosquitto_log_printf(MOSQ_LOG_NOTICE,
-				"subnet_acl: User '%s' from %s DENIED (not in allowed subnets)",
-				ed->username, client_address);
-			return MOSQ_ERR_AUTH;
-		}
-	}
-
-	/* No subnet rules for this user - allow */
-	return MOSQ_ERR_SUCCESS;
-}
-
-#ifdef ENABLE_PAM_SUPPORT
-static int pam_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
-{
-	int i;
-	const char *pass = (const char *)appdata_ptr;
-
-	*resp = calloc(num_msg, sizeof(struct pam_response));
-	if (*resp == NULL) {
-		mosquitto_log_printf(MOSQ_LOG_ERR, "pam failed to allocate buffer for validation");
-		return PAM_BUF_ERR;
-	}
-
-	if (pass == NULL)
-		return PAM_SUCCESS;
-
-	for (i = 0; i < num_msg; ++i) {
-		if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF) {
-			(*resp)[i].resp = strdup(pass);
-			if ((*resp)[i].resp == NULL) {
-				for (int j = 0; j < i ; j++)
-					free((*resp)[j].resp);
-
-				free(*resp);
-				*resp = NULL;
-				mosquitto_log_printf(MOSQ_LOG_ERR, "pam failed in strdup");
-				return PAM_BUF_ERR;
-			}
-		}
-	}
-	return PAM_SUCCESS;
-}
-
-static int process_pam_auth_callback(struct mosquitto_evt_basic_auth *ed)
-{
-	struct pam_conv conv;
-	int retval;
-	pam_handle_t *pamh = NULL;
-
-	conv.conv = pam_conversation;
-	conv.appdata_ptr = (void *)ed->password;
-
-	retval = pam_start("mosquitto", ed->username, &conv, &pamh);
-	if (retval != PAM_SUCCESS) {
-		mosquitto_log_printf(MOSQ_LOG_ERR, "pam start failed: %s", pam_strerror(pamh, retval));
-		return MOSQ_ERR_AUTH;
-	}
-
-	retval = pam_authenticate(pamh, 0);
-	pam_end(pamh, retval);
-	if (retval == PAM_SUCCESS) {
-		mosquitto_log_printf(MOSQ_LOG_NOTICE, "pam user [%s] logged in", ed->username);
-		return MOSQ_ERR_SUCCESS;
-	}
-
-	mosquitto_log_printf(MOSQ_LOG_NOTICE, "pam user [%s] failed authentication, err [%s]", ed->username, pam_strerror(pamh, retval));
-	return MOSQ_ERR_AUTH;
-}
-#else
-static int process_shadow_auth_callback(struct mosquitto_evt_basic_auth *ed)
-{
-	struct spwd spbuf, *sp = NULL;
-	char buf[256];
-	struct crypt_data data;
-	char *hash;
-
-	getspnam_r(ed->username, &spbuf, buf, sizeof(buf), &sp);
-
-	if (sp == NULL || sp->sp_pwdp == NULL)
-		return MOSQ_ERR_AUTH;
-
-	/* Empty string as hash means password is not required */
-	if (sp->sp_pwdp[0] == 0)
-		return MOSQ_ERR_SUCCESS;
-
-	if (ed->password == NULL)
-		return MOSQ_ERR_AUTH;
-
-	memset(&data, 0, sizeof(data));
-	hash = crypt_r(ed->password, sp->sp_pwdp, &data);
-
-	if (hash == NULL)
-		return MOSQ_ERR_AUTH;
-
-	if (strcmp(hash, sp->sp_pwdp) == 0)
-		return MOSQ_ERR_SUCCESS;
-
-	return MOSQ_ERR_AUTH;
-}
-#endif
-
-static int basic_auth_callback(int event, void *event_data, void *userdata)
-{
-	struct mosquitto_evt_basic_auth *ed = event_data;
-	plugin_data_t *pdata = userdata;
-	int auth_result;
-
-	/* Let other plugins or broker decide about anonymous login */
-	if (ed->username == NULL)
-		return MOSQ_ERR_PLUGIN_DEFER;
-
-	/* First check username/password authentication */
-#ifdef ENABLE_PAM_SUPPORT
-	auth_result = process_pam_auth_callback(ed);
-#else
-	auth_result = process_shadow_auth_callback(ed);
-#endif
-
-	/* If authentication failed, reject immediately */
-	if (auth_result != MOSQ_ERR_SUCCESS)
-		return auth_result;
-
-	/* Authentication succeeded, now check subnet restrictions */
-	return check_subnet_on_auth(pdata, ed);
-}
-
-static int reload_callback(int event, void *event_data, void *userdata)
-{
-	plugin_data_t *pdata = userdata;
-
-	if (pdata == NULL)
-		return MOSQ_ERR_SUCCESS;
-
-	mosquitto_log_printf(MOSQ_LOG_NOTICE,
-		"subnet_acl: Reloading subnet ACL configuration from '%s'",
-		pdata->config_file ? pdata->config_file : "(none)");
-
-	/* Reload subnet ACL configuration */
-	if (load_subnet_acl_config(pdata, pdata->config_file) != 0) {
-		mosquitto_log_printf(MOSQ_LOG_ERR,
-			"subnet_acl: Failed to reload subnet ACL configuration, keeping old config");
-		return MOSQ_ERR_UNKNOWN;
-	}
-
-	mosquitto_log_printf(MOSQ_LOG_NOTICE,
-		"subnet_acl: Reload complete, now tracking %d user(s)", pdata->user_count);
-
-	return MOSQ_ERR_SUCCESS;
-}
-
-int mosquitto_plugin_version(int supported_version_count,
-			     const int *supported_versions)
-{
-	return 5;
-}
-
-int mosquitto_plugin_init(mosquitto_plugin_id_t *identifier,
-			  void **user_data,
-			  struct mosquitto_opt *opts, int opt_count)
-{
-	plugin_data_t *pdata;
-	const char *config_file = NULL;
-	int rc;
-
-	/* Find subnet config file option */
-	for (int i = 0; i < opt_count; i++) {
-		if (strcmp(opts[i].key, "subnet_acl_file") == 0) {
-			config_file = opts[i].value;
-			break;
-		}
-	}
-
-	pdata = calloc(1, sizeof(plugin_data_t));
-	if (pdata == NULL)
-		return MOSQ_ERR_NOMEM;
-
-	pdata->identifier = identifier;
-
-	/* Store config file path for reload */
-	if (config_file != NULL) {
-		pdata->config_file = strdup(config_file);
-		if (pdata->config_file == NULL) {
-			free(pdata);
-			return MOSQ_ERR_NOMEM;
-		}
-	} else {
-		pdata->config_file = NULL;
-	}
-
-	/* Load subnet ACL configuration */
-	if (load_subnet_acl_config(pdata, config_file) != 0) {
-		free(pdata->config_file);
-		free(pdata);
-		return MOSQ_ERR_UNKNOWN;
-	}
-
-	/* Register authentication callback only - subnet check is done during auth */
-	rc = mosquitto_callback_register(identifier, MOSQ_EVT_BASIC_AUTH,
-	                                 basic_auth_callback, NULL, pdata);
-	if (rc != MOSQ_ERR_SUCCESS) {
-		mosquitto_log_printf(MOSQ_LOG_ERR,
-			"subnet_acl: Failed to register authentication callback");
-		free(pdata->config_file);
-		free(pdata);
-		return rc;
-	}
-
-	/* Register reload callback to handle SIGHUP */
-	rc = mosquitto_callback_register(identifier, MOSQ_EVT_RELOAD,
-	                                 reload_callback, NULL, pdata);
-	if (rc != MOSQ_ERR_SUCCESS) {
-		mosquitto_log_printf(MOSQ_LOG_ERR,
-			"subnet_acl: Failed to register reload callback");
-		mosquitto_callback_unregister(identifier, MOSQ_EVT_BASIC_AUTH,
-		                              basic_auth_callback, NULL);
-		free(pdata->config_file);
-		free(pdata);
-		return rc;
-	}
-
-	mosquitto_log_printf(MOSQ_LOG_INFO,
-		"subnet_acl: Plugin initialized with %d user(s)", pdata->user_count);
-
-	/* Only assign user_data after all possible error paths */
-	*user_data = pdata;
-
-	return MOSQ_ERR_SUCCESS;
-}
-
-int mosquitto_plugin_cleanup(void *user_data,
-			     struct mosquitto_opt *opts, int opt_count)
-{
-	plugin_data_t *pdata = user_data;
-
-	if (pdata) {
-		mosquitto_callback_unregister(pdata->identifier, MOSQ_EVT_BASIC_AUTH,
-		                              basic_auth_callback, NULL);
-		mosquitto_callback_unregister(pdata->identifier, MOSQ_EVT_RELOAD,
-		                              reload_callback, NULL);
-		free(pdata->config_file);
-		free(pdata);
-	}
-
-	return MOSQ_ERR_SUCCESS;
-}

mosquitto-auth-shadow/Makefile

@@ -13,42 +13,33 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=mosquitto-auth-plugin
-PKG_VERSION:=1.2.1
+PKG_NAME:=mosquitto-auth-shadow
+PKG_VERSION:=1.0.1
 
 PKG_MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
 PKG_LICENSE:=EPL-2.0
 
 PKG_BUILD_PARALLEL:=1
-PKG_CONFIG_DEPENDS:=CONFIG_MOSQUITTO_AUTH_PAM_SUPPORT
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/mosquitto-auth-plugin
+define Package/mosquitto-auth-shadow
   SECTION:=net
   CATEGORY:=Network
   TITLE:=mosquitto - /etc/shadow authentication plugin
-  DEPENDS:=+mosquitto-ssl +MOSQUITTO_AUTH_PAM_SUPPORT:libpam
+  DEPENDS:=+mosquitto-ssl
   USERID:=mosquitto=200:mosquitto=200 mosquitto=200:shadow=11
 endef
 
-define Package/mosquitto-auth-plugin/description
+define Package/mosquitto-auth-shadow/description
   Plugin for the mosquitto MQTT message broker that authenticates
   users using /etc/shadow
 endef
 
-define Package/mosquitto-auth-plugin/config
-	source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_MOSQUITTO_AUTH_PAM_SUPPORT),y)
-TARGET_CFLAGS+=-DENABLE_PAM_SUPPORT
-endif
-
-define Package/mosquitto-auth-plugin/install
+define Package/mosquitto-auth-shadow/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto_auth_plugin.so $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto_auth_shadow.so $(1)/usr/lib/
 	$(CP) ./files/* $(1)/
 endef
 
-$(eval $(call BuildPackage,mosquitto-auth-plugin))
+$(eval $(call BuildPackage,mosquitto-auth-shadow))