evoice :include Json-c for linking/ json files added for platforms brcm and airoha

bbf/Config_bbfdm.in

@@ -18,10 +18,6 @@ config BBF_TR143
 	bool "Enable TR-143 Data Model Support"
 	default y
 
-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

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.34
+PKG_VERSION:=6.8.33
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=3021165bb4877b7f4cfda8a2beded608175c8506
+PKG_SOURCE_VERSION:=9bdcb1ac188c44fc2274bf01dd9dce46f572b967
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -25,8 +25,7 @@ define Package/libbbf_api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
-  ABI_VERSION:=1.0
+  TITLE:=Library for libbbfdm API
 endef
 
 define Package/libbbfdm/default
@@ -34,8 +33,7 @@ define Package/libbbfdm/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbf_api \
-	    +BBF_TR471:obudpst
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
 endef
 
 define Package/libbbfdm
@@ -68,17 +66,6 @@ define Package/libbbfdm-wolfssl
   VARIANT:=wolfssl
 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 using libbbf JSON Plugin
-endef
-
 define Package/libbbfdm/config
 	source "$(SOURCE)/Config_bbfdm.in"
 endef
@@ -111,11 +98,6 @@ CMAKE_OPTIONS += \
 	-DBBF_TR143=ON
 endif
 
-ifeq ($(CONFIG_BBF_TR471),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR471=ON
-endif
-
 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_EXTENSION=ON
@@ -155,19 +137,13 @@ endef
 
 define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
-	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
-ifeq ($(CONFIG_PACKAGE_mosquitto-ssl),y)
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-mosquitto-config $(1)/etc/uci-defaults/
-endif
 endef
 
 define Package/libbbfdm/default/prerm
@@ -176,18 +152,6 @@ define Package/libbbfdm/default/prerm
 	exit 0
 endef
 
-define Package/userinterface/install
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DATA) ./files/etc/bbfdm/json/UserInterface.json $(1)/etc/bbfdm/json/
-	$(INSTALL_DATA) ./files/etc/config/userinterface $(1)/etc/config/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/firewall.userinterface $(1)/etc/firewall.userinterface
-endef
-
 Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
 Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
 Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
@@ -205,9 +169,9 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/usr/lib/
+	touch $(1)/usr/lib/libbbf_api.so
 endef
 
-$(eval $(call BuildPackage,userinterface))
 $(eval $(call BuildPackage,libbbf_api))
 $(eval $(call BuildPackage,libbbfdm))
 $(eval $(call BuildPackage,libbbfdm-openssl))

bbf/files/etc/bbfdm/json/UserInterface.json

@@ -1,117 +0,0 @@
-{
-	"Device.UserInterface.": {
-		"type": "object",
-		"version": "2.0",
-		"protocols": [
-			"cwmp",
-			"usp"
-		],
-		"access": false,
-		"array": false,
-		"Device.UserInterface.RemoteAccess.": {
-			"type": "object",
-			"version": "2.0",
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"access": false,
-			"array": false,
-			"Enable": {
-				"type": "boolean",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci", 
-						"uci": {
-							"file": "userinterface", 
-							"section": {
-								"name": "remote_access"
-							}, 
-							"option": {
-								"name": "enable"
-							}
-						}
-					}
-				]
-			},
-			"Port": {
-				"type": "unsignedInt",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"range": [
-					{
-						"max": 65535
-					}
-				],
-				"mapping": [
-					{
-						"type": "uci", 
-						"uci": {
-							"file": "userinterface", 
-							"section": {
-								"name": "remote_access"
-							}, 
-							"option": {
-								"name": "port"
-							}
-						}
-					}
-				]
-			},
-			"SupportedProtocols": {
-				"type": "string",
-				"read": true,
-				"write": false,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"list": {
-					"datatype": "string",
-					"enumerations": [
-						"HTTP",
-						"HTTPS"
-					]
-				},
-				"default": "HTTP"
-			},
-			"Protocol": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci", 
-						"uci": {
-							"file": "userinterface", 
-							"section": {
-								"name": "remote_access"
-							}, 
-							"option": {
-								"name": "protocol"
-							}
-						}
-					}
-				]
-			}
-		}
-	}
-}

bbf/files/etc/config/userinterface

@@ -1,6 +0,0 @@
-config userinterface 'remote_access'
-	option enable '0'
-	option interface 'wan'
-	option port '80'
-	option protocol 'HTTP'
-

bbf/files/etc/firewall.userinterface

@@ -1,85 +0,0 @@
-#!/bin/sh
-
-
-#!/bin/sh
-
-. /lib/functions.sh
-
-IDENTIFIER="REMOTE-ACCESS-WAN"
-
-log() {
-	echo "${@}"|logger -t firewall.userinterface -p info
-}
-
-if [ ! -f "/etc/config/userinterface" ]; then
-	exit 0;
-fi
-
-exec_cmd() {
-	if ! "$@"; then
-		log "Failed to run [$*]"
-	fi
-}
-
-configure_firewall_rule() {
-	local enable port protocol gui_port
-	local zone interface
-
-	config_load userinterface
-	config_get_bool enable remote_access enable 1
-	config_get port remote_access port
-	config_get interface remote_access interface
-
-	if [ "${enable}" -eq "0" ] || [ -z "${port}" ] || [ -z "${interface}" ]; then
-		return 0;
-	fi
-
-	zone="zone_${interface}_input"
-	iptables -w 1 -t filter -nL "${zone}" 2>/dev/null 1>&2
-	if [ "$?" -eq 0 ]; then
-		iptables -w 1 -I "${zone}" -p tcp -m multiport --dports "${port}" -m conntrack --ctstate NEW,ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
-	fi
-
-	zone="zone_${interface}_output"
-	iptables -w 1 -t filter -nL "${zone}" 2>/dev/null 1>&2
-	if [ "$?" -eq 0 ]; then
-		iptables -w 1 -I "${zone}" -p tcp -m multiport --dports "${port}" -m conntrack --ctstate ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
-	fi
-}
-
-delete_firewall_rule() {
-	local zone interface
-	local CMD
-
-	config_load userinterface
-	config_get interface remote_access interface
-
-	# Clean remote interface rules
-	if [ -z "${interface}" ]; then
-		return 0
-	fi
-
-	zone="zone_${interface}_input"
-	CMD="iptables -w 1 -t filter -nL ${zone} --line-numbers"
-	while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
-		rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
-		if [ -n "${rule_num}" ]; then
-			exec_cmd iptables -w 1 -t filter -D "${zone}" "${rule_num}";
-		fi
-	done
-
-	zone="zone_${interface}_output"
-	CMD="iptables -w 1 -t filter -nL ${zone} --line-numbers"
-	while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
-		rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
-		if [ -n "${rule_num}" ]; then
-			exec_cmd iptables -w 1 -t filter -D "${zone}" "${rule_num}";
-		fi
-	done
-}
-
-# Delete existing remote access rules
-delete_firewall_rule
-
-# Configure the User Interface rule
-configure_firewall_rule

bbf/files/etc/init.d/userinterface

@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-USE_PROCD=1
-
-start_service() {
-	local enable
-
-	procd_open_instance usp
-
-	config_load userinterface
-	config_get_bool enable global enable 1
-
-	# Inject firewall rules
-	if [ "${enable}" -eq "1" ]; then
-		/etc/firewall.userinterface
-	fi
-
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "userinterface"
-}

bbf/files/etc/uci-defaults/01-mosquitto-config

@@ -1,46 +0,0 @@
-#!/bin/sh
-
-config_mosquitto_owrt() {
-	sec=$(uci -q get mosquitto.owrt)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto owrt)
-		uci -q rename mosquitto."${sec}=owrt"
-	fi
-
-	uci -q set mosquitto.owrt.use_uci="1"
-	uci -q set mosquitto.owrt.write_pid="1"
-	uci -q commit mosquitto
-}
-
-config_mosquitto_general() {
-	sec=$(uci -q get mosquitto.mosquitto)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto mosquitto)
-		uci -q rename mosquitto."${sec}=mosquitto"
-	fi
-
-	uci -q set mosquitto.mosquitto.log_dest="syslog"
-	uci -q set mosquitto.mosquitto.log_facility="5"
-	uci -q set mosquitto.mosquitto.log_timestamp="1"
-	uci -q set mosquitto.mosquitto.log_types="error"
-	uci -q set mosquitto.mosquitto.per_listener_settings="1"
-	uci -q commit mosquitto
-}
-
-config_mosquitto_persistence() {
-	sec=$(uci -q get mosquitto.persistence)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto persistence)
-		uci -q rename mosquitto."${sec}=persistence"
-	fi
-
-	uci -q set mosquitto.persistence.persistence="0"
-	uci -q set mosquitto.persistence.location="/var/run"
-	uci -q commit mosquitto
-}
-
-if [ -f "/etc/config/mosquitto" ]; then 
-	config_mosquitto_owrt
-	config_mosquitto_general
-	config_mosquitto_persistence
-fi

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

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

bulkdata/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.10
+PKG_VERSION:=2.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=6e85d2032e66df581fae7c72cd83cc89367b8fc8
+PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,6 +25,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_DEPENDS:=bbf
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -48,8 +50,8 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/init.d/bulkdatad

@@ -7,19 +7,22 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
 start_service() {
-	local enable
+	local enable=$(uci -q get bulkdata.bulkdata.enable)
 
-	config_load bulkdata
-	config_get_bool enable bulkdata enable 1
-
-	procd_open_instance bulkdata
-	[ "$enable" -eq "1" ] && {
-		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
+	[ "$enable" != "1" ] && {
+		return 0
 	}
+
+	procd_open_instance
+	procd_set_param command "$PROG"
+	procd_set_param respawn "3" "7" "0"
 	procd_close_instance
 }
 
+boot() {
+	start
+}
+
 reload_service() {
 	stop
 	start 

bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options

@@ -16,8 +16,8 @@ get_next_count()
 	fi
 
 	while [ "${found}" -ne 1 ]; do
-		uci -q get "${config}"."${default_name}"_${count} >/dev/null
-		if [ "$?" -eq 0 ]; then
+		uci -q get ${config}.${default_name}_${count} >/dev/null
+		if [ $? -eq 0 ]; then
 			count=$((count + 1))
 		else
 			found=1;
@@ -39,8 +39,8 @@ translate_profile_id_to_profile_name() {
 	
 	[ "${curr_profile_id}" != "${profile_id}" ] && return
 
-	uci -q set bulkdata."${section}".profile_name="${profile_name}"
-	uci -q set bulkdata."${section}".profile_id=""
+	uci -q set bulkdata.${section}.profile_name="${profile_name}"
+	uci -q set bulkdata.${section}.profile_id=""	
 }
 
 update_profile_sections() {
@@ -54,7 +54,7 @@ update_profile_sections() {
 
 	case "${section}" in
 		"cfg"*)
-			profile_name="$(get_next_count bulkdata "${default}" ${PROFILE_COUNT})"
+			profile_name="$(get_next_count bulkdata ${default} ${PROFILE_COUNT})"
 			uci_rename bulkdata "${section}" "${profile_name}"
 		;;
 	esac
@@ -62,7 +62,7 @@ update_profile_sections() {
 
 	[ -n "$profile_name" ] && section="${profile_name}"
 
-	uci -q set bulkdata."${section}".profile_id=""
+	uci -q set bulkdata.${section}.profile_id=""
 
 	config_foreach translate_profile_id_to_profile_name profile_parameter "${profile_id}" "${profile_name}"
 	config_foreach translate_profile_id_to_profile_name profile_http_request_uri_parameter "${profile_id}" "${profile_name}"

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.6
+PKG_VERSION:=3.5.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=81450033d98fcdb68911e2148f48d190492090a6
+PKG_SOURCE_VERSION:=c5695bc92f7f22089c9a85d3e1f4dac7c12ca900
 PKG_MIRROR_HASH:=skip
 endif
 

dectmngr/files/etc/init.d/dectmngr

@@ -11,7 +11,7 @@ PROG=/usr/sbin/dectmngr
 LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 
-DECT_GPIO=22
+DECT_GPIO=$(db -q get hw.board.dect_gpio)
 
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
@@ -53,14 +53,14 @@ start_service() {
 	procd_open_instance
 	if [ "$log_dect_cmbs" = "none" ]; then
 		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command $PROG -comname ttyS1 $opt_ext
+		procd_set_param command $PROG -comname ttyH0 $opt_ext
 		rm -f $LOG_PATH/*
 	elif [ "$log_dect_cmbs" = "file" ]; then
 		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command $PROG -comname ttyS1 -log $LOG_PATH/dect-cmbs.log $opt_ext
+		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
 	else
 		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command $PROG -comname ttyS1 -syslog $opt_ext
+		procd_set_param command $PROG -comname ttyH0 -syslog $opt_ext
 		rm -f $LOG_PATH/*
 	fi
 
@@ -88,7 +88,6 @@ service_triggers()
 }
 
 boot() {
-	#devmem 0x1FA20218 32 0x08
 	[ -n "$DECT_GPIO" ] && {
 		echo ${DECT_GPIO} > /sys/class/gpio/export
 		echo out > /sys/class/gpio/gpio${DECT_GPIO}/direction
@@ -98,3 +97,4 @@ boot() {
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH
 	start
 }
+

dslmngr/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -26,7 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(CONFIG_TARGET_brcmbca),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
 else
   $(info Unexpected CONFIG_TARGET)
@@ -68,10 +68,6 @@ define Build/Compile
 endef
 
 define Package/dslmngr/install
-	$(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/
 endef

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

@@ -1,311 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-# ATM #
-check_pvc() {
-	local vpi=$1
-	local vci=$2
-	local ret
-
-	ret=$(xtmctl operate conn --show | awk -v test="$vpi/$vci" '{if ($3==test ) print $5 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-check_xtm_list() {
-	local qclass=$1
-	local pcr scr mbs
-	local ret
-
-	case $# in
-		1)
-			pcr=0
-			scr=0
-			mbs=0
-		;;
-		2)
-			pcr=$2
-			scr=0
-			mbs=0
-		;;
-		4)
-			pcr=$2
-			scr=$3
-			mbs=$4
-		;;
-	esac
-
-	ret=$(xtmctl operate tdte --show | awk -v test="$qclass" -v pcr="$pcr" -v scr="$scr" -v mbs="$mbs" '{if ($2==test && $3==pcr && $4==scr && $5==mbs ) print $1 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-configure_atm_device() {
-	local name vpi vci device link_type encapsulation qos_class pcr mbs scr i
-
-	config_get name $1 name "ATM"
-	config_get vpi $1 vpi "8"
-	config_get vci $1 vci "35"
-	config_get device $1 device "atm0"
-	config_get link_type $1 link_type "eoa"
-	config_get encapsulation $1 encapsulation "llc"
-	config_get qos_class $1 qos_class "ubr"
-	config_get pcr $1 pcr
-	config_get mbs $1 mbs
-	config_get scr $1 scr
-
-	check_pvc $vpi $vci
-	ret=$?
-
-	if [ "$ret" -eq 0 ]; then
-		check_xtm_list $qos_class $pcr $scr $mbs
-		ret=$?
-
-		if [ "$ret" -eq 0 ]; then
-			case $qos_class in # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
-				ubr)
-					xtmctl operate tdte --add "$qos_class"
-				;;
-				ubr_pcr|ubr+)
-					xtmctl operate tdte --add "$qos_class" $pcr
-				;;
-				cbr)
-					xtmctl operate tdte --add "$qos_class" $pcr
-				;;
-				nrtvbr|vbr-nrt)
-					xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
-				;;
-				rtvbr|vbr-rt)
-					xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
-				;;
-				gfr)
-				;;
-				abr)
-				;;
-			esac
-		fi
-
-		case $link_type in # EoA, IPoA, PPPoA, CIP
-			EoA|eoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_eth" || encapsulation="llcsnap_eth"
-			;;
-			PPPoA|pppoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_pppoa" || encapsulation="llcencaps_ppp"
-			;;
-			IPoA|ipoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_ipoa" || encapsulation="llcsnap_rtip"
-			;;
-			CIP|cip)
-			;;
-		esac
-
-		check_xtm_list $qos_class $pcr $scr $mbs
-		ret="$?"
-
-		xtmctl operate conn --add 1.$vpi.$vci aal5 $encapsulation 0 1 $ret
-		for i in `seq 0 7`; do
-			xtmctl operate conn --addq 1.$vpi.$vci $i wrr 1 dt # queue priority 0-7
-		done
-		xtmctl operate conn --createnetdev 1.$vpi.$vci $device
-		xtmctl operate intf --state 1 enable
-	fi
-}
-
-remove_atm_devices() {
-	local vpi vci rest
-	local vpivci=`xtmctl operate conn --show | grep "ATM\|mode" | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
-
-	for i in $vpivci
-	do
-		rest=${i#\/}
-		vpi=${rest%%\/*}
-		vci=${rest#*\/}
-		echo "xtmctl operate conn --delete 1.$vpi.$vci"
-		xtmctl operate conn --delete 1.$vpi.$vci
-		echo "xtmctl operate conn --deletenetdev 1.$vpi.$vci"
-		xtmctl operate conn --deletenetdev 1.$vpi.$vci
-	done
-}
-
-create_atm_devices() {
-	echo "Creating ATM Device(s)"
-	config_load dsl
-	config_foreach configure_atm_device atm-device
-}
-# ATM END #
-
-# PTM #
-check_ptm() {
-	local ret
-	local ptmprio=$1
-	local dslat=$2
-
-	if [ "$ptmprio" -eq 2 ]; then
-		ptmprio="high"
-	else
-		ptmprio="low"
-	fi
-
-	ret=$(xtmctl operate conn --show | awk -v dslat="$dslat" -v ptmprio="$ptmprio" '{if ($2 == dslat && $3 == ptmprio ) print $2 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-configure_ptm_device() {
-	local name device priority portid i
-
-	config_get name $1 name "PTM"
-	config_get device $1 device "ptm0"
-	config_get priority $1 priority 1
-	config_get portid $1 portid 1
-
-	check_ptm $priority $portid
-	ret=$?
-
-	if [ "$ret" -eq 0 ]; then
-		xtmctl operate conn --add $portid.$priority
-
-		for i in `seq 0 7`; do
-			xtmctl operate conn --addq $portid.$priority $i wrr 1 dt -1 -1 3000 # queue priority 0-7
-		done
-		echo "xtmctl operate conn --createnetdev $portid.$priority $device"
-		xtmctl operate conn --createnetdev $portid.$priority $device
-		xtmctl operate intf --state 1 enable
-	fi
-}
-
-remove_ptm_devices() {
-	local delptm
-	local x=0
-
-	IFS=$'\n'
-	for i in `xtmctl operate conn --show | grep "PTM\|mode"`
-	do
-		if [ $x -eq 1 ]; then
-			delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$11}')
-			echo "xtmctl operate conn --delete $delptm"
-			xtmctl operate conn --delete $delptm
-			xtmctl operate conn --deletenetdev $delptm
-		fi
-		x=1
-	done
-	unset IFS
-}
-
-create_ptm_devices() {
-	echo "Creating PTM Device(s)"
-	config_load dsl
-	config_foreach configure_ptm_device ptm-device
-}
-# PTM END #
-
-prioritize_arp()
-{
-      ebtables -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-      ebtables -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-}
-
-xtm_remove_devices() {
-	remove_atm_devices
-	remove_ptm_devices
-}
-
-xtm_create_devices() {
-	local tpstc="$(xdslctl info --show | grep TPS-TC)"
-	if echo "$tpstc" | grep -q "ATM Mode"; then
-		create_atm_devices
-	elif echo "$tpstc" | grep -q "PTM Mode"; then
-		create_ptm_devices
-	fi
-}
-
-xdsl_configure() {
-	local VDSL=0
-	local GFAST=0
-	local mod=""
-	local modes=""
-	local profile=""
-
-	config_load dsl
-
-	# Modes
-	config_get mode line mode
-	for mod in $mode; do
-		[ $mod == "gdmt" ] && modes="${modes}d"
-		[ $mod == "glite" ] && modes="${modes}l"
-		[ $mod == "t1413" ] && modes="${modes}t"
-		[ $mod == "adsl2" ] && modes="${modes}2"
-		[ $mod == "adsl2p" ] && modes="${modes}p"
-		[ $mod == "annexl" ] && modes="${modes}e"
-		[ $mod == "annexm" ] && modes="${modes}m"
-		[ $mod == "vdsl2" ] && modes="${modes}v" && VDSL=1
-		[ $mod == "gfast" ] && modes="${modes}f" && GFAST=1
-	done
-
-	# VDSL Profiles
-	config_get profile line profile
-	# Capabilities
-	config_get_bool bitswap line bitswap 1
-	[ $bitswap -eq 1 ] && bitswap="on" || bitswap="off"
-	config_get_bool sra line sra 1
-	[ $sra -eq 1 ] && sra="on" || sra="off"
-#	config_get_bool trellis line trellis 1
-	config_get_bool sesdrop line sesdrop 0
-	[ $sesdrop -eq 1 ] && sesdrop="on" || sesdrop="off"
-	# VDSL2 only
-	config_get_bool us0 line us0 1
-	[ $us0 -eq 1 ] && us0="on" || us0="off"
-#	config_get_bool dynamicd line dynamicd 1
-#	config_get_bool dynamicf line dynamicf 1
-	config_get_bool sos line sos 0
-	[ $sos -eq 1 ] && sos="on" || sos="off"
-
-	config_get_bool phyReXmtUs line phyReXmtUs 0
-	config_get_bool phyReXmtDs line phyReXmtDs 1
-	phyReXmt=$(( $((phyReXmtUs<<1)) + phyReXmtDs))
-
-	if [ $VDSL -eq 1 -o $GFAST -eq 1 ]; then
-		echo "xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0 --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt"
-		xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0 --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt
-		# G.Fast hardware to VDSL hardware, to set the driver bit kPhyCfg2EnableGfastVdslMMTimeOut0.
-		# Enable V43 tone for GFAST.
-		echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400"
-		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400
-	else
-		echo "xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt"
-		xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt
-	fi
-
-	if [ $GFAST -eq 1 ]; then
-		# G.Fast hardware to VDSL hardware, to set the driver bit kPhyCfg2EnableGfastVdslMMTimeOut0.
-		# Enable V43 tone for GFAST.
-		echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400"
-		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400
-	fi
-}
-
-xdsl_stop() {
-	# echo "Stopping DSL"
-	# stop causes IRQ issues
-	# xdslctl stop
-	return 0
-}
-
-xdsl_init() {
-	prioritize_arp
-
-	echo "Starting DSL"
-
-	xtmctl start
-	xtmctl operate intf --state 1 enable
-}

dslmngr/files/common/etc/config/dsl

@@ -1,53 +0,0 @@
-# OEM specific parameters
-config oem-parameters 'oem'
-#	option country_code "0000"   # 2 bytes hex
-#	option vendor_id "IO"        # 4 bytes string
-#	option vendor_suffix "0000"  # 2 bytes hex
-#	option sw_version "iopsys"   # 16 bytes string
-#	option serial_nr "00000000"  # 32 bytes string
-
-# DSL Modes
-config dsl-line line
-	list mode gdmt
-	list mode glite
-	list mode t1413
-	list mode adsl2
-	list mode adsl2p
-	list mode annexl
-	list mode annexm
-	list mode vdsl2
-	# VDSL2 profiles
-	list profile 8a
-	list profile 8b
-	list profile 8c
-	list profile 8d
-	list profile 12a
-	list profile 12b
-	list profile 17a
-	list profile 30a
-	option bitswap 1
-	option sra 1
-	option us0 1 # VDSL2 only
-	option sesdrop 0
-	option sos 0
-	option phyReXmtUs 0
-	option phyReXmtDs 1
-
-config atm-device atm0
-	option name 'ATM'
-	option vpi '8'
-	option vci '35'
-	option device atm0
-	option link_type 'eoa' # EoA, IPoA, PPPoA, CIP
-	option encapsulation 'llc' # llc, vcmux
-	option qos_class 'ubr' # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
-#	option pcr '512'
-#	option scr '256'
-#	option mbs '1024'
-
-config ptm-device ptm0
-	option name 'PTM'
-	option device 'ptm0'
-	option priority '1'
-	option portid '1'
-

dslmngr/files/common/etc/hotplug.d/dsl/10-devices

@@ -1,7 +0,0 @@
-[ "$STATUS" == "up" -o "$STATUS" == "down" ] || exit 0
-
-. /lib/functions.sh
-include /lib/dsl
-
-xtm_remove_devices
-xtm_create_devices

dslmngr/files/common/etc/hotplug.d/dsl/20-leds

@@ -1,7 +0,0 @@
-if [ "$STATUS" == "up" ]; then
-	ubus call led.dsl set '{"state":"ok"}'
-elif [ "$STATUS" == "down" ]; then
-	ubus call led.dsl set '{"state":"off"}'
-elif [ "$STATUS" == "training" ]; then
-	ubus call led.dsl set '{"state":"alert"}'
-fi

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

@@ -1,48 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /lib/functions.sh
-include /lib/dsl
-
-START=20
-USE_PROCD=1
-
-DSLMNGR=$(which dslmngr)
-
-start_service() {
-	[ -n "$DSLMNGR" ] && {
-		procd_open_instance
-		procd_set_param command "$DSLMNGR"
-		procd_set_param respawn
-		procd_close_instance
-	}
-
-	xdsl_configure
-	xtm_create_devices
-}
-
-stop_service() {
-	[ -n "$DSLMNGR" ] && service_stop $DSLMNGR
-
-	xtm_remove_devices
-	xdsl_stop
-}
-
-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
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-        procd_add_reload_trigger dsl
-}
-

easy-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
 endef
 
 define Package/easy-qos/description

easy-soc-events/Makefile

@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
 
 -include $(TOPDIR)/.config
 
-ifneq ($(CONFIG_TARGET_brcmbca),)
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
   LINUX_DIR=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.1
   LINUX_VERSION := 4.1.52
   LINUXINCLUDE=-Iarch/$(LINUX_KARCH)/mach-bcm963xx/include
@@ -85,7 +85,7 @@ define Build/Compile
 endef
 
 
-ifneq ($(CONFIG_TARGET_brcmbca),)
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
 define KernelPackage/easy-soc-events/install-extra
 	cp $(PKG_BUILD_DIR)/easyevent.ko $(FS_DIR)/lib/modules/$(LINUX_VERSION)/extra
 endef

easy-soc-libs/Config.in

@@ -0,0 +1,5 @@
+# libeasy configuration
+
+config LIBWIFI_USE_CTRL_IFACE
+	bool "Use UNIX sockets"
+	default n

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=7.2.16
+PKG_VERSION:=6.6.0
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=600dea2a0df974d9049c9fc9a2f85ff9e08f59d4
+PKG_SOURCE_VERSION:=c8c406568822b170e373a54fbf32323e960259ff
 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
@@ -36,13 +36,17 @@ define Package/easy-soc-libs
   MENU:=1
 endef
 
-ifeq ($(CONFIG_TARGET_brcmbca),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
   TARGET_WIFI_TYPE=BROADCOM
   CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
   TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MAC80211
 else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
   TARGET_PLATFORM=TEST
   TARGET_WIFI_TYPE=TEST
@@ -51,18 +55,10 @@ else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
   TARGET_PLATFORM=TEST
   TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_airoha),y)
+else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
   TARGET_PLATFORM=ECONET
   TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_ECONET
-else ifeq ($(CONFIG_TARGET_ipq95xx),y)
-  TARGET_PLATFORM=IPQ95XX
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIPQ95XX
-else ifeq ($(CONFIG_TARGET_iopsys_mediatek),y)
-  TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211
@@ -75,27 +71,13 @@ export TARGET_WIFI_TYPE
 
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
-	$(if $(CONFIG_PACKAGE_libwifiutils),libwifi) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
 	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
 	$(if $(CONFIG_PACKAGE_libqos),libqos)
 
-ifneq ($(CONFIG_PACKAGE_libwifi),)
-TARGET_CFLAGS +=-DHAS_WIFI
-endif
-
-esl-pkgs := \
-	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
-	$(if $(CONFIG_PACKAGE_libwifiutils),libwifiutils) \
-	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
-	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
-	$(if $(CONFIG_PACKAGE_libqos),libqos)
-
-esl-pkgs-all := \
+EASY_SOC_LIBS := \
 	libeasy \
-	libwifiutils \
 	libwifi \
 	libdsl \
 	libethernet \
@@ -145,15 +127,15 @@ define Build/Compile
 	$(Build/Compile/rebuild)
 	touch $(PKG_BUILD_DIR)/.config_$(CONFIG_TARGET_PROFILE)
 	$(call Build/Compile/Default)
-	$(foreach dir,$(esl-pkgs),$(call Build/Compile/$(dir)))
+	$(foreach dir,$(subdirs),$(call Build/Compile/$(dir)))
 endef
 
 define Build/InstallDev
-	$(foreach dir,$(esl-pkgs),$(call Build/InstallDev/$(dir),$(1),$(2));)
+	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
 define Package/easy-soc-libs/install
 	:
 endef
 
-$(eval $(foreach e,$(esl-pkgs-all),$(call BuildPackage,$(e))))
+$(eval $(foreach e,$(EASY_SOC_LIBS),$(call BuildPackage,$(e))))

easy-soc-libs/easy.mk

@@ -6,6 +6,10 @@ define Package/libeasy
   DEPENDS+=+libnl +libnl-route
 endef
 
+define Package/libeasy/config
+    source "$(SOURCE)/Config.in"
+endef
+
 define Build/InstallDev/libeasy
 	$(INSTALL_DIR) $(1)/usr/include/easy
 	$(INSTALL_DIR) $(1)/usr/lib

easy-soc-libs/ethernet.mk

@@ -2,7 +2,7 @@
 define Package/libethernet
   $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_airoha:ecnt_api
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_econet:ecnt_api
 endef
 
 define Package/libethernet/config

easy-soc-libs/wifi.mk

@@ -1,53 +1,29 @@
 
-define Package/libwifiutils
-  $(call Package/easy-soc-libs)
-  TITLE:= WiFi utility library (libwifiutils.so)
-  DEPENDS+=+libnl +libnl-route +libeasy
-endef
-
-define Build/InstallDev/libwifiutils
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifidefs.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifiutils.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifiutils*.so* $(1)/usr/lib/
-endef
-
-define Package/libwifiutils/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifiutils*.so* $(1)/usr/lib/
-endef
-
-
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcmkernel
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel
 endef
 
 define Package/libwifi/config
-  if PACKAGE_libwifi
-  	config LIBWIFI_DEBUG
+  if PACKAGE_libdsl
+	  config LIBWIFI_DEBUG
 		depends on PACKAGE_libwifi
-		bool "Enable debugging in libwifi"
+		bool "Enable wifi debugging"
 		default n
 
-	config LIBWIFI_USE_CTRL_IFACE
-		bool "Create UNIX sockets to interface with hostapd/wpa_supplicant"
-		default n
   endif
 endef
 
-
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifiops.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
 
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
+

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=fb85081443c19b5062bede49c80b1802c0f05d34
+PKG_SOURCE_VERSION:=0901382048bb7ce01fc1767fef75e54692f56743
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -30,6 +30,7 @@ PKG_BUILD_PARALLEL:=1
 # indirectly. This ensures that the package is rebuilt on config-changes.
 PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
+export CONFIG_BRCM_SDK_VER_504040
 export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk

ethmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
@@ -23,7 +23,7 @@ define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_iopsys_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
+  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/ethmngr/description
@@ -37,24 +37,10 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
-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/common/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca),)
-	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./files/airoha/* $(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_DIR) $(1)/etc/init.d $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/ethmngr.init $(1)/etc/init.d/ethmngr
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
-endif
 endef
 
 $(eval $(call BuildPackage,ethmngr))

ethmngr/files/airoha/lib/ethernet/airoha.sh

@@ -1,208 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-unset -f switchmgr
-# alias for switchmgr
-switchmgr() {
-	"/userfs/bin/switchmgr" "$@"
-}
-
-unset -f tc3162_get_lan_port
-# get lan port port by ifname
-# arg1: port ifname, ex: eth0.1
-tc3162_get_lan_port() {
-	[[ -z "$1" ]] && return 255
-
-	local ifname="$1"
-	local if_idx=255
-
-	# only for tc3162 eth switch ports (eth0.x, 0 < x < 7)
-	case "${ifname}" in
-	eth0.*)
-		;;
-	*)
-		logger -t "port-management" \
-		"unsupported - ${ifname} is not tc3162 switch port"
-		return 255
-		;;
-	esac
-
-	let "if_idx=$(echo "${ifname}" | cut -f2 -d'.')"
-	[[ -z "${if_idx}" ]] && return 255
-	[[ ${if_idx} -lt 1 || ${if_idx} -gt 6 ]] && {
-		logger -t "port-management" \
-		"incorrect tc3162 lan port index ${if_idx} picked from ifname ${ifname}"
-		return 255
-	}
-	let "if_idx=${if_idx}-1"
-	return ${if_idx}
-}
-
-
-unset -f tc3162_get_mapped_port
-# get mapped switch port by ifname
-# arg1: port ifname, ex: eth0.1
-tc3162_get_mapped_port() {
-	[[ -z "$1" ]] && return 255
-
-	local ifname="$1"
-	local if_idx=255
-	local prtmap_procfile="/proc/tc3162/eth_portmap"
-	local lan_prt=255
-	local port=255
-	local prtmap_out_line_num=4
-	local prtmap_out_line=""
-	
-	# check "lan port map" marker in portmap output string
-	prtmap_out_line="$(sed -n "${prtmap_out_line_num}p" ${prtmap_procfile})"
-	[[ ${prtmap_out_line} != "lan_port_map" ]] && return 255
-
-	tc3162_get_lan_port "${ifname}"
-	let "if_idx=$?"
-	[[ -z "${if_idx}" || ${if_idx} -eq 255 ]] && return
-
-	# get lan portmapping string "lan_port mapped_port" for ifname by it's index
-	let "prtmap_out_line_num=${prtmap_out_line_num}+1+${if_idx}"
-	prtmap_out_line="$(sed -n "${prtmap_out_line_num}p" ${prtmap_procfile})"
-
-	# get and check lan port index from lan portmapping string
-	lan_prt=$(echo "${prtmap_out_line}" | cut -f 1 -d' ')
-	[[ -z "${lan_prt}" || "${if_idx}" != "${lan_prt}" ]] && return 255
-
-	# get and check mapped port from lan portmapping string
-	let "port=$(echo "${prtmap_out_line}" | cut -f 2 -d' ')"
-	[[ ${port} -lt 0 || ${port} -gt 255 ]] && return 255
-
-	return ${port}
-}
-
-unset -f get_max_port_speed
-# arg1: port ifname, ex: eth0.1
-get_max_port_speed() {
-	[[ -z "$1" ]] && { echo 0; return; }
-
-	local ifname="$1"
-	local port=255
-	local speed=0
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-
-	# tc3162 capability for all ports is 1Gbps
-	speed=1000
-
-	echo $speed
-}
-
-unset -f power_updown
-# arg1: port ifname, ex: eth0.1
-# arg2: port enabled, ex: 0/1/off/on/..
-power_updown() {
-	[[ -z "$1" ]] && return
-	[[ -z "$2" ]] && return
-
-	local ifname="$1"
-	local enabled="$2"
-	local port=255
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-
-	let "enabled=$(get_bool "${enabled}" "-1")"
-	[[ ${enabled} -eq -1 ]] && return
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-
-	switchmgr phy admin "${port}" "${enabled}"
-}
-
-unset -f set_port_settings
-# arg1: port ifname, ex: eth0.1
-# arg2: port enabled, ex: 0/1/off/on/..
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: 0/1/off/on/..
-# arg6: port eee, ex: 0/1/off/on/..
-# arg7: port pause, ex: 0/1/off/on/..
-set_port_settings() {
-	[[ -z "$1" ]] && return
-	[[ -z "$2" ]] && return
-	[[ -z "$3" ]] && return
-	[[ -z "$4" ]] && return
-	[[ -z "$5" ]] && return
-	[[ -z "$6" ]] && return
-	[[ -z "$7" ]] && return
-
-	local ifname="$1"
-	local enabled="$2"
-	local speed="$3"
-	local duplex="$4"
-	local autoneg=$5
-	local eee="$6"
-	local pause="$7"
-	local port=255
-	local speedmode=1
-	local last_speed=0
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-	
-	let "enabled=$(get_bool "${enabled}" "-1")"
-	[[ ${enabled} -eq -1 ]] && return
-
-	let "autoneg=$(get_bool "${autoneg}" "-1")"
-	[[ ${autoneg} -eq -1 ]] && return
-
-	let "eee=$(get_bool "${eee}" "-1")"
-	[[ ${eee} -eq -1 ]] && return
-	
-	let "pause=$(get_bool "${pause}" "-1")"
-	[[ ${pause} -eq -1 ]] && return
-	
-	duplex="$(echo "${duplex}" | awk '{print tolower($0)}')"
-	[[ "${duplex}" != "half" && "${duplex}" != "full" ]] && return
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-	
-	last_speed="$(switchmgr phy maxspeed "${port}" | cut -f2 -d':')"
-	[[ -z "${last_speed}" || "${last_speed}" == "*Down*" ]] \
-		&& last_speed=${speed}
-	
-	switchmgr phy pause "${port}" "${pause}"
-
-	# set speedmode: speed+duplex+autoneg
-# FIXME: switchmgr has no separate setting for 1Gbps speed - use autoneg instead
-	if [[ ${autoneg} -eq 1 || ${speed} -gt 100 ]]; then
-		switchmgr phy speedmode ${port} "1"
-	else
-		[[ ${speed} -gt 10 ]] && let "speedmode=2" || let "speedmode=4"
-		[[ "${duplex}" == "half" ]] && let "speedmode=${speedmode}+1"
-		switchmgr phy speedmode "${port}" "${speedmode}"
-	fi
-	
-# TODO: implement MAC control register manipulations (mapped ports used) for
-	# eee settings change
-	# separate (tx/rx) pause (flow control) settings change
-	# set speed to 1Gbps separately from autoneg mode
-	
-# FIXME: workaround for duplex/pause settings being not applied if speed is unchanged
-	[[ ${last_speed} -eq ${speed} ]] && power_updown "${ifname}" 0
-
-	power_updown "${ifname}" ${enabled}
-
-}

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

@@ -1,140 +0,0 @@
-# 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
-# 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)"
-
-	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/ethmngr.init

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

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

@@ -1,95 +0,0 @@
-# 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 000 | 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

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evoice
-PKG_VERSION:=0.2.39
+PKG_VERSION:=0.2.29
 
 LOCAL_DEV=0
 LOCAL_DEV_EVOICE_DIR=~/voip/evoice
@@ -13,7 +13,7 @@ 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_VERSION:=ee4e9e00ec1c54b41e15a3de38f6a733634622dd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,6 +21,7 @@ endif
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_DEPENDS:=bbf
 # 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
@@ -32,10 +33,10 @@ define Package/$(PKG_NAME)
 	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
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c\
+		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
+		+TARGET_iopsys_econet:kmod-voip_driver\
+		+TARGET_iopsys_econet:voip_app
 endef
 
 define Package/$(PKG_NAME)/description
@@ -56,7 +57,7 @@ endif
 IDIR = $(STAGING_DIR)/usr/include
 TONES_INI_REQUIRED=
 
-ifeq ($(CONFIG_TARGET_brcmbca),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	TARGET_PLATFORM=BROADCOM
 	BDIR = bcm963xx/userspace/private/apps/voice
 	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
@@ -64,7 +65,7 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
 		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 	TRG=SVrgBcmFxs
 	JSONFILE=codecs_brcm.json
-else ifeq ($(CONFIG_TARGET_airoha),y)
+else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
 	TARGET_PLATFORM=ECONET
 	TONES_INI_REQUIRED=y
 	TRG=SVrgMtekOwrt

evoice/files/etc/config/voice

@@ -22,7 +22,6 @@ config SIPClient 'Client2'
 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'
@@ -34,12 +33,6 @@ config SIPNetwork 'Network1'
 	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'

evoice/files/etc/evoice/voicedm

@@ -48,23 +48,16 @@ config account 'map_account'
 # 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 Enable 'voice.Network@.Enable'
+   option Registration_Server 'voice.Network@.RegistrarServer'
+   option Outbound_Proxy 'voice.Network@.ProxyServer'
+   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'
+   option Reg_Failure_Interval 'voice.Network@.TimerRegistrationFailed'
+   option T1 'voice.Network@.TimerT1'
+   option UserAgentDomain 'voice.Network@.UserAgentDomain'
 
 config VoIPProfile 'map_voip'
    option Enable 'voice.VoIPProfile@.Enable'

evoice/files/etc/evoice/voicero

@@ -22,6 +22,7 @@ config static_prm 'defaults'
    option Tone_On_Hangup '1'
    option BusyTone_On_Hangup '1'
    option Enable_Analouge_Conf '0'
+   option SIP_SessTmrEnable '0'
    option PrackUsage '1'
    option SIP_SupportedPath '0'
    option IMS_Access_Network_Info ' '

evoice/files/lib/voice/codecs_airoha.json

@@ -1,50 +1,28 @@
 {
-	"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
-		}
-	]
+        "G.711ALaw": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        },
+        "G.711MuLaw": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        },
+        "G.726": {
+                "BitRate": 32000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        },
+        "G.729": {
+                "BitRate": 8000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        },
+        "G.722": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        }
 }
 

evoice/files/lib/voice/codecs_brcm.json

@@ -1,140 +1,28 @@
 {
-	"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
-		}
-	]
+        "G.711ALaw": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        },
+        "G.711MuLaw": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        },
+        "G.726": {
+                "BitRate": 32000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        },
+        "G.729": {
+                "BitRate": 8000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        },
+        "G.722": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        }
 }
 

gryphon-led-module/Makefile

@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_brcmbca):bcmkernel
+  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel
   PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
@@ -42,7 +42,7 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m
 MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 
 
-ifeq ($(CONFIG_TARGET_brcmbca),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),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

gryphon-led-module/src/main.c

@@ -220,6 +220,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->clock_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
 				PTR_ERR(leds->clock_gpio));
+		leds->clock_gpio = NULL;
 		return PTR_ERR(leds->clock_gpio);
 	}
 
@@ -227,6 +228,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->clock_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
 				PTR_ERR(leds->clock_gpio));
+		leds->clock_gpio = NULL;
 		return PTR_ERR(leds->clock_gpio);
 	} else {
 		printk(KERN_INFO "Got clock gpio\n");
@@ -244,6 +246,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->data_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
 				PTR_ERR(leds->data_gpio));
+		leds->data_gpio = NULL;
 		return PTR_ERR(leds->data_gpio);
 	}
 
@@ -251,6 +254,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->data_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
 				PTR_ERR(leds->data_gpio));
+		leds->data_gpio = NULL;
 		return PTR_ERR(leds->data_gpio);
 	} else {
 		printk(KERN_INFO "Got data gpio\n");

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.1.12
+PKG_VERSION:=9.0.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=2b067844c3e57c15693abb2b5875e6d41dcab8a9
+PKG_SOURCE_VERSION:=304db5eb064d89cf4e4df0bb81fa22b88933d602
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -29,7 +29,7 @@ define Package/icwmp/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbf_api
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
 endef
 
 define Package/icwmp-openssl
@@ -83,9 +83,6 @@ define Package/icwmp/default/install
 	$(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)/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
@@ -95,8 +92,6 @@ define Package/icwmp/default/install
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(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-openssl/install = $(Package/icwmp/default/install)

icwmp/files/etc/firewall.cwmp

@@ -20,13 +20,13 @@ if [ -z "${zone_name}" ]; then
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
 	iptables -nL zone_icwmp_input 2> /dev/null
-	if [ "$?" != 0 ]; then
+	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
+		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
+		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
@@ -64,13 +64,13 @@ else
 	fi
 fi
 
-echo "${cmd}"|grep -q "\-\-dport \|\-s "
+echo ${cmd}|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd}
 fi
 
-echo "${cmd6}"|grep -q "\-\-dport \|\-s "
+echo ${cmd6}|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd6}

icwmp/files/etc/icwmpd/update.sh

@@ -14,19 +14,16 @@ handle_icwmp_update() {
 		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
+	status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.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
+		# Handle timeout or tr069 object not found
+		if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
+			log "Restarting icwmp tr069 object"
+			/etc/init.d/icwmpd restart
 		fi
-	else
-		log "Restarting icwmp tr069 object"
-		/etc/init.d/icwmpd restart
 	fi
 }
 
-handle_icwmp_update "$@"
+handle_icwmp_update $@

icwmp/files/etc/init.d/icwmpd

@@ -23,22 +23,22 @@ regenerate_ssl_link()
 	[ ! -d "${cert_dir}" ] && return 0;
 
 	### Generate all ssl link for pem certicates ###
-	all_file=$(ls "${cert_dir}"/*.pem 2>/dev/null)
+	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
+			rehash="$(openssl x509 -hash -noout -in $cfile)"
+			[ -f ${cert_dir}/${rehash}.0 ] || \
+				ln -s $cfile $cert_dir/${rehash}.0
 		done
 	fi
 
 	### Generate all ssl link for crt certicates ###
-	all_file=$(ls "${cert_dir}"/*.crt 2>/dev/null)
+	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
+			rehash="$(openssl x509 -hash -noout -in $cfile)"
+			[ -f ${cert_dir}/${rehash}.0 ] || \
+				ln -s $cfile $cert_dir/${rehash}.0
 		done
 	fi
 }
@@ -47,8 +47,8 @@ enable_dhcp_option43() {
 	local wan="${1}"
 
 	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local reqopts="$(uci -q get network."${wan}".reqopts)"
-	local proto="$(uci -q get network."${wan}".proto)"
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local proto="$(uci -q get network.$wan.proto)"
 	local newreqopts=""
 	local option43_present=0
 
@@ -64,8 +64,8 @@ enable_dhcp_option43() {
 	fi
 
 	newreqopts="$reqopts 43"
-	if [ "${proto}" = "dhcp" ]; then
-		uci -q set network."${wan}".reqopts="$newreqopts"
+	if [ "${proto}" == "dhcp" ]; then
+		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	fi
@@ -77,7 +77,7 @@ convert_to_hex() {
 	OPTIND=1
 	while getopts ":" opt "-$optval"
 	do
-		temp=$(printf "%02X" "'${OPTARG:-:}")
+		temp=$(printf "%X" "'${OPTARG:-:}")
 		val="${val}:${temp}"
 	done
 
@@ -122,25 +122,25 @@ configure_send_op125() {
 	serial_len=$(echo -n "${serial}" | wc -m)
 	class_len=$(echo -n "${class}" | wc -m)
 
-	if [ "${oui_len}" -eq 0 ] || [ "${serial_len}" -eq 0 ]; then
+	if [ ${oui_len} -eq 0 ] || [ ${serial_len} -eq 0 ]; then
 		return 0
 	fi
 
 	opt125_len=$((oui_len + serial_len + class_len))
-	if [ "${class_len}" -gt 0 ]; then
+	if [ ${class_len} -gt 0 ]; then
 		opt125_len=$((opt125_len + 6))
 	else
 		opt125_len=$((opt125_len + 4))
 	fi
 
-	hex_opt125_len=$(printf "%02X" "${opt125_len}")
+	hex_opt125_len=$(printf "%X" "${opt125_len}")
 	opt125="${opt125}:${hex_opt125_len}"
 	hex_oui=$(convert_to_hex "${oui}")
 	if [ -z "${hex_oui}" ]; then
 		return 0
 	fi
 
-	hex_oui_len=$(printf "%02X" "${oui_len}")
+	hex_oui_len=$(printf "%X" "${oui_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
 	else
@@ -152,20 +152,20 @@ configure_send_op125() {
 		return 0
 	fi
 
-	hex_serial_len=$(printf "%02X" "${serial_len}")
+	hex_serial_len=$(printf "%X" "${serial_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
 	else
 		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
 	fi
 
-	if [ "${class_len}" -gt 0 ]; then
+	if [ ${class_len} -gt 0 ]; then
 		hex_class=$(convert_to_hex "${class}")
 		if [ -z "${hex_class}" ]; then
 			return 0
 		fi
 
-		hex_class_len=$(printf "%02X" "${class_len}")
+		hex_class_len=$(printf "%X" "${class_len}")
 		if [ "${uci}" = "network" ]; then
 			opt125="${opt125}:03:${hex_class_len}${hex_class}"
 		else
@@ -176,9 +176,9 @@ configure_send_op125() {
 
 	if [ "${uci}" = "network" ]; then
 		new_send_opt="$sendopt $opt125"
-		uci -q set network."${intf}".sendopts="$new_send_opt"
+		uci -q set network.$intf.sendopts="$new_send_opt"
 	else
-		uci -q add_list dhcp."${intf}".dhcp_option="$opt125"
+		uci -q add_list dhcp.$intf.dhcp_option="$opt125"
 	fi
 }
 
@@ -187,9 +187,9 @@ enable_dnsmasq_option125() {
 	local send125_present=0
 	local opt125="125,"
 
-	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
+	local proto="$(uci -q get dhcp.$lan.dhcpv4)"
 	if [ "${proto}" = "server" ]; then
-		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
+		opt_list="$(uci -q get dhcp.$lan.dhcp_option)"
 
 		for sopt in $opt_list; do
 			if [[ "$sopt" == "$opt125"* ]]; then
@@ -205,27 +205,13 @@ enable_dnsmasq_option125() {
 	fi
 }
 
-set_vendor_id() {
+enable_disable_dhcp_option125() {
 	local wan="${1}"
-	local proto="$(uci -q get network."${wan}".proto)"
+	local action="${2}"
 
-	if [ "${proto}" = "dhcp" ]; then
-		vendorid="$(uci -q get network."${wan}".vendorid)"
-		if [ -z "${vendorid}" ]; then
-			uci -q set network."${wan}".vendorid="dslforum.org"
-			ubus call uci commit '{"config":"network"}'
-		elif [[ $vendorid != *"dslforum.org"* ]]; then
-			uci -q set network."${wan}".vendorid="${vendorid},dslforum.org"
-			ubus call uci commit '{"config":"network"}'
-		fi
-	fi
-}
-
-enable_dhcp_option125() {
-	local wan="${1}"
-	local reqopts="$(uci -q get network."${wan}".reqopts)"
-	local sendopts="$(uci -q get network."${wan}".sendopts)"
-	local proto="$(uci -q get network."${wan}".proto)"
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local sendopts="$(uci -q get network.$wan.sendopts)"
+	local proto="$(uci -q get network.$wan.proto)"
 	local newreqopts=""
 	local newsendopts=""
 	local req125_present=0
@@ -247,16 +233,35 @@ enable_dhcp_option125() {
 		fi
 	done
 
-	if [ "${proto}" = "dhcp" ]; then
-		if [ ${req125_present} -eq 0 ]; then
-			newreqopts="$reqopts 125"
-			uci -q set network."${wan}".reqopts="$newreqopts"
-			network_uci_update=1
-		fi
+	if [ "${proto}" == "dhcp" ]; then
+		if [ "${action}" == "enable" ]; then
+			if [ ${req125_present} -eq 0 ]; then
+				newreqopts="$reqopts 125"
+				uci -q set network.$wan.reqopts="$newreqopts"
+				network_uci_update=1
+			fi
 
-		if [ ${send125_present} -eq 0 ]; then
-			configure_send_op125 "${sendopts}" "${wan}" "network"
-			network_uci_update=1
+			if [ ${send125_present} -eq 0 ]; then
+				configure_send_op125 "${sendopts}" "${wan}" "network"
+				network_uci_update=1
+			fi
+		else
+			if [ ${req125_present} -eq 1 ]; then
+				newreqopts=$(echo ${reqopts/125/})
+				uci -q set network.$wan.reqopts="$newreqopts"
+				network_uci_update=1
+			fi
+
+			if [ ${send125_present} -eq 1 ]; then
+				for sopt in $sendopts; do
+					if [[ "$sopt" == "$opt125"* ]]; then
+						newsendopts=$(echo ${sendopts/"${sopt}"/})
+						uci -q set network.$wan.sendopts="$newreqopts"
+						network_uci_update=1
+						break
+					fi
+				done
+			fi
 		fi
 	fi
 
@@ -283,6 +288,12 @@ wait_for_resolvfile() {
 copy_cwmp_etc_files_to_varstate() {
 	mkdir -p /var/run/icwmpd
 
+	if [ -f /etc/icwmpd/cwmp ]; then
+		uci -q -c /etc/icwmpd delete cwmp.acs
+		uci -q -c /etc/icwmpd commit cwmp
+		cp -f /etc/icwmpd/cwmp /var/state/cwmp
+	fi
+
 	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
 		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
 	fi
@@ -301,6 +312,10 @@ copy_cwmp_varstate_files_to_etc() {
 		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
 	fi
 
+	if [ -f /var/state/cwmp ]; then
+		cp -f /var/state/cwmp /etc/icwmpd/
+	fi
+
 	# move the successful custom notify import marker to persistent storage
 	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
 		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
@@ -377,30 +392,25 @@ validate_defaults() {
 }
 
 boot() {
-	local enable_cwmp="0"
 	local dhcp_discovery="0"
 
 	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-	if [ "$enable_cwmp" = "0" ]; then
-		return 0
-	fi
-
 	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
+	config_get wan_interface cpe default_wan_interface "wan"
+	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "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
 
 	config_get lan_interface cpe default_lan_interface ""
 	if [ -n "${lan_interface}" ]; then
 		# Set dhcp_option 125 if not already configured
-		enable_dhcp_option125 "${wan_interface}"
+		enable_disable_dhcp_option125 "${wan_interface}" "enable"
 		enable_dnsmasq_option125 "${lan_interface}"
+	else
+		# Remove dhcp option 125 if exists
+		enable_disable_dhcp_option125 "${wan_interface}" "disable"
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -409,12 +419,6 @@ boot() {
 		regenerate_ssl_link "${ssl_capath}"
 	fi
 
-	# Copy backup data so that if it restart latter on, it gets the info
-	copy_cwmp_etc_files_to_varstate
-	touch /etc/icwmpd/cwmp_notification
-	mkdir -p /var/run/icwmpd/
-	touch /var/run/icwmpd/cwmp
-
 	start
 }
 
@@ -437,6 +441,9 @@ start_service() {
 		return 1;
 	}
 
+	# Copy backup data so that if it restart latter on it gets the info
+	copy_cwmp_etc_files_to_varstate
+
 	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
@@ -448,7 +455,7 @@ start_service() {
 	procd_close_instance
 }
 
-stop_service()
+service_stopped()
 {
 	copy_cwmp_varstate_files_to_etc
 }
@@ -466,14 +473,7 @@ reload_service() {
 		return 0
 	fi
 
-	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 returning
-		return 0
-	fi
-
-	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
+	status="$(ubus -t 1 call tr069 status |jsonfilter -qe '@.cwmp.status')"
 	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'

ieee1905/Config.in

@@ -1,6 +1,6 @@
 if (PACKAGE_ieee1905)
 
-menu "Configuration"
+menu "Configurations"
 
 config IEEE1905_EXTENSION_ALLOWED
 	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
@@ -10,18 +10,5 @@ config IEEE1905_PLATFORM_HAS_WIFI
 	bool "Platform has WiFi"
 	default y if PACKAGE_libwifi
 
-config IEEE1905_CMDU_SA_IS_ALMAC
-	bool "Send CMDUs with SA set to 1905 AL-macaddress instead of interface macaddress"
-	default n
-
-config IEEE1905_WIFI_EASYMESH
-	bool "Include WiFi-Alliance's Easymesh updates"
-	default y
-
-config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
-	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
-	default y
-
 endmenu
-
 endif

ieee1905/Config.map-plugin.in

@@ -0,0 +1,14 @@
+if (PACKAGE_map-plugin)
+
+menu "Configurations"
+
+config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
+	bool "Sync configuration between dynamic controllers in the network"
+	default n
+
+config MULTIAP_FUZZ_1905_CMDUS
+	bool "Include support to fuzz 1905 CMDUs for testing purpose"
+	default n
+
+endmenu
+endif

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.0.10
+PKG_VERSION:=4.10.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=69b1073cfe3dc936c9cbe3e8a71005e9fa9f57e0
+PKG_SOURCE_VERSION:=b50f79061a95840d89a6129aa0a95aff82b5a1b7
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -35,21 +35,31 @@ define Package/ieee1905/config
 endef
 
 define Package/libieee1905
-  $(call Package/ieee1905/Default)
-  TITLE:=libieee1905.so (library for CMDU and TLV handling)
+$(call Package/ieee1905/Default,$(1))
+  TITLE+= (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json
 endef
 
 define Package/ieee1905
-  $(call Package/ieee1905/Default)
-  TITLE:=ieee1905d (daemon implementing 1905.1 and provides cli)
+$(call Package/ieee1905/Default,$(1))
+  TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
 endef
 
-include $(wildcard plugins/*.mk)
+
+define Package/map-plugin
+$(call Package/ieee1905/Default,$(1))
+  TITLE:=Multi-AP (Easymesh) plugin
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+endef
+
+define Package/map-plugin/config
+  source "$(SOURCE)/Config.map-plugin.in"
+endef
 
 define Package/ieee1905/description
  This package provides IEEE Std 1905.1 stack.
@@ -59,16 +69,8 @@ define Package/libieee1905/description
  This package provides library functions for IEEE Std 1905.1 stack.
 endef
 
-plugins := \
-	$(if $(CONFIG_PACKAGE_map-plugin),map) \
-	$(if $(CONFIG_PACKAGE_snoop-plugin),snoop) \
-	$(if $(CONFIG_PACKAGE_topology-plugin),topology)
-
-
-ppkg:=$(patsubst plugins/%.mk,%-plugin,$(wildcard plugins/*.mk))
-
-
 TARGET_CFLAGS += \
+	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
@@ -77,20 +79,10 @@ ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
 TARGET_CFLAGS += -DHAS_WIFI
 endif
 
-ifeq ($(CONFIG_IEEE1905_CMDU_SA_IS_ALMAC),y)
-TARGET_CFLAGS += -DCMDU_SA_IS_ALMAC
+ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
+TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
 endif
 
-ifeq ($(CONFIG_IEEE1905_WIFI_EASYMESH),y)
-TARGET_CFLAGS += -DWIFI_EASYMESH
-endif
-
-ifeq ($(CONFIG_IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY),y)
-TARGET_CFLAGS += -DIEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
-endif
-
-MAKE_FLAGS += \
-	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
 
 MAKE_PATH:=src
 
@@ -109,6 +101,25 @@ define Package/libieee1905/install
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
 endef
 
+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
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
+endef
+
+define Build/InstallDev/map-plugin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map2.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
+endef
+
+
 define Build/InstallDev/libieee1905
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -126,7 +137,7 @@ endef
 
 define Build/InstallDev
 	$(call Build/InstallDev/libieee1905,$(1),$(2))
-	$(foreach p,$(ppkg),$(call Build/InstallDev/$(p),$(1),$(2)))
+	$(call Build/InstallDev/map-plugin,$(1),$(2))
 endef
 
 ifeq ($(LOCAL_DEV),1)
@@ -137,4 +148,4 @@ endif
 
 $(eval $(call BuildPackage,ieee1905))
 $(eval $(call BuildPackage,libieee1905))
-$(eval $(foreach p,$(ppkg),$(call BuildPackage,$(p))))
+$(eval $(call BuildPackage,map-plugin))

ieee1905/files/etc/init.d/ieee1905

@@ -44,8 +44,7 @@ validate_ap_section() {
 	uci_validate_section ieee1905 $section "${1}" \
 			'band:or("2", "5", "60", "6")' \
 			'ssid:string' \
-			'encryption:or("psk2", "sae-mixed", "sae",
-				"psk", "psk-mixed", "none", string)' \
+			'encryption:or("psk2", "sae-mixed", "sae", string)' \
 			'key:string' \
 			'uuid:string' \
 			'manufacturer:string' \
@@ -83,10 +82,8 @@ start_service() {
 	validate_ieee1905_config || return 1;
 
 	procd_open_instance
-        procd_set_param command "/usr/sbin/ieee1905d" "-o"  "/tmp/ieee1905.log" "-f"
+        procd_set_param command "/usr/sbin/ieee1905d"
 	procd_set_param respawn
-	procd_set_param limits core="unlimited"
-#	procd_set_param env IEEE1905_LOG_CMDU=1
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
 	procd_close_instance

ieee1905/files/etc/uci-defaults/31-ifname-option-to-list

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-config_load ieee1905
-
-ifname_to_list() {
-	local section=$1
-
-	config_get ifname $section ifname	# get list or option as space separated values
-	ifname=${ifname//,/\ }			# convert csv with space separation
-	uci del ieee1905.${section}.ifname	# delete entry
-	for i in ${ifname}; do
-		uci add_list ieee1905.${section}.ifname="$i"	# writeback entry as list
-	done
-}
-
-config_foreach ifname_to_list al-iface

ieee1905/plugins/map.mk

@@ -1,51 +0,0 @@
-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/map-plugin/config
-	if (PACKAGE_map-plugin)
-
-		menu "Configuration"
-
-		config MULTIAP_EASYMESH_VERSION
-		int "Easymesh version"
-		default 2
-
-		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
-		bool "Sync configuration between dynamic controllers in the network"
-		default n
-
-		config MULTIAP_FUZZ_1905_CMDUS
-		bool "Include support to fuzz 1905 CMDUs for testing purpose"
-		default n
-
-		endmenu
-	endif
-endef
-
-TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_MULTIAP_EASYMESH_VERSION)
-
-ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
-TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
-endif
-
-define Build/InstallDev/map-plugin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/easymesh.h $(1)/usr/include/easymesh.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
-endef
-
-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
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-endef

ieee1905/plugins/snoop.mk

@@ -1,12 +0,0 @@
-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/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
-endef

ieee1905/plugins/topology.mk

@@ -1,12 +0,0 @@
-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/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
-endef

iop/config

@@ -18,21 +18,8 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 # /etc/banner and /etc/device_info #
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="IOPSYS"
+CONFIG_VERSION_MANUFACTURER="iopsysWrt"
 CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
-CONFIG_VERSION_DIST="IOWRT"
-
-# OpenWrt is given by CONFIG_VERSION_NUMBER which we do not want to override.
-# disabling CONFIG_VERSION_FILENAMES will hide the OpenWrt version from the image filename
-# CONFIG_VERSION_FILENAMES is not set
-
-# CONFIG_VERSION_CODE is set to the IOWRT version instead by the genconfig-script and
-# CONFIG_VERSION_CODE_FILENAMES will put it into the image filename.
-CONFIG_VERSION_CODE_FILENAMES=y
-
-CONFIG_VERSION_HOME_URL="https://iopsys.eu"
-CONFIG_VERSION_BUG_URL="https://iopsys.eu"
-CONFIG_VERSION_SUPPORT_URL="https://iopsys.eu"
 
 # /lib/preinit #
 CONFIG_PREINITOPT=y
@@ -56,8 +43,9 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 
 # EasySoC HAL #
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_qosmngr=y
-CONFIG_PACKAGE_libwifiutils=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_peripheral_manager=y
+CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
@@ -76,7 +64,6 @@ CONFIG_PACKAGE_urlfilter=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
-CONFIG_PACKAGE_usermngr=y
 
 # TR-x69 #
 CONFIG_PACKAGE_uspd-mbedtls=y
@@ -153,8 +140,7 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_ip6tables-zz-legacy=y
-CONFIG_PACKAGE_iptables-zz-legacy=y
+CONFIG_PACKAGE_iptables-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y

iop/scripts/genconfig.sh

@@ -13,12 +13,12 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcmbca_feed="target/linux/feeds/brcmbca"
-	airoha_feed="target/linux/feeds/airoha"
-	x86_feed="target/linux/feeds/iopsys-x86"
-	armvirt_feed="target/linux/feeds/iopsys-armvirt"
-	mediatek_feed="target/linux/feeds/iopsys-mediatek"
-	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
+	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
+	ramips="target/linux/feeds/iopsys-ramips"
+	econet="target/linux/feeds/iopsys-econet"
+	x86="target/linux/feeds/iopsys-x86"
+	armvirt="target/linux/feeds/iopsys-armvirt"
+	mediatek="target/linux/feeds/iopsys-mediatek"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -108,21 +108,21 @@ function genconfig {
 			return
 		fi
 
-		[ -e $brcmbca_feed/genconfig ] &&
-			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $airoha_feed/genconfig ] &&
-			airoha=$(cd $airoha_feed; ./genconfig)
-		[ -e $x86_feed/genconfig ] &&
-			iopsys_x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armvirt_feed/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt_feed; ./genconfig)
-		[ -e $mediatek_feed/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek_feed; ./genconfig)
-		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
+		[ -e $brcm63xx_arm/genconfig ] &&
+			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
+		[ -e $ramips/genconfig ] &&
+			iopsys_ramips=$(cd $ramips; ./genconfig)
+		[ -e $econet/genconfig ] &&
+			iopsys_econet=$(cd $econet; ./genconfig)
+		[ -e $x86/genconfig ] &&
+			iopsys_x86=$(cd $x86; ./genconfig)
+		[ -e $armvirt/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $mediatek/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -131,18 +131,26 @@ function genconfig {
 			return
 	    fi
 
-	    for p in $brcmbca; do
+	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
+		    target="iopsys_brcm63xx_arm"
+			target_config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
 
-	    for p in $airoha; do
+	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
+		    target="iopsys_ramips"
+			target_config_path="$ramips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_econet; do
+		if [ $p == $profile ]; then
+		    target="iopsys_econet"
+			target_config_path="$econet/config"
 		    return
 		fi
 	    done
@@ -150,7 +158,7 @@ function genconfig {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86_feed/config"
+			target_config_path="$x86/config"
 		    return
 		fi
 	    done
@@ -158,7 +166,7 @@ function genconfig {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt_feed/config"
+			target_config_path="$armvirt/config"
 		    return
 		fi
 	    done
@@ -166,15 +174,7 @@ function genconfig {
 	    for p in $iopsys_mediatek; do
 		if [ $p == $profile ]; then
 		    target="iopsys_mediatek"
-			target_config_path="$mediatek_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx_feed/config"
+			target_config_path="$mediatek/config"
 		    return
 		fi
 	    done
@@ -265,22 +265,11 @@ function genconfig {
 	setup_dirs()
 	{
 		git remote -v | grep -q http || {
-			CUSTBRANCH="$(git rev-parse --abbrev-ref HEAD)"
 			if git ls-remote $CUSTREPO -q 2>/dev/null; then
 				if [ ! -d "$CUSTPATH" ]; then
-					echo "Cloning $CUSTBRANCH branch of $CUSTREPO"
-					git clone -b "$CUSTBRANCH" "$CUSTREPO" "$CUSTPATH" 2>/dev/null || {
-						DEFBRANCH="$(git remote show $CUSTREPO | grep 'HEAD branch' | cut -d' ' -f5)"
-						echo "$CUSTBRANCH branch is not found, cloning $DEFBRANCH branch of $CUSTREPO"
-						git clone "$CUSTREPO" "$CUSTPATH"
-					}
+					git clone "$CUSTREPO" "$CUSTPATH"
 				elif [ $IMPORT -eq 1 ]; then
 					cd $CUSTPATH
-					echo "Checking out $CUSTBRANCH branch in $CUSTPATH"
-					git checkout "$CUSTBRANCH" 2>/dev/null || {
-						DEFBRANCH="$(git symbolic-ref refs/remotes/origin/HEAD | cut -d '/' -f4)"
-						echo "Checking out $CUSTBRANCH branch has failed, using $DEFBRANCH branch in $CUSTPATH"
-					}
 					v "git pull"
 					git pull
 					cd - >/dev/null #go back
@@ -340,9 +329,9 @@ function genconfig {
 		    echo "" >> .config
 		fi
 
-		# Special handling for targets which use TARGET_DEVICES
+		# Special handling for targets which use TARGET_DEVICES 
 		case "$target" in
-		airoha | iopsys_mediatek | brcmbca | ipq95xx)
+		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
@@ -388,15 +377,12 @@ function genconfig {
 		fi
 
 		# Set target version
-		local git_version
-		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
-			echo "ERROR: Failed getting version via git describe, exiting." >&2
-			return 1
-		fi
-		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
-		local version_lower="${version,,}"
-		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
+		local GIT_TAG=$(git describe --abbrev=0 --tags)
+		local GIT_REV=$(git rev-parse --short HEAD)
+		local GIT_VER="$GIT_TAG"
+		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
+		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected

iop/scripts/genconfig_min.sh

@@ -12,12 +12,12 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcmbca_feed="target/linux/feeds/brcmbca"
-	airoha_feed="target/linux/feeds/airoha"
-	x86_feed="target/linux/feeds/iopsys-x86"
-	armvirt_feed="target/linux/feeds/iopsys-armvirt"
-	mediatek_feed="target/linux/feeds/iopsys-mediatek"
-	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
+	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
+	ramips="target/linux/feeds/iopsys-ramips"
+	econet="target/linux/feeds/iopsys-econet"
+	x86="target/linux/feeds/iopsys-x86"
+	armvirt="target/linux/feeds/iopsys-armvirt"
+	mediatek="target/linux/feeds/iopsys-mediatek"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -107,21 +107,21 @@ function genconfig_min {
 			return
 		fi
 
-		[ -e $brcmbca_feed/genconfig ] &&
-			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $airoha_feed/genconfig ] &&
-			airoha=$(cd $airoha_feed; ./genconfig)
-		[ -e $x86_feed/genconfig ] &&
-			iopsys_x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armvirt_feed/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt_feed; ./genconfig)
-		[ -e $mediatek_feed/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek_feed; ./genconfig)
-		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
+		[ -e $brcm63xx_arm/genconfig ] &&
+			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
+		[ -e $ramips/genconfig ] &&
+			iopsys_ramips=$(cd $ramips; ./genconfig)
+		[ -e $econet/genconfig ] &&
+			iopsys_econet=$(cd $econet; ./genconfig)
+		[ -e $x86/genconfig ] &&
+			iopsys_x86=$(cd $x86; ./genconfig)
+		[ -e $armvirt/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $mediatek/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -130,18 +130,26 @@ function genconfig_min {
 			return
 	    fi
 
-	    for p in $brcmbca; do
+	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
+		    target="iopsys_brcm63xx_arm"
+			target_config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
 
-	    for p in $airoha; do
+	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
+		    target="iopsys_ramips"
+			target_config_path="$ramips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_econet; do
+		if [ $p == $profile ]; then
+		    target="iopsys_econet"
+			target_config_path="$econet/config"
 		    return
 		fi
 	    done
@@ -149,7 +157,7 @@ function genconfig_min {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86_feed/config"
+			target_config_path="$x86/config"
 		    return
 		fi
 	    done
@@ -157,7 +165,7 @@ function genconfig_min {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt_feed/config"
+			target_config_path="$armvirt/config"
 		    return
 		fi
 	    done
@@ -165,15 +173,7 @@ function genconfig_min {
 	    for p in $iopsys_mediatek; do
 		if [ $p == $profile ]; then
 		    target="iopsys_mediatek"
-			target_config_path="$mediatek_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx_feed/config"
+			target_config_path="$mediatek/config"
 		    return
 		fi
 	    done
@@ -181,6 +181,12 @@ function genconfig_min {
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
 		DEVELOPER=1
+
+		bcmAllowed=0
+		endptAllowed=0
+
+		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
+		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 	}
 
 	v() {
@@ -316,7 +322,7 @@ function genconfig_min {
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-			airoha | iopsys_mediatek | brcmbca | ipq95xx)
+		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
@@ -362,15 +368,12 @@ function genconfig_min {
 		fi
 
 		# Set target version
-		local git_version
-		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
-			echo "ERROR: Failed getting version via git describe, exiting." >&2
-			return 1
-		fi
-		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
-		local version_lower="${version,,}"
-		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
+		local GIT_TAG=$(git describe --abbrev=0 --tags)
+		local GIT_REV=$(git rev-parse --short HEAD)
+		local GIT_VER="$GIT_TAG"
+		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
+		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected

iop/scripts/install_key.sh

@@ -48,10 +48,7 @@ function ssh_install_key {
     local keys="$(get_ssh_public_keys)"
     echo "Adding the following keys to $DROPBEAR_AUTHORIZED_KEYS_FILE on $host:"
     echo "$keys"
-    ssh \
-        -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-        root@$host \
-        "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
+    ssh root@$host "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
 }
 
 register_command "ssh_install_key" "Install the users public ssh key on host running dropbear"

iop/scripts/iopupgrade.sh

@@ -274,10 +274,9 @@ function ssh_upgrade {
 	pv "$upd_fw" |
 		ssh \
 			-o ConnectTimeout=60 \
-			-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
 			root@"$upd_host" \
 			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
 		echo "Sysupgrade failed" >&2 && return 1
 }
 
-register_command "ssh_upgrade" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"
+register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"

libvoice-airoha/Makefile

@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2022 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:=libvoice-airoha
-PKG_VERSION:=0.1
-PKG_LICENSE:=PROPRIETARY
-PKG_LICENSE_FILES:=LICENSE
-
-LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=fc397f971e873bc57912ef3ab22466e59e5c416f
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-# 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
-
-LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += -Wall -Werror
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Utilities
-	TITLE:=IOPSYS libvoice for Airoha platform
-	URL:=
-	DEPENDS:=
-endef
-
-define Package/$(PKG_NAME)/description
-	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/$(PKG_NAME)/install
-	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
-	# WARNING: skipping libvoice-airoha -- package has no install section
-	$(INSTALL_DIR) $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
-

libvoice-broadcom/Makefile

@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2022 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:=libvoice-broadcom
-PKG_VERSION:=0.1
-PKG_LICENSE:=PROPRIETARY
-PKG_LICENSE_FILES:=LICENSE
-
-LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=415e36c4007040f723b164dee79a1719d9c77f0a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-# 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
-
-LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
-
-export BCM_VOICEMNGR_WORKAROUND=y
-export CONFIG_BCM_CHIP_ID
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += -Wall -Werror
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Utilities
-	TITLE:=IOPSYS libvoice for Broadcom
-	URL:=
-	DEPENDS:=
-endef
-
-define Package/$(PKG_NAME)/description
-	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/$(PKG_NAME)/install
-	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
-	# WARNING: skipping libvoice-broadcom -- package has no install section
-	$(INSTALL_DIR) $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
-

libvoice-d2/Makefile

@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2022 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:=libvoice-d2
-PKG_VERSION:=0.1
-PKG_LICENSE:=PROPRIETARY
-PKG_LICENSE_FILES:=LICENSE
-
-LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=abedc475cac1a21ad434dbf2131eb42aa495744d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-# 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
-
-LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += -Wall -Werror
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Utilities
-	TITLE:=IOPSYS libvoice for D2 which is software DSP
-	URL:=
-	DEPENDS:=
-endef
-
-define Package/$(PKG_NAME)/description
-	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/$(PKG_NAME)/install
-	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
-	# WARNING: skipping libvoice-d2 -- package has no install section
-	$(INSTALL_DIR) $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
-

map-agent/Config.in

@@ -13,9 +13,6 @@ config AGENT_ISLAND_PREVENTION
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
-config AGENT_EASYMESH_VERSION
-	int "Support Easymesh version"
-	default 2
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
@@ -33,17 +30,5 @@ config AGENT_EASYMESH_VENDOR_EXT_OUI
 	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
-config AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST
-	bool "Create STA entry before authorization is completed"
-
-config AGENT_CHANSWITCH_SKIP_DFS_UNAVAILABLE
-	bool "Skip DFS unavailable channels when channel switch"
-
-config AGENT_LOCAL_ACS_SERVICE
-	bool "Enable loacal ACS daemon usage"
-
-config AGENT_STRICT_OPER_CHANNEL_REPORT
-	bool "Report operation channel strictly, skip some unsolicited reports"
-
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.2.0.3
+PKG_VERSION:=2.10.3.14
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6bf73a47963bf305cac5487dcbe1a9a6e88065bd
+PKG_SOURCE_VERSION:=449eb907b121b7224cbfedcf51246e438f2b30d6
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -28,7 +28,7 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +map-plugin +ip-bridge
+	  +map-plugin
 endef
 
 
@@ -59,8 +59,6 @@ TARGET_CFLAGS += \
 	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
-TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_AGENT_EASYMESH_VERSION)
-
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
@@ -75,24 +73,8 @@ endif
 
 ifeq ($(CONFIG_AGENT_EASYMESH_VENDOR_EXT),y)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)\\\"
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 
-ifeq ($(CONFIG_AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST),y)
-TARGET_CFLAGS += -DUNAUTHORIZED_STA_IN_ASSOCLIST
-endif
-
-ifeq ($(CONFIG_AGENT_CHANSWITCH_SKIP_DFS_UNAVAILABLE),y)
-TARGET_CFLAGS += -DCHANSWITCH_SKIP_DFS_UNAVAILABLE
-endif
-
-ifeq ($(CONFIG_AGENT_LOCAL_ACS_SERVICE),y)
-TARGET_CFLAGS += -DLOCAL_ACS_SERVICE
-endif
-
-ifeq ($(CONFIG_AGENT_STRICT_OPER_CHANNEL_REPORT),y)
-TARGET_CFLAGS += -DSTRICT_OPER_CHANNEL_REPORT
-endif
 
 MAKE_PATH:=src
 

map-agent/files/etc/config/mapagent

@@ -7,7 +7,6 @@ config agent 'agent'
 	option island_prevention '0'
 	option eth_onboards_wifi_bhs '0'
 #	option controller_macaddr '0a:1b:2c:3d:4e:50'
-	option scan_on_boot_only '0'
 
 config dynamic_backhaul
 	option missing_bh_timer '60'

map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul

@@ -3,7 +3,7 @@
 . /lib/network/utils.sh
 
 conn_ports_file="/tmp/map.connected.ports"
-map_bh_file="/var/run/multiap/multiap.backhaul"
+map_bh_file="/tmp/multiap.backhaul"
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
 al_brnet="${al_bridge:3}"

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

@@ -10,9 +10,56 @@ IS_CFG_VALID=1
 MAP_DEV="map_dev"
 MAP_IF="map"
 
+create_map() {
+	ip link add lei type veth peer name lei_map 2>/dev/null
+	ip link add link lei name lei_lan type vlan id 1 2>/dev/null
+
+	uci -q set network.${MAP_DEV}=device
+	uci -q set network.${MAP_DEV}.name=br-map
+	uci -q set network.${MAP_DEV}.type=bridge
+
+	uci -q show network.${MAP_DEV}.ports | grep -q lei_map || {
+		uci -q add_list network.${MAP_DEV}.ports='lei_map'
+	}
+
+	uci -q set network.${MAP_IF}=interface
+	uci -q set network.${MAP_IF}.device=br-map
+	uci -q set network.${MAP_IF}.is_lan=1
+
+	uci -q show network.br_lan.ports | grep -q lei_lan || {
+		uci -q add_list network.br_lan.ports="lei_lan"
+	}
+
+	uci -q set mapagent.agent.al_bridge=br-map
+
+	uci -q commit
+
+	ubus call network reload
+	ubus -t 5 wait_for network.interface.map
+
+	brctl addif br-map lei_map 2>/dev/null
+	brctl addif br-lan lei_lan 2>/dev/null
+
+	ip link set lei up 2>/dev/null
+	ip link set lei_map up 2>/dev/null
+	ip link set lei_lan up 2>/dev/null
+}
+
+remove_map() {
+	ip link delete ${MAP_VETH} &>/dev/null
+
+	uci -q delete network.${MAP_DEV}
+	uci -q delete network.${MAP_IF}
+
+	uci -q set mapagent.agent.al_bridge=br-lan
+
+	uci -q commit
+
+	ubus call network reload
+}
 
 start_dynbhd_service() {
-	rm -f /var/run/multiap/multiap.backhaul
+	rm -f /tmp/multiap.backhaul
 	procd_open_instance
 	procd_set_param command "/usr/sbin/dynbhd"
 	procd_set_param respawn
@@ -25,7 +72,7 @@ validate_agent_section() {
 	uci_validate_section mapagent agent "agent" \
 		'enabled:bool:true' \
 		'debug:range(0,16)' \
-		'profile:range(1,4):2' \
+		'profile:range(1,2):2' \
 		'brcm_setup:bool:false' \
 		'controller_macaddr:macaddr' \
 		'al_bridge:string' \
@@ -34,8 +81,7 @@ validate_agent_section() {
 		'resend_num:uinteger:0' \
 		'dyn_cntlr_sync:bool:true' \
 		'island_prevention:bool:false' \
-		'eth_onboards_wifi_bhs:bool:false' \
-		'scan_on_boot_only:bool:false'
+		'eth_onboards_wifi_bhs:bool:false'
 
 
 	[ "$?" -ne 0 ] && {
@@ -92,7 +138,7 @@ validate_radio_section() {
 
 	uci_validate_section mapagent $section "${1}" \
 			'device:string' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'configured:bool:false' \
 			'onboarded:bool:false' \
 			'dedicated_backhaul:bool:false' \
@@ -104,11 +150,7 @@ validate_radio_section() {
 			'include_sta_metric:bool:false' \
 			'rcpi_hysteresis_margin:range(0,255)' \
 			'report_util_threshold:range(0,255)' \
-			'encryption:or("sae", "sae+aes", "psk2",
-				"psk2+aes", "sae-mixed", "sae-mixed+aes",
-				"none", "psk-mixed", "psk-mixed+aes",
-				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
-				"psk", "psk+aes")' \
+			'encryption:or("sae", "psk2", "sae-mixed")'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of radio section failed"
@@ -191,6 +233,10 @@ start_service() {
 	config_get_bool enabled agent enabled 1
 	[ "$enabled" -eq 0 ] && return 1
 
+	local ts
+	config_get_bool ts agent vlan_segregation 0
+	[ "$ts" -eq 1 ] && create_map #|| remove_map
+
 	procd_open_instance
 	create_dir
 	procd_set_param command "/usr/sbin/mapagent" "-d"
@@ -200,6 +246,10 @@ start_service() {
 	procd_close_instance
 }
 
+#stop_service() {
+#	remove_map
+#}
+
 service_triggers()
 {
 	procd_add_reload_trigger "mapagent"

map-controller/Config.in

@@ -14,10 +14,6 @@ config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	string
 	default "\\\\x11\\\\x22\\\\x33"
 
-config CONTROLLER_EASYMESH_VERSION
-	int "Support Easymesh version"
-	default 2
-
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.2.0.1
+PKG_VERSION:=2.11.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cc76a7199d2ae8e014720d90d06bf90e6d0535b3
+PKG_SOURCE_VERSION:=a4a626539ede73c1c4eb1ad768331524a8ee9ce8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -26,7 +26,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin
 endef
 
 define Package/map-controller/description
@@ -45,15 +45,12 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
-TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_CONTROLLER_EASYMESH_VERSION)
-
 ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
 
 ifeq ($(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT),y)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)\\\"
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 
 define Package/map-controller/install
@@ -61,8 +58,6 @@ define Package/map-controller/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
-	$(CP) $(PKG_BUILD_DIR)/src/plugins/steer/rcpi/rcpi.so $(1)/usr/lib/mapcontroller/rcpi.so
 endef
 
 ifeq ($(LOCAL_DEV),1)

map-controller/files/etc/config/mapcontroller

@@ -2,22 +2,14 @@ config controller 'controller'
 	option enabled '1'
 	option registrar '2 5'
 	option debug '0'
-	option bcn_metrics_max_num '10'
-	option initial_channel_scan '0'
-	option primary_vid '0'
-	option primary_pcp '0'
-	option allow_bgdfs '0'
-	option channel_plan '0'
-
-config sta_steering
-	option steer_module 'rcpi'
-	option enabled '1'
 	option enable_sta_steer '0'
 	option enable_bsta_steer '0'
 	option use_bcn_metrics '0'
 	option use_usta_metrics '0'
-	option bandsteer '0'
-	option diffsnr '8'
+	option primary_vid '0'
+	option primary_pcp '0'
+	option allow_bgdfs '0'
+	option channel_plan '0'
 
 config ap
 	option band '2'
@@ -68,8 +60,8 @@ config ap
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '0'
 #	option report_scan '0'
-#	list steer_exclude 'e0:d4:e8:79:c4:ee'
-#	list steer_exclude_btm 'e0:d4:e8:79:c4:11'
+#	option steer_exclude '0'
+#	option steer_exclude_btm '0'
 #	option steer_disallow '0'
 #	option coordinated_cac '0'
 #	option traffic_separation '0'
@@ -115,8 +107,8 @@ config ap
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '0'
 #	option report_scan '0'
-#	list steer_exclude 'e0:d4:e8:79:c4:ee'
-#	list steer_exclude_btm 'e0:d4:e8:79:c4:11'
+#	option steer_exclude '0'
+#	option steer_exclude_btm '0'
 #	option steer_disallow '0'
 #	option coordinated_cac '0'
 #	option traffic_separation '0'

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

@@ -19,9 +19,11 @@ validate_controller_section() {
 		'enabled:bool:true' \
 		'registrar:string' \
 		'debug:range(0,16)' \
-		'bcn_metrics_max_num:range(1,256)' \
-		'initial_channel_scan:bool:true' \
 		'resend_num:uinteger:0' \
+		'enable_sta_steer:bool:false' \
+		'enable_bsta_steer:bool:false' \
+		'use_bcn_metrics:bool:false' \
+		'use_usta_metrics:bool:false' \
 		'allow_bgdfs:range(0,2629744)' \
 		'channel_plan:range(0,2629744)' \
 		'enable_ts:bool:false'
@@ -34,33 +36,6 @@ validate_controller_section() {
 	return 0
 }
 
-validate_sta_steering_section() {
-	local section="$1"
-
-	uci_validate_section mapcontroller $section "${1}" \
-		'steer_module:string' \
-		'enabled:bool:true' \
-		'enable_sta_steer:bool:false' \
-		'enable_bsta_steer:bool:false' \
-		'use_bcn_metrics:bool:false' \
-		'use_usta_metrics:bool:false' \
-		'bandsteer:bool:false' \
-		'diffsnr:range(0,100)' \
-		'rcpi_threshold_2g:range(0,220)' \
-		'rcpi_threshold_5g:range(0,220)' \
-		'rcpi_threshold_6g:range(0,220)' \
-		'report_rcpi_threshold_2g:range(0,220)' \
-		'report_rcpi_threshold_5g:range(0,220)' \
-		'report_rcpi_threshold_6g:range(0,220)'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of sta_steering section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
 validate_ap_section() {
 	local section="$1"
 
@@ -68,10 +43,7 @@ validate_ap_section() {
 			'band:or("2", "5", "6")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
-				"psk2+aes", "sae-mixed", "sae-mixed+aes",
-				"none", "psk-mixed", "psk-mixed+aes",
-				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
-				"psk", "psk+aes")' \
+				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
 			'key:string' \
 			'vid:range(1,65535):1' \
 			'type:or("backhaul", "fronthaul", "combined")' \
@@ -121,7 +93,7 @@ validate_radio_section() {
 	uci_validate_section mapcontroller $section "${1}" \
 			'agent_id:macaddr' \
 			'macaddr:macaddr' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'steer_policy:range(0,2)' \
 			'util_threshold:range(0,255)' \
 			'rcpi_threshold:range(0,255)' \
@@ -144,7 +116,6 @@ validate_controller_config() {
 	IS_CFG_VALID=1
 
 	validate_controller_section &&
-		config_foreach validate_sta_steering_section sta_steering &&
 		config_foreach validate_ap_section ap &&
 		config_foreach validate_node_section node &&
 		config_foreach validate_radio_section radio
@@ -199,7 +170,7 @@ reload_service() {
 		return
 	fi
 
-	pidof "/usr/sbin/mapcontroller" > /dev/null
+	pidof "mapcontroller" > /dev/null
 	if [[ $? -ne 0 ]] ; then
 		start
 		return

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.17
+PKG_VERSION:=2.5.1.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=7683a1b6a08996f07de573c67a33ad143dffeaa8
+PKG_SOURCE_VERSION:=488ce1ce576b57c9b3c4d7c034969bf65e66216f
 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

map-topology/files/etc/config/topology

@@ -4,4 +4,3 @@ config topology 'topology'
 	option depth '8'
 	option interval '60'
 	option maxlog '32'
-	option profile '2'

map-topology/files/etc/firewall.hosts

@@ -1,126 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-day=""
-IP_RULE=""
-
-process_ac_schedule() {
-	local acs_id="$1"
-	local is_enabled
-	local access_control
-	local start_time=""
-	local stop_time=""
-	local mac=""
-
-	handle_day_list() {
-		local value=$1
-
-		val=$(echo $value | cut -c 1-3)
-		if [ -z $day ]; then
-			day="$val"
-		else
-			day="$day,$val"
-		fi
-	}
-
-	config_list_foreach "$acs_id" "day" handle_day_list
-	config_get is_enabled "$acs_id" "enable" 1
-	config_get access_control "$acs_id" "dm_parent"
-
-	if [ "$is_enabled" == "0" ] || [ -z "$access_control" ]; then
-		return
-	fi
-
-	IP_RULE=""
-
-	mac=$(uci -q get hosts.$access_control.macaddr)
-	access_policy=$(uci -q get hosts.$access_control.access_policy)
-
-	config_get start_time "$acs_id" "start_time"
-	config_get duration "$acs_id" "duration"
-
-	if [ -z "$mac" ] && [ -z "$start_time" ] && [ -z "$duration" ] && [ -z "$day" ] && [ -z "$access_policy" ]; then
-		return
-	fi
-	if [ -n "$mac" ]; then
-		IP_RULE="$IP_RULE -m mac --mac-source $mac"
-	fi
-
-	# as per iptables manual default starttime is 00:00
-	# default stoptime is 23:59
-	if [ -z "$start_time" ]; then
-		start_time="0:0"
-	fi
-
-        if [ -n "$duration" ]; then
-		hh=$(echo $start_time | awk -F: '{ print $1 }')
-                mm=$(echo $start_time | awk -F: '{ print $2 }')
-                hh_s=`expr $hh \* 3600`
-                mm_s=`expr $mm \* 60`
-                ss=$(( hh_s + mm_s ))
-
-                stop_ss=$(( ss + duration ))
-                hh=$(( stop_ss / 3600 ))
-                if [ $hh -lt 24 ]; then
-                	rem_ss=$(( stop_ss % 3600 ))
-                	mm=$(( rem_ss / 60 ))
-                	ss=$(( rem_ss % 60 ))
-                	stop_time="$hh:$mm:$ss"
-                else
-                	stop_time="23:59"
-                fi
-        else
-        	stop_time="23:59"
-        fi
-
-	# conversion to utc
-	zone=$(date +%z | cut -c 1)
-	utc_h=$(date -u -d @$(date "+%s" -d "$start_time") +%H)
-	local_h=$(echo $start_time | awk -F: '{ print $1 }')
-	if [ "$zone" == "+" ] && [ $utc_h -gt $local_h ]; then
-		start_utc="0:0"
-	else
-		start_utc=$(date -u -d @$(date "+%s" -d "$start_time") +%H:%M)
-	fi
-
-	utc_h=$(date -u -d @$(date "+%s" -d "$stop_time") +%H)
-	local_h=$(echo $stop_time | awk -F: '{ print $1 }')
-	if [ "$zone" == "-" ] && [ $utc_h -lt $local_h ]; then
-		stop_utc="23:59"
-	else
-		stop_utc=$(date -u -d @$(date "+%s" -d "$stop_time") +%H:%M)
-	fi
-
-
-	IP_RULE="$IP_RULE -m time --timestart $start_utc --timestop $stop_utc"
-	if [ -n "$day" ]; then
-		IP_RULE="$IP_RULE --weekdays $day"
-	fi
-
-	if [ "$access_policy" == "Deny" ]; then
-		IP_RULE="$IP_RULE -j DROP"
-	else
-		IP_RULE="$IP_RULE -j ACCEPT"
-	fi
-
-	iptables -w -A hosts_forward ${IP_RULE}
-	ip6tables -w -A hosts_forward ${IP_RULE}
-
-	day=""
-}
-
-iptables -w -F hosts_forward
-ip6tables -w -F hosts_forward
-
-iptables -w -t filter -N hosts_forward
-ret=$?                        
-[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
-ip6tables -w -t filter -N hosts_forward
-ret=$?                        
-[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
-
-# Load /etc/config/hosts UCI file
-config_load hosts
-config_foreach process_ac_schedule ac_schedule
-

map-topology/files/etc/init.d/topologyd

@@ -71,10 +71,6 @@ start_service() {
 	config_load "hosts"
 	validate_hosts_config || return 1;
 
-	if [ -f "/proc/sys/net/netfilter/nf_conntrack_timestamp" ]; then
-		echo 1 >/proc/sys/net/netfilter/nf_conntrack_timestamp
-	fi
-
 	procd_open_instance
         procd_set_param command "/usr/sbin/topologyd"
 	procd_set_param respawn

map-topology/files/etc/uci-defaults/992-firewall_host.ucidefaults

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/firewall.hosts ]; then
-	uci -q get firewall.hosts || {
-		uci -q set firewall.hosts=include
-		uci -q set firewall.hosts.path="/etc/firewall.hosts"
-		uci -q set firewall.hosts.reload=1
-	}
-fi
-
-
-exit 0

mcastmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -16,9 +16,8 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mcastmngr
- CATEGORY:=Utilities
- TITLE:=Multicast Proxy/Snooping Manager
- DEPENDS:=+!TARGET_brcmbca:mcproxy
+	CATEGORY:=Utilities
+	TITLE:=multicast packets manager daemon
 endef
 
 define Package/mcastmngr/description
@@ -33,12 +32,7 @@ define Build/Compile
 endef
 
 define Package/mcastmngr/install
-	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca),)
-	$(CP) ./files/broadcom/* $(1)/
-else
-	$(CP) ./files/linux/* $(1)/
-endif
+	$(CP) ./files/* $(1)/
 endef
 
 $(eval $(call BuildPackage,mcastmngr))

mcastmngr/files/broadcom/lib/mcast/broadcom.sh

@@ -1,254 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-. /lib/mcast/common.sh
-
-include /lib/network
-
-
-CONFFILE=/var/mcpd.conf
-PROG_EXE=/usr/sbin/mcpd
-
-proxdevs=""
-ethwan="$(db -q get hw.board.ethernetWanPort)"
-
-
-config_snooping_common_params() {
-	local protocol="$1"
-	echo "${protocol}-default-version $2" >> $CONFFILE
-	echo "${protocol}-robustness-value $3" >> $CONFFILE
-	echo "${protocol}-max-groups $max_groups" >> $CONFFILE
-	echo "${protocol}-max-sources $max_msf" >> $CONFFILE
-	echo "${protocol}-max-members $max_members" >> $CONFFILE
-	echo "${protocol}-snooping-enable $4" >> $CONFFILE
-}
-
-config_mcast_querier_params() {
-	local protocol="$1"
-	local query_interval=$2
-	local q_resp_interval=$3
-	local last_mem_q_int=$4
-
-	echo "${protocol}-query-interval $query_interval" >> $CONFFILE
-	echo "${protocol}-query-response-interval $q_resp_interval" >> $CONFFILE
-	echo "${protocol}-last-member-query-interval $last_mem_q_int" >> $CONFFILE
-}
-
-config_snooping_upstream_interface() {
-	local snooping_upstream_intf=""
-
-	json_load "$(devstatus $1)"
-	logger -t "mcastconf" "$(devstatus $1)"
-	itr=1
-	json_select bridge-members
-
-	# loop over the bridge and find the device on wan port
-	while json_get_var dev $itr; do
-		case "$dev" in
-			*.*)
-				port="$(echo "$dev" | cut -d'.' -f 1)"
-				if [ $port == $ethwan ]; then
-					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
-				fi
-				;;
-		esac
-		itr=$(($itr + 1))
-	done
-	json_select ..
-
-	# if none of the bridge members are on wan port, set the wan port itself
-	if [ -n "$snooping_upstream_intf" ]; then
-		echo "upstream-interface $snooping_upstream_intf" >>$CONFFILE
-	else
-		echo "upstream-interface $ethwan" >>$CONFFILE
-	fi
-}
-
-config_snooping_on_bridge() {
-	local protocol="$1"
-	local bcm_mcast_p=1
-	echo "${protocol}-snooping-interfaces $2" >> $CONFFILE
-
-	[ "$protocol" == "mld" ] && bcm_mcast_p=2
-
-	for snpif in $2; do
-		case "$snpif" in
-			br-*)
-				# set snooping mode on the bridge
-				bcmmcastctl mode -i $snpif -p $bcm_mcast_p -m $3
-			;;
-		esac
-	done
-}
-
-config_mcast_proxy_interface() {
-	local itr
-	local p1="$1"
-	local p_enable
-
-	if [ "$p1" == "igmp" ]; then
-		p_enable=$igmp_p_enable
-	else
-		p_enable=$mld_p_enable
-	fi
-
-	for proxif in $2; do
-		case "$proxif" in
-			br-*)
-				proxdevs="$proxdevs $proxif"
-				echo "upstream-interface $proxif" >>$CONFFILE
-			;;
-			*)
-				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
-			;;
-		esac
-	done
-
-	if [ $p_enable -eq 1 ]; then
-		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
-	fi
-
-	# if proxdevs is empty set the wan port as mcast-interface
-	if [ -n "$proxdevs" ]; then
-		echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
-	else
-		echo "${p1}-mcast-interfaces $ethwan" >> $CONFFILE
-	fi
-}
-
-configure_mcpd_snooping() {
-	local protocol="$1"
-	local exceptions
-	local filter_ip=""
-	local fast_leave=0
-
-	# Configure snooping related params
-	if [ "$protocol" == "igmp" ]; then
-		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
-		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
-		config_snooping_upstream_interface "$igmp_s_iface"
-		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
-		exceptions=$igmp_s_exceptions
-		fast_leave=$igmp_s_fast_leave
-	elif [ "$protocol" == "mld" ]; then
-		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
-		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
-		config_snooping_upstream_interface "$mld_s_iface"
-		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
-		exceptions=$mld_s_exceptions
-		fast_leave=$mld_s_fast_leave
-	fi
-
-	echo "${protocol}-proxy-enable 0" >> $CONFFILE
-	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
-
-	if [ -n "$exceptions" ]; then
-		IFS=" "
-		for excp in $exceptions; do
-			case $excp in
-			*/*)
-				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
-				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
-				filter_ip="$filter_ip $tmp/$tmp1"
-				;;
-			*)
-				filter_ip="$filter_ip $excp"
-				;;
-			esac
-		done
-		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
-	fi
-}
-
-configure_mcpd_proxy() {
-	local protocol="$1"
-	local fast_leave=0
-	local exceptions=""
-
-	# Configure snooping related params
-	if [ "$protocol" == "igmp" ]; then
-		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_p_mode
-		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
-		config_mcast_proxy_interface $protocol "$igmp_p_up_interfaces"
-		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $igmp_p_mode
-		fast_leave=$igmp_fast_leave
-		exceptions=$igmp_p_exceptions
-	elif [ "$protocol" == "mld" ]; then
-		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_p_mode
-		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
-		config_mcast_proxy_interface $protocol "$mld_p_up_interfaces"
-		config_snooping_on_bridge $protocol $mld_p_down_interfaces $mld_p_mode
-		fast_leave=$mld_fast_leave
-		exceptions=$mld_p_exceptions
-	fi
-
-	# This function will only be hit in case proxy is enabled, so hard coding
-	# proxy enable should not be a problem
-	echo "${protocol}-proxy-enable 1" >> $CONFFILE
-	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
-
-	if [ -n "$exceptions" ]; then
-		IFS=" "
-		for excp in $exceptions; do
-			case $excp in
-			*/*)
-				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
-				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
-				filter_ip="$filter_ip $tmp/$tmp1"
-				;;
-			*)
-				filter_ip="$filter_ip $excp"
-				;;
-			esac
-		done
-		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
-	fi
-}
-
-disable_snooping() {
-	local bcm_mcast_p=$1
-
-	for br in $(brctl show | grep 'br-' | awk '{print$1}' | tr '\n' ' '); do
-		bcmmcastctl mode -i $br -p $bcm_mcast_p -m 0 # disable snooping on all bridges
-	done
-}
-
-configure_mcpd() {
-	disable_snooping 1
-	disable_snooping 2
-
-	# BCM's mcpd does not allow configuration of proxy and L2 snooping simultaneously, hence
-	# here, if proxy is to be configured then the configuration params of snooping are ignored.
-	if [ "$igmp_p_enable" == "1" ]; then
-		configure_mcpd_proxy igmp
-	elif [ "$igmp_s_enable" == "1" ]; then
-		configure_mcpd_snooping igmp
-	fi
-
-	proxdevs=""
-	if [ "$mld_p_enable" == "1" ]; then
-		configure_mcpd_proxy mld
-	elif [ "$mld_s_enable" == "1" ]; then
-		configure_mcpd_snooping mld
-	fi
-}
-
-setup_mcast_mode() {
-	# set the mode at chip to allow both tagged and untagged multicast forwarding
-	bs /b/c iptv lookup_method=group_ip_src_ip
-}
-
-configure_mcast() {
-	rm -f $CONFFILE
-	touch $CONFFILE
-
-	# mcpd internally writes max_groups and max_msf, no need to modify
-	# here directly
-	config_global_params
-
-	read_mcast_snooping_params
-	read_mcast_proxy_params
-
-	configure_mcpd
-}

mcastmngr/files/common/lib/mcast/common.sh

@@ -1,182 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-include /lib/network
-
-
-# Parameters available in snooping configuration
-igmp_s_enable=0
-igmp_s_version=2
-igmp_s_query_interval=125
-igmp_s_q_resp_interval=100
-igmp_s_last_mem_q_int=10
-igmp_s_fast_leave=1
-igmp_s_robustness=2
-igmp_s_mode=0
-igmp_s_iface=""
-igmp_s_exceptions=""
-
-mld_s_enable=0
-mld_s_version=2
-mld_s_robustness=2
-mld_s_mode=0
-mld_s_iface=""
-mld_s_exceptions=""
-
-# Global params
-max_groups=25
-max_msf=10
-max_members=25
-mldv1_unsolicited_report_interval=10
-mldv2_unsolicited_report_interval=1
-
-# Parameters available in proxy configuration
-igmp_p_enable=0
-igmp_p_version=2
-igmp_query_interval=125
-igmp_q_resp_interval=100
-igmp_last_mem_q_int=10
-igmp_fast_leave=1
-igmp_p_robustness=2
-igmp_p_mode=0
-igmp_p_up_interfaces=""
-igmp_p_down_interfaces=""
-igmp_p_exceptions=""
-
-mld_p_enable=0
-mld_p_version=1
-mld_query_interval=125
-mld_q_resp_interval=100
-mld_last_mem_q_int=10
-mld_fast_leave=1
-mld_p_robustness=2
-mld_p_mode=0
-mld_p_up_interfaces=""
-mld_p_down_interfaces=""
-mld_p_exceptions=""
-
-read_snooping() {
-	local config="$1"
-	local sec_enable
-	local proto
-
-	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
-
-	if [ "$sec_enable" == "0" ]; then
-		return
-	fi
-
-	if [ "$proto" == "igmp" ]; then
-		igmp_s_enable=$sec_enable
-		config_get igmp_s_version "$config" version 2
-		config_get igmp_s_query_interval "$config" query_interval 125
-		config_get igmp_s_q_resp_interval "$config" query_response_interval 100
-		config_get igmp_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get igmp_s_fast_leave "$config" fast_leave 1
-		config_get igmp_s_robustness "$config" robustness 2
-		config_get igmp_s_mode "$config" snooping_mode 0
-		config_get igmp_s_iface "$config" interface
-		config_get igmp_s_exceptions "$config" filter
-		return
-	fi
-
-	if [ "$proto" == "mld" ]; then
-		mld_s_enable=$sec_enable
-		config_get mld_s_version "$config" version 2
-		config_get mld_s_query_interval "$config" query_interval 125
-		config_get mld_s_q_resp_interval "$config" query_response_interval 100
-		config_get mld_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get mld_s_fast_leave "$config" fast_leave 1
-		config_get mld_s_robustness "$config" robustness 2
-		config_get mld_s_mode "$config" snooping_mode 0
-		config_get mld_s_iface "$config" interface
-		config_get mld_s_exceptions "$config" filter
-		return
-	fi
-}
-
-read_proxy() {
-	local config="$1"
-	local sec_enable
-	local proto
-
-	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
-
-	if [ "$sec_enable" == "0" ]; then
-		return
-	fi
-
-	if [ "$proto" == "igmp" ]; then
-		igmp_p_enable=$sec_enable
-		config_get igmp_p_version "$config" version 2
-		config_get igmp_query_interval "$config" query_interval 125
-		config_get igmp_q_resp_interval "$config" query_response_interval 100
-		config_get igmp_last_mem_q_int "$config" last_member_query_interval 10
-		config_get igmp_fast_leave "$config" fast_leave 1
-		config_get igmp_p_robustness "$config" robustness 2
-		config_get igmp_p_mode "$config" snooping_mode 0
-		config_get igmp_p_up_interfaces "$config" upstream_interface
-		config_get igmp_p_down_interfaces "$config" downstream_interface
-		config_get igmp_p_exceptions "$config" filter
-		return
-	fi
-
-	if [ "$proto" == "mld" ]; then
-		mld_p_enable=$sec_enable
-		config_get mld_p_version "$config" version 2
-		config_get mld_query_interval "$config" query_interval 125
-		config_get mld_q_resp_interval "$config" query_response_interval 100
-		config_get mld_last_mem_q_int "$config" last_member_query_interval 10
-		config_get mld_fast_leave "$config" fast_leave 1
-		config_get mld_p_robustness "$config" robustness 2
-		config_get mld_p_mode "$config" snooping_mode 0
-		config_get mld_p_up_interfaces "$config" upstream_interface
-		config_get mld_p_down_interfaces "$config" downstream_interface
-		config_get mld_p_exceptions "$config" filter
-		return
-	fi
-}
-
-read_mcast_snooping_params() {
-	config_load mcast
-	config_foreach read_snooping snooping
-}
-
-read_mcast_proxy_params() {
-	config_load mcast
-	config_foreach read_proxy proxy
-}
-
-config_global_params() {
-	local igmp_qrv
-	local igmp_force_version
-	local mld_qrv
-	local mld_force_version
-
-	config_load mcast
-	config_get max_msf igmp max_msf 10
-	config_get max_groups igmp max_membership 25
-	config_get igmp_qrv igmp qrv 2
-	config_get igmp_force_version igmp force_version 0
-
-	config_get mld_qrv mld qrv 2
-	config_get mldv1_unsolicited_report_interval mld mldv1_unsolicited_report_interval 10
-	config_get mldv2_unsolicited_report_interval mld mldv2_unsolicited_report_interval 1
-	config_get mld_force_version mld force_version 0
-
-	if [ "$1" == "set_max_groups_and_sources" ]; then
-		echo $max_groups > /proc/sys/net/ipv4/igmp_max_memberships
-		echo $max_msf > /proc/sys/net/ipv4/igmp_max_msf
-		echo $max_msf > /proc/sys/net/ipv6/mld_max_msf
-	fi
-	echo $igmp_qrv > /proc/sys/net/ipv4/igmp_qrv
-	echo $igmp_force_version > /proc/sys/net/ipv4/conf/all/force_igmp_version
-
-	echo $mld_qrv >  /proc/sys/net/ipv6/mld_qrv
-	echo $mld_force_version > /proc/sys/net/ipv6/conf/all/force_mld_version
-	echo $mldv1_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv1_unsolicited_report_interval
-	echo $mldv2_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv2_unsolicited_report_interval
-}

mcastmngr/files/common/usr/libexec/rpcd/mcast

@@ -1,142 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-
-read_mcast_stats() {
-	cat /proc/net/igmp_snooping > /tmp/igmp_stats
-	local mcast_addrs=""
-	local ifaces=""
-
-	while read line; do
-	# reading each line
-		case $line in
-		br-*)
-			found_iface=0
-			snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-			if [ -z "$ifaces" ]; then
-				ifaces="$snoop_iface"
-				continue
-			fi
-
-			IFS=" "
-			for ifx in $ifaces; do
-				if [ $ifx == $snoop_iface ]; then
-					found_iface=1
-					break
-				fi
-			done
-
-			if [ $found_iface -eq 0 ]; then
-				ifaces="$ifaces $snoop_iface"
-				continue
-			fi
-			;;
-		esac
-	done < /tmp/igmp_stats
-
-	while read line; do
-	# reading each line
-		case $line in
-		br-*)
-			found_ip=0
-			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
-			if [ -z "$mcast_addrs" ]; then
-				mcast_addrs="$grp_ip"
-				continue
-			fi
-
-			IFS=" "
-			for ip_addr in $mcast_addrs; do
-				if [ $ip_addr == $grp_ip ]; then
-					found_ip=1
-					break
-				fi
-			done
-
-			if [ $found_ip -eq 0 ]; then
-				mcast_addrs="$mcast_addrs $grp_ip"
-				continue
-			fi
-			;;
-		esac
-	done < /tmp/igmp_stats
-
-	json_init
-	json_add_array "snooping"
-	json_add_object ""
-	IFS=" "
-	for intf in $ifaces; do
-		while read line; do
-		# reading each line
-			case $line in
-			br-*)
-				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-				if [ "$snoop_iface" != "$intf" ]; then
-					continue
-				fi
-				json_add_string "interface" "$intf"
-				json_add_array "groups"
-				break
-				;;
-			esac
-		done < /tmp/igmp_stats
-		IFS=" "
-		for gip_addr in $mcast_addrs; do
-			grp_obj_added=0
-			while read line; do
-			# reading each line
-				case $line in
-				br-*)
-					snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-					if [ "$snoop_iface" != "$intf" ]; then
-						continue
-					fi
-					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
-					if [ "$grp_ip" != "$gip_addr" ]; then
-						continue
-					fi
-					if [ $grp_obj_added -eq 0 ]; then
-						json_add_object ""
-						gip="$(ipcalc.sh $gip_addr | grep IP | awk '{print substr($0,4)}')"
-						json_add_string "groupaddr" "$gip"
-						json_add_array "clients"
-						grp_obj_added=1
-					fi
-
-					json_add_object ""
-					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
-					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
-					json_add_string "ipaddr" "$h_ip"
-					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
-					json_add_string "device" "$src_port"
-					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
-					json_add_int "timeout" "$timeout"
-					json_close_object #close the associated device object
-					;;
-				esac
-			done < /tmp/igmp_stats
-			json_close_array #close the associated devices array
-			json_close_object # close the groups object
-		done # close the loop for group addresses
-		json_close_array #close the groups array
-	done # close the loop for interfaces
-	json_close_object # close the snooping object
-	json_close_array # close the snooping array
-	json_dump
-
-	rm -f /tmp/igmp_stats
-}
-
-case "$1" in
-	list)
-		echo '{ "stats":{} }'
-		;;
-	call)
-		case "$2" in
-			stats)
-				read_mcast_stats
-				;;
-		esac
-		;;
-esac

mcastmngr/files/etc/init.d/mcast

@@ -14,36 +14,15 @@ service_triggers() {
 	procd_add_reload_trigger network $NAME
 }
 
-start_mcast_service() {
-	local param=$@
-
-	procd_open_instance
-
-	procd_set_param command "${PROG_EXE}"
-	if [ -n "${param}" ]; then
-		procd_append_param command ${param}
-	fi
-	procd_set_param respawn
-
-	procd_close_instance
-}
-
 start_service() {
 	if [ -f "/etc/config/mcast" ]; then
 		configure_mcast
 	fi
 
-	if [ -z "${PROG_PARAMS}" ]; then
-		start_mcast_service
-		return
-	fi
-
-	local prev_IFS="${IFS}"
-	IFS=${PROG_PARAMS_SEPARATOR}
-	for param in ${PROG_PARAMS}; do
-		IFS="${prev_IFS}"
-		start_mcast_service ${param}
-	done
+	procd_open_instance
+	procd_set_param command "$PROG_EXE"
+	procd_set_param respawn
+	procd_close_instance
 }
 
 boot() {
@@ -52,10 +31,11 @@ boot() {
 }
 
 stop_service() {
-	service_stop "${PROG_EXE}"
+	service_stop $PROG_EXE
 }
 
 reload_service() {
 	stop
 	start
 }
+

mcastmngr/files/etc/uci-defaults/61-mcast_config_generate

@@ -43,27 +43,6 @@ generate_mcast_config(){
 	done
 
 	uci add_list mcast.@proxy[-1].filter="239.0.0.0/8"
-
-
-	uci add mcast proxy
-	uci rename mcast.@proxy[-1]="mc_proxy_MLD"
-	uci set mcast.@proxy[-1].enable="1"
-	uci set mcast.@proxy[-1].proto="mld"
-	uci set mcast.@proxy[-1].version="1"
-	uci set mcast.@proxy[-1].robustness="2"
-	uci set mcast.@proxy[-1].query_interval="125"
-	uci set mcast.@proxy[-1].query_response_interval="100"
-	uci set mcast.@proxy[-1].last_member_query_interval="10"
-	uci set mcast.@proxy[-1].fast_leave="1"
-	uci set mcast.@proxy[-1].snooping_mode="2"
-	uci add_list mcast.@proxy[-1].downstream_interface="br-lan"
-
-	IFS=" "
-	for itf in $up_itf; do
-		uci add_list mcast.@proxy[-1].upstream_interface="$itf"
-	done
-
-
 	uci commit mcast
 }
 

mcastmngr/files/lib/mcast/broadcom.sh

@@ -0,0 +1,547 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+include /lib/network
+
+CONFFILE=/var/mcpd.conf
+PROG_EXE=/usr/sbin/mcpd
+
+# Parameters available in snooping configuration
+igmp_s_enable=0
+igmp_s_version=2
+igmp_s_query_interval=125
+igmp_s_q_resp_interval=100
+igmp_s_last_mem_q_int=10
+igmp_s_fast_leave=1
+igmp_s_robustness=2
+igmp_s_mode=0
+igmp_s_iface=""
+igmp_s_exceptions=""
+
+mld_s_enable=0
+mld_s_version=2
+mld_s_robustness=2
+mld_s_mode=0
+mld_s_iface=""
+mld_s_exceptions=""
+
+# Global params
+max_groups=25
+max_msf=10
+max_members=25
+mldv1_unsolicited_report_interval=10
+mldv2_unsolicited_report_interval=1
+
+# Parameters available in proxy configuration
+igmp_p_enable=0
+igmp_p_version=2
+igmp_query_interval=125
+igmp_q_resp_interval=100
+igmp_last_mem_q_int=10
+igmp_fast_leave=1
+igmp_p_robustness=2
+igmp_p_mode=0
+igmp_p_up_interfaces=""
+igmp_p_down_interfaces=""
+igmp_p_exceptions=""
+
+mld_p_enable=0
+mld_p_version=1
+mld_query_interval=125
+mld_q_resp_interval=100
+mld_last_mem_q_int=10
+mld_fast_leave=1
+mld_p_robustness=2
+mld_p_mode=0
+mld_p_up_interfaces=""
+mld_p_down_interfaces=""
+mld_p_exceptions=""
+
+proxdevs=""
+ethwan="$(db -q get hw.board.ethernetWanPort)"
+
+read_snooping() {
+	local config="$1"
+	local sec_enable
+	local proto
+
+	config_get sec_enable "$config" enable 0
+	config_get proto "$config" proto
+
+	if [ "$sec_enable" == "0" ]; then
+		return
+	fi
+
+	if [ "$proto" == "igmp" ]; then
+		igmp_s_enable=$sec_enable
+		config_get igmp_s_version "$config" version 2
+		config_get igmp_s_query_interval "$config" query_interval 125
+		config_get igmp_s_q_resp_interval "$config" query_response_interval 100
+		config_get igmp_s_last_mem_q_int "$config" last_member_query_interval 10
+		config_get igmp_s_fast_leave "$config" fast_leave 1
+		config_get igmp_s_robustness "$config" robustness 2
+		config_get igmp_s_mode "$config" snooping_mode 0
+		config_get igmp_s_iface "$config" interface
+		config_get igmp_s_exceptions "$config" filter
+		return
+	fi
+
+	if [ "$proto" == "mld" ]; then
+		mld_s_enable=$sec_enable
+		config_get mld_s_version "$config" version 2
+		config_get mld_s_query_interval "$config" query_interval 125
+		config_get mld_s_q_resp_interval "$config" query_response_interval 100
+		config_get mld_s_last_mem_q_int "$config" last_member_query_interval 10
+		config_get mld_s_fast_leave "$config" fast_leave 1
+		config_get mld_s_robustness "$config" robustness 2
+		config_get mld_s_mode "$config" snooping_mode 0
+		config_get mld_s_iface "$config" interface
+		config_get mld_s_exceptions "$config" filter
+		return
+	fi
+}
+
+read_proxy() {
+	local config="$1"
+	local sec_enable
+	local proto
+
+	config_get sec_enable "$config" enable 0
+	config_get proto "$config" proto
+
+	if [ "$sec_enable" == "0" ]; then
+		return
+	fi
+
+	if [ "$proto" == "igmp" ]; then
+		igmp_p_enable=$sec_enable
+		config_get igmp_p_version "$config" version 2
+		config_get igmp_query_interval "$config" query_interval 125
+		config_get igmp_q_resp_interval "$config" query_response_interval 100
+		config_get igmp_last_mem_q_int "$config" last_member_query_interval 10
+		config_get igmp_fast_leave "$config" fast_leave 1
+		config_get igmp_p_robustness "$config" robustness 2
+		config_get igmp_p_mode "$config" snooping_mode 0
+		config_get igmp_p_up_interfaces "$config" upstream_interface
+		config_get igmp_p_down_interfaces "$config" downstream_interface
+		config_get igmp_p_exceptions "$config" filter
+		return
+	fi
+
+	if [ "$proto" == "mld" ]; then
+		mld_p_enable=$sec_enable
+		config_get mld_p_version "$config" version 2
+		config_get mld_query_interval "$config" query_interval 125
+		config_get mld_q_resp_interval "$config" query_response_interval 100
+		config_get mld_last_mem_q_int "$config" last_member_query_interval 10
+		config_get mld_fast_leave "$config" fast_leave 1
+		config_get mld_p_robustness "$config" robustness 2
+		config_get mld_p_mode "$config" snooping_mode 0
+		config_get mld_p_up_interfaces "$config" upstream_interface
+		config_get mld_p_down_interfaces "$config" downstream_interface
+		config_get mld_p_exceptions "$config" filter
+		return
+	fi
+}
+
+config_snooping_common_params() {
+	local protocol="$1"
+	echo "${protocol}-default-version $2" >> $CONFFILE
+	echo "${protocol}-robustness-value $3" >> $CONFFILE
+	echo "${protocol}-max-groups $max_groups" >> $CONFFILE 
+	echo "${protocol}-max-sources $max_msf" >> $CONFFILE
+	echo "${protocol}-max-members $max_members" >> $CONFFILE
+	echo "${protocol}-snooping-enable $4" >> $CONFFILE
+}
+
+config_mcast_querier_params() {
+	local protocol="$1"
+	local query_interval=$2
+	local q_resp_interval=$3
+	local last_mem_q_int=$4
+
+	echo "${protocol}-query-interval $query_interval" >> $CONFFILE
+	echo "${protocol}-query-response-interval $q_resp_interval" >> $CONFFILE
+	echo "${protocol}-last-member-query-interval $last_mem_q_int" >> $CONFFILE
+}
+
+config_snooping_upstream_interface() {
+	local snooping_upstream_intf=""
+
+	json_load "$(devstatus $1)"
+	logger -t "mcastconf" "$(devstatus $1)"
+	itr=1
+	json_select bridge-members
+
+	# loop over the bridge and find the device on wan port
+	while json_get_var dev $itr; do
+		case "$dev" in
+			*.*)
+				port="$(echo "$dev" | cut -d'.' -f 1)"
+				if [ $port == $ethwan ]; then
+					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
+				fi
+				;;
+		esac
+		itr=$(($itr + 1))
+	done
+	json_select ..
+
+	# if none of the bridge members are on wan port, set the wan port itself
+	if [ -n "$snooping_upstream_intf" ]; then
+		echo "upstream-interface $snooping_upstream_intf" >>$CONFFILE
+	else
+		echo "upstream-interface $ethwan" >>$CONFFILE
+	fi
+}
+
+config_snooping_on_bridge() {
+	local protocol="$1"
+	local bcm_mcast_p=1
+	echo "${protocol}-snooping-interfaces $2" >> $CONFFILE
+
+	[ "$protocol" == "mld" ] && bcm_mcast_p=2
+
+	for snpif in $2; do
+		case "$snpif" in
+			br-*)
+				# set snooping mode on the bridge
+				bcmmcastctl mode -i $snpif -p $bcm_mcast_p -m $3
+			;;
+		esac
+	done
+}
+
+config_mcast_proxy_interface() {
+	local itr
+	local p1="$1"
+	local p_enable
+
+	if [ "$p1" == "igmp" ]; then
+		p_enable=$igmp_p_enable
+	else
+		p_enable=$mld_p_enable
+	fi
+
+	for proxif in $2; do
+		case "$proxif" in
+			br-*)
+				proxdevs="$proxdevs $proxif"
+				echo "upstream-interface $proxif" >>$CONFFILE
+			;;
+			*)
+				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
+			;;
+		esac
+	done
+
+	if [ $p_enable -eq 1 ]; then
+		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
+	fi
+
+	# if proxdevs is empty set the wan port as mcast-interface
+	if [ -n "$proxdevs" ]; then
+		echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
+	else
+		echo "${p1}-mcast-interfaces $ethwan" >> $CONFFILE
+	fi
+}
+
+configure_mcpd_snooping() {
+	local protocol="$1"
+	local exceptions
+	local filter_ip=""
+	local fast_leave=0
+	
+	# Configure snooping related params
+	if [ "$protocol" == "igmp" ]; then
+		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
+		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
+		config_snooping_upstream_interface "$igmp_s_iface"
+		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
+		exceptions=$igmp_s_exceptions
+		fast_leave=$igmp_s_fast_leave
+	elif [ "$protocol" == "mld" ]; then
+		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
+		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
+		config_snooping_upstream_interface "$mld_s_iface"
+		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
+		exceptions=$mld_s_exceptions
+		fast_leave=$mld_s_fast_leave
+	fi
+
+	echo "${protocol}-proxy-enable 0" >> $CONFFILE
+	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
+
+	if [ -n "$exceptions" ]; then
+		IFS=" "
+		for excp in $exceptions; do
+			case $excp in
+			*/*)
+				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
+				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
+				filter_ip="$filter_ip $tmp/$tmp1"
+				;;
+			*)
+				filter_ip="$filter_ip $excp"
+				;;
+			esac
+		done
+		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
+	fi
+}
+
+configure_mcpd_proxy() {
+	local protocol="$1"
+	local fast_leave=0
+	local exceptions=""
+
+	# Configure snooping related params
+	if [ "$protocol" == "igmp" ]; then
+		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_p_mode
+		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
+		config_mcast_proxy_interface $protocol "$igmp_p_up_interfaces"
+		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $igmp_p_mode
+		fast_leave=$igmp_fast_leave
+		exceptions=$igmp_p_exceptions
+	elif [ "$protocol" == "mld" ]; then
+		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_p_mode
+		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
+		config_mcast_proxy_interface $protocol "$mld_p_up_interfaces"
+		config_snooping_on_bridge $protocol $mld_p_down_interfaces $mld_p_mode
+		fast_leave=$mld_fast_leave
+		exceptions=$mld_p_exceptions
+	fi
+
+	# This function will only be hit in case proxy is enabled, so hard coding
+	# proxy enable should not be a problem
+	echo "${protocol}-proxy-enable 1" >> $CONFFILE
+	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
+
+	if [ -n "$exceptions" ]; then
+		IFS=" "
+		for excp in $exceptions; do
+			case $excp in
+			*/*)
+				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
+				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
+				filter_ip="$filter_ip $tmp/$tmp1"
+				;;
+			*)
+				filter_ip="$filter_ip $excp"
+				;;
+			esac
+		done
+		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
+	fi
+}
+
+disable_snooping() {
+	local bcm_mcast_p=$1
+
+	for br in $(brctl show | grep 'br-' | awk '{print$1}' | tr '\n' ' '); do
+		bcmmcastctl mode -i $br -p $bcm_mcast_p -m 0 # disable snooping on all bridges
+	done
+}
+
+configure_mcpd() {
+	disable_snooping 1
+	disable_snooping 2
+
+	# BCM's mcpd does not allow configuration of proxy and L2 snooping simultaneously, hence
+	# here, if proxy is to be configured then the configuration params of snooping are ignored.
+	if [ "$igmp_p_enable" == "1" ]; then
+		configure_mcpd_proxy igmp
+	elif [ "$igmp_s_enable" == "1" ]; then
+		configure_mcpd_snooping igmp
+	fi
+
+	proxdevs=""
+	if [ "$mld_p_enable" == "1" ]; then
+		configure_mcpd_proxy mld
+	elif [ "$mld_s_enable" == "1" ]; then
+		configure_mcpd_snooping mld
+	fi
+}
+
+read_mcast_snooping_params() {
+	config_load mcast
+	config_foreach read_snooping snooping
+}
+
+read_mcast_proxy_params() {
+	config_load mcast
+	config_foreach read_proxy proxy
+}
+
+config_global_params() {
+	local igmp_qrv
+	local igmp_force_version
+	local mld_qrv
+	local mld_force_version
+
+	config_load mcast
+	config_get max_msf igmp max_msf 10
+	config_get max_groups igmp max_membership 25
+	config_get igmp_qrv igmp qrv 2
+	config_get igmp_force_version igmp force_version 0
+
+	config_get mld_qrv mld qrv 2
+	config_get mldv1_unsolicited_report_interval mld mldv1_unsolicited_report_interval 10
+	config_get mldv2_unsolicited_report_interval mld mldv2_unsolicited_report_interval 1
+	config_get mld_force_version mld force_version 0
+
+	# mcpd internally writes max_groups and max_msf, no need to modify
+	# here directly
+	echo $igmp_qrv > /proc/sys/net/ipv4/igmp_qrv
+	echo $igmp_force_version > /proc/sys/net/ipv4/conf/all/force_igmp_version
+
+	echo $mld_qrv >  /proc/sys/net/ipv6/mld_qrv
+	echo $mld_force_version > /proc/sys/net/ipv6/conf/all/force_mld_version
+	echo $mldv1_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv1_unsolicited_report_interval
+	echo $mldv2_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv2_unsolicited_report_interval
+}
+
+setup_mcast_mode() {
+	# set the mode at chip to allow both tagged and untagged multicast forwarding
+	bs /b/c iptv lookup_method=group_ip_src_ip
+}
+
+configure_mcast() {
+	rm -f $CONFFILE
+	touch $CONFFILE
+
+	config_global_params
+
+	read_mcast_snooping_params
+	read_mcast_proxy_params
+
+	configure_mcpd
+}
+
+read_mcast_stats() {
+	cat /proc/net/igmp_snooping > /tmp/igmp_stats
+	local mcast_addrs=""
+	local ifaces=""
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_iface=0
+			snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+			if [ -z "$ifaces" ]; then
+				ifaces="$snoop_iface"
+				continue
+			fi
+
+			IFS=" "
+			for ifx in $ifaces; do
+				if [ $ifx == $snoop_iface ]; then
+					found_iface=1
+					break
+				fi
+			done
+
+			if [ $found_iface -eq 0 ]; then
+				ifaces="$ifaces $snoop_iface"
+				continue
+			fi
+			;;
+		esac
+	done < /tmp/igmp_stats
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_ip=0
+			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
+			if [ -z "$mcast_addrs" ]; then
+				mcast_addrs="$grp_ip"
+				continue
+			fi
+
+			IFS=" "
+			for ip_addr in $mcast_addrs; do
+				if [ $ip_addr == $grp_ip ]; then
+					found_ip=1
+					break
+				fi
+			done
+
+			if [ $found_ip -eq 0 ]; then
+				mcast_addrs="$mcast_addrs $grp_ip"
+				continue
+			fi
+			;;
+		esac
+	done < /tmp/igmp_stats
+
+	json_init
+	json_add_array "snooping"
+	json_add_object ""
+	IFS=" "
+	for intf in $ifaces; do
+		while read line; do
+		# reading each line
+			case $line in
+			br-*)
+				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+				if [ "$snoop_iface" != "$intf" ]; then
+					continue
+				fi
+				json_add_string "interface" "$intf"
+				json_add_array "groups"
+				break
+				;;
+			esac
+		done < /tmp/igmp_stats
+		IFS=" "
+		for gip_addr in $mcast_addrs; do
+			grp_obj_added=0
+			while read line; do
+			# reading each line
+				case $line in
+				br-*)
+					snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+					if [ "$snoop_iface" != "$intf" ]; then
+						continue
+					fi
+					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
+					if [ "$grp_ip" != "$gip_addr" ]; then
+						continue
+					fi
+					if [ $grp_obj_added -eq 0 ]; then
+						json_add_object ""
+						gip="$(ipcalc.sh $gip_addr | grep IP | awk '{print substr($0,4)}')"
+						json_add_string "groupaddr" "$gip"
+						json_add_array "clients"
+						grp_obj_added=1
+					fi
+
+					json_add_object ""
+					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
+					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
+					json_add_string "ipaddr" "$h_ip"
+					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
+					json_add_string "device" "$src_port"
+					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
+					json_add_int "timeout" "$timeout"
+					json_close_object #close the associated device object
+					;;
+				esac
+			done < /tmp/igmp_stats
+			json_close_array #close the associated devices array
+			json_close_object # close the groups object
+		done # close the loop for group addresses
+		json_close_array #close the groups array
+	done # close the loop for interfaces
+	json_close_object # close the snooping object
+	json_close_array # close the snooping array
+	json_dump
+
+	rm -f /tmp/igmp_stats
+}

mcastmngr/files/linux/etc/firewall.mcast

@@ -1,2 +0,0 @@
-# Forward multicast packets from wan to lan
-iptables -t filter -A zone_wan_forward -p udp -d 224.0.0.0/240.0.0.0 -m comment --comment "!fw3: Allow-Multicast-UDP" -j zone_lan_dest_ACCEPT

mcastmngr/files/linux/etc/uci-defaults/60-mcast_config_generate

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-# Add firewall include instance
-uci -q batch <<-EOT
-	delete firewall.mcast
-	set firewall.mcast=include
-	set firewall.mcast.path=/etc/firewall.mcast
-	set firewall.mcast.reload=1
-	commit firewall
-EOT

mcastmngr/files/linux/lib/mcast/linux.sh

@@ -1,149 +0,0 @@
-#!/bin/sh
-
-. /lib/mcast/common.sh
-
-include /lib/network
-
-CONFFILE=
-PROG_EXE=/usr/sbin/mcproxy
-PROG_PARAMS=
-PROG_PARAMS_SEPARATOR=:
-
-setup_mcast_mode() {
-	 unused(){ :;}
-}
-
-config_mcproxy_interfaces() {
-	local upstreams="$1"
-	local downstreams="$2"
-	local exceptions="$3"
-
-	local str_up=""
-	if [ -n "$upstreams" ]; then
-		for upstream in $upstreams; do
-			str_up="$str_up \"$upstream\""
-		done
-	fi
-
-	local str_down=""
-	if [ -n "$downstreams" ]; then
-		for downstream in $downstreams; do
-			str_down="$str_down \"$downstream\""
-		done
-	fi
-
-	if [ ! -z $downstream ]; then
-		echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
-	fi
-
-
-	if [ -z "$exceptions" ] || [ -z "$upstreams" ]; then
-		return
-	fi
-
-	for upstream in $upstreams; do
-		local filter=""
-		for excp in $exceptions; do
-			case $excp in
-			*/*)
-				ip_start="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
-				ip_end="$(ipcalc.sh $excp | grep BROADCAST | awk '{print substr($0,11)}')"
-				filter="$filter ($ip_start - $ip_end | *)"
-				;;
-			*)
-				filter="$filter ($excp | *)"
-				;;
-			esac
-		done
-		echo "pinstance main upstream \"$upstream\" in blacklist table{$filter };" >> $CONFFILE
-		echo "pinstance main upstream \"$upstream\" out blacklist table{$filter };" >> $CONFFILE
-	done
-}
-
-config_mcproxy_instance() {
-	local protocol="$1"
-	local version="$2"
-
-	local robustness=
-	local query_interval=
-	local q_resp_interval=
-	local last_mem_q_int=
-	local fast_leave=0
-	local exceptions=
-	local upstreams=
-	local downstreams=
-
-	CONFFILE=/var/etc/mcproxy_"$protocol".conf
-	rm -f $CONFFILE
-	touch $CONFFILE
-
-	if [ "$protocol" == "igmp" ]; then
-		case "$version" in
-			[1-3])
-				echo -e "protocol IGMPv${version};\n" >> $CONFFILE
-				;;
-			*)
-				echo -e "protocol IGMPv2;\n" >> $CONFFILE
-				;;
-		esac
-
-		robustness=$igmp_p_robustness
-		query_interval=$igmp_query_interval
-		q_resp_interval=$igmp_q_resp_interval
-		last_mem_q_int=$igmp_last_mem_q_int
-		fast_leave=$igmp_fast_leave
-		exceptions=$igmp_p_exceptions
-
-		upstreams=$igmp_p_up_interfaces
-		downstreams=$igmp_p_down_interfaces
-	elif [ "$protocol" == "mld" ]; then
-		case "$version" in
-			[1-2])
-				echo -e "protocol MLDv${version};\n" >> $CONFFILE
-				;;
-			*)
-				echo -e "protocol MLDv2;\n" >> $CONFFILE
-				;;
-		esac
-
-		robustness=$mld_p_robustness
-		query_interval=$mld_query_interval
-		q_resp_interval=$mld_q_resp_interval
-		last_mem_q_int=$mld_last_mem_q_int
-		fast_leave=$mld_fast_leave
-		exceptions=$mld_p_exceptions
-
-		upstreams=$mld_p_up_interfaces
-		downstreams=$mld_p_down_interfaces
-	fi
-
-	[ -n "$robustness" ] && echo -e "rv $robustness;" >> $CONFFILE
-	[ -n "$query_interval" ] && echo -e "qi $query_interval;" >> $CONFFILE
-	[ -n "$q_resp_interval" ] && echo -e "qri $q_resp_interval;" >> $CONFFILE
-	[ -n "$last_mem_q_int" ] && echo -e "lmqi $last_mem_q_int;" >> $CONFFILE
-	[ -n "$fast_leave" ] && echo -e "fastleave $fast_leave;\n" >> $CONFFILE
-
-	[ -n "$upstreams" ] && [ -n "$downstreams" ] &&
-		config_mcproxy_interfaces "$upstreams" "$downstreams" "$exceptions"
-
-	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
-}
-
-config_mcproxy() {
-	if [ "$igmp_p_enable" == "1" ]; then
-		config_mcproxy_instance igmp "$igmp_p_version"
-	fi
-
-	if [ "$mld_p_enable" == "1" ]; then
-		config_mcproxy_instance mld "$mld_p_version"
-	fi
-}
-
-configure_mcast() {
-	config_global_params "set_max_groups_and_sources"
-
-	read_mcast_snooping_params
-	read_mcast_proxy_params
-
-	config_mcproxy
-}

mcastmngr/files/usr/libexec/rpcd/mcast

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+include /lib/mcast
+
+case "$1" in
+	list)
+		echo '{ "stats":{} }'
+		;;
+	call)
+		case "$2" in
+			stats)
+				read_mcast_stats
+				;;
+		esac
+		;;
+esac

obudpst/Makefile

@@ -6,22 +6,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obudpst
-PKG_VERSION:=7.5.1
+PKG_VERSION:=7.2.1
+PKG_SOURCE_VERSION:=9c448095c9773bd7e5cea143af07817ad9f3c6ba
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/BroadbandForum/obudpst.git
-PKG_SOURCE_VERSION:=a8faf1925ea9189467e7f8d3b9d93c67c8b927bd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-CMAKE_OPTIONS += -DDISABLE_INT_TIMER=ON
-
 define Package/obudpst
 	CATEGORY:=Utilities
 	DEPENDS+=+libopenssl
@@ -42,10 +39,4 @@ define Package/obudpst/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/udpst $(1)/usr/sbin/udpst
 endef
 
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/obudpst
-	$(CP) $(HOST_BUILD_DIR)/udpst $(STAGING_DIR_HOST)/obudpst/
-endef
-
-$(eval $(call HostBuild))
 $(eval $(call BuildPackage,obudpst))

obuspa/Config.in

@@ -20,7 +20,7 @@ config OBUSPA_MTP_ENABLE_STOMP
 
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
-	default y
+	default n
 
 config OBUSPA_CONTROLLER_MTP_VERIFY
 	bool "Enable verification of MQTT response topic before processing the message"

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.0.6
+PKG_VERSION:=5.0.0.21
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
-PKG_SOURCE_VERSION:=0a2a3481dddea672a2b12d1fcaa689d7fa761fe3
+PKG_SOURCE_VERSION:=c71da7f9b66f4d7fd240e6eb7078044c6b43b72b
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -91,7 +91,6 @@ endif
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
-        $(Build/Patch)
 endef
 endif
 
@@ -110,7 +109,6 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/50-add-mqtt-usp-test $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,8 +1,8 @@
 config obuspa 'global'
 	option enabled '1'
-	option debug '0'
+	option debug '1'
 	option log_level '1'
-	option prototrace '0'
+	option prototrace '1'
 	option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
@@ -11,22 +11,54 @@ config obuspa 'global'
 	#option log_dest '/var/log/obuspa'
 
 # Adds Device.LocalAgent.MTP.
-config mtp 'test_mtp'
+config mtp 'agent_mtp'
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
-	option mqtt 'testmqtt'
+	option mqtt 'localmqtt'
 
 # Adds Device.MQTT.Client.
-config mqtt 'testmqtt'
+config mqtt 'localmqtt'
 	option BrokerAddress '127.0.0.1'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
 # Adds Device.LocalAgent.Controller.
-config controller 'testcontroller'
+config controller 'localcontroller'
 	option EndpointID 'proto::interop-usp-controller'
 	option Protocol 'MQTT'
 	option Topic '/usp/controller'
-	option mqtt 'testmqtt'
+	option mqtt 'localmqtt'
 	option assigned_role_name 'full_access'
 
+# Add Device.LocalAgent.Subscription.
+#config subscription 'sub_event'
+#    option ID 'uci-sub-events'
+#    option NotifType 'Event'
+#    list ReferenceList 'Device.Boot!'
+#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
+#    option Persistent 'true'
+#    option controller 'localcontroller'
+
+#config subscription 'sub_op_comp'
+#   option ID 'uci-sub-op_complete'
+#   option NotifType 'OperationComplete'
+#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
+#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
+#   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 'YWRtaW4='
+#	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 'dXNlcg=='
+#	option Retries 3
+#	option LockoutPeriod 30

obuspa/files/etc/init.d/obuspa

@@ -1,14 +1,14 @@
 #!/bin/sh /etc/rc.common
 
 START=99
-STOP=02
+STOP=2
 USE_PROCD=1
 
 PROG=/usr/sbin/obuspa
 CONFIGURATION=obuspa
 
 ENV_PROFILE="/root/.profile"
-KEEP_FILE="/lib/upgrade/keep.d/obuspa"
+KEEP_FILES="/lib/upgrade/keep.d/obuspa"
 
 RESET_FILE="/tmp/obuspa/obuspa_param_reset.txt"
 SQL_DB_FILE="/tmp/obuspa/usp.db"
@@ -59,17 +59,6 @@ db_set_sql()
 	fi
 }
 
-db_del_sql()
-{
-	local param
-
-	param="${1}"
-
-	if [ -n "${param}" ]; then
-		${PROG} -f ${SQL_DB_FILE} -c dbdel "${param}" >/dev/null 2>&1
-	fi
-}
-
 db_set()
 {
 	# if sql db present, update sql db
@@ -81,14 +70,6 @@ db_set()
 	fi
 }
 
-update_db_dump()
-{
-	if [ -f "${DB_DUMP}" ]; then
-		rm ${DB_DUMP}
-		${PROG} -f ${SQL_DB_FILE} -c show database |sort > ${DB_DUMP}
-	fi
-}
-
 # if db present then check if it matches with existing instances
 # fallback to max instance present + 1
 # In case of no db get the count
@@ -131,8 +112,8 @@ get_refrence_path()
 	value="${2}"
 	path=""
 
-	if [ -f "${DB_DUMP}" ]; then
-		path=$(grep "${dmref}\d.Alias " ${DB_DUMP}|grep -w "${value}")
+	if [ -f "${SQL_DB_FILE}" ]; then
+		path=$(${PROG} -f ${SQL_DB_FILE} -c show database |grep "${dmref}\d.Alias "|grep -w "${value}")
 	elif [ -f "${RESET_FILE}" ]; then
 		path=$(grep "${dmref}\d.Alias " ${RESET_FILE}|grep -w "${value}")
 	fi
@@ -142,18 +123,14 @@ get_refrence_path()
 
 update_keep()
 {
-	file=${1}
+	keep_file=${1}
 
-	if [ -z "${file}" ]; then
+	if [ -z "${keep_file}" ]; then
 		return;
 	fi
 
-	if [ ! -f "${KEEP_FILE}" ]; then
-		touch "${KEEP_FILE}"
-	fi
-
-	if ! grep -q "${file}" ${KEEP_FILE}; then
-		echo "${file}" >> ${KEEP_FILE}
+	if ! grep -q "${keep_file}" ${KEEP_FILES}; then
+		echo "${keep_file}" >> ${KEEP_FILES}
 	fi
 }
 
@@ -223,15 +200,13 @@ validate_controller_section()
 		'Enable:bool:1' \
 		'EndpointID:string' \
 		'assigned_role_name:string' \
-		'AssignedRole:string' \
 		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
 		'Destination:string' \
 		'Topic:string' \
 		'ParameterName:list(string)' \
-		'Reference:string' \
 		'mqtt:string' \
 		'stomp:string' \
-		'Host:string' \
+		'Host:host' \
 		'Port:port' \
 		'Path:string' \
 		'EnableEncryption:bool'
@@ -243,7 +218,7 @@ validate_subscription_section()
 		'Enable:bool:1' \
 		'NotifType:or("ValueChange","ObjectCreation","ObjectDeletion","OperationComplete","Event")' \
 		'ReferenceList:list(string)' \
-		'Recipient:string' \
+		'Persistent:bool:1' \
 		'controller:string'
 }
 
@@ -258,7 +233,6 @@ validate_mtp_section()
 		'Path:string' \
 		'mqtt:string' \
 		'stomp:string' \
-		'Reference:string' \
 		'EnableEncryption:bool'
 }
 
@@ -266,7 +240,7 @@ validate_stomp_connection_section()
 {
 	uci_validate_section ${CONFIGURATION} stomp "${1}" \
 		'Enable:bool:1' \
-		'Host:string' \
+		'Host:host' \
 		'Port:port:61613' \
 		'Username:string' \
 		'Password:string' \
@@ -279,7 +253,7 @@ validate_mqtt_client_section()
 {
 	uci_validate_section ${CONFIGURATION} mqtt "${1}" \
 		'Enable:bool:1' \
-		'BrokerAddress:string' \
+		'BrokerAddress:host' \
 		'BrokerPort:port:1883' \
 		'Username:string' \
 		'Password:string' \
@@ -314,7 +288,8 @@ publish_endpoint()
 {
 	local AgentEndpointID serial oui user pass
 
-	if ! uci -q get obuspa.testmqtt; then
+	if ! uci -q get obuspa.localmqtt; then
+		log "Remote mqtt broker configured, skip publishing endpoint"
 		return 0;
 	fi
 
@@ -330,11 +305,11 @@ publish_endpoint()
 	if [ -z "${AgentEndpointID}" ]; then
 		serial=$(get_serial_from_db)
 		oui=$(get_oui_from_db)
-		AgentEndpointID="os::${oui}-${serial//+/%2B}"
+		AgentEndpointID="os::${oui}-${serial}"
 	fi
 
-	config_get user testmqtt Username
-	config_get pass testmqtt Password
+	config_get user localmqtt Username
+	config_get pass localmqtt Password
 
 	# publish Agent's EndpointID in mosquito broker for discovery by usp-js
 	# This is a work around till obuspa adds supports for mDNS discovery
@@ -360,7 +335,6 @@ configure_localagent()
 	}
 
 	db_set Device.LocalAgent.EndpointID "${EndpointID}"
-	update_db_dump
 }
 
 update_reset_reason()
@@ -376,18 +350,16 @@ configure_controller()
 {
 	local EndpointID Enable 
 	local Protocol Destination
-	local Topic mqtt stomp assigned_role_name AssignedRole ParameterName
-	local Host Port Path EnableEncryption Reference
-	local dm_ref sec
+	local Topic mqtt stomp assigned_role_name ParameterName
+	local Host Port Path EnableEncryption
+	local dm_ref
 
-	sec="${1}"
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
 		return 1;
 	}
 
-	sec="${sec/controller_/cpe-}"
-	get_base_path "Device.LocalAgent.Controller." "${sec}"
+	get_base_path "Device.LocalAgent.Controller." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -399,30 +371,21 @@ configure_controller()
 	fi
 
 	dm_ref=""
-	if [ -z "${Reference}" ]; then
-		if [ "${Protocol}" = "STOMP" ]; then
-			stomp="${stomp/stomp_/cpe-}"
-			dm_ref=$(get_refrence_path "Device.STOMP.Connection." "${stomp}")
-		elif [ "${Protocol}" = "MQTT" ]; then
-			mqtt="${mqtt/mqtt_/cpe-}"
-			dm_ref=$(get_refrence_path "Device.MQTT.Client." "${mqtt}")
-		fi
-	else
-		dm_ref="${Reference}"
+	if [ "${Protocol}" = "STOMP" ]; then
+		dm_ref=$(get_refrence_path "Device.STOMP.Connection." "uci-${stomp}")
+	elif [ "${Protocol}" = "MQTT" ]; then
+		dm_ref=$(get_refrence_path "Device.MQTT.Client." "uci-${mqtt}")
 	fi
 
-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.EndpointID" "${EndpointID}"
 	if [ -n "${assigned_role_name}" ]; then
 		AssignedRole=$(get_role_index "${assigned_role_name}")
-	fi
-
-	if [ -n "${AssignedRole}" ]; then
 		db_set "${BASEPATH}.AssignedRole" "${AssignedRole}"
 	fi
 
-	db_set "${BASEPATH}.MTP.1.Alias" "${sec}"
+	db_set "${BASEPATH}.MTP.1.Alias" "uci-${1}"
 	db_set "${BASEPATH}.MTP.1.Enable" "${Enable}"
 	db_set "${BASEPATH}.MTP.1.Protocol" "${Protocol}"
 	# only support configuration of one mtp path per controller using uci
@@ -449,41 +412,36 @@ configure_controller()
 
 	for param in ${ParameterName}
 	do
-		db_set "${BASEPATH}.BootParameter.${_pnum}.Alias" "${sec}_boot_${_pnum}"
+		db_set "${BASEPATH}.BootParameter.${_pnum}.Alias" "uci-${1}-${_pnum}"
 		db_set "${BASEPATH}.BootParameter.${_pnum}.Enable" "${Enable}"
 		db_set "${BASEPATH}.BootParameter.${_pnum}.ParameterName" "${param}"
 		_pnum=$(( _pnum + 1 ))
 	done
 
 	db_set
-	update_db_dump
 }
 
 configure_subscription()
 {
-	local Enable NotifType ReferenceList controller
+	local Enable NotifType ReferenceList Persistent controller
 	local dm_ref
-	local sec
 
-	sec="${1}"
 	validate_subscription_section "${1}" || {
 		log "Validation of subscription section failed"
 		return 1;
 	}
 
-	sec="${sec/sub_/cpe-}"
-	get_base_path "Device.LocalAgent.Subscription." "sub_${1}"
+	get_base_path "Device.LocalAgent.Subscription." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
 	fi
 
 	if [ -n "${controller}" ]; then
-		controller="${controller/controller_/cpe-}"
-		dm_ref=$(get_refrence_path "Device.LocalAgent.Controller." "${controller}")
+		dm_ref=$(get_refrence_path "Device.LocalAgent.Controller." "uci-${controller}")
 	fi
 
-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.ID" "uci-${1}"
 	db_set "${BASEPATH}.CreationDate" "$(date -I'seconds')"
 	db_set "${BASEPATH}.Enable" "${Enable}"
@@ -492,10 +450,8 @@ configure_subscription()
 		ReferenceList=${ReferenceList// /,}
 		db_set "${BASEPATH}.ReferenceList" "${ReferenceList}"
 	fi
-	db_set "${BASEPATH}.Persistent" "1"
+	db_set "${BASEPATH}.Persistent" "${Persistent}"
 	db_set "${BASEPATH}.Recipient" "${dm_ref}"
-	# Entry updated in db, remove uci entry
-	uci_remove obuspa "${1}"
 }
 
 check_json_load()
@@ -532,7 +488,8 @@ get_role_index()
 	 *)
 		local ji=0
 
-		if check_json_load; then
+		check_json_load
+		if [ "$?" -eq "0" ]; then
 			ji=$(get_role_index_from_json "${role_name}" "${role_def_file}")
 		fi
 		idx=$(( ji + 2 )) # Add predefined roles
@@ -544,16 +501,13 @@ get_role_index()
 configure_challenges()
 {
 	local Enable Description role_name Role Value Retries LockoutPeriod
-	local sec
 
-	sec="${1}"
 	validate_challenge_section "${1}" || {
 		log "Validation of challenge section failed"
 		exit 1;
 	}
 
-	sec="${sec/challenge_/cpe-}"
-	get_base_path "Device.LocalAgent.ControllerTrust.Challenge." "${sec}"
+	get_base_path "Device.LocalAgent.ControllerTrust.Challenge." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -564,7 +518,7 @@ configure_challenges()
 		return 1;
 	fi
 
-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.Description" "${Description}"
 
@@ -576,22 +530,19 @@ configure_challenges()
 	db_set "${BASEPATH}.Value" "${Value}"
 	db_set "${BASEPATH}.Retries" "${Retries}"
 	db_set "${BASEPATH}.LockoutPeriod" "${LockoutPeriod}"
-	# Entry updated in db, remove uci entry
-	uci_remove obuspa "${1}"
 }
 
 configure_mtp() {
 	local Enable Protocol ResponseTopicConfigured
 	local Path Port EnableEncryption
-	local stomp mqtt dm_ref sec
+	local stomp mqtt dm_ref
 
-	sec="${1}"
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
 		return 1;
 	}
-	sec="${sec/mtp_/cpe-}"
-	get_base_path "Device.LocalAgent.MTP." "${sec}"
+
+	get_base_path "Device.LocalAgent.MTP." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -603,19 +554,13 @@ configure_mtp() {
 	fi
 
 	dm_ref=""
-	if [ -z "${Reference}" ]; then
-		if [ "${Protocol}" = "STOMP" ]; then
-			stomp="${stomp/stomp_/cpe-}"
-			dm_ref=$(get_refrence_path "Device.STOMP.Connection." "${stomp}")
-		elif [ "${Protocol}" = "MQTT" ]; then
-			mqtt="${mqtt/mqtt_/cpe-}"
-			dm_ref=$(get_refrence_path "Device.MQTT.Client." "${mqtt}")
-		fi
-	else
-		dm_ref="${Reference}"
+	if [ "${Protocol}" = "STOMP" ]; then
+		dm_ref=$(get_refrence_path "Device.STOMP.Connection." "uci-${stomp}")
+	elif [ "${Protocol}" = "MQTT" ]; then
+		dm_ref=$(get_refrence_path "Device.MQTT.Client." "uci-${mqtt}")
 	fi
 
-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.Protocol" "${Protocol}"
 	if [ "${Protocol}" = "MQTT" ]; then
@@ -633,28 +578,24 @@ configure_mtp() {
 		db_set "${BASEPATH}.WebSocket.EnableEncryption" "${EnableEncryption}"
 	fi
 	db_set
-	update_db_dump
 }
 
 configure_stomp_connection() {
 	local Host Username Password Enable Port VirtualHost
 	local EnableEncryption EnableHeartbeats
-	local sec
 
-	sec="${1}"
 	validate_stomp_connection_section "${1}" || {
 		log "Validation of stomp section failed"
 		return 1;
 	}
 
-	sec="${sec/stomp_/cpe-}"
-	get_base_path "Device.STOMP.Connection." "${sec}"
+	get_base_path "Device.STOMP.Connection." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
 	fi
 
-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Host" "${Host}"
 	db_set "${BASEPATH}.Username" "${Username}"
 	db_set "${BASEPATH}.Password" "${Password}"
@@ -665,28 +606,24 @@ configure_stomp_connection() {
 	db_set "${BASEPATH}.EnableHeartbeats" "${EnableHeartbeats}"
 	db_set "${BASEPATH}.VirtualHost" "${VirtualHost}"
 	db_set
-	update_db_dump
 }
 
-configure_mqtt_client() {
+configure_mqtt_client(){
 	local BrokerAddress BrokerPort Enable Username Password ProtocolVersion
 	local TransportProtocol ClientID
-	local sec
 
-	sec="${1}"
 	validate_mqtt_client_section "${1}" || {
 		log "Validation of mqtt section failed"
 		return 1;
 	}
 
-	sec="${sec/mqtt_/cpe-}"
-	get_base_path "Device.MQTT.Client." "${sec}"
+	get_base_path "Device.MQTT.Client." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
 	fi
 
-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.BrokerAddress" "${BrokerAddress}"
 	db_set "${BASEPATH}.BrokerPort" "${BrokerPort}"
@@ -697,7 +634,6 @@ configure_mqtt_client() {
 	db_set "${BASEPATH}.ClientID" "${ClientID}"
 
 	db_set
-	update_db_dump
 }
 
 
@@ -769,277 +705,21 @@ configure_obuspa() {
 	fi
 }
 
-get_instances_from_db_dump()
-{
-	local obj inst
-
-	obj="${1}\d"
-	if [ ! -f "${DB_DUMP}" ]; then
-		echo ""
-		return 0;
-	fi
-
-	inst="$(grep -oe "${obj}" "${DB_DUMP}"|uniq)"
-	echo "$inst"
-}
-
-get_param_value_from_dump()
-{
-	local param value
-
-	param="${1}"
-
-	if [ -z "${param}" ] || [ ! -f "${DB_DUMP}" ]; then
-		log "error getting param"
-		echo ""
-		return 0
-	fi
-
-	value="$(grep "^${param} " ${DB_DUMP}|awk '{print $3}')"
-
-	echo "$value"
-}
-
-update_uci_sec()
-{
-	local sec tmp
-
-	sec="${1}"
-	stype="${2}"
-	if [ -z "$sec" ] || [ -z "$stype" ]; then
-		log "No section name, error"
-		return 0
-	fi
-
-	tmp="$(uci_get obuspa "${sec}")"
-	if [ "$tmp" != "$stype" ]; then
-		uci_add obuspa "${stype}" "${sec}"
-	fi
-}
-
-sync_db_controller()
-{
-	local cntrs copts sec pvalue protocol
-
-	copts="Enable EndpointID AssignedRole"
-	popts="Destination Topic Reference Host Port Path EnableEncryption"
-
-	cntrs="$(get_instances_from_db_dump Device.LocalAgent.Controller.)"
-	for cntr in $cntrs; do
-		sec="$(get_param_value_from_dump "${cntr}".Alias)"
-		sec="${sec/cpe-/controller_}"
-		sec="${sec/-/_}"
-
-		update_uci_sec "${sec}" controller
-		for param in ${copts}; do
-			pvalue="$(get_param_value_from_dump "${cntr}"."${param}")"
-			uci_set obuspa "${sec}" "${param}" "${pvalue}"
-		done
-		uci_set obuspa "${sec}" "_sync" "1"
-
-		protocol="$(get_param_value_from_dump "${cntr}".MTP.1.Protocol)"
-		if [ -z "${protocol}" ]; then
-			break;
-		fi
-		uci_set obuspa "${sec}" "Protocol" "${protocol}"
-		for param in ${popts}; do
-			pvalue="$(get_param_value_from_dump "${cntr}".MTP.1."${protocol}"."${param}")"
-			uci_set obuspa "${sec}" "${param}" "${pvalue}"
-		done
-	done
-}
-
-sync_db_localagent_mtp()
-{
-	local mtps opts popts sec pvalue protocol
-
-	opts="Enable"
-	popts="ResponseTopicConfigured Destination Port Path Reference EnableEncryption"
-	ropts="mqtt stomp"
-
-	mtps="$(get_instances_from_db_dump Device.LocalAgent.MTP.)"
-	for inst in $mtps; do
-		sec="$(get_param_value_from_dump "${inst}".Alias)"
-		sec="${sec/cpe-/mtp_}"
-		sec="${sec/-/_}"
-		update_uci_sec "${sec}" mtp
-		for param in ${opts}; do
-			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
-			uci_set obuspa "${sec}" "${param}" "${pvalue}"
-		done
-		uci_set obuspa "${sec}" "_sync" "1"
-
-		protocol="$(get_param_value_from_dump "${inst}".Protocol)"
-		if [ -z "${protocol}" ]; then
-			break;
-		fi
-		uci_set obuspa "${sec}" "Protocol" "${protocol}"
-		for param in ${popts}; do
-			pvalue="$(get_param_value_from_dump "${inst}"."${protocol}"."${param}")"
-			uci_set obuspa "${sec}" "${param}" "${pvalue}"
-		done
-		for param in ${ropts}; do
-			uci_set obuspa "${sec}" "${param}" ""
-		done
-	done
-}
-
-
-sync_db_mqtt_client()
-{
-	local mtps copts sec pvalue protocol
-
-	opts="Enable BrokerAddress BrokerPort Username ProtocolVersion TransportProtocol ClientID"
-
-	mtps="$(get_instances_from_db_dump Device.MQTT.Client.)"
-	for inst in $mtps; do
-		sec="$(get_param_value_from_dump "${inst}".Alias)"
-		sec="${sec/cpe-/mqtt_}"
-		sec="${sec/-/_}"
-		update_uci_sec "${sec}" mqtt
-		for param in ${opts}; do
-			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
-			uci_set obuspa "${sec}" "${param}" "${pvalue}"
-		done
-		uci_set obuspa "${sec}" "_sync" "1"
-	done
-}
-
-sync_db_stomp_connection()
-{
-	local mtps copts sec pvalue protocol
-
-	opts="Enable Host Port Username EnableEncryption EnableHeartbeats VirtualHost"
-
-	mtps="$(get_instances_from_db_dump Device.STOMP.Connection.)"
-	for inst in $mtps; do
-		sec="$(get_param_value_from_dump "${inst}".Alias)"
-		sec="${sec/cpe-/stomp_}"
-		sec="${sec/-/_}"
-		update_uci_sec "${sec}" stomp
-		for param in ${opts}; do
-			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
-			uci_set obuspa "${sec}" "${param}" "${pvalue}"
-		done
-		uci_set obuspa "${sec}" "_sync" "1"
-	done
-}
-
-sync_update_sec()
-{
-	local _sync
-	config_get _sync "${1}" _sync ""
-	if [ -z "${_sync}" ]; then
-		uci_remove obuspa "${1}"
-	else
-		uci_remove obuspa "${1}" _sync
-	fi
-}
-
-sync_uci_with_db()
-{
-	if [ ! -f "${DB_DUMP}" ]; then
-		return 0;
-	fi
-
-	config_load obuspa
-	sync_db_controller
-	sync_db_localagent_mtp
-	sync_db_mqtt_client
-	sync_db_stomp_connection
-	uci_commit obuspa
-
-	config_load obuspa
-	config_foreach sync_update_sec controller
-	config_foreach sync_update_sec mtp
-	config_foreach sync_update_sec mqtt
-	config_foreach sync_update_sec stomp
-	uci_commit obuspa
-}
-
-delete_sql_db_entry_with_pattern()
-{
-	local params pattern
-
-	pattern="${1}"
-	if [ ! -f "${DB_DUMP}" ]; then
-		return 0;
-	fi
-
-	if [ "${#pattern}" -lt 7 ]; then
-		return 0;
-	fi
-
-	params="$(grep "${pattern}" ${DB_DUMP}|awk '{print $1}')"
-	for p in ${params}; do
-		db_del_sql "${p}"
-	done
-}
-
-check_n_delete_db()
-{
-	local sec t r path
-
-	sec="${1}"
-	if uci -q get obuspa."${sec}" >/dev/null 2>&1; then
-		return 0
-	fi
-
-	t="${2}"
-	r="${3}"
-	sec="${sec/${t}_/cpe-}"
-
-	path=$(grep "${r}\d.Alias => ${sec}" ${DB_DUMP})
-	path=${path%.*}
-
-	delete_sql_db_entry_with_pattern "${path}"
-}
-
-reverse_update_db_with_uci()
-{
-	if [ ! -f "${DB_DUMP}" ]; then
-		return 0;
-	fi
-
-	export UCI_CONFIG_DIR="/tmp/obuspa"
-	config_load obuspa
-	config_foreach check_n_delete_db controller controller "Device.LocalAgent.Controller."
-	config_foreach check_n_delete_db mtp mtp "Device.LocalAgent.MTP."
-	config_foreach check_n_delete_db mqtt mqtt "Device.MQTT.Client."
-	config_foreach check_n_delete_db stomp stomp "Device.STOMP.Connection."
-	unset UCI_CONFIG_DIR
-}
-
 # Create factory reset file
 db_init()
 {
-	local reason
-
-	reason="${1}"
-	mkdir -p /tmp/obuspa/
 	# Load configuration
 	config_load $CONFIGURATION
 	config_get SQL_DB_FILE global db_file "/tmp/obuspa/usp.db"
 
 	# Dump datamodel parameters from DB
 	if [ -f "${SQL_DB_FILE}" ]; then
-		${PROG} -f ${SQL_DB_FILE} -c show database |sort > ${DB_DUMP}
-	fi
-
-	# Only sync uci with db in case of non service triggers
-	if [ -f "${DB_DUMP}" ] && [ "${reason}" != "update" ]; then
-		sync_uci_with_db
-	fi
-
-	# remove entries from db if deleted from uci
-	if [ -f "${DB_DUMP}" ] && [ "${reason}" = "update" ] && [ -f "/tmp/obuspa/obuspa" ]; then
-		reverse_update_db_with_uci
+		${PROG} -f ${SQL_DB_FILE} -c show database > ${DB_DUMP}
 	fi
 
 	# Remove reset file if present
 	[ -f "${RESET_FILE}" ] && rm -f ${RESET_FILE}
 
-	config_load $CONFIGURATION
 	global_init
 	config_foreach configure_localagent localagent
 	global_init
@@ -1056,9 +736,6 @@ db_init()
 	config_foreach configure_challenges challenge
 	global_init
 	update_reset_reason
-	uci_commit ${CONFIGURATION}
-
-	cp /etc/config/obuspa /tmp/obuspa/
 
 	[ -f "${DB_DUMP}" ] && rm -f ${DB_DUMP}
 
@@ -1094,7 +771,7 @@ start_service() {
 	fi
 
 	mkdir -p /tmp/obuspa/
-	db_init "${1}"
+	db_init
 	register_service
 }
 
@@ -1104,7 +781,7 @@ stop_service() {
 
 reload_service() {
 	stop
-	start update
+	start
 }
 
 service_triggers() {
@@ -1124,7 +801,7 @@ service_triggers() {
 				json_add_array
 					json_add_string "" "run_script"
 					json_add_string "" "/etc/init.d/obuspa"
-					json_add_string "" "restart"
+					json_add_string "" "reload"
 				json_close_array
 			json_close_array
 			json_add_int "" "2000"

obuspa/files/etc/obuspa/dmcaching_exclude.json

@@ -1,8 +1,7 @@
 {
   "dmcaching_exclude": [
-    "Device.InterfaceStack.",
+    "Device.DeviceInfo.ProcessStatus.Process.",
     "Device.Hosts.Host.",
-    "Device.IEEE1905.",
     "Device.WiFi.DataElements."
   ]
 }

obuspa/files/etc/uci-defaults/01-fix-upgrade-uci

@@ -5,10 +5,10 @@
 fix_stomp_section() {
 	local encryption
 
-	config_get_bool encryption "${1}" encryption ""
+	config_get_bool encryption $1 encryption ""
 	if [ -n "${encryption}" ]; then
-		uci_set obuspa "${1}" encryption ""
-		uci_set obuspa "${1}" EnableEncryption "$encryption"
+		uci_set obuspa $1 encryption ""
+		uci_set obuspa $1 EnableEncryption "$encryption"
 	fi
 }
 

obuspa/files/etc/uci-defaults/50-add-mqtt-usp-test

@@ -1,14 +0,0 @@
-add_usp_test()
-{
-        if ! uci_get mosquitto usptest >/dev/null 2>&1; then
-                uci_add mosquitto listener usptest
-                uci_set mosquitto usptest enabled 1
-                uci_set mosquitto usptest port '9001'
-                uci_set mosquitto usptest protocol 'websockets'
-                uci_set mosquitto usptest require_certificates '0'
-                uci_set mosquitto usptest auth_plugin '/usr/lib/mosquitto_auth_shadow.so'
-        fi
-}
-
-uci_load mosquitto
-add_usp_test

obuspa/patches/0002-supress-group-get-error.patch

@@ -1,49 +0,0 @@
-diff --git a/src/core/cli_server.c b/src/core/cli_server.c
-index 701cbd9..103361e 100644
---- a/src/core/cli_server.c
-+++ b/src/core/cli_server.c
-@@ -733,10 +733,6 @@ int ExecuteCli_Get(char *arg1, char *arg2, char *usage)
-             USP_ASSERT(gge->value != NULL);
-             SendCliResponse("%s => %s\n", gge->path, gge->value);
-         }
--        else
--        {
--            SendCliResponse("ERROR: %d retrieving %s (%s)\n", gge->err_code, gge->path, gge->err_msg);
--        }
-     }
- 
-     GROUP_GET_VECTOR_Destroy(&ggv);
-diff --git a/src/core/handle_get.c b/src/core/handle_get.c
-index e1055e0..16b9ceb 100755
---- a/src/core/handle_get.c
-+++ b/src/core/handle_get.c
-@@ -260,26 +260,16 @@ void FormPathExprResponse(int get_expr_index, char *path_expr, get_expr_info_t *
-         return;
-     }
- 
--    // If there was an error in getting any of the parameters associated with the path expression,
--    // then just add the first error, without any of the parameter values, for this path expression result
--    for (i=0; i < gi->num_entries; i++)
--    {
--        gge = &ggv->vector[gi->index + i];
--        if (gge->err_code != USP_ERR_OK)
--        {
--            (void)AddGetResp_ReqPathRes(resp, path_expr, gge->err_code, gge->err_msg);
--            return;
--        }
--    }
--
-     // If the code gets here, then the value of all parameters were retrieved successfully, so add their values to the result_params
-     req_path_result = AddGetResp_ReqPathRes(resp, path_expr, USP_ERR_OK, "");
-     for (i=0; i < gi->num_entries; i++)
-     {
-         gge = &ggv->vector[gi->index + i];
- 
--        // Simple format contains a resolved_path_result for every object (and sub object)
--        AddResolvedPathResult(req_path_result, gge->path, gge->value);
-+        if (gge->err_code == USP_ERR_OK) {
-+            // Simple format contains a resolved_path_result for every object (and sub object)
-+            AddResolvedPathResult(req_path_result, gge->path, gge->value);
-+	}
-     }
- }

obuspa/patches/0003-set-internal-role-fix.patch

@@ -1,43 +0,0 @@
---- a/src/core/cli_server.c
-+++ b/src/core/cli_server.c
-@@ -787,6 +787,7 @@ int ExecuteCli_Set(char *arg1, char *arg
-         goto exit;
-     }
- 
-+    SetControllerRoleForInternal();
-     // Iterate over all objects to set
-     for (i=0; i < objects.num_entries; i++)
-     {
---- a/src/core/data_model.h
-+++ b/src/core/data_model.h
-@@ -324,6 +324,7 @@ void DATA_MODEL_DumpSchema(void);
- void DATA_MODEL_DumpInstances(void);
- char DATA_MODEL_GetJSONParameterType(char *path);
- int DATA_MODEL_SetParameterInDatabase(char *path, char *value);
-+void SetControllerRoleForInternal();
- 
- int DM_PRIV_InitSetRequest(dm_req_t *req, dm_node_t *node, char *path, dm_instances_t *inst, char *new_value);
- void DM_PRIV_RequestInit(dm_req_t *req, dm_node_t *node, char *path, dm_instances_t *inst);
---- a/src/core/msg_handler.c
-+++ b/src/core/msg_handler.c
-@@ -893,6 +893,20 @@ char *MtpSendItemToString(mtp_send_item_
- 
- /*********************************************************************//**
- **
-+** SetControllerRoleForInternal
-+**
-+** Sets the role for internal user
-+**
-+**
-+**************************************************************************/
-+void SetControllerRoleForInternal()
-+{
-+    cur_msg_combined_role.inherited = kCTrustRole_Untrusted;
-+    cur_msg_combined_role.assigned = kCTrustRole_FullAccess;
-+}
-+
-+/*********************************************************************//**
-+**
- ** CacheControllerRoleForCurMsg
- **
- ** Retrieves the role to use for the specified controller, and caches it locally, so that

obuspa/patches/0004-suppress-notification-logs.patch

@@ -1,20 +0,0 @@
---- a/src/core/data_model.c
-+++ b/src/core/data_model.c
-@@ -1239,7 +1239,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
-     // Exit if instance already exists - nothing to do
-     if (exists)
-     {
--        USP_ERR_SetMessage("%s: Object (%s) already exists in the data model", __FUNCTION__, path);
-+        // USP_ERR_SetMessage("%s: Object (%s) already exists in the data model", __FUNCTION__, path);
-         return USP_ERR_CREATION_FAILURE;
-     }
- 
-@@ -1324,7 +1324,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
-     // Exit if instance does not exist - nothing to do
-     if (exists == false)
-     {
--        USP_ERR_SetMessage("%s: Object (%s) does not exist in the data model", __FUNCTION__, path);
-+        // USP_ERR_SetMessage("%s: Object (%s) does not exist in the data model", __FUNCTION__, path);
-         return USP_ERR_OBJECT_DOES_NOT_EXIST;
-     }
- 

obuspa/patches/0005-optimise_ubus_calls_cli.patch

@@ -1,22 +0,0 @@
-diff --git a/src/core/data_model.c b/src/core/data_model.c
-index 2cf4b6c..b92cf59 100644
---- a/src/core/data_model.c
-+++ b/src/core/data_model.c
-@@ -136,6 +136,7 @@ void DumpDataModelNodeMap(void);
- int GetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *buf, int len, dm_req_t *req);
- int SetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *value, dm_req_t *req);
- 
-+extern bool is_running_cli_local_command;
- /*********************************************************************//**
- **
- ** DATA_MODEL_Init
-@@ -223,7 +224,9 @@ int DATA_MODEL_Init(void)
-     }
- 
-     // Set the default values of OUI, Serial Number and (LocalAgent) EndpointID, and cache EndpointID
-+    if (is_running_cli_local_command == false) {
-     err = DEVICE_LOCAL_AGENT_SetDefaults();
-+    }
-     if (err != USP_ERR_OK)
-     {
-         return err;

owsd/Makefile

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

periodicstats/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -20,13 +20,15 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_DEPENDS:=bbf
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/periodicstats
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Periodic Statistics Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbf_api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
 define Package/periodicstats/description