ieee1905: 8.1.16

- Added option to enable PWA support
- Option to define path of PWA certificates
- Form validation fix

bbfdm/Config_bbfdm.in

@@ -10,168 +10,26 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
+config BBF_TR104
+	bool "Enable TR-104 Data Model Support"
+	default y
+
+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
+
+config BBFDM_ENABLE_DOTSO_PLUGIN
+	bool "Enable shared library plugin to extend datamodel"
+	default y
+
 config BBF_MAX_OBJECT_INSTANCES
 	int "Maximum number of instances per object"
 	default 255
-
-menu "TR181 Datamodels"
-	depends on PACKAGE_libbbfdm
-
-	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_TR181_ATM
-		bool "Include Device.ATM."
-		default y
-
-	config BBFDM_TR181_BRIDGING
-		bool "Include Device.Bridging."
-		default y
-
-	config BBFDM_TR181_DDNS
-		bool "Include Device.DynamicDNS."
-		default y
-
-	config BBFDM_TR181_DEVICEINFO
-		bool "Include Device.DeviceInfo."
-		default y
-
-	config BBFDM_TR181_DEVICEINFO_PROCESSSTATUS
-		bool "Include Device.DeviceInfo.ProcessStatus."
-		default y
-
-	config BBFDM_TR181_DHCPv4
-		bool "Include Device.DHCPv4."
-		default y
-
-	config BBFDM_TR181_DHCPv6
-		bool "Include Device.DHCPv6."
-		default y
-
-	config BBFDM_TR181_DNS
-		bool "Include Device.DNS."
-		default y
-
-	config BBFDM_TR181_DSL
-		bool "Include Device.DSL."
-		default y
-
-	config BBFDM_TR181_ETHERNET
-		bool "Include Device.Ethenet."
-		default y
-
-	config BBFDM_TR181_FAST
-		bool "Include Device.FAST."
-		default y
-
-	config BBFDM_TR181_FIREWALL
-		bool "Include Device.Firewall."
-		default y
-
-	config BBFDM_TR181_GATEWAYINFO
-		bool "Include Device.GatewayInfo."
-		default y
-
-	config BBFDM_TR181_GRE
-		bool "Include Device.GRE."
-		default y
-
-	config BBFDM_TR181_IEEE1905
-		bool "Include Device.IEEE1905."
-		default y
-
-	config BBFDM_TR181_INTERFACESTACK
-		bool "Include Device.InterfaceStack."
-		default y
-
-	config BBFDM_TR181_IP
-		bool "Include Device.IP."
-		default y
-
-	config BBFDM_TR181_LANCONFSEC
-		bool "Include Device.LANonfigSecurity."
-		default y
-
-	config BBFDM_TR181_MQTT
-		bool "Include Device.MQTT."
-		default y
-
-	config BBFDM_TR181_NAT
-		bool "Include Device.NAT."
-		default y
-
-	config BBFDM_TR181_PACKETCAPTURE
-		bool "Include Device.PacketCaptureDiagnostics."
-		default y
-
-	config BBFDM_TR181_PPP
-		bool "Include Device.PPP."
-		default y
-
-	config BBFDM_TR181_PTM
-		bool "Include Device.PTM."
-		default y
-
-	config BBFDM_TR181_QOS
-		bool "Include Device.QoS."
-		default y
-
-	config BBFDM_TR181_ROUTERADVERTISEMENT
-		bool "Include Device.RouterAdvertisement."
-		default y
-
-	config BBFDM_TR181_ROUTING
-		bool "Include Device.Routing."
-		default y
-
-	config BBFDM_TR181_SECURITY
-		bool "Include Device.Security."
-		default y
-
-	config BBFDM_TR181_SELFTEST
-		bool "Include Device.SelfTestDiagnostics."
-		default y
-
-	config BBFDM_TR181_SSH
-		bool "Include Device.SSH."
-		default y
-
-	config BBFDM_TR181_TIME
-		bool "Include Device.Time."
-		default y
-
-	config BBFDM_TR181_UPNP
-		bool "Include Device.UPnP."
-		default y
-
-	config BBFDM_TR181_USB
-		bool "Include Device.USB."
-		default y
-
-	config BBFDM_TR181_USERINTERFACE
-		bool "Include Device.UserInterface."
-		default y
-
-	config BBFDM_TR181_WIFI
-		bool "Include Device.WiFi."
-		default y
-
-	config BBFDM_TR181_WIFI_DATAELEMENTS
-		bool "Include Device.WiFi.DataElements."
-		default y
-
-	config BBFDM_TR181_WIFI_DATAELEMENTS_ASSOCEVENTS
-		bool "Include deprecated AssociationEventData/DisassociationEventData tables"
-		default n
-		help
-		  TR181-2.17 deprecates below dataelements tables
-		  - Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.
-		  - Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.
-		  If this option is selected, above mentioned tables shall be added in datamodel.
-
-endmenu

bbfdm/Makefile

@@ -5,16 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.4.23.22
+PKG_VERSION:=1.1.4
 
-USE_LOCAL:=0
-ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=73d49e600e2cdf2aadcc23133b922916c6cd8c69
+PKG_SOURCE_VERSION:=dec994de5a1338bbda82c2fb01218d70bef9b09d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -38,7 +35,6 @@ define Package/libbbfdm/default
   TITLE:=Library for broadband forum data model support
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
 	    +BBF_TR471:obudpst
-  MENU:=1
 endef
 
 define Package/libbbfdm
@@ -103,162 +99,23 @@ define Package/libbbfdm-api/description
 endef
 
 define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR143 data models
+ Library contains the data model tree. It includes TR181, TR104 and TR143 data models
 endef
 
-ifeq ($(USE_LOCAL),1)
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-	$(CP) ~/git/bbfdm/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 endif
 
 CMAKE_OPTIONS += \
-	-DBBF_TR181=ON \
-	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+	-DBBF_TR181=ON
+	-DBBF_WIFI_DATAELEMENTS=ON
 
-
-ifeq ($(CONFIG_BBFDM_TR181_ATM),y)
-TARGET_CFLAGS += -DBBFDM_TR181_ATM
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_BRIDGING),y)
-TARGET_CFLAGS += -DBBFDM_TR181_BRIDGING
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_DDNS),y)
-TARGET_CFLAGS += -DBBFDM_TR181_DDNS
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_DEVICEINFO),y)
-TARGET_CFLAGS += -DBBFDM_TR181_DEVICEINFO
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_DEVICEINFO_PROCESSSTATUS),y)
-TARGET_CFLAGS += -DBBFDM_TR181_DEVICEINFO_PROCESSSTATUS
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_DHCPv4),y)
-TARGET_CFLAGS += -DBBFDM_TR181_DHCPv4
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_DHCPv6),y)
-TARGET_CFLAGS += -DBBFDM_TR181_DHCPv6
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_DNS),y)
-TARGET_CFLAGS += -DBBFDM_TR181_DNS
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_DSL),y)
-TARGET_CFLAGS += -DBBFDM_TR181_DSL
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_ETHERNET),y)
-TARGET_CFLAGS += -DBBFDM_TR181_ETHERNET
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_FAST),y)
-TARGET_CFLAGS += -DBBFDM_TR181_FAST
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_FIREWALL),y)
-TARGET_CFLAGS += -DBBFDM_TR181_FIREWALL
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_GATEWAYINFO),y)
-TARGET_CFLAGS += -DBBFDM_TR181_GATEWAYINFO
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_GRE),y)
-TARGET_CFLAGS += -DBBFDM_TR181_GRE
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_IEEE1905),y)
-TARGET_CFLAGS += -DBBFDM_TR181_IEEE1905
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_INTERFACESTACK),y)
-TARGET_CFLAGS += -DBBFDM_TR181_INTERFACESTACK
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_IP),y)
-TARGET_CFLAGS += -DBBFDM_TR181_IP
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_LANCONFSEC),y)
-TARGET_CFLAGS += -DBBFDM_TR181_LANCONFSEC
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_MQTT),y)
-TARGET_CFLAGS += -DBBFDM_TR181_MQTT
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_NAT),y)
-TARGET_CFLAGS += -DBBFDM_TR181_NAT
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_PACKETCAPTURE),y)
-TARGET_CFLAGS += -DBBFDM_TR181_PACKETCAPTURE
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_PPP),y)
-TARGET_CFLAGS += -DBBFDM_TR181_PPP
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_PTM),y)
-TARGET_CFLAGS += -DBBFDM_TR181_PTM
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_QOS),y)
-TARGET_CFLAGS += -DBBFDM_TR181_QOS
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_ROUTERADVERTISEMENT),y)
-TARGET_CFLAGS += -DBBFDM_TR181_ROUTERADVERTISEMENT
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_ROUTING),y)
-TARGET_CFLAGS += -DBBFDM_TR181_ROUTING
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_SECURITY),y)
-TARGET_CFLAGS += -DBBFDM_TR181_SECURITY
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_SELFTEST),y)
-TARGET_CFLAGS += -DBBFDM_TR181_SELFTEST
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_SSH),y)
-TARGET_CFLAGS += -DBBFDM_TR181_SSH
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_TIME),y)
-TARGET_CFLAGS += -DBBFDM_TR181_TIME
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_UPNP),y)
-TARGET_CFLAGS += -DBBFDM_TR181_UPNP
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_USB),y)
-TARGET_CFLAGS += -DBBFDM_TR181_USB
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_USERINTERFACE),y)
-TARGET_CFLAGS += -DBBFDM_TR181_USERINTERFACE
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_WIFI),y)
-TARGET_CFLAGS += -DBBFDM_TR181_WIFI
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_WIFI_DATAELEMENTS),y)
-TARGET_CFLAGS += -DBBFDM_TR181_WIFI_DATAELEMENTS
-endif
-
-ifeq ($(CONFIG_BBFDM_TR181_WIFI_DATAELEMENTS_ASSOCEVENTS),y)
-TARGET_CFLAGS += -DBBFDM_TR181_WIFI_DATAELEMENTS_ASSOCEVENTS
+ifeq ($(CONFIG_BBF_TR104),y)
+CMAKE_OPTIONS += \
+	-DBBF_TR104=ON
 endif
 
 ifeq ($(CONFIG_BBF_TR143),y)
@@ -282,6 +139,16 @@ CMAKE_OPTIONS += \
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+CMAKE_OPTIONS += \
+	-DBBF_JSON_PLUGIN=ON
+endif
+
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+CMAKE_OPTIONS += \
+	-DBBF_DOTSO_PLUGIN=ON
+endif
+
 ifeq ($(BUILD_VARIANT),default)
 CMAKE_OPTIONS += -DWITH_OPENSSL=ON
 endif
@@ -306,29 +173,27 @@ endif
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/scripts/bbf.config $(1)/usr/libexec/rpcd/bbf.config
 endef
 
 define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
-	$(INSTALL_BIN) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/97-firewall-service
-	$(INSTALL_BIN) ./files/etc/uci-defaults/99-link-core-plugins $(1)/etc/uci-defaults/99-link-core-plugins
-	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
-	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
 ifeq ($(CONFIG_BBF_TR143),y)
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
 	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
 endif
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+endif
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+endif
 endef
 
 define Package/libbbfdm/default/prerm
@@ -343,14 +208,11 @@ define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
-	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
-	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_BIN) ./files/etc/bbfdm/bbfdm_services.sh $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
-	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_lease_start_time.user $(1)/etc/udhcpc.user.d/udhcpc_lease_start_time.user
+	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/src/bbfdmd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/json/input.json $(1)/etc/bbfdm/
 endef
 
 define Package/userinterface/install
@@ -363,7 +225,9 @@ define Package/userinterface/install
 	$(INSTALL_BIN) ./files/etc/init.d/userinterface $(1)/etc/init.d/userinterface
 	$(INSTALL_BIN) ./files/etc/uci-defaults/93-userinterface-firewall $(1)/etc/uci-defaults/93-userinterface-firewall
 	$(INSTALL_BIN) ./files/etc/uci-defaults/94-userinterface-json $(1)/etc/uci-defaults/94-userinterface-json
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
 	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
+	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
 endef
 
 Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)

bbfdm/bbfdm.mk

@@ -1,9 +0,0 @@
-#
-# Copyright (C) 2023 IOPSYS
-#
-
-
-define BbfdmInstallPlugin
-	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
-	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
-endef

bbfdm/files/etc/bbfdm/bbfdm_services.sh

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-BBFDMD="/usr/sbin/bbfdmd"
-
-bbfdm_add_service()
-{
-	local name path
-
-	name="${1}"
-	path="${2}"
-
-	if [ -z "${name}" -o -z "$path" ]; then
-		return 0;
-	fi
-
-	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path']}}}"
-}
-
-bbfdm_stop_service()
-{
-	local name
-
-	name="${1}"
-	if [ -z "${name}" ]; then
-		return 0;
-	fi
-
-	if ubus call service list '{"name":"bbfdm.services"}' |grep -q "bbfdm.$name"; then
-		ubus call service delete "{'name':'bbfdm.services','instance':'bbfdm.$name'}"
-	fi
-}
-
-usages()
-{
-	echo "Usages $0: <OPTIONS>..."
-	echo
-	echo "    -h    show help"
-	echo "    -k    micro-service name to stop"
-	echo
-}
-
-while getopts "s:k:h" opts; do
-	case "$opts" in
-		h) usages; exit 0;;
-		k) bbfdm_stop_service "${OPTARG}";;
-	esac
-done

bbfdm/files/etc/bbfdm/input.json

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

bbfdm/files/etc/config/bbfdm

@@ -2,7 +2,6 @@
 config bbfdmd 'bbfdmd'
 	option enabled '1'
 	option loglevel '1'
-	option refresh_time '120'
-	option transaction_timeout '30'
-	option subprocess_level '2'
+	option refresh_time '10'
+	option transaction_timeout '10'
 

bbfdm/files/etc/firewall.portmap

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

bbfdm/files/etc/firewall.service

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

bbfdm/files/etc/init.d/bbfdmd

@@ -1,13 +1,12 @@
 #!/bin/sh /etc/rc.common
 
-START=65
+START=96
 STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_JSON="/tmp/bbfdm/input.json"
 
 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -17,21 +16,20 @@ validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enabled:bool:true' \
-		'sock:string' \
 		'debug:bool:false' \
-		'loglevel:uinteger:1' \
-		'refresh_time:uinteger:0' \
-		'transaction_timeout:uinteger:30' \
+		'loglevel:uinteger' \
+		'sock:string' \
+		'refresh_time:uinteger' \
+		'transaction_timeout:uinteger' \
 		'subprocess_level:uinteger'
 }
 
 configure_bbfdmd()
 {
-	local enabled debug sock update
-	local jlog jrefresh jtimeout jlevel
+	local enabled debug sock
 
-	update=0
 	config_load bbfdm
+
 	validate_bbfdm_bbfdmd_section || {
 		log "Validation of bbfdmd section failed"
 		return 1;
@@ -39,8 +37,22 @@ configure_bbfdmd()
 
 	[ "${enabled}" -eq 0 ] && return 0
 
-	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > ${BBFDM_TEMP_JSON}
+	[ ! -f "${BBFDM_JSON_INPUT}" ] && return 0
+
+	if [ -n "${loglevel}" ]; then
+		echo "$(jq --arg res ${loglevel} '.daemon.config += {"loglevel": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${refresh_time}" ]; then
+		echo "$(jq --arg res ${refresh_time} '.daemon.config += {"refresh_time": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${transaction_timeout}" ]; then
+		echo "$(jq --arg res ${transaction_timeout} '.daemon.config += {"transaction_timeout": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${subprocess_level}" ]; then
+		echo "$(jq --arg res ${subprocess_level} '.daemon.config += {"subprocess_level": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
 	fi
 
 	procd_set_param command ${PROG}
@@ -56,18 +68,10 @@ configure_bbfdmd()
 
 start_service()
 {
-	mkdir -p /tmp/bbfdm
 	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn
 	procd_close_instance "bbfdm"
-
-	ubus call service state '{"name":"bbfdm.services", "spawn":true}'
-}
-
-stop_service()
-{
-	ubus call service state '{"name":"bbfdm.services", "spawn":false}'
 }
 
 service_triggers()

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

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

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

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

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

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-UNIFIED_PATH="/etc/bbfdm/plugins/"
-
-# Link JSON plugins
-for f in `ls -1 /etc/bbfdm/json/*.json`; do
-	echo "# BBFDM JSON plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-# Link DotSo plugins
-for f in `ls -1 /usr/lib/bbfdm/*.so`; do
-	echo "# BBFDM DotSO plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-exit 0
-

bbfdm/files/etc/udhcpc.user.d/udhcpc_lease_start_time.user

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-leasestarttime="$(awk -F'.' '{print $1}' /proc/uptime 2> /dev/null)"
-target_file=/tmp/dhcp_client_info
-target_str="$INTERFACE $lease $leasestarttime"
-
-# if this interface is present in file, then replace it
-if grep -q "$INTERFACE" "$target_file" 2> /dev/null; then
-	# replace the whole line if pattern matches
-	sed -i "/${INTERFACE}/c\\${target_str}" "$target_file"
-else
-	# interface info was not present, append it to the file
-	echo "$target_str" >> "$target_file"
-fi

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=f556410b51a2248f11358793f11ae54d3e53e85e
+PKG_SOURCE_VERSION:=2dd55d9c9eb01ed1b11e16bad9e2c3e8badfffeb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -43,9 +43,9 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/	
-	$(INSTALL_DIR) $(1)/etc/bulkdata
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bulkdata
+	$(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
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/bulkdata/input.json

@@ -1,15 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "JSON",
-			"name": "/etc/bulkdata/bulkdata.json"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.bulkdata",
-			"parent_dm": "Device.",
-			"object": "BulkData",
-			"root_obj": "bbfdm"
-		}
-	}
-}

bulkdata/files/etc/init.d/bulkdatad

@@ -1,13 +1,10 @@
 #!/bin/sh /etc/rc.common
 
-START=60
+START=99
 STOP=10
 
-. /etc/bbfdm/bbfdm_services.sh
-
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
-BULKDATA_JSON_INPUT="/etc/bulkdata/input.json"
 
 start_service() {
 	local enable
@@ -15,14 +12,12 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
+	procd_open_instance bulkdata
 	[ "$enable" -eq "1" ] && {
-		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
-		procd_set_param respawn
-		procd_close_instance "bulkdata"
+		procd_set_param respawn "3" "7" "0"
 	}
-
-	bbfdm_add_service "bbfdm.bulkdata" "${BULKDATA_JSON_INPUT}"
+	procd_close_instance
 }
 
 reload_service() {

capiagent/files/etc/init.d/capiagent

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

csmngr/Makefile

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

csmngr/files/etc/init.d/csmngr

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

decollector/Config.in

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

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.2.1.1.5
+PKG_VERSION:=4.0.2.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b34c94d516ee18e33fc910b8a656649541b7e8e8
+PKG_SOURCE_VERSION:=944a981d8d3f9548f464c862778b67455aee9112
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

decollector/files/decollector.init

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

dectmngr/Makefile

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

dslmngr/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2024 iopsys Software Solutions AB
+# Copyright (C) 2018 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cb8b8fd2549751bcd38808391b76a1a9a908c4de
-PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
+PKG_SOURCE_VERSION:=43dec92b1c86be7859521da337e7bd1168848b26
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -60,7 +59,7 @@ MAKE_FLAGS += \
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	rsync -r --exclude=.* ./dslmngr/ $(PKG_BUILD_DIR)/
+	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
 endef
 endif
 

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

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

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

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

ethmngr/Makefile

@@ -1,21 +1,18 @@
 #
-# Copyright (C) 2020-2024 Iopsys
+# Copyright (C) 2020 Iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.0
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5b40a8167d3e0e5c8fc9229abccd5c6acecbe814
-PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
-PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
+PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
-endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
@@ -26,7 +23,7 @@ define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/ethmngr/description
@@ -35,25 +32,24 @@ define Package/ethmngr/description
  It uses APIs from the libethernet.so library.
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
+ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_mediatek),)
 define Build/Compile
 endef
 endif
 
 define Package/ethmngr/install
-	$(CP) ./files/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
+	$(CP) ./files/common/* $(1)/
+ifneq ($(CONFIG_TARGET_brcmbca),)
+	$(CP) ./files/broadcom/* $(1)/
+else
+	$(CP) ./files/linux/* $(1)/
+endif
+ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
 endif

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

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

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

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

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

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

ethmngr/files/etc/init.d/ethmngr

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

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

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

fscryptctl/Makefile

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

hostmngr/Config.in

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

hostmngr/Makefile

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

hostmngr/files/etc/config/hosts

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

hostmngr/files/etc/firewall.hosts

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

hostmngr/files/etc/hostmngr/input.json

@@ -1,17 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/hostmngr/libhostmngr.so",
-			"plugin_dir": "/etc/hostmngr/plugins/"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.hosts",
-			"parent_dm": "Device.",
-			"object": "Hosts",
-			"root_obj": "bbfdm"
-		}
-	}
-}
-

hostmngr/files/etc/init.d/hostmngr

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

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

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

hostmngr/files/scripts/hosts_acl.sh

@@ -1,237 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-day=""
-next_days=""
-prev_days=""
-IP_RULE=""
-IP_RULE1=""
-
-get_next_day() {
-	local weekday="$1"
-	case "$weekday" in
-		"Mon"|"Monday") echo "Tuesday"
-		;;
-		"Tue"|"Tuesday") echo "Wednesday"
-		;;
-		"Wed"|"Wednesday") echo "Thursday"
-		;;
-		"Thu"|"Thursday") echo "Friday"
-		;;
-		"Fri"|"Friday") echo "Saturday"
-		;;
-		"Sat"|"Saturday") echo "Sunday"
-		;;
-		"Sun"|"Sunday") echo "Monday"
-		;;
-	esac
-}
-
-get_previous_day() {
-	local weekday="$1"
-	case "$weekday" in
-		"Mon"|"Monday") echo "Sunday"
-		;;
-		"Tue"|"Tuesday") echo "Monday"
-		;;
-		"Wed"|"Wednesday") echo "Tuesday"
-		;;
-		"Thu"|"Thursday") echo "Wednesday"
-		;;
-		"Fri"|"Friday") echo "Thursday"
-		;;
-		"Sat"|"Saturday") echo "Friday"
-		;;
-		"Sun"|"Sunday") echo "Saturday"
-		;;
-	esac
-}
-
-ip_rule_west_zone() {
-	local utc_start_t_h="$1"
-	local utc_stop_t_h="$2"
-	local local_start_t_h="$3"
-	local local_stop_t_h="$4"
-	local utc_start_time="$5"
-	local utc_stop_time="$6"
-
-	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
-		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		if [ -n "$next_days" ]; then
-			IP_RULE="$IP_RULE --weekdays $next_days"
-		fi
-	else
-		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
-			IP_RULE1="$IP_RULE"
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop 23:59"
-			IP_RULE1="$IP_RULE1 -m time --timestart 00:00 --timestop $utc_stop_time"
-			if [ -n "$next_days" ]; then
-				IP_RULE1="$IP_RULE1 --weekdays $next_days"
-			fi
-		else
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		fi
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	fi
-}
-
-ip_rule_east_zone() {
-	local utc_start_t_h="$1"
-	local utc_stop_t_h="$2"
-	local local_start_t_h="$3"
-	local local_stop_t_h="$4"
-	local utc_start_time="$5"
-	local utc_stop_time="$6"
-
-	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
-		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	else
-		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
-			IP_RULE1="$IP_RULE"
-			IP_RULE="$IP_RULE -m time --timestart 00:00 --timestop $utc_stop_time"
-			IP_RULE1="$IP_RULE1 -m time --timestart $utc_start_time --timestop 23:59"
-			if [ -n "$prev_days" ]; then
-				IP_RULE1="$IP_RULE1 --weekdays $prev_days"
-			fi
-		else
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		fi
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	fi
-}
-
-process_ac_schedule() {
-	local acs_id="$1"
-	local is_enabled
-	local access_control
-	local start_time=""
-	local mac=""
-
-
-	handle_day_list() {
-		local value=$1
-
-		val=$(echo $value | cut -c 1-3)
-		next_day_val=$(get_next_day $val)
-		prev_day_val=$(get_previous_day $val)
-		if [ -z $day ]; then
-			day="$val"
-			next_days="$next_day_val"
-			prev_days="$prev_day_val"
-		else
-			day="$day,$val"
-			next_days="$next_days,$next_day_val"
-			prev_days="$prev_days,$prev_day_val"
-		fi
-	}
-
-	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=""
-	IP_RULE1=""
-
-	config_get is_enabled "$access_control" "enable" 1
-	if [ "$is_enabled" == "0" ]; then
-		return
-	fi
-
-	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
-
-	zone=$(date +%z | cut -c 1)
-	local_start_time=$start_time
-        if [ -n "$duration" ]; then
-		hh=$(echo $local_start_time | awk -F: '{ print $1 }')
-                mm=$(echo $local_start_time | awk -F: '{ print $2 }')
-                hh_s=`expr $hh \* 3600`
-                mm_s=`expr $mm \* 60`
-                ss=$(( hh_s + mm_s ))
-		local_start_hh=$hh
-
-                stop_ss=$(( ss + duration ))
-                hh=$(( stop_ss / 3600 ))
-               	rem_ss=$(( stop_ss % 3600 ))
-               	mm=$(( rem_ss / 60 ))
-               	ss=$(( rem_ss % 60 ))
-		local_stop_time="$hh:$mm:$ss"
-		local_stop_hh=$hh
-	fi
-
-	utc_start_time=$(date -u -d @$(date "+%s" -d "$local_start_time") +%H:%M)
-	utc_stop_time=$(date -u -d @$(date "+%s" -d "$local_stop_time") +%H:%M)
-	utc_start_hh=$(echo $utc_start_time | awk -F: '{ print $1 }')
-	utc_stop_hh=$(echo $utc_stop_time | awk -F: '{ print $1 }')
-	if [ "$zone" == "-" ]; then
-		ip_rule_west_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
-	else
-		ip_rule_east_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
-	fi
-
-	if [ "$access_policy" == "Deny" ]; then
-		IP_RULE="$IP_RULE -j DROP"
-		if [ -n "$IP_RULE1" ]; then
-			IP_RULE1="$IP_RULE1 -j DROP"
-		fi
-	else
-		IP_RULE="$IP_RULE -j ACCEPT"
-		if [ -n "$IP_RULE1" ]; then
-			IP_RULE1="$IP_RULE1 -j ACCEPT"
-		fi
-	fi
-
-	iptables -w -A hosts_forward ${IP_RULE}
-	ip6tables -w -A hosts_forward ${IP_RULE}
-	if [ -n "$IP_RULE1" ]; then
-		iptables -w -A hosts_forward ${IP_RULE1}
-		ip6tables -w -A hosts_forward ${IP_RULE1}
-	fi
-
-	day=""
-	next_days=""
-	prev_days=""
-}
-
-iptables -w -F hosts_forward
-ip6tables -w -F hosts_forward
-
-hosts_ipv4_forward=$(iptables -t filter --list -n | grep hosts_forward)
-if [ -z "$hosts_ipv4_forward" ]; then
-	iptables -w -t filter -N hosts_forward
-	ret=$?
-	[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
-fi
-
-hosts_ipv6_forward=$(ip6tables -t filter --list -n | grep hosts_forward)
-if [ -z "$hosts_ipv6_forward" ]; then
-	ip6tables -w -t filter -N hosts_forward
-	ret=$?
-	[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
-fi
-
-# Load /etc/config/hosts UCI file
-config_load hosts
-config_foreach process_ac_schedule ac_schedule

icwmp/Makefile

@@ -8,23 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.29.12
+PKG_VERSION:=9.3.8
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=9c85416648a1da63c1085a5c2dc635ed13776ef2
+PKG_SOURCE_VERSION:=09b7cd7a6b647dd8cbc038698af9298883b5c262
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-include ../bbfdm/bbfdm.mk
 
 define Package/icwmp/default
   SECTION:=utils
@@ -81,9 +79,10 @@ ifeq ($(BUILD_VARIANT),mbedtls)
 CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif
 
-ifeq ($(LOCAL_DEV),1)
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -94,19 +93,21 @@ define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libcwmpdm.so $(1)/usr/lib/bbfdm/libcwmpdm.so
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
-	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
-	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
-	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
-	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libcwmpdm.so)
+	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
 endef
 
 Package/icwmp/install = $(Package/icwmp/default/install)

icwmp/files/etc/config/cwmp

@@ -11,7 +11,6 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option skip_dhcp_boot_options '0'
 
 config cpe 'cpe'
 	option enable '1'
@@ -21,7 +20,7 @@ config cpe 'cpe'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'ERROR'
+	option log_severity 'INFO'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
@@ -38,10 +37,8 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
-	option disable_gatewayinfo '0'
-	option fw_upgrade_keep_settings '1'
 	
 config lwn 'lwn'
-	option enable '0'
+	option enable '1'
 	option hostname ''
 	option port '0'

icwmp/files/etc/firewall.cwmp

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

icwmp/files/etc/icwmpd/update.sh

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

icwmp/files/etc/init.d/icwmpd

@@ -98,11 +98,7 @@ configure_send_op125() {
 	if [ "${uci}" = "network" ]; then
 		local opt125="125:00:00:0D:E9"
 	else
-		if [ -z "${sendopt}" ]; then
-			local opt125="125,00:00:0D:E9"
-		else
-			local opt125=":00:00:0D:E9"
-		fi
+		local opt125="125,00:00:0D:E9"
 	fi
 
 	config_get oui cpe manufacturer_oui ""
@@ -182,94 +178,10 @@ configure_send_op125() {
 		new_send_opt="$sendopt $opt125"
 		uci -q set network."${intf}".sendopts="$new_send_opt"
 	else
-		new_send_opt="$sendopt$opt125"
-		uci -q add_list dhcp."${intf}".dhcp_option="$new_send_opt"
+		uci -q add_list dhcp."${intf}".dhcp_option="$opt125"
 	fi
 }
 
-check_for_suboptions() {
-	# Check if option 4 and 5 present inside enterprise id 3561
-	data=$(echo "${1}" | sed 's/://g')
-	len=$(printf "${data}"|wc -c)
-
-	rem_len="${len}"
-	while [ $rem_len -gt 8 ]; do
-		subopt_present=0
-
-		ent_id="${data:0:8}"
-		ent_id=$(printf "%d\n" "0x$ent_id")
-		if [ $ent_id -ne 3561 ]; then
-			len_val=${data:8:2}
-			data_len=$(printf "%d\n" "0x$len_val")
-			# add 4 byte for ent_id and 1 byte for len
-			data_len=$(( data_len * 2 + 10 ))
-			# move ahead data to next enterprise id
-			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - data_len ))
-			continue
-		fi
-
-		# read the length of enterprise data
-		len_val=${data:8:2}
-		data_len=$(printf "%d\n" "0x$len_val")
-		# add 4 byte for ent_id and 1 byte for len
-		data_len=$(( data_len * 2 + 10 ))
-
-		len_val=${data:8:2}
-		opt_len=$(printf "%d\n" "0x$len_val")
-		if [ $opt_len -eq 0 ]; then
-			echo ${subopt_present}
-			return 0
-		fi
-
-		# populate the option data of enterprise id
-		sub_data_len=$(( opt_len * 2))
-		# starting 10 means ahead of length field
-		sub_data=${data:10:"${sub_data_len}"}
-
-		# parsing of suboption of option 125
-		while [ $sub_data_len -gt 0 ]; do
-			# get the suboption id
-			sub_opt_id=${sub_data:0:2}
-			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
-			case "${sub_opt_id}" in
-			"4") subopt_present=1
-			;;
-			"5") subopt_present=1
-			;;
-			esac
-
-			if [ ${subopt_present} -eq 1 ]; then
-				break;
-			fi
-
-			# get the length of suboption
-			sub_opt_len=${sub_data:2:2}
-			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
-			sub_opt_len=$(( sub_opt_len * 2 ))
-
-			# add 2 bytes for sub_opt id and sub_opt len field
-			sub_opt_end=$(( sub_opt_len + 4 ))
-
-			# update the remaining sub option hex string length
-			sub_data_len=$((sub_data_len - sub_opt_end))
-
-			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
-		done
-
-		if [ ${subopt_present} -eq 1 ]; then
-			break;
-		else
-			# move ahead data to next enterprise id
-			rem_len=$(( rem_len - $data_len ))
-			data=${data:"${data_len}":"${rem_len}"}
-		fi
-	done
-
-	echo ${subopt_present}
-}
-
 enable_dnsmasq_option125() {
 	local lan="${1}"
 	local send125_present=0
@@ -278,19 +190,16 @@ enable_dnsmasq_option125() {
 	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
 	if [ "${proto}" = "server" ]; then
 		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
-		base_opt=""
 
 		for sopt in $opt_list; do
 			if [[ "$sopt" == "$opt125"* ]]; then
-				send125_present=$(check_for_suboptions "${sopt:4}")
-				base_opt="${sopt}"
+				send125_present=1
 				break
 			fi
 		done
 
 		if [ ${send125_present} -eq 0 ]; then
-			uci -q del_list dhcp."${lan}".dhcp_option="${base_opt}"
-			configure_send_op125 "${base_opt}" "${lan}" "dhcp"
+			configure_send_op125 "" "${lan}" "dhcp"
 			ubus call uci commit '{"config":"dhcp"}'
 		fi
 	fi
@@ -407,7 +316,6 @@ validate_acs_section()
 		'periodic_inform_time:string' \
 		'url:string' \
 		'dhcp_discovery:string' \
-		'skip_dhcp_boot_options:bool:0' \
 		'dhcp_url:string' \
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
@@ -437,8 +345,7 @@ validate_cpe_section()
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
 		'enable:bool' \
-		'periodic_notify_interval:uinteger' \
-		'fw_upgrade_keep_settings:bool'
+		'periodic_notify_interval:uinteger'
 }
 
 validate_defaults() {
@@ -469,32 +376,33 @@ validate_defaults() {
 }
 
 boot() {
-	local dhcp_discovery wan_interface skip_dhcp_boot_options disable_gatewayinfo
+	local enable_cwmp="0"
+	local dhcp_discovery="0"
 
 	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+	local wan_interface=""
+	
 	config_get wan_interface cpe default_wan_interface "wan"
-	config_get disable_gatewayinfo cpe disable_gatewayinfo "0"
+	
+	if [ "$enable_cwmp" = "0" ]; then
+		return 0
+	fi
 
 	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get skip_dhcp_boot_options acs skip_dhcp_boot_options "0"
 
 	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
-		if [ "${skip_dhcp_boot_options}" -ne 1 ]; then
-			# Set dhcp option 43 if not already configured
-			enable_dhcp_option43 "${wan_interface}"
-			# Set dhcp option 60
-			set_vendor_id "${wan_interface}"
-		fi
+		# Set dhcp option 43 if not already configured
+		enable_dhcp_option43 "${wan_interface}"
+		# Set dhcp option 60
+		set_vendor_id "${wan_interface}"
 	fi
 
 	config_get lan_interface cpe default_lan_interface ""
 	if [ -n "${lan_interface}" ]; then
-		if [ "${disable_gatewayinfo}" -ne 1 ]; then
-			# Set dhcp_option 125 if not already configured
-			enable_dhcp_option125 "${wan_interface}"
-			enable_dnsmasq_option125 "${lan_interface}"
-		fi
+		# Set dhcp_option 125 if not already configured
+		enable_dhcp_option125 "${wan_interface}"
+		enable_dnsmasq_option125 "${lan_interface}"
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -512,35 +420,32 @@ boot() {
 }
 
 start_service() {
-	local enable_cwmp url dhcp_url
+	local enable_cwmp
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
-	config_get url acs url ""
-	config_get dhcp_url acs dhcp_url ""
-
-	procd_open_instance icwmp
 
 	if [ "$enable_cwmp" = "0" ]; then
-		procd_close_instance
 		return 0
 	fi
 
+	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
+	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
+	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
+
 	validate_defaults || {
 		log "Validation of defaults failed"
-		procd_close_instance
 		return 1;
 	}
 
-	if [ -n "${url}" ] || [ -n "${dhcp_url}" ]; then
-		procd_set_param command "$PROG"
-		procd_append_param command -b
-	fi
-
+	procd_open_instance icwmp
+	procd_set_param command "$PROG"
+	procd_append_param command -b
 	procd_set_param respawn \
 		"${respawn_threshold:-5}" \
 		"${respawn_timeout:-10}" "${respawn_retry:-3}"
 
+	procd_set_param watch network.interface
 	procd_close_instance
 }
 
@@ -555,7 +460,6 @@ reload_service() {
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
 
-	log "Reload service $ret"
 	ret="0"
 	if [ "$enable_cwmp" = "0" ]; then
 		stop
@@ -563,29 +467,38 @@ reload_service() {
 		return 0
 	fi
 
-	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
-	if [ "$ret" != "true" ]; then
-		log "Reloading cwmp service ..."
-		stop
-		start
-		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 return
-		log "Skipping ubus reload due to ubus timeout"
+		# ubus timed out may be due to uloop is busy in some task so returning
 		return 0
 	fi
 
 	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
+	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'
+		ret="$?"
+	fi
+
+	if [ "$status" = "init" ] || [ "$ret" -ne "0" ]; then
+		log "Restarting CWMP client"
+		stop
+		start
 	fi
 }
 
-service_triggers() {
-       procd_add_reload_trigger "cwmp"
+add_interface_trigger() {
+        procd_add_interface_trigger "interface.update" "$1" /etc/icwmpd/update.sh
+}
+
+service_triggers() {
+       local wan_interface
+
+       config_load cwmp
+       config_get wan_interface cpe default_wan_interface "wan"
+
+       procd_add_reload_trigger "cwmp"
+       add_interface_trigger ${default_wan_interface}
 }
 

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

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

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

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

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

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

ieee1905/Config.in

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

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.4.10
+PKG_VERSION:=8.1.16
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4231e9496e63fb6d0ab74870c06f9345b001c5bf
+PKG_SOURCE_VERSION:=4843afa0069c8eff18c6bdde6a5dd76625dc1ac5
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -89,12 +89,6 @@ ifeq ($(CONFIG_IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY),y)
 TARGET_CFLAGS += -DIEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 endif
 
-ifeq ($(CONFIG_IEEE1905_EXTENSION_ALLOWED),y)
-TARGET_CFLAGS += -DEXTENSION_ALLOWED
-endif
-
-TARGET_CFLAGS += -DHAS_UBUS
-
 MAKE_FLAGS += \
 	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
 
@@ -123,6 +117,7 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/

ieee1905/files/etc/config/ieee1905

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

ieee1905/files/etc/init.d/ieee1905

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

ieee1905/plugins/map.mk

@@ -12,11 +12,11 @@ define Package/map-plugin/config
 
 		config MULTIAP_EASYMESH_VERSION
 		int "Easymesh version"
-		default 4
+		default 2
 
 		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 		bool "Sync configuration between dynamic controllers in the network"
-		default y
+		default n
 
 		config MULTIAP_FUZZ_1905_CMDUS
 		bool "Include support to fuzz 1905 CMDUs for testing purpose"

inbd/Makefile

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

iop/config

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

iop/scripts/feeds_update.sh

@@ -4,18 +4,7 @@ function feeds_update {
 	heads=1
 	developer=0
 	override=1
-	force=1
-
-	function update_failure {
-		if [ $force == 1 ]; then
-			echo "WARNING: Failed to update feed(s). Forced update, proceeding anyway." >&2
-		else
-			echo "ERROR: Failed to update feed(s). Omit -F to proceed anyway." >&2
-			exit 1
-		fi
-	}
-
-	while getopts "inFh" opt; do
+	while getopts "inh" opt; do
 		case $opt in
 		i)
 			heads=0
@@ -23,16 +12,12 @@ function feeds_update {
 		n)
 			override=0
 			;;
-		F)
-			force=0
-			;;
 		h|\?)
-			echo "Usage: ./iop feeds_update [-i] [-n] [-F] [-h]"
+			echo "Usage: ./iop feeds_update [-i] [-n] [-h]"
 			echo
 			echo "OPTIONS:"
 			echo "  -i - Only update index. Do not change HEAD in feeds."
 			echo "  -n - Do not replace core packages with iopsys versions."
-			echo "  -F - Do not force update if there are inaccessible feeds."
 			echo "  -h - Display this help message and exit."
 			exit 1
 			;;
@@ -45,9 +30,9 @@ function feeds_update {
 
 	if [ $heads == 1 ]; then
 		if [ $developer == 1 ]; then
-			./scripts/feeds update -g || update_failure
+			./scripts/feeds update -g
 		else
-			./scripts/feeds update || update_failure
+			./scripts/feeds update
 		fi
 	fi
 	./scripts/feeds update -ai || exit 1
@@ -55,13 +40,12 @@ function feeds_update {
 	# replace core packages with iopsys versions
 	if [ $override == 1 ]; then
 		./scripts/feeds install -f -p openwrt_core -a || exit 1
-		./scripts/feeds install -f -p qualcomm -a || exit 1
 	fi
 
 	(
 		echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update'
 		echo 'FEED_DEVICES_DIRS:='
-		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h\n'
+		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h'
 	) > target/linux/feed-devices/feed-devices-list.mk || exit 1
 
 	# targets need to be installed explicitly

iop/scripts/genconfig.sh

@@ -2,7 +2,6 @@
 
 function genconfig {
 	export CLEAN=0
-	export DIRTY="--dirty"
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
@@ -17,7 +16,7 @@ function genconfig {
 	brcmbca_feed="target/linux/feeds/brcmbca"
 	airoha_feed="target/linux/feeds/airoha"
 	x86_feed="target/linux/feeds/x86"
-	armsr_feed="target/linux/feeds/armsr"
+	armvirt_feed="target/linux/feeds/armvirt"
 	mediatek_feed="target/linux/feeds/mediatek"
 	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
 	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
@@ -109,8 +108,8 @@ function genconfig {
 			airoha=$(cd $airoha_feed; ./genconfig)
 		[ -e $x86_feed/genconfig ] &&
 			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armsr_feed/genconfig ] &&
-			armsr=$(cd $armsr_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			armvirt=$(cd $armvirt_feed; ./genconfig)
 		[ -e $mediatek_feed/genconfig ] &&
 			mediatek=$(cd $mediatek_feed; ./genconfig)
 		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
@@ -119,7 +118,7 @@ function genconfig {
 			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armsr mediatek ipq95xx ipq53xx; do
+			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
 				a=$(echo "${!list}" | sort)
 				for b in $a; do
@@ -145,10 +144,10 @@ function genconfig {
 		fi
 	    done
 
-	    for p in $armsr; do
+	    for p in $armvirt; do
 		if [ $p == $profile ]; then
-		    target="armsr"
-			target_config_path="$armsr_feed/config"
+		    target="armvirt"
+			target_config_path="$armvirt_feed/config"
 		    return
 		fi
 	    done
@@ -199,7 +198,6 @@ function genconfig {
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
 		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
 		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
 		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
@@ -365,27 +363,11 @@ function genconfig {
 		    echo "" >> .config
 		fi
 		# hack to support custom-devices until we have deprecated this genconfig-script...
-		local custom_found=false
-		local used_config_file
-
-		for config_file in feeds/*/devices/$target/config/$BOARDTYPE/config; do
-			if [ "$custom_found" = "true" ]; then
-				echo
-				echo "Error was found!"
-				echo "Please use only one path."
-				echo "Two instances of $target/config/$BOARDTYPE exists:"
-				echo "Path 1: $used_config_file"
-				echo "Path 2: $config_file"
-				return 1
-			fi
-			if [ -f "$config_file" ]; then
-				cat "$config_file" >> .config
-				echo "" >> .config
-				custom_found=true
-				used_config_file=$config_file
-			fi
-		done
-
+		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
+			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
+			echo "" >> .config
+		fi
+		
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
 		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
@@ -431,19 +413,10 @@ function genconfig {
 				fi
 			done
 		fi
-		# Ensure strict file permissions, for when provided through the above
-		if [ -f "$FILEDIR/etc/shadow" ]; then
-			v "chmod 0600 $FILEDIR/etc/shadow"
-			chmod 0600 "$FILEDIR/etc/shadow"
-		fi
-		if [ -d "$FILEDIR/etc/ssl/private" ]; then
-			v "find $FILEDIR/etc/ssl/private -type d -exec chmod 0700 '{}' ';' -o -type f -exec chmod 0600 '{}' ';'"
-			find "$FILEDIR/etc/ssl/private" -type d -exec chmod 0700 '{}' ';' -o -type f -exec chmod 0600 '{}' ';'
-		fi
 
 		# Set target version
 		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+		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
@@ -510,7 +483,6 @@ function genconfig {
 			case "$1" in
 
 			-c|--clean) export CLEAN=1;;
-			-D|--no-dirty) export DIRTY="";;
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
 			-t|--target) export TARGET="$2"; shift;;

iop/scripts/genconfig_min.sh

@@ -2,7 +2,6 @@
 
 function genconfig_min {
 	export CLEAN=0
-	export DIRTY="--dirty"
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
 	CURRENT_CONFIG_FILE=".current_config_file"
@@ -16,7 +15,7 @@ function genconfig_min {
 	brcmbca_feed="target/linux/feeds/brcmbca"
 	airoha_feed="target/linux/feeds/airoha"
 	x86_feed="target/linux/feeds/x86"
-	armsr_feed="target/linux/feeds/armsr"
+	armvirt_feed="target/linux/feeds/armvirt"
 	mediatek_feed="target/linux/feeds/mediatek"
 	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
 	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
@@ -108,8 +107,8 @@ function genconfig_min {
 			airoha=$(cd $airoha_feed; ./genconfig)
 		[ -e $x86_feed/genconfig ] &&
 			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armsr_feed/genconfig ] &&
-			armsr=$(cd $armsr_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			armvirt=$(cd $armvirt_feed; ./genconfig)
 		[ -e $mediatek_feed/genconfig ] &&
 			mediatek=$(cd $mediatek_feed; ./genconfig)
 		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
@@ -118,7 +117,7 @@ function genconfig_min {
 			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armsr mediatek ipq95xx ipq53xx; do
+			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
 				a=$(echo "${!list}" | sort)
 				for b in $a; do
@@ -144,10 +143,10 @@ function genconfig_min {
 		fi
 	    done
 
-	    for p in $armsr; do
+	    for p in $armvirt; do
 		if [ $p == $profile ]; then
-		    target="armsr"
-			target_config_path="$armsr_feed/config"
+		    target="armvirt"
+			target_config_path="$armvirt_feed/config"
 		    return
 		fi
 	    done
@@ -198,7 +197,6 @@ function genconfig_min {
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
 		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
 		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
 		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
@@ -339,26 +337,10 @@ function genconfig_min {
 		    echo "" >> .config
 		fi
 		# hack to support custom-devices until we have deprecated this genconfig-script...
-		local custom_found=false
-		local used_config_file
-
-		for config_file in feeds/*/devices/$target/config/$BOARDTYPE/config; do
-			if [ "$custom_found" = "true" ]; then
-				echo
-				echo "Error was found!"
-				echo "Please use only one path."
-				echo "Two instances of $target/config/$BOARDTYPE exists:"
-				echo "Path 1: $used_config_file"
-				echo "Path 2: $config_file"
-				return 1
-			fi
-			if [ -f "$config_file" ]; then
-				cat "$config_file" >> .config
-				echo "" >> .config
-				custom_found=true
-				used_config_file=$config_file
-			fi
-		done
+		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
+			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
+			echo "" >> .config
+		fi
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
@@ -405,19 +387,10 @@ function genconfig_min {
 				fi
 			done
 		fi
-		# Ensure strict file permissions, for when provided through the above
-		if [ -f "$FILEDIR/etc/shadow" ]; then
-			v "chmod 0600 $FILEDIR/etc/shadow"
-			chmod 0600 "$FILEDIR/etc/shadow"
-		fi
-		if [ -d "$FILEDIR/etc/ssl/private" ]; then
-			v "find $FILEDIR/etc/ssl/private -type d -exec chmod 0700 '{}' ';' -o -type f -exec chmod 0600 '{}' ';'"
-			find "$FILEDIR/etc/ssl/private" -type d -exec chmod 0700 '{}' ';' -o -type f -exec chmod 0600 '{}' ';'
-		fi
 
 		# Set target version
 		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+		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
@@ -478,7 +451,6 @@ function genconfig_min {
 			case "$1" in
 
 			-c|--clean) export CLEAN=1;;
-			-D|--no-dirty) export DIRTY="";;
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
 			-t|--target) export TARGET="$2"; shift;;

iop/scripts/generate_tarballs.sh

@@ -0,0 +1,108 @@
+#!/bin/bash
+# shellcheck disable=SC2029
+
+build_bcmkernel_consumer() {
+	local tarfile bcmkernelcommith sdkversion serverpath serverlink
+
+	sdkversion="$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')"
+	sdkversion="${sdkversion:0:4}${sdkversion:(-1)}"
+	bcmkernelcommith="$(grep -w "PKG_SOURCE_VERSION:" "$curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}"*".mk" | cut -d'=' -f2)"
+
+	[ -n "$board" ] && [ -n "$bcmkernelcommith" ] || return
+
+	serverpath="$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz"
+	serverlink="$FPATH/bcmopen-$board-$majver.$minver-latest"
+
+	# do not build bcmopen sdk if it was already built before
+	# if it was, check if there's a symlink in place and create it if missing
+	ssh "$SERVER" "test -f '$serverpath' && { test -L '$serverlink' || ln -sf '$serverpath' '$serverlink'; }" && return
+
+	cd "./build_dir/target-"*"/bcmkernel-"*"-${sdkversion:0:4}"*"/bcm963xx/release"
+	bash do_consumer_release -p "$profile" -y -F
+
+	tarfile='out/bcm963xx_*_consumer.tar.gz'
+	[ $(ls -1 $tarfile | wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
+
+	scp -pv $tarfile "$SERVER":"$serverpath"
+	ssh "$SERVER" "test -f '$serverpath' && ln -sf '$serverpath' '$serverlink'"
+	rm -f $tarfile
+
+	cd "$curdir"
+}
+
+build_endptmngr_consumer() {
+	# create endptmngr open version tar file
+	local endptversion endptcommith
+	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
+	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
+	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
+	[ -n "$profile" ] && [ -n "$endptversion" ] && [ -n "$endptcommith" ] || return
+	ssh $SERVER "test -f $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
+	cd ./build_dir/target-*/endptmngr-$endptversion/
+	mkdir endptmngr-open-$endptversion
+	mkdir endptmngr-open-$endptversion/src
+	cp ./src/endptmngr endptmngr-open-$endptversion/src
+	cp -r ./files/ endptmngr-open-$endptversion/
+	tar -czv  endptmngr-open-$endptversion/ -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
+	scp -pv endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
+	cp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $curdir/
+	rm -rf endptmngr-open-$endptversion
+	rm -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
+	cd "$curdir"
+}
+
+function print_usage {
+	echo "Usage: $0 generate_tarballs"
+	echo "  -t <target>"
+}
+
+function generate_tarballs {
+
+    SERVER="god@download.iopsys.eu"
+    FPATH="/var/www/html/iopsys/opensdk"
+
+    set -e
+    git remote -v | grep -q http && return # do not continue if this is an open SDK environment
+
+    board=$(grep CONFIG_TARGET_FAMILY .config | cut -d'=' -f2 | tr -d '"')
+    profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
+    majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
+    minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
+    curdir="$PWD"
+
+
+	# Execute user command
+	while getopts "t:h" opt; do
+		case $opt in
+			t)
+				stk_target=${OPTARG}
+				;;
+			h)
+				print_usage
+				exit 1
+				;;
+			\?)
+				print_usage
+				exit 1
+				;;
+		esac
+	done
+
+	if [ -z "$stk_target" ]; then
+		print_usage
+		exit 1
+	fi
+
+	if [ "$stk_target" == "broadcom" ]; then
+		build_bcmkernel_consumer
+		build_endptmngr_consumer
+	else
+		echo "Invalid target: $stk_target"
+		print_usage
+		exit 1
+	fi
+
+}
+
+register_command "generate_tarballs" "Generate tarballs for Open SDK"
+

libdpp/Makefile

@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2020-2023 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdpp
-PKG_VERSION:=2.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22959b107a8bf443d04d6261d00074b5514dfe8
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
-PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=LGPL-2.1-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/libdpp/description
-  Library providing APIs for DPP EasyConnect frame generation and handling
-endef
-
-define Package/libdpp
-  TITLE:= DPP EasyConnect library (libdpp)
-  DEPENDS:= +libeasy +libopenssl +libgcrypt +libubox +libwifiutils
-endef
-
-MAKE_PATH:=lib
-
-
-define Build/InstallDev/libdpp
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/dpp_api.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/dpputils.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/libdpp.so* $(1)/usr/lib/
-endef
-
-
-define Build/InstallDev
-	$(call Build/InstallDev/libdpp,$(1),$(2))
-endef
-
-define Package/libdpp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libdpp.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdpp))

libdsl/Makefile

@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  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_x86),y)

libeasy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.3
+PKG_VERSION:=7.2.100
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0f16f1bd7d995427f0c4601b4e1e595224321df2
+PKG_SOURCE_VERSION:=32db1b79bd88eba85a3e7518dbbbd1e29f4b06d9
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libeasy.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -50,9 +50,6 @@ define Build/InstallDev/libeasy
 	$(CP) $(PKG_BUILD_DIR)/easy.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/event.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/bufutil.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/cryptutil.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/ecc_cryptutil.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/if_utils.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/debug.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/hlist.h $(1)/usr/include/easy/

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.109
+PKG_VERSION:=7.2.104
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cc72f5ab0171cd0fc29bb48dafff6751ab2f0d9c
+PKG_SOURCE_VERSION:=d777636ca43302a95e571ab030ec44ef50905570
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include

libqos/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libqos
-PKG_VERSION:=7.2.106
+PKG_VERSION:=7.2.101
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=02dba6571fddd9b4c5b4b671270604b4c0faf9ae
+PKG_SOURCE_VERSION:=93ca0a66d6f82bca208bbe52b75ed582b20aa094
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  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_x86),y)
@@ -38,11 +37,14 @@ else ifeq ($(CONFIG_TARGET_armvirt),y)
 else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
   TARGET_CFLAGS +=-DIOPSYS_ECONET
+else ifeq ($(CONFIG_TARGET_ipq95xx),y)
+  TARGET_PLATFORM=IPQ95XX
+  TARGET_CFLAGS +=-DIPQ95XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
-  TARGET_PLATFORM=MEDIATEK
-  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+  TARGET_PLATFORM=LINUX
+  TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
-  $(info Using default LINUX)
+  $(info Unexpected CONFIG_TARGET, use default LINUX)
   TARGET_PLATFORM=LINUX
   TARGET_CFLAGS +=-DIOPSYS_LINUX
 endif

libvoice-airoha/Makefile

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

libvoice-airoha/files/etc/uci-defaults/99-asterisk

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-hasVoice=$(db -q get hw.board.hasVoice)
-
-[ "$hasVoice" = "1" ] || { rm -f "/etc/config/asterisk"; return; }
-
-source /lib/voice/config_asterisk.sh
-
-default_asterisk_config
-
-SLIC=`cat /proc/device-tree/airoha-voice/slic-type`
-[ "${SLIC#pef}" != "${SLIC}" ] || return
-
-echo Configure TxGain and RxGain for MXL SLIC $SLIC
-
-ports=$(db -q get hw.board.VoicePorts)
-for p in $(seq 0 $((ports-1))); do
-    uci set asterisk.extension${p}.txgain='10'
-    uci set asterisk.extension${p}.rxgain='-15'
-done
-uci commit asterisk

libvoice-airoha/files/lib/voice/codecs.json

@@ -2,7 +2,7 @@
 	"ulaw": {
 		"name": "G.711MuLaw",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 64
@@ -10,7 +10,7 @@
 	"alaw": {
 		"name": "G.711ALaw",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 64
@@ -18,16 +18,15 @@
 	"g726": {
 		"name": "G.726",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
-		"bitrate": 16,
-		"rtp_payload": 80
+		"bitrate": 16
 	},
 	"g723": {
 		"name": "G.723.1",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 30,
 		"ptime_increment": 30,
 		"bitrate": 5.3
@@ -35,18 +34,26 @@
 	"g729": {
 		"name": "G.729",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 8
 	},
-	"g722": {
-		"name": "G.722",
+	"ilbc": {
+		"name": "iLBC",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
-		"ptime_increment": 10,
-		"bitrate": 64
+		"ptime_increment": 30,
+		"bitrate": 15.2
+	},
+	"gsm": {
+		"name": "AMR",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 20,
+		"bitrate": 12.2
 	}
 }
 

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.9
+PKG_VERSION:=1.0.1
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ 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:=99ed0ea5ef83cebb444d135909573ccb2b37fe45
+PKG_SOURCE_VERSION:=548f8fccc9f8f0b5dd6bb39bdd9cac8659400cb6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,7 @@ PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
 LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
 
-export BCM_CHIP_ID:=$(SUBTARGET)
+export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk
 

libvoice-broadcom/files/etc/uci-defaults/99-asterisk

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-hasVoice=$(db -q get hw.board.hasVoice)
-
-[ "$hasVoice" = "1" ] || { rm -f "/etc/config/asterisk"; return; }
-
-source /lib/voice/config_asterisk.sh
-
-default_asterisk_config
-

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.0.6
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ 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:=e6d689334000bc57498d9a3f203a8933160e1ef4
+PKG_SOURCE_VERSION:=062a265754b93a865cfcd2745f200aa09fb4a668
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.16.13
+PKG_VERSION:=7.2.107
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=38b946b847a6d8e12dbc12a2b1a8f16b9c59ae33
+PKG_SOURCE_VERSION:=1bd819ac21f86a0956b1f69ef1d110665e240a5f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -26,9 +26,8 @@ include $(INCLUDE_DIR)/package.mk
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
   TARGET_WIFI_TYPE=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  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_x86),y)
@@ -47,13 +46,9 @@ else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
   TARGET_WIFI_TYPE=QUALCOMM MAC80211
   TARGET_CFLAGS +=-DIPQ95XX
-else ifeq ($(CONFIG_TARGET_ipq53xx),y)
-  TARGET_PLATFORM=IPQ53XX
-  TARGET_WIFI_TYPE=QUALCOMM MAC80211
-  TARGET_CFLAGS +=-DIPQ53XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
   TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MEDIATEK MAC80211
+  TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
@@ -62,12 +57,6 @@ else
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-mt7915e),)
-  TARGET_CFLAGS=-DMT7915_VENDOR_EXT
-endif
-
-PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e:mt76
-
 ifneq ($(CONFIG_PACKAGE_libwifi),)
 TARGET_CFLAGS +=-DHAS_WIFI
 endif

map-agent/Config.in

@@ -8,28 +8,28 @@ config AGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 
 config AGENT_ISLAND_PREVENTION
 	bool "Support Island Prevention"
-	default y
+	default y if MULTIAP_AGENT_ISLAND_PREVENTION
 
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
 config AGENT_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 2
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
 	default y
 
 config AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	hex "Vendor OUI default"
-	default 0xB456FA
+	string
+	default "\\\\x11\\\\x22\\\\x33"
 
 config AGENT_EASYMESH_VENDOR_EXT_OUI
-	hex "Vendor OUI in 0xAABBCC format"
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base EasyMesh specification can be
+	Extra features not covered by the base Easymesh specification can be
 	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
@@ -45,18 +45,5 @@ config AGENT_LOCAL_ACS_SERVICE
 config AGENT_STRICT_OPER_CHANNEL_REPORT
 	bool "Report operation channel strictly, skip some unsolicited reports"
 
-config AGENT_WIRELESS_EXPLICIT_RELOAD
-	bool "Reload wireless after UCI commit"
-
-config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
-	bool "Use config opt to determine if Oper Channel Report CMDU is send as relayed multicast or directly to controller"
-	default y
-
-config AGENT_USE_LIBDPP
-	bool "Depend on libdpp for DPP EasyConnect"
-
-config DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER
-	bool "Let dynbhd through AP-Autoconfiguration Search and DHCP Discovery determine the controller or agent role"
-
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.0.23
+PKG_VERSION:=4.3.3.10
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=eb1138dfc1a87193a03c8e71590e4be0a466dfad
+PKG_SOURCE_VERSION:=644884a8b421fd830f793b94779876395eecd8e6
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -28,12 +28,9 @@ 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 +AGENT_USE_LIBDPP:libdpp
+	  +map-plugin +ip-bridge
 endef
 
-ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)
-  TARGET_CFLAGS += -DUSE_LIBDPP
-endif
 
 define Package/dynbhd
   SECTION:=utils
@@ -77,7 +74,7 @@ TARGET_CFLAGS += -DEASYMESH_R2_CERT
 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_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)\\\"
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 
@@ -97,18 +94,6 @@ ifeq ($(CONFIG_AGENT_STRICT_OPER_CHANNEL_REPORT),y)
 TARGET_CFLAGS += -DSTRICT_OPER_CHANNEL_REPORT
 endif
 
-ifeq ($(CONFIG_AGENT_WIRELESS_EXPLICIT_RELOAD),y)
-TARGET_CFLAGS += -DWIRELESS_EXPLICIT_RELOAD
-endif
-
-ifeq ($(CONFIG_AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST),y)
-TARGET_CFLAGS += -DOPER_CHAN_CHANGE_RELAY_MCAST
-endif
-
-ifeq ($(CONFIG_DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER),y)
-TARGET_CFLAGS += -DPERSIST_CONTROLLER
-endif
-
 MAKE_PATH:=src
 
 define Package/map-agent/install

map-agent/files/etc/config/mapagent

@@ -1,16 +1,14 @@
 config agent 'agent'
 	option enabled '1'
 	option debug '0'
-	option profile '3'
+	option profile '2'
 	option al_bridge 'br-lan'
-	option island_prevention '1'
-	option eth_onboards_wifi_bhs '1'
-	option scan_on_boot_only '0'
-	option chan_ch_relay_mcast '1'
-	option guest_isolation '1'
-	option dyn_cntlr_sync '0'
-	list map_port 'all'
+	option netdev 'wlan'
+	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'
+	list map_port 'all'
 
 config dynamic_backhaul
 	option missing_bh_timer '60'
@@ -23,9 +21,9 @@ config controller_select
 	option autostart '1'
 	option local '0'
 
-#config radio
-#	option device 'phy0'
-#	option band '2'
+config radio
+	option device 'phy0'
+	option band '2'
 # options below are auto-generated during onboarding
 #	option steer_policy '0'
 #	option util_threshold '0'
@@ -36,9 +34,9 @@ config controller_select
 #	option include_sta_stats '1'
 #	option include_sta_metric '1'
 
-#config radio
-#	option device 'phy1'
-#	option band '5'
+config radio
+	option device 'phy1'
+	option band '5'
 # options below are auto-generated during onboarding
 #	option steer_policy '0'
 #	option util_threshold '0'
@@ -49,12 +47,12 @@ config controller_select
 #	option include_sta_stats '1'
 #	option include_sta_metric '1'
 
-#config bsta
-#	option enabled '1'
-#	option ifname 'wlan0'
-#	option band '2'
-#	option device 'phy0'
-#	option priority '2'
+config bsta
+	option enabled '1'
+	option ifname 'wlan0'
+	option band '2'
+	option device 'phy0'
+	option priority '2'
 # options below are auto-generated during onboarding
 #	option ssid 'MAP-BH-2.4GHz'
 #	option encryption 'sae-mixed'
@@ -63,12 +61,12 @@ config controller_select
 #	option bssid '0a:1b:2c:3d:4e:53'
 #	option vid '1'
 
-#config bsta
-#	option enabled '1'
-#	option ifname 'wlan1'
-#	option band '5'
-#	option device 'phy1'
-#	option priority '0'
+config bsta
+	option enabled '1'
+	option ifname 'wlan1'
+	option band '5'
+	option device 'phy1'
+	option priority '0'
 # options below are auto-generated during onboarding
 #	option ssid 'MAP-BH-5GHz'
 #	option encryption 'sae-mixed'

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

@@ -1,27 +1,21 @@
 #!/bin/sh
 
-conn_ports_file="/var/run/multiap/map.connected.ports"
-map_bh_file="/var/run/multiap/multiap.backhaul"
+. /lib/network/utils.sh
 
-# Exit if AL Bridge is not configured to be a bridge device
+conn_ports_file="/tmp/map.connected.ports"
+map_bh_file="/var/run/multiap/multiap.backhaul"
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
+al_brnet="${al_bridge:3}"
 
 # Exit if the PORT is not member of the AL Bridge
-port_bridge_sec="$(uci show network | grep -w $PORT | grep '\.ports' | cut -d'.' -f2)"
-port_bridge_name="$(uci -q get network.$port_bridge_sec.name)"
-[ "$port_bridge_name" = "$al_bridge" ] || exit 0
-
-# Exit if the device is not operating in extender/repeater mode
-al_brnet="${al_bridge:3}"
-[ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
+[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0
 
 ############## Dynamic Backhaul Daemon ##############
 if [ -n "$(which dynbhd)" ]; then
 	pidof dynbhd >/dev/null && exit 0 # dynbhd is managing the links
 
 	if [ ! -f $conn_ports_file ]; then
-		mkdir -p /var/run/multiap
 		touch $conn_ports_file
 		if [ "$LINK" = "up" ]; then
 			touch $conn_ports_file
@@ -53,6 +47,8 @@ if [ -n "$wanport" ]; then
 ########################################################
 else
 #################### DHCP Discovery ####################
+	[ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
+
 	if [ "$LINK" = "up" ]; then
 		brctl delif $al_bridge $PORT
 
@@ -71,7 +67,7 @@ fi
 
 remove_from_bridge() {
 	config_get ifname "$section" ifname
-	[ -n "$ifname" ] && brctl delif ${al_bridge} ${ifname}
+	[ -n "$ifname" ] && ubus call network.interface.${al_brnet} remove_device '{"name":"$ifname"}'
 }
 
 update_bstas() {

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

@@ -179,16 +179,7 @@ create_dir() {
 }
 
 start_service() {
-	if [ -f /usr/sbin/dynbhd ]; then
-		# Start dynbhd only if the device is operating in extender/repeater mode
-		al_bridge="$(uci -q get mapagent.agent.al_bridge)"
-		if [ "${al_bridge:0:3}" = "br-" ]; then
-			al_brnet="${al_bridge:3}"
-			if [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ]; then
-				start_dynbhd_service
-			fi
-		fi
-	fi
+	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
 
 	config_load "mapagent"
 	validate_agent_config || return 1;
@@ -219,8 +210,3 @@ reload_service() {
 	stop
 	start
 }
-
-boot() {
-	/lib/wifi/multiap conf
-	start
-}

map-agent/files/lib/multiap/map_genconfig

@@ -1,199 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /lib/functions.sh
-
-generate_mapagent_config=0
-generate_wireless_sta_config=0
-
-network_mode="$(fw_printenv -n netmode)" # default is layer3
-multiap_mode="$(fw_printenv -n multiap_mode)" # default is full
-
-is_airoha() {
-	[ -f /proc/device-tree/compatible ] || return
-	strings /proc/device-tree/compatible | grep -qE '^(econet,|airoha,)'; return
-}
-
-is_broadcom() {
-	[ -e /dev/bcm ] && return 0
-	return 1
-}
-
-is_qualcomm() {
-	[ -d /sys/module/ath12k ] && return 0
-	return 1
-}
-
-generate_multiap_config() {
-	devidx=0
-
-	generate_config() {
-		dev="$1"
-
-		[ -n "$dev" ] || continue
-
-		config_get band $dev band
-
-		mode_band=""
-		priority=
-		dpp_chan=
-		channels=
-
-		case "$band" in
-			2g)
-				mode_band=2
-				priority=2
-				dpp_chan="81/1"
-				channels="1 6 11"
-			;;
-			5g)
-				mode_band=5
-				priority=1
-				dpp_chan="128/36"
-				channels="36-64 100-112"
-			;;
-			6g)
-				mode_band=6
-				priority=0
-				dpp_chan="133/49"
-			;;
-		esac
-
-		[ -n "$mode_band" ] || continue
-
-		devidx=$(echo ${dev} |tr -dc '0-9')
-
-		device="$dev"
-
-		if is_airoha; then
-			ifprefix="wlan%_%"
-			ifname="wlan${devidx}_0"
-			ifname_bh="wlan${devidx}_1"
-			uci set wireless.$dev.channels="$channels"
-			uci commit wireless
-		elif is_broadcom; then
-			ifprefix="wl"
-			ifname="wl${devidx}"
-			ifname_bh="$ifname.1"
-			device="wl${devidx}"
-			brcm_setup="1"
-		elif is_qualcomm; then
-			ifprefix="wlan0%-"
-			ifname="wlan${devidx}"
-			ifname_bh="wlan${devidx}-1"
-			ap_follow_sta_dfs="1"
-		else
-			ifprefix="wlan%-"
-			ifname="wlan$devidx"
-			ifname_bh="$ifname-1"
-		fi
-
-		if [ $generate_mapagent_config -eq 1 ]; then
-			uci set mapagent.agent.ifprefix="$ifprefix"
-			uci set mapagent.agent.brcm_setup="$brcm_setup"
-			uci set mapagent.agent.ap_follow_sta_dfs="$ap_follow_sta_dfs"
-			uci add mapagent radio
-			uci set mapagent.@radio[-1].device="$device"
-			uci set mapagent.@radio[-1].band="$mode_band"
-
-			if [ "$network_mode" == "extender" ]; then
-				uci add mapagent bsta
-				uci set mapagent.@bsta[-1].device="$device"
-				uci set mapagent.@bsta[-1].ifname="$ifname"
-				uci set mapagent.@bsta[-1].band="$mode_band"
-				uci set mapagent.@bsta[-1].priority="$priority"
-
-				#uci add mapagent dpp_uri
-				#uci set mapagent.@dpp_uri[-1].type="qrcode"
-				#uci set mapagent.@dpp_uri[-1].device="$device"
-				#uci set mapagent.@dpp_uri[-1].ifname="$ifname"
-				#uci set mapagent.@dpp_uri[-1].band="$mode_band"
-				#uci set mapagent.@dpp_uri[-1].chirp_interval="10"
-				#uci add_list mapagent.@dpp_uri[-1].dpp_chan="$dpp_chan"
-
-				if [ $generate_wireless_sta_config -eq 1 ]; then
-					secname="default_sta_${device}"
-					uci set wireless.$secname=wifi-iface
-					uci set wireless.$secname.device="$device"
-					uci set wireless.$secname.mode="sta"
-					uci set wireless.$secname.ifname="$ifname"
-					uci set wireless.$secname.disabled="0"
-					uci set wireless.$secname.default_disabled="1"
-					uci set wireless.$secname.multi_ap="1"
-					uci commit wireless
-				else
-					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
-						\"match\":{\"mode\":\"sta\", \"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
-				fi
-			else
-				uci add mapagent ap
-				uci set mapagent.@ap[-1].type="fronthaul"
-				uci set mapagent.@ap[-1].device="$device"
-				uci set mapagent.@ap[-1].ifname="$ifname"
-				uci set mapagent.@ap[-1].band="$mode_band"
-				uci add mapagent ap
-				uci set mapagent.@ap[-1].type="backhaul"
-				uci set mapagent.@ap[-1].device="$device"
-				uci set mapagent.@ap[-1].ifname="$ifname_bh"
-				uci set mapagent.@ap[-1].band="$mode_band"
-
-				if [ "$multiap_mode" != "none" ]; then
-					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
-						\"match\":{\"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"2\"}}" 2>/dev/null
-					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
-						\"match\":{\"ifname\":\"$ifname_bh\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
-				fi
-			fi
-		fi
-	}
-
-	config_load wireless
-	config_foreach generate_config wifi-device
-}
-
-map_genconf () {
-	if [ -f /etc/config/mapagent -a -z "$(uci -q get mapagent.@radio[0].band)" ]; then
-		generate_mapagent_config=1
-	fi
-
-	if [ "$network_mode" == "extender" ]; then
-		if ! uci show wireless | grep -q "mode=.*sta"; then
-			generate_wireless_sta_config=1
-
-			if is_broadcom; then
-				for section in $(uci show wireless | grep wifi-device | cut -d'.' -f2 | cut -d'=' -f1); do
-					uci -q set wireless.$section.apsta="1"
-				done
-			fi
-
-			for section in $(uci show wireless | grep "mode=.*ap" | cut -d'.' -f2); do
-				uci delete wireless.$section
-			done
-		fi
-	fi
-
-	generate_multiap_config
-
-	if [ $generate_mapagent_config -eq 1 ]; then
-		uci set mapagent.agent.enabled="1"
-		if [ "$multiap_mode" == "agent" ]; then
-			uci -q set mapagent.@controller_select[0].autostart=0
-			uci -q set mapagent.@controller_select[0].local=0
-		elif [ "$multiap_mode" == "auto" ]; then
-			uci -q set mapagent.@controller_select[0].autostart=1
-			uci -q set mapagent.@controller_select[0].local=0
-		elif [ "$multiap_mode" == "none" ]; then
-			uci set mapagent.agent.enabled="0"
-		else # default to full
-			uci -q set mapagent.@controller_select[0].autostart=1
-			uci -q set mapagent.@controller_select[0].local=1
-		fi
-		uci -q commit mapagent
-
-		if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
-			uci set mapcontroller.controller.enabled="0"
-		else
-			uci set mapcontroller.controller.enabled="1"
-		fi
-		uci -q commit mapcontroller
-	fi
-}

map-controller/Config.in

@@ -11,24 +11,20 @@ config CONTROLLER_EASYMESH_VENDOR_EXT
 	default y
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	hex "Vendor OUI default"
-	default 0xB456FA
+	string
+	default "\\\\x11\\\\x22\\\\x33"
 
 config CONTROLLER_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 2
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
-	hex "Vendor OUI in 0xAABBCC format"
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base EasyMesh specification can be
+	Extra features not covered by the base Easymesh specification can be
 	enabled through CONTROLLER_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
-config CONTROLLER_USE_LIBDPP
-	bool "Depend on libdpp for DPP EasyConnect"
-
-
 endmenu
 endif

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.5.0.8
+PKG_VERSION:=4.3.0.8
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c719a86bb2485b8de79a639cc42a8f1d6303253c
+PKG_SOURCE_VERSION:=0d83f8acd66a4cb97f2f123149696334d7f03e6e
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0
@@ -27,15 +27,9 @@ 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 \
-	   +CONTROLLER_USE_LIBDPP:libdpp
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin
 endef
 
-ifeq ($(CONFIG_CONTROLLER_USE_LIBDPP),y)
-  TARGET_CFLAGS += -DUSE_LIBDPP
-endif
-
-
 define Package/map-controller/description
  This package provides WiFi MultiAP Controller as per the EasyMesh-R2 specs.
 endef
@@ -59,7 +53,7 @@ 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_OUI=\\\"$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)\\\"
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 

map-controller/files/etc/config/mapcontroller

@@ -1,16 +1,13 @@
 config controller 'controller'
-	option enabled '1'	# may be modified by other package start-up scripts (i.e. map-agent)
-	option profile '3'
-	option registrar '2 5 6'
+	option enabled '1'
+	option registrar '2 5'
 	option debug '0'
 	option bcn_metrics_max_num '10'
 	option initial_channel_scan '0'
-	option enable_ts '0'
-	option primary_vid '1'
+	option primary_vid '0'
 	option primary_pcp '0'
 	option allow_bgdfs '0'
 	option channel_plan '0'
-	option de_collect_interval '60'
 
 config sta_steering
 	option steer_module 'rcpi'
@@ -21,65 +18,40 @@ config sta_steering
 	option use_usta_metrics '0'
 	option bandsteer '0'
 	option diffsnr '8'
-	option rcpi_threshold_2g '70'
-	option rcpi_threshold_5g '86'
-	option rcpi_threshold_6g '86'
-	option report_rcpi_threshold_2g '80'
-	option report_rcpi_threshold_5g '96'
-	option report_rcpi_threshold_6g '96'
-
-###################
-# Default AP sections credentials will by updated
-# by uci-defaults script 99-mapcntlr
-###################
 
 config ap
 	option band '2'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
 	option encryption 'sae-mixed'
-	option key '$WIFI_FH_KEY'
 	option vid '1'
-	option type 'fronthaul'
+	option ssid 'IOWRT-2.4GHz'
+	option encryption 'sae-mixed'
+	option key '1234567890'
 
 config ap
 	option band '5'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option type 'fronthaul'
+	option vid '1'
+	option ssid 'IOWRT-5GHz'
 	option encryption 'sae-mixed'
-	option key '$WIFI_FH_KEY'
-	option vid '1'
-	option type 'fronthaul'
-
-config ap
-	option band '6'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
-	option encryption 'sae'
-	option key '$WIFI_FH_KEY'
-	option vid '1'
-	option type 'fronthaul'
+	option key '1234567890'
 
 config ap
 	option band '2'
-	option ssid 'MAP-$BASEMAC_ADDR-BH-2.4GHz'
-	option encryption 'sae'
-	option key '$WIFI_BH_KEY'
 	option type 'backhaul'
 	option vid '1'
+	list disallow_bsta '0'
+	option ssid 'MAP-BH-2.4GHz'
+	option encryption 'sae'
+	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
 
 config ap
 	option band '5'
-	option ssid 'MAP-$BASEMAC_ADDR-BH-5GHz'
-	option encryption 'sae'
-	option key '$WIFI_BH_KEY'
 	option type 'backhaul'
 	option vid '1'
-
-config ap
-	option band '6'
-	option ssid 'MAP-$BASEMAC_ADDR-BH-6GHz'
+	list disallow_bsta '0'
+	option ssid 'MAP-BH-5GHz'
 	option encryption 'sae'
-	option key '$WIFI_BH_KEY'
-	option type 'backhaul'
-	option vid '1'
+	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
 
 # node and radio sections (per node) are auto
 # generated per Multi-AP Agent in the network
@@ -90,6 +62,8 @@ config ap
 #	option backhaul_ul_macaddr '00:00:00:00:00:00'
 #	option backhaul_dl_macaddr '00:00:00:00:00:00'
 #	option backhaul_type 'none'
+#	option primary_vid '1'
+#	option primary_pcp '0'
 #	option report_sta_assocfails '0'
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '0'

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

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /etc/device_info
-
-WIFI_BH_KEY=$(openssl rand -rand /dev/urandom -hex 64 2>/dev/null | openssl dgst -hex -sha256 | cut -d " " -f 2)
-WIFI_BH_KEY=${WIFI_BH_KEY::-1}
-
-BASEMAC_ADDR="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-[ ${#BASEMAC_ADDR} -eq 12 ] || BASEMAC_ADDR="$(db -q get device.deviceinfo.BaseMACAddress | tr -d ':')"
-
-WIFI_FH_KEY="$(db get hw.board.wpa_key)"
-WIFI_FH_KEY="${WIFI_FH_KEY:-1234567890}"
-
-sed -i  -e "s/\$BASEMAC_ADDR/$BASEMAC_ADDR/g" \
-	-e "s/\$WIFI_FH_KEY/$WIFI_FH_KEY/g" \
-	-e "s/\$WIFI_BH_KEY/$WIFI_BH_KEY/g" \
-	-e "s/\$DEVICE_MANUFACTURER/$DEVICE_MANUFACTURER/g" \
-	/etc/config/mapcontroller	2>/dev/null

map-topology/Config.in

@@ -7,14 +7,14 @@ config TOPOLOGYD_EASYMESH_VENDOR_EXT
 	default y
 
 config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	hex "Vendor OUI default"
-	default 0xB456FA
+	string
+	default "\\\\x11\\\\x22\\\\x33"
 
 config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
-	hex "Vendor OUI in 0xAABBCC format"
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base EasyMesh specification can be
+	Extra features not covered by the base Easymesh specification can be
 	enabled through TOPOLOGYD_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.2.1
+PKG_VERSION:=2.5.1.24
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=914f1ead2e65c1e24ed2d8786aa883730db2208f
+PKG_SOURCE_VERSION:=9f15e813c39ff23cef27975ce138bd3286f30adf
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
@@ -49,7 +49,7 @@ endef
 MAKE_PATH:=src
 
 ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
 endif
 
 ifeq ($(CONFIG_TOPOLOGYD_HOST_WAN_STATS),y)

map-topology/files/etc/config/hosts

@@ -0,0 +1,5 @@
+
+config global 'global'
+	option ageing_timer '1440'
+	option reboot_persistent '0'
+	list ifname 'br-lan'

map-topology/files/etc/config/topology

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

map-topology/files/etc/firewall.hosts

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

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

@@ -49,7 +49,7 @@ config_snooping_upstream_interface() {
 			*.*)
 				port="$(echo "$dev" | cut -d'.' -f 1)"
 				if [ $port == $ethwan ]; then
-					ifconfig $dev | grep RUNNING >/dev/null && snooping_upstream_intf="$dev" && break
+					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
 				fi
 				;;
 		esac

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

@@ -89,24 +89,16 @@ interfaces_ok(){
 	# check if upstream untagged
 	IFS=" "
 	for itf in $up_interf; do
-		# check if there exist a interface section for this upstream interface, if yes the
-		# do nothing, if no then generate config as mcast config is outdated
-		local dev_section=$(uci show network | grep -E "\.device=\'$itf\'" | head -n 1 | cut -d'.' -f2)
+		# check if there exist a device section for this upstream interface, if yes the
+		# do nothing, if no then split the it at . and use the native interface as
+		# upstream interface
+		dev_section=$(ubus call uci get '{"config":"network", "type":"device", "match":{"name":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])
 
 		# mcast config is outdated, simply generate as per new logic
 		if [ -z "$dev_section" ]; then
 		       # check if the itf is a native interface	&& return 1
-			return 1
-		else
-			section_type=$(uci get network.$dev_section)
-			if [ "$section_type" == "interface" ]; then
-				# interface section exits, hence, sync has already happened
-				# nothing to do further, just return
-				return 0
-			else
-				# mcast config is outdated
-				return 1
-			fi
+			native=$(ubus call uci get '{"config":"ports", "type":"ethport", "match":{"ifname":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])
+			[ -z "native" ] && return 1
 		fi
 	done
 	return 0

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

@@ -62,7 +62,7 @@ read_snooping() {
 	local proto
 
 	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto "igmp"
+	config_get proto "$config" proto
 
 	if [ "$sec_enable" == "0" ]; then
 		return
@@ -103,7 +103,7 @@ read_proxy() {
 	local proto
 
 	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto "igmp"
+	config_get proto "$config" proto
 
 	if [ "$sec_enable" == "0" ]; then
 		return

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

@@ -10,12 +10,10 @@ PROG_EXE=/usr/sbin/mcproxy
 PROG_PARAMS=
 PROG_PARAMS_SEPARATOR=:
 
-snooping_bridges=
-
 
 __device_is_bridge() {
 	local device="$2"
-	local devsec__="$(uci show network | grep -F ".name='$device'" | cut -d'.' -f2)"
+	local devsec__="$(uci show network | grep name=.*$device | cut -d'.' -f2)"
 	local sectype="$(uci -q get network.$devsec__)"
 	local devtype="$(uci -q get network.$devsec__.type)"
 	[ "$sectype" != "device" -o "$devtype" != "bridge" ] && return 1
@@ -46,6 +44,9 @@ device_has_ip() {
 	# Read the openwrt interface for the device.
 	# Device can have multiple logical interfaces like wan and wan6
 	# but same l3 device
+	# NB. Don't use 'get_network_of' here.
+	# This function fails in some uci configurations for interfaces that refer
+	# to a device indirectly.
 	local ifaces=$(ubus call network.interface dump | jsonfilter -e "@.interface[@.device='$device'].interface")
 	for iface in $ifaces; do
 		local ip=
@@ -113,12 +114,10 @@ config_mcproxy_interfaces() {
 
 config_sysfs_mcast_snooping() {
 	local downstreams="$1"
-	local snooping="$2"
 
 	for downstream in $downstreams; do
 		if device_is_bridge "$downstream"; then
-			echo 0 > /sys/class/net/$downstream/bridge/multicast_snooping
-			echo $snooping > /sys/class/net/$downstream/bridge/multicast_snooping
+			echo 1 > /sys/class/net/$downstream/bridge/multicast_snooping
 		fi
 	done
 }
@@ -137,53 +136,7 @@ config_sysfs_mcast_fastleave() {
 	done
 }
 
-config_sysfs_mcast_version() {
-	local protocol="$1"
-	local interfaces="$2"
-	local version="$3"
-
-	for iface in $interfaces; do
-		echo $version > /sys/class/net/$iface/bridge/multicast_"$protocol"_version
-	done
-}
-
-config_sysfs_mcast_robustness() {
-	local interfaces="$1"
-	local robustness="$2"
-
-	for iface in $interfaces; do
-		echo $robustness > /sys/class/net/$iface/bridge/multicast_last_member_count
-	done
-}
-
-config_sysfs_mcast_query_interval() {
-	local interfaces="$1"
-	local query_interval="$2"
-
-	for iface in $interfaces; do
-		echo $query_interval > /sys/class/net/$iface/bridge/multicast_query_interval
-	done
-}
-
-config_sysfs_mcast_q_resp_interval() {
-	local interfaces="$1"
-	local q_resp_interval="$2"
-
-	for iface in $interfaces; do
-		echo $q_resp_interval > /sys/class/net/$iface/bridge/multicast_query_response_interval
-	done
-}
-
-config_sysfs_mcast_last_mem_q_int() {
-	local interfaces="$1"
-	local last_mem_q_int="$2"
-
-	for iface in $interfaces; do
-		echo $last_mem_q_int > /sys/class/net/$iface/bridge/multicast_last_member_interval
-	done
-}
-
-config_sysfs_mcast_flood() {
+config_sysfs_mcast_mode() {
 	local downstreams=$1
 	local mcast_mode=$2
 	local prt
@@ -204,25 +157,6 @@ config_sysfs_mcast_flood() {
 	done
 }
 
-config_snooping_mode() {
-	local interfaces="$1"
-	local snooping="$2"
-
-	# snooping_mode:
-	#  0 - snooping is disabled
-	#  1 - multicast flood is enabled
-	#  2 - multicast flood is disabled
-	[ -z "$snooping_mode" ] && snooping_mode=2
-
-	if [ "$snooping_mode" == 0 ]; then
-		config_sysfs_mcast_snooping "$interfaces" 0
-	else
-		config_sysfs_mcast_snooping "$interfaces" 1
-	fi
-
-	config_sysfs_mcast_flood "$interfaces" "$snooping_mode"
-}
-
 config_mcproxy_instance() {
 	local protocol="$1"
 	local version="$2"
@@ -261,7 +195,6 @@ config_mcproxy_instance() {
 		upstreams=$igmp_p_up_interfaces
 		downstreams=$igmp_p_down_interfaces
 		mcast_mode=$igmp_p_mode
-
 	elif [ "$protocol" == "mld" ]; then
 		case "$version" in
 			[1-2])
@@ -295,124 +228,32 @@ config_mcproxy_instance() {
 
 	# for snooping to work we should enable it on the bridge, doing it from
 	# here instead of from inside network config
-	if [ "$downstreams" != "$snooping_bridges" ]; then
-		if [ "$mcast_mode" == "0" ]; then
-			config_sysfs_mcast_snooping "$downstreams" 0
-		else
-			config_sysfs_mcast_snooping "$downstreams" 1
-		fi
-
-		[ -n $fast_leave ] &&
-			config_sysfs_mcast_fastleave "$downstreams" "$fast_leave"
-		config_sysfs_mcast_flood "$downstreams" "$mcast_mode"
-	fi
+	config_sysfs_mcast_snooping "$downstreams"
+	[ -n $fast_leave ] &&
+		config_sysfs_mcast_fastleave "$downstreams" "$fast_leave"
+	config_sysfs_mcast_mode "$downstreams" "$mcast_mode"
 
 	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
 }
 
-disable_snooping_iface() {
-	local iface="$(uci -q get network.$1.name)"
-	config_sysfs_mcast_snooping "$iface" 0
-}
-
-disable_snooping() {
-	config_load network
-	config_foreach disable_snooping_iface device
-}
-
-config_snooping() {
-	local protocol="$1"
-
-	local version=
-	local robustness=
-	local query_interval=
-	local q_resp_interval=
-	local last_mem_q_int=
-	local fast_leave=0
-	local snooping_mode=
-	local interfaces=
-
-	local HZ=100
-
-	local all_interfaces=
-	if [ "$protocol" == "igmp" ]; then
-		all_interfaces=$igmp_s_iface
-	elif [ "$protocol" == "mld" ]; then
-		all_interfaces=$mld_s_iface
-	fi
-	for iface in $all_interfaces; do
-		device_is_bridge "$iface" || continue
-		interfaces="$interfaces $iface"
-	done
-	[ -z "$interfaces" ] && return
-	snooping_bridges="$interfaces"
-
-	if [ "$protocol" == "igmp" ]; then
-		case "$igmp_s_version" in
-			[1-3])
-				version="$igmp_s_version"
-				;;
-			*)
-				version="2"
-				;;
-		esac
-
-		robustness=$igmp_s_robustness
-		query_interval=$(( igmp_s_query_interval * HZ ))
-		q_resp_interval=$(( igmp_s_q_resp_interval * HZ / 10 ))
-		last_mem_q_int=$(( igmp_s_last_mem_q_int * HZ / 10 ))
-		fast_leave=$igmp_s_fast_leave
-		snooping_mode=$igmp_s_mode
-	elif [ "$protocol" == "mld" ]; then
-		case "$mld_s_version" in
-			[1-2])
-				version="$mld_s_version"
-				;;
-			*)
-				version="2"
-				;;
-		esac
-
-		robustness=$mld_s_robustness
-		query_interval=$(( mld_s_query_interval * HZ ))
-		q_resp_interval=$(( mld_s_q_resp_interval * HZ / 10 ))
-		last_mem_q_int=$(( mld_s_last_mem_q_int * HZ / 10 ))
-		fast_leave=$mld_s_fast_leave
-		snooping_mode=$mld_s_mode
-	fi
-
-	config_snooping_mode "$interfaces" "$snooping_mode"
-
-	[ -n "$version" ] && config_sysfs_mcast_version "$protocol" "$interfaces" "$version"
-	[ -n "$robustness" ] && config_sysfs_mcast_robustness "$interfaces" "$robustness"
-	[ -n "$query_interval" ] && config_sysfs_mcast_query_interval "$interfaces" "$query_interval"
-	[ -n "$q_resp_interval" ] && config_sysfs_mcast_q_resp_interval "$interfaces" "$q_resp_interval"
-	[ -n "$last_mem_q_int" ] && config_sysfs_mcast_last_mem_q_int "$interfaces" "$last_mem_q_int"
-	[ -n "$fast_leave" ] && config_sysfs_mcast_fastleave "$interfaces" "$fast_leave"
-}
-
 config_mcproxy() {
-	disable_snooping
 	if [ "$igmp_p_enable" == "1" ]; then
 		config_mcproxy_instance igmp "$igmp_p_version"
-	elif [ "$igmp_s_enable" == "1" ]; then
-		config_snooping igmp "$igmp_s_version"
 	fi
 
 	if [ "$mld_p_enable" == "1" ]; then
 		config_mcproxy_instance mld "$mld_p_version"
-	elif [ "$mld_s_enable" == "1" ]; then
-		config_snooping mld "$mld_s_version"
 	fi
 }
 
-setup_mcast_mode() {
-	:
-}
-
 configure_mcast() {
 	config_global_params "set_max_groups_and_sources"
 
+	# mcproxy reserves two multicast subscriptions for igmp router service groups
+	local mg=$(cat /proc/sys/net/ipv4/igmp_max_memberships)
+	mg=$((mg+2))
+	echo $mg > /proc/sys/net/ipv4/igmp_max_memberships
+
 	read_mcast_snooping_params
 	read_mcast_proxy_params
 	config_mcproxy

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

@@ -11,7 +11,6 @@
  *   Erik Karlsson - initial implementation
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 #include <shadow.h>
 #include <crypt.h>

netmode/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=1.0.1
+PKG_VERSION:=0.3.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only

netmode/files/etc/config/netmode

@@ -1,3 +1,10 @@
 config netmode global
 	option enabled 0
 #	option mode 'router'
+
+#config testnet testnet
+#	option enabled 1
+#	option destination '8.8.8.8'
+	
+#config shiftrange shiftrange
+#	option enabled 1

netmode/files/etc/hotplug.d/iface/05-testnet

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # do not start testnet if the feature is explicitly disabled
-[ "$(uci -q get testnet.global.enabled)" = "0" ] && exit 0
+[ "$(uci -q get netmode.testnet.enabled)" = "0" ] && exit 0
 
 [ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 0
 
@@ -14,4 +14,8 @@ interface_check() {
 }
 
 interface_check
-/etc/init.d/testnet reload
+if [ -n "$(pgrep -f testnet)" ]; then
+	testnet once
+else
+	testnet &
+fi

netmode/files/etc/hotplug.d/iface/70-shiftrange

@@ -0,0 +1,252 @@
+#!/bin/sh
+# this scripts shifts the lan network prefixes
+# if a wan interface has the same network prefix.
+
+# do not shift range if the feature is explicitly disabled
+[ "$(uci -q get netmode.shiftrange.enabled)" == "0" ] && exit 0
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+
+LOCKFILE="/tmp/70-shiftrange.lock"
+RESTRICTED_NETS=""
+ALL_NETS=""
+
+#####
+##### initial functions
+#####
+
+initial_check()
+{
+	# run only on ifup
+	[ "$ACTION" == "ifup" ] || exit 0
+
+	# run only for uplink (not is_lan) interfaces
+	local islan="$(uci -q get network.$INTERFACE.is_lan)"
+	[ "$islan" != "1" ] || exit 0
+
+	# run only if the uplink interface has a configured protocol
+	local proto="$(uci -q get network.$INTERFACE.proto)"
+	[ "$proto" != "none" ] || exit 0
+}
+
+finish()
+{
+    lock -u $LOCKFILE
+    rm -f $LOCKFILE
+}
+
+# just one instance of this script at a time
+just_one_instance()
+{
+	local counter=0
+	local limit=10
+
+	#wait for the lock to become free
+	while [ -e $LOCKFILE ] ; do
+		sleep 1
+		counter=$((counter + 1))
+		[ "$counter" -gt "$limit" ] && exit 1
+	done
+
+	lock $LOCKFILE
+	trap finish EXIT INT TERM
+}
+
+
+#####
+##### helper functions
+#####
+
+#given a an ip and a mask in the form of "192.168.1.1/24"
+#return the network address like "192.168.1.0/24"
+get_network_address()
+{
+	local ip="$1"
+	[ -z "$ip" ] && return
+
+	local prefix=${ip##*/}
+
+	local ip1=${ip%%.*} ; ip=${ip#*.*}
+	local ip2=${ip%%.*} ; ip=${ip#*.*}
+	local ip3=${ip%%.*} ; ip=${ip#*.*}
+	local ip4=${ip%%/*}
+
+	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
+	local mask=$((0xFFFFFFFF >> (32 - $prefix) << (32 - $prefix)))
+	local network=$(($ip & $mask))
+
+	local n1=$((($network & 0xFF000000) >> 24))
+	local n2=$((($network & 0x00FF0000) >> 16))
+	local n3=$((($network & 0x0000FF00) >> 8))
+	local n4=$(( $network & 0x000000FF))
+
+	echo "$n1.$n2.$n3.$n4/$prefix"
+}
+
+#given a network address (192.168.1.0/24)
+#find the next network address (192.168.2.0/24)
+next_network_address()
+{
+	local ip=$1
+	local prefix=${ip##*/}
+
+	local ip1=${ip%%.*} ; ip=${ip#*.*}
+	local ip2=${ip%%.*} ; ip=${ip#*.*}
+	local ip3=${ip%%.*} ; ip=${ip#*.*}
+	local ip4=${ip%%/*}
+
+	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
+	local one="$((1 << (32-$prefix)))"
+	local new=$(($ip + $one))
+
+	local n1=$((($new & 0xFF000000) >> 24))
+	local n2=$((($new & 0x00FF0000) >> 16))
+	local n3=$((($new & 0x0000FF00) >> 8))
+	local n4=$(( $new & 0x000000FF))
+
+	echo "$n1.$n2.$n3.$n4/$prefix"
+}
+
+# given a network address and a prefix (192.168.2.0/24)
+# return the first host ip available   (192.168.2.1)
+first_host_in_network ()
+{
+	local ip=$1
+	local prefix=${ip##*/}
+
+	local ip1=${ip%%.*} ; ip=${ip#*.*}
+	local ip2=${ip%%.*} ; ip=${ip#*.*}
+	local ip3=${ip%%.*} ; ip=${ip#*.*}
+	local ip4=${ip%%/*}
+
+	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
+	local new=$(($ip + 1))
+
+	local n1=$((($new & 0xFF000000) >> 24))
+	local n2=$((($new & 0x00FF0000) >> 16))
+	local n3=$((($new & 0x0000FF00) >> 8))
+	local n4=$(( $new & 0x000000FF))
+
+	echo "$n1.$n2.$n3.$n4"
+}
+
+# given a network address,
+# find the next available network address.
+shift_range()
+{
+	local net="$1"
+	while true ; do
+		if [ "$RESTRICTED_NETS" == "${RESTRICTED_NETS//$net/}" ] && [ "$ALL_NETS" == "${ALL_NETS//$net/}" ]; then
+			# found a net that is not in restricted nets nor in all nets
+			break
+		fi
+		net=$(next_network_address $net)
+	done
+
+	echo "$net"
+}
+
+
+#####
+##### parse all interfaces section
+#####
+
+# RESTRICTED_NETS = all the IPs on wan interfaces
+# ALL_NETS = all the IPs on any interface
+parse_interface()
+{
+	local interface=$1
+	local nets=""		# "192.168.1.1/24"
+	local networks=""	# "192.168.1.0/24"
+
+	config_get is_lan $interface is_lan
+	network_get_subnets nets $interface
+
+	for n in $nets ; do
+		networks="$networks $(get_network_address $n)"
+	done
+
+	[ "$is_lan" != "1" ] && RESTRICTED_NETS="$RESTRICTED_NETS $networks"
+	ALL_NETS="$ALL_NETS $networks"
+}
+
+# parse all the interfaces
+# get all the IPs on wan interfaces and store them in restrict_nets
+# get all the IPs on all interfaces and store them in ALL_NETS
+parse_interfaces()
+{
+	config_foreach parse_interface "interface"
+}
+
+
+#####
+##### parse all lan interfaces section
+#####
+
+parse_lan()
+{
+	local interface=$1
+	local nets=""
+	local ips=""
+	local newips=""
+	local ips_changed=0
+
+	[ "$interface" == "loopback" ] && return
+	config_get is_lan $interface is_lan
+	[ "$is_lan" == "1" ] || return
+
+	network_get_subnets ips $interface
+
+	for ip in $ips ; do
+		net="$(get_network_address $ip)"
+
+		if [ "$RESTRICTED_NETS" == "${RESTRICTED_NETS//$net/}" ] ; then
+			# net is not in restricted nets
+			# append ip to newips
+			[ -z "$newips" ] && newips="${ip%/*}" ||  newips="$newips ${ip%/*}"
+			continue
+		fi
+
+		#net is in RESTRICTED_NETS
+		local newnet=$(shift_range $net)
+		local newip="$(first_host_in_network $newnet)"
+		# append newip to newips
+		[ -z "$newips" ] && newips="$newip" ||  newips="$newips $newip"
+
+		ips_changed=1
+		logger "$0: Changing the ip on interface $interface from $ip to $newip/${newnet##*/}"
+		echo "$0: Changing the ip on interface $interface from $ip to $newip/${newnet##*/}" >/dev/console
+	done
+
+	#assign the new ips
+	if [ "$ips_changed" == "1" ] ; then
+		uci -q set network.$interface.ipaddr="$newips"
+	fi
+}
+
+# parse all the interface with is_lan=1
+parse_lans()
+{
+	config_foreach parse_lan "interface"
+}
+
+#####
+##### main
+#####
+
+main()
+{
+	initial_check
+	just_one_instance
+
+	config_load network
+	parse_interfaces
+	parse_lans
+
+	if [ -n "$(uci changes network)" ] ; then
+		ubus call uci commit '{"config":"network"}'
+	fi
+}
+
+main $@