map-agent: wait ap-autoconfig when MLO

Don't generate APs early - just wait
ap-autoconfig.

bbfdm/Config_bbfdmd.in

@@ -2,9 +2,13 @@ if PACKAGE_bbfdmd
 
 config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
-	default "X_IOWRT_EU_"
+	default "X_IOPSYS_EU_"
 
 config BBF_OBFUSCATION_KEY
 	string "Obfuscation key"
 	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
+
+config BBF_MAX_OBJECT_INSTANCES
+	int "Maximum number of instances per object"
+	default 255
 endif

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.15.29
+PKG_VERSION:=1.12.26
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=08cf6a9725b34c0421f2ee8f762aa1878b8cca1f
+PKG_SOURCE_VERSION:=811f0616c6a861c9b78d5a079a0f79f3eb0b23b2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -19,8 +19,6 @@ endif
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-RSTRIP:=true
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include bbfdm.mk
@@ -70,13 +68,8 @@ define Package/bbfdmd/config
 	source "$(SOURCE)/Config_bbfdmd.in"
 endef
 
-# Below config is a hack to force-recompile dependent micro-services
-define Package/libbbfdm-api/config
-	if PACKAGE_bbfdmd
-		config BBF_LIBBBFDM_VERSION
-			string "Internal config variable to force recompile"
-			default "v${PKG_VERSION}"
-	endif
+define Package/bbf_configmngr/config
+	source "$(SOURCE)/bbf_configmngr.in"
 endef
 
 define Package/libbbfdm-api/description
@@ -107,14 +100,12 @@ endif
 
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBFDMD_MAX_MSG_LEN:Integer=10485760 \
-	-DCMAKE_BUILD_TYPE:String="Debug" \
-
+	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES) \
+	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
 
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/lib/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
 
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
@@ -142,7 +133,6 @@ define Package/bbfdmd/install
 
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/bbfdmd
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
@@ -155,10 +145,6 @@ define Package/bbfdmd/install
 	
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/ruleng.bbfdm $(1)/etc/uci-defaults
-
-	$(INSTALL_DIR) $(1)/etc/ruleng
-	$(INSTALL_BIN) ./files/etc/ruleng/bbfdm.json $(1)/etc/ruleng
 endef
 
 define Package/dm-service/install
@@ -167,22 +153,22 @@ define Package/dm-service/install
 
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-service/dm-service $(1)/usr/sbin/
-
-	$(BBFDM_REGISTER_SERVICES) -v ${CONFIG_BBF_VENDOR_PREFIX} ./bbfdm_service.json $(1) core
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdm/libcore.so $(1) core
 endef
 
 define Package/bbf_configmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/bbfdm/
+ifeq ($(CONFIG_BBF_CONFIGMNGR_C_BACKEND),y)
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts
-
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/bbf_configd
-
 	$(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_DIR) $(1)/usr/share/bbfdm/scripts
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
+endif
+ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.config $(1)/usr/libexec/rpcd/bbf.config
+endif
 	$(INSTALL_DATA) ./files/etc/bbfdm/critical_services.json $(1)/etc/bbfdm/
 endef
 
@@ -196,17 +182,11 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api/legacy
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api/version-2
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-ubus
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/*.h $(1)/usr/include/libbbfdm-api/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/*.h $(1)/usr/include/libbbfdm-api/legacy/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/*.h $(1)/usr/include/libbbfdm-api/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/*.h $(1)/usr/include/libbbfdm-api/version-2/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-ubus/bbfdm-ubus.h $(1)/usr/include/libbbfdm-ubus/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/include/*.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/usr/lib
 endef
 

bbfdm/bbf_configmngr.in

@@ -0,0 +1,19 @@
+if PACKAGE_bbf_configmngr
+choice
+	prompt "Select backend daemon for bbf.config"
+	default BBF_CONFIGMNGR_C_BACKEND
+	help
+		Select which backend daemon should be used for ubus bbf.config
+
+config BBF_CONFIGMNGR_SCRIPT_BACKEND
+	bool "Use shell script backend"
+	help
+		Enable this option to use shell script as the backend for bbf.config. This can be useful for quick and easy scripting of configuration tasks.
+
+config BBF_CONFIGMNGR_C_BACKEND
+	bool "Use C code backend"
+	help
+		Enable this option to use a C code implementation as the backend for bbf.config. This option is generally preferred for performance-critical tasks and scenarios requiring more robust and efficient handling.
+
+endchoice
+endif

bbfdm/bbfdm.mk

@@ -6,7 +6,6 @@ BBFDM_BASE_DM_PATH=/usr/share/bbfdm
 BBFDM_INPUT_PATH=/etc/bbfdm/micro_services
 BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-PKG_CONFIG_DEPENDS += CONFIG_BBF_LIBBBFDM_VERSION
 #BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile)
 #BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools
 
@@ -48,6 +47,7 @@ BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p
 # Note:
 # - There could be only one main plugin file, so its bind to PKG_NAME
 # - Micro-service input.json will be auto generated with this call
+# - Use -u (optional argument) to overwrite ubus object name
 #
 # Example:
 #  BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME)
@@ -88,5 +88,27 @@ BBFDM_INSTALL_MS_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -m -p
 #
 BBFDM_INSTALL_SCRIPT:=$(BBFDM_DIR)/tools/bbfdm.sh -s
 
+# Deprecated functions errors
+define BbfdmInstallPluginInMicroservice
+	$(warning # BbfdmInstallPluginInMicroservice function is deprecated, use BBFDM_INSTALL_MS_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)
+	$(INSTALL_DATA) $(2) $(1)/
+endef
 
-BBFDM_REGISTER_SERVICES:=$(BBFDM_DIR)/tools/bbfdm.sh -t
+define BbfdmInstallMicroServiceInputFile
+	$(warning # function BbfdmInstallMicroServiceInputFile deprecated, input file auto generated with BBFDM_INSTALL_MS_DM #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/micro_services
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/micro_services/$(PKG_NAME).json
+endef
+
+define BbfdmInstallPlugin
+	$(warning # function BbfdmInstallPlugin deprecated, use BBFDM_INSTALL_CORE_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
+endef
+
+define BbfdmInstallPluginWithPriority
+	$(warning # fucntion BbfdmInstallPluginWithPriority deprecated, use BBFDM_INSTALL_CORE_PLUGIN #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(3) $(1)/etc/bbfdm/plugins/$(2)_$(shell basename ${3})
+endef

bbfdm/bbfdm_service.json

@@ -1,54 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "core",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "LANConfigSecurity"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "Schedules"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "Security",
-        "proto": "cwmp"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "PacketCaptureDiagnostics"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "SelfTestDiagnostics"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "Syslog"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "{BBF_VENDOR_PREFIX}OpenVPN",
-        "proto": "usp"
-      },	  
-      {
-        "parent_dm": "Device.",
-        "object": "RootDataModelVersion"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "Reboot()"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "FactoryReset()"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

bbfdm/files/etc/bbfdm/critical_services.json

@@ -3,17 +3,15 @@
 			"firewall",
 			"network",
 			"dhcp",
-			"time",
 			"wireless",
-			"ieee1905",
-			"mapcontroller",
-			"mosquitto",
-			"nginx"
+			"time"
 	],
 	"cwmp": [
 			"firewall",
 			"network",
 			"dhcp",
+			"stunc",
+			"xmpp",
 			"wireless",
 			"time"
 	]

bbfdm/files/etc/init.d/bbf_configd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=80
-STOP=07
+STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbf_configd

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

@@ -1,12 +1,12 @@
 #!/bin/sh /etc/rc.common
 
 START=60
-STOP=05
+STOP=8
 
 USE_PROCD=1
 PROG=/usr/sbin/dm-service
 
-BBFDM_MICROSERVICE_DIR="/etc/bbfdm/services"
+BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
 
 . /usr/share/libubox/jshn.sh
 
@@ -24,7 +24,7 @@ validate_bbfdm_micro_service_section()
 _add_microservice()
 {
 	local name path loglevel
-	local enable enable_core unified_daemon
+	local enable enable_core
 
 	# Check enable from micro-service
 	path="${1}"
@@ -41,14 +41,9 @@ _add_microservice()
 		log "datamodel micro-service ${name} not enabled"
 		return 0
 	fi
-
-	json_get_var unified_daemon unified_daemon 0
-	if [ "${unified_daemon}" -eq "1" ]; then
-		return 0
-	fi
-
+	
 	json_select config
-	json_get_var loglevel loglevel 4
+	json_get_var loglevel loglevel 3
 
 	procd_open_instance "${name}"
 

bbfdm/files/etc/init.d/bbfdmd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=97
-STOP=06
+STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
@@ -17,7 +17,7 @@ validate_bbfdm_bbfdmd_section()
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enable:bool:true' \
 		'debug:bool:false' \
-		'loglevel:uinteger:4'
+		'loglevel:uinteger:3'
 }
 
 configure_bbfdmd()

bbfdm/files/etc/ruleng/bbfdm.json

@@ -1,62 +0,0 @@
-{
-	"hosts_refresh": {
-		"if" : [
-			{
-				"event": "host"
-			}
-		],
-		"then" : [
-			{
-				"object": "bbfdm.hostmngr",
-				"method":"refresh_references_db",
-				"args" : {},
-				"timeout": 1
-			}
-		]
-	},
-	"dhcp_refresh": {
-		"if" : [
-			{
-				"event": "host"
-			}
-		],
-		"then" : [
-			{
-				"object": "bbfdm.dhcpmngr",
-				"method":"refresh_references_db",
-				"args" : {},
-				"timeout": 1
-			}
-		]
-	},
-	"ieee1905_refresh_add": {
-		"if" : [
-			{
-				"event": "ieee1905.neighbor.add"
-			}
-		],
-		"then" : [
-			{
-				"object": "bbfdm.ieee1905",
-				"method":"refresh_references_db",
-				"args" : {},
-				"timeout": 1
-			}
-		]
-	},
-	"ieee1905_refresh_del": {
-		"if" : [
-			{
-				"event": "ieee1905.neighbor.del"
-			}
-		],
-		"then" : [
-			{
-				"object": "bbfdm.ieee1905",
-				"method":"refresh_references_db",
-				"args" : {},
-				"timeout": 1
-			}
-		]
-	}
-}

bbfdm/files/etc/uci-defaults/96-sysctl-translation

@@ -51,6 +51,10 @@ parse_bbfdm_sysctl_conf_file() {
 
 	# Replace the original file with the modified content
 	mv "$tmpfile" "${bbfdm_sysctl_conf}"
+
+	# Apply the changes
+	uci commit network
+	sysctl -e -p "${bbfdm_sysctl_conf}" >&-
 }
 
 parse_bbfdm_sysctl_conf_file

bbfdm/files/etc/uci-defaults/ruleng.bbfdm

@@ -1,2 +0,0 @@
-uci -q set ruleng.bbfdm=rule
-uci -q set ruleng.bbfdm.recipe='/etc/ruleng/bbfdm.json'

bbfdm/tools/bbfdm.sh

@@ -2,19 +2,18 @@
 
 BBFDM_BASE_DM_PATH="usr/share/bbfdm"
 BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
-INPUT_FILE="0"
+INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"3"}}}'
+OUT_NAME=""
 
 MICRO_SERVICE=0
 SCRIPT=0
 DIAG=0
 PLUGIN=0
 DEST=""
-VENDOR_EXTN=""
 TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 SRC=""
-EXTRA_DATA=""
 
-while getopts ":mpsdtv:" opt; do
+while getopts ":mpsdu:" opt; do
 	case ${opt} in
 	  m)
 	  	MICRO_SERVICE=1
@@ -28,11 +27,8 @@ while getopts ":mpsdtv:" opt; do
 	  d)
 	  	DIAG=1
 		;;
-	  t)
-	  	INPUT_FILE=1
-		;;
-	  v)
-	  	VENDOR_EXTN=${OPTARG}
+	  u)
+	  	OUT_NAME="${OPTARG}"
 		;;
 	  ?)
 	  	echo "Invalid option: ${OPTARG}"
@@ -47,9 +43,6 @@ shift
 DEST="${1}"
 shift
 DATA="${1}"
-shift
-EXTRA_DATA="${1}"
-
 
 install_bin() {
 	if ! install -m0755 ${1} ${2}; then
@@ -96,10 +89,6 @@ bbfdm_install_dm()
 		minfile=$(mktemp)
 		jq -c 'del(..|.description?)' ${src} > ${minfile}
 
-		if [ -n "${VENDOR_EXTN}" ]; then
-			sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${minfile}
-		fi
-
 		src=${minfile}
 		if dpkg -s python3-jsonschema >/dev/null 2>&1; then
 			echo "Verifying bbfdm Datamodel JSON file"
@@ -119,6 +108,23 @@ bbfdm_install_dm()
 	fi
 }
 
+bbfdm_generate_input()
+{
+	local dest ser
+
+	dest_dir=${1}
+	ser=${2}
+	dest=${dest_dir}/${ser}.json
+
+	if [ -n "${OUT_NAME}" ]; then
+		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" --arg OUT "${OUT_NAME}" '.daemon |= (.service_name = $service |.output.name = $OUT)' > ${dest}
+	else
+		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" '.daemon.service_name = $service' > ${dest}
+	fi
+
+	chmod 466 ${dest}
+}
+
 if [ -z "$SRC" ] || [ -z "${DEST}" ] ; then
 	echo "# BBFDM Null value in src[${SRC}], dest[${DEST}]"
 	exit 1
@@ -135,40 +141,6 @@ if [ "${SCRIPT}" -eq "1" ]; then
 	exit 0
 fi
 
-if [ "${INPUT_FILE}" -eq "1" ]; then
-
-	tempfile=""
-	if [ ! -f "${SRC}" ]; then
-		echo "# Datamodel Input file ${SRC} not available"
-		exit 1
-	fi
-
-	if ! cat ${SRC} |jq >/dev/null 2>&1; then
-		echo "# Invalid datamodel json input file"
-		exit 1
-	fi
-
-	service_name="$(cat ${SRC}|jq -r '.daemon.service_name')"
-	if [ -z "${service_name}" ]; then
-		echo "# service_name not defined in service json ...."
-		exit 1
-	fi
-
-	tempfile=$(mktemp)
-	cp ${SRC} ${tempfile}
-	if [ -n "${VENDOR_EXTN}" ]; then
-		sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${tempfile}
-	fi
-
-	install_dir ${DEST}/etc/bbfdm/services
-	install_data ${tempfile} ${DEST}/etc/bbfdm/services/${service_name}.json
-
-	if [ -f "${tempfile}" ]; then
-		rm ${tempfile}
-	fi
-	exit 0
-fi
-
 if [ "${MICRO_SERVICE}" -eq "1" ]; then
 	if [ -z "${DATA}" ]; then
 		echo "# service_name[${DATA}] not provided"
@@ -179,21 +151,24 @@ if [ "${MICRO_SERVICE}" -eq "1" ]; then
 		extn="$(basename ${SRC})"
 		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services
 		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}.${extn##*.}
+
+		# main micro-service datamodel plugin, create an input file as well
+		install_dir ${DEST}/${BBFDM_INPUT_PATH}
+		bbfdm_generate_input ${DEST}/${BBFDM_INPUT_PATH}/ ${DATA}
 	else
 		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}
-		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(printf "%02d" ${EXTRA_DATA})$(basename ${SRC})
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(basename ${SRC})
 	fi
 else
 	if [ "${PLUGIN}" -eq "1" ]; then
-		echo "# WARNING: BBFDM_INSTALL_CORE_PLUGIN macro will be deprecated soon. Please use BBFDM_INSTALL_MS_PLUGIN macro instead, specifying 'core' as micro-service name #"
 		priority="${DATA:-0}"
-		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/plugins
 
 		if [ "${priority}" -gt "0" ]; then
 			# install with priority if defined
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core/${priority}_$(basename ${SRC})
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/${priority}_$(basename ${SRC})
 		elif [ "${priority}" -eq "0" ]; then
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core/$(basename ${SRC})
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC})
 		else
 			echo "# Priority should be an unsigned integer"
 			exit 1

blkpg-part/Makefile

@@ -1,45 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2025 IOPSYS Software Solutions AB
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=blkpg-part
-PKG_VERSION:=1
-PKG_RELEASE:=1
-PKG_SOURCE_VERSION:=5a4ec5f53ed904b37fba03f3797fbe2af3077f8d
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/gportay/blkpg-part.git
-PKG_MIRROR_HASH:=skip
-
-PKG_MAINTAINER:=Andreas Gnau <andreas.gnau@iopsys.eu>
-PKG_LICENSE:=LGPL-2.1-or-later
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-MAKE_INSTALL_FLAGS += PREFIX=/usr
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Disc
-  TITLE:=User space partition table and disk geometry handling utility
-  URL:=https://www.portay.io/blkpg-part/
-endef
-
-define Package/$(PKG_NAME)/description
-  blkpg-part creates temporary partitions that are not part of the GPT/MBR.
-  It makes a partition block device from any consecutive blocks that are
-  not partitioned. It creates, resizes and deletes partitions on the fly
-  without writing back the changes to the partition table.
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkpg-part $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

bridgemngr/Config.in

@@ -1,5 +1,7 @@
 if PACKAGE_bridgemngr
 
+menu "Configuration"
+
 config BRIDGEMNGR_BRIDGE_VLAN
 	bool "Use bridge-vlan backend"
 	help
@@ -11,7 +13,5 @@ config BRIDGEMNGR_BRIDGE_VENDOR_EXT
 	help
 	   Set this option to use bridge BBF vendor extensions.
 
-config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX
-	string "Package specific datamodel Vendor Prefix for TR181 extensions"
-	default ""
+endmenu
 endif

bridgemngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.0.7
 
 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
-PKG_SOURCE_VERSION:=99bc3a3a0a2571917eda7085c21952f779fdb471
+PKG_SOURCE_VERSION:=4f22b4a4270c8d9b94b9de6f5cbe2a1dd86a3027
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -40,31 +40,18 @@ endef
 
 MAKE_PATH:=src
 
-ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
-VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
-else
-VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX)
-endif
-
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 
 ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
 	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
 endif
 
 define Package/bridgemngr/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-
-	$(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
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME)
 endif
-
-	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/
-	$(INSTALL_DATA) ./files/etc/config/bridging $(1)/etc/config/
 endef
 
 ifeq ($(LOCAL_DEV),1)

bridgemngr/bbfdm_service.json

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

bridgemngr/files/etc/config/bridging

@@ -1,33 +0,0 @@
-#L2 filter UCI file
-
-config chain 'qos_output'
-	option target 'qos_output'
-	option table 'nat'
-	option chain 'OUTPUT'
-	option policy 'RETURN'
-
-config chain 'dscp2pbits'
-	option target 'dscp2pbits'
-	option table 'broute'
-	option chain 'BROUTING'
-	option policy 'RETURN'
-
-config chain 'qos'
-	option target 'qos'
-	option table 'broute'
-	option chain 'BROUTING'
-	option policy 'RETURN'
-
-config chain 'prevlanxlate'
-	option target 'prevlanxlate'
-	option table 'broute'
-	option chain 'BROUTING'
-	option policy 'RETURN'
-	option append 'false'
-
-config chain 'mcsnooping'
-	option target 'mcsnooping'
-	option table 'broute'
-	option chain 'BROUTING'
-	option policy 'RETURN'
-	option append 'false'

bridgemngr/files/etc/init.d/bridging

@@ -1,93 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-# Start after bdmf shell, wanconf, and switch-script but before the network-script
-START=20
-STOP=10
-
-USE_PROCD=1
-
-. /lib/functions.sh
-
-handle_ebtables_chain() {
-	local sid="$1"
-	local table
-	local chain
-	local target
-	local policy
-	local append
-	local enabled
-	local ret
-
-	config_get table "$sid" table filter
-	config_get chain "$sid" chain
-	config_get policy "$sid" policy RETURN
-	config_get target "$sid" target
-	config_get_bool append "$sid" append 1
-	config_get_bool enabled "$sid" enabled 1
-
-	[ "$enabled" = "0" ] && return
-	[ -z "${chain}" -o -z "${target}" ] && return
-
-	if [ "$append" != "0" ]; then
-		append="-A"
-	else
-		append="-I"
-	fi
-
-	ebtables --concurrent -t "$table" -N "$target" -P "$policy" 2> /dev/null
-	ret=$?
-
-	if [ $ret -eq 0 ]; then
-		ebtables --concurrent -t "$table" ${append} "$chain" -j "$target"
-	else
-		ebtables --concurrent -t "$table" -D "$chain" -j "$target"
-		ebtables --concurrent -t "$table" ${append} "$chain" -j "$target"
-	fi
-}
-
-handle_ebtables_rule() {
-	local sid="$1"
-	local table
-	local chain
-	local target
-	local match
-	local value
-	local enabled
-	local ret
-
-	config_get table "$sid" table filter
-	config_get chain "$sid" chain
-	config_get match "$sid" match
-	config_get value "$sid" value
-	config_get target "$sid" target RETURN
-	config_get_bool append "$sid" append 1
-	config_get_bool enabled "$sid" enabled 1
-
-	[ "$enabled" = "0" ] && return
-	[ -z "${chain}" -o -z "${target}" ] && return
-
-	if [ "$append" != "0" ]; then
-		append="-A"
-	else
-		append="-I"
-	fi
-
-	ebtables --concurrent -t "$table" -D "$chain" ${match} -j "$target" ${value} 2> /dev/null
-	ebtables --concurrent -t "$table" ${append} "$chain" ${match} -j "$target" ${value}
-}
-
-start_service() {
-	config_load bridging
-	config_foreach handle_ebtables_chain chain
-	config_foreach handle_ebtables_rule rule
-}
-
-reload_service() {
-	stop
-	start
-}
-
-
-service_triggers() {
-	procd_add_reload_trigger bridging
-}

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.20
+PKG_VERSION:=2.1.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=a5e57962938ca143ede65d92be90b6e9fce66e15
+PKG_SOURCE_VERSION:=93c9e87cb9f8f635cece1473cff6f67cff9ff7c0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -54,8 +54,6 @@ define Package/bulkdata/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
 	$(INSTALL_DATA) ./files/etc/config/bulkdata $(1)/etc/config/
 	$(INSTALL_BIN) ./files/etc/init.d/bulkdatad $(1)/etc/init.d/
-
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,bulkdata))

bulkdata/bbfdm_service.json

@@ -1,17 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "bulkdata",
-    "unified_daemon": true,
-    "proto": "cwmp",
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "BulkData"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

bulkdata/files/etc/config/bulkdata

@@ -1,6 +1,6 @@
 
 config bulkdata 'bulkdata'
 	option enable '0'
-	#Log levels: As per syslog 0-7, default 6=>LOG_INFO
-	option loglevel '3'
+	#Log levels: Error=1, Warning=2, Info=3, Debug=4
+	option log_level '3'
 

bulkdata/files/etc/init.d/bulkdatad

@@ -6,20 +6,9 @@ STOP=10
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
-validate_global_section() {
-	uci_validate_section bulkdata bulkdata bulkdata \
-	    'enable:bool:1' \
-	    'loglevel:uinteger:3'
-}
-
 start_service() {
-	local enable loglevel
-
-	validate_global_section
-
 	procd_open_instance "bulkdata"
 	procd_set_param command "$PROG"
-	procd_append_param command -l ${loglevel}
 	procd_set_param respawn
 	procd_close_instance "bulkdata"
 }

ddnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.11
+PKG_VERSION:=1.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
-PKG_SOURCE_VERSION:=9f2f4dabc71c4f405b1c5df576d20d793d299e94
+PKG_SOURCE_VERSION:=5144e73fad92d23ae706894a4357436c3fe89355
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -71,7 +71,6 @@ ifeq ($(CONFIG_DDNSMNGR_BACKEND_INADYN),y)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/inadyn/server/* $(1)/etc/ddnsmngr/servers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/inadyn/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
 endif
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1) $(PKG_NAME)
 endef
 

ddnsmngr/bbfdm_service.json

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

decollector/Makefile

@@ -1,23 +1,22 @@
 #
-# Copyright (C) 2021-2024 IOPSYS Software Solutions AB
-# Copyright (C) 2025 Genexis AB
+# Copyright (C) 2021-2023 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.2.1.3
+PKG_VERSION:=6.1.0.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=40b6d6183a282bb8f48b3cf554691f54b5928ecf
+PKG_SOURCE_VERSION:=37669ed8365397d65656f11a04f6af8cae57607c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 
 PKG_LICENSE:=BSD-3-Clause

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.7.7
+PKG_VERSION:=3.7.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=289a91b3e7f221f16c976efd147bd4b203420b41
+PKG_SOURCE_VERSION:=393dfd7637fdeccc24ef286c3daec9a232896b98
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -56,14 +56,11 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/dspg
+	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
-ifeq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./firmware/common/* $(1)/etc/dspg/
-endif
 	$(CP) ./files/etc/* $(1)/etc/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dect $(1)/lib/upgrade/keep.d/dect
 endef

dectmngr/files/etc/config/dect

@@ -1,6 +1,3 @@
 config dect 'global'
-	option log_dect_cmbs 'syslog'
-	option log_level 'realtime,warning,error'
-
-config dect 'base'
-	option enable '1'
+ 	option log_dect_cmbs 'syslog'
+        option log_level 'realtime,warning,error'

dectmngr/files/etc/init.d/dectmngr

@@ -11,25 +11,6 @@ LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 DCX81_UART_DT_ALIAS=/proc/device-tree/aliases/dcx81-uart
 
-get_extension_shift() {
-   local dect_exts
-
-   get_dect_extension() {
-       local ext=$1
-       local type
-
-       config_get type $ext type
-
-       [ "$type" == "dect" ] && echo $ext
-    }
-
-    config_load "asterisk"
-
-    dect_exts=$(config_foreach get_dect_extension "extension" |sort |head -n1)
-
-    echo "${dect_exts#extension}"
-}
-
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	dect_pid=$(pidof $PROG)
@@ -57,53 +38,13 @@ get_dcx81_device() {
 			device_name_line="$(grep '^DEVNAME=' "$uevent_file")" || return 1
 			readonly device="/dev/${device_name_line##DEVNAME=}"
 			[ -c "$device" ] || return 1
-			printf "%s" "$(basename $device)"
+			printf "%s" "$device"
 			return 0
 		fi
 	done
 	return 1
 }
 
-check_dcx81_firmware() {
-	local dcx81_uart=$1
-	local fw_link="/lib/firmware/dcx81_firmware"
-	local fw_file
-
-	[ -L "$fw_link" ] || return
-
-	fw_file=$(readlink -f $fw_link)
-	[ -f "$fw_file" ] || return
-
-	# the symbolic link is not needed
-	rm -f $fw_link
-
-	eval $(/sbin/cmbs_tcx -comname "$dcx81_uart" -fw_version |grep DCX81_FW_Version)
-	[ -n "$DCX81_FW_Version" ] || return
-
-	if echo $(basename $fw_file) | grep -qi "$DCX81_FW_Version" ; then
-		logger -t "$PROG" "DCX81 running expected $DCX81_FW_Version"
-		return;
-	fi
-
-	logger -t "$PROG" "DCX81 firmware upgrading to $fw_file"
-	/sbin/cmbs_tcx -comname "$dcx81_uart" -fwu "$fw_file" 2>&1 >/dev/null &
-
-	echo -n "Updrading DCX81 firmware.." >/dev/console
-	local wait_time=0
-	while pidof cmbs_tcx >/dev/null && [ "$wait_time" -lt "200" ] ; do
-		sleep 5
-		wait_time=$(($wait_time + 5))
-		echo -n "." >/dev/console
-	done
-
-	if pidof cmbs_tcx >/dev/null ; then
-		killall -9 cmbs_tcx
-		logger -t "$PROG" "DCX81 firmware upgrade timeout"
-	else
-		logger -t "$PROG" "DCX81 firmware upgrade done"
-	fi
-}
-
 start_service() {
 	local opt_ext=
 	local rfpi=
@@ -118,13 +59,9 @@ start_service() {
 	local dcx81_uart_device
 	if ! dcx81_uart_device="$(get_dcx81_device)"; then
 		logger -t "$PROG" -p daemon.warning "Could not determine DCX81 UART device. Falling back to default ttyH0."
-		dcx81_uart_device="ttyH0"
+		dcx81_uart_device=/dev/ttyH0
 	fi
 
-	check_dcx81_firmware $dcx81_uart_device
-
-	opt_ext="-extensionShift $(get_extension_shift)"
-
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
 
@@ -140,27 +77,24 @@ start_service() {
 
 	config_load dect
 	config_get log_dect_cmbs global log_dect_cmbs syslog
-	config_get pcm_slot_start global pcm_slot_start
-	config_get pcm_fsync global pcm_fsync
-
-        [ -n "$pcm_fsync" ] && opt_ext="$opt_ext -sync $pcm_fsync"
-        [ -n "$pcm_slot_start" ] && opt_ext="$opt_ext -slotsShift $pcm_slot_start"
 
 	procd_open_instance
 
+	# dectmngr takes expects device without /dev
+	readonly dcx81_uart_device_wo_dev="${dcx81_uart_device##/dev/}"
 	case "$log_dect_cmbs" in
 	none)
 		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device" $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	file)
 		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device" -log $LOG_PATH/dect-cmbs.log $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -log $LOG_PATH/dect-cmbs.log $opt_ext
 		;;
 	*)
 		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device" -syslog $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -syslog $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	esac

dhcpmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
-PKG_SOURCE_VERSION:=986f66608959f4f589009d580b046e250d8c620d
+PKG_SOURCE_VERSION:=2a517188211849bcc324a9f9727eeb34d076c032
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -52,7 +52,6 @@ ifeq ($(CONFIG_DNSMNGR_BACKEND_UNBOUND),y)
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DATA) ./files/etc/uci-defaults/unbound.odhcpd.uci_default $(1)/etc/uci-defaults/16-set-unbound-as-odhcpd-leasetrigger
 endif
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdhcpmngr.so $(1) $(PKG_NAME)
 endef
 

dhcpmngr/bbfdm_service.json

@@ -1,20 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "dhcpmngr",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "DHCPv4"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "DHCPv6"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

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

@@ -10,6 +10,7 @@ uci -q get dhcp.odhcpd >/dev/null 2>&1 && {
 		[ -e /usr/lib/unbound/odhcpd.sh ] && [ -e /usr/sbin/unbound ] && {
 			# then set unbound script as leasetrigger in dhcp UCI
 			uci -q set dhcp.odhcpd.leasetrigger='/usr/lib/unbound/odhcpd.sh'
+			uci commit dhcp
 		}
 	}
 }

dnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.17
+PKG_VERSION:=1.0.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=2ceb76e98cf23a8d52ab3f464d38d62385311a87
+PKG_SOURCE_VERSION:=fb49088ddb498980e2c91f03aea10bd502caeca1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -64,15 +64,10 @@ ifeq ($(CONFIG_DNSMNGR_BACKEND_DNSMASQ),y)
 endif
 
 define Package/dnsmngr/install
-	$(INSTALL_DIR) $(1)/etc/umdns
-	$(INSTALL_DIR) $(1)/etc/umdns/tmp
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dnsmngr $(1)/lib/upgrade/keep.d/dnsmngr
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/nslookup $(1)
 ifeq ($(CONFIG_DNSMNGR_DNS_SD),y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libdns_sd.so $(1) $(PKG_NAME) 10
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libdns_sd.so $(1) $(PKG_NAME)
 endif
 endef
 

dnsmngr/bbfdm_service.json

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

dnsmngr/files/lib/upgrade/keep.d/dnsmngr

@@ -1 +0,0 @@
-/etc/umdns/*

dslmngr/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.9
+PKG_VERSION:=1.2.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -78,7 +78,6 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
 endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdsl.so $(1) $(PKG_NAME)
 endef
 

dslmngr/bbfdm_service.json

@@ -1,28 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "dslmngr",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "DSL"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "FAST"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "ATM"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "PTM"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

ebtables-extensions/Makefile

@@ -6,21 +6,21 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ebtables-extensions
-PKG_VERSION:=2.0.5
+PKG_VERSION:=2.0.1
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=5ef3a5b057f6b59a4b90bd5ca15a852b0c27f3b3
 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.gz
 PKG_MIRROR_HASH:=skip
 endif
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/ebt-vlantranslation
+define KernelPackage/vlantranslation
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables VLAN translation
   FILES:=$(PKG_BUILD_DIR)/src/ebt_vlantranslation.ko
@@ -29,7 +29,7 @@ define KernelPackage/ebt-vlantranslation
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-dscp2pbit
+define KernelPackage/dscp2pbit
   SUBMENU:=Other modules
   TITLE:=Kernel module for DSCP-to-Pbit mapping
   DEPENDS+=+kmod-ebtables
@@ -38,7 +38,7 @@ define KernelPackage/ebt-dscp2pbit
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-dhcp
+define KernelPackage/dhcp
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables DHCP snooping
   FILES:=$(PKG_BUILD_DIR)/src/ebt_dhcp.ko
@@ -47,7 +47,7 @@ define KernelPackage/ebt-dhcp
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-dhcpv6
+define KernelPackage/dhcpv6
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables DHCPv6 snooping
   FILES:=$(PKG_BUILD_DIR)/src/ebt_dhcpv6.ko
@@ -56,7 +56,7 @@ define KernelPackage/ebt-dhcpv6
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-ra
+define KernelPackage/ra
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables NDP/RA snooping
   FILES:=$(PKG_BUILD_DIR)/src/ebt_ra.ko
@@ -65,7 +65,7 @@ define KernelPackage/ebt-ra
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-dns
+define KernelPackage/dns
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables DNS manipulation
   FILES:=$(PKG_BUILD_DIR)/src/ebt_dns.ko
@@ -74,7 +74,7 @@ define KernelPackage/ebt-dns
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-pppoe_disc
+define KernelPackage/pppoe_disc
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables PPPoE manipulation
   FILES:=$(PKG_BUILD_DIR)/src/ebt_pppoe_disc.ko
@@ -83,7 +83,7 @@ define KernelPackage/ebt-pppoe_disc
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-l2pt
+define KernelPackage/l2pt
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables L2CP tunneling
   FILES:=$(PKG_BUILD_DIR)/src/ebt_l2pt.ko
@@ -92,7 +92,7 @@ define KernelPackage/ebt-l2pt
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-xtarp
+define KernelPackage/xtarp
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables extended ARP matching
   FILES:=$(PKG_BUILD_DIR)/src/ebt_xtarp.ko
@@ -101,7 +101,7 @@ define KernelPackage/ebt-xtarp
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-xtip
+define KernelPackage/xtip
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables extended IPv4 matching
   FILES:=$(PKG_BUILD_DIR)/src/ebt_xtip.ko
@@ -110,7 +110,7 @@ define KernelPackage/ebt-xtip
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-xtip6
+define KernelPackage/xtip6
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables extended IPv6 matching
   FILES:=$(PKG_BUILD_DIR)/src/ebt_xtip6.ko
@@ -119,77 +119,53 @@ define KernelPackage/ebt-xtip6
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-igmpsnooping
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables IGMP snooping
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_igmpsnooping.ko
-  DEPENDS+=+kmod-ebtables
-  # AUTOLOAD:=$(call AutoLoad,30,ebt_igmpsnooping) - Will be loaded on demand
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-mldsnooping
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables MLD snooping
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_mldsnooping.ko
-  DEPENDS+=+kmod-ebtables
-  # AUTOLOAD:=$(call AutoLoad,30,ebt_mldsnooping) - Will be loaded on demand
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-dhcp/description
+define KernelPackage/dhcp/description
 	Kernel module to enable DHCP snooping for ebtables
 endef
 
-define KernelPackage/ebt-dhcpv6/description
+define KernelPackage/dhcpv6/description
 	Kernel module to enable DHCPv6 snooping for ebtables
 endef
 
-define KernelPackage/ebt-ra/description
+define KernelPackage/ra/description
 	Kernel module to enable NDP/RA snooping for ebtables
 endef
 
-define KernelPackage/ebt-dns/description
+define KernelPackage/dns/description
 	Kernel module to enable DNS manipulation for ebtables
 endef
 
-define KernelPackage/ebt-pppoe_disc/description
+define KernelPackage/pppoe_disc/description
 	Kernel module to enable PPPoE manipulation for ebtables
 endef
 
-define KernelPackage/ebt-l2pt/description
+define KernelPackage/l2pt/description
 	Kernel module to enable L2CP tunneling for ebtables
 endef
 
-define KernelPackage/ebt-xtarp/description
+define KernelPackage/xtarp/description
 	Kernel module to enable extended ARP matching for ebtables
 endef
 
-define KernelPackage/ebt-xtip/description
+define KernelPackage/xtip/description
 	Kernel module to enable extended IPv4 matching for ebtables
 endef
 
-define KernelPackage/ebt-xtip6/description
+define KernelPackage/xtip6/description
 	Kernel module to enable extended IPv6 matching for ebtables
 endef
 
-define KernelPackage/ebt-vlantranslation/description
+define KernelPackage/vlantranslation/description
 	Kernel module to enable VLAN translation for ebtables
 endef
 
-define KernelPackage/ebt-dscp2pbit/description
+define KernelPackage/dscp2pbit/description
 	Kernel module to enable DSCP-to-Pbit mapping for ebtables
 endef
 
-define KernelPackage/ebt-igmpsnooping/description
-	Kernel module to enable IGMP snooping for ebtables
-endef
-
-define KernelPackage/ebt-mldsnooping/description
-	Kernel module to enable MLD snooping for ebtables
-endef
-
--include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+endif
 
 define Build/Prepare
 
@@ -211,8 +187,6 @@ endif
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtarp.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip6.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_igmpsnooping.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_mldsnooping.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
 endef
 
 define Build/InstallDev
@@ -230,10 +204,9 @@ endif
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtarp.h $(1)/include/uapi/linux/netfilter_bridge/
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip.h $(1)/include/uapi/linux/netfilter_bridge/
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip6.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_igmpsnooping.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_mldsnooping.h $(1)/include/uapi/linux/netfilter_bridge/
 endef
 
+KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
 ifeq ($(CONFIG_TARGET_airoha),y)
   KERNEL_MAKE_FLAGS += PLATFORM="ECONET"
 endif
@@ -242,16 +215,14 @@ define Build/Compile
 	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src" modules
 endef
 
-$(eval $(call KernelPackage,ebt-vlantranslation))
-$(eval $(call KernelPackage,ebt-dscp2pbit))
-$(eval $(call KernelPackage,ebt-dhcp))
-$(eval $(call KernelPackage,ebt-dhcpv6))
-$(eval $(call KernelPackage,ebt-ra))
-$(eval $(call KernelPackage,ebt-dns))
-$(eval $(call KernelPackage,ebt-pppoe_disc))
-$(eval $(call KernelPackage,ebt-l2pt))
-$(eval $(call KernelPackage,ebt-xtarp))
-$(eval $(call KernelPackage,ebt-xtip))
-$(eval $(call KernelPackage,ebt-xtip6))
-$(eval $(call KernelPackage,ebt-igmpsnooping))
-$(eval $(call KernelPackage,ebt-mldsnooping))
+$(eval $(call KernelPackage,vlantranslation))
+$(eval $(call KernelPackage,dscp2pbit))
+$(eval $(call KernelPackage,dhcp))
+$(eval $(call KernelPackage,dhcpv6))
+$(eval $(call KernelPackage,ra))
+$(eval $(call KernelPackage,dns))
+$(eval $(call KernelPackage,pppoe_disc))
+$(eval $(call KernelPackage,l2pt))
+$(eval $(call KernelPackage,xtarp))
+$(eval $(call KernelPackage,xtip))
+$(eval $(call KernelPackage,xtip6))

ethmngr/Config.in

@@ -2,16 +2,8 @@ if (PACKAGE_ethmngr)
 
 menu "Configurations"
 
-config ETHMNGR_MACVLAN_EXTENSION
-	bool "Enable datamodel MACVLAN vendor extension"
+config TR181_VENDOR_EXTENSIONS_MACVLAN
+	bool "Use TR181 vendor extension MACVLAN"
 	default y
-
-config ETHMNGR_EXPOSE_ETHERNET_OBJECT
-	bool "Expose ethernet ubus object to fetch and clear interface stats"
-	default y
-
-config ETHMNGR_VENDOR_PREFIX
-	string "Package specific datamodel Vendor Prefix for TR181 extensions"
-	default ""
 endmenu
 endif

ethmngr/Makefile

@@ -5,29 +5,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=3.0.7
+PKG_VERSION:=2.1.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
-PKG_SOURCE_VERSION:=171cf63d972c6fa81b97281531e457a0967c16c7
+PKG_SOURCE_VERSION:=2d35e86cc8dfd7ef4e0d8579f5d314e90faadc90
+PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
-
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
+include ../bbfdm/bbfdm.mk
 
 define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +libblobmsg-json +libjson-c +libc +libubus
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
 define Package/ethmngr/description
@@ -40,39 +41,39 @@ define Package/$(PKG_NAME)/config
        source "$(SOURCE)/Config.in"
 endef
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-ifeq ($(CONFIG_ETHMNGR_VENDOR_PREFIX),"")
-VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
-else
-VENDOR_PREFIX = $(CONFIG_ETHMNGR_VENDOR_PREFIX)
-endif
-
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-        $(CP) -rf ~/git/ethmngr/* $(PKG_BUILD_DIR)/
+        $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE \
+	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 
-ifeq ($(CONFIG_ETHMNGR_MACVLAN_EXTENSION),y)
-TARGET_CFLAGS += -DETHMNGR_MACVLAN_EXTENSION
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN
 endif
 
-ifeq ($(CONFIG_ETHMNGR_EXPOSE_ETHERNET_OBJECT),y)
-TARGET_CFLAGS += -DETHMNGR_EXPOSE_ETHERNET_OBJECT
+ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
+define Build/Compile
+endef
 endif
 
 define Package/ethmngr/install
 	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/ethmngr
+	$(INSTALL_DIR) $(1)/etc/ethmngr/plugins
+ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
+endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfethernet.so $(1) $(PKG_NAME)
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libbbfethernetmacvlan.so $(1) $(PKG_NAME)
+endif
 endef
 
 $(eval $(call BuildPackage,ethmngr))

ethmngr/bbfdm_service.json

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

ethmngr/files/etc/hotplug.d/ethernet/ethport-deprecated-ubus-event

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+[ -n "$PORT" -a -n "$LINK" ] || exit 0
+
+case "$PORT" in
+	# do not generate ethport ubus event
+	# for wifi, dsl and brige devices
+	wl*|wds*|atm*|ptm*|br-*)
+		exit 0
+	;;
+esac
+
+speed=0
+duplex=full
+
+if [ "$LINK" = "up" ]; then
+	devspeed="$(ubus -t 2 call network.device status "{\"name\":\"$PORT\"}" | jsonfilter -e @.speed)"
+	speed=${devspeed:0:-1}
+	duplex=${devspeed:0-1}
+	[ "$duplex" == "H" ] && duplex="half" || duplex="full"
+fi
+
+ubus send ethport "{\"ifname\":\"$PORT\",\"link\":\"$LINK\",\"speed\":\"$speed\",\"duplex\":\"$duplex\"}"

ethmngr/files/etc/init.d/ethmngr

@@ -1,17 +1,28 @@
 #!/bin/sh /etc/rc.common
 
-START=80
+START=15
 STOP=90
 
 USE_PROCD=1
 PROG=/usr/sbin/ethmngr
 
+. /lib/functions.sh
+include /lib/ethernet
+
 start_service() {
 	if [ -f $PROG ]; then
-		procd_open_instance "ethmngr"
+		procd_open_instance
 		procd_set_param command ${PROG}
-		procd_append_param command -l 3
 		procd_set_param respawn
-		procd_close_instance "ethmngr"
+		procd_close_instance
 	fi
 }
+
+reload_service() {
+        stop
+        start
+}
+
+service_triggers() {
+	procd_add_reload_trigger network
+}

ethmngr/files/etc/ruleng/ethport.json

@@ -2,10 +2,7 @@
 	"ethport_update": {
 		"if" : [
 			{
-				"event": "network.device",
-				"match": {
-					"wireless": false
-				}
+				"event": "network.device"
 			}
 		],
 		"then" : [

firewallmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.9
+PKG_VERSION:=1.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
-PKG_SOURCE_VERSION:=77ad8425b73a3ac63f6160dc217635394ac87907
+PKG_SOURCE_VERSION:=2cac05871f7a8d93c144157c5f3f129deecf1a29
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -29,7 +29,7 @@ define Package/firewallmngr
   CATEGORY:=Network
   TITLE:=Package to add Device.Firewall and Device.NAT. data model support.
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +firewall
-  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-trigger
+  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:kmod-ipt-trigger +FIREWALLMNGR_PORT_TRIGGER:kmod-ip6t-trigger
   DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-nfqueue
   DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
@@ -69,7 +69,6 @@ endif
 	$(INSTALL_BIN) ./files/firewall.service $(1)/etc/
 	$(INSTALL_DATA) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/
 
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
 endef
 

firewallmngr/bbfdm_service.json

@@ -1,20 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "firewallmngr",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "Firewall"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "NAT"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

firewallmngr/files/firewall.portmap

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

firewallmngr/files/firewall.service

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

firewallmngr/files/port-trigger/etc/init.d/port-trigger

@@ -7,11 +7,7 @@ USE_PROCD=1
 . /lib/port-trigger/port_trigger.sh
 
 start_service() {
-	port_trigger_add
-}
-
-stop_service() {
-	port_trigger_clean
+	port_trigger_handling
 }
 
 service_triggers()
@@ -21,6 +17,5 @@ service_triggers()
 }
 
 reload_service() {
-	stop
 	start
 }

firewallmngr/files/port-trigger/lib/port-trigger/port_trigger.sh

@@ -119,12 +119,18 @@ process_port_trigger() {
 	fi
 }
 
-port_trigger_add() {
+port_trigger_handling() {
 	rm /tmp/port_trigger_iptables 2> /dev/null
 	rm /tmp/port_trigger_ip6tables 2> /dev/null
 	touch /tmp/port_trigger_iptables
 	touch /tmp/port_trigger_ip6tables
 
+	echo "iptables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "iptables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "iptables -w -t nat -F prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "ip6tables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+	echo "ip6tables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+
 	echo "iptables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	ret=$?
 	[ $ret -eq 0 ] && echo "iptables -w -t nat -I PREROUTING -j prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
@@ -133,7 +139,7 @@ port_trigger_add() {
 	[ $ret -eq 0 ] && echo "iptables -w -t filter -I forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	echo "iptables -w -t nat -N prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	ret=$?
-	[ $ret -eq 0 ] && echo "iptables -w -t nat -A prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	[ $ret -eq 0 ] && echo "iptables -w -t nat -I prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 
 	echo "ip6tables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
 	ret=$?
@@ -149,21 +155,3 @@ port_trigger_add() {
 	sh /tmp/port_trigger_iptables
 	sh /tmp/port_trigger_ip6tables
 }
-
-port_trigger_clean() {
-	iptables -w -t nat -D PREROUTING -j prerouting_porttrigger 2> /dev/null
-	iptables -w -t nat -F prerouting_porttrigger 2> /dev/null
-	iptables -w -t nat -X prerouting_porttrigger 2> /dev/null
-	iptables -w -t nat -D prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null
-	iptables -w -t nat -F prerouting_wan_porttrigger 2> /dev/null
-	iptables -w -t nat -X prerouting_wan_porttrigger 2> /dev/null
-	iptables -w -t filter -D forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null
-	iptables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null
-	iptables -w -t filter -X forwarding_wan_porttrigger 2> /dev/null
-	ip6tables -w -t nat -D PREROUTING -j prerouting_porttrigger 2> /dev/null
-	ip6tables -w -t nat -F prerouting_porttrigger 2> /dev/null
-	ip6tables -w -t nat -X prerouting_porttrigger 2> /dev/null
-	ip6tables -w -t filter -D forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null
-	ip6tables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null
-	ip6tables -w -t filter -X forwarding_wan_porttrigger 2> /dev/null
-}

fluent-bit/Config.in

@@ -1,5 +0,0 @@
-config FLUENT_BIT_SYSLOG_PREPEND_LENGTH
-    bool "Enable syslog length prefix (RFC5424)"
-    default y
-    help
-      If enabled, prepends the byte-length of the syslog message to the message output.

fluent-bit/Makefile

@@ -1,19 +1,18 @@
 #
-# Copyright (C) 2024-2025 IOPSYS
+# Copyright (C) 2024 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
-PKG_VERSION:=4.0.2
+PKG_VERSION:=3.1.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL_FILE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/refs/tags/
-PKG_HASH:=aa0577ba7251081c8d5398b2a905b5b0585bb657ca13b39a5e12931437516f08
+PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/v$(PKG_VERSION)
+PKG_HASH:=7a49e110cf3050b6c29c911063494b8081f3c743274d1d95e52562d0476ba1eb
 endif
 
 PKG_LICENSE:=Apache-2.0
@@ -24,7 +23,7 @@ include $(INCLUDE_DIR)/cmake.mk
 
 define Package/fluent-bit
 	CATEGORY:=Utilities
-	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison +libstdcpp +@OPENSSL_WITH_NPN
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison
 	TITLE:=Fluent-Bit
 	URL:=https://fluentbit.io/
 endef
@@ -33,10 +32,6 @@ define Package/fluent-bit/description
 	Fluent Bit is a super fast, lightweight, and highly scalable logging and metrics processor and forwarder.
 endef
 
-define Package/$(PKG_NAME)/config
-        source "$(SOURCE)/Config.in"
-endef
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ./fluent-bit/* $(PKG_BUILD_DIR)/
@@ -50,23 +45,16 @@ CMAKE_OPTIONS+= \
 	-DFLB_RELEASE=Yes \
 	-DFLB_SMALL=No \
 	-DEXCLUDE_FROM_ALL=true \
-	-DFLB_SHARED_LIB=Yes \
+	-DFLB_SHARED_LIBS=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=No
 
-ifeq ($(CONFIG_FLUENT_BIT_SYSLOG_PREPEND_LENGTH),y)
-  CMAKE_OPTIONS += -DFLUENT_BIT_SYSLOG_PREPEND_LENGTH=Yes
-else
-  CMAKE_OPTIONS += -DFLUENT_BIT_SYSLOG_PREPEND_LENGTH=No
-endif
-
 # In plugins
 CMAKE_OPTIONS += \
 	-DFLB_IN_SYSLOG=Yes \
@@ -112,7 +100,7 @@ CMAKE_OPTIONS += \
 
 
 # Filter options
-CMAKE_OPTIONS += \
+CMAKE_OPTIONS += 
 	-DFLB_FILTER_AWS=No \
 	-DFLB_FILTER_ECS=No \
 	-DFLB_FILTER_KUBERNETES=No \
@@ -150,7 +138,6 @@ CMAKE_OPTIONS += \
 	-DFLB_OUT_ES=No \
 	-DFLB_OUT_GELF=No \
 	-DFLB_OUT_INFLUXDB=No \
-	-DFLB_OUT_KAFKA=No \
 	-DFLB_OUT_NRLOGS=No \
 	-DFLB_OUT_OPENSEARCH=No \
 	-DFLB_OUT_TD=No \
@@ -180,7 +167,6 @@ CMAKE_OPTIONS += \
 define Package/fluent-bit/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/fluent-bit
-	$(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

fluent-bit/patches/0003-prepend_number_in_syslog_output.patch

@@ -1,71 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72b950e7b..58e76b349 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -205,6 +205,9 @@ option(FLB_CUSTOM_CALYPTIA     "Enable Calyptia Support"      Yes)
- # Config formats
- option(FLB_CONFIG_YAML         "Enable YAML config format"    Yes)
- 
-+# out syslog message format
-+option(FLUENT_BIT_SYSLOG_PREPEND_LENGTH      "Enable prepending of length to syslog message" Yes)
-+
- # List of plugins available and defaults for each option
- include(cmake/plugins_options.cmake)
- 
-diff --git a/plugins/out_syslog/CMakeLists.txt b/plugins/out_syslog/CMakeLists.txt
-index 556d8e1a4..a848020e9 100644
---- a/plugins/out_syslog/CMakeLists.txt
-+++ b/plugins/out_syslog/CMakeLists.txt
-@@ -1,3 +1,7 @@
-+if(FLUENT_BIT_SYSLOG_PREPEND_LENGTH)
-+  add_definitions(-DFLUENT_BIT_SYSLOG_PREPEND_LENGTH)
-+endif()
-+
- set(src
-   syslog.c
-   syslog_conf.c)
-diff --git a/plugins/out_syslog/syslog.c b/plugins/out_syslog/syslog.c
-index 4ecc7c4ac..f85c38b51 100644
---- a/plugins/out_syslog/syslog.c
-+++ b/plugins/out_syslog/syslog.c
-@@ -156,7 +156,7 @@ static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
-             return NULL;
-         }
-         *s = tmp;
--        return *s;
-+        goto finalize;
-     }
- 
-     prival = (msg->facility << 3) + msg->severity;
-@@ -291,6 +291,31 @@ static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
-         *s = tmp;
-     }
- 
-+finalize:
-+#ifdef FLUENT_BIT_SYSLOG_PREPEND_LENGTH
-+    // Create new SDS with length prefix
-+    // Allocate enough space for "%u "
-+    flb_sds_t prefix = flb_sds_create_size(32);
-+    if (!prefix) {
-+        return NULL;
-+    }
-+
-+    unsigned int msg_len = flb_sds_len(*s);
-+    prefix = flb_sds_printf(&prefix, "%u ", msg_len);
-+    if (!prefix) {
-+        return NULL;
-+    }
-+
-+    flb_sds_t new_s = flb_sds_cat(prefix, *s, msg_len);
-+    if (!new_s) {
-+        flb_sds_destroy(prefix);
-+        return NULL;
-+    }
-+
-+    flb_sds_destroy(*s);
-+    *s = new_s;
-+#endif
-+
-     return *s;
- }
- 

gateway-info/Makefile

@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2025 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the BSD-3-Clause
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gateway-info
-PKG_VERSION:=1.0.2
-
-LOCAL_DEV:=0
-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.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk
-
-define Package/gateway-info
-  CATEGORY:=Utilities
-  TITLE:=GatewayInfo Data Model Support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +umdns
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +iputils-arping
-endef
-
-define Package/gateway-info/description
-	Package to add Device.GatewayInfo. data model support.
-endef
-
-MAKE_PATH:=src
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) ~/git/gateway-info/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/gateway-info/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
-	$(INSTALL_DIR) $(1)/etc/bbfdm/services
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/micro_services
-	$(INSTALL_DATA) ./files/etc/config/gateway $(1)/etc/config/gateway
-	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_gateway_info.user $(1)/etc/udhcpc.user.d/udhcpc_gateway_info.user
-	$(INSTALL_BIN) ./files/etc/uci-defaults/86-set-gateway-device-info $(1)/etc/uci-defaults/
-	$(BBFDM_REGISTER_SERVICES) ./files/bbfdm_service.json $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libgwinfo.so $(1) $(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,gateway-info))

gateway-info/files/bbfdm_service.json

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

gateway-info/files/etc/config/gateway

@@ -1,4 +0,0 @@
-config global 'global'
-	option enable '1'
-	option wan_interface 'wan'
-	option lan_interface 'lan'

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

@@ -1,288 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-convert_to_hex() {
-	local val=""
-	local optval="${1}"
-	OPTIND=1
-	while getopts ":" opt "-$optval"
-	do
-		temp=$(printf "%02X" "'${OPTARG:-:}")
-		val="${val}:${temp}"
-	done
-
-	echo "${val}"
-}
-
-configure_send_op125() {
-	local sendopt="${1}"
-	local intf="${2}"
-	local uci="${3}"
-	local hex_oui=""
-	local hex_serial=""
-	local hex_class=""
-	local oui_len=0
-	local serial_len=0
-	local class_len=0
-
-	if [ "${uci}" = "network" ]; then
-		local opt125="125:00:00:0D:E9"
-	else
-		if [ -z "${sendopt}" ]; then
-			local opt125="125,00:00:0D:E9"
-		else
-			local opt125=":00:00:0D:E9"
-		fi
-	fi
-
-	config_get oui cpe manufacturer_oui ""
-	if [ -z "${oui}" ]; then
-		oui=$(db -q get device.deviceinfo.ManufacturerOUI)
-	fi
-
-	oui=$(echo "${oui}" | tr 'a-f' 'A-F')
-
-	config_get serial cpe serial_number ""
-	if [ -z "${serial}" ]; then
-		serial=$(db -q get device.deviceinfo.SerialNumber)
-	fi
-
-	config_get class cpe product_class ""
-	if [ -z "${class}" ]; then
-		class=$(db -q get device.deviceinfo.ProductClass)
-	fi
-
-	oui_len=$(echo -n "${oui}" | wc -m)
-	serial_len=$(echo -n "${serial}" | wc -m)
-	class_len=$(echo -n "${class}" | wc -m)
-
-	if [ "${oui_len}" -eq 0 ] || [ "${serial_len}" -eq 0 ]; then
-		return 0
-	fi
-
-	opt125_len=$((oui_len + serial_len + class_len))
-	if [ "${class_len}" -gt 0 ]; then
-		opt125_len=$((opt125_len + 6))
-	else
-		opt125_len=$((opt125_len + 4))
-	fi
-
-	hex_opt125_len=$(printf "%02X" "${opt125_len}")
-	opt125="${opt125}:${hex_opt125_len}"
-	hex_oui=$(convert_to_hex "${oui}")
-	if [ -z "${hex_oui}" ]; then
-		return 0
-	fi
-
-	hex_oui_len=$(printf "%02X" "${oui_len}")
-	if [ "${uci}" = "network" ]; then
-		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
-	else
-		opt125="${opt125}:04:${hex_oui_len}${hex_oui}"
-	fi
-
-	hex_serial=$(convert_to_hex "${serial}")
-	if [ -z "${hex_serial}" ]; then
-		return 0
-	fi
-
-	hex_serial_len=$(printf "%02X" "${serial_len}")
-	if [ "${uci}" = "network" ]; then
-		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
-	else
-		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
-	fi
-
-	if [ "${class_len}" -gt 0 ]; then
-		hex_class=$(convert_to_hex "${class}")
-		if [ -z "${hex_class}" ]; then
-			return 0
-		fi
-
-		hex_class_len=$(printf "%02X" "${class_len}")
-		if [ "${uci}" = "network" ]; then
-			opt125="${opt125}:03:${hex_class_len}${hex_class}"
-		else
-			opt125="${opt125}:06:${hex_class_len}${hex_class}"
-		fi
-	fi
-
-
-	if [ "${uci}" = "network" ]; then
-		new_send_opt="$sendopt $opt125"
-		uci -q set network."${intf}".sendopts="$new_send_opt"
-	else
-		new_send_opt="$sendopt$opt125"
-		uci -q add_list dhcp."${intf}".dhcp_option="$new_send_opt"
-	fi
-}
-
-check_for_suboptions() {
-	# Check if option 4 and 5 present inside enterprise id 3561
-	data=$(echo "${1}" | sed 's/://g')
-	len=$(printf "${data}"|wc -c)
-
-	rem_len="${len}"
-	while [ $rem_len -gt 8 ]; do
-		subopt_present=0
-
-		ent_id="${data:0:8}"
-		ent_id=$(printf "%d\n" "0x$ent_id")
-		if [ $ent_id -ne 3561 ]; then
-			len_val=${data:8:2}
-			data_len=$(printf "%d\n" "0x$len_val")
-			# add 4 byte for ent_id and 1 byte for len
-			data_len=$(( data_len * 2 + 10 ))
-			# move ahead data to next enterprise id
-			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - data_len ))
-			continue
-		fi
-
-		# read the length of enterprise data
-		len_val=${data:8:2}
-		data_len=$(printf "%d\n" "0x$len_val")
-		# add 4 byte for ent_id and 1 byte for len
-		data_len=$(( data_len * 2 + 10 ))
-
-		len_val=${data:8:2}
-		opt_len=$(printf "%d\n" "0x$len_val")
-		if [ $opt_len -eq 0 ]; then
-			echo ${subopt_present}
-			return 0
-		fi
-
-		# populate the option data of enterprise id
-		sub_data_len=$(( opt_len * 2))
-		# starting 10 means ahead of length field
-		sub_data=${data:10:"${sub_data_len}"}
-
-		# parsing of suboption of option 125
-		while [ $sub_data_len -gt 0 ]; do
-			# get the suboption id
-			sub_opt_id=${sub_data:0:2}
-			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
-			case "${sub_opt_id}" in
-			"4") subopt_present=1
-			;;
-			"5") subopt_present=1
-			;;
-			esac
-
-			if [ ${subopt_present} -eq 1 ]; then
-				break;
-			fi
-
-			# get the length of suboption
-			sub_opt_len=${sub_data:2:2}
-			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
-			sub_opt_len=$(( sub_opt_len * 2 ))
-
-			# add 2 bytes for sub_opt id and sub_opt len field
-			sub_opt_end=$(( sub_opt_len + 4 ))
-
-			# update the remaining sub option hex string length
-			sub_data_len=$((sub_data_len - sub_opt_end))
-
-			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
-		done
-
-		if [ ${subopt_present} -eq 1 ]; then
-			break;
-		else
-			# move ahead data to next enterprise id
-			rem_len=$(( rem_len - $data_len ))
-			data=${data:"${data_len}":"${rem_len}"}
-		fi
-	done
-
-	echo ${subopt_present}
-}
-
-enable_dhcp_option125() {
-	local wan="${1}"
-	local reqopts="$(uci -q get network."${wan}".reqopts)"
-	local sendopts="$(uci -q get network."${wan}".sendopts)"
-	local proto="$(uci -q get network."${wan}".proto)"
-	local newreqopts=""
-	local newsendopts=""
-	local req125_present=0
-	local send125_present=0
-	local opt125="125:"
-
-	for ropt in $reqopts; do
-		case $ropt in
-			125) req125_present=1 ;;
-			*) ;;
-		esac
-	done
-
-	for sopt in $sendopts; do
-		if [[ "$sopt" == "$opt125"* ]]; then
-			send125_present=1
-			break
-		fi
-	done
-
-	if [ "${proto}" = "dhcp" ]; then
-		if [ ${req125_present} -eq 0 ]; then
-			newreqopts="$reqopts 125"
-			uci -q set network."${wan}".reqopts="$newreqopts"
-		fi
-
-		if [ ${send125_present} -eq 0 ]; then
-			configure_send_op125 "${sendopts}" "${wan}" "network"
-		fi
-	fi
-}
-
-enable_dnsmasq_option125() {
-	local lan="${1}"
-	local send125_present=0
-	local opt125="125,"
-
-	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
-	if [ "${proto}" = "server" ]; then
-		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
-		base_opt=""
-
-		for sopt in $opt_list; do
-			if [[ "$sopt" == "$opt125"* ]]; then
-				send125_present=$(check_for_suboptions "${sopt:4}")
-				base_opt="${sopt}"
-				break
-			fi
-		done
-
-		if [ ${send125_present} -eq 0 ]; then
-			uci -q del_list dhcp."${lan}".dhcp_option="${base_opt}"
-			configure_send_op125 "${base_opt}" "${lan}" "dhcp"
-		fi
-	fi
-}
-
-configure_gateway_device_info() {
-	wan_intf=""
-	lan_intf=""
-
-	config_load gateway
-	config_get_bool enable global enable '1'
-	config_get wan_intf global wan_interface "wan"
-	config_get lan_intf global lan_interface "lan"
-
-	if [ "${enable}" -eq 0 ]; then
-		return 0
-	fi
-
-	# Set dhcp_option 125 for device info if not already configured
-	enable_dhcp_option125 "${wan_intf}"
-
-	if [ "${wan_intf}" != "${lan_intf}" ]; then
-		# This is extender no need to configure gateway info
-		enable_dnsmasq_option125 "${lan_intf}"
-	fi
-}
-
-configure_gateway_device_info

gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user

@@ -1,367 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-
-CLASS=""
-OUI=""
-SERIAL=""
-GW_DISCOVERED=0
-_json_no_warning=1
-
-get_vivsoi() {
-	# opt125 environment variable has data in below format
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	# |	 enterprise-number1	  |
-	# |				  |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	# |   data-len1   |		  |
-	# +-+-+-+-+-+-+-+-+ option-data1  |
-	# /				  /
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
-	# |	 enterprise-number2	  |   ^
-	# |				  |   |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
-	# |   data-len2   |		  | optional
-	# +-+-+-+-+-+-+-+-+ option-data2  |   |
-	# /				  /   |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
-	# ~	       ...		  ~   V
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
-
-	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data	  Sub Op  SLen Data
-	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
-	# |	id    |  n  |	1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
-	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
-
-	local opt125="$1"
-	local len="$2"
-	local ent_id
-
-	#hex-string 2 character=1 Byte
-	# length in hex string will be twice of actual Byte length
-	[ "$len" -gt "8" ] || return
-
-	data="${opt125}"
-	rem_len="${len}"
-	while [ $rem_len -gt 0 ]; do
-		ent_id=${data:0:8}
-		ent_id=$(printf "%d\n" "0x$ent_id")
-
-		if [ $ent_id -ne  3561 ]; then
-			len_val=${data:8:2}
-			data_len=$(printf "%d\n" "0x$len_val")
-			# add 4 byte for ent_id and 1 byte for len
-			data_len=$(( data_len * 2 + 10 ))
-			# move ahead data to next enterprise id
-			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - $data_len ))
-			continue
-		fi
-
-		# read the length of enterprise data
-		len_val=${data:8:2}
-		data_len=$(printf "%d\n" "0x$len_val")
-		# add 4 byte for ent_id and 1 byte for len
-		data_len=$(( data_len * 2 + 10 ))
-
-		opt_len=$(printf "%d\n" "0x$len_val")
-		[ $opt_len -eq 0 ] && return
-
-		# populate the option data of enterprise id
-		sub_data_len=$(( opt_len * 2))
-		# starting 10 means ahead of length field
-		sub_data=${data:10:"${sub_data_len}"}
-
-		# parsing of suboption of option 125
-		while [ $sub_data_len -gt 0 ]; do
-			# get the suboption id
-			sub_opt_id=${sub_data:0:2}
-			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
-
-			# get the length of suboption
-			sub_opt_len=${sub_data:2:2}
-			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
-			sub_opt_len=$(( sub_opt_len * 2 ))
-
-			# get the value of sub option starting 4 means starting after length
-			sub_opt_val=${sub_data:4:${sub_opt_len}}
-
-			# assign the value found in sub option
-			case "${sub_opt_id}" in
-				"4")
-				OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				GW_DISCOVERED=1
-				;;
-				"5")
-				SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				GW_DISCOVERED=1
-				;;
-				"6")
-				CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				GW_DISCOVERED=1
-				;;
-			esac
-
-			# add 2 bytes for sub_opt id and sub_opt len field
-			sub_opt_end=$(( sub_opt_len + 4 ))
-
-			# update the remaining sub option hex string length
-			sub_data_len=$((sub_data_len - sub_opt_end))
-
-			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
-		done
-
-		# move ahead data to next enterprise id
-		data=${data:"${data_len}":"${rem_len}"}
-		rem_len=$(( rem_len - data_len ))
-	done
-}
-
-send_host_query() {
-	intf="${1}"
-	resp=1
-	loop=3
-	usp_serv_found=0
-	sent_host=" "
-
-	ubus call umdns update
-	while [ "${loop}" -ne 0 ]; do
-		sleep 5
-
-		json_load "$(ubus call umdns browse)"
-		json_select discovered_services
-		if [ "${?}" -ne 0 ]; then
-			json_cleanup
-			loop=$(( loop - 1 ))
-			continue
-		fi
-
-		json_select _usp-agt-mqtt._tcp
-		if [ "${?}" -ne 0 ]; then
-			json_cleanup
-			loop=$(( loop - 1 ))
-			continue
-		fi
-
-		usp_serv_found=1
-		break
-	done
-
-	if [ "${usp_serv_found}" -eq 0 ]; then
-		echo "${resp}"
-		return 0
-	fi
-
-	json_get_keys keys
-	for key in $keys; do
-		json_select $key
-		json_get_var _host host ""
-
-		if [ -z "${_host}" ] || [[ "${sent_host}" =~ " ${_host}" ]]; then
-			json_select ..
-			continue
-		fi
-
-		sent_host="${sent_host} ${_host}"
-		cmd="ubus call umdns query '{\"question\":\"$_host\",\"interface\":\"$intf\"}'"
-		eval $cmd
-		resp=0
-		json_select ..
-	done
-
-	json_cleanup
-	echo "${resp}"
-}
-
-get_usp_agent_id() {
-	dhcp_ip="${1}"
-	family="ipv4"
-	ID=""
-
-	if [[ "${dhcp_ip}" =~ ":" ]]; then
-		family="ipv6"
-	fi
-
-	json_load "$(ubus call umdns browse)"
-	json_select discovered_services
-	if [ "${?}" -ne 0 ]; then
-		json_cleanup
-		echo ${ID}
-		return 0
-	fi
-
-	json_select _usp-agt-mqtt._tcp
-	if [ "${?}" -ne 0 ]; then
-		json_cleanup
-		echo ${ID}
-		return 0
-	fi
-
-	json_get_keys keys
-	for key in $keys; do
-		json_select $key
-		json_select $family
-		if [ "${?}" -ne 0 ]; then
-			json_select ..
-			continue
-		fi
-
-		json_get_keys ips
-		for ip in $ips; do
-			json_get_var ip_val $ip
-			if [ "${ip_val}" != "${dhcp_ip}" ]; then
-				continue
-			fi
-
-			json_select ..
-			json_select txt
-			json_get_keys txts
-			for _txt in $txts; do
-				json_get_var text_val $_txt
-				if [[ "${text_val:0:3}" == "ID=" ]]; then
-					ID="${text_val:3}"
-					break
-				fi
-			done
-
-			break
-		done
-
-		json_select ..
-		json_select ..
-
-		if [ -n "${ID}" ]; then
-			break
-		fi
-	done
-
-	json_cleanup
-	echo ${ID}
-}
-
-get_mac_address() {
-	ip="${1}"
-	device="${2}"
-
-	mac="$(cat /proc/net/arp | grep $ip | awk '{print $4}')"
-	if [ -z "${mac}" ]; then
-		arp_resp="$(arping -b -f -c 5 -I $device $ip | grep 'Unicast reply from' | awk '{print $5}')"
-		if [ -n "${arp_resp}" ]; then
-			mac=${arp_resp:1:-1}
-		fi
-	fi
-
-	echo "${mac}"
-}
-
-send_unknown_gw_event() {
-	mac="${1}"
-
-	cmd="ubus -t 5 send gateway-info.gateway.unknown '{\"hwaddr\":\"$mac\"}'"
-	eval $cmd
-}
-
-send_cwmp_gw_event() {
-	oui="${1}"
-	class="${2}"
-	serial="${3}"
-
-	cmd="ubus -t 5 send gateway-info.gateway.cwmp '{\"oui\":\"$oui\",\"class\":\"$class\",\"serial\":\"$serial\"}'"
-	eval $cmd
-}
-
-send_usp_gw_event() {
-	endpoint="${1}"
-
-	cmd="ubus -t 5 send gateway-info.gateway.usp '{\"endpoint\":\"$endpoint\"}'"
-	eval $cmd
-}
-
-config_load gateway
-config_get_bool enable global enable '1'
-config_get wan_intf global wan_interface "wan"
-
-if [ "${enable}" -eq 0 ]; then
-	return 0
-fi
-
-if [ "${wan_intf}" == "${INTERFACE}" ]; then
-	if [ "${1}" == "deconfig" ]; then
-		rm -rf /var/state/gwinfo
-		return 0
-	fi
-
-	json_load "$(ifstatus ${INTERFACE})"
-	json_get_var dev_name device ""
-	json_select data
-	json_get_var dhcp_ip dhcpserver ""
-	json_cleanup
-
-	if [ -z "${dhcp_ip}" ] || [ -z "${dev_name}" ]; then
-		return 0
-	fi
-
-	MAC="$(get_mac_address $dhcp_ip $dev_name)"
-
-	mkdir -p /var/state
-	touch /var/state/gwinfo
-	sec=$(uci -q -c /var/state get gwinfo.gatewayinfo)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q -c /var/state add gwinfo gatewayinfo)
-		uci -q -c /var/state rename gwinfo."${sec}"="gatewayinfo"
-	fi
-
-	uci -q -c /var/state set gwinfo.gatewayinfo.hwaddr="$MAC"
-	uci -q -c /var/state set gwinfo.gatewayinfo.endpoint=""
-	uci -q -c /var/state set gwinfo.gatewayinfo.class=""
-	uci -q -c /var/state set gwinfo.gatewayinfo.oui=""
-	uci -q -c /var/state set gwinfo.gatewayinfo.serial=""
-	uci -q -c /var/state set gwinfo.gatewayinfo.proto=""
-	uci -q -c /var/state commit gwinfo
-
-	if [ -z "$opt125" ]; then
-		send_unknown_gw_event "${MAC}"
-		return 0
-	fi
-
-	len=$(printf "$opt125"|wc -c)
-	get_vivsoi "$opt125" "$len"
-
-	if [ "${GW_DISCOVERED}" -eq 0 ]; then
-		send_unknown_gw_event "${MAC}"
-		return 0
-	fi
-
-	uci -q -c /var/state set gwinfo.gatewayinfo.class="$CLASS"
-	uci -q -c /var/state set gwinfo.gatewayinfo.oui="$OUI"
-	uci -q -c /var/state set gwinfo.gatewayinfo.serial="$SERIAL"
-	uci -q -c /var/state set gwinfo.gatewayinfo.proto="CWMP"
-	uci -q -c /var/state commit gwinfo
-
-	# Check for USP parameters
-	ubus -t 15 wait_for umdns
-	if [ "${?}" -ne 0 ]; then
-		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
-		return 0
-	fi
-
-	resp=$(send_host_query $dev_name)
-	if [ "${resp}" -ne 0 ]; then
-		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
-		return 0
-	fi
-
-	ID="$(get_usp_agent_id $dhcp_ip)"
-	if [ -z "${ID}" ]; then
-		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
-		return 0
-	fi
-
-	uci -q -c /var/state set gwinfo.gatewayinfo.endpoint="$ID"
-	uci -q -c /var/state set gwinfo.gatewayinfo.proto="USP"
-	uci -q -c /var/state commit gwinfo
-
-	send_usp_gw_event "${ID}"
-fi

gryphon-led-module/Makefile

@@ -18,8 +18,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=gryphon-led-kernel-module
-PKG_VERSION:=1.0.0
-PKG_LICENSE:=GPL-2.0
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,18 +26,41 @@ define KernelPackage/$(PKG_NAME)
   SUBMENU:=LED modules
   TITLE:=LED driver for Gryphon
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
+  DEPENDS:= +(TARGET_brcmbca):bcm963xx-bsp
+  PKG_LICENSE:=GPLv2
+  PKG_LICENSE_URL:=
 endef
 
 define KernelPackage/$(PKG_NAME)/description
   This package contains the LED driver for Gryphon devices.
 endef
 
+EXTRA_KCONFIG:= CONFIG_RGB_LED=m
+
+MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
+
 # support compilation against BCM SDK kernel
--include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
+	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
+	$(CP) src/* $(PKG_BUILD_DIR)
+endef
 
 define Build/Compile
-	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
+	$(MAKE) -C "$(LINUX_DIR)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="-DKERNEL_MODULE $(BUILDFLAGS) -I$(LINUX_DIR)/include -include generated/autoconf.h $(MODULE_INCLUDE)" \
+		modules
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
 endef
 
 $(eval $(call KernelPackage,$(PKG_NAME)))

gryphon-led-module/src/main.c

@@ -28,7 +28,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/of.h>
 #include <linux/version.h>
-#include <linux/string.h>
 
 #include "sk9822.h"
 
@@ -47,6 +46,11 @@ static ssize_t get_led_color(struct device *dev,
 	int len;
 	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
 	len = scnprintf(buf, PAGE_SIZE, "%02x%02x%02x\n", sk9822->led_colors[0].r, sk9822->led_colors[0].g, sk9822->led_colors[0].b);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
@@ -69,6 +73,11 @@ static ssize_t set_led_color(struct device *dev,
 	size_t buflen = count;
 	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
 	/* strip newline */
 	if ((count > 0) && (buf[count-1] == '\n')) {
 		buflen--;
@@ -102,6 +111,11 @@ static ssize_t get_led_brightness(struct device *dev,
 	int len;
 	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
 	len = scnprintf(buf, PAGE_SIZE, "%x\n", sk9822->led_brightness);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
@@ -124,6 +138,11 @@ static ssize_t set_led_brightness(struct device *dev,
 	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 	unsigned long val = SK9822_DEFAULT_BRIGHTNESS;
 
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
 	if (kstrtoul(buf, 16, &val)) {
 		return -EINVAL;
 	}
@@ -190,33 +209,49 @@ static int canyon_led_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, leds);
 
-	leds->clock_gpio = devm_gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
+	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
+#else
+	dev_warn(&pdev->dev, "Kernel version Not supported\n");
+	exit(1);
+#endif
 	if (IS_ERR(leds->clock_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
 				PTR_ERR(leds->clock_gpio));
 		return PTR_ERR(leds->clock_gpio);
 	}
 
-	ret = gpiod_direction_output(leds->clock_gpio, 1);
-	if (ret) {
-		dev_err(&pdev->dev, "Failed to set clock GPIO output %d\n", ret);
-		return ret;
+	gpiod_direction_output(leds->clock_gpio, 1);
+	if (IS_ERR(leds->clock_gpio)) {
+		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
+				PTR_ERR(leds->clock_gpio));
+		return PTR_ERR(leds->clock_gpio);
 	} else {
 		printk(KERN_INFO "Got clock gpio\n");
 		gpiod_set_value(leds->clock_gpio, 0);
 	}
 
-	leds->data_gpio = devm_gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
+	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
+#else
+	dev_warn(&pdev->dev, "Kernel version Not supported\n");
+	exit(1);
+#endif
 	if (IS_ERR(leds->data_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
 				PTR_ERR(leds->data_gpio));
 		return PTR_ERR(leds->data_gpio);
 	}
 
-	ret = gpiod_direction_output(leds->data_gpio, 1);
-	if (ret) {
-		dev_err(&pdev->dev, "Failed to set data GPIO output %d\n", ret);
-		return ret;
+	gpiod_direction_output(leds->data_gpio, 1);
+	if (IS_ERR(leds->data_gpio)) {
+		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
+				PTR_ERR(leds->data_gpio));
+		return PTR_ERR(leds->data_gpio);
 	} else {
 		printk(KERN_INFO "Got data gpio\n");
 		gpiod_set_value(leds->data_gpio, 0);
@@ -229,31 +264,45 @@ static int canyon_led_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+#if 0
+	printk(KERN_INFO "Flash LEDs to verify they work\n");
+	sk9822_set_color_str(leds, "00FF00");
+	sk9822_update(leds);
+	msleep(200);
+	sk9822_set_color_str(leds, "000000");
+	sk9822_update(leds);
+#endif
+
 	printk(KERN_INFO "canyon led successfully probed\n");
 
 	return 0;
 }
 
-static void canyon_led_off(struct sk9822_leds *leds)
-{
-	leds->led_brightness = 0;
-	memset(leds->led_colors, 0, sizeof(cRGB) * leds->led_count);
-	sk9822_update(leds);
-}
-
 static int canyon_led_remove(struct platform_device *pdev)
 {
+	struct sk9822_leds *leds;
+
 	sysfs_remove_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
-	canyon_led_off(platform_get_drvdata(pdev));
+
+	leds = platform_get_drvdata(pdev);
+	if (IS_ERR(leds)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -1;
+	}
+
+	if (leds->clock_gpio) {
+		gpiod_put(leds->clock_gpio);
+	}
+
+	if (leds->data_gpio) {
+		gpiod_put(leds->data_gpio);
+	}
+
+	printk(KERN_NOTICE "Bye, bye\n");
 
 	return 0;
 }
 
-static void canyon_led_shutdown(struct platform_device *pdev)
-{
-	canyon_led_off(platform_get_drvdata(pdev));
-}
-
 /**
  * platform driver metadata
  */
@@ -266,7 +315,6 @@ static const struct of_device_id canyon_led_of_ids[] = {
 static struct platform_driver canyon_led = {
 	.probe = &canyon_led_probe,
 	.remove = &canyon_led_remove,
-	.shutdown = &canyon_led_shutdown,
 	.driver = {
 		.name = DRIVER_NAME,
 		.owner = THIS_MODULE,

hostmngr/Config.in

@@ -10,15 +10,6 @@ config HOSTMNGR_PLATFORM_HAS_WIFI
 	bool "Platform has WiFi"
 	default y if PACKAGE_libwifi
 
-config HOSTMNGR_DATAMODEL_EXT
-	bool "Keep vendor specific datamodel parameters"
-	default n
-
-config HOSTMNGR_VENDOR_PREFIX
-	depends on HOSTMNGR_DATAMODEL_EXT
-	string "Vendor Prefix for hostmngr datamodel extension"
-	default ""
-
 endmenu
 
 endif

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.20
+PKG_VERSION:=1.2.11
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3948618fa8fa23a0ddc51632b0036dbd08e27696
+PKG_SOURCE_VERSION:=431b122a051a28a16b430c9dcc83d26f73030f79
 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
@@ -24,7 +24,6 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
-
 define Package/hostmngr
   SECTION:=utils
   CATEGORY:=Utilities
@@ -55,15 +54,6 @@ ifeq ($(CONFIG_HOSTMNGR_PLATFORM_HAS_WIFI),y)
 TARGET_CFLAGS += -DHAS_WIFI
 endif
 
-ifeq ($(CONFIG_HOSTMNGR_DATAMODEL_EXT),y)
-TARGET_CFLAGS += -DHAS_VENDOR_EXT
-ifeq ($(CONFIG_HOSTMNGR_VENDOR_PREFIX),"")
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
-else
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_HOSTMNGR_VENDOR_PREFIX)\\\"
-endif
-endif
-
 MAKE_PATH:=src
 
 define Package/hostmngr/install
@@ -72,14 +62,7 @@ define Package/hostmngr/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/share/hostmngr
 	$(INSTALL_DATA) ./files/scripts/hosts_acl.sh $(1)/usr/share/hostmngr/
-
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1) $(PKG_NAME)
-
-ifeq ($(CONFIG_HOSTMNGR_DATAMODEL_EXT),y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostext.so $(1) $(PKG_NAME) 10
-endif
-
 endef
 
 ifeq ($(LOCAL_DEV),1)

hostmngr/bbfdm_service.json

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

hostmngr/files/scripts/hosts_acl.sh

@@ -271,14 +271,14 @@ touch $ACL_FILE
 echo "iptables -w -F hosts_forward" >> $ACL_FILE
 echo "ip6tables -w -F hosts_forward" >> $ACL_FILE
 
-hosts_ipv4_forward=$(iptables -w -t filter --list -n | grep hosts_forward)
+hosts_ipv4_forward=$(iptables -t filter --list -n | grep hosts_forward)
 if [ -z "$hosts_ipv4_forward" ]; then
 	echo "iptables -w -t filter -N hosts_forward" >> $ACL_FILE
 	ret=$?
 	[ $ret -eq 0 ] && echo "iptables -w -t filter -I FORWARD -j hosts_forward" >> $ACL_FILE
 fi
 
-hosts_ipv6_forward=$(ip6tables -w -t filter --list -n | grep hosts_forward)
+hosts_ipv6_forward=$(ip6tables -t filter --list -n | grep hosts_forward)
 if [ -z "$hosts_ipv6_forward" ]; then
 	echo "ip6tables -w -t filter -N hosts_forward" >> $ACL_FILE
 	ret=$?

icwmp/Config.in

@@ -7,16 +7,4 @@ config ICWMP_MGMT_FROM_USP
 config ICWMP_BACKUP_EVENTS
 	bool "Create backup of session events to persistent storage after each successful session"
 	default y
-
-config ICWMP_ENABLE_VENDOR_EXTN
-	bool "Enable datamodel vendor extension"
-	default y
-
-config ICWMP_VENDOR_PREFIX
-	string "Package specific datamodel Vendor Prefix for TR181 extensions"
-	default ""
-
-config ICWMP_ENABLE_SMM_SUPPORT
-	bool "Enable software module management support"
-	default n
 endmenu

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2025 IOPSYS Software Solutions AB
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the BSD-3-Clause
 # See /LICENSE for more information.
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.9.6
+PKG_VERSION:=9.8.24
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=5dba542b280495730176da468bc45ed5dcc8c94e
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_VERSION:=868abeb86c2974b3647c7f66e085808c0f296721
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -52,21 +52,6 @@ ifeq ($(CONFIG_ICWMP_BACKUP_EVENTS),y)
 EXTRA_CFLAGS += -DPERSIST_BACKUP_SESSION_EVENTS
 endif
 
-ifeq ($(CONFIG_ICWMP_ENABLE_VENDOR_EXTN),y)
-EXTRA_CFLAGS += -DICWMP_ENABLE_VENDOR_EXTN
-endif
-
-ifeq ($(CONFIG_ICWMP_ENABLE_SMM_SUPPORT),y)
-EXTRA_CFLAGS += -DICWMP_ENABLE_SMM_SUPPORT
-endif
-
-ifeq ($(CONFIG_ICWMP_VENDOR_PREFIX),"")
-CMAKE_OPTIONS += -DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)"
-else
-CMAKE_OPTIONS += -DBBF_VENDOR_PREFIX:String="$(CONFIG_ICWMP_VENDOR_PREFIX)"
-endif
-
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
@@ -87,14 +72,13 @@ define Package/icwmp/install
 	$(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/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
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libcwmpdm.so $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME) 20
+	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,icwmp))

icwmp/bbfdm_service.json

@@ -1,26 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "icwmp",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "ManagementServer"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "CWMPManagementServer",
-        "proto": "usp"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "XMPP",
-        "proto": "cwmp"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

icwmp/files/etc/config/cwmp

@@ -1,6 +1,6 @@
 config acs 'acs'
 	option userid '' #$OUI-$SER
-	option passwd ''
+	option passwd 'iopsys'
 	option periodic_inform_enable 'true'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
@@ -13,23 +13,20 @@ config acs 'acs'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
 	option skip_dhcp_boot_options '0'
-	option insecure_enable '0'
-	option get_rpc_methods '0'
 
 config cpe 'cpe'
 	option enable '1'
 	option default_wan_interface 'wan'
 	option default_lan_interface 'lan'
-	#option client_cert_path '/etc/icwmpd/client.pem'
-	#option client_key_path '/etc/icwmpd/client.key'
 	option log_to_console 'disable'
 	option log_to_file 'disable'
+	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'WARNING'
+	option log_severity 'ERROR'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
-	option passwd ''
+	option passwd 'iopsys'
 	option port '7547'
 	option provisioning_code ''
 	option amd_version '5'
@@ -42,10 +39,9 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
+	option disable_gatewayinfo '0'
 	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'
 	
 config lwn 'lwn'
 	option enable '0'

icwmp/files/etc/icwmpd/firewall.cwmp

@@ -6,24 +6,19 @@ log() {
 }
 
 get_firewall_zone() {
-	zone="$(uci show firewall|grep network|grep -w "${1}"|cut -d. -f 2)"
+	zone="$(uci show firewall|grep network|grep -w ${1}|cut -d. -f 2)"
 	zone="${zone:-wan}" # defaults to wan zone
 	echo "$zone"
 }
 
-cleanup_upstream_rules() {
-	if [ -z "${1}" ]; then
-		log "Rule can not be cleaned without zone name"
-		return
-	fi
-
-	while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
+cleanup_exiting_rules() {
+        while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
 		rule_num="$(iptables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Open_ACS_port" | head -1|awk '{print $1}')"
 		if [ -n "${rule_num}" ]; then
 			iptables -w 1 -D zone_"${1}"_input "${rule_num}";
 		fi
 	done
-	while ip6tables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
+        while ip6tables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
 		rule_num="$(ip6tables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Open_ACS_port" | head -1|awk '{print $1}')"
 		if [ -n "${rule_num}" ]; then
 			ip6tables -w 1 -D zone_"${1}"_input "${rule_num}";
@@ -31,142 +26,76 @@ cleanup_upstream_rules() {
 	done
 }
 
-cleanup_downstream_rules() {
-	if [ -z "${1}" ]; then
-		log "Rule can not be cleaned without zone name"
-		return
+enable="$(uci -q get cwmp.cpe.enable)"
+enable="${enable:-1}"
+
+if [ "$enable" -eq 0 ]; then
+	log "CWMP not enabled"
+	exit 0;
+fi
+
+wan="$(uci -q get cwmp.cpe.default_wan_interface)"
+wan="${wan:-wan}"
+
+zone_name="$(get_firewall_zone $wan)"
+
+port=$(uci -q get cwmp.cpe.port)
+port="${port:-7547}"
+
+incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|awk '{print tolower($0)}')
+incoming_rule="${incoming_rule:-port_only}"
+
+ipaddr=$(uci -c /var/state -q get icwmp.acs.ip)
+ip6addr=$(uci -c /var/state -q get icwmp.acs.ip6)
+
+cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
+cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
+
+# default incoming rule is Port only
+if [ "${incoming_rule}" = "ip_only" ]; then
+	if [ -n "${ipaddr}" ]; then
+		cmd="${cmd} -s ${ipaddr}"
 	fi
-
-	while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Close_ACS_port"; do
-		rule_num="$(iptables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Close_ACS_port" | head -1|awk '{print $1}')"
-		if [ -n "${rule_num}" ]; then
-			iptables -w 1 -D zone_"${1}"_input "${rule_num}";
-		fi
-	done
-	while ip6tables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Close_ACS_port"; do
-		rule_num="$(ip6tables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Close_ACS_port" | head -1|awk '{print $1}')"
-		if [ -n "${rule_num}" ]; then
-			ip6tables -w 1 -D zone_"${1}"_input "${rule_num}";
-		fi
-	done
-}
-
-close_downstream_acs_port() {
-	lan="${1}"
-	port="${2}"
-	zone_name="$(get_firewall_zone $lan)"
-
-	if [ -z "${zone_name}" ]; then
-		log "Rule can not be added without zone name"
-		return
+	if [ -n "${ip6addr}" ]; then
+		cmd6="${cmd6} -s ${ip6addr}"
 	fi
-
-	cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp --dport ${port} -j DROP -m comment --comment=Close_ACS_port"
-	${cmd}
-	log "Applied [${cmd}]"
-
-	cmd="ip6tables -w 1 -I zone_${zone_name}_input -p tcp --dport ${port} -j DROP -m comment --comment=Close_ACS_port"
-	${cmd}
-	log "Applied [${cmd}]"
-}
-
-add_firewall_rule() {
-	version="${1}"
-	ipaddr="${2}"
-	port="${3}"
-	zone_name="${4}"
-	cmd=""
-
-	if [ -z "${zone_name}" ]; then
-		log "Rule can not be added without zone name"
-		return
+elif [ "${incoming_rule}" = "port_only" ]; then
+	if [ -n "${port}" ]; then
+		cmd="${cmd} --dport ${port}"
+		cmd6="${cmd6} --dport ${port}"
 	fi
-
-	if [ "${version}" = "ipv6" ]; then
-		cmd="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
-	else
-		cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
-	fi
-
+else
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
 	fi
 
+	if [ -n "${ip6addr}" ]; then
+		cmd6="${cmd6} -s ${ip6addr}"
+	fi
+
 	if [ -n "${port}" ]; then
 		cmd="${cmd} --dport ${port}"
+		cmd6="${cmd6} --dport ${port}"
 	fi
+fi
 
-	if echo "${cmd}"|grep -q "\-\-dport \|\-s "; then
-		cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
-		${cmd}
-		log "Applied [${cmd}]"
-	fi
-}
+cleanup_exiting_rules "${zone_name}"
 
-configure_connection_req_rules() {
-	app="${1}"
+echo "${cmd}"|grep -q "\-\-dport \|\-s "
+if [ "$?" -eq 0 ]; then
+	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd}
+	log "Applied [${cmd}]"
+fi
 
-	wan="$(uci -q get cwmp.cpe.default_wan_interface)"
-	wan="${wan:-wan}"
+echo "${cmd6}"|grep -q "\-\-dport \|\-s "
+if [ "$?" -eq 0 ]; then
+	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd6}
+	log "Applied [${cmd6}]"
+fi
 
-	wan_zone_name="$(get_firewall_zone $wan)"
-
-	cleanup_upstream_rules "${wan_zone_name}"
-
-	lan="$(uci -q get cwmp.cpe.default_lan_interface)"
-	lan="${lan:-lan}"
-
-	if [ "${lan}" != "${wan}" ]; then
-		lan_zone_name="$(get_firewall_zone $lan)"
-		cleanup_downstream_rules "${lan_zone_name}"
-	fi
-
-	enable="$(uci -q get cwmp.cpe.enable)"
-	enable="${enable:-1}"
-
-	if [ "$enable" -eq 0 ]; then
-		exit 0
-	fi
-
-	url="$(uci -q get cwmp.acs.url)"
-	if [ -z "${url}" ]; then
-		url="$(uci -q get cwmp.acs.dhcp_url)"
-	fi
-
-	# no need to apply firewall rule, acs url not configured
-	if [ -z "${url}" ]; then
-		exit 0
-	fi
-
-	if [ -z "${app}" ]; then
-		if ! ubus -t 1 list tr069 2>/dev/null; then
-			log "cwmp client not running"
-			exit 0
-		fi
-	fi
-
-	port=$(uci -q get cwmp.cpe.port)
-	port="${port:-7547}"
-
-	ipaddr=$(uci -q get cwmp.cpe.allowed_cr_ip)
-	if [ -n "${ipaddr}" ]; then
-		for ip in $ipaddr; do
-			if echo "${ip}" | grep -q ":"; then
-				add_firewall_rule "ipv6" "${ip}" "${port}" "${wan_zone_name}"
-			else
-				add_firewall_rule "ipv4" "${ip}" "${port}" "${wan_zone_name}"
-			fi
-		done
-	else
-		# Port-only
-		add_firewall_rule "ipv6" "" "${port}" "${wan_zone_name}"
-		add_firewall_rule "ipv4" "" "${port}" "${wan_zone_name}"
-	fi
-
-	if [ "${lan}" != "${wan}" ]; then
-		# Close the ACS port at Lan side
-		close_downstream_acs_port "${lan}" "${port}"
-	fi
-}
-
-configure_connection_req_rules "$@"
+if [ -f "/var/state/icwmp" ]; then
+	uci -c /var/state -q set icwmp.cpe.firewall_restart="init"
+	uci -c /var/state -q commit icwmp
+fi

icwmp/files/etc/init.d/icwmpd

@@ -73,6 +73,231 @@ enable_dhcp_option43() {
 	fi
 }
 
+convert_to_hex() {
+	local val=""
+	local optval="${1}"
+	OPTIND=1
+	while getopts ":" opt "-$optval"
+	do
+		temp=$(printf "%02X" "'${OPTARG:-:}")
+		val="${val}:${temp}"
+	done
+
+	echo "${val}"
+}
+
+configure_send_op125() {
+	local sendopt="${1}"
+	local intf="${2}"
+	local uci="${3}"
+	local hex_oui=""
+	local hex_serial=""
+	local hex_class=""
+	local oui_len=0
+	local serial_len=0
+	local class_len=0
+
+	if [ "${uci}" = "network" ]; then
+		local opt125="125:00:00:0D:E9"
+	else
+		if [ -z "${sendopt}" ]; then
+			local opt125="125,00:00:0D:E9"
+		else
+			local opt125=":00:00:0D:E9"
+		fi
+	fi
+
+	config_get oui cpe manufacturer_oui ""
+	if [ -z "${oui}" ]; then
+		oui=$(db -q get device.deviceinfo.ManufacturerOUI)
+	fi
+
+	oui=$(echo "${oui}" | tr 'a-f' 'A-F')
+
+	config_get serial cpe serial_number ""
+	if [ -z "${serial}" ]; then
+		serial=$(db -q get device.deviceinfo.SerialNumber)
+	fi
+
+	config_get class cpe product_class ""
+	if [ -z "${class}" ]; then
+		class=$(db -q get device.deviceinfo.ProductClass)
+	fi
+
+	oui_len=$(echo -n "${oui}" | wc -m)
+	serial_len=$(echo -n "${serial}" | wc -m)
+	class_len=$(echo -n "${class}" | wc -m)
+
+	if [ "${oui_len}" -eq 0 ] || [ "${serial_len}" -eq 0 ]; then
+		return 0
+	fi
+
+	opt125_len=$((oui_len + serial_len + class_len))
+	if [ "${class_len}" -gt 0 ]; then
+		opt125_len=$((opt125_len + 6))
+	else
+		opt125_len=$((opt125_len + 4))
+	fi
+
+	hex_opt125_len=$(printf "%02X" "${opt125_len}")
+	opt125="${opt125}:${hex_opt125_len}"
+	hex_oui=$(convert_to_hex "${oui}")
+	if [ -z "${hex_oui}" ]; then
+		return 0
+	fi
+
+	hex_oui_len=$(printf "%02X" "${oui_len}")
+	if [ "${uci}" = "network" ]; then
+		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
+	else
+		opt125="${opt125}:04:${hex_oui_len}${hex_oui}"
+	fi
+
+	hex_serial=$(convert_to_hex "${serial}")
+	if [ -z "${hex_serial}" ]; then
+		return 0
+	fi
+
+	hex_serial_len=$(printf "%02X" "${serial_len}")
+	if [ "${uci}" = "network" ]; then
+		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
+	else
+		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
+	fi
+
+	if [ "${class_len}" -gt 0 ]; then
+		hex_class=$(convert_to_hex "${class}")
+		if [ -z "${hex_class}" ]; then
+			return 0
+		fi
+
+		hex_class_len=$(printf "%02X" "${class_len}")
+		if [ "${uci}" = "network" ]; then
+			opt125="${opt125}:03:${hex_class_len}${hex_class}"
+		else
+			opt125="${opt125}:06:${hex_class_len}${hex_class}"
+		fi
+	fi
+
+
+	if [ "${uci}" = "network" ]; then
+		new_send_opt="$sendopt $opt125"
+		uci -q set network."${intf}".sendopts="$new_send_opt"
+	else
+		new_send_opt="$sendopt$opt125"
+		uci -q add_list dhcp."${intf}".dhcp_option="$new_send_opt"
+	fi
+}
+
+check_for_suboptions() {
+	# Check if option 4 and 5 present inside enterprise id 3561
+	data=$(echo "${1}" | sed 's/://g')
+	len=$(printf "${data}"|wc -c)
+
+	rem_len="${len}"
+	while [ $rem_len -gt 8 ]; do
+		subopt_present=0
+
+		ent_id="${data:0:8}"
+		ent_id=$(printf "%d\n" "0x$ent_id")
+		if [ $ent_id -ne 3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		data_len=$(printf "%d\n" "0x$len_val")
+		# add 4 byte for ent_id and 1 byte for len
+		data_len=$(( data_len * 2 + 10 ))
+
+		len_val=${data:8:2}
+		opt_len=$(printf "%d\n" "0x$len_val")
+		if [ $opt_len -eq 0 ]; then
+			echo ${subopt_present}
+			return 0
+		fi
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+			case "${sub_opt_id}" in
+			"4") subopt_present=1
+			;;
+			"5") subopt_present=1
+			;;
+			esac
+
+			if [ ${subopt_present} -eq 1 ]; then
+				break;
+			fi
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+		done
+
+		if [ ${subopt_present} -eq 1 ]; then
+			break;
+		else
+			# move ahead data to next enterprise id
+			rem_len=$(( rem_len - $data_len ))
+			data=${data:"${data_len}":"${rem_len}"}
+		fi
+	done
+
+	echo ${subopt_present}
+}
+
+enable_dnsmasq_option125() {
+	local lan="${1}"
+	local send125_present=0
+	local opt125="125,"
+
+	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
+	if [ "${proto}" = "server" ]; then
+		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
+		base_opt=""
+
+		for sopt in $opt_list; do
+			if [[ "$sopt" == "$opt125"* ]]; then
+				send125_present=$(check_for_suboptions "${sopt:4}")
+				base_opt="${sopt}"
+				break
+			fi
+		done
+
+		if [ ${send125_present} -eq 0 ]; then
+			uci -q del_list dhcp."${lan}".dhcp_option="${base_opt}"
+			configure_send_op125 "${base_opt}" "${lan}" "dhcp"
+			ubus call uci commit '{"config":"dhcp"}'
+		fi
+	fi
+}
+
 set_vendor_id() {
 	local wan="${1}"
 	local proto="$(uci -q get network."${wan}".proto)"
@@ -89,6 +314,51 @@ set_vendor_id() {
 	fi
 }
 
+enable_dhcp_option125() {
+	local wan="${1}"
+	local reqopts="$(uci -q get network."${wan}".reqopts)"
+	local sendopts="$(uci -q get network."${wan}".sendopts)"
+	local proto="$(uci -q get network."${wan}".proto)"
+	local newreqopts=""
+	local newsendopts=""
+	local req125_present=0
+	local send125_present=0
+	local network_uci_update=0
+	local opt125="125:"
+
+	for ropt in $reqopts; do
+		case $ropt in
+			125) req125_present=1 ;;
+			*) ;;
+		esac
+	done
+
+	for sopt in $sendopts; do
+		if [[ "$sopt" == "$opt125"* ]]; then
+			send125_present=1
+			break
+		fi
+	done
+
+	if [ "${proto}" = "dhcp" ]; then
+		if [ ${req125_present} -eq 0 ]; then
+			newreqopts="$reqopts 125"
+			uci -q set network."${wan}".reqopts="$newreqopts"
+			network_uci_update=1
+		fi
+
+		if [ ${send125_present} -eq 0 ]; then
+			configure_send_op125 "${sendopts}" "${wan}" "network"
+			network_uci_update=1
+		fi
+	fi
+
+	if [ ${network_uci_update} -eq 1 ]; then
+		uci commit network
+		ubus call network reload
+	fi
+}
+
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -211,10 +481,13 @@ validate_defaults() {
 }
 
 boot() {
-	local dhcp_discovery wan_interface skip_dhcp_boot_options
+	local dhcp_discovery wan_interface skip_dhcp_boot_options disable_gatewayinfo
 
 	config_load cwmp
 	config_get wan_interface cpe default_wan_interface "wan"
+	config_get disable_gatewayinfo cpe disable_gatewayinfo "0"
+
+	config_get dhcp_discovery acs dhcp_discovery "0"
 	config_get dhcp_discovery acs dhcp_discovery "0"
 	config_get skip_dhcp_boot_options acs skip_dhcp_boot_options "0"
 
@@ -227,6 +500,15 @@ boot() {
 		fi
 	fi
 
+	config_get lan_interface cpe default_lan_interface ""
+	if [ -n "${lan_interface}" ]; then
+		if [ "${disable_gatewayinfo}" -ne 1 ]; then
+			# Set dhcp_option 125 if not already configured
+			enable_dhcp_option125 "${wan_interface}"
+			enable_dnsmasq_option125 "${lan_interface}"
+		fi
+	fi
+	
 	config_get ssl_capath acs ssl_capath
 
 	if [ -n "${ssl_capath}" ]; then
@@ -263,14 +545,7 @@ start_service() {
 
 stop_service()
 {
-	local switch_bank
-
 	copy_cwmp_varstate_files_to_etc
-	
-	switch_bank=$(uci -q -c /var/state/ get icwmp.cpe.switch_bank)
-	if [ -n "$switch_bank" ] && [ "$switch_bank" = "1" ]; then
-		[ -x /etc/sysmngr/fwbank ] && /etc/sysmngr/fwbank call copy_config
-	fi
 }
 
 reload_service() {

icwmp/files/etc/uci-defaults/85-cwmp-set-userid

@@ -4,10 +4,6 @@
 # Copy defaults by the factory to the cwmp UCI user section.
 config_load cwmp
 
-if [ -f "/lib/functions/iopsys-environment.sh" ]; then
-	. /lib/functions/iopsys-environment.sh
-fi
-
 # Get Manufacturer OUI.
 config_get oui cpe manufacturer_oui ""
 if [ -z "${oui}" ]; then
@@ -42,14 +38,4 @@ if [ -z "${enable_cwmp}" ]; then
     uci -q set cwmp.cpe.enable="1"
 fi
 
-default_password="$(get_acs_password)"
-config_get pass cpe passwd ""
-if [ -z "${pass}" ]; then
-	uci -q set cwmp.cpe.passwd="${default_password:-iopsys}"
-fi
-
-config_get pass acs passwd ""
-if [ -z "${pass}" ]; then
-	uci -q set cwmp.acs.passwd="${default_password:-iopsys}"
-fi
 # No need for commit here, it is done by uci_apply_defaults().

icwmp/files/etc/uci-defaults/85-migrate-gw-info

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Script to migrate gateway-info options to gateway uci
-if [ ! -f "/etc/config/cwmp" ] && [ ! -f "/etc/config/gateway" ]; then
-	exit 0
-fi
-
-val="$(uci -q get cwmp.cpe.disable_gatewayinfo)"
-
-if [ -n "$val" ] && [ "$val" -eq 1 ]; then
-	uci -q set gateway.global.enable=0
-fi
-
-uci -q set cwmp.cpe.disable_gatewayinfo=""

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

@@ -0,0 +1,139 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+CLASS=""
+OUI=""
+SERIAL=""
+
+get_vivsoi() {
+	# opt125 environment variable has data in below format
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |	 enterprise-number1	  |
+	# |				  |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |   data-len1   |		  |
+	# +-+-+-+-+-+-+-+-+ option-data1  |
+	# /				  /
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+	# |	 enterprise-number2	  |   ^
+	# |				  |   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# |   data-len2   |		  | optional
+	# +-+-+-+-+-+-+-+-+ option-data2  |   |
+	# /				  /   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# ~	       ...		  ~   V
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+
+	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data	  Sub Op  SLen Data
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+	# |	id    |  n  |	1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+
+	local opt125="$1"
+	local len="$2"
+	local ent_id
+
+	#hex-string 2 character=1 Byte
+	# length in hex string will be twice of actual Byte length
+	[ "$len" -gt "8" ] || return
+
+	data="${opt125}"
+	rem_len="${len}"
+	while [ $rem_len -gt 0 ]; do
+		ent_id=${data:0:8}
+		ent_id=$(printf "%d\n" "0x$ent_id")
+
+		if [ $ent_id -ne  3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - $data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		data_len=$(printf "%d\n" "0x$len_val")
+		# add 4 byte for ent_id and 1 byte for len
+		data_len=$(( data_len * 2 + 10 ))
+
+		opt_len=$(printf "%d\n" "0x$len_val")
+		[ $opt_len -eq 0 ] && return
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# get the value of sub option starting 4 means starting after length
+			sub_opt_val=${sub_data:4:${sub_opt_len}}
+
+			# assign the value found in sub option
+			case "${sub_opt_id}" in
+				"4") OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"5") SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"6") CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+			esac
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+		done
+
+		# move ahead data to next enterprise id
+		data=${data:"${data_len}":"${rem_len}"}
+		rem_len=$(( rem_len - data_len ))
+	done
+}
+
+config_load cwmp
+config_get_bool enable_cwmp cpe enable 1
+config_get wan_intf cpe default_wan_interface "wan"
+
+if [ "$enable_cwmp" = "0" ]; then
+	return 0
+fi
+
+if [ "${wan_intf}" == "${INTERFACE}" ]; then
+	if [ -n "$opt125" ]; then
+		len=$(printf "$opt125"|wc -c)
+		get_vivsoi "$opt125" "$len"
+	fi
+
+	mkdir -p /var/state
+	touch /var/state/icwmp
+	sec=$(uci -q -c /var/state get icwmp.gatewayinfo)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q -c /var/state add icwmp gatewayinfo)
+		uci -q -c /var/state rename icwmp."${sec}"="gatewayinfo"
+	fi
+
+	uci -q -c /var/state set icwmp.gatewayinfo.class="$CLASS"
+	uci -q -c /var/state set icwmp.gatewayinfo.oui="$OUI"
+	uci -q -c /var/state set icwmp.gatewayinfo.serial="$SERIAL"
+	uci -q -c /var/state commit icwmp
+fi

ieee1905/Config.in

@@ -23,7 +23,6 @@ config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 
 config IEEE1905_BUILD_TR181_PLUGIN
 	bool "Build TR-181 mapping module (responsible for Device.IEEE1905.)"
-	default y
 
 endmenu
 

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.7.8
+PKG_VERSION:=8.6.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9c507bfb7f45fad81097262f05dc7cd11760e6b0
+PKG_SOURCE_VERSION:=5f7e6e30cbda36e431ecb7150d7494bce0c26f6f
 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
@@ -22,10 +22,8 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-
-ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
 include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
-endif
+
 
 define Package/ieee1905/Default
   SECTION:=utils
@@ -41,8 +39,7 @@ define Package/libieee1905
   $(call Package/ieee1905/Default)
   TITLE:=libieee1905.so (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +libwifiutils \
-	   +iputils-arping
+	   +libjson-c +libblobmsg-json +libwifiutils
 endef
 
 define Package/ieee1905
@@ -51,10 +48,8 @@ define Package/ieee1905
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi \
-	   +libwifiutils +iputils-arping
-  DEPENDS+=+IEEE1905_BUILD_TR181_PLUGIN:libbbfdm-api \
-	   +IEEE1905_BUILD_TR181_PLUGIN:libbbfdm-ubus \
-	   +IEEE1905_BUILD_TR181_PLUGIN:dm-service
+	   +libwifiutils
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
 include $(wildcard plugins/*.mk)
@@ -102,10 +97,7 @@ TARGET_CFLAGS += -DEXTENSION_ALLOWED
 endif
 
 TARGET_CFLAGS += -DHAS_UBUS
-
-ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
 TARGET_CFLAGS += -DBUILD_TR181_PLUGIN
-endif
 
 MAKE_FLAGS += \
 	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
@@ -119,10 +111,7 @@ define Package/ieee1905/install
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
-ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/tr181/ieee1905dm.so $(1) $(PKG_NAME)
-endif
 endef
 
 define Package/libieee1905/install

ieee1905/bbfdm_service.json

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

ieee1905/files/etc/uci-defaults/30-set-ieee1905-al-macaddr

@@ -18,3 +18,5 @@ mac=$(uci -q get ieee1905.ieee1905.macaddress)
 [ "$mac" != "" ] && exit 0
 
 uci set ieee1905.ieee1905.macaddress="$LMAC"
+uci commit ieee1905
+

ieee1905/files/etc/uci-defaults/32-ieee1905-device-info

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /etc/os-release
-
-set_val() {
-	uci -q get "$1" > /dev/null || uci set "${1}=${2:-${3}}"
-}
-
-set_val ieee1905.ieee1905.manufacturer "$OPENWRT_DEVICE_MANUFACTURER" IOPSYS
-set_val ieee1905.ieee1905.model_name "$(cat /tmp/sysinfo/model)" 1905-SampleDev
-set_val ieee1905.ieee1905.device_name "$NAME" 1905Device
-
-exit 0

iop/Config.in

@@ -0,0 +1,7 @@
+config TARGET_VERSION
+	string
+	prompt "Software Version"
+
+config TARGET_CUSTOMER
+	string
+	prompt "Customer ID"

iop/Makefile

@@ -24,6 +24,10 @@ define Package/iop/description
 	This package contains iopsysWrt SDK utilities
 endef
 
+define Package/iop/config
+	source "$(SOURCE)/Config.in"
+endef
+
 define Build/Compile
 	true
 endef

iop/scripts/feeds_update.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+function feeds_update {
+
+	# always return true
+	exit 0
+}
+
+register_command "feeds_update" "Compatibility function only"

iopsys-analytics/Makefile

@@ -31,7 +31,7 @@ define Package/$(PKG_NAME)
     +@PACKAGE_COLLECTD_ENCRYPTED_NETWORK                \
   # remote syslog
   DEPENDS+=                                             \
-    +@FLUENT_BIT_SYSLOG_PREPEND_LENGTH                  \
+    +syslog-ng                                          \
     +@SYSLOGNG_LOGROTATE                                \
 
 endef
@@ -44,12 +44,7 @@ endef
 Build/Compile=
 
 define Package/$(PKG_NAME)/install
-	$(CP) -r ./files/common/*  $(1)/
-ifneq ($(CONFIG_PACKAGE_fluent-bit),)
-	$(CP) -r ./files/fluent-bit/*  $(1)/
-else
-	$(CP) -r ./files/syslog-ng/*  $(1)/
-endif
+	$(CP) -r $(PKG_BUILD_DIR)/files/*  $(1)/
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

iopsys-analytics/files/common/etc/analytics-cert/clientcert.pem

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDJTCCAg0CAQEwDQYJKoZIhvcNAQELBQAwRTELMAkGA1UEBhMCU0UxEzARBgNV
-BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
-ZDAeFw0yMjExMjIxMjM1MDNaFw0zMjExMTkxMjM1MDNaMGwxCzAJBgNVBAYTAlVT
-MREwDwYDVQQIDAhJbnRlcm5ldDEMMAoGA1UEBwwDRFVUMQwwCgYDVQQKDAMuLi4x
-DDAKBgNVBAsMAy4uLjEMMAoGA1UEAwwDLi4uMRIwEAYJKoZIhvcNAQkBFgMuLi4w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDleMMuJ8AO1DeRmOyE2k2D
-DWUKB4yiRQhKxnRyRcF1s+mHcySS1NRlLwyZUuOFvBYHUhE3AfNMN5ywKazl4FwG
-MNtx0iUfHmHc0MQ04KZk1ifkS5WPUMksEJDQyM06ZH3gcIhGDlSkprnMsp9q5HlG
-umopBlihLTI+WM+8kliFbT7iOICDi9qRHPS+WTT/RClX12ISAejVFMFdpf8aQOGn
-klu7mcGyOBij0axcfd2QlHybvkSSksvny19I1/Be7MdtO3fxJODuUy8sHd9HqaOJ
-TbjcwWNWFJIR4+Gsz2DeqIPxpaqUjEZgJfUD5FSTOL3ZgtjMmzjYZj8IEf5BD7st
-AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAK+WvRYkkM+11ljo1pKwyTtcyz9fiQ9Z
-zGAed6UViEPhJNIchFEFukMMqNaWL3Pi0MkvkAiJvyJbGW0YiPm7r0sf2sOD4PPI
-UqDskApA9P1aL1uF/CBvP7kViVVVcNDSHq+Hc+6Jrg+Ufycq2kE9KrU/zI2Z0kEd
-70k+YNLWTZNjekXfrxlniw7ycmALJuYkw1GXSZ4pph+VXYPJ7c/sm4J3MKDXonTQ
-tEI4wTTkfOHUBDppNX/b9gw0A4jL5nAga/6Q2PPNoaTrgLZS0o03GO3HES24iHlG
-TBrIW9q2HRcDOfj5oNaoSasOyARFT0owJdcBFlzp7Pe1lMN+bRLz5h0=
------END CERTIFICATE-----

iopsys-analytics/files/common/etc/analytics-cert/clientkey.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDleMMuJ8AO1DeR
-mOyE2k2DDWUKB4yiRQhKxnRyRcF1s+mHcySS1NRlLwyZUuOFvBYHUhE3AfNMN5yw
-Kazl4FwGMNtx0iUfHmHc0MQ04KZk1ifkS5WPUMksEJDQyM06ZH3gcIhGDlSkprnM
-sp9q5HlGumopBlihLTI+WM+8kliFbT7iOICDi9qRHPS+WTT/RClX12ISAejVFMFd
-pf8aQOGnklu7mcGyOBij0axcfd2QlHybvkSSksvny19I1/Be7MdtO3fxJODuUy8s
-Hd9HqaOJTbjcwWNWFJIR4+Gsz2DeqIPxpaqUjEZgJfUD5FSTOL3ZgtjMmzjYZj8I
-Ef5BD7stAgMBAAECggEATmdMiOCcBnUL53tQlLPh9/0DoMGjk23yv1m/P6wFxamL
-CPSWcnS1fTzuGRTxGCiDfkzUBO9tqYT2zFnw8ToPNy5KTEF43YEL/t51q3t2Xs2t
-I5uPpj/7/EpMsIlrVaAwQhcw+H68/OTaZs5BGcymgzv+ObYpYiiHGjZOBCgchrl+
-/FyUyrS1M11VcamJ8H6GqNDEy5zvwOX3VjIwHvbONrN6zjNvMRIMzCQC59hEeBDG
-j6AYMw2/UJ4sPLpmqObnPvYO4D6qsEuKxQDGFwaPGSulOs5+OHMqTcTLRtktR5qJ
-Mjq5C2axy3TvxpbZ5Ou2jRB/zaXWNkK26UP5Iv2MAQKBgQD/4J5lcFBkrZArR5XL
-FiAfN4yfBAPcveRP7Zgqb7nlLzzouqz7vyH8Hhnk+XbA9CiKVOMc2Fbe82/exuft
-DvsoW5+Ds31SU52q5vWjtnPXeuK0kT6lm+qBbtmsFSAnfCRZUQcF8PhERLfzOEA6
-Uln0xr2EFR3D/UaBjsN3aTKMzQKBgQDllOe+QAf4CZGgCyAF1DDakuZF+iAfsCNz
-83dlb6N2ggJinOLs3ExfT0oJSUp4KPAIOQ+QgY01Itk0py2HEfYCgvXim7RrZ1P7
-5Sx++fi48ar3aqgLqg0hur0Yd1kFPjVRWj2/jM6qvLC8nEehNQH1VOh847FcwTrY
-UWWMKOnn4QKBgFnApE7Ykpp99u/3cCeIX0QT7BNrCR/Iy+jtYk6gWgh2BVts/3he
-lsEkndifWHReMEo1dGSNzgruQPNXucqBUr/ZQ56iuvbBtbBYyxjdysxuok7ME7lr
-c1prU5b04g53kRhzP49p8uufXxbFSGIsuLkPbTKDZal1keGn/hBIqh6RAoGAT9pS
-HMdSvkA9yaf09HIQqAXOWGqef8cZHbyCO+LvvUmNINWmzHH3knMWslIut8qtan7G
-XiHhhqjfWcQIPuHNaqQ4eCBmSbE/8e6NYoD5tQJB0Brl5mC4fpHgMcFZUkyH6Qr1
-TUnhnFtTMdc9xuGUE8v7rWzZBQUkvZbaNj0I1qECgYAesALh2u0r/ayEYjWAcqu8
-XXhQWRhg7fXm0cCODNeK5rhkaqxlw64hSY29tgEKPg/F66jXMDXcsvsBwnPoGN35
-lD6CQlWKR3g2LtRCAHLICQ5aODNL9B321syoIHF1Cdlw78V3uMsQ7av/IWaIX4BL
-EEWtDICxzN37PaGuYVSRSQ==
------END PRIVATE KEY-----

iopsys-analytics/files/common/etc/collectd.conf

@@ -1,93 +0,0 @@
-BaseDir "/var/lib/collectd"
-PIDFile "/var/run/collectd.pid"
-Interval 60
-ReadThreads 2
-WriteQueueLimitHigh 10000
-WriteQueueLimitLow   8000
-
-LoadPlugin "load"
-LoadPlugin "network"
-LoadPlugin "memory"
-LoadPlugin "processes"
-LoadPlugin "cpu"
-LoadPlugin "exec"
-
-<Plugin "network">
-   <Server "analytics.iopsys.eu" "25827">
-     SecurityLevel "encrypt"
-     Username "iopsys"
-     Password "kffJDv3CMVO9WHO4CIP8CGM3ZXN4EQv"
-   </Server>
-</Plugin>
-
-<Plugin "network">
-   <Server "analytics.iopsys.eu" "25825">
-     SecurityLevel "encrypt"
-     Username "iopsys"
-     Password "6rgVOHWq9BPCbZFlLVB854jD8WCv4EvK"
-   </Server>
-</Plugin>
-
-<Plugin "memory">
-  ValuesPercentage true
-</Plugin>
-
-<Plugin "processes">
-  CollectFileDescriptor true
-  CollectContextSwitch true
-  CollectMemoryMaps true
-
-  ProcessMatch "mapagent_instances" "mapagent"
-  ProcessMatch "wifimngr_instances" "wifimngr"
-  ProcessMatch "ieee1905d_instances" "ieee1905d"
-  ProcessMatch "topologyd_topologyd" "topologyd"
-  ProcessMatch "uspd_instances" "uspd"
-  ProcessMatch "mapcontroller_instances" "mapcontroller"	
-  ProcessMatch "obuspa_instances" "(.*)obuspa"
-  ProcessMatch "hostapd_instances" "hostapd"
-  ProcessMatch "swmodd_instances" "swmodd"
-  ProcessMatch "ruleng_instances" "rulengd"
-  ProcessMatch "wpa_supplicant_instances" "wpa_supplicant"
-  ProcessMatch "dm_bulkdata" "bbfdmd -m bulkdata"
-  ProcessMatch "dm_ddnsmngr" "bbfdmd -m ddnsmngr"
-  ProcessMatch "dm_dnsmngr" "bbfdmd -m dnsmngr"
-  ProcessMatch "dm_ethmngr" "bbfdmd -m ethmngr"
-  ProcessMatch "dm_hostmngr" "bbfdmd -m hostmngr"
-  ProcessMatch "dm_icwmp" "bbfdmd -m icwmp"
-  ProcessMatch "dm_mcastmngr" "bbfdmd -m mcastmngr"
-  ProcessMatch "dm_periodicstat" "bbfdmd -m periodicstats"
-  ProcessMatch "dm_portmapping" "bbfdmd -m portmapping"
-  ProcessMatch "dm_qosmngr" "bbfdmd -m qosmngr"
-  ProcessMatch "dm_sshmngr" "bbfdmd -m sshmngr"
-  ProcessMatch "dm_swmodd" "bbfdmd -m swmodd"
-  ProcessMatch "dm_timemngr" "bbfdmd -m timemngr"
-  ProcessMatch "dm_tr104" "bbfdmd -m tr104"
-  ProcessMatch "dm_urlfilter" "bbfdmd -m urlfilter"
-  ProcessMatch "dm_userinterfac" "bbfdmd -m userinterface"
-  ProcessMatch "dm_usermngr" "bbfdmd -m usermngr"
-  ProcessMatch "bbfdmd" "bbfdmd"
-  ProcessMatch "decollector" "decollector"
-  ProcessMatch "collectd" "collectd"
-  ProcessMatch "uwsgi" "uwsgi"
-  ProcessMatch "syslog-ng" "syslog-ng"
-  ProcessMatch "mosquitto" "mosquitto"
-  ProcessMatch "nginx" "nginx"
-  ProcessMatch "hostmngr" "hostmngr"                      
-  ProcessMatch "asterisk" "asterisk"                       
-  ProcessMatch "voicemngr" "voicemngr"
-
-
-</Plugin>
-
-<Plugin "cpu">
-  ReportByState true
-  ReportByCpu true
-  ValuesPercentage true
-</Plugin>
-
-<Plugin "exec">
-Exec "nobody" "/sbin/get-sn"
-</Plugin>
-
-<Plugin "load">
-</Plugin>

iopsys-analytics/files/common/etc/config/core-watcher

@@ -1,3 +0,0 @@
-config core-watcher 'globals'
-    option api_key '1JH7ZKGDtJXKeLt4CfeJt4y'
-    option url 'https://analytics.iopsys.eu:1337/crash_upload_file'

iopsys-analytics/files/common/etc/icwmpd/force_inform.json

@@ -1,6 +0,0 @@
-{
-  "forced_inform": [
-      "Device.DeviceInfo.ModelName"
-  ]
-}
-

iopsys-analytics/files/common/etc/init.d/core-watcher

@@ -1,38 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-export USE_PROCD=1
-
-export START=95
-export STOP=01
-
-LOG="logger -t core-watcher[$$] -p"
-
-start_service() {
-
-    [ -f /etc/config/core-watcher ] || {
-        $LOG error "UCI config not found"
-        return 1
-    }
-
-    firmware_version=$(db get device.deviceinfo.SoftwareVersion || echo "unknown")
-    product_class=$(db get device.deviceinfo.ProductClass | awk '{print tolower($0)}')
-    serial=$(db get device.deviceinfo.SerialNumber || echo "unknown")
-    config_load core-watcher
-
-    url=""
-    config_get url "globals" "url"
-    api_key=""
-    config_get api_key "globals" "api_key"
-
-    if [ -z "$url" ] || [ -z "$api_key" ]; then
-        $LOG error "URL or API Key not found in config"
-        return 2
-    fi
-
-    procd_open_instance
-    procd_set_param env API_KEY="$api_key" SERIAL="$serial" FIRMWARE_VERSION="$firmware_version" PRODUCT_CLASS="$product_class"
-    procd_set_param command /usr/bin/core-watcher -u "$url"
-    procd_set_param limits core="unlimited"
-    procd_close_instance
-}
-

iopsys-analytics/files/common/etc/init.d/ubus-monitor

@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=15
-STOP=20
-
-USE_PROCD=1
-
-start_service() {
-    procd_open_instance
-
-    echo "Starting ubus monitor..."
-
-    procd_set_param respawn  # Enable automatic restart on failure
-    procd_set_param stdout 1  # Redirect stdout to procd
-    procd_set_param stderr 1  # Redirect stderr to procd
-    procd_set_param command /bin/sh "/usr/sbin/ubus-monitor"
-
-
-    procd_close_instance
-}
-
-reload_service(){
-    echo "Explicitly restarting service, are you sure you need this?"
-    stop
-    start
-}

iopsys-analytics/files/common/etc/uci-defaults/89-cwmp-setforceinform

@@ -1,3 +0,0 @@
-#!/bin/sh
-uci set cwmp.cpe.forced_inform_json='/etc/icwmpd/force_inform.json'
-uci commit cwmp

iopsys-analytics/files/common/lib/preinit/95_set_core_limit_unlimited

@@ -1,5 +0,0 @@
-set_core_unlimited() {
-	prlimit --core=unlimited: -p 1
-}
-
-boot_hook_add preinit_main set_core_unlimited

iopsys-analytics/files/common/sbin/get-sn

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-INTERVAL="${COLLECTD_INTERVAL:-60}"
-
-while sleep "$INTERVAL"; do
-    SN=$(db get device.deviceinfo.SerialNumber)
-    HOSTNAME=$(uname -n)
-    FORMATTED_RESULT=$(echo "1337")
-   echo "PUTVAL \"$HOSTNAME/exec-$SN/gauge-INFO\" interval=$INTERVAL N:\"$FORMATTED_RESULT\""
-
-done

iopsys-analytics/files/common/usr/bin/core-watcher

@@ -1,150 +0,0 @@
-#!/bin/sh
-
-# shellcheck shell=busybox
-
-# This shell script watches for *.core files created in
-# /tmp and uploads them
-
-CORE_DIR="/tmp"
-
-LOG="logger -t core-watcher[$$] -p"
-POLL_INTERVAL="5"
-
-upload_file() {
-    FILEPATH=$1
-    $LOG info "Uploading $UPLOAD_TYPE $FILEPATH"
-
-    curl -s --fail -X "POST" \
-        "$API_URL" \
-        -H "accept: application/json" \
-        -H "Content-Type: multipart/form-data" \
-        -F "api_key=$API_KEY" \
-        -F "dump_md5=$COREDUMP_MD5" \
-        -F "device_serial=$SERIAL" \
-        -F "upload_type=$UPLOAD_TYPE" \
-        -F "incoming_file=@$FILEPATH;type=text/plain"
-
-    status=$?
-
-    if [ "$status" != "0" ]; then
-        $LOG error "$UPLOAD_TYPE upload failed. curl returned status $status"
-    else
-        $LOG info "$UPLOAD_TYPE upload success"
-        if [ $UPLOAD_TYPE = "core" ]; then
-            $LOG info "Renaming core $ORIGINAL_CORE_FILEPATH"
-            mv "$ORIGINAL_CORE_FILEPATH" "$ORIGINAL_CORE_FILEPATH"_UPLOADED
-        fi
-    fi
-}
-
-usage() {
-    cat <<EOM
-Usage:
-  $0 [OPTIONS]
-Options:
-  -h  help
-  -u <URL> API Gateway URL (required)
-EOM
-    exit 1
-}
-
-main() {
-    if [ -z "$API_KEY" ]; then
-        $LOG error "API_KEY env variable not set"
-        exit 1
-    fi
-
-    if [ -z "$SERIAL" ]; then
-        $LOG error "SERIAL env variable not set"
-        exit 1
-    fi
-
-    if [ -z "$FIRMWARE_VERSION" ]; then
-        $LOG error "FIRMWARE_VERSION env variable not set"
-        exit 1
-    fi
-
-    while getopts "u:" opt; do
-        case $opt in
-        u)
-            API_URL=${OPTARG}
-            ;;
-        *)
-            usage
-            ;;
-        esac
-    done
-
-    if [ -z "$API_URL" ]; then
-        usage
-    fi
-    # Source system information from /etc/os-release
-    . /etc/os-release                                     
-                                                    
-    # Convert OPENWRT_DEVICE_PRODUCT to uppercase and use it as the board name
-    BOARD_NAME=$(echo "$OPENWRT_DEVICE_PRODUCT" | tr 'a-z' 'A-Z')   
-    BASE_MAC="$(db get device.deviceinfo.BaseMACAddress)"
-
-    while true; do
-        if ping -c1 -4 analytics.iopsys.eu; then
-            CORES=$(find "$CORE_DIR" -type f -name "*.core")
-            for core in $CORES; do
-                $LOG error "Core found: $core"
-
-                COREDUMP_MD5="$(md5sum "$core" | cut -f1 -d' ')"
-
-                UPLOAD_TYPE="file"
-
-                if [ -e /tmp/ctfw.meta ]; then
-                    . /tmp/ctfw.meta
-                fi
-
-                echo "$CTFW_TEST_CASE" > /tmp/ctfw-test-case.txt
-                upload_file "/tmp/ctfw-test-case.txt"
-
-                echo "$CTFW_TAG" > /tmp/ctfw-job-tag.txt
-                upload_file "/tmp/ctfw-job-tag.txt"
-
-                echo "$CTFW_LOCK_USERNAME" > /tmp/ctfw-lock-username.txt
-                upload_file "/tmp/ctfw-lock-username.txt"
-
-                opkg list > /tmp/opkg-list.txt
-                upload_file "/tmp/opkg-list.txt"
-
-                free > /tmp/free-mem.txt
-                upload_file "/tmp/free-mem.txt"
-
-                cat /proc/slabinfo > /tmp/slabinfo.txt
-                upload_file "/tmp/slabinfo.txt"
-
-                echo "$BOARD_NAME" > /tmp/board-name.txt
-                upload_file "/tmp/board-name.txt"
-
-                echo "$BASE_MAC" > /tmp/base-mac.txt
-                upload_file "/tmp/base-mac.txt"
-
-                uname -n > /tmp/hostname.txt
-                upload_file "/tmp/hostname.txt"
-
-                echo "$FIRMWARE_VERSION" > /tmp/fw-version.txt
-                upload_file "/tmp/fw-version.txt"
-
-                cp "$(strings "$core" | grep ^/ | head -1 | cut -d' ' -f1)" /tmp/binary
-                upload_file /tmp/binary
-
-                UPLOAD_TYPE="core"
-                ORIGINAL_CORE_FILEPATH="$core"
-                cp "$core" /tmp/core
-                upload_file /tmp/core
-                rm /tmp/core
-            done
-        fi
-
-        sleep $POLL_INTERVAL
-    done
-
-
-}
-
-main "$@"
-

iopsys-analytics/files/common/usr/sbin/system-report

@@ -1,231 +0,0 @@
-#!/bin/sh
-# shellcheck shell=dash
-
-# Location of system report temporary directory
-SRDIR="/tmp/system-report"
-
-
-configure() {
-    local preconf_path
-    preconf_path="$(realpath "$0")"
-
-    if ! cmp -s /usr/sbin/system-report "${preconf_path}" >/dev/null; then
-        echo "iopsys-test system-report differs from included with firmware, symlinking"
-        ln -sf "${preconf_path}" /usr/sbin/system-report
-    fi
-
-    if ! cmp -s /rom/usr/sbin/system-report /usr/sbin/system-report >/dev/null && ! grep -Fq "/usr/sbin/system-report" /etc/sysupgrade.conf; then
-        echo "iopsys-test system-report differs from included with firmware, adding to sysupgrade.conf"
-        echo "/usr/sbin/system-report" >>/etc/sysupgrade.conf
-    fi
-}
-
-run() {
-    set -x
-
-    # Alias ubus to have a smaller 5-second timeout on all subsequent calls
-    ubus() { command ubus -t 5 "$@"; }
-
-    mkdir -p "$SRDIR"
-
-    SRCF="$SRDIR/config"
-    SRSY="$SRDIR/system"
-    SRNT="$SRDIR/network"
-    SRTR="$SRDIR/tr069"
-    SRMD="$SRDIR/mem_dump"
-
-    # Config
-    echo "Gathering configuration data"
-    {
-        cat /etc/banner
-
-        echo "Installed Packages"
-        opkg list-installed
-
-        echo "Database"
-        db show
-
-        echo "Configuration"
-        uci show
-    } > "$SRCF"
-
-    # System
-    echo "Gathering system information"
-    {
-        echo "System Info"
-        ubus call system info
-
-        echo "Board Info"
-        ubus call system board
-
-        echo "Running Processes"
-        top -b -n 1
-
-        echo "Kernel Parameters"
-        sysctl -A  2>/dev/null
-
-        echo "System Log"
-        timeout 5 logread -l 1000
-
-        echo "Driver Message"
-        timeout 5 dmesg
-
-        echo "PCI Devices"
-        lspci -k
-
-        echo "Installed Modules"
-        lsmod
-
-        echo "CPU Info"
-        cat /proc/cpuinfo
-
-        echo "Memory Info"
-        cat /proc/meminfo
-
-        echo "Slab Info"
-        cat /proc/slabinfo
-
-        echo "Firmware banks"
-        ubus call fwbank dump
-    } > "$SRSY"
-
-    # Network
-    echo "Gathering network state"
-    {
-        echo "Device Status"
-        ubus call network.device status
-
-        echo "Hosts Status"
-        ubus call hosts show
-
-        echo "Topology"
-        ubus call ieee1905.topology dump
-
-        echo "Network Status"
-        ubus call network.interface dump
-
-        if [ -d /sys/class/ieee80211 ]; then
-            echo "Wireless Status"
-            ubus call network.wireless status
-
-            echo "Wireless Radio Status"
-            ubus call wifi status
-
-            echo "Get radio scan"
-            for radio_if in $(ubus list 'wifi.radio.*'); do
-              ubus call "${radio_if}" scan
-              sleep 2
-              ubus call "${radio_if}" scanresults
-            done
-
-            echo "Get Assoc List"
-            interfaces=$(uci show wireless | grep "ifname=" |  awk -F'[.,=]' '{print$2}')
-            for int in $interfaces; do
-                mode=$(uci get "wireless.${int}.mode")
-                if [ "$mode" = "ap" ] ; then
-                    ap_int=$(uci get "wireless.${int}.ifname")
-                    echo "Get assoc list"
-                    ubus call "wifi.ap.${ap_int}" assoclist
-                    echo "Get station info"
-                    ubus call "wifi.ap.${ap_int}" stations
-                fi
-            done
-
-        fi
-
-        if [ "$(db get hw.board.hasVoice)" = 1 ]; then
-            echo "voice status"
-            ubus call voice.asterisk status
-        fi
-
-        echo "IPv4 Routes"
-        ip -d r
-
-        echo "IPv6 Routes"
-        ip -d -6 r
-
-        echo "Neighbor Table"
-        ip n
-
-        echo "ARP Table"
-        cat /proc/net/arp
-
-        echo "IGMP Snooping Table"
-        ubus call mcast stats
-
-        echo "Conntrack Table"
-        cat /proc/net/nf_conntrack
-
-        echo "Network Interface Status"
-        ip -d a
-
-        echo "IPv4 Firewall Status"
-        iptables -xvnL
-
-        echo "IPv6 Firewall Status"
-        ip6tables -xvnL
-
-        echo "Bridge Info"
-        brctl show
-
-        if [ -f /tmp/multiap.backhaul ]; then
-          echo "Multi-AP Backhaul status"
-          cat /tmp/multiap.backhaul
-        fi
-
-        echo "TCP/UDP listened ports"
-        netstat -tlnp
-        netstat -ulnp
-
-        echo "MAC layer firewall status"
-        ebtables -t broute -L
-
-        echo "MAC layer firewall status list"
-        ebtables -L
-
-        echo "IEEE1905 info"
-        ubus call ieee1905 info
-
-         if [ -f /usr/bin/iwinfo ]; then
-          echo "iwinfo interface details"
-          /usr/bin/iwinfo
-        fi
-
-    } > "$SRNT"
-
-    # TR-069
-    echo "Gathering TR-069 state"
-    {
-        echo "TR-069 status"
-        ubus call tr069 status
-
-        echo "get all TR-181 Parameters"
-        ubus call bbfdm get '{"path":"Device."}'
-
-        echo "TR-069 Option 43 URL"
-        uci -P /var/state -q get cwmp.acs.url
-
-        echo "TR-069 Logs"
-        [ -f /var/log/icwmp ] && cat /var/log/icwmp
-    } > "$SRTR"
-
-    # Firmware RAM dump (IOP-8118)
-    if [ -f /tmp/mem_dump ]; then
-        mv /tmp/mem_dump "$SRMD"
-    fi
-
-    REPORT_PATH="$(dirname "${SRDIR}")"
-    REPORT_DIRNAME="$(basename "${SRDIR}")"
-    FILENAME="${REPORT_PATH}/system-report-$(date +%Y-%m-%d).tar.gz"
-    tar -cz -C "${REPORT_PATH}" -f "${FILENAME}" "${REPORT_DIRNAME}"
-    echo "Report is located at ${FILENAME}"
-
-    #ubus send "system-report" "{ \"filename\" : \"$FILENAME\" }"
-
-    rm -r "$SRDIR"
-}
-
-case "${1:-}" in
-    configure) configure ;;
-    *) run ;;
-esac

iopsys-analytics/files/common/usr/sbin/ubus-monitor

@@ -1,7 +0,0 @@
-#!/bin/ash
-
-rm -f /tmp/ubus-calls-pipe
-
-mkfifo /tmp/ubus-calls-pipe || echo "Pipe wasn't created" >&2
-logger -t ubus-logging "Pipe created sucessfully"
-/bin/ubus listen > /tmp/ubus-calls-pipe

iopsys-analytics/files/fluent-bit/etc/fluent-bit/conf.d/analytics.conf

@@ -1,42 +0,0 @@
-[INPUT]
-    name            syslog
-    tag             logs
-    path            /dev/log
-    parser          syslog-rfc3164-local 
-
-[INPUT]
-    Name         head
-    Tag          ubus_listen
-    file  /tmp/ubus-calls-pipe
-    Interval_Sec 1
-
-[OUTPUT]
-    name         syslog
-    match        logs
-    host         analytics.iopsys.eu
-    port         6514
-    mode         tcp
-    tls    on
-    tls.verify        off
-    tls.key_file      /etc/analytics-cert/clientkey.pem
-    tls.crt_file      /etc/analytics-cert/clientcert.pem
-    syslog_format        rfc5424
-    syslog_appname_preset dummy
-    syslog_message_key   message
-    syslog_hostname_key  hostname
-    syslog_hostname_preset    dummy
-
-[OUTPUT]
-    name         syslog
-    match        ubus_listen
-    host         analytics.iopsys.eu
-    port         6515
-    mode         tcp
-    tls    on
-    tls.verify        off
-    tls.key_file      /etc/analytics-cert/clientkey.pem
-    tls.crt_file      /etc/analytics-cert/clientcert.pem
-    syslog_format        rfc5424
-    syslog_appname_preset dummy
-    syslog_message_key   head
-    syslog_hostname_preset   dummy

iopsys-analytics/files/fluent-bit/etc/uci-defaults/01-fluent-bit-init

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Check if fluent-bit is installed
-if command -v fluent-bit >/dev/null 2>&1; then
-    conf_file="/etc/fluent-bit/conf.d/analytics.conf"
-
-    # Check if the configuration file exists
-    if [ -f "$conf_file" ]; then
-        # Get hostname and serial number
-        hostname="$(db -q get device.deviceinfo.ModelName)"
-        serialnum="$(db -q get device.deviceinfo.SerialNumber)"
-
-        # Replace syslog_hostname_preset line
-        sed -i "s/^.*syslog_hostname_preset.*/    syslog_hostname_preset    ${hostname}/" "$conf_file"
-
-        # Replace syslog_appname_preset line
-        sed -i "s/^.*syslog_appname_preset.*/    syslog_appname_preset    ${serialnum}/" "$conf_file"
-    fi
-fi
-
-# Clear logs periodically
-grep -q 'logrotate' /etc/crontabs/root || echo '*/15 * * * *    /usr/sbin/logrotate /etc/logrotate.conf' >> /etc/crontabs/root
-
-# Exit successfully
-exit 0

iopsys-analytics/files/syslog-ng/etc/logrotate.d/analytics

@@ -1,9 +0,0 @@
-
-/var/log/messages {
-    missingok
-    rotate 1
-    size 1M
-    postrotate
-        /usr/sbin/syslog-ng-ctl reopen
-    endscript
-}

iopsys-analytics/files/syslog-ng/etc/syslog-ng.d/analytics

@@ -1,46 +0,0 @@
-source s_file {
-    file("/var/log/messages" program_override("`ENV_VAR_SYSLOG_NG_DUT_SERIAL_NUMBER`"));
-};
-
-source ubus_calls {
-    pipe("/tmp/ubus-calls-pipe"
-    flags(no-parse)
-    );
-
-};
-
-destination d_tls_syslog {
-	syslog(
-		"analytics.iopsys.eu"
-		transport("tls")
-		port(6514)
-		tls(
-			key-file("/etc/analytics-cert/clientkey.pem")
-			cert-file("/etc/analytics-cert/clientcert.pem")
-			peer-verify(no)
-		)
-	);
-};
-
-destination d_tls_ubus {
-	syslog(
-			"analytics.iopsys.eu"
-			transport("tls")
-			port(6515)
-			tls(
-					key-file("/etc/analytics-cert/clientkey.pem")
-					cert-file("/etc/analytics-cert/clientcert.pem")
-					peer-verify(no)
-			)
-	);
-};
-
-log {
-	source(s_file);
-	destination(d_tls_syslog);
-};
-
-log {
-    source(ubus_calls);
-    destination(d_tls_ubus);
-};