obuspa: Rebase with obuspa-4.0

- missing library files under /usr/lib/bbfdm
	- Added global enable for periodicstats & disabled by default
	- updated to latest devel

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=4.1.2
+PKG_VERSION:=4.1.5
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3034c1b324937fdccafa92e706e5986dc7a78df7
+PKG_SOURCE_VERSION:=838372a16ed0029cd681626bb5adb722f6a7681e
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.0.12
+PKG_VERSION:=3.0.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=db155c063a9875026e573bbd292dec484fc3f103
+PKG_SOURCE_VERSION:=2c4fdf3f3ffc299c7596e6d0dc4be86485250533
 PKG_MIRROR_HASH:=skip
 endif
 

dectmngr/files/etc/init.d/dectmngr

@@ -1,7 +1,4 @@
 #!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2021 OpenWrt.org
-#
 
 source /lib/functions/uci-defaults.sh
 

dectmngr/files/scripts/load_sound_modules.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-SOUND_BASE=/lib/modules/$(uname -r)/kernel/sound
-SOUND_MODULES="$SOUND_BASE/soundcore.ko $SOUND_BASE/core/snd.ko $SOUND_BASE/core/snd-timer.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/snd-pcm.ko $SOUND_BASE/core/snd-hwdep.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/seq/snd-seq-device.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/seq/snd-seq.ko $SOUND_BASE/core/snd-rawmidi.ko "
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/usb/snd-usbmidi-lib.ko $SOUND_BASE/usb/snd-usb-audio.ko"
-
-load_sound_modules() {
-	for mod in $SOUND_MODULES; do
-		insmod $mod
-	done
-}
-
-unload_sound_modules() {
-	local modules=
-
-	# reverse the order
-	for mod in $SOUND_MODULES; do
-		modules="$mod $modules"
-	done
-
-	for mod in $modules; do
-		rmmod $mod
-	done
-}

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.2.12
+PKG_VERSION:=6.2.19
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=48b9abce9acace69a9b270ed4438b80434fc3446
+PKG_SOURCE_VERSION:=d1fd660106d9ac3c937d005775608df43e1aa17c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

endptmngr/Makefile

@@ -6,26 +6,17 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_RELEASE:=1
-PKG_VERSION:=0.4
-PKG_SOURCE_VERSION:=510b885c049b8ba06772dae59e64b370d0fded3e
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=https://download.iopsys.eu/iopsys/opensdk/
-PKG_NAME:=endptmngr-open
-PATCH_DIR:=
-PKG_HASH:=skip
-else
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_PROTO:=git
 PKG_NAME:=endptmngr
+PKG_VERSION:=0.5
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
+PKG_SOURCE_VERSION:=d3938443caffea15641bff72837d2de0cf87d62c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
 
 export BUILD_DIR
 
@@ -34,15 +25,10 @@ PKG_BUILD_PARALLEL:=1
 
 # 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
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
-export CONFIG_BRCM_SDK_VER_504001
 export CONFIG_BRCM_SDK_VER_504002
-export CONFIG_BRCM_SDK_VER_504003
-export CONFIG_BRCM_SDK_VER_504004
-export CONFIG_BRCM_SDK_VER_504005
-
+export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -52,7 +38,7 @@ endef
 
 define Package/endptmngr
   CATEGORY:=Utilities
-  TITLE:=Brcmslic
+  TITLE:=Broadcom Voice Endpoint Manager
   URL:=
   DEPENDS:= +libubox +ubus +libpicoevent +uci +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
 endef
@@ -61,18 +47,9 @@ define Package/endptmngr/description
 	endptmngr
 endef
 
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-
-define Build/Compile
-endef
-
-endif
-
-
 define Package/endptmngr/install
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	cp $(PKG_BUILD_DIR)/files/etc/init.d/* $(1)/etc/init.d/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endptmngr $(1)/usr/sbin/
 endef
 

endptmngr/files/etc/init.d/endptmngr

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=68
+STOP=12
+
+USE_PROCD=1
+NAME=endptmngr
+
+start_service() {
+	procd_open_instance
+	procd_set_param env hw_board_hasDect=$(db get hw.board.hasDect)
+	procd_set_param command $NAME
+	procd_set_param respawn "5" "0" "3"
+	procd_set_param nice -12
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger asterisk 
+}

icwmp/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=7.0.1-2021-04-15
+PKG_VERSION:=7.0.1-2021-05-14
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git

icwmp/files/etc/config/cwmp

@@ -30,7 +30,6 @@ config cpe 'cpe'
 	option userid '' #$OUI-$SER
 	option passwd 'iopsys'
 	option port '7547'
-	option ubus_socket '/var/run/ubus.sock'
 	option provisioning_code ''
 	option amd_version '5'
 	# compression possible configs: InstanceNumber, InstanceAlias

imonitor/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=imonitor
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
-PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
+PKG_SOURCE_VERSION:=4beb1d5d6925507f1850a84c0b83aaf12a082f7f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

iop/config

@@ -39,20 +39,14 @@ CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
-CONFIG_PACKAGE_juci-firewall-fw3=y
-CONFIG_PACKAGE_juci-mod-status=y
-CONFIG_PACKAGE_juci-mod-system=y
-CONFIG_PACKAGE_juci-network-device=y
-CONFIG_PACKAGE_juci-network-dsl=y
-CONFIG_PACKAGE_juci-network-netifd=y
-CONFIG_PACKAGE_juci-sysupgrade=y
-CONFIG_PACKAGE_juci-wireless=y
-CONFIG_PACKAGE_juci-theme-iopsys=y
 CONFIG_PACKAGE_libreswan=m
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_lscpu=y
+CONFIG_PACKAGE_luci=y
+# CONFIG_LUCI_JSMIN is not set
+# CONFIG_LUCI_CSSTIDY is not set
+CONFIG_PACKAGE_luci-mod-dashboard=y
+CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_map=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mwan3=y

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=1.5.22
+PKG_VERSION:=2.0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=f10842f576fc29f6c3145a4b4b0efcb931d0e643
+PKG_SOURCE_VERSION:=eec19fb7f18863312760fe0db953d2f4e5ec9f5a
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

obuspa/Config.in

@@ -0,0 +1,15 @@
+if PACKAGE_obuspa
+
+config OBUSPA_MTP_ENABLE_STOMP
+	bool "Enable STOMP as mtp protocol"
+	default y
+
+config OBUSPA_MTP_ENABLE_MQTT
+	bool "Enable MQTT as mtp protocol"
+	default y
+
+config OBUSPA_MTP_ENABLE_COAP
+	bool "Enable CoAP as mtp protocol"
+	default y
+
+endif

obuspa/Makefile

@@ -5,13 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=3.0.0.25
+PKG_VERSION:=3.0.0.28
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=617c724d409bf8d44fb2bf7b4ac47bb6dfe6c0eb
+PKG_SOURCE_VERSION:=31d80ee826076953c24bdd1a67bc61560ed3e69f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
+PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -36,10 +37,38 @@ define Package/obuspa/description
  OB-USP-AGENT is a system daemon providing a User Services Platform (USP) Agent.
 endef
 
+define Package/obuspa/config
+	source "$(SOURCE)/Config.in"
+endef
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE
 
+ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_STOMP),y)
+  CONFIGURE_ARGS += \
+	--enable-stomp
+else
+  CONFIGURE_ARGS += \
+	--disable-stomp
+endif
+
+ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_MQTT),y)
+  CONFIGURE_ARGS += \
+	--enable-mqtt
+else
+  CONFIGURE_ARGS += \
+	--disable-mqtt
+endif
+
+ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_COAP),y)
+  CONFIGURE_ARGS += \
+	--enable-coap
+else
+  CONFIGURE_ARGS += \
+	--disable-coap
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
@@ -55,6 +84,7 @@ define Package/obuspa/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
+	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-obuspa $(1)/etc/hotplug.d/iface/
 endef
 

obuspa/files/etc/config/obuspa

@@ -1,16 +1,17 @@
 config obuspa 'global'
-	option enabled 'true'
+	option enabled '1'
 	option interface 'wan'
 	#option ifname 'eth0.1'
 	option debug '0'
 	option log_level '1'
-	#option db_file '/tmp/usp.db'
+	#option db_file '/etc/obuspa/usp.db'
+	option role_file '/etc/obuspa/roles.json'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
 
 config localagent 'localagent'
-	option Enable 'true'
+	option Enable '1'
 
 # Adds Device.LocalAgent.Controller.
 config controller 'localcontroller'
@@ -18,6 +19,7 @@ config controller 'localcontroller'
 	option Protocol 'MQTT'
 	option Topic '/usp/controller'
 	option mqtt 'localmqtt'
+	option assigned_role_name 'Full Access'
 
 # Adds Device.LocalAgent.MTP.
 config mtp
@@ -41,3 +43,18 @@ config subscription
 	option Persistent 'true'
 	option controller 'localcontroller'
 
+config challenge 'admin'
+	option Description 'Request to get Administrative access'
+	option role_name 'Full Access'
+	option Enable '1'
+	option Value 'admin'
+	option Retries 2
+	option LockoutPeriod 60
+
+config challenge 'user'
+	option Description 'Request to get User access'
+	option role_name 'user'
+	option Enable '1'
+	option Value 'user'
+	option Retries 3
+	option LockoutPeriod 30

obuspa/files/etc/init.d/obuspa

@@ -5,7 +5,7 @@ USE_PROCD=1
 PROG=/usr/sbin/obuspa
 
 EXTRA_COMMANDS="remove_db"
-EXTRA_HELP="	remove_db Removes obuspa persistent db before restarting"
+EXTRA_HELP="	remove_db Removes obuspa persistent db before restarting, self trigger with uci change"
 
 PARAM_FILE="/tmp/obuspa_param_reset.txt"
 CONFIGURATION=obuspa
@@ -16,9 +16,20 @@ mtp_num=0
 stomp_num=0
 mqtt_num=0
 subs_num=0
+challenge_num=0
 index=0
+role_def_file=""
 
 . /lib/functions/network.sh
+. /usr/share/libubox/jshn.sh
+
+cleanup() {
+	if [ -f "${USP_TEMP_FILE}" ]; then
+		rm -f "${USP_TEMP_FILE}"
+	fi
+}
+
+trap cleanup EXIT
 
 log() {
 	echo "${@}"|logger -t obuspa -p debug
@@ -39,6 +50,37 @@ get_index() {
 	fi
 }
 
+get_role_index_from_json() {
+	local role="${@}"
+
+	# In case of role is empty or file not present
+	if [ -z "${role}" -o ! -f ${role_def_file} ]; then
+		echo 0
+		return 0
+	fi
+
+	json_init
+	json_load_file ${role_def_file}
+	if [ $? -ne 0 ]; then # In case of invalid json file
+		echo 0
+		return 0
+	fi
+
+	json_select roles
+	json_get_keys roles_obj
+
+	for k in ${roles_obj}; do
+		json_select $k
+		json_get_var name name
+		json_select ..
+		if [ "${role}" = "${name}" ]; then
+			echo "${k}"
+			return 0
+		fi
+	done
+	echo 0
+}
+
 get_uci_ref_index() {
 	local val;
 
@@ -62,14 +104,15 @@ validate_obuspa_section()
 {
 	uci_validate_section ${CONFIGURATION} obuspa "${1}" \
 		'enabled:bool:true' \
-		'trust_cert:string' \
-		'client_cert:string' \
+		'trust_cert:file' \
+		'client_cert:file' \
 		'interface:string' \
 		'ifname:string:"br-lan"' \
 		'debug:bool:false' \
 		'log_level:uinteger' \
-		'log_dest:string' \
-		'db_file:string'
+		'log_dest:file' \
+		'db_file:file' \
+		'role_file:file'
 }
 
 validate_localagent_section()
@@ -85,7 +128,8 @@ validate_controller_section()
 	uci_validate_section ${CONFIGURATION} controller "${1}" \
 		'EndpointID:string' \
 		'Enable:bool:true' \
-		'AssignedRole:string:Device.LocalAgent.ControllerTrust.Role.1' \
+		'AssignedRole:string' \
+		'assigned_role_name:string' \
 		'PeriodicNotifInterval:uinteger:86400' \
 		'PeriodicNotifTime:string' \
 		'USPNotifRetryMinimumWaitInterval:uinteger:5' \
@@ -95,9 +139,9 @@ validate_controller_section()
 		'Reference:string' \
 		'Destination:string:controller-notify-dest' \
 		'Topic:string' \
-		'coap_host:string' \
+		'coap_host:host' \
 		'coap_path:string' \
-		'coap_port:uinteger' \
+		'coap_port:port' \
 		'mqtt:string' \
 		'stomp:string'
 }
@@ -124,7 +168,7 @@ validate_mtp_section()
 		'PublishQoS:uinteger' \
 		'Destination:string' \
 		'coap_path:string' \
-		'coap_port:uinteger' \
+		'coap_port:port' \
 		'mqtt:string' \
 		'stomp:string'
 }
@@ -132,12 +176,12 @@ validate_mtp_section()
 validate_stomp_connection_section()
 {
 	uci_validate_section ${CONFIGURATION} stomp "${1}" \
-		'Host:string:usp-controller.com' \
+		'Host:host' \
 		'Username:string' \
 		'Password:string' \
 		'encryption:bool:true' \
 		'Enable:bool:true' \
-		'Port:uinteger:61613' \
+		'Port:port:61613' \
 		'VirtualHost:string:/' \
 		'EnableHeartbeats:bool:true' \
 		'OutgoingHeartbeat:uinteger:30000' \
@@ -150,13 +194,13 @@ validate_stomp_connection_section()
 validate_mqtt_client_section()
 {
 	uci_validate_section ${CONFIGURATION} mqtt "${1}" \
-		'BrokerAddress:string' \
-		'BrokerPort:uinteger:1883' \
+		'BrokerAddress:host' \
+		'BrokerPort:port:1883' \
 		'Enable:bool:true' \
 		'Username:string' \
 		'Password:string' \
-		'ProtocolVersion:string:5.0' \
-		'TransportProtocol:string:TCP/IP' \
+		'ProtocolVersion:or("3.1", "3.1.1","5.0"):5.0' \
+		'TransportProtocol:or("TCP/IP","TLS"):TCP/IP' \
 		'KeepAliveTime:uinteger:60' \
 		'ClientID:string' \
 		'ConnectRetryTime:uinteger:5' \
@@ -180,7 +224,6 @@ configure_localagent() {
 	_num=1
 	while [ ${_num} -le ${controller_num} ]
 	do
-		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.Alias "cpe-1"
 		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.Enable "${Enable}"
 		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.ParameterName "${ParameterName}"
 		_num=$(( ${_num} + 1 ))
@@ -192,14 +235,14 @@ configure_localagent() {
 configure_controller() {
 	local EndpointID Enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPNotifRetryMinimumWaitInterval
 	local USPNotifRetryIntervalMultiplier ControllerCode Protocol Destination coap_host coap_path coap_port
-	local Reference Topic mqtt stomp
+	local Reference Topic mqtt stomp assigned_role_name
 
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
 		return 1;
 	}
 
-	if [ -z ${EndpointID} -o -z ${Protocol} ]; then
+	if [ -z "${EndpointID}" -o -z "${Protocol}" ]; then
 		log "controller:: EndpointID id and Protocol cannot be empty"
 		return 1;
 	fi
@@ -232,7 +275,15 @@ configure_controller() {
 	db_set Device.LocalAgent.Controller.${controller_num}.Alias "cpe-${controller_num}"
 	db_set Device.LocalAgent.Controller.${controller_num}.Enable "${Enable}"
 	db_set Device.LocalAgent.Controller.${controller_num}.EndpointID "${EndpointID}"
-	#db_set Device.LocalAgent.Controller.${controller_num}.AssignedRole "${AssignedRole}"
+	if [ -n "${AssignedRole}" ]; then
+		db_set Device.LocalAgent.Controller.${controller_num}.AssignedRole "${AssignedRole}"
+	else
+		if [ -n "${assigned_role_name}" ]; then
+			AssignedRole=$(get_role_index ${assigned_role_name})
+			db_set Device.LocalAgent.Controller.${controller_num}.AssignedRole "${AssignedRole}"
+		fi
+	fi
+
 	db_set Device.LocalAgent.Controller.${controller_num}.PeriodicNotifInterval "${PeriodicNotifInterval}"
 	if [ -n "${PeriodicNotifTime}" ]; then
 		db_set Device.LocalAgent.Controller.${controller_num}.PeriodicNotifTime "${PeriodicNotifTime}"
@@ -297,6 +348,74 @@ configure_subscription(){
 	db_set Device.LocalAgent.Subscription.${subs_num}.Recipient "${Recipient}"
 }
 
+validate_challenge_section()
+{
+	uci_validate_section ${CONFIGURATION} challenge "${1}" \
+		'Enable:bool:true' \
+		'Alias:string' \
+		'Description:string' \
+		'role_name:string' \
+		'Role:string' \
+		'Value:string' \
+		'Retries:uinteger:3' \
+		'LockoutPeriod:uinteger:0'
+}
+
+get_role_index() {
+	local role="Device.LocalAgent.ControllerTrust.Role"
+	local index=0
+	local role_name="${@}"
+
+	case "${role_name}" in
+	'Full Access')
+	     index=1;
+	     ;;
+	'Untrusted')
+	     index=2;
+	     ;;
+	 *)
+	     local ji=$(get_role_index_from_json ${role_name})
+	     index=$(( ji + 2 )) # Add predefined roles
+	 esac
+
+	 echo "${role}.${index}"
+}
+
+configure_challenges() {
+	local Enable Description role_name Role Value Retries LockoutPeriod Alias
+
+	validate_challenge_section "${1}" || {
+		log "Validation of challenge section failed"
+		exit 1;
+	}
+
+	if [ -z "${role_name}" -a -z ${Role} ]; then
+		log "Either role_name or Role must defined for a challenge";
+		return 1;
+	fi
+
+	challenge_num=$(( challenge_num + 1))
+
+	db_set Device.LocalAgent.ControllerTrust.Challenge.${challenge_num}.Enable "${Enable}"
+	if [ -n "${Description}" ]; then
+	  db_set Device.LocalAgent.ControllerTrust.Challenge.${challenge_num}.Description "${Description}"
+	fi
+
+	if [ -z "${Role}" ]; then
+		Role=$(get_role_index ${role_name})
+	fi
+
+	if [ -z "${Alias}" -a -n "${role_name}" ]; then
+		Alias=${role_name}
+	fi
+
+	db_set Device.LocalAgent.ControllerTrust.Challenge.${challenge_num}.Alias "${Alias}"
+	db_set Device.LocalAgent.ControllerTrust.Challenge.${challenge_num}.Role "${Role}"
+	db_set Device.LocalAgent.ControllerTrust.Challenge.${challenge_num}.Value "${Value}"
+	db_set Device.LocalAgent.ControllerTrust.Challenge.${challenge_num}.Retries "${Retries}"
+	db_set Device.LocalAgent.ControllerTrust.Challenge.${challenge_num}.LockoutPeriod "${LockoutPeriod}"
+}
+
 configure_mtp() {
 	local Enable Protocol Reference ResponseTopicConfigured PublishQoS
 	local stomp mqtt
@@ -366,7 +485,7 @@ configure_stomp_connection() {
 	db_set Device.STOMP.Connection.${stomp_num}.Alias "cpe-${stomp_num}"
 	db_set Device.STOMP.Connection.${stomp_num}.Enable "${Enable}"
 	db_set Device.STOMP.Connection.${stomp_num}.Port "${Port}"
-	db_set Device.STOMP.Connection.${stomp_num}.X_ARRIS-COM_EnableEncryption "${encryption}"
+	db_set Device.STOMP.Connection.${stomp_num}.EnableEncryption "${encryption}"
 	db_set Device.STOMP.Connection.${stomp_num}.VirtualHost "${VirtualHost}"
 	db_set Device.STOMP.Connection.${stomp_num}.EnableHeartbeats "${EnableHeartbeats}"
 	db_set Device.STOMP.Connection.${stomp_num}.OutgoingHeartbeat "${OutgoingHeartbeat}"
@@ -412,14 +531,15 @@ configure_mqtt_client(){
 
 
 configure_obuspa() {
-	local enabled trust_cert ifname interface debug log_level db_file log_dest
+	local enabled trust_cert ifname interface debug log_level db_file log_dest role_file
 
 	validate_obuspa_section "global" || {
 		log "Validation of global section failed"
 		return 1;
 	}
 
-	[ ${enabled} -eq 0 ] && exit 0
+	role_def_file="${role_file}"
+	[ ${enabled} -eq 0 ] && return 0
 
 	if [ ${debug} -eq 1 ]; then
 		# Forward stdout of the command to logd
@@ -483,6 +603,7 @@ db_init() {
 	config_foreach configure_stomp_connection stomp
 	config_foreach configure_mqtt_client mqtt
 	config_foreach configure_subscription subscription
+	config_foreach configure_challenges challenge
 
 	db_set Internal.Reboot.Cause "LocalFactoryReset"
 }
@@ -537,7 +658,7 @@ start_service() {
 	ubus wait_for usp.raw
 	if [ "$?" -ne 0 ]; then
 		log "OBUSPA failed to start usp.raw not available"
-		exit 0
+		return 0
 	fi
 
 	procd_open_instance ${CONFIGURATION}

obuspa/files/etc/obuspa/roles.json

@@ -0,0 +1,97 @@
+{
+  "roles": [
+    {
+      "name": "admin",
+      "permission": [
+        {
+          "object": "Device.",
+          "perm": [
+            "PERMIT_NONE"
+          ]
+        },
+        {
+          "object": "Device.DeviceInfo.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST"
+          ]
+        },
+        {
+          "object": "Device.WiFi.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_SET",
+            "PERMIT_ADD",
+            "PERMIT_DEL",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object": "Device.IP.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "user",
+      "permission": [
+        {
+          "object": "Device.",
+          "perm": [
+            "PERMIT_NONE"
+          ]
+        },
+        {
+          "object": "Device.DeviceInfo.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST"
+          ]
+        },
+        {
+          "object": "Device.WiFi.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object": "Device.IP.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "undefined-1"
+    },
+    {
+      "name": "undefined-2"
+    },
+    {
+      "name": "undefined-3"
+    },
+    {
+      "name": "undefined-4"
+    }
+  ]
+}

owsd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owsd
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=fd696e9d1be8278db3eb1d9be97e1a66afd6e1f6
+PKG_SOURCE_VERSION:=f78f7198944758cd2140887ecd8970432f678fc1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

owsd/files/owsd.config

@@ -1,5 +1,6 @@
 config owsd 'global'
-	option sock '/var/run/ubus.sock'
+	option enable '0'
+#	option sock '/var/run/ubus/ubus.sock'
 	option www '/www'
 #	option redirect '/cgi-bin/luci:/cacheflush.html'
 #	option www_maxage '3600'

owsd/files/owsd.init

@@ -124,6 +124,7 @@ validate_owsd_ubusproxy() {
 
 validate_owsd_global() {
 	uci_validate_section "owsd" "owsd" "global" \
+		'enable:bool:1' \
 		'sock:string' \
 		'redirect:string' \
 		'www:string' \
@@ -320,6 +321,10 @@ start_service() {
 	load_dhcp_domains
 
 	config_load owsd # note: do not overload a config while parsing it
+
+	config_get_bool owsd_enable global enable 1
+	[ $owsd_enable -eq 1 ] || return 0
+
 	procd_open_instance
 	procd_set_param command $PROG
 

periodicstats/Makefile

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2021 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=periodicstats
+PKG_VERSION:=1.0.0
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=91b15f9779baccc93213ce3ca164c326235d3096
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+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
+
+define Package/periodicstats
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Periodic Statistics Daemon
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm
+endef
+
+define Package/periodicstats/description
+	Manage periodic statistics
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./periodicstats/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/periodicstats/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin
+endef
+
+$(eval $(call BuildPackage,periodicstats))

periodicstats/files/etc/config/periodicstats

@@ -0,0 +1,3 @@
+config globals 'globals'
+	option enable '0'
+

periodicstats/files/etc/init.d/periodicstats

@@ -0,0 +1,43 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+NAME=periodicstatsd
+PROG=/usr/sbin/periodicstatsd
+
+. /lib/functions.sh
+
+start_service() {
+	if [ -f "/etc/config/periodicstats" ]; then
+		if [ "$(uci -q get periodicstats.globals.enable)" == "1" ]; then
+			procd_open_instance periodicstatsd
+			procd_set_param command ${PROG}
+			procd_set_param respawn
+			procd_close_instance
+		fi
+	fi
+}
+
+stop() {
+	#stop_service() is called after procd killed the service
+	echo ;
+}
+
+boot() {
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger periodicstats
+}
+
+reload_service() {
+	stop
+	start
+}
+
+restart() {
+	start
+}

prj-unish/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prj-unish
-PKG_VERSION:=0.7.0
+PKG_VERSION:=1.0.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=595bd811428f4c1271cc8e2f61a9b6311f4672f0
+PKG_SOURCE_VERSION:=a47110968d57fa1d0765900254b63c8ef983e741
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/prj-unish.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

rulengd/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rulengd
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.3
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=e5afe7734674d416138a54526cc589c57ba28279
+PKG_SOURCE_VERSION:=f5ded45562189a05f3912182d708bcb1427912f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

stunc/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
-PKG_SOURCE_VERSION:=cd7c5d70bc97a2f1a26d5587ccf6f4c1e9ca82c8
+PKG_SOURCE_VERSION:=d578df0c8e4e7d1b642a5cf037ce468379270534
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
 
@@ -29,7 +29,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description
@@ -43,9 +43,11 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libstunc.so $(1)/usr/lib/bbfdm/libstunc.so
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stunc $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/stunc $(1)/etc/init.d/stunc
-	$(INSTALL_DATA) ./files/etc/config/stun $(1)/etc/config/stun
+	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

stunc/files/etc/config/stunc

@@ -1,6 +1,6 @@
 
-config stun 'stun'
-	option enable '0'
+config stunc 'stunc'
+	option enabled '0'
 	option username 'stun'
 	option password 'stun'
 	option server_address 'stun.l.google.com'

stunc/files/etc/init.d/stunc

@@ -1,23 +1,20 @@
 #!/bin/sh /etc/rc.common
-# STUN client software
-# Copyright (C) 2020 iopsys Software Solutions AB
-# Author: Omar Kallel <omar.kallel@pivasoftware.com>
 
-START=90
+START=99
+STOP=15
 
 USE_PROCD=1
 PROG="/usr/sbin/stunc"
 
-
 log() {
 	#echo "${@}" >/dev/console
-	echo "${@}"|logger -t stun -p info
+	echo "${@}"|logger -t stunc -p info
 }
 
 validate_stun_section()
 {
-	uci_validate_section stun stun stun \
-		'enable:bool' \
+	uci_validate_section stunc stunc stunc \
+		'enabled:bool' \
 		'Username:string' \
 		'Password:string' \
 		'server_address:host' \
@@ -26,31 +23,26 @@ validate_stun_section()
 		'log_level:uinteger:0'
 }
 
-service_running() {
-	ubus wait_for tr069
-	return $?;
-}
-
 start_service() {
-	local enable server_address
+	local enabled server_address
 
-	config_load stun
+	config_load stunc
 	validate_stun_section || {
-		log "Validation failed for stun section";
-		exit 1;
+		log "Validation failed for stunc section";
+		return 1;
 	}
 
-	if [ "$enable" -eq 0 ]; then
-		exit 0;
+	if [ "$enabled" -eq 0 ]; then
+		return 0;
 	fi
 
 	if [ -z "${server_address}" ]; then
 		log "Stun server address not defined or invalid"
-		exit 0;
+		return 0;
 	fi
 
-	procd_open_instance stun
-	procd_set_param command "$PROG"
+	procd_open_instance stunc
+	procd_set_param command ${PROG}
 	procd_set_param respawn "3" "7" "0"
 	procd_close_instance
 
@@ -63,5 +55,5 @@ reload_service() {
 
 service_triggers()
 {
-	procd_add_reload_trigger stun
+	procd_add_reload_trigger stunc
 }

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=0.2
+PKG_VERSION:=0.2.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
-PKG_SOURCE_VERSION:=f2502d984b3ecd6d97529ea128142609c0165289
+PKG_SOURCE_VERSION:=5f9c2ffb64a4cc46ffee59b6bbfafdaa26a7ab4f
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -29,6 +29,7 @@ define Package/sulu
   CATEGORY:=Utilities
   MENU=1
   TITLE:=SULU-CE ReactJS based Web UI Package
+  DEPENDS:=+nginx
 endef
 
 define Package/sulu/description
@@ -36,8 +37,8 @@ define Package/sulu/description
 endef
 
 define Package/sulu/install
-	$(INSTALL_DIR) $(1)/www
-	$(CP) $(PKG_BUILD_DIR)/out/* $(1)/www
+	$(INSTALL_DIR) $(1)/sulu
+	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
 #	$(CP) ./files/* $(1)/
 endef
 

urlfilter/Makefile

@@ -11,7 +11,7 @@ PKG_VERSION:=1.0.0
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c11c1057e8f7bd96934fce1eef07f96d8349f683
+PKG_SOURCE_VERSION:=891e8d36446c0b1e7999c5798375985b1804fcf1
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
@@ -26,7 +26,7 @@ define Package/urlfilter
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=URL filter
-  DEPENDS:=+libuci +libnetfilter-queue +libnfnetlink +libpthread +libubox +ubus
+  DEPENDS:=+libuci +libnetfilter-queue +libnfnetlink +iptables-mod-nfqueue +libpthread +libubox +ubus
 endef
 
 define Package/urlfilter/description

urlfilter/files/etc/config/urlfilter

@@ -1,2 +1,2 @@
 config globals globals
-	option enable 1
+	option enable 0

uspd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.1.15
+PKG_VERSION:=2.1.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8463c05d8bf6ed9145e018a9816baefce08bd2ec
+PKG_SOURCE_VERSION:=8f31734007fa2d9d4c551578f9f3436ca55a5c17
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

uspd/files/uspd.init

@@ -28,14 +28,14 @@ configure_uspd()
 		return 1;
 	}
 
-	[ ${enabled} -eq 0 ] && exit 0
+	[ ${enabled} -eq 0 ] && return 0
 
 	if [ ${debug} -eq 1 ]; then
 		procd_set_param stdout 1
 		procd_set_param stderr 1
 	fi
 
-	if [ -n "${sock}" ]; then
+	if [ -f "${sock}" ]; then
 		procd_append_param command -s ${sock}
 	fi
 

wifimngr/Makefile

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

xmppc/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
-PKG_SOURCE_VERSION:=231b010d5578bedee5f37de3ad7bd65e57f13a31
+PKG_SOURCE_VERSION:=a98cdda759418dab1c12a18c345112d94ed4c02e
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/xmppc.git
 
@@ -29,7 +29,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libbbf_api
+  DEPENDS:=+libuci +libubox +libstrophe +libbbf_api +libubus
 endef
 
 define Package/$(PKG_NAME)/description
@@ -41,7 +41,7 @@ TARGET_CFLAGS += \
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/xmppd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/xmppc $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/

xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp

@@ -17,5 +17,5 @@ local proto="$(uci -q get network.$INTERFACE.proto)"
 local ifname="$(uci -q get network.$INTERFACE.ifname)"
 [ "${ifname:0:1}" == "@" ] && exit 0
 
-/etc/init.d/xmppd reload &
+/etc/init.d/xmppc reload &
 

xmppc/files/etc/init.d/xmppc

@@ -1,13 +1,10 @@
 #!/bin/sh /etc/rc.common
-# XMPP client software
-# Copyright (C) 2020 iopsys Software Solutions AB
-# Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
 
 START=99
 STOP=10
 
 USE_PROCD=1
-PROG="/usr/sbin/xmppd"
+PROG="/usr/sbin/xmppc"
 
 start_service() {
 	local xmpp_enable=`uci -q get xmpp.xmpp.enable`
@@ -19,7 +16,7 @@ start_service() {
 		local con_enable=`uci -q get xmpp.$con.enable`
 		local srv_enable=`uci -q get xmpp.$con_srv.enable`
 		if ([ "$serveralgorithm" = "DNS-SRV" ] && [ "$con_enable" = "1" ]) || ([ "$serveralgorithm" = "ServerTable" ] && [ "$con_enable" = "1" ] && [ "$srv_enable" = "1" ]); then
-			procd_open_instance
+			procd_open_instance xmppc
 			procd_set_param command "$PROG"
 			procd_set_param respawn "3" "7" "0"
 			procd_close_instance