icwmp: optimize dual stack implementation

bbfdm/Config_bbfdm.in

@@ -1,3 +1,7 @@
+config BBF_VENDOR_EXTENSION
+	bool "Enable Vendor Extension"
+	default y
+
 config BBF_VENDOR_LIST
 	string "Vendor List"
 	default "iopsys"
@@ -6,9 +10,9 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
-config BBF_OBFUSCATION_KEY
-	string "Obfuscation key"
-	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
+config BBF_TR104
+	bool "Enable TR-104 Data Model Support"
+	default y
 
 config BBF_TR143
 	bool "Enable TR-143 Data Model Support"
@@ -18,6 +22,14 @@ config BBF_TR471
 	bool "Enable TR-471 Data Model Support"
 	default y
 
+config BBFDM_ENABLE_JSON_PLUGIN
+	bool "Enable json plugin to extend datamodel"
+	default y
+
+config BBFDM_ENABLE_DOTSO_PLUGIN
+	bool "Enable shared library plugin to extend datamodel"
+	default y
+
 config BBF_MAX_OBJECT_INSTANCES
 	int "Maximum number of instances per object"
 	default 255

bbfdm/Makefile

@@ -5,40 +5,68 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.8.1
+PKG_VERSION:=1.0.4
 
-USE_LOCAL:=0
-ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=63fad00eeed1a7c181ef51be43174d92be4ad00f
+PKG_SOURCE_VERSION:=96b305926f8fa8cafa0638e613879537da9b6086
 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 $(INCLUDE_DIR)/cmake.mk
-include bbfdm.mk
 
 define Package/libbbfdm-api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
   ABI_VERSION:=1.0
 endef
 
-define Package/libbbfdm
+define Package/libbbfdm/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api \
-	    +BBF_TR471:obudpst +libopenssl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
+	    +BBF_TR471:obudpst
+endef
+
+define Package/libbbfdm
+  $(Package/libbbfdm/default)
+  TITLE += (default)
+  VARIANT:=default
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  DEFAULT_VARIANT:=1
+endef
+
+define Package/libbbfdm-mbedtls
+  $(Package/libbbfdm/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
+  VARIANT:=mbedtls
+  CONFLICTS := libbbfdm libbbfdm-openssl libbbfdm-wolfssl
+endef
+
+define Package/libbbfdm-openssl
+  $(Package/libbbfdm/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  VARIANT:=openssl
+  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-wolfssl
+endef
+
+define Package/libbbfdm-wolfssl
+  $(Package/libbbfdm/default)
+  TITLE += (wolfssl)
+  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
+  VARIANT:=wolfssl
+  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-openssl
 endef
 
 define Package/bbfdmd
@@ -46,7 +74,20 @@ define Package/bbfdmd
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +PACKAGE_libbbfdm-mbedtls:libbbfdm-mbedtls \
+		   +PACKAGE_libbbfdm-openssl:libbbfdm-openssl +PACKAGE_libbbfdm-wolfssl:libbbfdm-wolfssl \
+		   +PACKAGE_libbbfdm:libbbfdm
+endef
+
+define Package/userinterface
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Package to add Device.UserInterface. datamodel support
+endef
+
+define Package/userinterface/description
+  Package to add Device.UserInterface. datamodel support
 endef
 
 define Package/libbbfdm/config
@@ -58,18 +99,23 @@ define Package/libbbfdm-api/description
 endef
 
 define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR143 data models
+ Library contains the data model tree. It includes TR181, TR104 and TR143 data models
 endef
 
-ifeq ($(USE_LOCAL),1)
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-	$(CP) ~/git/bbfdm/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 endif
 
 CMAKE_OPTIONS += \
 	-DBBF_TR181=ON
-	-DBBF_WIFI_DATAELEMENTS=ON
+
+ifeq ($(CONFIG_BBF_TR104),y)
+CMAKE_OPTIONS += \
+	-DBBF_TR104=ON
+endif
 
 ifeq ($(CONFIG_BBF_TR143),y)
 CMAKE_OPTIONS += \
@@ -81,12 +127,45 @@ CMAKE_OPTIONS += \
 	-DBBF_TR471=ON
 endif
 
+ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
+CMAKE_OPTIONS += \
+	-DBBF_VENDOR_EXTENSION=ON
+
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
 	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
 
+endif ##CONFIG_BBF_VENDOR_EXTENSION
+
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+CMAKE_OPTIONS += \
+	-DBBF_JSON_PLUGIN=ON
+endif
+
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+CMAKE_OPTIONS += \
+	-DBBF_DOTSO_PLUGIN=ON
+endif
+
+ifeq ($(BUILD_VARIANT),default)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),openssl)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),wolfssl)
+CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+endif
+
 ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
+CMAKE_OPTIONS += -DBBFDMD_ENABLED=ON
 CMAKE_OPTIONS += \
 	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
 endif
@@ -94,41 +173,30 @@ endif
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/scripts/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
-	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
 endef
 
-define Package/libbbfdm/install
+define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/share/bbfdm/libbbfdm.so
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
-	$(INSTALL_BIN) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/97-firewall-service
-	$(INSTALL_BIN) ./files/etc/uci-defaults/99-link-core-plugins $(1)/etc/uci-defaults/99-link-core-plugins
-	$(INSTALL_BIN) ./files/etc/uci-defaults/90-remove-nonexisting-microservices $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
-	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
-ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
-	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so $(1)
-endif
 ifeq ($(CONFIG_BBF_TR143),y)
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm/scripts/
-	$(LN) /usr/share/bbfdm/scripts/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
+	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+endif
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+endif
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 endif
 endef
 
-define Package/libbbfdm/prerm
+define Package/libbbfdm/default/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
@@ -136,26 +204,56 @@ endef
 
 define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
-	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
-	$(INSTALL_BIN) ./files/etc/init.d/bbfdm.services $(1)/etc/init.d/
 	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/src/bbfdmd $(1)/usr/sbin/
 endef
 
+define Package/userinterface/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DATA) ./files/etc/config/userinterface $(1)/etc/config/userinterface
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/userinterface $(1)/lib/upgrade/keep.d/userinterface
+	$(INSTALL_BIN) ./files/etc/init.d/userinterface $(1)/etc/init.d/userinterface
+	$(INSTALL_BIN) ./files/etc/uci-defaults/93-userinterface-firewall $(1)/etc/uci-defaults/93-userinterface-firewall
+	$(INSTALL_BIN) ./files/etc/uci-defaults/94-userinterface-json $(1)/etc/uci-defaults/94-userinterface-json
+	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
+endef
+
+Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
+
+Package/libbbfdm/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/tr181/device.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/vendor.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	# Work around for backward compatibility
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbf_api/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/libbbfdm_api.h $(1)/usr/include/libbbf_api.h
 endef
 
 $(eval $(call BuildPackage,libbbfdm-api))
 $(eval $(call BuildPackage,libbbfdm))
+$(eval $(call BuildPackage,libbbfdm-openssl))
+$(eval $(call BuildPackage,libbbfdm-wolfssl))
+$(eval $(call BuildPackage,libbbfdm-mbedtls))
 $(eval $(call BuildPackage,bbfdmd))
+
+$(eval $(call BuildPackage,userinterface))

bbfdm/README.md

@@ -1,40 +0,0 @@
-# BBFDM configuration options and utilities
-
-bbfdm provides few compile time configuration options and compile time help utility called [bbfdm.mk](./bbfdm.mk), this document aimed to explain the available usages and best practices.
-
-## Compilation options
-
-|  Configuration option    | Description   | Default Value |
-| -----------------------  | ------------- | ----------- |
-| CONFIG_BBF_VENDOR_LIST   | List of vendor extension directories | iopsys        |
-| CONFIG_BBF_VENDOR_PREFIX | Prefix for Vendor extension datamodel objects/parameters | X_IOPSYS_EU_  |
-| CONFIG_BBF_TR143         | Enable/Add TR-143 Data Model Support | y             |
-| CONFIG_BBF_TR471         | Enable/Add TR-471 Data Model Support | y             |
-| CONFIG_BBF_MAX_OBJECT_INSTANCES | Maximum number of instances per object | 255    |
-| BBF_OBFUSCATION_KEY      | Hash used to encode/decode in `bbf.secure` object | 371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04 |
-
-
-#### BBF_OBFUSCATION_KEY
-
-`bbfdm` provides an ubus object called `bbf.secure` to allow encoding/decoding the values, `bbf.secure` currently support following methods internally to encode/decode
-
-  - Encode/Decode using a predefined SHA512 Hash key
-  - Encode/Decode using a private/public RSA key pair
-
-The `BBF_OBFUSCATION_KEY` compile time configuration option used to defined the SHA512 HASH, if this option is undefined, then it usages a default value as mention in the above table.
-
-User must override this parameter with their own hash value, to generate a hash user can run below command and copy the hash value to this option.
-
-ex: User wants to use 'Sup3rS3cur3Passw0rd' as passkey, then can get the SHA512 sum with
-
-```bash
-$ echo -n "Sup3rS3cur3Passw0rd" | sha512sum
-371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04  -
-```
-
-> Note: Additionally, user can install RSA private key in '/etc/bbfdm/certificates/private_key.pem' path, if private key is present `bbf.secure` shall use rsa private certificate for encrypt/decrypt function. In case of key not present in the pre-defined path, hash will be used for the same.
-
-## Helper utility (bbfdm.mk)
-
-bbfdm provides a helper utility [bbfdm.mk](./bbfdm.mk) to install datamodel plugins in bbfdm core or in microservice directory.
-

bbfdm/bbfdm.mk

@@ -1,96 +0,0 @@
-#
-# Copyright (C) 2023 IOPSYS
-#
-
-BBFDM_BASE_DM_PATH=/usr/share/bbfdm
-BBFDM_INPUT_PATH=/etc/bbfdm/micro_services
-BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-
-#BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile)
-#BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools
-
-# Utility to install the plugin in bbfdm core path with priority.
-# Its now possible to overwrite/remove core datamodel with plugin, so, if some
-# datamodel objects/parameters are present in more than one plugin, order in
-# which they loaded into memory becomes crucial, this Utility help to configure
-# a priority order in which they gets loaded in memory.
-#
-# ARGS:
-#  $1 => Plugin artifact
-#  $2 => package install directory
-#  $3 => Priority of the installed plugin (Optional)
-#
-# Note:
-# - Last loaded plugin gets the highest priority
-#
-# Example:
-#  BBFDM_INSTALL_CORE_PLUGIN ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)
-#
-# Example to install plugin with priority:
-#  BBFDM_INSTALL_CORE_PLUGIN ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) 01
-#
-BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p
-
-
-# Utility to install the micro-service datamodel
-# Use Case:
-# user wants to run a datamodel micro-service, it required to install the
-# DotSO/JSON plugin into a bbf shared directory, this utility helps in
-# installing the DotSO/JSON plugin in bbfdm shared directory, and auto-generate
-# input file for the micro-service
-#
-# ARGS:
-#  $1 => DotSo or Json plugin with complete path
-#  $2 => package install directory
-#  $3 => service name
-#
-# 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
-#
-# Example:
-#  BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME)
-#
-BBFDM_INSTALL_MS_DM:=$(BBFDM_DIR)/tools/bbfdm.sh -m
-
-
-# Utility to install a plugins in datamodel micro-service
-#
-# ARGS:
-#  $1 => DotSo or Json plugin with complete path
-#  $2 => package install directory
-#  $3 => service name
-#
-# Note:
-# - Use the service_name/PKG_NAME of the service in which this has to run
-#
-# Example:
-#  BBFDM_INSTALL_MS_PLUGIN $(PKG_BUILD_DIR)/libxmpp.so $(1) icwmp
-#
-BBFDM_INSTALL_MS_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -m -p
-
-
-# Deprecated functions errors
-define BbfdmInstallPluginInMicroservice
-	$(warning # BbfdmInstallPluginInMicroservice function is deprecated, use BBFDM_INSTALL_MS_PLUGIN macro #)
-	$(INSTALL_DIR) $(1)
-	$(INSTALL_DATA) $(2) $(1)/
-endef
-
-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/files/etc/bbfdm/input.json

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

bbfdm/files/etc/config/bbfdm

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

bbfdm/files/etc/firewall.portmap

@@ -1,74 +0,0 @@
-#!/bin/sh
-
-. /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 -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 -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 -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 -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
-
-		# 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
-
-		if [ -n "${EMPTY_HOST}" ]; then
-			echo "${EMPTY_HOST}" | while read cmd; do
-				cmd1="iptables -t nat $(echo $cmd)"
-				exec_cmd $cmd1
-			done
-		fi
-
-		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
-}
-
-# Re-order portmapping rules according to precedence hierarchy
-reorder_dnat_rules

bbfdm/files/etc/firewall.service

@@ -1,163 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-log() {
-	echo "${@}"|logger -t firewall.service -p info
-}
-
-exec_cmd() {
-	if ! eval "$*"; then
-		log "Failed to run [$*]"
-		echo "-1"
-		return 0
-	fi
-
-	echo "0"
-	return 0
-}
-
-add_iptable_rule() {
-	chain_name=$1
-	protocol=$2
-	dest_port=$3
-	icmp_type=$4
-	family=$5
-	src_prefix=$6
-	action=$7
-	res=-1
-
-	cmd="-I ${chain_name}"
-
-	if [ -n "${protocol}" ]; then
-		cmd="${cmd} -p $protocol"
-
-		if [ "${protocol}" -eq 41 ] || [ "${protocol}" -eq 43 ] || [ "${protocol}" -eq 44 ] ||
-		   [ "${protocol}" -eq 58 ] || [ "${protocol}" -eq 59 ] || [ "${protocol}" -eq 60 ]; then
-		   	# Explicit v6 protocols
-			if [ "${family}" = "ipv4" ]; then
-				echo $res
-				return 0
-			else
-				family="ipv6"
-			fi
-		elif [ "${protocol}" -eq 1 ]; then
-		   	# Explicit v4 protocols
-			if [ "${family}" = "ipv6" ]; then
-				echo $res
-				return 0
-			else
-				family="ipv4"
-			fi
-		fi
-
-		# Limitation:: iptables do not accept dport without specific protocol
-		count=$(echo "${dest_port}" | sed -n "/-1/p" | wc -l)
-
-		if [ "${count}" -eq 0 ]; then
-			# dest_port not contains -1 so need to have this match criteria
-			count=$(echo "${dest_port}" | wc -w)
-			if [ "${count}" -gt 1 ]; then
-				# multiple ports present
-				port=$(echo "${dest_port}" | sed "s/ /,/g")
-				cmd="${cmd} -m multiport --dports ${port}"
-			else
-				cmd="${cmd} --dport ${dest_port}"
-			fi
-		fi
-	fi
-
-	if [ "${family}" = "ipv4" ] || [ "${family}" = "-1" ]; then
-		if [ "${protocol}" -eq 1 ] && [ "${icmp_type}" -ge 0 ]; then
-			cmd="${cmd} --icmp-type ${icmp_type}"
-		fi
-
-		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd "iptables ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
-		else
-			#Add ipv4 sources if any
-			src_list=""
-			for src in $src_prefix; do
-				ret=$(echo $src | grep ":" | wc -l)
-				if [ "${ret}" -eq 0 ]; then
-					src_list="$src,$src_list"
-				fi
-			done
-
-			if [ -n "$src_list" ]; then
-				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd "iptables -s $src_list ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
-			fi
-		fi
-	fi
-
-	if [ "${family}" = "ipv6" ] || [ "${family}" = "-1" ]; then
-		if [ "${protocol}" -eq 58 ] && [ "${icmp_type}" -ge 0 ]; then
-			cmd="${cmd} --icmpv6-type ${icmp_type}"
-		fi
-
-		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd "ip6tables ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
-		else
-			#Add ipv6 sources if any
-			src_list=""
-			for src in $src_prefix; do
-				ret=$(echo $src | grep ":" | wc -l)
-				if [ "${ret}" -eq 1 ]; then
-					src_list="$src,$src_list"
-				fi
-			done
-
-			if [ -n "$src_list" ]; then
-				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd "ip6tables -s $src_list ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
-			fi
-		fi
-	fi
-
-	echo $res
-}
-
-add_service() {
-	local enable proto family dest_port interface target icmp_type
-
-	config_get enable "$1" enable "0"
-	config_get icmp_type "$1" icmp_type "-1"
-	config_get target "$1" target "Accept"
-	config_get interface "$1" interface ""
-	config_get family "$1" family "-1"
-	config_get dest_port "$1" dest_port "-1"
-	config_get proto "$1" proto "-1"
-	config_get src_prefix "$1" src_prefix ""
-
-	if [ "${enable}" -eq 0 ] || [ -z "${interface}" ]; then
-		return 0
-	fi
-
-	action=$(echo "${target}" | tr a-z A-Z)
-	chain_name="zone_${interface}_input"
-	res=0
-
-	count=$(echo "${proto}" | sed -n "/-1/p" | wc -l)
-
-	if [ "${count}" -eq 0 ]; then
-		# proto not contains -1 so need to have this match criteria
-		for protocol in $proto; do
-			res=$(add_iptable_rule "$chain_name" "$protocol" "$dest_port" "$icmp_type" "$family" "$src_prefix" "$action")
-		done
-	else
-		# proto contains -1 so no need to have this match criteria
-		res=$(add_iptable_rule "$chain_name" "" "$dest_port" "$icmp_type" "$family" "$src_prefix" "$action")
-	fi
-
-	if [ "${res}" -ne 0 ]; then
-		uci -q set firewall."${1}".status="Error"
-	else
-		uci -q set firewall."${1}".status=""
-	fi
-
-	uci commit firewall
-}
-
-config_load firewall
-config_foreach add_service "service"

bbfdm/files/etc/hotplug.d/iface/85-bbfdm-sysctl

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" = "ifup" ] || exit 0
-
-apply_sysctl_configuration() {
-        local sysctl_conf
-
-        sysctl_conf="/etc/bbfdm/sysctl.conf"
-
-        [ -f "${sysctl_conf}" ] || touch "${sysctl_conf}"
-
-        sysctl -e -p "${sysctl_conf}" >&-
-}
-
-
-ubus -t 10 wait_for network.device
-apply_sysctl_configuration

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

@@ -1,106 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=40
-STOP=8
-
-USE_PROCD=1
-PROG=/usr/sbin/bbfdmd
-
-BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
-
-. /usr/share/libubox/jshn.sh
-
-log() {
-	echo "${@}"|logger -t bbfdmd.services -p info
-}
-
-validate_bbfdm_micro_service_section()
-{
-	uci_validate_section bbfdm micro_services "micro_services" \
-		'enable:bool:true' \
-		'enable_core:bool:false' \
-		'enable_respawn:bool:true'
-}
-
-_add_microservice()
-{
-	local name path
-	local enable enable_core enable_respawn
-
-	# Check enable from micro-service
-	path="${1}"
-	enable_respawn="${2}"
-	enable_core="${3}"
-
-	name="$(basename ${path})"
-	name="${name//.json}"
-
-	enable="$(jq '.daemon.enable//1' ${path})"
-	if [ "${enable}" -eq "0" ]; then
-		log "datamodel micro-service ${name} not enabled"
-		return 0
-	fi
-
-	procd_open_instance "${name}"
-
-	procd_set_param command ${PROG}
-	procd_append_param command -m "${name}"
-
-	if [ "${enable_core}" -eq "1" ]; then
-		procd_set_param limits core="unlimited"
-		procd_set_param stdout 1
-		procd_set_param stderr 1
-	fi
-
-	if [ "${enable_respawn}" -eq "1" ]; then
-		procd_set_param respawn "3600" "5" "5"
-	fi
-	procd_close_instance "${name}"
-}
-
-configure_bbfdm_micro_services()
-{
-	local enable enable_core enable_respawn
-
-	config_load bbfdm
-	validate_bbfdm_micro_service_section || {
-		log "Validation of micro_service section failed"
-		return 1;
-	}
-
-	[ "${enable}" -eq "0" ] && return 0
-
-	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
-		FILES="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/*.json)"
-
-		for file in $FILES;
-		do
-			[ -e "$file" ] || continue
-
-			_add_microservice $file "${enable_respawn}" "${enable_core}"
-		done
-	fi
-}
-
-_start_single_service()
-{
-	local service file
-
-	service="${1}"
-
-	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
-		file="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/${service}.json)"
-		[ -e "$file" ] || return
-
-		_add_microservice $file "0" "0"
-	fi
-}
-
-start_service()
-{
-	if [ -n "${1}" ]; then
-		_start_single_service "${1}"
-	else
-		configure_bbfdm_micro_services
-	fi
-}

bbfdm/files/etc/init.d/bbfdmd

@@ -1,16 +1,11 @@
 #!/bin/sh /etc/rc.common
 
-START=65
+START=96
 STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
-BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_DIR="/tmp/bbfdm"
-
-. /usr/share/libubox/jshn.sh
-
 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
 }
@@ -18,31 +13,25 @@ log() {
 validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
-		'enable:bool:true' \
-		'sock:string' \
+		'enabled:bool:true' \
 		'debug:bool:false' \
-		'loglevel:uinteger:1' \
-		'refresh_time:uinteger:0' \
-		'transaction_timeout:uinteger:30' \
-		'subprocess_level:uinteger'
+		'loglevel:uinteger' \
+		'sock:string' \
+		'transaction_timeout:string'
 }
 
 configure_bbfdmd()
 {
-	local enable debug sock
-	local jlog jrefresh jtimeout jlevel
+	local enabled debug sock transaction_timeout
 
 	config_load bbfdm
+
 	validate_bbfdm_bbfdmd_section || {
 		log "Validation of bbfdmd section failed"
 		return 1;
 	}
 
-	[ "${enable}" -eq 0 ] && return 0
-
-	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
-	fi
+	[ "${enabled}" -eq 0 ] && return 0
 
 	procd_set_param command ${PROG}
 	if [ "${debug}" -eq 1 ]; then
@@ -53,19 +42,42 @@ configure_bbfdmd()
 	if [ -f "${sock}" ]; then
 		procd_append_param command -s "${sock}"
 	fi
+
+	if [ -n "${transaction_timeout}" ]; then
+		procd_append_param command -t "${transaction_timeout}"
+	fi
 }
 
-start_service()
-{
-	mkdir -p ${BBFDM_TEMP_DIR}
+apply_sysctl_configuration() {
+	local sysctl_conf
 
-	procd_open_instance "bbfdm"
+	sysctl_conf="/etc/bbfdm/sysctl.conf"
+	
+	[ -f "${sysctl_conf}" ] || touch "${sysctl_conf}"
+
+	sysctl -e -p "${sysctl_conf}" >&-
+}
+
+start_service() {
+	local sysctl_reload
+
+	ubus -t 5 wait_for network.device
+	[ "$?" -eq 0 ] && sysctl_reload=1
+
+	procd_open_instance bbf
 	configure_bbfdmd
 	procd_set_param respawn
-	procd_close_instance "bbfdm"
+	procd_close_instance
+
+	[ "${sysctl_reload}" -eq 1 ] && apply_sysctl_configuration
+}
+
+reload_service() {
+	ubus -t 5 wait_for network.device
+	apply_sysctl_configuration
 }
 
 service_triggers()
 {
-	procd_add_reload_trigger "bbfdm"
+	procd_add_reload_trigger "bbfdm" "network"
 }

bbfdm/files/etc/init.d/userinterface

@@ -0,0 +1,33 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=01
+
+USE_PROCD=1
+
+start_service() {
+	local enable
+
+	config_load userinterface
+	config_get_bool enable global enable 1
+
+	if [ ! -f "/etc/config/nginx" ]; then
+		return 0
+	fi
+
+	if [ "${enable}" -eq "1" ]; then
+		ubus call service state '{"name":"nginx", "spawn":true}'
+	else
+		ubus call service state '{"name":"nginx", "spawn":false}'
+	fi
+
+	# Inject firewall rules
+	procd_open_instance userinterface
+	/etc/firewall.userinterface
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "userinterface" "nginx"
+}

bbfdm/files/etc/uci-defaults/90-remove-nonexisting-microservices

@@ -1,18 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-
-remove_nonexisting_microservice() {
-	local input_json
-
-	config_get input_json "$1" input_json ""
-
-	if [ -z "${input_json}" ]; then
-		uci_remove bbfdm "${1}"
-	fi
-}
-
-config_load bbfdm
-config_foreach remove_nonexisting_microservice "micro_service"
-
-exit 0
-

bbfdm/files/etc/uci-defaults/91-fix-bbfdmd-enabled-option

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# rename bbfdmd enabled option to enable
-val="$(uci -q get bbfdm.bbfdmd.enabled)"
-if [ -n "${val}" ]; then
-	uci -q set bbfdm.bbfdmd.enabled=""
-	uci -q set bbfdm.bbfdmd.enable="${val}"
-fi
-
-exit 0
-

bbfdm/files/etc/uci-defaults/93-userinterface-firewall

@@ -3,7 +3,7 @@
 uci -q batch <<-EOT
         delete firewall.userinterface
         set firewall.userinterface=include
-        set firewall.userinterface.path=/etc/userinterface/firewall.userinterface
+        set firewall.userinterface.path=/etc/firewall.userinterface
         set firewall.userinterface.reload=1
         commit firewall
 EOT

bbfdm/files/etc/uci-defaults/95-portmap-firewall

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

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

@@ -1,62 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-bbfdm_sysctl_conf="/etc/bbfdm/sysctl.conf"
-
-update_device_section() {
-	local section="${1}"
-	local dev_name="${2}"
-	local ipv6="${3}"
-	local name
-
-	# Get name value
-	config_get name "${section}" name
-
-	# Retrun if the name value is different to the dev_name value
-	[ "${name}" != "${dev_name}" ] && return
-	
-	if [ "${ipv6}" = "0" ]; then
-		ipv6="1"
-	else
-		ipv6="0"
-	fi
-
-	# Add ipv6 option
-	uci -q set network.${section}.ipv6="${ipv6}"
-}
-
-parse_bbfdm_sysctl_conf_file() {
-	# Check if the file exists
-	[ -f "${bbfdm_sysctl_conf}" ] || return
-
-	# Create a temporary file
-	tmpfile=$(mktemp)
-
-	# Load network config
-	config_load network
-
-	# Read each line of the file
-	while read -r line; do
-		if echo "$line" | grep -Eq '^net\.ipv6\.conf\.(.+)\.disable_ipv6=([0-1])$'; then
-			name=$(echo "$line" | sed -n 's/^net\.ipv6\.conf\.\(.*\)\.disable_ipv6=[0-1]$/\1/p')
-			value=$(echo "$line" | sed -n 's/^net\.ipv6\.conf\.\(.*\)\.disable_ipv6=\([0-1]\)$/\2/p')
-
-			config_foreach update_device_section device "${name}" "${value}"
-		else
-			# If the line doesn't match, preserve it in the temporary file
-			echo "$line" >> "$tmpfile"
-		fi
-	done < "${bbfdm_sysctl_conf}"
-
-	# 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
-
-exit 0

bbfdm/files/etc/uci-defaults/97-firewall-service

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

bbfdm/files/etc/uci-defaults/99-link-core-plugins

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-UNIFIED_PATH="/usr/share/bbfdm/plugins/"
-
-log() {
-	echo "$@" | logger -t bbfdm.uci-default -p info
-}
-
-# Link JSON plugins
-for f in `ls -1 /etc/bbfdm/json/*.json`; do
-	log "# BBFDM JSON plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-# Link DotSo plugins
-for f in `ls -1 /usr/lib/bbfdm/*.so`; do
-	log "# BBFDM DotSO plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-# Link JSON plugins
-for f in `ls -1 /etc/bbfdm/plugins/*.json`; do
-	log "# BBFDM JSON plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-# Link DotSo plugins
-for f in `ls -1 /etc/bbfdm/plugins/*.so`; do
-	log "# BBFDM DotSO plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-exit 0
-

bbfdm/files/lib/upgrade/keep.d/userinterface

@@ -0,0 +1 @@
+/etc/nginx/allow_host_*

bbfdm/tools/bbfdm.sh

@@ -1,141 +0,0 @@
-#!/bin/bash
-
-BBFDM_BASE_DM_PATH="usr/share/bbfdm"
-BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
-INPUT_TEMPLATE='{"daemon":{"service_name":"template","config":{"loglevel":"1"}}}'
-
-MICRO_SERVICE=0
-PLUGIN=0
-DEST=""
-TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-SRC=""
-
-while getopts ":mp" opt; do
-	case ${opt} in
-	  m)
-	  	MICRO_SERVICE=1
-		;;
-	  p)
-	  	PLUGIN=1
-		;;
-	  ?)
-	  	echo "Invalid option: ${OPTARG}"
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-SRC="${1}"
-shift
-DEST="${1}"
-shift
-DATA="${1}"
-
-install_bin() {
-	if ! install -m0755 ${1} ${2}; then
-		echo "Failed to install bin ${1} => ${2}"
-		exit 1
-	fi
-}
-
-install_dir() {
-	if ! install -d -m0755 ${1}; then
-		echo "Failed to create directory ${1}"
-		exit 1
-	fi
-}
-
-install_data() {
-	if ! install -m0644 ${1} ${2}; then
-		echo "Failed to install ${1} => ${2}"
-		exit 1
-	fi
-}
-
-# Installing datamodel
-bbfdm_install_dm()
-{
-	local src dest minfile
-
-	src="$1"
-	dest="$2"
-	minfile=""
-
-	if [ -z ${src} ] || [ -z "${dest}" ] || [ -z "${TOOLS}" ]; then
-		echo "Invalid input option for install dm $@"
-		exit 1
-	fi
-
-	if [ "${src##*.}" = "json" ]; then
-		echo "Compacting BBFDM JSON file"
-		minfile=$(mktemp)
-		jq -c 'del(..|.description?)' ${src} > ${minfile}
-
-		src=${minfile}
-		if dpkg -s python3-jsonschema >/dev/null 2>&1; then
-			echo "Verifying bbfdm Datamodel JSON file"
-			if ! ${TOOLS}/validate_plugins.py ${src}; then
-				echo "Validation of the plugin failed ${src}"
-				exit 1
-			fi
-		else
-			echo "## Install python3-jsonschema to verify datamodel plugins"
-		fi
-	fi
-
-	install_bin ${src} ${dest}
-
-	if [ -f "${minfile}" ]; then
-		rm ${minfile}
-	fi
-}
-
-bbfdm_generate_input()
-{
-	local dest ser
-
-	dest_dir=${1}
-	ser=${2}
-	dest=${dest_dir}/${ser}.json
-
-	echo ${INPUT_TEMPLATE} | jq --arg service "$ser" '.daemon.service_name = $service' > ${dest}
-	chmod 466 ${dest}
-}
-
-if [ -z "$SRC" ] || [ -z "${DEST}" ] ; then
-	echo "# BBFDM Null value in src[${SRC}], dest[${DEST}]"
-	exit 1
-fi
-
-if [ "${MICRO_SERVICE}" -eq "1" ]; then
-	if [ -z "${DATA}" ]; then
-		echo "# service_name[${DATA}] not provided"
-		exit 1
-	fi
-
-	if [ "${PLUGIN}" -ne "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}/$(basename ${SRC})
-	fi
-else
-	if [ "${PLUGIN}" -eq "1" ]; then
-		priority="${DATA:-0}"
-		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}/plugins/${priority}_$(basename ${SRC})
-		else
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC})
-		fi
-	fi
-fi
-

bbfdm/tools/validate_plugins.py

@@ -1,330 +0,0 @@
-#!/usr/bin/python3
-
-# Copyright (C) 2024 iopsys Software Solutions AB
-# Author: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
-
-import sys
-import json
-from jsonschema import validate
-
-JSON_PLUGIN_VERSION = 0
-
-obj_schema = {
-	"definitions": {
-		"type_t": {
-			"type": "string",
-			"enum": [
-				"object"
-			]
-		},
-		"map_type_t": {
-			"type": "string",
-			"enum": [
-				"uci",
-				"ubus"
-			]
-		},
-		"protocols_t": {
-			"type": "string",
-			"enum": [
-				"cwmp",
-				"usp"
-			]
-		}
-	},
-	"type" : "object",
-	"properties" : {
-		"type" : {"$ref": "#/definitions/type_t"},
-		"version" : {"type": "string"},
-		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
-		"uniqueKeys" : {"type" : "array"},
-		"access" : {"type" : "boolean"},
-		"array" : {"type" : "boolean"},
-		"mapping" : {"type" : "object", "properties" : {
-				"type" : {"$ref": "#/definitions/map_type_t"},
-				"uci" : {"type" : "object", "properties" : {
-						"file" : {"type": "string"},
-						"section" : {"type": "object", "properties" : {
-								"type" : {"type": "string"}
-							}
-						},
-						"dmmapfile" : {"type": "string"}
-					}
-				},
-				"ubus" : {"type" : "object", "properties" : {
-						"object" : {"type": "string"},
-						"method" : {"type": "string"},
-						"args" : {"type": "object"},
-						"key" : {"type": "string"}
-					}
-				}
-			}
-		}
-	},
-	"required": [
-		"type",
-		"protocols",
-		"array",
-		"access"
-	]
-}
-
-obj_schema_v1 = {
-	"definitions": {
-		"type_t": {
-			"type": "string",
-			"enum": [
-				"object"
-			]
-		},
-		"map_type_t": {
-			"type": "string",
-			"enum": [
-				"uci",
-				"ubus"
-			]
-		},
-		"protocols_t": {
-			"type": "string",
-			"enum": [
-				"cwmp",
-				"usp",
-				"none"
-			]
-		}
-	},
-	"type" : "object",
-	"properties" : {
-		"type" : {"$ref": "#/definitions/type_t"},
-		"version" : {"type": "string"},
-		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
-		"uniqueKeys" : {"type" : "array"},
-		"access" : {"type" : "boolean"},
-		"array" : {"type" : "boolean"},
-		"mapping" : {"type" : "array", "items" : {
-			"type" : "object", "properties" : {
-				"type" : {"$ref": "#/definitions/map_type_t"},
-					"uci" : {"type" : "object", "properties" : {
-							"file" : {"type": "string"},
-							"section" : {"type": "object", "properties" : {
-									"type" : {"type": "string"}
-								}
-							},
-							"dmmapfile" : {"type": "string"}
-						}
-					},
-					"ubus" : {"type" : "object", "properties" : {
-							"object" : {"type": "string"},
-							"method" : {"type": "string"},
-							"args" : {"type": "object"},
-							"key" : {"type": "string"}
-						}
-					}
-				}
-			}
-		}
-	},
-	"required": [
-		"type",
-		"protocols",
-		"array",
-		"access"
-	]
-}
-
-param_schema = {
-	"definitions": {
-		"type_t": {
-			"type": "string",
-			"enum": [
-				"string",
-				"unsignedInt",
-				"unsignedLong",
-				"int",
-				"long",
-				"boolean",
-				"dateTime",
-				"hexBinary",
-				"base64",
-				"decimal"
-			]
-		},
-		"map_type_t": {
-			"type": "string",
-			"enum": [
-				"uci",
-				"ubus",
-				"procfs",
-				"sysfs",
-				"json",
-				"uci_sec"
-			]
-		},
-		"protocols_t": {
-			"type": "string",
-			"enum": [
-				"cwmp",
-				"usp",
-				"none"
-			]
-		}
-	},
-	"type" : "object",
-	"properties" : {
-		"type" : {"$ref": "#/definitions/type_t"},
-		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
-		"read" : {"type" : "boolean"},
-		"write" : {"type" : "boolean"},
-		"mapping" : {"type" : "array", "items" : {"type": "object", "properties" : {
-					"type" : {"$ref": "#/definitions/map_type_t"},
-					"uci" : {"type" : "object", "properties" : {
-							"file" : {"type": "string"},
-							"section" : {"type": "object", "properties" : {
-									"type" : {"type": "string"},
-									"index" : {"type": "string"}
-								}
-							},
-							"option" : {"type": "object", "properties" : {
-									"name" : {"type": "string"}								}
-							}
-						}
-					},
-					"ubus" : {"type" : "object", "properties" : {
-							"object" : {"type": "string"},
-							"method" : {"type": "string"},
-							"args" : {"type": "object"},
-							"key" : {"type": "string"}
-						}
-					},
-					"procfs" : {"type" : "object", "properties" : {
-							"file" : {"type": "string"}
-						}
-					},
-					"sysfs" : {"type" : "object", "properties" : {
-							"file" : {"type": "string"}
-						}
-					}
-				}
-			}
-		}
-	},
-	"required": [
-		"type",
-		"protocols",
-		"read",
-		"write"
-	]
-}
-
-event_schema = {
-	"definitions": {
-		"type_t": {
-			"type": "string",
-			"enum": [
-				"event"
-			]
-		},
-		"protocols_t": {
-			"type": "string",
-			"enum": [
-				"usp"
-			]
-		}
-	},
-	"type" : "object",
-	"properties" : {
-		"type" : {"$ref": "#/definitions/type_t"},
-		"version" : {"type": "string"},
-		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}}
-	},
-	"required": [
-		"type",
-		"protocols"
-	]
-}
-
-command_schema = {
-	"definitions": {
-		"type_t": {
-			"type": "string",
-			"enum": [
-				"command"
-			]
-		},
-		"protocols_t": {
-			"type": "string",
-			"enum": [
-				"usp"
-			]
-		}
-	},
-	"type" : "object",
-	"properties" : {
-		"type" : {"$ref": "#/definitions/type_t"},
-		"async" : {"type" : "boolean"},
-		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
-		"input" : {"type" : "object"},
-		"output" : {"type" : "object"}
-	},
-	"required": [
-		"type",
-		"async",
-		"protocols"
-	]
-}
-
-def print_validate_json_usage():
-    print("Usage: " + sys.argv[0] + " <dm json file>")
-    print("Examples:")
-    print("  - " + sys.argv[0] + " datamodel.json")
-    print("    ==> Validate the json file")
-    print("")
-    exit(1)
-
-def parse_value( key , value ):
-
-    if key.endswith('.') and not key.startswith('Device.'):
-        print(key + " is not a valid path")
-        exit(1)
-
-    if key.endswith('.') and (JSON_PLUGIN_VERSION == 1 or JSON_PLUGIN_VERSION == 2):
-        __schema = obj_schema_v1
-    elif key.endswith('.'):
-        __schema = obj_schema
-    elif key.endswith('!'):
-        __schema = event_schema
-    elif key.endswith('()'):
-        __schema = command_schema
-    else:
-        __schema = param_schema
-    
-    validate(instance = value, schema = __schema)
-    
-    for k, v in value.items():
-        if k != "list" and k != "mapping" and k != "input" and k != "output" and isinstance(v, dict):
-            parse_value(k, v)
-
-### main ###
-if len(sys.argv) < 2:
-    print_validate_json_usage()
-    
-json_file = open(sys.argv[1], "r", encoding='utf-8')
-try:
-    json_data = json.loads(json_file.read())
-except ValueError:
-    print(sys.argv[1] + " file has a wrong JSON format!!!!!")
-    exit(1)
-
-for __key, __value in json_data.items():
-
-    if __key == "json_plugin_version":
-
-        if not isinstance(__value, int) or __value not in [0, 1, 2]:
-            raise ValueError("Invalid value for json_plugin_version")
-
-        JSON_PLUGIN_VERSION = __value
-        continue
-
-    parse_value(__key , __value)
-
-print("JSON File is Valid")

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.10
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=e472e90feec31d9f318ea8c732ab564002e25db1
+PKG_SOURCE_VERSION:=2dd55d9c9eb01ed1b11e16bad9e2c3e8badfffeb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,7 +22,6 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/$(PKG_NAME)
   SECTION:=utils
@@ -44,14 +43,10 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(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/
-	$(INSTALL_DATA) ./files/etc/uci-defaults/95-bulkdata-translation-options $(1)/etc/uci-defaults/
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json $(1) $(PKG_NAME)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
+	$(CP) ./files/* $(1)/
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

bulkdata/bulkdata/usr/share/bbfdm/micro_services/bulkdata.json

@@ -1,960 +0,0 @@
-{
-	"json_plugin_version": 2,
-	"Device.BulkData.": {
-		"type": "object",
-		"protocols": [
-			"cwmp",
-			"usp"
-		],
-		"access": false,
-		"array": false,
-		"Enable": {
-			"type": "boolean",
-			"read": true,
-			"write": true,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"datatype": "boolean",
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "bulkdata",
-						"section": {
-							"name": "bulkdata"
-						},
-						"option": {
-							"name": "enable"
-						}
-					}
-				}
-			]
-		},
-		"Status": {
-			"type": "string",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"datatype": "string",
-			"enumerations": [
-				"Enabled",
-				"Disabled",
-				"Error"
-			],
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "bulkdata",
-						"section": {
-							"name": "bulkdata"
-						},
-						"option": {
-							"name": "enable"
-						}
-					}
-				}
-			]
-		},
-		"MinReportingInterval": {
-			"type": "unsignedInt",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"default": "0",
-			"datatype": "unsignedInt",
-			"unit": "seconds"
-		},
-		"Protocols": {
-			"type": "string",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"default": "HTTP",
-			"list": {
-				"datatype": "string",
-				"enumerations": [
-					"Streaming",
-					"File",
-					"HTTP",
-					"MQTT"
-				]
-			}
-		},
-		"EncodingTypes": {
-			"type": "string",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"default": "JSON,CSV",
-			"list": {
-				"datatype": "string",
-				"enumerations": [
-					"XML",
-					"XDR",
-					"CSV",
-					"JSON"
-				]
-			}
-		},
-		"ParameterWildCardSupported": {
-			"type": "boolean",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"default": "1",
-			"datatype": "boolean"
-		},
-		"MaxNumberOfProfiles": {
-			"type": "int",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"default": "-1",
-			"datatype": "int",
-			"range": [
-				{
-					"min": -1
-				}
-			]
-		},
-		"MaxNumberOfParameterReferences": {
-			"type": "int",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"default": "-1",
-			"datatype": "int",
-			"range": [
-				{
-					"min": -1
-				}
-			]
-		},
-		"ProfileNumberOfEntries": {
-			"type": "unsignedInt",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"datatype": "unsignedInt",
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "bulkdata",
-						"section": {
-							"type": "profile"
-						},
-						"option": {
-							"name": "@Count"
-						}
-					}
-				}
-			]
-		},
-		"Device.BulkData.Profile.{i}.": {
-			"type": "object",
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"access": true,
-			"array": true,
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "bulkdata",
-						"section": {
-							"type": "profile"
-						},
-						"dmmapfile": "dmmap_bulkdata"
-					}
-				}
-			],
-			"Enable": {
-				"type": "boolean",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "boolean",
-				"mapping": [
-					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "enable"
-					}
-				]
-			},
-			"Alias": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "Alias",
-				"range": [
-					{
-						"max": 64
-					}
-				],
-				"flags": [
-					"Unique"
-				],
-				"mapping": [
-					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "alias"
-					}
-				]
-			},
-			"Name": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "string",
-				"range": [
-					{
-						"max": 255
-					}
-				],
-				"mapping": [
-					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "name"
-					}
-				]
-			},
-			"NumberOfRetainedFailedReports": {
-				"type": "int",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "int",
-				"range": [
-					{
-						"min": -1
-					}
-				],
-				"mapping": [
-					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "nbre_of_retained_failed_reports"
-					}
-				]
-			},
-			"Protocol": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "string",
-				"enumerations": [
-					"Streaming",
-					"File",
-					"HTTP"
-				],
-				"mapping": [
-					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "protocol"
-					}
-				]
-			},
-			"EncodingType": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "string",
-				"enumerations": [
-					"XML",
-					"XDR",
-					"CSV",
-					"JSON"
-				],
-				"mapping": [
-					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "encoding_type"
-					}
-				]
-			},
-			"ReportingInterval": {
-				"type": "unsignedInt",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "unsignedInt",
-				"range": [
-					{
-						"min": 1
-					}
-				],
-				"unit": "seconds",
-				"mapping": [
-					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "reporting_interval"
-					}
-				]
-			},
-			"TimeReference": {
-				"type": "dateTime",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "dateTime",
-				"mapping": [
-					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "time_reference"
-					}
-				]
-			},
-			"ParameterNumberOfEntries": {
-				"type": "unsignedInt",
-				"read": true,
-				"write": false,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "unsignedInt",
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "bulkdata",
-							"section": {
-								"type": "profile_parameter"
-							},
-							"option": {
-								"name": "@Count"
-							}
-						}
-					}
-				]
-			},
-			"Device.BulkData.Profile.{i}.Parameter.{i}.": {
-				"type": "object",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"access": true,
-				"array": true,
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "bulkdata",
-							"section": {
-								"type": "profile_parameter"
-							},
-							"dmmapfile": "dmmap_bulkdata"
-						}
-					}
-				],
-				"Name": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"range": [
-						{
-							"max": 64
-						}
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "name"
-						}
-					]
-				},
-				"Reference": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"range": [
-						{
-							"max": 256
-						}
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "reference"
-						}
-					]
-				}
-			},
-			"Device.BulkData.Profile.{i}.CSVEncoding.": {
-				"type": "object",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"access": false,
-				"array": false,
-				"FieldSeparator": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "csv_encoding_field_separator"
-						}
-					]
-				},
-				"RowSeparator": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "csv_encoding_row_separator"
-						}
-					]
-				},
-				"EscapeCharacter": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "csv_encoding_escape_character"
-						}
-					]
-				},
-				"ReportFormat": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"enumerations": [
-						"ParameterPerRow",
-						"ParameterPerColumn"
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "csv_encoding_report_format"
-						}
-					]
-				},
-				"RowTimestamp": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"enumerations": [
-						"Unix-Epoch",
-						"ISO-8601",
-						"None"
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "csv_encoding_row_time_stamp"
-						}
-					]
-				}
-			},
-			"Device.BulkData.Profile.{i}.JSONEncoding.": {
-				"type": "object",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"access": false,
-				"array": false,
-				"ReportFormat": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"enumerations": [
-						"ObjectHierarchy",
-						"NameValuePair"
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "json_encoding_report_format"
-						}
-					]
-				},
-				"ReportTimestamp": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"enumerations": [
-						"Unix-Epoch",
-						"ISO-8601",
-						"None"
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "json_encoding_report_time_stamp"
-						}
-					]
-				}
-			},
-			"Device.BulkData.Profile.{i}.HTTP.": {
-				"type": "object",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"access": false,
-				"array": false,
-				"URL": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "URL",
-					"range": [
-						{
-							"max": 2048
-						}
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_url"
-						}
-					]
-				},
-				"Username": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"range": [
-						{
-							"max": 256
-						}
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_username"
-						}
-					]
-				},
-				"Password": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"range": [
-						{
-							"max": 256
-						}
-					],
-					"flags": [
-						"Secure"
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_password"
-						}
-					]
-				},
-				"CompressionsSupported": {
-					"type": "string",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"default": "GZIP",
-					"list": {
-						"datatype": "string",
-						"enumerations": [
-							"GZIP",
-							"Compress",
-							"Deflate"
-						]
-					}
-				},
-				"Compression": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"enumerations": [
-						"GZIP",
-						"Compress",
-						"Deflate"
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_compression"
-						}
-					]
-				},
-				"MethodsSupported": {
-					"type": "string",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"default": "POST,PUT",
-					"list": {
-						"datatype": "string",
-						"enumerations": [
-							"POST",
-							"PUT"
-						]
-					}
-				},
-				"Method": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "string",
-					"enumerations": [
-						"POST",
-						"PUT"
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_method"
-						}
-					]
-				},
-				"UseDateHeader": {
-					"type": "boolean",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "boolean",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_use_date_header"
-						}
-					]
-				},
-				"RetryEnable": {
-					"type": "boolean",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "boolean",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_retry_enable"
-						}
-					]
-				},
-				"RetryMinimumWaitInterval": {
-					"type": "unsignedInt",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "unsignedInt",
-					"range": [
-						{
-							"min": 1,
-							"max": 65535
-						}
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_retry_minimum_wait_interval"
-						}
-					]
-				},
-				"RetryIntervalMultiplier": {
-					"type": "unsignedInt",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "unsignedInt",
-					"range": [
-						{
-							"min": 1000,
-							"max": 65535
-						}
-					],
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_retry_interval_multiplier"
-						}
-					]
-				},
-				"RequestURIParameterNumberOfEntries": {
-					"type": "unsignedInt",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "unsignedInt",
-					"mapping": [
-						{
-							"type": "uci",
-							"uci": {
-								"file": "bulkdata",
-								"section": {
-									"type": "profile_http_request_uri_parameter"
-								},
-								"option": {
-									"name": "@Count"
-								}
-							}
-						}
-					]
-				},
-				"PersistAcrossReboot": {
-					"type": "boolean",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"datatype": "boolean",
-					"mapping": [
-						{
-							"data": "@Parent",
-							"type": "uci_sec",
-							"key": "http_persist_across_reboot"
-						}
-					]					
-				},
-				"Device.BulkData.Profile.{i}.HTTP.RequestURIParameter.{i}.": {
-					"type": "object",
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"access": true,
-					"array": true,
-					"mapping": [
-						{
-							"type": "uci",
-							"uci": {
-								"file": "bulkdata",
-								"section": {
-									"type": "profile_http_request_uri_parameter"
-								},
-								"dmmapfile": "dmmap_bulkdata"
-							}
-						}
-					],
-					"Name": {
-						"type": "string",
-						"read": true,
-						"write": true,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"datatype": "string",
-						"range": [
-							{
-								"max": 64
-							}
-						],
-						"mapping": [
-							{
-								"data": "@Parent",
-								"type": "uci_sec",
-								"key": "name"
-							}
-						]
-					},
-					"Reference": {
-						"type": "string",
-						"read": true,
-						"write": true,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"datatype": "string",
-						"range": [
-							{
-								"max": 256
-							}
-						],
-						"mapping": [
-							{
-								"data": "@Parent",
-								"type": "uci_sec",
-								"key": "reference"
-							}
-						]
-					}
-				}
-			}
-		}
-	}
-}

bulkdata/files/etc/init.d/bulkdatad

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=60
+START=99
 STOP=10
 
 USE_PROCD=1
@@ -12,12 +12,12 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
+	procd_open_instance bulkdata
 	[ "$enable" -eq "1" ] && {
-		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
-		procd_set_param respawn
-		procd_close_instance "bulkdata"
+		procd_set_param respawn "3" "7" "0"
 	}
+	procd_close_instance
 }
 
 reload_service() {

capiagent/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=capiagent
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=136cab3a9f1eec0132db9fa3f7bb1c8748ce1449
+PKG_SOURCE_VERSION:=3e671db8f567b19c109fc13b25bc571c4c73a962
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/capiagent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/capiagent
   TITLE+= capiagent (daemon implementing Wi-Fi Alliance's CAPI commands)
   DEPENDS= +libubox +libuci +libubus +libnl-genl +libeasy +libwifi \
-	   +libjson-c +libblobmsg-json +ubus +libieee1905 +libwifiutils
+	   +libjson-c +libblobmsg-json +ubus +libieee1905
 endef
 
 define Package/capiagent/description

capiagent/files/etc/init.d/capiagent

@@ -6,22 +6,13 @@ STOP=20
 USE_PROCD=1
 
 start_service() {
-	if [ -e "/etc/config/mapagent" -o -e "/etc/config/mapcontroller" ]; then
-		config_load mapagent
-		config_get_bool agent_enabled agent enabled 1
-		config_load mapcontroller
-		config_get_bool controller_enabled controller enabled 1
-
-		if [ $agent_enabled -eq 1 -o $controller_enabled -eq 1 ]; then
-			procd_open_instance
-			procd_set_param command "/usr/sbin/capiagent" "-p 9000"
-			procd_set_param limits core="unlimited"
-			#procd_set_param respawn
-			#procd_set_param stdout 1
-			#procd_set_param stderr 1
-			procd_close_instance
-		fi
-	fi
+	procd_open_instance
+        procd_set_param command "/usr/sbin/capiagent" "-p 9000"
+	procd_set_param limits core="unlimited"
+#	procd_set_param respawn
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
 }
 
 service_triggers()

csmngr/Makefile

@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2020-2024 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=csmngr
-PKG_VERSION:=0.0.8
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ca899eb18b5bec38f4b8b4d08b42d89fef965c13
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/csmngr.git
-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_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_CONFIG_DEPENDS := \
-		     CONFIG_PACKAGE_libwifiutils \
-		     CONFIG_PACKAGE_libwifi
-
-PKG_BUILD_DEPENDS := libwifi
-
-include $(INCLUDE_DIR)/package.mk
-
-
-MAKE_PATH:=src
-
-define Package/csmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=WiFi channel selection manager
-  DEPENDS:=+libwifiutils +libwifi +libuci +libubox +ubus +libnl-genl
-endef
-
-define Package/csmngr/description
- WiFi Auto Channel Selection manager.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-  rsync -r --exclude=.* ~/git/csmngr/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/csmngr/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/csmngr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,csmngr))

csmngr/files/etc/init.d/csmngr

@@ -1,21 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=95
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/csmngr
-
-start_service() {
-	procd_open_instance
-	procd_set_param command ${PROG}
-#	procd_set_param stderr 1                    #for debugging only
-#	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-        stop
-        start
-}
-

ddnsmngr/Config.in

@@ -1,16 +0,0 @@
-if PACKAGE_ddnsmngr
-choice
-	prompt "Select backend for dynamic DNS management"
-	default DDNSMNGR_BACKEND_DDNSSCRIPT
-	depends on PACKAGE_ddnsmngr
-	help
-		Select which package to use for dynamic DNS support
-
-config DDNSMNGR_BACKEND_DDNSSCRIPT
-	bool "Use ddns_script"
-
-config DDNSMNGR_BACKEND_INADYN
-	bool "Use inadyn"
-
-endchoice
-endif

ddnsmngr/Makefile

@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2024 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.4
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
-PKG_SOURCE_VERSION:=d0d37df44644ef2c1a0b11d3a4f92dc694ae1010
-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
-PKG_CONFIG_DEPENDS:=CONFIG_DDNSMNGR_BACKEND_DDNSSCRIPT CONFIG_DDNSMNGR_BACKEND_INADYN
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Dynamic DNS manager
-  DEPENDS:=+libbbfdm-api +DDNSMNGR_BACKEND_DDNSSCRIPT:ddns-scripts +DDNSMNGR_BACKEND_INADYN:inadyn
-  MENU:=1
-endef
-
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
-MAKE_PATH:=src
-
-define Package/$(PKG_NAME)/description
-	Manage dynamic DNS updation and provides Device.DynamicDNS. datamodel object based on TR181-2.16
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/ddnsmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/ddnsmngr/ddns
-	$(INSTALL_DIR) $(1)/etc/ddnsmngr/servers
-	$(INSTALL_DIR) $(1)/usr/lib/ddnsmngr
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(INSTALL_DATA) ./files/etc/config/ddnsmngr $(1)/etc/config/ddnsmngr
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-ddns-config-migrate $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/init.d/ddnsmngr $(1)/etc/init.d/ddnsmngr
-ifeq ($(CONFIG_DDNSMNGR_BACKEND_DDNSSCRIPT),y)
-	$(INSTALL_BIN) ./files/usr/lib/ddns_script/ddnsmngr_service.sh $(1)/usr/lib/ddnsmngr/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns-script/usr/lib/ddnsmngr/ddnsmngr_updater.sh $(1)/usr/lib/ddnsmngr/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/ddns-script/server/* $(1)/etc/ddnsmngr/servers
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns-script/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
-endif
-ifeq ($(CONFIG_DDNSMNGR_BACKEND_INADYN),y)
-	$(INSTALL_BIN) ./files/usr/lib/inadyn/ddnsmngr_service.sh $(1)/usr/lib/ddnsmngr/
-	$(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_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1) $(PKG_NAME)
-endef
-
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

ddnsmngr/files/etc/config/ddnsmngr

@@ -1,23 +0,0 @@
-config ddnsmngr 'global'
-	option configfile '/var/run/ddnsmngr/ddnsmngr.json'
-	option ddns_dateformat '%F %R'
-	option ddns_rundir '/var/run/ddnsmngr'
-	option ddns_logdir '/var/log/ddnsmngr'
-	option ddns_loglines '250'
-	option upd_privateip '0'
-	option use_curl '1'
-
-config server 'ddns_server_1'
-	option enabled '1'
-	option service 'dynu.com'
-	option name 'dynu.com'
-
-config server 'ddns_server_2'
-	option enabled '1'
-	option service 'dyndns.org'
-	option name 'dyndns.org'
-
-config server 'ddns_server_3'
-	option enabled '1'
-	option service 'zoneedit.com'
-	option name 'zoneedit.com'

ddnsmngr/files/etc/init.d/ddnsmngr

@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=80
-STOP=10
-USE_PROCD=1
-
-. /usr/lib/ddnsmngr/ddnsmngr_service.sh
-
-start_service() {
-	start_ddnsmngr_service
-}
-
-stop_service() {
-	stop_ddnsmngr_service
-}
-
-reload_service() {
-	stop
-	sleep 1
-	start
-}
-
-service_triggers() {
-	procd_add_reload_trigger ddnsmngr
-	add_ddnsmngr_triggers
-}

ddnsmngr/files/etc/uci-defaults/01-ddns-config-migrate

@@ -1,170 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-cl_id=1
-srv_id=1
-
-function get_ddns_config_option() {
-	local val
-
-	val="$(uci -q get ddns.${1}.${2})"
-
-	if [ -z "${val}" ] && [ -n "${3}" ]; then
-		val="${3}"
-	fi
-
-	echo "${val}"
-}
-
-function config_supported_service() {
-	if ! uci -q get ddnsmngr.global >/dev/null 2>&1; then
-		uci -q set ddnsmngr.global="ddnsmngr"
-	fi
-
-	servers=""
-
-	for i in $(find /etc/ddnsmngr/servers/ -name '*.json' | cut -d'/' -f 5 | sed "s/.json//")
-	do
-		if [ -z "${servers}" ]; then
-			servers="${i}"
-		else
-			servers="${servers},${i}"
-		fi
-	done
-
-	uci -q set ddnsmngr.global.supported_services="${servers}"
-}
-
-function migrate_service_section() {
-	client_sec=""
-	enabled="$(get_ddns_config_option ${1} enabled "0")"
-	service_name="$(get_ddns_config_option ${1} service_name)"
-	interface="$(get_ddns_config_option ${1} interface)"
-	ip_network="$(get_ddns_config_option ${1} ip_network)"
-	username="$(get_ddns_config_option ${1} username)"
-	password="$(get_ddns_config_option ${1} password)"
-	lookup_host="$(get_ddns_config_option ${1} lookup_host)"
-	use_ipv6="$(get_ddns_config_option ${1} use_ipv6 "0")"
-	force_ipversion="$(get_ddns_config_option ${1} force_ipversion "0")"
-	use_https="$(get_ddns_config_option ${1} use_https "0")"
-	force_dnstcp="$(get_ddns_config_option ${1} force_dnstcp "0")"
-
-	if [ -z "${service_name}" ]; then
-		uci -q delete ddns."${1}"
-		return 0
-	fi
-
-	# check server file is present in device
-	if [ ! -f "/etc/ddnsmngr/servers/${service_name}.json" ]; then
-		uci -q delete ddns."${1}"
-		return 0
-	fi
-
-	# Check if client section is already added for this service
-	clients=$(uci -q show ddnsmngr | grep "=client")
-	client_count=$(echo "${clients}" | wc -l)
-
-	tmp=0
-	while [ $tmp -lt $client_count ]
-	do
-		mngr_serv="$(uci -q get ddnsmngr.@client[$tmp].service_name)"
-		mngr_intf="$(uci -q get ddnsmngr.@client[$tmp].interface)"
-		mngr_netw="$(uci -q get ddnsmngr.@client[$tmp].ip_network)"
-		mngr_user="$(uci -q get ddnsmngr.@client[$tmp].username)"
-		mngr_ipv6="$(uci -q get ddnsmngr.@client[$tmp].use_ipv6)"
-		mngr_forceip="$(uci -q get ddnsmngr.@client[$tmp].force_ipversion)"
-		mngr_https="$(uci -q get ddnsmngr.@client[$tmp].use_https)"
-		mngr_dnstcp="$(uci -q get ddnsmngr.@client[$tmp].force_dnstcp)"
-
-		[ -z "${mngr_ipv6}" ] && mngr_ipv6="0"
-		[ -z "${mngr_forceip}" ] && mngr_forceip="0"
-		[ -z "${mngr_https}" ] && mngr_https="0"
-		[ -z "${mngr_dnstcp}" ] && mngr_dnstcp="0"
-
-		if [ "${mngr_serv}" == "${service_name}" ] && [ "${mngr_intf}" == "${interface}" ] && \
-		   [ "${mngr_netw}" == "${ip_network}" ] && [ "${mngr_user}" == "${username}" ] && \
-		   [ "${mngr_ipv6}" == "${use_ipv6}" ] && [ "${mngr_forceip}" == "${force_ipversion}" ] && \
-		   [ "${mngr_https}" == "${use_https}" ] && [ "${mngr_dnstcp}" == "${force_dnstcp}" ]; then
-			break
-		fi
-
-		tmp=$(( tmp + 1 ))
-	done
-
-	if [ $tmp -ne $client_count ]; then
-		i=0
-		for client in $clients; do
-			if [ $i -eq $tmp ]; then
-				client_sec="$(echo $client | cut -d'=' -f 1 | cut -d'.' -f 2)"
-				break
-			fi
-			i=$(( i + 1 ))
-		done
-
-		if [ $enabled -eq 1 ]; then
-			uci -q set ddnsmngr."${client_sec}".enabled="1"
-		fi
-	else
-		client_sec=ddns_mig_client_"${cl_id}"
-
-		uci -q set ddnsmngr."${client_sec}"="client"
-		uci -q set ddnsmngr."${client_sec}".enabled="${enabled}"
-		uci -q set ddnsmngr."${client_sec}".service_name="${service_name}"
-		uci -q set ddnsmngr."${client_sec}".interface="${interface}"
-		uci -q set ddnsmngr."${client_sec}".ip_network="${ip_network}"
-		uci -q set ddnsmngr."${client_sec}".username="${username}"
-		uci -q set ddnsmngr."${client_sec}".password="${password}"
-		uci -q set ddnsmngr."${client_sec}".use_ipv6="${use_ipv6}"
-		uci -q set ddnsmngr."${client_sec}".force_ipversion="${force_ipversion}"
-		uci -q set ddnsmngr."${client_sec}".use_https="${use_https}"
-		uci -q set ddnsmngr."${client_sec}".force_dnstcp="${force_dnstcp}"
-
-		cl_id=$(( cl_id + 1 ))
-
-		# add server section if not added
-		servers=$(uci -q show ddnsmngr | grep "service=\'${service_name}\'")
-		if [ -z "${servers}" ]; then
-			server_sec=ddns_mig_server_"${srv_id}"
-			uci -q set ddnsmngr."${server_sec}"="server"
-			uci -q set ddnsmngr."${server_sec}".enabled="1"
-			uci -q set ddnsmngr."${server_sec}".service="${service_name}"
-			uci -q set ddnsmngr."${server_sec}".name="${service_name}"
-
-			srv_id=$(( srv_id + 1 ))
-		fi
-	fi
-
-
-	# if lookup_host is set then add host section
-	if [ -n "${lookup_host}" ] && [ -n "${client_sec}" ]; then
-		# check number of hosts present for this client
-		host_count=$(uci -q show ddnsmngr | grep "dm_parent=\'${client_sec}\'" | wc -l)
-		host_ix=$(( host_count + 1 ))
-		host_sec="${client_sec}"_host_"${host_ix}"
-
-		uci -q set ddnsmngr."${host_sec}"="host"
-		uci -q set ddnsmngr."${host_sec}".enabled="${enabled}"
-		uci -q set ddnsmngr."${host_sec}".lookup_host="${lookup_host}"
-		uci -q set ddnsmngr."${host_sec}".dm_parent="${client_sec}"
-	fi
-
-	uci -q delete ddns."${1}"
-}
-
-function migrate_ddns_config() {
-	if [ ! -f "/etc/config/ddnsmngr" ]; then
-		# Create ddnsmngr config file
-		touch /etc/config/ddnsmngr
-	fi
-
-	config_supported_service
-
-	config_load ddns
-	config_foreach migrate_service_section service
-
-	uci -q commit ddns
-	uci -q commit ddnsmngr
-}
-
-migrate_ddns_config

ddnsmngr/files/usr/lib/ddns_script/ddnsmngr_service.sh

@@ -1,169 +0,0 @@
-#! /bin/sh
-
-RUNDIR="/var/run/ddnsmngr"
-LOGDIR="/var/log/ddnsmngr"
-PROG="/usr/lib/ddnsmngr/ddnsmngr_updater.sh"
-CONFIGFILE="/var/run/ddnsmngr/ddnsmngr.json"
-CLIENT_INTFS=""
-
-. /usr/share/libubox/jshn.sh
-
-log() {
-	echo "$*"|logger -t ddnsmngr.init -p debug
-}
-
-validate_host_section() {
-	uci_validate_section ddnsmngr host "${1}" \
-		'enabled:bool:0' \
-		'lookup_host:string' \
-		'dm_parent:string'
-}
-
-validate_client_section() {
-	uci_validate_section ddnsmngr client "${1}" \
-		'enabled:bool:0' \
-		'service_name:string' \
-		'interface:string' \
-		'ip_network:string' \
-		'username:string' \
-		'password:string' \
-		'use_https:bool:0' \
-		'force_dnstcp:bool:0' \
-		'use_ipv6:bool:0' \
-		'force_ipversion:bool:0'
-}
-
-add_object() {
-	local enabled lookup_host dm_parent use_ipv6 force_ipversion proc_info_file
-	local service_name interface ip_network username password use_https force_dnstcp
-
-	validate_host_section "${1}" || {
-		log "Validation of host section failed"
-		return 0
-	}
-
-	if [ "${enabled}" -ne 1 ] || [ -z "${dm_parent}" ]; then
-		return 0
-	fi
-
-	validate_client_section "${dm_parent}" || {
-		log "Validation of client section failed"
-		return 0 
-	}
-
-	if [ "${enabled}" -ne 1 ]; then
-		return 0
-	fi
-
-	service_name=$(uci -q get ddnsmngr.${dm_parent}.service_name)
-	if [ -z "${service_name}" ]; then
-		return 0
-	fi
-
-	service_section=$(uci -q show ddnsmngr | grep "service=\'${service_name}\'" | cut -d'.' -f 2 | head -1)
-	if [ -z "${service_section}" ]; then
-		return 0
-	fi
-
-	service_enabled=$(uci -q get ddnsmngr.${service_section}.enabled)
-	if [ "${service_enabled}" -ne 1 ]; then
-		return 0
-	fi
-
-	json_add_object
-	json_add_string "interface" "${interface}"
-	json_add_string "service_name" "${service_name}"
-	json_add_string "username" "${username}"
-	json_add_string "password" "${password}"
-	json_add_string "lookup_host" "${lookup_host}"
-	json_add_string "ip_network" "${ip_network}"
-	json_add_string "proc_info_file" "${1}"
-	json_add_string "use_ipv6" "${use_ipv6}"
-	json_add_string "force_ipversion" "${force_ipversion}"
-	json_add_string "use_https" "${use_https}"
-	json_add_string "force_dnstcp" "${force_dnstcp}"
-	json_close_object
-
-	if [ -z "${interface}" ]; then
-		if [ "${use_ipv6}" -eq 0 ]; then
-			interface="wan"
-		else
-			interface="wan6"
-		fi
-	fi
-
-	for intf in $CLIENT_INTFS; do
-		if [ "${intf}" == "${interface}" ]; then
-			return 0
-		fi
-	done
-
-	CLIENT_INTFS="${CLIENT_INTFS} ${interface}"
-}
-
-start_ddnsmngr_service() {
-	run_dir=$(uci -q get ddnsmngr.global.ddns_rundir)
-	log_dir=$(uci -q get ddnsmngr.global.ddns_logdir)
-
-	if [ -n "${run_dir}" ]; then
-		RUNDIR="${run_dir}"
-	fi
-
-	if [ -n "${log_dir}" ]; then
-		LOGDIR="${log_dir}"
-	fi
-
-	mkdir -p "${RUNDIR}"
-	mkdir -p "${LOGDIR}"
-
-	conf_file=$(uci -q get ddnsmngr.global.configfile)
-	if [ -n "${conf_file}" ]; then
-		CONFIGFILE="${conf_file}"
-	fi
-
-	touch "${CONFIGFILE}"
-
-	if [ ! -f "${CONFIGFILE}" ]; then
-		log "Can not create ${CONFIGFILE}, exit"
-		exit 0
-	fi
-
-	json_init
-	json_add_array "services"
-
-	config_load ddnsmngr
-	config_foreach add_object host
-
-	json_close_array
-	json_dump > "${CONFIGFILE}"
-
-	procd_open_instance ddnsmngr
-	procd_set_param command "$PROG"
-	procd_append_param command -c "${CONFIGFILE}"
-	procd_append_param command -- start
-	procd_close_instance
-}
-
-stop_ddnsmngr_service() {
-	conf_file=$(uci -q get ddnsmngr.global.configfile)
-	if [ -n "${conf_file}" ]; then
-		CONFIGFILE="${conf_file}"
-	fi
-
-	if [ ! -f "${CONFIGFILE}" ]; then
-		log "${CONFIGFILE} not found, can't stop services if running any"
-	fi
-
-	"$PROG" -c "${CONFIGFILE}" -- stop
-	return 0
-}
-
-add_ddnsmngr_triggers() {
-	procd_open_trigger
-	for intf in $CLIENT_INTFS; do
-		# No need to handle other ifevents like ifupdate etc
-		procd_add_interface_trigger "interface.*.up" $intf /etc/init.d/ddnsmngr restart
-		procd_add_interface_trigger "interface.*.down" $intf /etc/init.d/ddnsmngr restart
-	done
-	procd_close_trigger
-}

ddnsmngr/files/usr/lib/inadyn/ddnsmngr_service.sh

@@ -1,311 +0,0 @@
-#!/bin/sh
-
-PROG="/usr/sbin/inadyn"
-CONFIGPATH="/tmp/inadyn_config"
-PIDPATH="/etc/inadyn_pid"
-CLIENT_INTFS=""
-CONFIG_FILES=""
-SERVER_PATH="/etc/ddnsmngr/servers"
-
-FORMAT="custom [SECTION] {\n\tusername\t= [USER]\n\tpassword\t= [PWD]\n\tddns-server\t= [SERV]\n\tddns-path\t= [URI]\n\tssl\t\t= [SSL]\n\thostname\t= [NAME]\n\tcheckip-command\t= [CMD]\n\tddns-response\t= [RESPONSES]\n}"
-
-
-. /usr/share/libubox/jshn.sh
-
-log() {
-	echo "$*"|logger -t ddnsmngr.init -p debug
-}
-
-get_service_data() {
-	local provider="$1"
-	shift
-	local dir="$1"
-	shift
-	local ipv6="$1"
-	shift
-
-	local name data url answer script
-
-	[ $# -ne 2 ] && {
-		return 1
-	}
-
-	[ -f "${dir}/${provider}.json" ] || {
-		eval "$1=\"\""
-		eval "$2=\"\""
-		return 1
-	}
-
-	json_load_file "${dir}/${provider}.json"
-	json_get_var name "name"
-	if [ "$ipv6" -eq "1" ]; then
-		json_select "ipv6"
-	else
-		json_select "ipv4"
-	fi
-	json_get_var data "url"
-	json_get_var answer "answer"
-	json_select ".."
-	json_cleanup
-
-	response=""
-	if [ -n "${answer}" ]; then
-		answer=$(echo "${answer}" | sed 's/|/ /g')
-		for ans in $answer; do
-			if [ -z "${response}" ]; then
-				response="${ans}"
-			else
-				response="${response}, ${ans}"
-			fi
-		done
-		response="{ ${response} }"
-	fi
-
-	eval "$1=\"$data\""
-	eval "$2=\"$response\""
-
-	return 0
-}
-
-generate_inadyn_config() {
-	json_load "${1}"
-	json_get_var service_name service_name
-	json_get_var use_ipv6 use_ipv6
-	json_get_var interface interface
-	json_get_var username username
-	json_get_var password password
-	json_get_var host lookup_host
-	json_get_var conf_file config_file
-	json_get_var conf_dir config_dir
-	json_get_var server_address server_address
-	json_cleanup
-
-	if [ -z "${service_name}" ] || [ -z "${host}" ]; then
-		return 1
-	fi
-
-	if [ -z "${conf_file}" ]; then
-		return 1
-	fi
-
-	if [ -z "${conf_dir}" ]; then
-		return 1
-	fi
-
-	# First look into custom path to load the url otherwise default path
-	get_service_data "${service_name}" "${SERVER_PATH}" "${use_ipv6}" server_url server_answer
-
-	if [ -z "${server_url}" ]; then
-		return 1
-	fi
-
-	# Need to pick proto, server address and request uri separately from the url
-	# format http://[server_address]/[update_Request_uri]
-	proto=$(echo $server_url | cut -d':' -f 1)
-	serv=$(echo $server_url | cut -d'/' -f 3 | cut -d'@' -f 2)
-	uri=${server_url#*$serv}
-
-	if [ -z $proto ] || [ -z $serv ] || [ -z $uri ]; then
-		return 1
-	fi
-
-	path=$(echo "$uri" | sed 's/&/\\&/g')
-	update_uri=$(echo $path | sed -e "s#\[DOMAIN\]#%h#g"	-e "s#\[PASSWORD\]#%p#g" \
-				      -e "s#\[USERNAME\]#%u#g"	-e "s#\[IP\]#%i#g")
-
-	if [ -z "${interface}" ]; then
-		if [ "${use_ipv6}" -eq 0 ]; then
-			interface="wan"
-		else
-			interface="wan6"
-		fi
-	fi
-
-	# now get the physical interface name
-	intf=$(ifstatus "${interface}" | jsonfilter -e '@.device')
-	if [ -z "${intf}" ]; then
-		return 1
-	fi
-
-	# command to get ip of the interface
-	if [ "${use_ipv6}" -eq 0 ]; then
-		get_ip="\"ifstatus ${interface} | jsonfilter -e '@[\\\\\"ipv4-address\\\\\"][0].address'\""
-	else
-		get_ip="\"ifstatus ${interface} | jsonfilter -e '@[\\\\\"ipv6-address\\\\\"][0].address'\""
-	fi
-
-	if [ "${proto}" = "http" ]; then
-		ssl="false"
-	else
-		ssl="true"
-	fi
-
-	inadyn_ver=$(inadyn -v)
-	user_agent="inadyn/${inadyn_ver}"
-
-	config_file="${conf_dir}/${conf_file}"
-	touch "${config_file}"
-
-	echo "iface = ${intf}" > "${config_file}"
-	echo "period = 600" >> "${config_file}"
-	echo "user-agent = ${user_agent}" >> "${config_file}"
-
-	if [ "${use_ipv6}" -eq 1 ]; then
-		echo "allow-ipv6 = true" >> "${config_file}"
-	fi
-
-	if [ -z "${password}" ]; then
-		FORMAT=$(echo "${FORMAT}" | sed 's/\\tpassword\\t= \[PWD\]\\n//g')
-	fi
-
-	if [ -z "${server_answer}" ]; then
-		FORMAT=$(echo "${FORMAT}" | sed 's/\\tddns-response\\t= \[RESPONSES\]\\n//g')
-	fi
-
-	config=$(echo $FORMAT | sed -e "s#\[SECTION\]#$conf_file#g"	-e "s#\[PWD\]#$password#g" \
-				    -e "s#\[USER\]#$username#g"	-e "s#\[SERV\]#$serv#g" \
-				    -e "s#\[URI\]#\"$update_uri\"#g"	-e "s#\[SSL\]#$ssl#g" \
-				    -e "s#\[NAME\]#$host#g"	-e "s#\[CMD\]#$get_ip#g" \
-				    -e "s#\[RESPONSES\]#$server_answer#g")
-
-	echo -e "\n\n${config}" >> "${config_file}"
-
-	return 0
-}
-
-validate_host_section() {
-	uci_validate_section ddnsmngr host "${1}" \
-		'enabled:bool:0' \
-		'lookup_host:string' \
-		'dm_parent:string'
-}
-
-validate_client_section() {
-	uci_validate_section ddnsmngr client "${1}" \
-		'enabled:bool:0' \
-		'service_name:string' \
-		'interface:string' \
-		'ip_network:string' \
-		'username:string' \
-		'password:string' \
-		'use_https:bool:0' \
-		'force_dnstcp:bool:0' \
-		'use_ipv6:bool:0' \
-		'force_ipversion:bool:0'
-}
-
-add_object() {
-	local enabled lookup_host dm_parent use_ipv6 force_ipversion
-	local service_name interface ip_network username password use_https force_dnstcp
-
-	validate_host_section "${1}" || {
-		log "Validation of host section failed"
-		return
-	}
-
-	if [ "${enabled}" -ne 1 ] || [ -z "${dm_parent}" ]; then
-		return
-	fi
-
-	validate_client_section "${dm_parent}" || {
-		log "Validation of client section failed"
-		return
-	}
-
-	if [ "${enabled}" -ne 1 ]; then
-		return
-	fi
-
-	service_name=$(uci -q get ddnsmngr.${dm_parent}.service_name)
-	if [ -z "${service_name}" ]; then
-		return
-	fi
-
-	service_section=$(uci show ddnsmngr | grep "service=\'${service_name}\'" | cut -d'.' -f 2 | head -1)
-	if [ -z "${service_section}" ]; then
-		return
-	fi
-
-	service_enabled=$(uci -q get ddnsmngr.${service_section}.enabled)
-	if [ "${service_enabled}" -ne 1 ]; then
-		return
-	fi
-
-	json_init
-	json_add_string "interface" "${interface}"
-	json_add_string "service_name" "${service_name}"
-	json_add_string "username" "${username}"
-	json_add_string "password" "${password}"
-	json_add_string "lookup_host" "${lookup_host}"
-	json_add_string "ip_network" "${ip_network}"
-	json_add_string "use_ipv6" "${use_ipv6}"
-	json_add_string "force_ipversion" "${force_ipversion}"
-	json_add_string "use_https" "${use_https}"
-	json_add_string "force_dnstcp" "${force_dnstcp}"
-	json_add_string "config_file" "${1}"
-	json_add_string "config_dir" "${CONFIGPATH}"
-
-	json_str=$(json_dump)
-	json_cleanup
-
-	generate_inadyn_config "${json_str}"
-
-	if [ "$?" -ne 0 ]; then
-		return
-	fi
-
-	CONFIG_FILES="${CONFIG_FILES} ${1}"
-
-	if [ -z "${interface}" ]; then
-		if [ "${use_ipv6}" -eq 0 ]; then
-			interface="wan"
-		else
-			interface="wan6"
-		fi
-	fi
-
-	for intf in $CLIENT_INTFS; do
-		if [ "${intf}" == "${interface}" ]; then
-			return
-		fi
-	done
-
-	CLIENT_INTFS="${CLIENT_INTFS} ${interface}"
-}
-
-start_ddnsmngr_service() {
-	rm -rf $CONFIGPATH
-	mkdir $CONFIGPATH
-	mkdir -p $PIDPATH
-
-	config_load ddnsmngr
-	config_foreach add_object host
-
-	i=1
-	for conf in $CONFIG_FILES; do
-		instance="ddnsmngr_${i}"
-		i=$(( i + 1 ))
-
-		procd_open_instance $instance
-		procd_set_param command "$PROG"
-		procd_append_param command -f "${CONFIGPATH}/${conf}"
-		procd_append_param command -l debug
-		procd_append_param command -P "${PIDPATH}/${conf}"
-		procd_append_param command -n -C
-		procd_close_instance
-	done
-}
-
-stop_ddnsmngr_service() {
-	rm -rf $CONFIGPATH
-	return 0
-}
-
-add_ddnsmngr_triggers() {
-	procd_open_trigger
-	for intf in $CLIENT_INTFS; do
-		# No need to handle other ifevents like ifupdate etc
-		procd_add_interface_trigger "interface.*.up" $intf /etc/init.d/ddnsmngr restart
-	done
-	procd_close_trigger
-}

decollector/Config.in

@@ -2,6 +2,6 @@ menu "Configuration"
 
 config DECOLLECTOR_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 2
 
 endmenu

decollector/Makefile

@@ -5,19 +5,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.4.0.5
+PKG_VERSION:=4.0.2.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b3e76eb2f03b13cc8d73b103277b7ad240460ec2
+PKG_SOURCE_VERSION:=162654487bfbff7d68d0c87ae9498a3def738d84
 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@iopsys.eu>
-
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -29,7 +27,7 @@ define Package/decollector
   CATEGORY:=Utilities
   TITLE:=WiFi DataElements Collector Proxy
   DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \
-	   +libeasy +libwifiutils +libieee1905 +ieee1905-map-plugin
+	   +libeasy +libwifiutils +libieee1905 +map-plugin
 endef
 
 define Package/decollector/description

decollector/files/decollector.init

@@ -7,7 +7,7 @@ USE_PROCD=1
 PROG=/usr/sbin/decollector
 
 service_running() {
-	ubus -t 2 wait_for ieee1905 ieee1905.map
+	ubus -t 2 wait_for ieee1905 ieee1905.map topology
 }
 
 start_service() {
@@ -17,13 +17,10 @@ start_service() {
 
 		config_load mapcontroller
 		config_get en controller enabled "0"
-		config_get collect_int controller de_collect_interval
-
-		[ -n "$collect_int" -a $collect_int -lt 30 ] &&  collect_int=""
 
 		[ $en -gt 0 ] && {
 			procd_open_instance
-			procd_set_param command "$PROG" "-d" "${collect_int:+-t $collect_int}"
+			procd_set_param command "$PROG" "-d"
 			#procd_set_param stdout 1
 			#procd_set_param stderr 1
 			procd_set_param respawn

dectmngr/Makefile

@@ -1,14 +1,20 @@
+#
+# Copyright (C) 2021 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.5
+PKG_VERSION:=3.5.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=192e74db2082e3f89f6defe9d752d752b0b09079
+PKG_SOURCE_VERSION:=83f89a83cf860bbcf2b7f2e030215db315a5bbbf
 PKG_MIRROR_HASH:=skip
 endif
 

dectmngr/files/etc/init.d/dectmngr

@@ -6,6 +6,7 @@ START=70
 STOP=12
 
 USE_PROCD=1
+NAME=dectmngr
 PROG=/usr/sbin/dectmngr
 LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
@@ -15,13 +16,11 @@ DECT_GPIO="$(gpiofind DCX81_RSTN | cut -d ' ' -f 2 2>/dev/null)"
 
 # 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)
-	[ -n "$dect_pid" ] && kill $dect_pid
+	pidof $NAME && killall -q $NAME
 
-	pidof $PROG > /dev/null 2>&1 && sleep 2 # wait for the process to stop gracefully
-	while pidof $PROG > /dev/null 2>&1; do
-		dect_pid=$(pidof $PROG)
-		[ -n "$dect_pid" ] && kill -9 $dect_pid
+	pidof $NAME && sleep 2 # wait for the process to stop gracefully
+	while pidof $NAME; do
+		killall -q -9 $NAME
 		sleep 1
 	done
 }

dnsmngr/Makefile

@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2022-2024 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.4
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=347070e096b98946ba660791e3c78d1646adc54a
-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
-
-MAKE_PATH:=src
-
-define Package/dnsmngr
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq +umdns
-  TITLE:=Package to add Device.DNS. datamodel support
-endef
-
-define Package/dnsmngr/description
-  Package to add Device.DNS. datamodel support.
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/dnsmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/dnsmngr/install
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1) $(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,dnsmngr))

dslmngr/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2024 iopsys Software Solutions AB
+# Copyright (C) 2018 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.4
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
-PKG_SOURCE_VERSION:=d71bef278b8222dee1c278723f8264aa8faf5e40
+PKG_SOURCE_VERSION:=bb754ae620a9fc66fd6fc0745f0fead0708c7a17
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -26,7 +25,6 @@ PKG_LICENSE_FILES:=LICENSE
 
 
 include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
@@ -40,7 +38,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
 endef
 
 define Package/dslmngr/description
@@ -61,7 +59,7 @@ MAKE_FLAGS += \
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	rsync -r --exclude=.* ./dslmngr/ $(PKG_BUILD_DIR)/
+	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -70,14 +68,12 @@ define Build/Compile
 endef
 
 define Package/dslmngr/install
-	$(INSTALL_DIR) $(1)/etc/dsl
 	$(CP) ./files/common/* $(1)/
 ifeq ($(CONFIG_TARGET_brcmbca),y)
 	$(CP) ./files/broadcom/* $(1)/
 endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdsl.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,dslmngr))

dslmngr/files/broadcom/lib/dsl/broadcom.sh

@@ -302,8 +302,6 @@ xdsl_stop() {
 }
 
 xdsl_init() {
-	[ -d /sys/class/net/dsl0/ ] || exit
-
 	prioritize_arp
 
 	echo "Starting DSL"

dslmngr/files/common/etc/init.d/dsl

@@ -26,6 +26,10 @@ stop_service() {
 }
 
 boot() {
+	local HASADSL="$(db -q get hw.board.hasAdsl)"
+	local HASVDSL="$(db -q get hw.board.hasVdsl)"
+	[ "$HASADSL" == "1" -o "$HASVDSL" == "1" ] || return
+
 	xdsl_init
 
 	start

ethmngr/Config.in

@@ -1,9 +0,0 @@
-if (PACKAGE_ethmngr)
-
-menu "Configurations"
-
-config TR181_VENDOR_EXTENSIONS_MACVLAN
-	bool "Use TR181 vendor extension MACVLAN"
-	default y
-endmenu
-endif

ethmngr/Makefile

@@ -1,33 +1,29 @@
 #
-# Copyright (C) 2020-2024 Iopsys
+# Copyright (C) 2020 Iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.7
+PKG_VERSION:=2.1.0
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
-PKG_SOURCE_VERSION:=d029ce86fe99b7896f096f68eda3f6caa000ee5f
-PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
+PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
+
 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 ../bbfdm/bbfdm.mk
 
 define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_iopsys_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/ethmngr/description
@@ -36,42 +32,26 @@ define Package/ethmngr/description
  It uses APIs from the libethernet.so library.
 endef
 
-define Package/$(PKG_NAME)/config
-       source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE \
-	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
-TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN
-endif
-
-ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
+ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_iopsys_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),)
+	$(CP) ./files/common/* $(1)/
+ifneq ($(CONFIG_TARGET_brcmbca),)
+	$(CP) ./files/broadcom/* $(1)/
+else
+	$(CP) ./files/linux/* $(1)/
+endif
+ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_iopsys_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
-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
 

ethmngr/files/broadcom/lib/ethernet/broadcom.sh

@@ -0,0 +1,149 @@
+# arg1: port ifname, ex: eth0
+get_max_port_speed() {
+	if [ -z "$1" ]; then
+		echo 0
+		return
+	fi
+
+	local ifname="$1"
+	local phycap="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Capabilities' | awk '{print$NF}' | cut -d'|' -f1)"
+	local speed=1000
+
+	case "$phycap" in
+		10GFD) speed=10000 ;;
+		5GFD) speed=5000 ;;
+		2.5GFD) speed=2500 ;;
+		1GFD|1GHD) speed=1000 ;;
+		100MFD|100MHD) speed=100 ;;
+		10MFD|10MHD) speed=10 ;;
+	esac
+
+	echo $speed
+}
+
+# arg1: port name, ex: eth0
+get_port_number() {
+	[ -z "$1" ] && return
+	local ports="0 1 2 3 4 5 6 7 8"
+	local units="0 1"
+	local port="$1"
+	local ifname
+
+	for unit in $units; do
+		for prt in $ports; do
+			ifname="$(ethswctl getifname $unit $prt 2>/dev/null | awk '{print$NF}')"
+			if [ "$ifname" == "$port" ]; then
+				echo "$unit $prt"
+				return
+			fi
+		done
+	done
+}
+
+# arg1: port ifname, ex: eth0
+reset_port() {
+        local ifname="$1"
+        ethctl $ifname phy-reset >/dev/null
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+power_updown() {
+	local ifname="$1"
+	local enabled=$2
+
+	local updown="up"
+	[ $enabled -eq 0 ] && updown="down"
+	ethctl $ifname phy-power $updown >/dev/null
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+# arg3: port speed, ex: 1000
+# arg4: port duplex, ex: full
+# arg5: port autoneg, ex: on
+# arg6: port eee, ex: 0
+# arg7: port pause, ex: 0
+set_port_settings() {
+	local ifname="$1"
+	local enabled=$2
+	local speed="$3"
+	local duplex=$4
+	local autoneg=$5
+	local eee=$6
+	local pause=$7
+
+	[ -d /sys/class/net/$ifname ] || return
+
+	local unitport="$(get_port_number $ifname)"
+	local unit=$(echo $unitport | cut -d ' ' -f 1)
+	local port=$(echo $unitport | cut -d ' ' -f 2)
+
+	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
+	[ "$duplex" == "half" ] && duplex=0 || duplex=1
+	[ "$duplex" == 0 ] && dplx="HD" || dplx="FD"
+	[ "$autoneg" == "on" ] && media_type="auto" || media_type="$speed$dplx"
+
+	phycrossbar="$(ethctl $ifname phy-crossbar | head -1)"
+	crossbartype="$(echo $phycrossbar | awk '{print$2$3}')"
+	# Take only the last PHY Endpoint (non-Serdes) into account as Serdes port number precedes
+	[ "$crossbartype" == "oncrossbar" ] && pyhendpoint="$(echo $phycrossbar | awk '{print$NF}')"
+
+	phycaps="$(ethctl $ifname media-type ${pyhendpoint:+ port $pyhendpoint} | awk -F'PHY Capabilities: ' '{print$2}')"
+	numofcaps="$(echo $phycaps | tr '|' ' ' | wc -w)"
+
+        # Reset the port before setting new params
+        reset_port $ifname
+
+	if [ "$numofcaps" == "1" ]; then
+		logger -t "port-management" "$ifname is capable of $phycaps only; not setting speed/duplex"
+	else
+		logger -t "port-management" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
+		ethctl $ifname media-type $media_type ${pyhendpoint:+ port $pyhendpoint} &>/dev/null
+	fi
+
+	[ $eee -eq 1 ] && eee="on" || eee="off"
+	ethtool --set-eee $ifname eee $eee 2>/dev/null
+
+	case $pause in
+		off|0)
+			pause=0x0
+			auto=off
+			rx=off
+			tx=off
+		;;
+		on|1)
+			pause=0x2
+			auto=off
+			rx=on
+			tx=on
+		;;
+		auto)
+			pause=0x1
+			auto=on
+			rx=on
+			tx=on
+		;;
+		tx)
+			pause=0x3
+			auto=off
+			rx=off
+			tx=on
+		;;
+		rx)
+			pause=0x4
+			auto=off
+			rx=on
+			tx=off
+		;;
+	esac
+	if [ "$auto" == "on" ]; then
+		# Use ethswctl utility to set pause autoneg
+		# as ethtool is not setting it properly
+		ethswctl -c pause -n $unit -p $port -v $pause 2>&1 >/dev/null
+	else
+		ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
+	fi
+
+	power_updown $ifname $enabled
+}

ethmngr/files/common/etc/init.d/ethmngr

@@ -0,0 +1,50 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+STOP=90
+
+USE_PROCD=1
+PROG=/usr/sbin/ethmngr
+
+. /lib/functions.sh
+include /lib/ethernet
+
+configure_ethernet_port(){
+	local cfg=$1
+	local ifname enabled speed duplex autoneg eee pause
+
+	config_get ifname $cfg ifname
+	[ -d /sys/class/net/$ifname ] || return
+
+	config_get enabled $cfg enabled 1
+	config_get speed $cfg speed 1000
+	config_get duplex $cfg duplex "full"
+	config_get autoneg $cfg autoneg 1
+	config_get eee $cfg eee 0
+	config_get pause $cfg pause 0
+
+	set_port_settings $ifname $enabled $speed $duplex $autoneg $eee $pause
+}
+
+start_service() {
+	if [ -s /etc/config/ports ]; then
+		config_load ports
+		config_foreach configure_ethernet_port ethport
+	fi
+
+	if [ -f $PROG ]; then
+		procd_open_instance
+		procd_set_param command ${PROG}
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}
+
+reload_service() {
+        stop
+        start
+}
+
+service_triggers() {
+	procd_add_reload_trigger ports
+}

ethmngr/files/common/etc/uci-defaults/15-ports-config-generate

@@ -0,0 +1,81 @@
+#!/bin/sh
+
+populate_config_from_db() {
+	. /lib/functions.sh
+	. /lib/network/utils.sh
+	include /lib/ethernet
+
+	portorder="$(db -q get hw.board.ethernetPortOrder)"
+	for port in $portorder; do
+		speed="$(get_max_port_speed $port 2>/dev/null)"
+		speed="${speed:-1000}"
+
+		uci add ports ethport
+		uci rename ports.@ethport[-1]="$(get_port_name $port)"
+		uci set ports.@ethport[-1].enabled=1
+		uci set ports.@ethport[-1].name="$(get_port_name $port)"
+		uci set ports.@ethport[-1].ifname="$port"
+		uci set ports.@ethport[-1].speed="$speed"
+		uci set ports.@ethport[-1].duplex="full"
+		uci set ports.@ethport[-1].autoneg=1
+		uci set ports.@ethport[-1].eee=0
+		if [ "$(db -q get hw.board.ethernetWanPort)" = "$port" ]; then
+			uci set ports.@ethport[-1].pause=1
+			uci set ports.@ethport[-1].uplink=1
+		else
+			uci set ports.@ethport[-1].pause=0
+		fi
+	done
+
+	uci commit ports
+}
+
+populate_config_from_device_tree() {
+	for path in $(find /proc/device-tree/ -name "port@*"); do
+		port="$(cat $path/label)"
+		[ -n "$port" ] || continue
+		[ "$port" = "cpu" ] && continue
+		speed=1000
+		if [ -e "$path/phy-mode" ]; then
+			phymode="$(cat $path/phy-mode)"
+			case "$phymode" in
+				10000*) speed=10000 ;;
+				2500*) speed=2500 ;;
+			esac
+		fi
+		PORT="$(echo $port | tr '[a-z]' '[A-Z]')"
+		uci add ports ethport
+		uci rename ports.@ethport[-1]="$PORT"
+		uci set ports.@ethport[-1].enabled=1
+		uci set ports.@ethport[-1].name="$PORT"
+		uci set ports.@ethport[-1].ifname="$port"
+		uci set ports.@ethport[-1].speed="$speed"
+		uci set ports.@ethport[-1].duplex="full"
+		uci set ports.@ethport[-1].autoneg=1
+		uci set ports.@ethport[-1].eee=0
+		if [ "$port" = "wan" ]; then
+			uci set ports.@ethport[-1].pause=1
+			uci set ports.@ethport[-1].uplink=1
+		else
+			uci set ports.@ethport[-1].pause=0
+		fi
+	done
+	uci commit ports
+}
+
+if [ -s "/etc/config/ports" ]; then
+	if uci -q get ports.@ethport[0] >/dev/null; then
+		# exit if there is any valid content
+		exit 0
+	else
+		rm -f /etc/config/ports
+	fi
+fi
+
+touch /etc/config/ports
+
+if [ -f /sbin/db -a -n "$(db get hw.board.ethernetPortOrder 2>/dev/null)" ]; then
+	populate_config_from_db
+elif [ -d /proc/device-tree/ ]; then
+	populate_config_from_device_tree
+fi

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

@@ -1,23 +0,0 @@
-#!/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,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-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
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance
-	fi
-}
-
-reload_service() {
-        stop
-        start
-}
-
-service_triggers() {
-	procd_add_reload_trigger network
-}

ethmngr/files/etc/ruleng/ethport.json

@@ -1,20 +0,0 @@
-{
-	"ethport_update": {
-		"if" : [
-			{
-				"event": "network.device"
-			}
-		],
-		"then" : [
-			{
-				"cli": "/sbin/hotplug-call ethernet",
-				"envs": {
-					"PORT": "&network.device->ifname",
-					"LINK": "&network.device->link"
-				},
-				"timeout": 1
-			}
-		]
-	}
-}
-

ethmngr/files/etc/uci-defaults/ruleng.ethport

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

ethmngr/files/linux/lib/ethernet/linux.sh

@@ -0,0 +1,95 @@
+# arg1: port ifname, ex: eth0
+get_max_port_speed() {
+	if [ -z "$1" ]; then
+		echo 0
+		return
+	fi
+
+	local ifname="$1"
+	local phycap="$(ethtool $ifname | grep -A 10 "Supported link modes" | grep 00 | tail -n 1 | awk '{print$NF}')"
+	local speed=1000
+
+	case "$phycap" in
+		10000*) speed=10000 ;;
+		5000*) speed=5000 ;;
+		2500*) speed=2500 ;;
+		1000*) speed=1000 ;;
+		100*) speed=100 ;;
+		10*) speed=10 ;;
+	esac
+
+	echo $speed
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+power_updown() {
+	local ifname="$1"
+	local enabled=$2
+
+	local updown="up"
+	[ $enabled -eq 0 ] && updown="down"
+	ip link set dev $ifname $updown
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+# arg3: port speed, ex: 1000
+# arg4: port duplex, ex: full
+# arg5: port autoneg, ex: on
+# arg6: port eee, ex: 0
+# arg7: port pause, ex: 0
+set_port_settings() {
+	local ifname="$1"
+	local enabled=$2
+	local speed="$3"
+	local duplex=$4
+	local autoneg=$5
+	local eee=$6
+	local pause=$7
+
+	[ -d /sys/class/net/$ifname ] || return
+
+	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
+	ethtool --change $ifname speed $speed duplex $duplex autoneg $autoneg
+
+	[ $eee -eq 1 ] && eee="on" || eee="off"
+	ethtool --set-eee $ifname eee $eee 2>/dev/null
+
+	case $pause in
+		off|0)
+			pause=0x0
+			auto=off
+			rx=off
+			tx=off
+		;;
+		on|1)
+			pause=0x2
+			auto=off
+			rx=on
+			tx=on
+		;;
+		auto)
+			pause=0x1
+			auto=on
+			rx=on
+			tx=on
+		;;
+		tx)
+			pause=0x3
+			auto=off
+			rx=off
+			tx=on
+		;;
+		rx)
+			pause=0x4
+			auto=off
+			rx=on
+			tx=off
+		;;
+	esac
+
+	ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
+
+	power_updown $ifname $enabled
+}

evoice/Makefile

@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=evoice
+PKG_VERSION:=0.2.39
+
+LOCAL_DEV=0
+LOCAL_DEV_EVOICE_DIR=~/voip/evoice
+
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
+PKG_SOURCE_VERSION:=30d65330de0368f73ecf4a2e804c39a2ee280454
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+#PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Network
+	SUBMENU:=Telephony
+	TITLE:=Ensemble Voice
+	URL:=
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c +libblobmsg-json\
+		+TARGET_brcmbca:bcmkernel\
+		+TARGET_airoha:kmod-voip_driver\
+		+TARGET_airoha:voip_app +libbbf_api
+endef
+
+define Package/$(PKG_NAME)/description
+	Ensemble Voice. A stand alone SIP VoIP application. 
+endef
+
+ifeq ($(LOCAL_DEV),1)
+# If you want to build the code from your own local repositiory enable
+# LOCAL_DEV and set LOCAL_DEV_EVOICE_DIR to your own git repository.
+define Build/Prepare
+	@echo "======================================================="
+	@echo "DEVELOPMENT BUILD! rsync $(LOCAL_DEV_EVOICE_DIR) to $(PKG_BUILD_DIR)"
+	@echo "======================================================="
+	rsync -a $(LOCAL_DEV_EVOICE_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+IDIR = $(STAGING_DIR)/usr/include
+TONES_INI_REQUIRED=
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	TARGET_PLATFORM=BROADCOM
+	BDIR = bcm963xx/userspace/private/apps/voice
+	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
+		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
+		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
+	TRG=SVrgBcmFxs
+	JSONFILE=codecs_brcm.json
+else ifeq ($(CONFIG_TARGET_airoha),y)
+	TARGET_PLATFORM=ECONET
+	TONES_INI_REQUIRED=y
+	TRG=SVrgMtekOwrt
+	JSONFILE=codecs_airoha.json
+endif
+
+# disable temporarily some not important warnings, force PIC
+CC_FLAGS_VS=$(CC_FLAGS) -Wno-unused-parameter -Wno-unused-function -fPIC
+
+export TARGET_PLATFORM
+
+#used and altered by BIDE makefiles
+export _XFLAGS
+
+BIDE_MAKE_OPTS = -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk\
+	SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix LIF=cerder DBG=dbg
+
+define Build/Compile
+	@echo "TARGET_PLATFORM=${TARGET_PLATFORM}"
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS)" TRG=$(TRG)
+
+	@echo "clean libvoiceservice before building shared lib!"
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice cleanall
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice
+endef
+
+define Package/evoice/install
+	$(CP) ./files/* $(1)/
+	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(1)/lib/voice/$(JSONFILE) $(1)/lib/voice/codecs_evoice.json
+	$(RM) $(1)/lib/voice/codecs_brcm.json
+	$(RM) $(1)/lib/voice/codecs_airoha.json
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/
+endef
+
+$(eval $(call BuildPackage,evoice))

evoice/files/etc/config/voice

@@ -0,0 +1,334 @@
+
+config SIPClient 'Client1'
+	option Enable '1'
+	option RegisterMode 'RFC3261'
+	option AuthUserName '51234'
+	option AuthPassword '51234'
+	option Network 'Network1'
+	option MaxSessions '5'
+	option RegisiterURI '51234@sip-proxy.iopsys.eu'
+	option E164Format '1'
+
+config SIPClient 'Client2'
+	option Enable '1'
+	option RegisterMode 'RFC3261'
+	option AuthUserName '51235'
+	option AuthPassword '51235'
+	option Network 'Network1'
+	option MaxSessions '5'
+	option RegisiterURI '51235@sip-proxy.iopsys.eu'
+	option E164Format '1'
+
+config SIPNetwork 'Network1'
+	option Enable '1'
+	option ProxyServer 'sip-proxy.iopsys.eu'
+	option AcceptFromProxyOnly '0'
+	option ProxyServerPort '5060'
+	option ProxyServerTransport 'UDP'
+	option RegistrarServer 'sip-proxy.iopsys.eu'
+	option RegistrarServerPort '5060'
+	option RegistrarServerTransport 'UDP'
+	option RegistrationPeriod '3240'
+	option RegisterExpires '3600'
+	option UserAgentDomain ' '
+	option TimerRegistrationFailed '120'
+	option TimerT1 '500'
+	option VoIPProfile 'VoIPProfile1'
+	option SIPSessionTimerEnable '0'
+	option SIPSessionExpireInterval '1800'
+	option SIPSessionMinimumTimer '90'
+	option SIPSessionRefresher 'NONE'
+	option SIPSessionTimerMode 'REQUEST'
+	option SIPSessionRefreshRequest 'UPDATE'
+	list CodecList '1CodecProfile1'
+	list CodecList '1CodecProfile2'
+	list CodecList '1CodecProfile3'
+	list CodecList '1CodecProfile5'
+	list CodecList '1CodecProfile4'
+
+config CodecProfile '1CodecProfile1'
+	option Enable '1'
+	option Codec 'G.711ALaw'
+	option PacketizationPeriod '20'
+	option SilenceSupression '1'
+
+config CodecProfile '1CodecProfile2'
+	option Enable '1'
+	option Codec 'G.711MuLaw'
+	option PacketizationPeriod '20'
+	option SilenceSupression '1'
+
+config CodecProfile '1CodecProfile3'
+	option Enable '1'
+	option Codec 'G.726'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config CodecProfile '1CodecProfile4'
+	option Enable '1'
+	option Codec 'G.722'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config CodecProfile '1CodecProfile5'
+	option Enable '1'
+	option Codec 'G.729'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config VoIPProfile 'VoIPProfile1'
+	option Enable '1'
+	option DTMFMethod 'RFC4733'
+	option RTP '1RTP'
+
+config RTP '1RTP'
+	option LocalPortMin '10020'
+	option LocalPortMax '10039'
+	option JitterBufferType 'Static'
+
+config FXXPorts 'POTS'
+	option Region 'US'
+
+config FXSPorts 'FXS1'
+	option Enable '1'
+	option DialType 'Tone'
+	option TransmitGain '0'
+	option ReceiveGain '0'
+	option EchoCancellationEnable '1'
+
+config FXSPorts 'FXS2'
+	option Enable '1'
+	option DialType 'Tone'
+	option TransmitGain '0'
+	option ReceiveGain '0'
+	option EchoCancellationEnable '1'
+
+config Extension 'Extension1'
+	option Enable '1'
+	option ExtensionNumber '10#'
+	option Provider 'FXS1'
+	option CallingFeatures 'Set1'
+	option Name 'Phone 1'
+
+config Extension 'Extension2'
+	option Enable '1'
+	option ExtensionNumber '11#'
+	option Provider 'FXS2'
+	option CallingFeatures 'Set1'
+	option Name 'Phone 2'
+
+config Line 'Line1'
+	option Enable '1'
+	option Provider 'Client1'
+	option CallingFeatures 'Set1'
+
+config Line 'Line2'
+	option Enable '1'
+	option Provider 'Client2'
+	option CallingFeatures 'Set2'
+
+config IncomingMap 'IncomingMap1'
+	option Enable '1'
+	option Extension 'Extension1'
+	option Line 'Line1'
+
+config IncomingMap 'IncomingMap2'
+	option Enable '1'
+	option Extension 'Extension2'
+	option Line 'Line2'
+
+config IncomingMap 'IncomingMap3'
+	option Enable '0'
+	option Extension 'Extension2'
+	option Line 'Line1'
+
+config OutgoingMap 'OutgoingMap1'
+	option Enable '1'
+	option Extension 'Extension1'
+	option Line 'Line1'
+
+config OutgoingMap 'OutgoingMap2'
+	option Enable '1'
+	option Extension 'Extension2'
+	option Line 'Line2'
+
+config CallingFeatures 'Set1'
+	option CallerIDEnable '1'
+	option CallerIDNameEnable '1'
+	option CallForwardUnconditionalEnable '0'
+	option CallForwardUnconditionalNumber ' '
+	option CallForwardOnBusyEnable '0'
+	option CallForwardOnBusyNumber ' '
+	option CallForwardOnNoAnswerEnable '0'
+	option CallForwardOnNoAnswerRingTimeout '24'
+	option CallForwardOnNoAnswerNumber ' '
+	option CallTransferEnable '1'
+	option MWIEnable '1'
+	option VMWIEnable '1'
+	option LineMessagesWaiting '0'
+	option AnonymousCallRejectionEnable '0'
+	option AnonymousCallEnable '1'
+	option DoNotDisturbEnable '1'
+	option RepeatDialEnable '1'
+	option VoiceMailEnable '1'
+	option CallPickUpEnable '1'
+	option CCBSEnable '1'
+	option CallWaitingEnable '0'
+
+config CallingFeatures 'Set2'
+	option CallerIDEnable '1'
+	option CallerIDNameEnable '1'
+	option CallForwardUnconditionalEnable '0'
+	option CallForwardUnconditionalNumber ' '
+	option CallForwardOnBusyEnable '0'
+	option CallForwardOnBusyNumber ' '
+	option CallForwardOnNoAnswerEnable '0'
+	option CallForwardOnNoAnswerRingTimeout '24'
+	option CallForwardOnNoAnswerNumber ' '
+	option CallTransferEnable '1'
+	option MWIEnable '1'
+	option VMWIEnable '1'
+	option LineMessagesWaiting '0'
+	option AnonymousCallRejectionEnable '0'
+	option AnonymousCallEnable '1'
+	option DoNotDisturbEnable '1'
+	option RepeatDialEnable '1'
+	option VoiceMailEnable '1'
+	option CallPickUpEnable '1'
+	option CCBSEnable '1'
+	option CallWaitingEnable '1'
+
+config NumberingPlan 'NumberingPlan1'
+	option MinimumNumberOfDigits '1'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit '#'
+
+config NumberingPlan 'NumberingPlan2'
+	option MinimumNumberOfDigits '5'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit ' '
+	list PrefixList '2PrefixInfo1'
+	list PrefixList '2PrefixInfo2'
+	list PrefixList '2PrefixInfo3'
+	list PrefixList '2PrefixInfo4'
+	list PrefixList '2PrefixInfo5'
+	list PrefixList '2PrefixInfo6'
+	list PrefixList '2PrefixInfo7'
+	list PrefixList '2PrefixInfo8'
+	list PrefixList '2PrefixInfo9'
+
+config NumberingPlan 'NumberingPlan3'
+	option MinimumNumberOfDigits '5'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit '#'
+	list PrefixList '3PrefixInfo1'
+
+config PrefixInfo '2PrefixInfo1'
+	option Enable '1'
+	option PrefixRange '*43#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CW_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo2'
+	option Enable '1'
+	option PrefixRange '#43#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CW_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo3'
+	option Enable '1'
+	option PrefixRange '*21*(X+)#'
+	option PrefixMinNumberOfDigits '9'
+	option PrefixMaxNumberOfDigits '9'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFU_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo4'
+	option Enable '1'
+	option PrefixRange '#21#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFU_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo5'
+	option Enable '1'
+	option PrefixRange '*67*(X+)#'
+	option PrefixMinNumberOfDigits '9'
+	option PrefixMaxNumberOfDigits '9'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFB_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo6'
+	option Enable '1'
+	option PrefixRange '#67#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFB_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo7'
+	option Enable '1'
+	option PrefixRange '*61*(X+(*X+)?)#'
+	option PrefixMinNumberOfDigits '15'
+	option PrefixMaxNumberOfDigits '15'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFNR_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo8'
+	option Enable '1'
+	option PrefixRange '#61#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFNR_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo9'
+	option Enable '1'
+	option PrefixRange '*31*'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CA_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo1'
+	option Enable '1'
+	option PrefixRange '110|112'
+	option PrefixMinNumberOfDigits '7'
+	option PrefixMaxNumberOfDigits '7'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'X_IOPSYS_EU_EMERGENCY'
+	option FacilityActionArgument ' '
+
+config DialPlan 'X_IOPSYS_EU_InternalNumber1'
+	option RegExp '1X#'
+

evoice/files/etc/evoice/voicedm

@@ -0,0 +1,181 @@
+# RO (Main)
+config account 'map_board'
+   option HW_Has_Voice 'hw.board.hasVoice'
+   option HW_Has_DECT 'hw.board.hasDect'
+   option HW_Nr_Of_POTS_Ports 'hw.board.VoicePorts'
+   option HW_VoiceDSP 'hw.board.VoiceDSP'
+   option ProductID 'device.deviceinfo.ModelName'
+   option I3_VERSION 'device.deviceinfo.SoftwareVersion'
+   option SerialNumber 'device.deviceinfo.SerialNumber'
+   
+config account 'map_pots'
+   option Country 'voice.POTS.Region'
+
+# Voice Service navigation paths
+# Not used to initialize internal configuration
+config navigation 'map_vs'
+   option Account 'voice.Client@.'
+   option Network 'voice.Client@.Network'
+   option VoIPProfile 'voice.Network@.VoIPProfile'
+   option CfAccount 'voice.Line@.CallingFeatures'
+   option CfPhone 'voice.Extension@.CallingFeatures'
+   option CodecList 'voice.Network@.CodecList'
+   option Codec 'voice.Codec@.Codec'
+   option OutgoingMapEnabled 'voice.OutgoingMap@.Enable'
+   option From_Phone 'voice.OutgoingMap@.Extension'
+   option Extension 'voice.Extension@.Provider'
+   option To_Account 'voice.OutgoingMap@.Line'
+   option Line 'voice.Line@.Provider'
+   option LineEnable 'voice.Line@.Enable'
+   option LineProvider 'voice.Line@.Provider'
+   option IncomingMapEnabled 'voice.IncomingMap@.Enable'
+   option From_Account 'voice.IncomingMap@.Line'
+   option To_Phone 'voice.IncomingMap@.Extension'
+   option ExtensionEnable 'voice.Extension@.Enable'
+   option ExtensionProvider 'voice.Extension@.Provider'
+
+# Registration for account A-Z is associate with SIP.Clienti.Enable    
+# All parameters in this table are written to internal configuration
+config account 'map_account'
+   option Registration 'voice.Client@.Enable'
+   option Display_Name ''
+   option PhoneNumber 'voice.Client@.RegisiterURI'
+   option Username 'voice.Client@.AuthUserName'
+   option Password 'voice.Client@.AuthPassword'
+   option SIP_Telephone_Syntax 'voice.Client@.E164Format'
+   option Device_Description 'voice.Client@.UserAgent'
+
+# Network stuff associated with an account.
+# All parameters in this table are written to internal configuration
+config network 'map_net'
+   option Enable                'voice.Network@.Enable'
+   option Registration_Server   'voice.Network@.RegistrarServer'
+   option Outbound_Proxy        'voice.Network@.ProxyServer'
+   option Accept_From_Registered 'voice.Network@.AcceptFromProxyOnly'
+   option SIP_Port              'voice.Network@.RegistrarServerPort'
+   option SIP_Transport         'voice.Network@.RegistrarServerTransport'
+   option RegistrationPeriod    'voice.Network@.RegistrationPeriod'
+   option Registration_Interval 'voice.Network@.RegisterExpires'
+   option Reg_Failure_Interval  'voice.Network@.TimerRegistrationFailed'
+   option T1                    'voice.Network@.TimerT1'
+   option UserAgentDomain       'voice.Network@.UserAgentDomain'
+   option SIP_SessTmrEnable     'voice.Network@.SIPSessionTimerEnable'
+   option SIP_SessTmrMode       'voice.Network@.SIPSessionTimerMode'
+   option SIP_SessTmrMsg        'voice.Network@.SIPSessionRefreshRequest'
+   option SIP_SessTmrRefresher  'voice.Network@.SIPSessionRefresher'
+   option SIP_MinSE             'voice.Network@.SIPSessionMinimumTimer'
+   option SIP_SessInterval      'voice.Network@.SIPSessionExpireInterval'
+
+config VoIPProfile 'map_voip'
+   option Enable 'voice.VoIPProfile@.Enable'
+   option DTMF_Method 'voice.VoIPProfile@.DTMFMethod'
+   option RTP 'voice.VoIPProfile@.RTP'
+
+config RTP 'map_rtp'
+   option RTP_Port_Base 'voice.@RTP@.LocalPortMin'
+   option RTP_Port_End 'voice.@RTP@.LocalPortMax'
+
+config codecs 'map_codec'
+   option Codec 'voice.CodecProfile@.Codec'
+   option enable 'voice.CodecProfile@.Enable'
+   option ptime 'voice.CodecProfile@.PacketizationPeriod'
+   option dtx 'voice.CodecProfile@.SilenceSupression'
+
+config fxsinfo 'map_fxs'
+   option Enable 'voice.FXS@.Enable'
+   option DialType 'voice.FXS@.DialType'
+   option TransmitGain 'voice.FXS@.TransmitGain'
+   option ReceiveGain  'voice.FXS@.ReceiveGain'
+   option EchoCancellationEnable 'voice.FXS@.EchoCancellationEnable'
+
+config extensioninfo 'map_ext'
+   option Enable 'voice.Extension@.Enable'
+   option Internal_Number_Phone 'voice.Extension@.ExtensionNumber'
+   option Display_Name_Phone 'voice.Extension@.Name'
+
+config capabilities 'map_capa'
+   option Call_Waiting_Enable 'voice.Capabilities@FacilityActions'
+   option Enable_Call_Diversion 'voice.Capabilities@FacilityActions'
+
+config cs_account 'map_set'
+   option BusyCallWait 'voice.Set@.CallWaitingEnable'
+   option AlwaysDivert 'voice.Set@.CallForwardUnconditionalEnable'
+   option CFU_Number 'voice.Set@.CallForwardUnconditionalNumber'
+   option BusyDivert 'voice.Set@.CallForwardOnBusyEnable'
+   option CFB_Number 'voice.Set@.CallForwardOnBusyNumber'
+   option NoAnswDivert 'voice.Set@.CallForwardOnNoAnswerEnable'
+   option CFNR_Number 'voice.Set@.CallForwardOnNoAnswerNumber'
+   option CFNR_Timeout 'voice.Set@.CallForwardOnNoAnswerRingTimeout'
+   option Enable_Call_Transfer 'voice.Set@.CallTransferEnable'
+   option AnonymousReject 'voice.Set@.AnonymousCallRejectionEnable'
+   option AllowAnonymousConf 'voice.Set@.AnonymousCallEnable'
+   option CallerIDEnable 'voice.Set@.CallerIDEnable'
+
+config cs_xvendor 'map_np_cs'
+   option np_sc_actCW 'voice.X_IOPSYS_EU_NpSc@.CW_ACT'
+   option np_sc_actCW_output 'voice.X_IOPSYS_EU_NpSc@.CW_OUT'
+   option np_sc_deactCW 'voice.X_IOPSYS_EU_NpSc@.CW_DEACT'
+   option np_sc_isactCW 'voice.X_IOPSYS_EU_NpSc@.CW_ISACT'
+   option np_sc_actCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_ACT'
+   option np_sc_actCFU_output 'voice.X_IOPSYS_EU_NpSc@.CFU_OUT'
+   option np_sc_deactCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_DEACT'
+   option np_sc_actCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_ACT'
+   option np_sc_actCFB_output 'voice.X_IOPSYS_EU_NpSc@.CFB_OUT'
+   option np_sc_deactCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_DEACT'
+   option np_sc_actCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_ACT'
+   option np_sc_actCFNR_output 'voice.X_IOPSYS_EU_NpSc@.CFNR_OUT'
+   option np_sc_deactCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_DEACT'
+   option np_sc_actRA 'voice.X_IOPSYS_EU_NpSc@.RA_ACT'
+   option np_sc_deactRA 'voice.X_IOPSYS_EU_NpSc@.RA_DEACT'
+   option np_sc_actAC 'voice.X_IOPSYS_EU_NpSc@.AC_ACT'
+   option np_sc_deactAC 'voice.X_IOPSYS_EU_NpSc@.AC_DEACT'
+   option np_sc_actAA 'voice.X_IOPSYS_EU_NpSc@.AA_ACT'
+   option np_sc_deactAA 'voice.X_IOPSYS_EU_NpSc@.AA_DEACT'
+   option np_sc_actAD 'voice.X_IOPSYS_EU_NpSc@.AD_ACT'
+   option np_sc_actAD_output 'voice.X_IOPSYS_EU_NpSc@.AD_OUT'
+   option np_sc_deactAD 'voice.X_IOPSYS_EU_NpSc@.AD_DEACT'
+   option np_sc_actMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_ACT'
+   option np_sc_deactMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_DEACT'
+   option np_sc_actMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_ACT'
+   option np_sc_deactMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_DEACT'
+   option np_sc_redial 'voice.X_IOPSYS_EU_NpSc@.REDIAL'
+   option np_sc_setMiscConf 'voice.X_IOPSYS_EU_NpSc@.SET_MISC'
+
+config cc_xvendor 'map_np_in'
+   option np_in_limitExp 'voice.X_IOPSYS_EU_InternalNumber@.RegExp'
+
+config cc_xvendor 'map_np_sh'
+   option sh_no_str 'voice.X_IOPSYS_EU_ShortNumber@.RegExp'
+
+config cc_xvendor 'map_np_eme'
+   option np_eme 'voice.X_IOPSYS_EU_EmergencyNumber@.RegExp'
+   option np_eme_out 'voice.X_IOPSYS_EU_EmergencyNumber@.OutStr'
+
+config cc_xvendor 'map_np_rn'
+   option np_rn 'voice.X_IOPSYS_EU_RegularNumber@.RegExp'
+   option np_rn_out 'voice.X_IOPSYS_EU_RegularNumber@.OutStr'
+   option np_rn_account 'voice.X_IOPSYS_EU_RegularNumber@.AccStr'
+
+config cc_xvendor 'map_np_bn'
+   option np_bn 'voice.X_IOPSYS_EU_BarredNumber@.RegExp'
+   option np_bn_out 'voice.X_IOPSYS_EU_BarredNumber@.OutStr'
+
+config TR104NumberingPlan 'map_np_tr'
+   option min_digits 'voice.NumberingPlan@.MinimumNumberOfDigits'
+   option max_digits 'voice.NumberingPlan@.MaximumNumberOfDigits'
+   option tmo_std 'voice.NumberingPlan@.InterDigitTimerStd'
+   option tmo_open 'voice.NumberingPlan@.InterDigitTimerOpen'
+   option term_digit 'voice.NumberingPlan@.TerminationDigit'
+   option prefix_list 'voice.NumberingPlan@.PrefixList'
+
+config TR104NumberingPlanPrefix 'map_np_pf'
+   option enable 'voice.@PrefixInfo@.Enable'
+   option range 'voice.@PrefixInfo@.PrefixRange'
+   option prefix_min_digits 'voice.@PrefixInfo@.PrefixMinNumberOfDigits'
+   option prefix_max_digits 'voice.@PrefixInfo@.PrefixMaxNumberOfDigits'
+   option remove_digits 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
+   option remove_pos 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
+   option facility_act 'voice.@PrefixInfo@.FacilityAction'
+   option facility_arg 'voice.@PrefixInfo@.FacilityActionArgument'
+
+

evoice/files/etc/evoice/voicero

@@ -0,0 +1,56 @@
+config static_prm 'defaults'
+   option Print_Control '4'
+   option Print_UDP_Addr '192.168.1.3'
+   option Print_UDP_Port '60000'
+   option Verbosity 'On'
+   option Failure_Log 'On'
+   option Message_Log 'On'
+   option Method_Trace 'Off'
+   option Dial_Cache_Size '0'
+   option Reverse_Fax_Detection '0'
+   option DSP_24 '0'
+   option DSP_36 '0'
+   option DSP_43 '0'
+   option Swap_Name_Nr_CID '0'
+   option R_Button_Lower_Lim '100'
+   option R_Button_Upper_Lim '800'
+   option HookOn_Delay '0'
+   option SupportLDD '0'
+   option LDD_Min_Break_Time '41'
+   option LDD_Max_Break_Time '94'
+   option LDD_Percent_Break '55'
+   option Tone_On_Hangup '1'
+   option BusyTone_On_Hangup '1'
+   option Enable_Analouge_Conf '0'
+   option PrackUsage '1'
+   option SIP_SupportedPath '0'
+   option IMS_Access_Network_Info ' '
+   option SIP_Reason_Protocol '0'
+   option SIP_Body_QOST '0'
+   option SIP_HistoryInfo '0'
+   option Customer_Spec2 '1'
+   option UTF8_Enable '0'
+   option RFC3325 '0'
+   option Accept_From_Registered '0'
+   option Polarity_Reversal '0'
+   option Closed_Dial_Plan '0'
+   option Netw_Dial '0'
+   option No_Answer_Tmo '180'
+   option UPnP_Enabled '0'
+   option NAT_Address ' '
+   option NAT_Address_From_SIP '0'
+   option HookOn_Transfer '0'
+   option Enable_Call_Transfer '1'
+   option CallerIDEnable '1'
+   option Multiparty_Transp '0'
+   option Presence_Indication '0'
+   option Login_Note ' '
+   option Login_Description ' '
+   option Logout_Note ' '
+   option Logout_Description ' '
+   option Resolve_Every_Transaction '2'
+   option Translate_Plus '1'
+   option Mid_Call_Services '0'
+   option Account_Restriction '0'
+   option Answering_Machine_Enable '0'
+

evoice/files/etc/init.d/evoice

@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+
+START=68
+STOP=12
+
+USE_PROCD=1
+NAME=evoice
+VOICE_UCI_CONFIG=voice
+
+start_service() {
+	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
+
+
+	which endptmngr >/dev/null 2>&1 && {
+		echo "evoice can't be started since endptmngr is installed. Please remove endptmngr and retry"
+		return
+	}
+
+	procd_open_instance
+	procd_set_param command $NAME
+	procd_set_param respawn "5" "0" "3"
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger $VOICE_UCI_CONFIG
+}

evoice/files/lib/voice/codecs_airoha.json

@@ -0,0 +1,50 @@
+{
+	"G.711ALaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.711MuLaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.722": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.726": [
+		{
+			"BitRate": 32000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		},
+		{
+			"BitRate": 24000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.729": [
+		{
+			"BitRate": 8000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"AMR": [
+		{
+			"BitRate": 7400,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	]
+}
+

evoice/files/lib/voice/codecs_brcm.json

@@ -0,0 +1,140 @@
+{
+	"G.711MuLaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.711ALaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.726": [
+		{
+			"BitRate": 16000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 24000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 32000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 40000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.723.1": [
+		{
+			"BitRate": 5300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 6300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.729": [
+		{
+			"BitRate": 8000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"iLBC": [
+		{
+			"BitRate": 15200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 13300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.722": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"AMR": [
+		{
+			"BitRate": 12200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 10200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 7950,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 7400,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 6700,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 5900,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 5150,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 4750,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-EFR": [
+		{
+			"BitRate": 12200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-FR": [
+		{
+			"BitRate": 13200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-HR": [
+		{
+			"BitRate": 5600,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	]
+}
+

fscryptctl/Makefile

@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fscryptctl
-PKG_VERSION:=1.1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/google/fscryptctl.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Encryption
-  TITLE:=Fscryptctl
-endef
-
-define Package/$(PKG_NAME)/description
-	fscryptctl is a low-level tool written in C that handles raw keys and manages policies for Linux filesystem encryption,
-	specifically the "fscrypt" kernel interface which is supported by the ext4, f2fs, and UBIFS filesystems
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		fscryptctl
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fscryptctl $(1)/usr/bin/fscryptctl
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

gryphon-led-module/Makefile

@@ -41,8 +41,32 @@ 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
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
+	# This assumes that the MODULES_SUBDIR set by OpenWrt is of the form
+	# lib/modules/4.19.235-abcdef where 4.19.235 is the version of our fake bcmlinux kernel
+	# and abcdef the git-commit.
+	# The kernel compiled by the Broadcom SDK has a uname -r of 4.19.235, i.e. without the git-commit.
+	# The assignment below removes the part after the - which puts modules in the right directory as
+	# long as the bcmlinux version matches the kernel version in the BCM SDK.
+	# So, this will only stop working in the time window where the BCM SDK has been updated
+	# but bcmlinux has not yet been updated.
+	MODULES_SUBDIR:=$(firstword $(subst -, ,$(MODULES_SUBDIR)))
+	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-
+
+	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
+		# These targets use a 64-bit kernel
+		LINUX_KARCH:=arm64
+		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX)-
+	else ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"6855" "6756" "47622" "63148" "63178"))
+		# These targets use a 32-bit arm-sfp kernel
+		LINUX_KARCH:=arm
+		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX)-
+	endif
+	# For some reason, Broadcom's kernel does not set the include paths correctly when compiling out-of-tree modules
+	EXTRA_KCPPFLAGS:="-I $(LINUX_DIR)/../bcmkernel/include -I $(LINUX_DIR)/arch/arm/mach-bcm963xx/include"
+endif
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/

hostmngr/Config.in

@@ -1,15 +0,0 @@
-if (PACKAGE_hostmngr)
-
-menu "Configuration"
-
-config HOSTMNGR_HOSTS_HISTORY
-	bool "Keep history of hosts"
-	default y
-
-config HOSTMNGR_PLATFORM_HAS_WIFI
-	bool "Platform has WiFi"
-	default y if PACKAGE_libwifi
-
-endmenu
-
-endif

hostmngr/Makefile

@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.4
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b4990b384461f2d1ff75a122a7fa5d9276f211bb
-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
-endif
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
-
-define Package/hostmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Show and manage hosts in the network
-  DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
-	   +libnetfilter-conntrack \
-	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api \
-	   +libwifiutils
-
-endef
-
-define Package/hostmngr/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/hostmngr/description
- This package provides hostmngr that can detect and show host devices
- present in the network.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
-	-D_GNU_SOURCE
-
-ifeq ($(CONFIG_HOSTMNGR_PLATFORM_HAS_WIFI),y)
-TARGET_CFLAGS += -DHAS_WIFI
-endif
-
-MAKE_PATH:=src
-
-define Package/hostmngr/install
-	$(CP) ./files/etc $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(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_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1) $(PKG_NAME)
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/hostmngr/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-$(eval $(call BuildPackage,hostmngr))

hostmngr/files/etc/config/hosts

@@ -1,9 +0,0 @@
-
-config global 'global'
-	option enabled '1'
-	option history '1'
-	option history_file '/etc/hosts_history.json'
-	option history_timeout '86400'
-
-config interface
-	list ifname 'br-lan'

hostmngr/files/etc/firewall.hosts

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sh /usr/share/hostmngr/hosts_acl.sh

hostmngr/files/etc/init.d/hostmngr

@@ -1,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=65
-STOP=20
-
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-	procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
-#	procd_set_param respawn
-	procd_set_param limits core="unlimited"
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-	
-	sh /usr/share/hostmngr/hosts_acl.sh
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "hosts"
-}
-
-reload_service() {
-	stop
-	start
-}

hostmngr/files/etc/uci-defaults/993-topology-hosts-to-hostmngr-hosts-config

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-uci -q get hosts.global.ageing_timer || exit 0
-
-
-# Old hosts UCI config is detected; Convert to new format
-
-ageing_timer="$(uci -q get hosts.global.ageing_timer)"
-history_timeout=$((ageing_timer*60))
-
-uci -q set hosts.global.enabled=1
-uci -q delete hosts.global.ageing_timer
-uci -q set hosts.global.history_timeout="$history_timeout"
-uci -q rename hosts.global.reboot_persistent=history
-uci -q set hosts.global.history_file="/etc/hosts_history.json"
-
-uci -q add hosts interface
-for ifname in $(uci -q get hosts.global.ifname); do
-	uci -q add_list hosts.@interface[-1].ifname="$ifname"
-done
-
-uci -q delete hosts.global.ifname
-exit 0

hostmngr/files/scripts/hosts_acl.sh

@@ -1,295 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-day=""
-next_days=""
-prev_days=""
-schedule_added=""
-
-ACCESS_RULE=""
-IP_RULE=""
-IP_RULE1=""
-
-get_next_day() {
-	local weekday="$1"
-	case "$weekday" in
-		"Mon"|"Monday") echo "Tuesday"
-		;;
-		"Tue"|"Tuesday") echo "Wednesday"
-		;;
-		"Wed"|"Wednesday") echo "Thursday"
-		;;
-		"Thu"|"Thursday") echo "Friday"
-		;;
-		"Fri"|"Friday") echo "Saturday"
-		;;
-		"Sat"|"Saturday") echo "Sunday"
-		;;
-		"Sun"|"Sunday") echo "Monday"
-		;;
-	esac
-}
-
-get_previous_day() {
-	local weekday="$1"
-	case "$weekday" in
-		"Mon"|"Monday") echo "Sunday"
-		;;
-		"Tue"|"Tuesday") echo "Monday"
-		;;
-		"Wed"|"Wednesday") echo "Tuesday"
-		;;
-		"Thu"|"Thursday") echo "Wednesday"
-		;;
-		"Fri"|"Friday") echo "Thursday"
-		;;
-		"Sat"|"Saturday") echo "Friday"
-		;;
-		"Sun"|"Sunday") echo "Saturday"
-		;;
-	esac
-}
-
-ip_rule_west_zone() {
-	local utc_start_t_h="$1"
-	local utc_stop_t_h="$2"
-	local local_start_t_h="$3"
-	local local_stop_t_h="$4"
-	local utc_start_time="$5"
-	local utc_stop_time="$6"
-
-	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
-		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		if [ -n "$next_days" ]; then
-			IP_RULE="$IP_RULE --weekdays $next_days"
-		fi
-	else
-		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
-			IP_RULE1="$IP_RULE"
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop 23:59"
-			IP_RULE1="$IP_RULE1 -m time --timestart 00:00 --timestop $utc_stop_time"
-			if [ -n "$next_days" ]; then
-				IP_RULE1="$IP_RULE1 --weekdays $next_days"
-			fi
-		else
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		fi
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	fi
-}
-
-ip_rule_east_zone() {
-	local utc_start_t_h="$1"
-	local utc_stop_t_h="$2"
-	local local_start_t_h="$3"
-	local local_stop_t_h="$4"
-	local utc_start_time="$5"
-	local utc_stop_time="$6"
-
-	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
-		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	else
-		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
-			IP_RULE1="$IP_RULE"
-			IP_RULE="$IP_RULE -m time --timestart 00:00 --timestop $utc_stop_time"
-			IP_RULE1="$IP_RULE1 -m time --timestart $utc_start_time --timestop 23:59"
-			if [ -n "$prev_days" ]; then
-				IP_RULE1="$IP_RULE1 --weekdays $prev_days"
-			fi
-		else
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		fi
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	fi
-}
-
-
-add_access_rule() {
-	local rule="$1"
-	echo "iptables -w -A hosts_forward ${rule}" >> $ACL_FILE
-	echo "ip6tables -w -A hosts_forward ${rule}" >> $ACL_FILE
-}
-
-handle_day_list() {
-	local value=$1
-
-	val=$(echo $value | cut -c 1-3)
-	next_day_val=$(get_next_day $val)
-	prev_day_val=$(get_previous_day $val)
-	if [ -z $day ]; then
-		day="$val"
-		next_days="$next_day_val"
-		prev_days="$prev_day_val"
-	else
-		day="$day,$val"
-		next_days="$next_days,$next_day_val"
-		prev_days="$prev_days,$prev_day_val"
-	fi
-}
-
-handle_schedule() {
-	local schd_section="$1"
-	local ac_section="$2"
-	local acs_id
-	local start_time
-	local duration
-
-	IP_RULE="$ACCESS_RULE"
-	IP_RULE1=""
-	day=""
-	next_days=""
-	prev_days=""
-
-	config_get acs_id "$schd_section" "dm_parent"
-
-	if [ "$acs_id" != "$ac_section" ]; then
-		return # schedule not for this access control section
-	fi
-
-	local is_enabled
-	config_get is_enabled "$schd_section" "enable" 0
-	if [ "$is_enabled" == "0" ]; then
-		return
-	fi
-
-	local all_days="Monday Tuesday Wednesday Thursday Friday Saturday Sunday"
-	local day_config
-	config_get day_config "$schd_section" "day" "$all_days"
-
-	IFS=" "
-	for d in $day_config; do
-		handle_day_list $d
-	done
-
-	config_get start_time "$schd_section" "start_time" "00:00"
-	config_get duration "$schd_section" "duration"
-
-	zone=$(date +%z | cut -c 1)
-	local_start_time=$start_time
-	hh=$(echo $local_start_time | awk -F: '{ print $1 }')
-	mm=$(echo $local_start_time | awk -F: '{ print $2 }')
-	hh_s=`expr $hh \* 3600`
-	mm_s=`expr $mm \* 60`
-	ss=$(( hh_s + mm_s ))
-	local_start_hh=$hh
-
-        if [ -n "$duration" ]; then
-                stop_ss=$(( ss + duration ))
-                hh=$(( stop_ss / 3600 ))
-               	rem_ss=$(( stop_ss % 3600 ))
-               	mm=$(( rem_ss / 60 ))
-               	ss=$(( rem_ss % 60 ))
-		local_stop_time="$hh:$mm:$ss"
-		local_stop_hh=$hh
-	else
-		# if duartion is not specified, then apply rule to end of the day
-		local_stop_time="23:59:59"
-		local_stop_hh="23"
-	fi
-
-	utc_start_time=$(date -u -d @$(date "+%s" -d "$local_start_time") +%H:%M)
-	utc_stop_time=$(date -u -d @$(date "+%s" -d "$local_stop_time") +%H:%M)
-	utc_start_hh=$(echo $utc_start_time | awk -F: '{ print $1 }')
-	utc_stop_hh=$(echo $utc_stop_time | awk -F: '{ print $1 }')
-	if [ "$zone" == "-" ]; then
-		ip_rule_west_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
-	else
-		ip_rule_east_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
-	fi
-
-	IP_RULE="$IP_RULE -j ACCEPT"
-	if [ -n "$IP_RULE1" ]; then
-		IP_RULE1="$IP_RULE1 -j ACCEPT"
-	fi
-
-	add_access_rule "$IP_RULE"
-	if [ -n "$IP_RULE1" ]; then
-		add_access_rule "$IP_RULE1"
-	fi
-
-	# for access rules to be effective for a schedule, need to add DROP rule
-	# to block the access outside the defined schedule
-	if [ "$schedule_added" == "0" ]; then
-		schedule_added="1"
-	fi
-}
-
-handle_access_control() {
-	local ac_section="$1"
-	local is_enabled
-
-	# default value of Hosts.AccessControl.{i}.Enable is false,
-	# so, if not defined in uci as 1, assume 0
-	config_get is_enabled "$ac_section" "enable" 0
-	if [ "$is_enabled" == "0" ]; then
-		return
-	fi
-
-	local mac_addr
-	config_get mac_addr "$ac_section" "macaddr"
-	if [ -z "$mac_addr" ]; then
-		return
-	else
-		ACCESS_RULE="-m mac --mac-source $mac_addr"
-	fi
-
-	local access_policy
-	config_get access_policy "$ac_section" "access_policy"
-	if [ -z "$access_policy" ]; then
-		return # since system default is allow so no need to do anything
-	fi
-
-	# As per Data Model, if access policy is deny, then schedule is to be ignored
-	# and no access is to be provided for the device
-	if [ "$access_policy" == "Deny" ]; then
-		ACCESS_RULE="$ACCESS_RULE -j DROP"
-		add_access_rule "$ACCESS_RULE"
-		return # no need to parse schedule
-	fi
-
-	schedule_added="0"
-	# check if schedule is defined for this access_control instance
-	# and if yes, create rule accordingly
-	config_foreach handle_schedule  ac_schedule "$ac_section"
-
-	# for access rule to work, need to have default drop rule as last rule
-	if [ "$schedule_added" == "1" ]; then
-		IP_RULE="$ACCESS_RULE -j DROP"
-		add_access_rule "$IP_RULE"
-	fi
-}
-
-ACL_FILE="/tmp/hosts_access_control/access_control.rules"
-
-rm -f $ACL_FILE
-
-mkdir -p /tmp/hosts_access_control/
-touch $ACL_FILE
-
-echo "iptables -w -F hosts_forward" >> $ACL_FILE
-echo "ip6tables -w -F hosts_forward" >> $ACL_FILE
-
-hosts_forward=$(iptables -t filter --list | grep hosts_forward)
-if [ -z "$hosts_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
-	echo "ip6tables -w -t filter -N hosts_forward" >> $ACL_FILE
-	ret=$?
-	[ $ret -eq 0 ] && echo "ip6tables -w -t filter -I FORWARD -j hosts_forward" >> $ACL_FILE
-fi
-
-# Load /etc/config/hosts UCI file
-config_load hosts
-config_foreach handle_access_control access_control
-
-# apply the rules
-sh $ACL_FILE

icwmp/Makefile

@@ -8,59 +8,114 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.7.8
+PKG_VERSION:=9.3.2
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=5139c70c5f4da5107b7996456763b6beecb3b7d4
+PKG_SOURCE_VERSION:=a68417ec44251e9f619f2682618b06dae083bd32
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-include ../bbfdm/bbfdm.mk
 
-define Package/icwmp
+define Package/icwmp/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api
 endef
 
-ifeq ($(LOCAL_DEV),1)
+define Package/icwmp
+  $(Package/icwmp/default)
+  VARIANT:=default
+  DEFAULT_VARIANT:=1
+  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
+endef
+
+define Package/icwmp-openssl
+  $(Package/icwmp/default)
+  TITLE += (openssl)
+  VARIANT:=openssl
+  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
+  CONFLICTS := icwmp icwmp-mbedtls icwmp-wolfssl
+endef
+
+define Package/icwmp-wolfssl
+  $(Package/icwmp/default)
+  TITLE += (wolfssl)
+  VARIANT:=wolfssl
+  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
+  CONFLICTS := icwmp icwmp-mbedtls icwmp-openssl
+endef
+
+define Package/icwmp-mbedtls
+  $(Package/icwmp/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_icwmp-mbedtls:libmbedtls
+  VARIANT:=mbedtls
+  CONFLICTS := icwmp icwmp-wolfssl icwmp-openssl
+endef
+
+ifeq ($(BUILD_VARIANT),default)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),openssl)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),wolfssl)
+CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+endif
+
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-define Package/icwmp/install
+define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
-	$(INSTALL_DIR) $(1)/etc/icwmpd/plugins
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libcwmpdm.so $(1)/usr/lib/bbfdm/libcwmpdm.so
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
-	$(INSTALL_BIN) ./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_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libcwmpdm.so $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME)
+	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
 endef
 
+Package/icwmp/install = $(Package/icwmp/default/install)
+Package/icwmp-openssl/install = $(Package/icwmp/default/install)
+Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
+Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
+
 $(eval $(call BuildPackage,icwmp))
+$(eval $(call BuildPackage,icwmp-openssl))
+$(eval $(call BuildPackage,icwmp-wolfssl))
+$(eval $(call BuildPackage,icwmp-mbedtls))

icwmp/files/etc/bbfdm/json/CWMPManagementServer.json

@@ -1,7 +1,8 @@
 {
-	"json_plugin_version": 2,
+	"json_plugin_version": 1,
 	"Device.CWMPManagementServer.": {
 		"type": "object",
+		"version": "2.15",
 		"protocols": [
 			"usp"
 		],
@@ -10,6 +11,7 @@
 		"dependency": "file:/etc/config/cwmp",
 		"EnableCWMP": {
 			"type": "boolean",
+			"version": "2.15",
 			"read": true,
 			"write": true,
 			"protocols": [

icwmp/files/etc/config/cwmp

@@ -5,14 +5,12 @@ config acs 'acs'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
 	option dhcp_discovery 'enable'
-	option ssl_capath "/etc/ssl/certs"
 	# compression possible configs: GZIP, Deflate, Disabled
 	option compression 'Disabled'
 	#­ possible configs interval :[1:65535]
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option skip_dhcp_boot_options '0'
 
 config cpe 'cpe'
 	option enable '1'
@@ -22,7 +20,7 @@ config cpe 'cpe'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'ERROR'
+	option log_severity 'INFO'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
@@ -39,10 +37,8 @@ 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'
 	
 config lwn 'lwn'
-	option enable '0'
+	option enable '1'
 	option hostname ''
 	option port '0'

icwmp/files/etc/firewall.cwmp

@@ -5,58 +5,46 @@ log() {
 	echo "${@}"|logger -t firewall.cwmp -p info
 }
 
-get_firewall_zone() {
-	zone="$(uci show firewall|grep network|grep ${1}|cut -d. -f 2)"
-	zone="${zone:-wan}" # defaults to wan zone
-	echo "$zone"
-}
-
-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
-		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}";
-		fi
-	done
-}
-
-enable="$(uci -q get cwmp.cpe.enable)"
-enable="${enable:-1}"
-
-if [ "$enable" -eq 0 ]; then
-	log "CWMP not enabled"
+if [ ! -f "/var/state/cwmp" ]; then
 	exit 0;
 fi
 
-wan="$(uci -q get cwmp.cpe.default_wan_interface)"
-wan="${wan:-wan}"
-
-zone_name="$(get_firewall_zone $wan)"
-
+zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
 port=$(uci -q get cwmp.cpe.port)
-port="${port:-7547}"
+ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
+ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
+incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
 
-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)
+if [ -z "${zone_name}" ]; then
+	log "empty firewall zone name"
+	exit 0
+elif [ "$zone_name" = "icwmp" ]; then
+	iptables -nL zone_icwmp_input 2> /dev/null
+	if [ "$?" != 0 ]; then
+		iptables -w 1 -N zone_icwmp_input
+		iptables -w 1 -t filter -A INPUT -j zone_icwmp_input
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport "${port}" -j REJECT
+	else			
+		iptables -w 1 -F zone_icwmp_input
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport "${port}" -j REJECT
+	fi			
+else
+	iptables -w 1 -F zone_icwmp_input 2> /dev/null
+	iptables -w 1 -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
+	iptables -w 1 -X zone_icwmp_input 2> /dev/null
+fi
 
 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 [ -z "${incoming_rule}" ]; then
+	incoming_rule="port_only"
+fi
+
 if [ "${incoming_rule}" = "ip_only" ]; then
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
-	fi
-	if [ -n "${ip6addr}" ]; then
 		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 elif [ "${incoming_rule}" = "port_only" ]; then
@@ -67,9 +55,6 @@ elif [ "${incoming_rule}" = "port_only" ]; then
 else
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
-	fi
-
-	if [ -n "${ip6addr}" ]; then
 		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 
@@ -79,23 +64,17 @@ else
 	fi
 fi
 
-cleanup_exiting_rules "${zone_name}"
-
 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
 
 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
 
-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
+uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
+uci -c /var/state -q commit cwmp

icwmp/files/etc/icwmpd/update.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+. /lib/functions.sh
+
+log() {
+	echo "$@" |logger -t cwmp.update -p info
+}
+
+handle_icwmp_update() {
+	local cwmp_enable
+	config_load cwmp
+
+	config_get_bool cwmp_enable cpe enable 1
+	if [ "$cwmp_enable" = "0" ]; then
+		return 0
+	fi
+
+	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
+
+	if [ "$ret" = "true" ]; then
+		# read status from var/state/cwmp
+		status=$(uci -q -c /var/state get cwmp.sess_status.current_status)
+		if [ "$status" != "running" ]; then
+			log "Trigger out of bound inform, since last inform status was failure"
+			ubus -t 10 call tr069 inform >/dev/null 2>&1
+		fi
+	else
+		log "Restarting icwmp tr069 object"
+		/etc/init.d/icwmpd restart
+	fi
+}
+
+handle_icwmp_update "$@"

icwmp/files/etc/init.d/icwmpd

@@ -9,31 +9,38 @@ PROG="/usr/sbin/icwmpd"
 
 . /lib/functions.sh
 . /usr/share/libubox/jshn.sh
-
 include /lib/network
 
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
 
-regenerate_ssl_link() {
-	local cert_dir="${1%/}"
-	[ ! -d "${cert_dir}" ] || [ "${cert_dir}" = "/etc/ssl/certs" ] && return 0
+regenerate_ssl_link()
+{
+	local cert_dir all_file rehash
 
-	generate_links() {
-		local file_type="$1"
-		local files="${cert_dir}"/*."${file_type}"
-		for cfile in ${files}; do
-			if [ -f "${cfile}" ]; then
-				rehash="$(openssl x509 -hash -noout -in "${cfile}")"
-				[ -f "${cert_dir}/${rehash}.0" ] || \
-					ln -s "${cfile}" "${cert_dir}/${rehash}.0"
-			fi
+	cert_dir="${1}"
+	[ ! -d "${cert_dir}" ] && return 0;
+
+	### Generate all ssl link for pem certicates ###
+	all_file=$(ls "${cert_dir}"/*.pem 2>/dev/null)
+	if [ -n "${all_file}" ]; then
+		for cfile in $all_file; do
+			rehash="$(openssl x509 -hash -noout -in "${cfile}")"
+			[ -f "${cert_dir}"/"${rehash}".0 ] || \
+				ln -s "${cfile}" "${cert_dir}"/"${rehash}".0
 		done
-	}
+	fi
 
-	generate_links "pem"
-	generate_links "crt"
+	### Generate all ssl link for crt certicates ###
+	all_file=$(ls "${cert_dir}"/*.crt 2>/dev/null)
+	if [ -n "${all_file}" ]; then
+		for cfile in $all_file; do
+			rehash="$(openssl x509 -hash -noout -in "${cfile}")"
+			[ -f "${cert_dir}"/"${rehash}".0 ] || \
+				ln -s "${cfile}" "${cert_dir}"/"${rehash}".0
+		done
+	fi
 }
 
 enable_dhcp_option43() {
@@ -91,11 +98,7 @@ configure_send_op125() {
 	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
+		local opt125="125,00:00:0D:E9"
 	fi
 
 	config_get oui cpe manufacturer_oui ""
@@ -175,94 +178,10 @@ configure_send_op125() {
 		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"
+		uci -q add_list dhcp."${intf}".dhcp_option="$opt125"
 	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
@@ -271,19 +190,16 @@ enable_dnsmasq_option125() {
 	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}"
+				send125_present=1
 				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"
+			configure_send_op125 "" "${lan}" "dhcp"
 			ubus call uci commit '{"config":"dhcp"}'
 		fi
 	fi
@@ -400,7 +316,6 @@ validate_acs_section()
 		'periodic_inform_time:string' \
 		'url:string' \
 		'dhcp_discovery:string' \
-		'skip_dhcp_boot_options:bool:0' \
 		'dhcp_url:string' \
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
@@ -429,14 +344,12 @@ validate_cpe_section()
 		'notification:bool' \
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
-		'enable:bool:1' \
-		'periodic_notify_interval:uinteger' \
-		'fw_upgrade_keep_settings:bool'
+		'enable:bool' \
+		'periodic_notify_interval:uinteger'
 }
 
 validate_defaults() {
-	local ssl_capath enable url dhcp_url
-
+	local ssl_capath
 	config_load cwmp
 
 	validate_acs_section || {
@@ -444,17 +357,13 @@ validate_defaults() {
 		return 1;
 	}
 
-	if [ -z "${url}" ] && [ -z "${dhcp_url}" ]; then
-		log "No ACS URL is configured"
-		return 1
-	fi
-
 	ssl_capath="${ssl_capath%/}"
 	# Put the cert pem file in keep list
-	if [ -d "${ssl_capath}" ] && [ "${ssl_capath}" != "/etc/ssl/certs" ]; then
+	if [ -d "${ssl_capath}" ]; then
 		if ! grep "*.pem\|*.crt" /lib/upgrade/keep.d/icwmp; then
 			echo "${ssl_capath}"'/*.pem' >> /lib/upgrade/keep.d/icwmp
 			echo "${ssl_capath}"'/*.crt' >> /lib/upgrade/keep.d/icwmp
+			echo "${ssl_capath}"'/*.0' >> /lib/upgrade/keep.d/icwmp
 		fi
 	fi
 
@@ -463,41 +372,37 @@ validate_defaults() {
 		return 1;
 	}
 
-	if [ "$enable" = "0" ]; then
-		log "CWMP service disabled"
-		return 1
-	fi
-
 	return 0;
 }
 
 boot() {
-	local dhcp_discovery wan_interface skip_dhcp_boot_options disable_gatewayinfo
+	local enable_cwmp="0"
+	local dhcp_discovery="0"
 
 	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+	local wan_interface=""
+	
 	config_get wan_interface cpe default_wan_interface "wan"
-	config_get disable_gatewayinfo cpe disable_gatewayinfo "0"
+	
+	if [ "$enable_cwmp" = "0" ]; then
+		return 0
+	fi
 
 	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"
 
 	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
-		if [ "${skip_dhcp_boot_options}" -ne 1 ]; then
-			# Set dhcp option 43 if not already configured
-			enable_dhcp_option43 "${wan_interface}"
-			# Set dhcp option 60
-			set_vendor_id "${wan_interface}"
-		fi
+		# Set dhcp option 43 if not already configured
+		enable_dhcp_option43 "${wan_interface}"
+		# Set dhcp option 60
+		set_vendor_id "${wan_interface}"
 	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
+		# Set dhcp_option 125 if not already configured
+		enable_dhcp_option125 "${wan_interface}"
+		enable_dnsmasq_option125 "${lan_interface}"
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -515,22 +420,32 @@ boot() {
 }
 
 start_service() {
+	local enable_cwmp
 
-	procd_open_instance icwmp
+	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+
+	if [ "$enable_cwmp" = "0" ]; then
+		return 0
+	fi
+
+	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
+	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
+	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
 
 	validate_defaults || {
 		log "Validation of defaults failed"
-		procd_close_instance
 		return 1;
 	}
 
+	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
-
 	procd_set_param respawn \
 		"${respawn_threshold:-5}" \
 		"${respawn_timeout:-10}" "${respawn_retry:-3}"
 
+	procd_set_param watch network.interface
 	procd_close_instance
 }
 
@@ -542,18 +457,11 @@ stop_service()
 reload_service() {
 	local ret
 
-	log "Reload service $ret"
+	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+
 	ret="0"
-
-	validate_defaults || {
-		stop
-		start
-		return 0;
-	}
-
-	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
-	if [ "$ret" != "true" ]; then
-		log "Reloading cwmp service ..."
+	if [ "$enable_cwmp" = "0" ]; then
 		stop
 		start
 		return 0
@@ -562,18 +470,38 @@ reload_service() {
 	tr069_status="$(ubus -t 1 call tr069 status)"
 	ret="$?"
 	if [ "$ret" = "7" ]; then
-		# ubus timed out may be due to uloop is busy in some task so return
-		log "Skipping ubus reload due to ubus timeout"
+		# ubus timed out may be due to uloop is busy in some task so returning
 		return 0
 	fi
 
 	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
+	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'
+		ret="$?"
+	fi
+
+	if [ "$status" = "init" ] || [ "$ret" -ne "0" ]; then
+		log "Restarting CWMP client"
+		stop
+		start
 	fi
 }
 
 service_triggers() {
        procd_add_reload_trigger "cwmp"
+
+       procd_open_trigger
+               json_add_array
+                       json_add_string "" "interface.update"
+                       json_add_array
+                               json_add_array
+                                       json_add_string "" "run_script"
+                                       json_add_string "" "/etc/icwmpd/update.sh"
+                               json_close_array
+                       json_close_array
+                       json_add_int "" "2000"
+               json_close_array
+       procd_close_trigger
 }
 

icwmp/files/etc/uci-defaults/95-set-random-inform-time

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_inform_time()
-{
-	local sec inform_time value
-
-	config_load cwmp
-	config_get inform_time acs periodic_inform_time '0001-01-01T00:00:00Z'
-
-	if [ "${inform_time}" == "0001-01-01T00:00:00Z" ]; then
-		sec=$(date +%s)
-		value="$(date -d @$(($sec-$RANDOM)) +%Y-%m-%dT%H:%M:%SZ)"
-
-		uci_set cwmp acs periodic_inform_time "$value"
-	fi
-}
-
-set_inform_time

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

@@ -1,139 +0,0 @@
-#!/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

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

@@ -1,141 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-DHCP_ACS_URL=""
-DHCP_PROV_CODE=""
-MIN_WAIT_INVL=""
-INVL_MULTIPLIER=""
-
-log() {
-	echo "$@" |logger -t cwmp.update -p info
-}
-
-get_opt43() {
-	# Check if option value is in encapsulated form
-	local opt43="$1"
-	local len="$2"
-
-	[ "$len" -gt "2" ] || return
-
-	first_byte=${opt43:0:2}
-	first_byte=$(printf "%d\n" "0x$first_byte")
-
-	if [ $len -ge 4 ] && [ $first_byte -ge 1 ] && [ $first_byte -le 4 ]; then
-		# it is in encapsulated form
-		# opt43 encapsulated vendor-specific option has data in below format
-		#  Code   Len   Data item        Code   Len   Data item        Code
-		# +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
-		# |  T1 |  n  |  d1 |  d2 | ... |  T2 |  n  |  D1 |  D2 | ... | ... |
-		# +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
-
-		#hex-string 2 character=1 Byte
-		# length in hex string will be twice of actual Byte length
-
-		data="${opt43}"
-		rem_len="${len}"
-		# parsing of suboption of option 43
-		while [ $rem_len -gt 0 ]; do
-			# get the suboption id
-			sub_opt_id=${data:0:2}
-			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
-
-			# get the length of suboption
-			sub_opt_len=${data:2:2}
-			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
-			sub_opt_len=$(( sub_opt_len * 2 ))
-
-			# get the value of sub option starting 4 means starting after length
-			sub_opt_val=${data:4:${sub_opt_len}}
-
-			# assign the value found in sub option
-			case "${sub_opt_id}" in
-				"1") DHCP_ACS_URL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-				"2") DHCP_PROV_CODE=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-				"3") MIN_WAIT_INVL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-				"4") INVL_MULTIPLIER=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-			esac
-
-			# add 2 bytes for sub_opt id and sub_opt len field
-			sub_opt_end=$(( sub_opt_len + 4 ))
-
-			# fetch next sub option hex string
-			data=${data:${sub_opt_end}:${len}}
-
-			# update the remaining sub option hex string length
-			rem_len=$((rem_len - sub_opt_end))
-		done
-	else
-		DHCP_ACS_URL=$(echo -n $opt43 | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-	fi
-}
-
-config_load cwmp
-config_get wan_intf cpe default_wan_interface "wan"
-config_get dhcp_discovery acs dhcp_discovery "0"
-config_get dhcp_url acs dhcp_url ""
-config_get min_wait_intvl acs dhcp_retry_min_wait_interval "0"
-config_get intvl_multi acs dhcp_retry_interval_multiplier "0"
-
-config_change=0
-discovery_enable=0
-
-if [ "$dhcp_discovery" = "1" ] || [ "$dhcp_discovery" = "true" ] || [ "$dhcp_discovery" = "enable" ]; then
-	discovery_enable=1
-fi
-
-if [ "$discovery_enable" = "0" ]; then
-	return 0
-fi
-
-if [ "${wan_intf}" == "${INTERFACE}" ]; then
-	if [ -n "$opt43" ]; then
-		len=$(printf "$opt43"|wc -c)
-		get_opt43 "$opt43" "$len"
-	fi
-
-	if [ -z "$DHCP_ACS_URL" ]; then
-		return 0
-	fi
-
-	sec=$(uci -q get cwmp.acs)
-
-	if [ -z "${sec}" ]; then
-		return 0
-	fi
-
-	if [ "${dhcp_url}" != "${DHCP_ACS_URL}" ]; then
-		uci -q set cwmp.acs.dhcp_url="$DHCP_ACS_URL"
-		config_change=1
-	fi
-
-	if [ -n "$MIN_WAIT_INVL" ] && [ "${MIN_WAIT_INVL}" != "${min_wait_intvl}" ]; then
-		uci -q set cwmp.acs.dhcp_retry_min_wait_interval="$MIN_WAIT_INVL"
-		config_change=1
-	fi
-
-	if [ -n "$INVL_MULTIPLIER" ] && [ "${INVL_MULTIPLIER}" != "${intvl_multi}" ]; then
-		uci -q set cwmp.acs.dhcp_retry_interval_multiplier="$INVL_MULTIPLIER"
-		config_change=1
-	fi
-
-	sec=$(uci -q get cwmp.cpe)
-
-	if [ -n "${sec}" ] && [ -n "$DHCP_PROV_CODE" ]; then
-		uci -q set cwmp.cpe.dhcp_provisioning_code="$DHCP_PROV_CODE"
-		config_change=1
-	fi
-
-	if [ $config_change -eq 0 ]; then
-		return 0
-	fi
-
-	# ACS url has been set, inform icwmpd to reload new configuration
-	sleep 10 # wait for some time to avoid interface fluctuation
-
-	ubus call uci commit '{"config":"cwmp"}'
-fi

ieee1905/Config.in

@@ -20,6 +20,7 @@ config IEEE1905_WIFI_EASYMESH
 
 config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
+	default y
 
 endmenu
 

ieee1905/Makefile

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2020-2024 IOPSYS Software Solutions AB
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.19
+PKG_VERSION:=8.0.15
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fa847e6360e24265ae4e9e2e12ca4ed62ebf7fc5
+PKG_SOURCE_VERSION:=1717f97c054c232d393c91fa7e95a571bf893680
 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
@@ -60,12 +60,12 @@ define Package/libieee1905/description
 endef
 
 plugins := \
-	$(if $(CONFIG_PACKAGE_ieee1905-map-plugin),map) \
-	$(if $(CONFIG_PACKAGE_ieee1905-snoop-plugin),snoop) \
-	$(if $(CONFIG_PACKAGE_ieee1905-topology-plugin),topology)
+	$(if $(CONFIG_PACKAGE_map-plugin),map) \
+	$(if $(CONFIG_PACKAGE_snoop-plugin),snoop) \
+	$(if $(CONFIG_PACKAGE_topology-plugin),topology)
 
 
-ppkg:=$(patsubst plugins/%.mk,ieee1905-%-plugin,$(wildcard plugins/*.mk))
+ppkg:=$(patsubst plugins/%.mk,%-plugin,$(wildcard plugins/*.mk))
 
 
 TARGET_CFLAGS += \
@@ -89,12 +89,6 @@ ifeq ($(CONFIG_IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY),y)
 TARGET_CFLAGS += -DIEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 endif
 
-ifeq ($(CONFIG_IEEE1905_EXTENSION_ALLOWED),y)
-TARGET_CFLAGS += -DEXTENSION_ALLOWED
-endif
-
-TARGET_CFLAGS += -DHAS_UBUS
-
 MAKE_FLAGS += \
 	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
 
@@ -123,6 +117,7 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/

ieee1905/files/etc/config/ieee1905

@@ -2,17 +2,13 @@ config ieee1905 'ieee1905'
 	option enabled '1'
 	option extension '1'
 	list extmodule 'map'
-	list extmodule 'topology'
 	option registrar '2 5 6'
-	list exclude_tagging '/eth.*'
 #	option macaddress '0a:1b:2c:3d:4e:50'
 
 config al-iface
 	option enabled '1'
-	list ifname 'br-lan'
-	list ifname '/eth.*'
-	list ifname '/wl.*'
-	list ifname '/wds.*'
+	option ifname 'br-lan'
+	option type 'bridge'
 
 # ap sections are auto-generated/overwritten during onboarding
 #

ieee1905/files/etc/init.d/ieee1905

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=60
+START=96
 STOP=21
 
 USE_PROCD=1

ieee1905/plugins/map.mk

@@ -1,22 +1,22 @@
-define Package/ieee1905-map-plugin
+define Package/map-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/ieee1905-map-plugin/config
-	if (PACKAGE_ieee1905-map-plugin)
+define Package/map-plugin/config
+	if (PACKAGE_map-plugin)
 
 		menu "Configuration"
 
 		config MULTIAP_EASYMESH_VERSION
 		int "Easymesh version"
-		default 4
+		default 2
 
 		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 		bool "Sync configuration between dynamic controllers in the network"
-		default y
+		default n
 
 		config MULTIAP_FUZZ_1905_CMDUS
 		bool "Include support to fuzz 1905 CMDUs for testing purpose"
@@ -32,7 +32,7 @@ ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
 TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
 endif
 
-define Build/InstallDev/ieee1905-map-plugin
+define Build/InstallDev/map-plugin
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
@@ -43,7 +43,7 @@ define Build/InstallDev/ieee1905-map-plugin
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
 endef
 
-define Package/ieee1905-map-plugin/install
+define Package/map-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so

ieee1905/plugins/snoop.mk

@@ -1,11 +1,11 @@
-define Package/ieee1905-snoop-plugin
+define Package/snoop-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Show all received 1905 CMDUs over UBUS
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/ieee1905-snoop-plugin/install
+define Package/snoop-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/snoop/snoop.so $(1)/usr/lib/ieee1905/snoop.so

ieee1905/plugins/topology.mk

@@ -1,11 +1,11 @@
-define Package/ieee1905-topology-plugin
+define Package/topology-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Build full network topology of the 1905 nodes only
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/ieee1905-topology-plugin/install
+define Package/topology-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/topology/topology.so $(1)/usr/lib/ieee1905/topology.so

inbd/Makefile

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2016 iopsys
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=inbd
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=d4e910a31039e0c0b7a539311eafcd716c36be77
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+# support parallel build
+PKG_BUILD_PARALLEL:=1
+
+#re create configure scripts if not present.
+PKG_FIXUP:=autoreconf
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/inbd
+	CATEGORY:=Utilities
+	TITLE:=iopsys Netlink Bridge Daemon
+	URL:=
+	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
+endef
+
+define Package/inbd/description
+	Application handling netlink messages from kernel and sending them out on ubus.
+endef
+
+define Package/inbd/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inbd $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/files/etc/init.d/inbd $(1)/etc/init.d/
+endef
+
+$(eval $(call BuildPackage,inbd))

iop/config

@@ -11,19 +11,10 @@ CONFIG_DEVEL=y
 CONFIG_USE_STRIP=y
 # CONFIG_SIGNED_PACKAGES is not set
 
-CONFIG_JSON_CYCLONEDX_SBOM=y
-CONFIG_INCLUDE_CONFIG=y
-
 # Image #
 CONFIG_TARGET_CUSTOMER="IOPSYS"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 
-# Although UBIFS and EXT4 images work on all non-secure-boot devices,
-# squashfs is the only officially supported rootfs filesystem.
-# A writable rootfs is useful for developping an debugging preinit code.
-# CONFIG_TARGET_ROOTFS_UBIFS is not set
-# CONFIG_TARGET_ROOTFS_EXT4FS is not set
-
 # /etc/banner and /etc/device_info #
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
@@ -64,21 +55,21 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 ################
 
 # EasySoC HAL #
+CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_qosmngr=y
 CONFIG_PACKAGE_libwifiutils=y
 CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
-CONFIG_PACKAGE_ieee1905-topology-plugin=y
+CONFIG_PACKAGE_map-agent=m
+CONFIG_PACKAGE_map-controller=m
+CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_decollector=y
-CONFIG_PACKAGE_map-agent=y
-CONFIG_PACKAGE_map-controller=y
 
 # Network #
-CONFIG_PACKAGE_hostmngr=y
 CONFIG_PACKAGE_netmode=y
+CONFIG_PACKAGE_owsd=m
 CONFIG_PACKAGE_urlfilter=y
 
 # System #
@@ -94,15 +85,12 @@ CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=y
-CONFIG_PACKAGE_swmodd=y
-CONFIG_PACKAGE_twamp=y
-CONFIG_PACKAGE_udpecho-client=y
-CONFIG_PACKAGE_udpecho-server=y
-CONFIG_PACKAGE_userinterface=y
-CONFIG_PACKAGE_xmppc=y
-CONFIG_PACKAGE_timemngr=y
-CONFIG_PACKAGE_self-diagnostics=y
+CONFIG_PACKAGE_stunc=m
+CONFIG_PACKAGE_swmodd=m
+CONFIG_PACKAGE_twamp=m
+CONFIG_PACKAGE_udpecho-client=m
+CONFIG_PACKAGE_udpecho-server=m
+CONFIG_PACKAGE_xmppc=m
 
 # WebGUI #
 CONFIG_PACKAGE_sulu=y
@@ -142,11 +130,11 @@ CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_xl2tpd=y
 
 # Services #
-CONFIG_PACKAGE_atftpd=y
+CONFIG_PACKAGE_atftp=m
+CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_dnsmasq=y
 CONFIG_PACKAGE_ssdpd=y
-CONFIG_PACKAGE_miniupnpd-iptables=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -155,7 +143,7 @@ CONFIG_PACKAGE_openvpn-openssl=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_PACKAGE_qos-scripts is not set
 CONFIG_PACKAGE_rdnssd=y
-CONFIG_PACKAGE_vsftpd-tls=y
+CONFIG_PACKAGE_vsftpd-tls=m
 
 # Tools and Utilities #
 CONFIG_PACKAGE_curl=y
@@ -171,18 +159,11 @@ CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_ip6tables-zz-legacy=y
 CONFIG_PACKAGE_iptables-zz-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
-CONFIG_PACKAGE_iptables-mod-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
-CONFIG_PACKAGE_iptables-mod-ipmark=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
-CONFIG_PACKAGE_iptables-mod-nflog=y
-CONFIG_PACKAGE_iptables-mod-nfqueue=y
-CONFIG_PACKAGE_iputils-arping=y
-CONFIG_PACKAGE_iputils-ping=y
 CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_rdisc6=y
 CONFIG_PACKAGE_resolveip=y
-CONFIG_PACKAGE_socat=y
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_traceroute6=y
 
@@ -192,13 +173,9 @@ CONFIG_PACKAGE_traceroute6=y
 ##########
 
 CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_ca-certificates=y
-CONFIG_PACKAGE_crun=y
 CONFIG_PACKAGE_getopt=y
-CONFIG_PACKAGE_gpiod-tools=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_libcap-bin=y
 CONFIG_PACKAGE_libustream-openssl=y
 # CONFIG_PACKAGE_libustream-wolfssl is not set
 CONFIG_PACKAGE_lscpu=y
@@ -206,7 +183,6 @@ CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_procd-ujail=m
-CONFIG_PACKAGE_quota=y
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
 CONFIG_PACKAGE_rpcd-mod-rrdns=y
@@ -248,10 +224,12 @@ CONFIG_PACKAGE_nginx-mod-luci=y
 
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
+CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
+# CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
 # CONFIG_BUSYBOX_CONFIG_HTTPD is not set
@@ -328,8 +306,3 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
-# CONFIG_BUSYBOX_CONFIG_ARPING is not set
-# CONFIG_BUSYBOX_CONFIG_PING is not set
-# CONFIG_BUSYBOX_CONFIG_PING6 is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING is not set

iop/iop.completion

@@ -33,8 +33,7 @@ _iop()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
-             feeds_update feeds_update-legacy genconfig genconfig-legacy \
-             generate_tarballs install_key \
+             feeds_update genconfig generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
              update_package update_feed_branches ssh_upgrade smoketest"