map-agent: traffic_separation: only handle layer3 if controller is on same device

This reverts commit a316b74555.

ated/Makefile

@@ -0,0 +1,78 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
+#
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ated
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
+
+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/ated
+	CATEGORY:=Utilities
+	TITLE:=Daemon for handling wifi calibration
+	URL:=
+	DEPENDS:= libc
+endef
+
+define Package/ated/description
+	Daemon for handling wifi calibration
+endef
+
+#TARGET_CFLAGS += -I$(LINUX_DIR)/include -I$(LINUX_DIR)/arch/mips/include
+
+MAKE_FLAGS += \
+	v=2 \
+	m=3
+
+
+#TARGET_CPPFLAGS := \
+#	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
+#	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
+#	$(TARGET_CPPFLAGS)
+
+# we donot wwant to have any install.
+define Build/Install/Default
+endef
+
+define Package/ated/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ated $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ated))

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.7.1
+PKG_VERSION:=6.8.9.25
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=f716f92edc0eec04f81a501339100adfa0c3b4ca
+PKG_SOURCE_VERSION:=e87b25b08294c608aef1e73d1268b35073097592
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -25,8 +25,7 @@ define Package/libbbf_api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
-  ABI_VERSION:=1.0
+  TITLE:=Library for libbbfdm API
 endef
 
 define Package/libbbfdm/default
@@ -34,7 +33,7 @@ define Package/libbbfdm/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbf_api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
 endef
 
 define Package/libbbfdm
@@ -138,10 +137,10 @@ endef
 
 define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
@@ -172,6 +171,7 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/usr/lib/
+	touch $(1)/usr/lib/libbbf_api.so
 endef
 
 $(eval $(call BuildPackage,libbbf_api))

bulkdata/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.7
+PKG_VERSION:=2.0.3.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=be565bd5b7bf91c81a824601235f68b11e6ea308
+PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,6 +25,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_DEPENDS:=bbf
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -32,7 +34,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json +zlib
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json
 endef
 
 TARGET_CFLAGS += \
@@ -48,8 +50,8 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/init.d/bulkdatad

@@ -7,12 +7,9 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
 start_service() {
-	local enable
+	local enable=$(uci -q get bulkdata.bulkdata.enable)
 
-	config_load bulkdata
-	config_get_bool enable bulkdata enable 1
-
-	[ "$enable" -ne "1" ] && {
+	[ "$enable" != "1" ] && {
 		return 0
 	}
 
@@ -22,6 +19,10 @@ start_service() {
 	procd_close_instance
 }
 
+boot() {
+	start
+}
+
 reload_service() {
 	stop
 	start 

easy-qos/Makefile

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

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.7.5
+PKG_VERSION:=6.4.52
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6a7dcbfe7ce41e87a7528b63cf12e67078231629
+PKG_SOURCE_VERSION:=822e9a50790970d14db254ffe3d7464709bcd3ca
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -38,36 +38,26 @@ endef
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-  TARGET_WIFI_TYPE=BROADCOM
   CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
   TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
 else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
   TARGET_PLATFORM=TEST
-  TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
 else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
   TARGET_PLATFORM=TEST
-  TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
-  TARGET_PLATFORM=ECONET
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_ECONET
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211
-  TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
 export TARGET_PLATFORM
-export TARGET_WIFI_TYPE
 
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
@@ -97,7 +87,6 @@ MAKE_FLAGS += \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FPIC="$(FPIC)" \
 	PLATFORM="$(TARGET_PLATFORM)" \
-	WIFI_TYPE="$(TARGET_WIFI_TYPE)" \
 	subdirs="$(subdirs)"
 
 ifeq ($(LOCAL_DEV),1)

easy-soc-libs/ethernet.mk

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

endptmngr/Makefile

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

evoice/Makefile

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

evoice/files/etc/config/voice

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

evoice/files/etc/evoice/voicedm

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

evoice/files/etc/evoice/voicero

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

evoice/files/etc/init.d/evoice

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

evoice/files/lib/voice/codecs_airoha.json

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

evoice/files/lib/voice/codecs_brcm.json

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

fdtextract/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e3cefda3b26c9aea3021b20725ce7b31b33eebc4
+PKG_SOURCE_VERSION:=0ebaf1e7d1f09318ae75d0f475a25280742b790e
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2

gryphon-led-module/Makefile

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

icwmp/Config_cwmp.in

@@ -0,0 +1,14 @@
+choice
+       prompt "Select ACS sever"
+       default CWMP_ACS_MULTI
+       depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
+
+config CWMP_ACS_MULTI
+	bool "No specific ACS, follow standard"
+
+config CWMP_ACS_HDM
+	bool "Select HDM as ACS server"
+endchoice

icwmp/Makefile

@@ -1,37 +1,42 @@
 #
 # Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
-# This is free software, licensed under the BSD-3-Clause
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.0.15
+PKG_VERSION:=8.4.25.10
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=61131746e2831453d0a935dcb3094fc758167f22
+PKG_SOURCE_VERSION:=cb601366e6a91db532ba7d577f653a2b86c4a479
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_FIXUP:=autoreconf
+
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
 
 define Package/icwmp/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
 endef
 
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
+
 define Package/icwmp-openssl
   $(Package/icwmp/default)
   TITLE += (openssl)
@@ -57,15 +62,15 @@ define Package/icwmp-mbedtls
 endef
 
 ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+CONFIGURE_ARGS += --enable-libopenssl
 endif
 
 ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+CONFIGURE_ARGS += --enable-libwolfssl
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+CONFIGURE_ARGS += --enable-libmbedtls
 endif
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)

icwmp/files/etc/config/cwmp

@@ -32,7 +32,7 @@ config cpe 'cpe'
 	option amd_version '5'
 	# compression possible configs: InstanceNumber, InstanceAlias
 	option instance_mode 'InstanceNumber'
-	option session_timeout '300'
+	option session_timeout '60'
 	option notification '1'
 	option exec_download '0'
 	option periodic_notify_enable '1'

icwmp/files/etc/icwmpd/update.sh

@@ -14,18 +14,15 @@ handle_icwmp_update() {
 		return 0
 	fi
 
-	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
-
-	if [ "$ret" == "true" ]; then
-		# read status from var/state/cwmp
-		status=$(uci -q -c /var/state get cwmp.sess_status.current_status)
-		if [ "$status" != "running" ]; then
-			log "Trigger out of bound inform, since last inform status was failure"
-			ubus -t 10 call tr069 inform >/dev/null 2>&1
+	status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
+	if [ "$status" != "running" ]; then
+		log "Trigger out of bound inform, since last inform status was failure"
+		ubus -t 10 call tr069 inform >/dev/null 2>&1
+		# Handle timeout or tr069 object not found
+		if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
+			log "Restarting icwmp tr069 object"
+			/etc/init.d/icwmpd restart
 		fi
-	else
-		log "Restarting icwmp tr069 object"
-		/etc/init.d/icwmpd restart
 	fi
 }
 

icwmp/files/etc/init.d/icwmpd

@@ -480,14 +480,7 @@ reload_service() {
 		return 0
 	fi
 
-	tr069_status="$(ubus -t 1 call tr069 status)"
-	ret="$?"
-	if [ "$ret" = "7" ]; then
-		# ubus timed out may be due to uloop is busy in some task so returning
-		return 0
-	fi
-
-	status="$(echo $tr069_status | jsonfilter -qe '@.cwmp.status')"
+	status="$(ubus -t 1 call tr069 status |jsonfilter -qe '@.cwmp.status')"
 	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'

ieee1905/Config.in

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

ieee1905/Config.map-plugin.in

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

ieee1905/Makefile

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

ieee1905/files/etc/config/ieee1905

@@ -2,7 +2,7 @@ config ieee1905 'ieee1905'
 	option enabled '1'
 	option extension '1'
 	list extmodule 'map'
-	option registrar '2 5 6'
+	option registrar '2 5'
 #	option macaddress '0a:1b:2c:3d:4e:50'
 
 config al-iface
@@ -24,9 +24,3 @@ config ap
 	option encryption 'sae-mixed'
 	option key '1234567890'
 
-config ap
-	option band '6'
-	option ssid 'IOWRT-6GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
-

ieee1905/files/etc/init.d/ieee1905

@@ -42,7 +42,7 @@ validate_ap_section() {
 	local section="$1"
 
 	uci_validate_section ieee1905 $section "${1}" \
-			'band:or("2", "5", "60", "6")' \
+			'band:or("2", "5", "60")' \
 			'ssid:string' \
 			'encryption:or("psk2", "sae-mixed", "sae", string)' \
 			'key:string' \

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

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+config_load ieee1905
+
+list_to_ifname() {
+	local section=$1
+
+	config_get ifname $section ifname	# get list as space separated values
+
+	uci del ieee1905.${section}.ifname	# delete entry
+	uci set ieee1905.${section}.ifname="$ifname"	# writeback entry as option
+}
+
+config_foreach list_to_ifname al-iface
+

ieee1905/plugins/map.mk

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

ieee1905/plugins/snoop.mk

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

ieee1905/plugins/topology.mk

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

iop/config

@@ -44,13 +44,12 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 # EasySoC HAL #
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-agent=m
-CONFIG_PACKAGE_map-controller=m
 CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_wfadatad-collector=y
 
@@ -116,8 +115,7 @@ CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_dnsmasq=y
-CONFIG_PACKAGE_miniupnpd-iptables=y
+CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -139,7 +137,7 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables-zz-legacy=y
+CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -164,7 +162,6 @@ CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
-CONFIG_PACKAGE_procd-ujail=m
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
 CONFIG_PACKAGE_rpcd-mod-rrdns=y
@@ -288,10 +285,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
-
-# Use fw3 iptables-based instead of newer nftables-based fw4
-# TODO: for now we cannot build an image with fw3 and luci-app-firewall (i.e. fw3)
-# Enabling luci-app-firewall enables fw4
-# CONFIG_PACKAGE_luci-app-firewall is not set
-CONFIG_PACKAGE_firewall=y
-# CONFIG_PACKAGE_firewall4 is not set

iop/scripts/feeds_update.sh

@@ -2,65 +2,57 @@
 
 function feeds_update {
 
-	developer=0
-	override=1
-	start=$(date -u +'%s')
-	while getopts "n" opt; do
-		case $opt in
-		n)
-			override=0
-			;;
-		esac
-	done
+    developer=0
+    override=1
+    start=$(date -u +'%s');
+    while getopts "n" opt; do
+	case $opt in
+	    n)
+		override=0
+		;;
+	esac
+    done
 
-	git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
-	cp .config .genconfig_config_bak
+    git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
-	#if -d argument is passed, clone feeds with ssh instead of http
-	if [ $developer == 1 ]; then
-		./scripts/feeds update -g
-	else
-		./scripts/feeds update
-	fi
+    cp .config .genconfig_config_bak
+
+    #if -d argument is passed, clone feeds with ssh instead of http
+    if [ $developer == 1 ]; then
+	./scripts/feeds update -g
+    else
+	./scripts/feeds update
+    fi
 	./scripts/feeds update -ai
 
-	# replace core packages with iopsys versions
-	if [ $override == 1 ]; then
+    # replace core packages with iopsys versions
+    if [ $override == 1 ]; then
 		./scripts/feeds install -f -p openwrt_core -a
-	fi
+    fi
 
-	# targets need to be installed explicitly
-	for target in $(ls ./feeds/targets); do
-		rm -f target/linux/$target
-		./scripts/feeds install -p targets $target
-	done
+    # targets need to be installed explicitly
+    for target in $(ls ./feeds/targets)
+    do
+	rm -f target/linux/$target
+	./scripts/feeds install -p targets $target
+    done
 
-	# Workaround for bug in 22.03.0-rc4 where installed target path has been
-	# moved to target/linux/feeds but Config.in and Makefile from installed
-	# targets are not properly included from the new location.
-	# This hack is to be removed once the issues are fixed.
-	# Note that the above block of code might no longer necessary because
-	# targets no longer need to be installed explicitly.
-	echo "Working around installed-target-bug"
-	for f in target/linux/feeds/*; do
-		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
-	done
+    # install all packages
+    ./scripts/feeds install -a
 
-	# install all packages
-	./scripts/feeds install -a
+    # remove broken symlinks ( for packages that are no longer in the feed )
+    find -L package/feeds -maxdepth 2 -type l -delete
 
-	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete
+    cp .genconfig_config_bak .config
+    make defconfig
 
-	cp .genconfig_config_bak .config
-	make defconfig
+    # record when we last run this script
+    touch tmp/.iop_bootstrap
 
-	# record when we last run this script
-	touch tmp/.iop_bootstrap
-
-	# always return true
-	exit 0
+    # always return true
+    exit 0
 }
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
+

iop/scripts/genconfig.sh

@@ -13,13 +13,11 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
-	mediatek="target/linux/feeds/iopsys-mediatek"
-	qualcomm_ipq95xx="target/linux/feeds/ipq95xx"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	econet="target/linux/iopsys-econet"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -85,8 +83,8 @@ function genconfig {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
+			local targetpath="./target/linux/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -119,13 +117,9 @@ function genconfig {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
-		[ -e $qualcomm_ipq95xx/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -173,22 +167,6 @@ function genconfig {
 		    return
 		fi
 	    done
-
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx/config"
-		    return
-		fi
-	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -341,25 +319,19 @@ function genconfig {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES 
-		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
-			if [ -z "$mk_file" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			local subtarget="$(basename "${mk_file%.mk}")"
+		if [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			;;
-		*)
+		elif [ "$target" = "iopsys_econet" ]; then
+			subtarget="en7562"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
+		fi
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

iop/scripts/genconfig_min.sh

@@ -12,13 +12,11 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
-	mediatek="target/linux/feeds/iopsys-mediatek"
-	qualcomm_ipq95xx="target/linux/feeds/ipq95xx"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	econet="target/linux/iopsys-econet"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -84,8 +82,8 @@ function genconfig_min {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
+			local targetpath="./target/linux/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -118,13 +116,9 @@ function genconfig_min {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
-		[ -e $qualcomm_ipq95xx/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -172,22 +166,6 @@ function genconfig_min {
 		    return
 		fi
 	    done
-
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx/config"
-		    return
-		fi
-	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -332,25 +310,19 @@ function genconfig_min {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
-			if [ -z "$mk_file" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			local subtarget="$(basename "${mk_file%.mk}")"
+		if [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			;;
-		*)
+		elif [ "$target" = "iopsys_econet" ]; then
+			subtarget="en7562"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
+		fi
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

iop/scripts/install_key.sh

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

iop/scripts/iopupgrade.sh

@@ -1,283 +1,344 @@
 # this is a developer helper script to install firmware on a remote host with SSH
 
 function upd_usage {
-	echo "usage: $0 ssh_upgrade [-t <host>] [-f <file>] [opts] "
-	echo ""
-	echo "   Default host is 192.168.1.1"
-	echo "   Default firmware file is the latest one (last.{itb,pkgtb})"
-	echo "   Default is to not keep configuration"
-	echo "opts:"
-	echo ""
-	echo "	-i	Interactive use, allows to select firmware file"
-	echo "	-n	Do not do the final reboot of the target board"
-	echo "	-c	Keep configuration"
-	echo "	-x	Force install even if firmware is not for this board"
-	echo "	-b	Force install of bootloader regardless of version installed"
+    echo "usage: $0 iopupgrade -t <host> -f <file> [opts] "
+    echo ""
+    echo "   Default host is 192.168.1.1"
+    echo "   Default firmware file is the newest one found"
+    echo "   Default is to not keep configuration"
+    echo "opts:"
+    echo ""
+    echo "	-i	Interactive use, Allows to select firmware file"
+    echo "	-n	Do not do the final reboot of the target board"
+    echo "	-c	Keep configuration"
+    echo "	-x	Force install even if firmware is not for this board"
+    echo "	-b	Force install of bootloader regardless of version installed"
+    echo "	-s	Use sysupgade. old upgrade method, needed for old releases that do not have iopu"
 }
 
 function set_config_string {
-	eval $(grep $1 .config)
+    eval `grep $1 .config`
 }
 
 function upd_ask_ok {
-	echo "Will continue with the following settings:"
-	echo "-----------------------------------------"
-	printf "%20s: %s\n" "Firmware file" "$upd_fw_base"
-	printf "%20s: %s\n" "Host IP" "$upd_host"
-	printf "%20s: " "Reboot"
-	if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Keep config"
-	if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force bootloader"
-	if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force image upgrade"
-	if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	echo "-----------------------------------------"
+    echo "Will Continue with the following settings"
+    echo "-----------------------------------------"
+    printf "%20s: %s\n"  "Firmare file" "$upd_fw_base"
+    printf "%20s: %s\n"  "Host ip" "$upd_host"
+    printf "%20s: " "Reboot";               if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Keep config";          if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Force bootloader";     if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Force image upgrade";  if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Use sysupgrade";       if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    echo "-----------------------------------------"
 
-	echo -n "Continue? [Y/n/q]:"
-	read answer
+    if [ "$upd_sysupgrade" == "0" ]
+       then
+	   if [ "$upd_keepconf"   == "1" ] ;then echo "keeping config is just a fantasy it's not yet implemented, try sysupgrade";fi
+    fi
 
-	case $answer in
-	n | N)
-		return 1
-		;;
-	q | Q)
-		exit 1
-		;;
-	y | Y | *)
-		return 0
-		;;
-	esac
+    echo -n "Continue? [Y/n/q]:"
+    read answer
+
+    case $answer in
+	n|N)
+	    return 1;;
+	q|Q)
+	    exit 1;;
+	y|Y|*)
+	    return 0;;
+    esac
 }
 
 function upd_select_file {
-	dialog --keep-tite --title "To select a file, use TAB/ARROW to highlight then press SPACEBAR -> RETURN" \
-		--fselect "${upd_fw:-bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/}" \
-		$((lines - 10)) $((cols - 5)) \
-		2>$tempfile
 
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_fw="$new_file"
-		upd_fw_base=$(basename $upd_fw)
-	fi
+    dialog --keep-tite --title "To select file use TAB/ARROW to hilight then press SPACEBAR -> RETURN" \
+	   --fselect "bin/targets/$CONFIG_TARGET_BOARD/generic/" \
+	   $((lines -10)) $((cols -5)) \
+	   2> $tempfile
+
+    new_file=$(cat $tempfile)
+    if [ -n "$new_file" ]
+    then
+	upd_fw="$new_file"
+	upd_fw_base=$(basename $upd_fw);
+    fi
 }
 
 function upd_select_target {
-	dialog --keep-tite --title "Input the hostname/IP of the target board" \
-		--inputbox "Name/IP" \
-		$((lines - 10)) $((cols - 5)) \
-		"$upd_host" \
-		2>$tempfile
 
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_host="$new_file"
-	fi
+    dialog --keep-tite --title "Input the name/ip number of target board" \
+	   --inputbox "Name/IP" \
+	   $((lines -10)) $((cols -5)) \
+	   "$upd_host" \
+	   2> $tempfile
+
+    new_file=$(cat $tempfile)
+    if [ -n "$new_file" ]
+    then
+	upd_host="$new_file"
+    fi
 }
 
-function upd_select_reboot {
-	dialog --keep-tite --radiolist "Should the board reboot after download finished" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Reboot" "Restart board after done" $(if [ "$upd_noreboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		"No reboot" "Continue running old system" $(if [ "$upd_noreboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
 
-	res=$(cat $tempfile)
-	case $res in
+function upd_select_reboot {
+    dialog --keep-tite --radiolist "Should the board reboot after download finished" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Reboot" "Restart board after done"       `if [ "$upd_noreboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "No reboot" "Continue running old system" `if [ "$upd_noreboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
 	"No reboot")
-		upd_noreboot=1
-		;;
+	    upd_noreboot=1
+	;;
 	"Reboot")
-		upd_noreboot=0
-		;;
-	esac
+	    upd_noreboot=0
+	    ;;
+    esac
 }
 
 function upd_select_config {
-	dialog --keep-tite --radiolist "Should the configuration be kept" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Keep" "Keep the config from old system" $(if [ "$upd_keepconf" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Default" "Use default config for new system" $(if [ "$upd_keepconf" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
+    dialog --keep-tite --radiolist "Should the configuration be keept" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Keep" "Keep the config from old system"      `if [ "$upd_keepconf" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Default" "Use default config for new system" `if [ "$upd_keepconf" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
 
-	res=$(cat $tempfile)
-	case $res in
+    res=$(cat $tempfile)
+    case $res in
 	"Keep")
-		upd_keepconf=1
-		;;
+	    upd_keepconf=1
+	    ;;
 	"Default")
-		upd_keepconf=0
-		;;
-	esac
+	    upd_keepconf=0
+	    ;;
+    esac
 }
 
 function upd_select_forceboot {
-	dialog --keep-tite --radiolist "Should the boot loader be updated regardless of the version installed" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Always update boot loader" $(if [ "$upd_forceboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Version check" "Only upgrade if version is newer" $(if [ "$upd_forceboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
+    dialog --keep-tite --radiolist "Should the boot loader be updated reagardless of version installed" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Force" "Alwasy update boot loader"                `if [ "$upd_forceboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Version check" "Only upgrade if version is newer" `if [ "$upd_forceboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
 
-	res=$(cat $tempfile)
-	case $res in
+    res=$(cat $tempfile)
+    case $res in
 	"Force")
-		upd_forceboot=1
-		;;
+	    upd_forceboot=1
+	    ;;
 	"Version check")
-		upd_forceboot=0
-		;;
-	esac
+	    upd_forceboot=0
+	    ;;
+    esac
 }
 
 function upd_select_forceimage {
-	dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Disable sanity check and force use of image (dangerous)" $(if [ "$upd_forceimage" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Only compatible" "Normal checks apply" $(if [ "$upd_forceimage" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
+    dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Force" "Dissable sanity check and force use of image (dangerous)" `if [ "$upd_forceimage" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Only compatible" "Normal checks apply"                            `if [ "$upd_forceimage" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
 
-	res=$(cat $tempfile)
-	case $res in
+    res=$(cat $tempfile)
+    case $res in
 	"Force")
-		upd_forceimage=1
-		;;
+	    upd_forceimage=1
+	    ;;
 	"Only compatible")
-		upd_forceimage=0
-		;;
-	esac
+	    upd_forceimage=0
+	    ;;
+    esac
+}
+
+function upd_select_sysupgrade {
+    dialog --keep-tite --radiolist "Use the old way to upgrade a board" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "iopu" "Use the iop upgrade methode"          `if [ "$upd_sysupgrade" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "sysupgrade" "Use the old sysupgrade methode" `if [ "$upd_sysupgrade" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
+	"iopu")
+	    upd_sysupgrade=0
+	    ;;
+	"sysupgrade")
+	    upd_sysupgrade=1
+	    ;;
+    esac
 }
 
 function upd_select {
-	dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select item to change" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Firmware file" "$upd_fw_base" \
-		"Host IP" "$upd_host" \
-		"Reboot" $(if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Keep config" $(if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force bootloader" $(if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force image upgrade" $(if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		2>$tempfile
 
-	case $(cat $tempfile) in
-	"Firmware file")
-		upd_select_file
-		;;
-	"Host IP")
-		upd_select_target
-		;;
+    dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select Item to change" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Firmare file" "$upd_fw_base"\
+	   "Host ip" "$upd_host" \
+	   "Reboot"               `if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Keep config"          `if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Force bootloader"     `if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Force image upgrade"  `if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "sysupgrade"           `if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   2> $tempfile
+
+
+    case $(cat $tempfile) in
+	"Firmare file")
+	    upd_select_file
+	    ;;
+	"Host ip")
+	    upd_select_target
+	    ;;
 	"Reboot")
-		upd_select_reboot
-		;;
+	    upd_select_reboot
+	    ;;
 	"Keep config")
-		upd_select_config
-		;;
+	    upd_select_config
+	    ;;
 	"Force bootloader")
-		upd_select_forceboot
-		;;
+	    upd_select_forceboot
+	    ;;
 	"Force image upgrade")
-		upd_select_forceimage
-		;;
+	    upd_select_forceimage
+	    ;;
+	"sysupgrade")
+	    upd_select_sysupgrade
+	    ;;
 	*)
-		return
-		;;
-	esac
-	upd_select
+	    return
+	;;
+    esac
+    upd_select
 }
 function upd_select_start {
-	lines=$(tput lines)
-	cols=$(tput cols)
-	tempfile="$(mktemp)"
-	trap "rm -f $tempfile" 0 1 2 5 15
-	upd_select
+    lines=$(tput lines)
+    cols=$(tput cols)
+    tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
+    trap "rm -f $tempfile" 0 1 2 5 15
+    upd_select
 
 }
 
 function ssh_upgrade {
-	upd_noreboot=0
-	upd_forceboot=0
-	upd_keepconf=0
-	upd_forceimage=0
-	upd_fw_base=""
-	upd_fw=""
-	upd_host="192.168.1.1"
-	do_dialog=0
+    upd_noreboot=0
+    upd_forceboot=0
+    upd_keepconf=0
+    upd_forceimage=0
+    upd_fw_base=""
+    upd_fw=""
+    upd_host="192.168.1.1"
+    upd_sysupgrade=1
+    do_dialog=0
 
-	while getopts "f:hnxt:icb" opt; do
-		case $opt in
-		n)
-			upd_noreboot=1
-			;;
-		x)
-			upd_forceimage=1
-			;;
-		b)
-			upd_forceboot=1
-			;;
-		c)
-			upd_keepconf=1
-			;;
-		v)
-			verbose=$OPTARG
-			;;
-		f)
-			upd_fw=$OPTARG
-			;;
-		t)
-			upd_host=$OPTARG
-			;;
-		i)
-			do_dialog=1
-			;;
-		h)
-			upd_usage
-			exit 1
-			;;
-		\?)
-			echo "Invalid option: -$OPTARG" >&2
-			exit 1
-			;;
-		esac
-	done
-
-	if [ -z "$upd_fw" ]; then
-		set_config_string CONFIG_TARGET_BOARD
-		set_config_string CONFIG_TARGET_SUBTARGET
-		upd_fw="$(realpath -q --canonicalize-existing --relative-to=. "bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/"last.{pkgtb,itb})"
-		if [ -z "$upd_fw" ] && [ $do_dialog -eq 0 ]; then
-			echo "Could not find image. Check that last.{itb,pkgtb} exists or specify an image using -f <image> or -i (interactive)." >&2
-			return 1
-		fi
-	fi
-	upd_fw_base="$(basename "$upd_fw")"
-
-	[ $do_dialog -eq 1 ] && upd_select_start
-
-	if ! upd_ask_ok; then
-		upd_select_start
-		if ! upd_ask_ok; then
-			exit 1
-		fi
-	fi
-
-	if [ ! -f $upd_fw ]; then
-		echo "Firmware file $firmware does not exist."
+    while getopts "f:hnxt:iscb" opt; do
+	case $opt in
+	    n)
+		upd_noreboot=1
+		;;
+	    x)
+		upd_forceimage=1
+		;;
+	    b)
+		upd_forceboot=1
+		;;
+	    c)
+		upd_keepconf=1
+		;;
+	    v)
+		verbose=$OPTARG
+		;;
+	    f)
+		upd_fw=$OPTARG
+		;;
+	    t)
+		upd_host=$OPTARG
+		;;
+	    i)
+		do_dialog=1
+		;;
+	    s)
+		upd_sysupgrade=1
+		;;
+	    h)
+		upd_usage
 		exit 1
+		;;
+	    \?)
+		echo "Invalid option: -$OPTARG" >&2
+		exit 1
+		;;
+	esac
+    done
+
+    if [ -n "$upd_fw" ]
+    then
+	upd_fw_base=$(basename $upd_fw);
+    else
+	set_config_string CONFIG_TARGET_BOARD
+	firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t *[0-9].y[3])
+
+	# if target uses pkgtb
+	if [ -z "$firmwares"]
+	then
+	    # pkgtb files can not be streamed so copy over the file witch scp
+	    use_scp=1
+	    firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t last.pkgtb)
 	fi
 
-	extra_args=""
-	[ $upd_noreboot -eq 1 ] && extra_args="$extra_args --no-reboot"
-	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args --force"
-	[ $upd_keepconf -eq 0 ] && extra_args="$extra_args -n"
-	[ $upd_forceboot -eq 1 ] && extra_args="$extra_args --force-loader-upgrade"
+	for upd_fw_base in $firmwares
+	do
+	    #echo "firmware $upd_fw"
+	    break
+	done
+	upd_fw="bin/targets/$CONFIG_TARGET_BOARD/generic/$upd_fw_base"
+    fi
 
-	pv "$upd_fw" |
-		ssh \
-			-o ConnectTimeout=60 \
-			-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-			root@"$upd_host" \
-			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
-		echo "Sysupgrade failed" >&2 && return 1
+    [ $do_dialog -eq 1 ] && upd_select_start
+
+    if ! upd_ask_ok
+    then
+	upd_select_start
+	if ! upd_ask_ok
+	then
+	    exit 1
+	fi
+    fi
+
+    if [ ! -f $upd_fw ]
+    then
+	echo "firmware file $firmware do not exist"
+	exit 1
+    fi
+
+    if [ $upd_sysupgrade -eq 0 ]
+    then
+	extra_args=""
+	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -n"
+	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args -x"
+	[ $upd_forceboot  -eq 1 ] && extra_args="$extra_args -b"
+
+	file_size_kb=`du -k "$upd_fw" | cut -f1`
+	if [ "$use_scp" == "1" ]
+	then
+	    scp $upd_fw root@$upd_host:/tmp/ &&
+		ssh -o ConnectTimeout=60 root@$upd_host "iopu $extra_arg -f /tmp/$upd_fw_base"
+	else
+	    cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
+	fi
+    else
+	extra_args=""
+	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -d"
+	[ $upd_keepconf   -eq 0 ] && extra_args="$extra_args -n"
+
+	scp $upd_fw root@$upd_host:/tmp/ &&
+	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $extra_args /tmp/$upd_fw_base" &&
+	    echo "sysupgrade done!"
+    fi
 }
 
-register_command "ssh_upgrade" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"
+register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"
+
+

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.3.25
+PKG_VERSION:=2.10.2.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=fa73ec8a5128dd9609abfd17ca40dbf10327684b
+PKG_SOURCE_VERSION:=4ed3f9bf0743086a85e1b7cf49c47eb49ab05015
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -56,7 +56,6 @@ endef
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
@@ -84,8 +83,6 @@ define Package/map-agent/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/lib/wifi
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/script/* $(1)/lib/wifi/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 

map-agent/files/etc/config/mapagent

@@ -6,6 +6,8 @@ config agent 'agent'
 	option netdev 'wlan'
 	option island_prevention '0'
 	option eth_onboards_wifi_bhs '0'
+	option ap_follow_sta_dfs '0'
+	option guest_isolation '0'
 #	option controller_macaddr '0a:1b:2c:3d:4e:50'
 
 config dynamic_backhaul

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

@@ -69,7 +69,7 @@ validate_ap_section() {
 	uci_validate_section mapagent $section "${1}" \
 			'ifname:string' \
 			'device:string' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'enabled:bool:true' \
 			'onboarded:bool:false' \
 			'ssid:string' \
@@ -91,7 +91,7 @@ validate_radio_section() {
 
 	uci_validate_section mapagent $section "${1}" \
 			'device:string' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'configured:bool:false' \
 			'onboarded:bool:false' \
 			'dedicated_backhaul:bool:false' \
@@ -168,10 +168,6 @@ validate_agent_config() {
 	return 0
 }
 
-create_dir() {
-        mkdir -p /var/run/multiap
-}
-
 start_service() {
 	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
 
@@ -187,7 +183,6 @@ start_service() {
 	[ "$enabled" -eq 0 ] && return 1
 
 	procd_open_instance
-	create_dir
 	procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1

map-agent/files/lib/wifi/multiap

@@ -0,0 +1,945 @@
+#!/bin/sh
+
+# functions
+# wireless_teardown - tear down ifaces based on mapagent config
+# setup_network     - prepare /etc/config/network if necessary
+# setup_wireless    - prepare /etc/config/wireless based on mapagent config
+# write_credentials - write bBSS credentials to fBSS
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+. /lib/wifi/traffic_separation
+
+MAPFILE="/tmp/multiap.backhaul"
+
+diff=0
+onbrd_bssid=0
+onbrd_band=0
+
+usage() {
+	cat <<EOF
+Usage: $0 [wireless_teardown|setup_network|setup_wireless|write_credentials]
+Platform specific Multi-AP script to prepare network and wifi subsystem based on
+mapagent configuration.
+wireless_teardown - tear down ifaces in /etc/config/wireless
+setup_network     - prepare /etc/config/network
+setup_wireless    - prepare /etc/config/wireless
+write_credentials - write bBSS credentials to fBSS
+EOF
+	exit 1
+}
+
+
+type_to_multi_ap () {
+	type="$1"
+
+	if [ "$type" = "backhaul" ]; then
+		echo "1"
+		return
+	elif [ "$type" = "fronthaul" ]; then
+		echo "2"
+		return
+	elif [ "$type" = "combined" ]; then
+		echo "3"
+		return
+	fi
+
+	echo "0"
+}
+
+get_type_by_section() {
+	section="$1"
+
+	config_get type $section type "0"
+
+	echo "$(type_to_multi_ap $type)"
+}
+
+sync_credentials() {
+	bands=""
+	json_init
+	mapagent_process_fh() {
+		local section=$1
+		local dev=$2
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
+		config_get device $section device
+
+		[ "$dev" != "$device" ] && return
+
+		config_get band $section band
+		config_get ssid $section ssid
+		config_get encryption $section encryption
+		config_get key $section key
+
+		section=$(uci add ieee1905 ap)
+		[ "$section" == "" ] && return
+
+		uci -q set ieee1905.${section}.band=$band
+		uci -q set ieee1905.${section}.ssid="$ssid"
+		uci -q set ieee1905.${section}.encryption=$encryption
+		uci -q set ieee1905.${section}.key="$key"
+		json_select "$band" > /dev/null
+		if [ "$?" = "0" ]; then
+			json_get_keys keys
+
+			for key in ${keys};
+			do
+				json_get_var val "$key"
+				uci -q set ieee1905.${section}.$key="$val"
+			done
+			json_select ..
+		fi
+	}
+
+	mapagent_process_radio() {
+		local section=$1
+
+		config_get device $section device
+		config_get band $section band
+		config_get dedicated_backhaul $section dedicated_backhaul 0
+
+		[ "$dedicated_backhaul" != "0" ] && return
+
+		for b in $bands; do
+			if [ "$b" == "$band" ]; then
+				return
+			fi
+		done
+
+		config_foreach mapagent_process_fh ap $device
+		bands="$bands $band"
+	}
+
+	ieee1905_del_ap() {
+		append_value() {
+			local section=$1
+			local key=$2
+			shift
+			shift
+
+			while [ "$key" != "" ]; do
+				val=$(uci -q get ieee1905.$section.$key)
+				[ "$val" = "" ] && {
+					key=$1
+					shift
+					continue
+				}
+				json_add_string "$key" ${val}
+				key=$1
+				shift
+			done
+		}
+
+		local section=$1
+		local band
+
+		config_get band $section band
+		json_select "$band" > /dev/null
+		rc=$?
+		[ "$rc" != "0" ] && json_add_object "$band"
+		append_value $section "manufacturer" "model_name" "device_name" "model_number" "serial_number" "device_type" "os_version"
+		if [ "$rc" != "0" ]; then
+			json_close_object
+		else
+			json_select ..
+		fi
+
+		uci -q delete ieee1905.${section}
+	}
+
+	config_load ieee1905
+	config_foreach ieee1905_del_ap ap
+
+	config_load mapagent
+	config_foreach mapagent_process_radio radio
+
+	uci commit ieee1905
+	json_cleanup
+}
+
+write_credentials() {
+	config_load mapagent
+
+	mapagent_apply_wireless() {
+		write_wireless() {
+			local section=$1
+			local map_ifname=$2
+			local bk_ssid="$3"
+			local bk_key="$4"
+
+			config_get ifname $section ifname
+
+			#echo found device=$device map=$multi_ap ifname=$ifname mapifname=$map_ifname
+
+			[ "$ifname" != "$map_ifname" ] && return
+
+			#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
+
+			uci -q set wireless.${section}.multi_ap_backhaul_ssid="$bk_ssid"
+			uci -q set wireless.${section}.multi_ap_backhaul_key="$bk_key"
+		}
+		config_load wireless
+
+		config_foreach write_wireless wifi-iface "$1" "$2" "$3"
+	}
+
+	mapagent_find_fbss() {
+		local section=$1
+		local dev=$2
+		local bk_ssid="$3"
+		local bk_key="$4"
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
+		config_get device $section device
+
+		#echo found dev=$dev device=$device map=$multi_ap
+
+		[ "$device" != "$dev" ] && return
+		[ "$multi_ap" != "2" ] && return
+
+		config_get ifname $section ifname
+
+		#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
+
+		# subshell in hopes to maintain mapagent config loaded
+		(mapagent_apply_wireless $ifname "$bk_ssid" "$bk_key")
+	}
+
+	mapagent_find_bbss() {
+		local section=$1
+		local dev=$2
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
+		config_get device $section device
+		config_get enabled $section enabled "1"
+
+		#echo found dev=$dev device=$device map=$multi_ap
+
+		[ "$enabled" == "0" ] && return
+		[ "$device" != "$dev" ] && return
+		[ "$multi_ap" != "1" ] && return
+
+		config_get ssid $1 ssid
+		config_get key $1 key
+
+		#echo found ssid="$ssid" key="$key"
+
+		config_foreach mapagent_find_fbss ap $dev "$ssid" "$key"
+	}
+
+	mapagent_process_radio() {
+		local section=$1
+
+		config_get device $section device
+
+		#echo found dev=$dev
+
+		config_foreach mapagent_find_bbss ap $device
+	}
+
+
+	config_foreach mapagent_process_radio radio
+
+	uci commit wireless
+}
+
+set_network() {
+	local ifname=$1
+	local num=$2
+	local bssid=$3
+
+	wpa_cli -i $ifname set_n $num bssid $bssid
+}
+
+bsta_steer() {
+	local ifname=$1
+	local bssid=$2
+
+	rc=$(wpa_cli -i $ifname set_n 0 bssid $bssid)
+	[ "$rc" == "FAIL" ] && {
+		echo "1"
+		return;
+	}
+
+	rc=$(wpa_cli -i $ifname roam $bssid)
+	[ "$rc" == "FAIL" ] && {
+		echo "1"
+		return;
+	}
+}
+
+write_bsta_config() {
+	local ifname=$1
+
+	#echo diff = $diff > /dev/console
+
+
+	config_load mapagent
+
+	mapagent_apply_wl_bsta() {
+		apply_config() {
+			local section=$1
+			local bsta=$2
+			local bssid=$3
+
+			config_get ifname $section ifname
+
+			[ "$bsta" == "$ifname" ] || return
+			#echo setting diff = $diff > /dev/console
+			old_bssid="$(uci -q get wireless.${section}.bssid)"
+
+			[ "$old_bssid" == "$bssid" ] && break
+
+			uci -q set wireless.${section}.bssid=$bssid
+			wpa_cli -i "$bsta" set_n 0 bssid $bssid
+			wpa_cli -i "$bsta" save_config
+			echo 1
+		}
+		config_load wireless
+
+		config_foreach apply_config wifi-iface $1 $2
+		uci commit wireless
+	}
+
+	mapagent_process_bk() {
+		local section=$1
+		local bsta=$2
+
+
+		config_get ifname $section ifname
+		#echo bsta = $bsta > /dev/console
+
+		[ "$bsta" == "$ifname" ] || return
+		#echo found ifname=$ifname > /dev/console
+
+		config_get bssid $section bssid
+		config_get band $section band
+		ret=$(mapagent_apply_wl_bsta $ifname $bssid)
+		[ "$ret" == "1" ] && {
+			diff=1
+			onbrd_bssid=$bssid
+			onbrd_band=$band
+		}
+	}
+
+	mapagent_apply_bssid_same_band() {
+		apply_config() {
+			local section=$1
+			local bsta=$2
+
+			config_get ifname $section ifname
+
+			[ "$bsta" == "$ifname" ] || return
+			uci -q set wireless.${section}.bssid=$bssid
+		}
+
+		config_get band $1 band
+		config_get onboarded $1 onboarded "0"
+
+		[ "$onbrd_band" != "$band" -o "$onboarded" = "1" ] && return
+
+		config_get ifname $1 ifname
+
+		config_load wireless
+		config_foreach apply_config wifi-iface $ifname $onbrd_bssid
+		uci commit wireless
+	}
+
+	config_foreach mapagent_process_bk bsta $ifname
+
+	#echo result diff = $diff > /dev/console
+	[ "$diff" == "1" ] && {
+		(config_foreach mapagent_apply_bssid_same_band bsta)
+		#ubus call uci commit '{"config":"wireless"}'
+		#echo reloading wireless > /dev/console
+	}
+
+}
+
+teardown_iface() {
+	config_load mapagent
+
+	local iface=$1
+
+	mapagent_teardown_wireless() {
+		write_wireless() {
+			local section=$1
+			local map_ifname=$2
+
+			config_get ifname $section ifname
+
+			[ "$ifname" != "$map_ifname" ] && return
+
+			uci -q set wireless.${section}.disabled="1"
+			uci -q set wireless.${section}.ssid="DISABLED-SSID"
+			uci -q set wireless.${section}.key="DISABLED-KEY"
+			uci -q delete wireless.${section}.multi_ap_backhaul_ssid
+			uci -q delete wireless.${section}.multi_ap_backhaul_key
+		}
+
+		config_load wireless
+
+		config_foreach write_wireless wifi-iface $1
+	}
+
+	mapagent_teardown_bss() {
+		local section=$1
+		local iface=$2
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
+		config_get ifname $section ifname
+
+		[ "$iface" != "$ifname" ] && return
+
+		config_get ifname $section ifname
+		uci -q set mapagent.${section}.enabled="0"
+		uci -q set mapagent.${section}.ssid="DISABLED-SSID"
+		uci -q set mapagent.${section}.key="DISABLED-KEY"
+		uci -q del mapagent.${section}.vid
+
+		# subshell in hopes to maintain mapagent config loaded
+		(mapagent_teardown_wireless $ifname)
+	}
+
+
+	config_foreach mapagent_teardown_bss ap $iface
+
+	uci commit wireless
+	uci commit mapagent
+}
+
+bsta_to_wireless() {
+	config_load mapagent
+
+	mapagent_find_lowest_prio_onboarded() {
+		mapagent_process_bk() {
+			config_get priority $1 priority "2"
+			config_get onboarded $1 onboarded "0"
+
+			[ "$onboarded" = "0" ] && return
+
+			if [ -z "$sec" -o "$prio" = "-1" -o "$priority" -lt "$prio" ]; then
+				sec=$1
+				prio=$priority
+			fi
+		}
+
+		local sec=""
+		local prio="-1"
+
+		config_foreach mapagent_process_bk bsta
+		echo $sec
+	}
+
+	mapagent_enable_best() {
+		#echo 1=$1 best=$best > /dev/console
+		if [ "$1" = "$best" ]; then
+			uci -q set mapagent.$1.enabled='1'
+		else
+			uci -q set mapagent.$1.enabled='0'
+		fi
+	}
+
+	mapagent_bsta_to_wireless() {
+		mapagent_apply_wl_bsta() {
+			apply_config() {
+				local section=$1
+				local bsta=$2
+				local ssid="$3"
+				local key="$4"
+				local encryption=$5
+				local enabled=$6
+				local bssid=$7
+				local disabled="0"
+
+				config_get ifname $section ifname
+
+				[ -z "$enabled" -o "$enabled" = "0" ] && disabled="1"
+
+				[ "$bsta" == "$ifname" ] || return
+
+				uci -q set wireless.${section}.ssid="$ssid"
+				uci -q set wireless.${section}.key="$key"
+				uci -q set wireless.${section}.encryption=$encryption
+				uci -q set wireless.${section}.bssid="$bssid"
+				uci -q set wireless.${section}.default_disabled='0'
+
+				[ "$disabled" != "1" ] && return
+				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
+				wpa_cli -i "$bsta" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$bsta" save_config > /dev/null 2>&1
+
+				echo 1
+			}
+
+			config_load wireless
+
+			config_foreach apply_config wifi-iface $@
+			uci commit wireless
+		}
+
+		mapagent_find_other_creds() {
+			#echo "trying to find other creds for $2" > /dev/console
+			local other_section="$2"
+
+			config_get band $1 band
+			config_get onboarded $1 onboarded "0"
+
+			[ "$4" != "$band" -o "$onboarded" = "0" ] && return
+
+			config_get ssid $1 ssid
+			config_get key $1 key
+			config_get encryption $1 encryption
+			config_get enabled $1 enabled "0"
+			config_get bssid $1 bssid
+
+			uci -q set mapagent.${other_section}.ssid="$ssid"
+			uci -q set mapagent.${other_section}.key="$key"
+			uci -q set mapagent.${other_section}.encryption=$encryption
+			uci -q set mapagent.${other_section}.bssid="$bssid"
+			uci commit mapagent
+			(mapagent_apply_wl_bsta "$3" "$ssid" "$key" $encryption "$5" "$bssid")
+		}
+
+		config_get band $1 band
+		config_get ifname $1 ifname
+		config_get onboarded $1 onboarded "0"
+		config_get enabled $1 enabled "0"
+
+		if [ "$onboarded" = "0" ]; then
+			config_foreach mapagent_find_other_creds bsta $1 $ifname $band $enabled
+		else
+			config_get ssid $1 ssid
+			config_get key $1 key
+			config_get encryption $1 encryption
+			config_get bssid $1 bssid
+
+			(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
+		fi
+	}
+
+#	best=$(mapagent_find_lowest_prio_onboarded)
+#
+#	[ -z "$best" ] && return
+#
+#	band=$1
+#	sec=""
+#	prio=""
+#
+#	config_foreach mapagent_enable_best bsta $best
+#	uci commit mapagent
+	config_load mapagent
+
+	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
+
+#	[ "$diff" != "" ] && {
+
+		ubus call uci commit '{"config":"wireless"}'
+#	}
+}
+
+
+sync_mapcontroller_from_wireless() {
+	ubus -t 5 wait_for wifi
+	[ "$?" != "0" ] && return
+
+	[ ! -f "/etc/config/wireless" ] && return
+
+	status=$(ubus -S call wifi status)
+
+	device_to_band() {
+		local ifname=$1
+		json_load "$status"
+		json_select "radios"
+		json_get_keys keys
+
+		for key in $keys; do
+			json_select $key
+			json_get_var name name
+
+			if [ "$name" != "$ifname" ]; then
+				json_select ..
+				continue
+			fi
+
+			json_get_var band band
+
+			if [ "$band" == "5GHz" ]; then
+				echo "5"
+			elif [ "$band" == "2.4GHz" ]; then
+				echo "2"
+			fi
+
+			break
+		done
+
+		json_cleanup
+	}
+
+	wireless_process_iface() {
+		local section=$1
+		local type="ap"
+		local enabled="1"
+
+		config_get multi_ap $section multi_ap 0
+		[ "$multi_ap" != "1" ] && [ "$multi_ap" != "2" ] && return
+
+		config_get mode $section mode "ap"
+		[ "$mode" != "ap" ] && return
+
+		config_get device $section device
+		band=$(device_to_band $device)
+		[ "$band" == "" ] && return
+
+		config_get ssid $section ssid
+		config_get key $section key
+		config_get encryption $section encryption
+		config_get start_disabled $section start_disabled "0"
+		config_get network $section network
+
+
+		cntlr_section=$(uci add mapcontroller ${type})
+		uci -q set mapcontroller.${cntlr_section}.ssid="$ssid"
+		uci -q set mapcontroller.${cntlr_section}.key="$key"
+		uci -q set mapcontroller.${cntlr_section}.encryption="$encryption"
+		uci -q set mapcontroller.${cntlr_section}.band="$band"
+		uci -q set mapcontroller.${cntlr_section}.vid="1"
+		uci -q set mapcontroller.${cntlr_section}.network="$network"
+
+		[ "$multi_ap" == "1" ] && map_type="backhaul" || map_type="fronthaul"
+		uci -q set mapcontroller.${cntlr_section}.type="$map_type"
+
+		[ "$start_disabled" == "1" ] && enabled="0"
+		uci -q set mapcontroller.${cntlr_section}.enabled="$enabled"
+	}
+
+	mapcontroller_teardown() {
+		local section=$1
+
+		uci delete mapcontroller.$1
+	}
+
+	config_load mapcontroller
+	config_foreach mapcontroller_teardown ap
+
+	config_load wireless
+	config_foreach wireless_process_iface wifi-iface
+	uci commit mapcontroller
+}
+
+bsta_scan_on_enabled() {
+	local onboarded_bands=""
+
+	mapagent_onboarded_bands() {
+		config_get band $1 band
+		config_get onboarded $1 onboarded "0"
+
+		[ "$onboarded" = "0" ] && return
+
+		onboarded_bands="$onboarded_bands $band"
+	}
+
+	mapagent_enable_bk() {
+		config_get ifname $1 ifname
+		config_get band $1 band
+		config_get enabled $1 enabled
+
+		[ "$enabled" = "0" ] && return
+
+		for onboarded_band in $onboarded_bands
+		do
+			[ "$onboarded_band" != "$band" ] && continue
+
+			logger -t multiap "bsta_scan_on_enabled $ifname $band"
+			wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
+			wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
+			wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+		done
+	}
+
+	config_load mapagent
+	config_foreach mapagent_onboarded_bands bsta
+	config_foreach mapagent_enable_bk bsta
+}
+
+bsta_enable_all() {
+	mapagent_enable_bk() {
+		config_get ifname $1 ifname
+		uci -q set mapagent.$1.enabled="1"
+	}
+
+	config_load mapagent
+
+	config_foreach mapagent_enable_bk bsta
+	uci commit mapagent
+	bsta_scan_on_enabled
+}
+
+# arg = one interface to clear
+# no arg = clear all interfaces
+bsta_clear_bssid() {
+	local iface=$1
+
+	mapagent_remove_bssid() {
+		local iface=$2
+
+		config_get ifname $1 ifname
+
+		[ -n "$iface" -a "$iface" != "$ifname" ] && return
+
+		uci -q set mapagent.$1.enabled="1"
+		uci -q del mapagent.$1.bssid
+	}
+
+	wireless_remove_bssid() {
+		local iface=$2
+
+		config_get mode $1 mode
+		config_get ifname $1 ifname
+
+		[ "$mode" != "sta" ] && return
+
+		[ -n "$iface" -a "$iface" != "$ifname" ] && return
+
+		uci -q del wireless.$1.bssid
+		wpa_cli -i "$ifname" bssid 0 00:00:00:00:00:00 > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	config_load mapagent
+	config_foreach mapagent_remove_bssid bsta $iface
+	uci commit mapagent
+
+	config_load wireless
+	config_foreach wireless_remove_bssid wifi-iface $iface
+	uci commit wireless
+}
+
+# arg1 = ifname arg2 = bssid
+bsta_blacklist_bssid_set() {
+	local ifname="$1"
+	shift
+	local bssid="$@"
+
+	wpa_cli -i "$ifname" set_network 0 bssid_ignore "$bssid" > /dev/null 2>&1
+	wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+}
+
+bsta_blacklist_bssid_clear() {
+	mapagent_blacklist_by_band() {
+		config_get ifname $1 ifname
+
+		wpa_cli -i "$ifname" set_network 0 bssid_ignore "" > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	config_load mapagent
+	config_foreach mapagent_blacklist_by_band bsta
+}
+
+bsta_disable_lower_priority() {
+	config_load mapagent
+
+	mapagent_get_priority() {
+		config_get ifname $1 ifname
+
+		[ "$ifname" != "$2" ] && return
+
+		config_get priority $1 priority "2"
+
+		echo "$priority"
+	}
+
+	mapagent_disable_lower_bk() {
+		mapagent_apply_wl_bsta() {
+			apply_config() {
+				local section="$1"
+				local bsta="$2"
+				local enabled="$3"
+
+				config_get ifname $section ifname
+
+				[ "$bsta" == "$ifname" ] || return
+
+				[ "$enabled" != "0" ] && return
+
+				wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
+				wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+			}
+			local ifname="$1"
+			local enabled="$2"
+
+			[ "$enabled" != "0" ] && return
+
+			config_load wireless
+
+			config_foreach apply_config wifi-iface $ifname $enabled
+		}
+
+		local enabled="1"
+
+		config_get ifname $1 ifname
+		config_get priority $1 priority
+
+		[ "$ifname" != "$2" -a "$priority" -gt "$3" ] && enabled="0"
+
+		# enable passed ifname explicitly
+		# don't explicitly enable other higher prio interfaces
+		[ "$ifname" != "$2" -a "$enabled" = "1" ] && return
+
+		uci -q set mapagent.$1.enabled="$enabled"
+
+		(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
+	}
+
+	local bsta=$1
+
+	prio=$(config_foreach mapagent_get_priority bsta $bsta)
+	#echo bsta $bsta has prio $prio > /dev/console
+
+	config_foreach mapagent_disable_lower_bk bsta $bsta $prio
+	uci commit mapagent
+
+#	ubus call uci commit '{"config":"wireless"}'
+}
+
+
+bsta_use_link() {
+	config_load mapagent
+
+	mapagent_disable_bk() {
+		local bsta="$2"
+
+		config_get ifname $1 ifname
+		config_get enabled $1 enabled
+
+		[ "$bsta" = "$ifname" ] && return
+
+		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
+		wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	local bsta=$1
+
+	config_foreach mapagent_disable_bk bsta $bsta
+
+	noht=$(iw $bsta info | grep "no HT")
+	[ -n "$noht" ] &&  {
+		logger -t multiap "no HT hit, issue reassoc $bsta"
+		wpa_cli -i $bsta reassoc
+	}
+}
+
+bsta_swap_to_link() {
+	bsta_disable_lower_priority $1
+	bsta_use_link $1
+
+	wpa_cli -i "$1" enable_network 0 > /dev/null
+	wpa_cli -i "$1" reconnect > /dev/null
+	wpa_cli -i "$1" save_config > /dev/null
+}
+
+set_uplink_backhaul_info() {
+	local ul_1905id=$1
+	local ul_mac=$2
+
+	(
+		flock -x 200
+		json_load "$(cat $MAPFILE)"
+		json_add_string "backhaul_device_id" "$ul_1905id"
+		json_add_string "backhaul_macddr" "$ul_mac"
+		json_dump > "$MAPFILE"
+		json_cleanup
+	) 200>/var/lock/map.backhaul.lock
+}
+
+set_uplink() {
+	local type=$1
+	local ifname=$2
+	local hwaddr
+
+	hwaddr="$(ifconfig $ifname | grep -i hwaddr | awk '{print $5}' | awk '{print tolower($0)}')"
+
+	json_init
+	json_add_string "type" "$type"
+	json_add_string "ifname" "$ifname"
+	json_add_string "macaddr" "$hwaddr"
+	(
+		flock -x 200
+		json_dump > "$MAPFILE"
+	) 200>/var/lock/map.backhaul.lock
+	json_cleanup
+
+	config_load mapagent
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":true, "prevent_island":true, "ifname":"all"}'
+	fi
+
+}
+
+unset_uplink() {
+	local type=${1:-wifi}
+
+	config_load mapagent
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
+	fi
+
+	(
+		flock -x 200
+		json_load "$(cat $MAPFILE)"
+		json_get_var bk_type type
+		json_cleanup
+
+		[ "$type" = "$bk_type" ] && rm -f "$MAPFILE" > /dev/null 2>&1
+	) 200>/var/lock/map.backhaul.lock
+}
+
+func=$1
+shift
+
+case "$func" in
+	wireless_teardown) wireless_teardown;;
+	setup_network) setup_network;;
+	setup_wireless) setup_wireless;;
+	write_credentials) write_credentials;;
+	sync_credentials) sync_credentials;;
+	bsta_steer) bsta_steer $@;;
+	set_network) set_network $@;;
+	write_bsta_config) write_bsta_config $@;;
+	teardown_iface) teardown_iface $@;;
+	bsta_to_wireless) bsta_to_wireless $@;;
+	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
+	ts) ts_sub $@;;
+	bsta_enable_all) bsta_enable_all $@;;
+	bsta_clear_bssid) bsta_clear_bssid $@;;
+	bsta_blacklist_bssid_set) bsta_blacklist_bssid_set $@;;
+	bsta_blacklist_bssid_clear) bsta_blacklist_bssid_clear $@;;
+	bsta_disable_lower_priority) bsta_disable_lower_priority $@;;
+	bsta_scan_on_enabled) bsta_scan_on_enabled $@;;
+	bsta_use_link) bsta_use_link $@;;
+	bsta_swap_to_link) bsta_swap_to_link $@;;
+	set_uplink) set_uplink $@;;
+	set_uplink_backhaul_info) set_uplink_backhaul_info $@;;
+	unset_uplink) unset_uplink $@;;
+	--help|help) usage;;
+	*) usage; exit 1;;
+esac
+

map-agent/files/lib/wifi/traffic_separation

@@ -0,0 +1,460 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+AL_BRIDGE=${AL_BRIDGE-"br-lan"}
+PRIMARY_VID=${PRIMARY_VID-1}
+
+### Traffic Separation ###
+
+dbg() {
+	logger -t traffic_separation $@
+}
+
+ts_sub() {
+	ts_usage() {
+		cat <<EOF
+Usage: $0 [create|reload]
+Traffic Separation related functions.
+create vid - create vlan configuration with vlan_id
+reload     - reload network with new configuration
+EOF
+	exit 1
+	}
+
+	ts_create() {
+		_dhcp_setup() {
+			local name=$1
+
+			[ -n "$(uci -q get dhcp.${name})" ] && return
+
+			uci -q set dhcp.${name}=dhcp
+			uci -q set dhcp.${name}.interface="${name}"
+			uci -q set dhcp.${name}.start="100"
+			uci -q set dhcp.${name}.limit="150"
+			uci -q set dhcp.${name}.leasetime="1h"
+			uci -q set dhcp.${name}.dhcpv4="server"
+			uci -q set dhcp.${name}.dhcpv6="server"
+			uci -q set dhcp.${name}.ra="server"
+			uci -q set dhcp.${name}.ra_slaac="1"
+			uci -q add_list dhcp.${name}.ra_flags="managed-config"
+			uci -q add_list dhcp.${name}.ra_flags="other-config"
+
+			uci -q commit dhcp
+		}
+
+		_firewall_setup() {
+			local name=$1
+			local network=$1
+			local vid=$2
+			local zone_exist=0
+
+			config_load firewall
+
+			_process_zone() {
+				local section=$1
+				local new_name=$2
+				local name
+
+				config_get name $section name
+
+				[ "$name" == "$new_name" ] && zone_exist=1
+			}
+
+			config_foreach _process_zone zone $name
+
+			[ "$zone_exist" != "0" ] && return
+
+			uci -q add firewall zone
+			uci -q set firewall.@zone[-1].name="$name"
+			uci -q add_list firewall.@zone[-1].network="$network"
+			uci -q set firewall.@zone[-1].input='ACCEPT'
+			uci -q set firewall.@zone[-1].output='ACCEPT'
+			uci -q set firewall.@zone[-1].forward='ACCEPT'
+
+			uci -q add firewall forwarding
+			uci -q set firewall.@forwarding[-1].src="$name"
+			uci -q set firewall.@forwarding[-1].dest="wan"
+
+			uci -q commit firewall
+		}
+
+		_guest_net_setup() {
+			local vid=$1
+			local name="guest${vid}"
+			local dev="guest_dev${vid}"
+			local br_guest="br-guest${vid}"
+			local peer="guest_peer${vid}"
+			local ip_addr="192.168.${vid}.1"
+			local br_dev="${AL_BRIDGE/-/_}"
+
+			[ "${vid}" = "${PRIMARY_VID}" ] && return
+
+			ip link show $dev 2> /dev/null || {
+				ip link add $dev type veth peer name $peer
+			}
+
+			ip link set $dev up
+			ip link set $port_dev up
+
+			[ -z "$(uci -q get network.${name})" ] || return
+
+			uci -q set network.${name}="interface"
+			uci -q set network.${name}.device="${br_guest}"
+			uci -q set network.${name}.is_lan="1"
+			uci -q set network.${name}.proto="static"
+			uci -q set network.${name}.ipaddr="${ip_addr}"
+			uci -q set network.${name}.netmask="255.255.255.0"
+			uci -q set network.${name}.ip6assign '60'
+
+			uci -q set network.br_${name}="device"
+			uci -q set network.br_${name}.name="${br_guest}"
+			uci -q set network.br_${name}.type="bridge"
+
+			if [ -z $(uci -q get network.${br_dev}.ports | grep -w ${dev}) ]; then
+				uci -q add_list network.${br_dev}.ports="${dev}"
+			fi
+
+			if [ -z $(uci -q get network.br_${name}.ports | grep -w ${peer}) ]; then
+				uci -q add_list network.br_${name}.ports="${peer}"
+			fi
+
+			if [ -z $(uci -q get network.vlan${vid}.ports | grep -w ${dev}) ]; then
+				uci -q add_list network.vlan${vid}.ports="${dev}:*"
+			fi
+
+			uci -q commit network
+		}
+
+		_net_setup() {
+			local vid=$1
+			local layer3=$2
+			local name="vlan${vid}"
+			local br_dev="${AL_BRIDGE/-/_}"
+			local tag=":t"
+			local self_flags="untagged"
+			local brvid_local="1"
+
+			[ -z "$(uci -q get network.${name})" ] || return
+
+			uci -q set network.${name}="bridge-vlan"
+			uci -q set network.${name}.name="${name}"
+			uci -q set network.${name}.device="$AL_BRIDGE"
+			uci -q set network.${name}.vlan="$vid"
+
+			if [ "${vid}" = "${PRIMARY_VID}" ]; then
+				self_flags="untagged pvid"
+				tag=":*"
+			elif [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
+				brvid_local="0"
+			fi
+
+			uci -q set network.${name}.flags="${self_flags}"
+			uci -q set network.${name}.local="${brvid_local}"
+
+			for port in $(uci -q get network.${br_dev}.ports) ; do
+				if [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
+					echo $port | grep "guest" && continue
+				fi
+				uci -q get network.${name}.ports | grep -q "${port}${tag}" && continue
+				uci -q add_list network.${name}.ports="${port}${tag}"
+			done
+
+			uci -q commit network
+		}
+		local layer3=$(uci -q get mapagent.agent.layer3_ts)
+
+		vid=$1
+
+		[ -n "$vid" ] || {
+			cat <<EOF
+VID required to configure.
+EOF
+			exit 1
+		}
+
+		_net_setup ${vid} ${layer3}
+
+                logger -t vlan "setup ts vid $vid"
+		[ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ] && {
+			_dhcp_setup guest${vid}
+			_firewall_setup guest${vid} ${vid}
+			_guest_net_setup ${vid}
+
+		}
+
+                # Disable pktfwd here and flush FlowCache rules
+                echo 0 > /proc/pktfwd_dhd/enable
+                echo 0 > /proc/pktfwd_wl/enable
+                fcctl flush
+	}
+
+	ts_reload() {
+		# TODO check it again
+		local dhcp_reload=$1
+		restart=""
+
+		bridge_verify_vid_mapping() {
+			local section=$1
+
+			check_port_vid() {
+				local port="$1"
+				local vlan="$2"
+
+				added=$(bridge vlan show dev $port | grep -w "$vlan")
+				if [ "$added" = "" ]; then
+					restart="1"
+					break
+				fi
+			}
+
+			config_get vlan "$section" vlan "0"
+
+			[ "$vlan" = "0" ] && continue
+
+			config_list_foreach "$section" "ports" check_port_vid "$vlan"
+			[ "$restart" = "1" ] && break
+		}
+
+
+
+		config_load network
+		config_foreach bridge_verify_vid_mapping bridge-vlan
+
+
+		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
+		if [ "$restart" = "1" ]; then
+			dbg "trigger network restart"
+			/etc/init.d/network restart
+		else
+			ubus call uci commit '{"config":"network"}'
+		fi
+		/etc/init.d/firewall reload
+
+
+		#for sink in $(ubus list network.interface.sink*) ; do
+		#	local sink_vlan=${sink/network.interface./}_vlan
+		#done
+	}
+
+	# maintain VIDs passed as args in network config, remove rest
+	ts_keep() {
+		local al_bridge=$(uci -q get mapagent.agent.al_bridge)
+		local layer3="$(uci -q get mapagent.agent.layer3_ts)"
+		restart=""
+
+		[ "$al_bridge" = "" ] && al_bridge="br-lan"
+
+
+		guest_teardown() {
+			local section=$1
+			local config=$2
+			local bridge=$3
+			local option=$4
+
+			config_get name "$section" "$option"
+
+			[ "$bridge" != "$name" ] && continue
+
+			uci -q delete ${config}.${section}
+		}
+
+		bridge_vlan_teardown() {
+			local section=$1
+			shift
+			local bridge=$1
+			shift
+			local layer3=$1
+			shift
+			local keep="$@"
+
+			config_get device "$section" device
+
+			[ "$bridge" != "$device" ] && continue
+
+			config_get vlan "$section" vlan
+
+			for i in $@; do
+				if [ "$i" -eq "$vlan" ] ; then
+					return
+				fi
+			done
+
+			#if layer3ts enabled
+			if [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
+				local br_guest="br-guest${vlan}"
+
+				config_load network
+				config_foreach guest_teardown device "network" $br_guest "name" $@ # could easier be replaced by uci ubus api and using match field
+				config_foreach guest_teardown interface "network" $br_guest "device" $@ # could easier be replaced by uci ubus api and using match field
+
+				config_load dhcp
+				[ -n "$(uci -q get dhcp.guest${vlan})" ] && {
+					uci -q delete dhcp.guest${vlan}
+					restart="1"
+				}
+				config_load firewall
+				config_foreach guest_teardown zone "firewall" guest${vlan} "name" $@ #delete firewall section with name = guest${vlan}
+				config_foreach guest_teardown forwarding "firewall" guest${vlan} "src" $@ #delete firewall section with name = guest${vlan}
+			fi
+
+
+			#endif
+			uci -q delete network.$section
+			restart="1"
+		}
+
+		config_load network
+		(config_foreach bridge_vlan_teardown bridge-vlan $al_bridge $layer3 $@)
+
+		if [ "$restart" = "1" ]; then
+			uci commit network
+			if [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
+				uci commit firewall
+				uci commit dhcp
+			fi
+			dbg "trigger network restart"
+			/etc/init.d/network restart
+		fi
+	}
+
+	ts_cleanup() {
+		local al_bridge=$(uci -q get mapagent.agent.al_bridge)
+		local layer3="$(uci -q get mapagent.agent.layer3_ts)"
+		restart=""
+
+		[ "$al_bridge" = "" ] && al_bridge="br-lan"
+
+		bridge_device_teardown() {
+			local section=$1
+			local bridge=$2
+			local layer3=$3
+			local br_dev="${AL_BRIDGE/-/_}"
+			local dev
+			local br_guest
+			local peer
+
+			config_get device "$section" device
+			config_get vlan "$section" vlan
+
+			dev="guest_dev${vlan}"
+
+			[ "$bridge" != "$device" ] && continue
+
+			uci -q delete network.$section
+
+			echo "restart"
+
+			[ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ] || continue
+
+			####
+			# layer3 specific teardown
+			####
+
+			guest_teardown() {
+				local section=$1
+				local config=$2
+				local bridge=$3
+				local option=$4
+
+				config_get name "$section" "$option"
+
+				[ "$bridge" != "$name" ] && continue
+
+				echo "$bridge=$name" > /dev/console
+
+				uci -q delete ${config}.${section}
+				echo "uci -q delete ${config}.${section}" > /dev/console
+			}
+
+			br_guest="br-guest${vlan}"
+
+			# network config guest teardown
+			config_load network
+			config_foreach guest_teardown device "network" $br_guest "name"
+			config_foreach guest_teardown interface "network" $br_guest "device"
+
+			if [ -n "$(uci -q get network.${br_dev}.ports | grep -w ${dev})" ]; then
+				uci -q del_list network.${br_dev}.ports="${dev}"
+			fi
+
+			peer="guest_peer${vlan}"
+
+			ip link show $dev 2> /dev/null && {
+				ip link del $dev
+			}
+
+			ip link show $peer 2> /dev/null && {
+				ip link del $peer
+			}
+
+			# dhcp config guest teardown
+			[ -n "$(uci -q get dhcp.guest${vlan})" ] && {
+				uci -q delete dhcp.guest${vlan}
+			}
+
+			# firewall config guest teardown
+			config_load firewall
+			config_foreach guest_teardown zone "firewall" guest${vlan} "name"
+			config_foreach guest_teardown forwarding "firewall" guest${vlan} "src"
+		}
+
+		config_load network
+		restart="$(config_foreach bridge_device_teardown bridge-vlan $al_bridge $layer3)"
+
+		if [ -n "$restart" ]; then
+			uci commit network
+			if [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
+				uci commit firewall
+				uci commit dhcp
+			fi
+			dbg "trigger network restart"
+			/etc/init.d/network restart
+		fi
+
+		# enable pktfwd again and flush FlowCache rules
+		echo 1 > /proc/pktfwd_dhd/enable
+		echo 1 > /proc/pktfwd_wl/enable
+		echo 0 > /proc/pktfwd_dhd/enable
+		echo 0 > /proc/pktfwd_wl/enable
+		echo 1 > /proc/pktfwd_dhd/enable
+		echo 1 > /proc/pktfwd_wl/enable
+		fcctl flush
+	}
+
+	ts_isolate() {
+		local action=$1
+		shift
+		local pvid=$1 # pvid
+		shift
+		local ifname=$1 # guest fbss name
+		shift
+		local ifprefix=$@ # 4addr mode ifname prefix
+
+		[ -z "$pvid" -o -z "$ifprefix" -o -z "$ifname" ] && return
+
+		for prefix in $@; do
+			ebtables -D FORWARD -i $ifname --o ${prefix}+ --vlan-id ! $pvid -j DROP -p 802_1Q > /dev/null 2>&1
+			ebtables -D FORWARD -i ${prefix}+ --o ${ifname} --vlan-id ! $pvid -j DROP -p 802_1Q > /dev/null 2>&1
+
+			[ "$action" != "add" ] && continue
+			ebtables -A FORWARD -i $ifname --o ${prefix}+ --vlan-id ! $pvid -j DROP -p 802_1Q > /dev/null 2>&1
+			ebtables -A FORWARD -i ${prefix}+ --o ${ifname} --vlan-id ! $pvid -j DROP -p 802_1Q > /dev/null 2>&1
+		done
+
+
+	}
+
+	local func=$1
+	shift
+
+	case "$func" in
+		create) dbg "create $@"; ts_create $@;;
+		keep) dbg "keep $@"; ts_keep $@;;
+		reload) dbg "reload $@"; ts_reload $@;;
+		cleanup) dbg "cleanup $@"; ts_cleanup $@;;
+		isolate) dbg "isolate $@"; ts_isolate $@;;
+		--help|help) ts_usage;;
+		*) ts_usage; exit 1;;
+	esac
+}

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.11
+PKG_VERSION:=2.8.0.15
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3f462d32e487115b1a1d6f92645d895dc5cd9c44
+PKG_SOURCE_VERSION:=e71a5f4f7f947f4c7819b4caf238fd1bec9b4fe8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -38,7 +38,6 @@ define Package/map-controller/config
 endef
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

map-controller/files/etc/config/mapcontroller

@@ -6,8 +6,9 @@ config controller 'controller'
 	option enable_bsta_steer '0'
 	option use_bcn_metrics '0'
 	option use_usta_metrics '0'
-	option primary_vid '0'
+	option primary_vid '1'
 	option primary_pcp '0'
+	option enable_ts '0'
 	option allow_bgdfs '0'
 	option channel_plan '0'
 

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

@@ -40,7 +40,7 @@ validate_ap_section() {
 	local section="$1"
 
 	uci_validate_section mapcontroller $section "${1}" \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
 				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
@@ -93,7 +93,7 @@ validate_radio_section() {
 	uci_validate_section mapcontroller $section "${1}" \
 			'agent_id:macaddr' \
 			'macaddr:macaddr' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'steer_policy:range(0,2)' \
 			'util_threshold:range(0,255)' \
 			'rcpi_threshold:range(0,255)' \

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.8
+PKG_VERSION:=2.5.0.13
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=ee72703a5c89983c881d8faedcdc749b54278790
+PKG_SOURCE_VERSION:=413330b08fc4608ea2f5f740cf829f62d5a8bba0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
@@ -36,7 +36,6 @@ define Package/map-topology/config
 endef
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \

map-topology/files/etc/config/hosts

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

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

@@ -24,7 +24,8 @@ validate_topology_config() {
 validate_global_section() {
 	uci_validate_section hosts global "global" \
 		'ageing_timer:uinteger' \
-		'reboot_persistent:bool'
+		'reboot_persistent:bool' \
+		'ifname:string'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "hosts" "Validation of global section failed"

obuspa/Config.in

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

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=6.0.0.7
+PKG_VERSION:=5.0.0.16.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=b0626e54ba4a0e8d1d261948a7114c6dc35e2dbc
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
-PKG_SOURCE_VERSION:=b5afdfc4b7ba93698a6ac981fc0f300b5362b7bf
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -101,7 +101,6 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
@@ -109,7 +108,6 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,17 +1,30 @@
 config obuspa 'global'
 	option enabled '1'
+	option interface 'loopback'
+	#option ifname 'lo'
 	option debug '1'
 	option log_level '1'
-	option prototrace '1'
-	option db_file '/etc/obuspa/usp.db'
+	option prototrace '0'
+	#option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
 
+config localagent 'localagent'
+	option Enable '1'
+
+# Adds Device.LocalAgent.Controller.
+config controller 'localcontroller'
+	option EndpointID 'proto::interop-usp-controller'
+	option Protocol 'MQTT'
+	option Topic '/usp/controller'
+	option mqtt 'localmqtt'
+	option assigned_role_name 'full_access'
+
 # Adds Device.LocalAgent.MTP.
-config mtp 'agent_mtp'
+config mtp
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
 	option mqtt 'localmqtt'
@@ -22,30 +35,13 @@ config mqtt 'localmqtt'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
-# Adds Device.LocalAgent.Controller.
-config controller 'localcontroller'
-	option EndpointID 'proto::interop-usp-controller'
-	option Protocol 'MQTT'
-	option Topic '/usp/controller'
-	option mqtt 'localmqtt'
-	option assigned_role_name 'full_access'
-
 # Add Device.LocalAgent.Subscription.
-#config subscription 'sub_event'
-#    option ID 'uci-sub-events'
-#    option NotifType 'Event'
-#    list ReferenceList 'Device.Boot!'
-#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
-#    option Persistent 'true'
-#    option controller 'localcontroller'
-
-#config subscription 'sub_op_comp'
-#   option ID 'uci-sub-op_complete'
-#   option NotifType 'OperationComplete'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
-#   option Persistent 'true'
-#   option controller 'localcontroller'
+config subscription
+	option ID 'default-boot-event-ACS'
+	option NotifType 'Event'
+	option ReferenceList 'Device.Boot!'
+	option Persistent 'true'
+	option controller 'localcontroller'
 
 #config challenge 'admin'
 #	option Description 'Request to get Administrative access'

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

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-fix_stomp_section() {
-	local encryption
-
-	config_get_bool encryption $1 encryption ""
-	if [ -n "${encryption}" ]; then
-		uci_set obuspa $1 encryption ""
-		uci_set obuspa $1 EnableEncryption "$encryption"
-	fi
-}
-
-# fix the stomp encryption parameter
-config_load obuspa
-config_foreach fix_stomp_section stomp
-uci_commit

obuspa/patches/0001-validate-mtp-topic.patch

@@ -1,140 +0,0 @@
-diff --git a/src/core/device.h b/src/core/device.h
-index adf8fa6..072f953 100644
---- a/src/core/device.h
-+++ b/src/core/device.h
-@@ -111,6 +111,7 @@ typedef struct
-     // Following member variables only set if USP message was received over MQTT
-     int mqtt_instance;
-     char *mqtt_topic;           // only set if reply_to was specified in the received MQTT packet
-+    char *mqtt_topic_recv;
- 
- 
-     // Following member variables only set if USP message was received over CoAP
-@@ -252,7 +253,7 @@ void DEVICE_MTP_NotifyMqttConnDeleted(int mqtt_instance);
- int DEVICE_MTP_ValidateMqttReference(dm_req_t *req, char *value);
- void DEVICE_CONTROLLER_SetRolesFromMqtt(int mqtt_instance, ctrust_role_t role);
- char *DEVICE_CONTROLLER_GetControllerTopic(int mqtt_instance);
--
-+int validate_controller_topic_by_endpointid(char *endpointid, mtp_protocol_t proto, char *recv_topic);
- //------------------------------------------------------------------------------
- // Tables used to convert to/from an enumeration to/from a string
- extern const enum_entry_t mtp_protocols[kMtpProtocol_Max];
-diff --git a/src/core/device_controller.c b/src/core/device_controller.c
-index 62c803f..103388d 100755
---- a/src/core/device_controller.c
-+++ b/src/core/device_controller.c
-@@ -239,6 +239,41 @@ int Async_E2ESessionReset(dm_req_t *req, kv_vector_t *input_args, int request);
- extern const enum_entry_t e2e_session_modes[kE2EMode_Max];
- #endif
- 
-+
-+int validate_controller_topic_by_endpointid(char *endpointid, mtp_protocol_t proto, char *recv_topic)
-+{
-+    controller_t *cont = FindEnabledControllerByEndpointId(endpointid);
-+    if (cont == NULL)
-+    {
-+        USP_LOG_Error("not able to find the controller from endpointid [%s]", endpointid);
-+        return USP_ERR_PERMISSION_DENIED;
-+    }
-+#ifdef ENABLE_MQTT
-+    if (proto == kMtpProtocol_MQTT)
-+    {
-+        controller_mtp_t *mtp = FindFirstEnabledMtp(cont, proto);
-+
-+        if (mtp == NULL) {
-+            USP_LOG_Error("Not able to find mtp[%d] for endpointid [%s]", proto, endpointid);
-+            return USP_ERR_REQUEST_DENIED;
-+        }
-+
-+        if (mtp->protocol != proto) {
-+            USP_LOG_Error("No matching mtp[%d] for endpointid [%s]", proto, endpointid);
-+            return USP_ERR_REQUEST_DENIED;
-+        }
-+
-+        char *response_topic = DEVICE_MTP_GetAgentMqttResponseTopic(mtp->mqtt_connection_instance);
-+        if (response_topic && strcmp(response_topic, recv_topic) != 0 ) {
-+            USP_LOG_Error("Controller response topic[%s] and recv topic[%s] mismatch, probably a spoof message", response_topic, recv_topic);
-+            return USP_ERR_PERMISSION_DENIED;
-+        }
-+    }
-+#endif
-+
-+    return USP_ERR_OK;
-+}
-+
- /*********************************************************************//**
- **
- ** DEVICE_CONTROLLER_Init
-diff --git a/src/core/dm_exec.c b/src/core/dm_exec.c
-index c0b95d8..6eb51e2 100755
---- a/src/core/dm_exec.c
-+++ b/src/core/dm_exec.c
-@@ -624,6 +624,7 @@ void DM_EXEC_PostUspRecord(unsigned char *pbuf, int pbuf_len, ctrust_role_t role
-     pur->mtp_reply_to.coap_encryption = mrt->coap_encryption;
-     pur->mtp_reply_to.coap_reset_session_hint = mrt->coap_reset_session_hint;
-     pur->mtp_reply_to.mqtt_topic = USP_STRDUP(mrt->mqtt_topic);
-+    pur->mtp_reply_to.mqtt_topic_recv = USP_STRDUP(mrt->mqtt_topic_recv);
-     pur->mtp_reply_to.mqtt_instance = mrt->mqtt_instance;
-     pur->mtp_reply_to.wsclient_cont_instance = mrt->wsclient_cont_instance;
-     pur->mtp_reply_to.wsclient_mtp_instance = mrt->wsclient_mtp_instance;
-@@ -1144,6 +1145,7 @@ void ProcessMessageQueueSocketActivity(socket_set_t *set)
-             USP_SAFE_FREE(mrt->coap_resource);
-             USP_SAFE_FREE(mrt->mqtt_topic);
-             USP_SAFE_FREE(mrt->cont_endpoint_id);
-+            USP_SAFE_FREE(mrt->mqtt_topic_recv);
-             break;
- 
- #ifndef DISABLE_STOMP
-diff --git a/src/core/mqtt.c b/src/core/mqtt.c
-index 7dba9f4..3ee9c97 100644
---- a/src/core/mqtt.c
-+++ b/src/core/mqtt.c
-@@ -3141,6 +3141,7 @@ void ReceiveMqttMessage(mqtt_client_t *client, const struct mosquitto_message *m
-         mrt.mqtt_topic = response_topic;
-     }
- 
-+    mrt.mqtt_topic_recv = message->topic;
-     // Message may not be valid USP
-     DM_EXEC_PostUspRecord(message->payload, message->payloadlen, client->role, &mrt);
- }
-diff --git a/src/core/msg_handler.c b/src/core/msg_handler.c
-index ce67626..4af9ade 100644
---- a/src/core/msg_handler.c
-+++ b/src/core/msg_handler.c
-@@ -118,7 +118,7 @@ static enum_entry_t mtp_content_types[] = {
- //------------------------------------------------------------------------------
- // Forward declarations. Note these are not static, because we need them in the symbol table for USP_LOG_Callstack() to show them
- int HandleUspMessage(Usp__Msg *usp, char *controller_endpoint, mtp_reply_to_t *mrt);
--int ValidateUspRecord(UspRecord__Record *rec);
-+int ValidateUspRecord(UspRecord__Record *rec, mtp_reply_to_t *mrt);
- char *MtpSendItemToString(mtp_send_item_t *msi);
- void CacheControllerRoleForCurMsg(char *endpoint_id, ctrust_role_t role, mtp_protocol_t protocol);
- int QueueUspNoSessionRecord(usp_send_item_t *usi, char *endpoint_id, char *usp_msg_id, mtp_reply_to_t *mrt, time_t expiry_time);
-@@ -172,7 +172,7 @@ int MSG_HANDLER_HandleBinaryRecord(unsigned char *pbuf, int pbuf_len, ctrust_rol
- #endif
- 
-     // Exit if USP record failed validation
--    err = ValidateUspRecord(rec);
-+    err = ValidateUspRecord(rec, mrt);
-     if (err != USP_ERR_OK)
-     {
-         goto exit;
-@@ -725,7 +725,7 @@ exit:
- ** \return  USP_ERR_OK if record is valid
- **
- **************************************************************************/
--int ValidateUspRecord(UspRecord__Record *rec)
-+int ValidateUspRecord(UspRecord__Record *rec, mtp_reply_to_t *mrt)
- {
-     char *endpoint_id;
- 
-@@ -806,6 +806,9 @@ int ValidateUspRecord(UspRecord__Record *rec)
-         return USP_ERR_REQUEST_DENIED;
-     }
- 
-+#if OBUSPA_CONTROLLER_MTP_VERIFY
-+    return validate_controller_topic_by_endpointid(rec->from_id, mrt->protocol, mrt->mqtt_topic_recv);
-+#endif
-     // If the code gets here, then the USP record passed validation, and the encapsulated USP message may be processed
-     return USP_ERR_OK;
- }

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

@@ -1,8 +1,6 @@
-diff --git a/src/core/cli_server.c b/src/core/cli_server.c
-index 701cbd9..103361e 100644
 --- a/src/core/cli_server.c
 +++ b/src/core/cli_server.c
-@@ -733,10 +733,6 @@ int ExecuteCli_Get(char *arg1, char *arg2, char *usage)
+@@ -733,10 +733,6 @@ int ExecuteCli_Get(char *arg1, char *arg
              USP_ASSERT(gge->value != NULL);
              SendCliResponse("%s => %s\n", gge->path, gge->value);
          }
@@ -13,11 +11,9 @@ index 701cbd9..103361e 100644
      }
  
      GROUP_GET_VECTOR_Destroy(&ggv);
-diff --git a/src/core/handle_get.c b/src/core/handle_get.c
-index e1055e0..16b9ceb 100755
 --- a/src/core/handle_get.c
 +++ b/src/core/handle_get.c
-@@ -260,26 +260,16 @@ void FormPathExprResponse(int get_expr_index, char *path_expr, get_expr_info_t *
+@@ -252,24 +252,14 @@ void FormPathExprResponse(int get_expr_i
          return;
      }
  
@@ -39,11 +35,8 @@ index e1055e0..16b9ceb 100755
      {
          gge = &ggv->vector[gi->index + i];
  
--        // Simple format contains a resolved_path_result for every object (and sub object)
--        AddResolvedPathResult(req_path_result, gge->path, gge->value);
-+        if (gge->err_code == USP_ERR_OK) {
-+            // Simple format contains a resolved_path_result for every object (and sub object)
-+            AddResolvedPathResult(req_path_result, gge->path, gge->value);
-+	}
-     }
- }
++        if (gge->err_code != USP_ERR_OK)
++		continue;
+ #ifdef GET_RESPONSE_SIMPLE_FORMAT
+         // Simple format contains a resolved_path_result for every object (and sub object)
+         AddResolvedPathResult(req_path_result, gge->path, gge->value, 0);

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

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

owsd/Makefile

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

periodicstats/Makefile

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

ponmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ponmngr
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -17,12 +17,11 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/ponmngr
 	CATEGORY:=Utilities
-	TITLE:=PON Manager
-	DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
+	TITLE:=ponmngr packets manager daemon
 endef
 
 define Package/ponmngr/description
-	Configures PON
+	Configures pon
 endef
 
 #define Build/Prepare
@@ -33,12 +32,7 @@ define Build/Compile
 endef
 
 define Package/ponmngr/install
-	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
-	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_iopsys_econet),)
-	$(CP) ./files/airoha/* $(1)/
-endif
+	$(CP) ./files/* $(1)/
 endef
 
 $(eval $(call BuildPackage,ponmngr))

ponmngr/files/airoha/lib/xpon/airoha.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_serial_number() {
-	vendor_id=$1
-	vssn=$2
-
-	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
-}
-
-init_xpon() {
-	# don't start pon daemons if xpon module is not loaded
-	[ -d /sys/module/xpon ] || return
-
-	procd_open_instance ponmgr_cfg
-	procd_set_param command /userfs/bin/ponmgr_cfg
-	procd_close_instance
-	procd_open_instance omci
-	procd_set_param command /userfs/bin/omci
-	procd_close_instance
-}
-
-deinit_xpon() {
-	killall -9 omci 2>/dev/null
-	killall -9 ponmgr_cfg 2>/dev/null
-}
-

port-management/files/etc/uci-defaults/15-ports-config-generate

@@ -30,25 +30,17 @@ populate_config_from_db() {
 }
 
 populate_config_from_device_tree() {
-	for path in $(find /proc/device-tree/ -name "port@*"); do
-		port="$(cat $path/label)"
+	for port in $(find /proc/device-tree/ -name "port@*"); do
+		port="$(cat $port/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].speed=1000
 		uci set ports.@ethport[-1].duplex="full"
 		uci set ports.@ethport[-1].autoneg=1
 		uci set ports.@ethport[-1].eee=0
@@ -73,7 +65,7 @@ fi
 
 touch /etc/config/ports
 
-if [ -f /sbin/db -a -n "$(db get hw.board.ethernetPortOrder 2>/dev/null)" ]; then
+if [ -f /sbin/db ] && [ -f /etc/board-db/config/hw ]; then
 	populate_config_from_db
 elif [ -d /proc/device-tree/ ]; then
 	populate_config_from_device_tree

qosmngr/Makefile

@@ -27,7 +27,7 @@ define Package/qosmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=QoS Manager
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
 endef
 
 define Package/qosmngr/description

qosmngr/files/lib/qos/broadcom.sh

@@ -10,9 +10,6 @@ POLICER_COUNT=0
 Q_COUNT=0
 SP_Q_PRIO=7
 
-#counter variable to assign classify order value if not added in config
-temp_order=1
-
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {
@@ -979,43 +976,6 @@ config_ingress_rate_limit() {
 	ethswctl -c rxratectrl -n $unit -p $port -x $ingress_rate -y $in_burst_size
 }
 
-# Function to handle a classify order
-handle_classify_order() {
-	local cid="$1" #classify section ID
-
-	config_get is_enable "$cid" "enable" 1
-
-	# No need to configure disabled classify
-	if [ $is_enable == '0' ]; then
-		return
-	fi
-
-	# Create classify file containing classify order
-	local corder_file="/tmp/qos/classify.order"
-
-	config_get c_order "$cid" "order"
-
-        if [ -z "$c_order" ]; then
-           c_order=$temp_order;
-           temp_order=$((temp_order + 1))
-        fi
-
-	value=${c_order}_${cid}
-	echo $value >> $corder_file
-
-}
-
-# Sort classify, lower value in uci means higher precedence, so this
-# function sorts the classify order in assending order
-sort_classify_by_order() {
-	local corder_file="/tmp/qos/classify.order"
-	local tmp_corder_file="/tmp/qos/tmp_classify.order"
-
-	sort -n -k1 $corder_file > $tmp_corder_file
-	cp $tmp_corder_file $corder_file
-	rm -f $tmp_corder_file
-}
-
 #function to handle a classify section
 handle_classify() {
 	cid="$1" #classify section ID
@@ -1026,15 +986,9 @@ handle_classify() {
 		return
 	fi
 
-	local corder_file="/tmp/qos/classify.order"
-
-	while read -r line; do
-		line_cid=${line: 2}
-
-	        handle_ebtables_rules $line_cid
-	        handle_iptables_rules $line_cid
-	        handle_policer_rules $line_cid
-	done < "$corder_file"
+	handle_ebtables_rules $cid
+	handle_iptables_rules $cid
+	handle_policer_rules $cid
 }
 
 configure_shaper() {
@@ -1054,25 +1008,19 @@ configure_classify() {
 	rm -f /tmp/qos/classify.ebtables
 	rm -f /tmp/qos/classify.iptables
 	rm -f /tmp/qos/classify.ip6tables
-        rm -f /tmp/qos/classify.order
-        rm -f /tmp/qos/tmp_classify.order
 
 	#create files that will contain the rules if not present already
 	mkdir -p /tmp/qos/
 	touch /tmp/qos/classify.iptables
 	touch /tmp/qos/classify.ip6tables
 	touch /tmp/qos/classify.ebtables
-        touch /tmp/qos/classify.order
-        touch /tmp/qos/tmp_classify.order
 
 	#add flush chain rules
 	flush_chains
 
 	# Load UCI file
 	config_load qos
-	config_foreach handle_classify_order classify
-	sort_classify_by_order
-	handle_classify classify
+	config_foreach handle_classify classify
 
 	sh /tmp/qos/classify.ebtables
 	sh /tmp/qos/classify.iptables

skopeo/Makefile

@@ -1,77 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=skopeo
-PKG_VERSION:=1.9.2
-PKG_RELEASE:=$(AUTORELEASE)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/containers/skopeo/archive/v$(PKG_VERSION)
-PKG_HASH:=9a321ba75f213e5c46cba7f92073c2437137a56d3140c9ab6e723fb92890f9d0
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-HOST_BUILD_DEPENDS:=golang/host
-HOST_BUILD_PARALLEL:=1
-
-PKG_BUILD_DEPENDS:=golang/host
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-GO_PKG:=github.com/containers/skopeo
-GO_PKG_BUILD_PKG:=github.com/containers/skopeo/cmd/skopeo
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-GOLANG_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-package.mk)
-GOLANG_HOST_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-host-build.mk)
-
-# verify that there is only one single file returned
-ifneq (1,$(words $(GOLANG_PACKAGE_MK)))
-ifeq (0,$(words $(GOLANG_PACKAGE_MK)))
-$(error did not find golang-package.mk in any feed)
-else
-$(error found multiple golang-package.mk files in the feeds)
-endif
-else
-$(info found golang-package.mk at $(GOLANG_PACKAGE_MK))
-endif
-
-include $(GOLANG_PACKAGE_MK)
-include $(GOLANG_HOST_PACKAGE_MK)
-
-define Package/skopeo
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Command line utility for container image management
-  URL:=https://github.com/containers/skopeo
-  DEPENDS:=$(GO_ARCH_DEPENDS)
-endef
-
-define Package/skopeo/description
-  skopeo is a command line utility that performs various operations on container images and image repositories.
-endef
-
-define Package/skopeo/conffiles
-/etc/containers/policy.json
-endef
-
-GO_PKG_TAGS=exclude_graphdriver_devicemapper,exclude_graphdriver_btrfs,containers_image_openpgp
-GO_PKG_BUILD_VARS += GO111MODULE=auto
-
-define Build/Compile
-	$(call GoPackage/Build/Compile)
-	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
-endef
-
-define Package/skopeo/install
-	$(call GoPackage/Package/Install/Bin,$(1))
-	$(INSTALL_DIR) $(1)/etc/containers
-	$(INSTALL_DATA) ./files/etc/containers/policy.json $(1)/etc/containers/policy.json
-endef
-
-$(eval $(call GoBinHostBuild))
-$(eval $(call HostBuild))
-$(eval $(call GoBinPackage,skopeo))
-$(eval $(call BuildPackage,skopeo))

skopeo/files/etc/containers/policy.json

@@ -1,15 +0,0 @@
-{
-    "default": [
-        {
-            "type": "insecureAcceptAnything"
-        }
-    ],
-    "transports":
-        {
-            "docker-daemon":
-                {
-                    "": [{"type":"insecureAcceptAnything"}]
-                }
-        }
-}
-

stunc/Makefile

@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.14
+PKG_VERSION:=1.1.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=06b63878a448b593d907bb3e9c1381dc0e69bca6
+PKG_SOURCE_VERSION:=5b65364709a921db0956bf74a4f126217cfb1775
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -23,6 +23,8 @@ endif
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_DEPENDS:=bbf
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/stunc/default
@@ -30,7 +32,7 @@ define Package/stunc/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json
 endef
 
 define Package/stunc-mbedtls

sulu-base/Makefile

@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sulu-base
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=ea9b80a6f7a5fc2230d97706fd1ddbbac66fc6a7
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-SULU_MOD:=core
-include ../sulu-builder/sulu.mk
-
-# call BuildPackage - OpenWrt buildroot signature

sulu-builder/Makefile

@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2021-2022 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sulu-builder
-PKG_VERSION:=2.0.0
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=cd1bdbbb5e658493504caf5be36182f3dc5bfbca
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=PROPRIETARY IOPSYS
-PKG_LICENSE_FILES:=LICENSE
-
-SULU_PLUGINS:=sulu-lcm sulu-multi-ap sulu-theme-iopsys
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/${PKG_NAME}
-	SECTION:=utils
-	CATEGORY:=Utilities
-	SUBMENU:=SULU
-	TITLE:=Build sulu from source
-	EXTRA_DEPENDS:=nginx mosquitto-auth-shadow
-	DEPENDS:=+sulu-base $(foreach plugin,$(SULU_PLUGINS), +PACKAGE_$(plugin):$(plugin))
-	CONFLICTS:=sulu
-endef
-
-define Package/${PKG_NAME}/description
-	SULU-CE ReactJS based Web UI builder.
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/sulu-builder/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) CORE_DIR="../sulu-stagging/core/sulu-base" PLUGINS_PATH="../sulu-stagging/plugin"
-endef
-
-define Package/${PKG_NAME}/install
-	$(INSTALL_DIR) $(1)/sulu
-	$(INSTALL_DIR) $(1)/sulu/config
-	$(INSTALL_DIR) $(1)/sulu/config/widgets
-	$(INSTALL_DIR) $(1)/etc/nginx/
-	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
-	$(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu
-	$(CP) $(PKG_BUILD_DIR)/build/src/config/*.json $(1)/sulu/config/
-	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/diagnostics.json $(1)/sulu/config/widgets/
-ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
-	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/lcm-store.json $(1)/sulu/config/widgets/
-endif
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,${PKG_NAME}))
-

sulu-builder/files/etc/init.d/sulu

@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=10
-
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t sulu.init -p debug
-}
-
-start_service() {
-	procd_open_instance sulu
-	# append sulu connection injection
-	procd_close_instance
-
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers()
-{
-	procd_add_config_trigger "config.change" "obuspa" /etc/init.d/sulu reload
-}

sulu-builder/files/etc/mosquitto/conf.d/obuspa.conf

@@ -1,3 +0,0 @@
-listener 1883 127.0.0.1
-allow_anonymous true
-

sulu-builder/files/etc/mosquitto/conf.d/sulu.conf

@@ -1,5 +0,0 @@
-listener 9001
-protocol websockets
-plugin /usr/lib/mosquitto_auth_shadow.so
-require_certificate false
-allow_anonymous false

sulu-builder/files/etc/nginx/conf.d/sulu.locations

@@ -1,18 +0,0 @@
-location /config/ {
-	autoindex on;
-	if ($request_method = 'OPTIONS') {
-		add_header 'Access-Control-Allow-Origin' '*';
-		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-		add_header 'Access-Control-Max-Age' 1728000;
-		add_header 'Content-Type' 'text/plain; charset=utf-8';
-		add_header 'Content-Length' 0;
-		return 204;
-	}
-	if ($request_method = 'GET') {
-		add_header 'Access-Control-Allow-Origin' '*' always;
-		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
-		add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-	}
-}

sulu-builder/files/etc/uci-defaults/90-sulu-set-nginx-conf

@@ -1,10 +0,0 @@
-mkdir -p /tmp/sulu
-
-uci -q get nginx._sulu && exit 0
-
-uci -q set nginx._sulu=server
-uci -q add_list nginx._sulu.listen='8080'
-uci -q add_list nginx._sulu.listen='[::]:8080'
-uci -q set nginx._sulu.root='/sulu'
-uci -q set nginx._sulu.server_name='_sulu'
-uci -q add_list nginx._sulu.include='conf.d/sulu.locations'

sulu-builder/sulu.mk

@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS
-#
-
-SULU_NAME?=$(notdir ${CURDIR})
-SULU_URL?=https://dev.iopsys.eu/websdk
-SULU_MAINTAINER?=IOPSYS SuLu team
-
-SULU_MOD?=plugin
-
-PKG_NAME?=$(SULU_NAME)
-PKG_RELEASE?=1
-PKG_LICENSE:=PROPRIETARY IOPSYS
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(SULU_MOD)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=SULU
-  TITLE:=$(if $(SULU_TITLE),$(SULU_TITLE),Sulu plugin or module $(SULU_NAME))
-  EXTRA_DEPENDS:=sulu-builder
-  URL:=$(SULU_URL)/$(SULU_NAME)
-  MAINTAINER:=$(SULU_MAINTAINER)
-endef
-
-ifneq ($(SULU_DESCRIPTION),)
- define Package/$(PKG_NAME)/description
-   $(strip $(SULU_DESCRIPTION))
- endef
-endif
-
-define Build/Compile
-	mkdir -p $(BUILD_DIR)/sulu-stagging/$(SULU_MOD)
-	-unlink $(BUILD_DIR)/sulu-stagging/$(SULU_MOD)/$(1)
-	$(LN) $(PKG_BUILD_DIR) $(BUILD_DIR)/sulu-stagging/$(SULU_MOD)/$(1)
-endef
-
-define Build/Clean
-	-unlink $(BUILD_DIR)/sulu-stagging/$(SULU_MOD)/$(SULU_NAME)
-	$(call Build/Clean/Default)
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/sulu/config/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

sulu-lcm/Makefile

@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-PKG_NAME:=sulu-lcm
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=068e71a3ec28dfa984f20fdc9796784f36d497dd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-include ../sulu-builder/sulu.mk
-
-# call BuildPackage - OpenWrt buildroot signature

sulu-multi-ap/Makefile

@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=7f4744e328478bdf8e6d599a1b99751c3c2cccb4
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-include ../sulu-builder/sulu.mk
-
-# call BuildPackage - OpenWrt buildroot signature

sulu-theme-iopsys/Makefile

@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-PKG_NAME:=sulu-theme-iopsys
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-theme-iopsys.git
-PKG_SOURCE_VERSION:=e80fea80cdf8d49db0ae70b5c26a5dab49b8a20d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-include ../sulu-builder/sulu.mk
-
-# call BuildPackage - OpenWrt buildroot signature

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.3.15
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=524418f7a2e6e2b1d807b2a87f9f80ac3cb1d1b6
+PKG_SOURCE_VERSION:=81d4bb268914dc3822293e93519ae6adbd6ddbea
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -26,7 +26,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sulu
 	SECTION:=sulu
 	CATEGORY:=Utilities
-	SUBMENU:=SULU
 	TITLE:=SULU-CE ReactJS based Web UI Package
 	DEPENDS:=+nginx +mosquitto-auth-shadow
 endef
@@ -44,6 +43,7 @@ define Package/sulu/install
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
 	$(CP) $(PKG_BUILD_DIR)/config/*.json $(1)/sulu/config
 	$(CP) $(PKG_BUILD_DIR)/config/widgets/diagnostics.json $(1)/sulu/config/widgets/
+	$(CP) $(PKG_BUILD_DIR)/config/widgets/wan.json $(1)/sulu/config/widgets/
 ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
 	$(CP) $(PKG_BUILD_DIR)/config/widgets/lcm-store.json $(1)/sulu/config/widgets/
 endif

swmodd/Config.in

@@ -1,22 +1,9 @@
+if PACKAGE_swmodd
+
 menu "Configuration"
-	depends on PACKAGE_swmodd
 
-	config SWMODD_LXC_SUPPORT
-		bool "Handles LXC based containers"
-		default n
-		depends on PACKAGE_swmodd
-		select PACKAGE_liblxc
-
-	config SWMODD_OCI_SUPPORT
-		bool "Handles OCI containers"
-		default y
-		depends on PACKAGE_swmodd
-		select PACKAGE_crun
-
-	config SWMODD_REGISTRY_PULL_SUPPORT
-		bool "Add support to pull images from container image registries (i.e: docker.io, quay.io)"
-		default n
-		depends on PACKAGE_swmodd
-		select PACKAGE_skopeo
-		select PACKAGE_umoci
+config SWMOD_HOST_IS_EXECENV
+	bool "Enable host system as execution environment"
+	default n
 endmenu
+endif

swmodd/Makefile

@@ -1,22 +1,24 @@
 #
-# Copyright (C) 2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 IOPSYS
 #
+# 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.17
+PKG_VERSION:=2.1.5.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5124ea8051c06e8c3563b384660b08db199c93eb
+PKG_SOURCE_VERSION:=2f953ea76b5779a73a540777dfb450982802e4f8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DEPENDS:=bbf
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -31,7 +33,7 @@ define Package/swmodd
   DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
 	    +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
-	    +swmodd-cgroup +jq +libbbf_api
+	    +swmodd-cgroup
 endef
 
 define Package/swmodd/description
@@ -51,19 +53,20 @@ define Package/swmodd-cgroup
 endef
 
 TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(CONFIG_PACKAGE_crun),y)
-MAKE_FLAGS += \
-	SWMOD_CRUN="yes"
-endif
-
 ifeq ($(CONFIG_PACKAGE_liblxc),y)
 MAKE_FLAGS += \
 	SWMOD_LXC="yes"
 endif
 
+ifeq ($(CONFIG_SWMOD_HOST_IS_EXECENV),y)
+MAKE_FLAGS += \
+	SWMOD_HOST_IS_EXECENV="yes"
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/swmodd/* $(PKG_BUILD_DIR)/
@@ -74,6 +77,7 @@ define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/etc/swmod
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/swmodd $(1)/etc/init.d/swmodd
 	$(INSTALL_BIN) ./files/etc/config/swmodd $(1)/etc/config/swmodd
@@ -85,15 +89,6 @@ ifeq ($(CONFIG_PACKAGE_liblxc),y)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/templates/lxc-iopsys $(1)/usr/share/lxc/templates/lxc-iopsys
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/opkg_offline.sh $(1)/usr/share/swmodd/opkg_offline
 endif
-ifeq ($(CONFIG_PACKAGE_crun),y)
-	$(INSTALL_DIR) $(1)/etc/swmodd
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/swmodd/run.sh $(1)/etc/swmodd/run.sh
-	$(INSTALL_BIN) ./files/etc/init.d/crun $(1)/etc/init.d/crun
-	$(INSTALL_BIN) ./files/etc/config/crun $(1)/etc/config/crun
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/crun_create $(1)/usr/sbin/crun_create
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-bundle-path $(1)/etc/uci-defaults/01-fix-bundle-path
-endif
 endef
 
 define Package/swmodd-cgroup/install

swmodd/files/etc/config/crun

@@ -1,2 +0,0 @@
-config global global
-	option enable '1'

swmodd/files/etc/config/swmodd

@@ -1,5 +1,4 @@
 config globals 'globals'
-        option enabled '1'
-        option debug '1'
-        option log_level '3'
-        option lan_bridge 'br-lan'
+	option enabled '1'
+	option debug '1'
+	option log_level '3'

swmodd/files/etc/init.d/crun

@@ -1,190 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t crun.init -p info
-}
-
-is_container_running() {
-	crun list |tail -n +2|grep -wq "^${1}"
-	return $?
-}
-
-configure_crun_container() {
-	local name type autostart du_status requested_state url username password
-	local BRIDGE BUNDLE
-	local RUNNER="/etc/swmodd/run.sh"
-
-	BUNDLE="${2}"
-	BRIDGE="${3}"
-
-	config_get name ${1} name ""
-	config_get type ${1} type ""
-	config_get_bool autostart ${1} autostart 1
-	config_get du_status ${1} du_status ""
-	config_get requested_state ${1} requested_state ""
-	config_get url ${1} url ""
-	config_get username ${1} username ""
-	config_get password ${1} password ""
-
-	if [ -z "${name}" ] || [ -z "${type}" ] || [ -z "${du_status}" ]; then
-		return 0;
-	fi
-
-	if [ "${type}" != "crun" ]; then
-		return 0;
-	fi
-
-	if [ "${du_status}" == "Installing" ]; then
-		local result
-		log "Pull image from registry"
-		uci_set ocicontainer ${1} du_status Installing_start
-		uci_set ocicontainer ${1} username ""
-		uci_set ocicontainer ${1} password ""
-		result=$(${RUNNER} -b "${BUNDLE}" -n "${name}" -r "${url}" -l "${username}:${password}")
-		if [ "$?" -eq 0 ]; then
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_description")
-			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} description "${result}"
-			fi
-
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_vendor")
-			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} vendor "${result}"
-			fi
-
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_version")
-			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} version "${result}"
-			fi
-
-			uci_set ocicontainer ${1} du_status Installing_success
-			du_status="Installed"
-		else
-			uci_set ocicontainer ${1} du_status Installing_failed
-			uci_set ocicontainer ${1} fault_string "${result}"
-			return 0;
-		fi
-	fi
-
-	if [ "${du_status}" == "Uninstalling" ]; then
-		ubus call service delete "{\"name\":\"crun\",\"instance\":\"${name}\"}"
-		if is_container_running "${name}"; then
-			crun kill --all "${name}" 9
-		fi
-		${RUNNER} -c -n "${name}"
-		if [ -d "${BUNDLE:?}/${name:?}" ]; then
-			rm -rf "${BUNDLE:?}/${name:?}"
-		fi
-
-		# If directory still exists then uninstall failed
-		if [ -d "${BUNDLE}/${name}" ]; then
-			uci_set ocicontainer ${1} du_status Uninstalling_failed
-			uci_set ocicontainer ${1} fault_string "Failed to remove ${BUNDLE}/${name}"
-		else
-			uci_set ocicontainer ${1} du_status Uninstalling_success
-		fi
-		# Delete the uci config section after uninstall
-		log "CRUN container ${name} removed"
-		return 0;
-	fi
-
-	if [ ! -d "${BUNDLE:?}/${name:?}" ]; then
-		log "Crun container {${BUNDLE:?}/${name:?}} not available"
-		return 0;
-	fi
-
-	if [ "${du_status}" != "Installed" ]; then
-		return 0;
-	fi
-
-	if [ "${autostart}" -eq 0 ]; then
-		ubus call service delete "{\"name\":\"crun\",\"instance\":\"${name}\"}"
-		# stop the container if not enabled
-		crun kill --all "${name}" 9
-		return 0;
-	fi
-
-	if is_container_running "${name}"; then
-		log "Container [$name] req_status [${requested_state}]"
-		if [ "${requested_state}" == "Idle" ]; then
-			crun pause "${name}"
-		elif [ "${requested_state}" == "Active" ]; then
-			${RUNNER} -u -n "${name}" -i "${BRIDGE}"
-			crun resume "${name}"
-		fi
-	else
-		${RUNNER} -U -b "${BUNDLE}" -n "${name}"
-		result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_description")
-		if [ "${result}" != "null" ]; then
-			uci_set ocicontainer ${1} description "${result}"
-		fi
-
-		result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_vendor")
-		if [ "${result}" != "null" ]; then
-			uci_set ocicontainer ${1} vendor "${result}"
-		fi
-
-		result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_version")
-		if [ "${result}" != "null" ]; then
-			uci_set ocicontainer ${1} version "${result}"
-		fi
-	fi
-
-        procd_open_instance "${name}"
-        procd_set_param stdout 1
-        procd_set_param stderr 1
-        procd_set_param command "${RUNNER}"
-        procd_append_param command -b "${BUNDLE}" -n "${name}" -i "${BRIDGE}"
-        procd_set_param respawn
-        procd_close_instance "${name}"
-}
-
-start_service() {
-	local bundle bridge
-
-	# Check if crun present
-	if ! command -v crun >/dev/null 2>&1; then
-		log "CRUN binary not found"
-		return 0;
-	fi
-
-	config_load swmodd
-	config_get bundle globals oci_bundle_root ""
-	config_get bridge globals lan_bridge "br-lan"
-
-	if [ -z "${bundle}" ] || [ -z "${bridge}" ]; then
-		log "Empty bundle path or bridge"
-		return 0;
-	fi
-
-	if [ -f "${bundle}/ocicontainer" ]; then
-		UCI_CONFIG_DIR="${bundle}"
-		config_load ocicontainer
-		config_foreach configure_crun_container du_eu_assoc "${bundle}" "${bridge}"
-		uci_commit
-		# Add a timer for DuStateChange!
-		(sleep 5 && ubus -t 5 call swmodules reload) &
-	fi
-}
-
-stop_service() {
-	local cid
-
-	cid="$(crun list|tail -n +2 |awk '{printf $1 " "}')"
-	for f in $cid; do
-		crun kill --all "${f}" 9
-	done
-}
-
-reload_service() {
-        start
-}
-
-service_triggers() {
-	procd_add_reload_trigger "crun" "network"
-}

swmodd/files/etc/init.d/swmodd

@@ -12,97 +12,46 @@ validate_globals_section()
 		'enabled:bool:1' \
 		'debug:bool:false' \
 		'log_level:uinteger:1' \
-		'lxc_bundle_root:string' \
-		'oci_bundle_root:string' \
 		'sock:string'
 }
 
-start_lxc_container() {
-	config_get name "${1}" name ""
-	config_get type "${1}" type ""
-	config_get autostart "${1}" autostart "0"
-	config_get timeout "${1}" timeout "300"
-
-	if [ -z "${name}" ] || [ -z "${type}" ]; then
-		return 0;
-	fi
-
-	if [ "${type}" != "lxc" ]; then
-		return 0;
-	fi
-
-	state=$(lxc-ls -f | tail -n +2 | grep -w "${name}" | cut -d " " -f 2)
-	if [ -z "${state}" ]; then
-		return 0;
-	fi
-
-	if [ "${autostart}" == "0" ]; then
-		if [ "${state}" == "RUNNING" ]; then
-			# stop the container if running
-			lxc-stop -n "${name}" -t "${timeout}" &
-			return 0;
-		elif [ "${state}" == "FROZEN" ]; then
-			# first unfreeze then stop
-			lxc-unfreeze -n "${name}"
-			lxc-stop -n "${name}" -t "${timeout}" &
-			return 0;
-		fi
-	else
-		if [ "${state}" == "FROZEN" ]; then
-			# unfreeze the container
-			lxc-unfreeze -n "${name}"
-		elif [ "${state}" == "STOPPED" ]; then
-			# start the container
-			lxc-start -n "${name}"
-			return 0;
-		fi
-	fi
-}
-
 start_service() {
-	local enabled debug log_level sock lxc_bundle_root oci_bundle_root
+	local enabled debug log_level sock
+
+	# creating fallback shared mount-point
+	mkdir -p /tmp/swmodd_dw
 
 	config_load swmodd
 
 	validate_globals_section || {
+		log "Validation of uci globals failed"
 		return 1;
 	}
 
 	[ "${enabled}" -eq 0 ] && return 0
 
-	# Create the bundle paths if not present
-	[ -n "${lxc_bundle_root}" ] && mkdir -p "${lxc_bundle_root}"
-	[ -n "${oci_bundle_root}" ] && mkdir -p "${oci_bundle_root}"
-
 	procd_open_instance swmodd
 	procd_set_param command ${PROG}
 
 	if [ "${debug}" -eq 1 ]; then
 		procd_set_param stdout 1
 		procd_set_param stderr 1
-		procd_append_param command -l "${log_level}"
+		procd_append_param command -l ${log_level}
 	fi
 
 	if [ -f "${sock}" ]; then
-		procd_append_param command -s "${sock}"
+		procd_append_param command -s ${sock}
 	fi
 
 	procd_set_param respawn
 	procd_close_instance
+}
 
-	# Auto-start the lxc containers
-	if [ -f "${lxc_bundle_root}/lxccontainer" ]; then
-		UCI_CONFIG_DIR="${lxc_bundle_root}"
-		config_load lxccontainer
-		config_foreach start_lxc_container container
-	fi
+stop_service() {
+	service_stop ${PROG}
 }
 
 reload_service() {
 	stop
 	start
 }
-
-service_triggers() {
-       procd_add_reload_trigger "swmodd"
-}

swmodd/files/etc/swmodd/run.sh

@@ -1,262 +0,0 @@
-#!/bin/sh
-
-VETHNAME=""
-
-log() {
-	echo "${@}"|logger -t crun.runner -p info
-	echo "${@}"
-}
-
-check_binary() {
-	if [ -z "${1}" ]; then
-		return 0;
-	fi
-
-	if ! command -v "${1}" >/dev/null 2>&1;then
-		log "${1} not present in system"
-		exit 1
-	fi
-	return 0;
-}
-
-check_binary crun
-check_binary script
-
-get_veth_name() {
-	local name
-
-	name="cr$1"
-	VETHNAME="${name:0:15}"
-}
-
-clean_container_network() {
-	local name
-
-	name="${1}"
-	# clean up
-	if ip netns list|grep -qw "${name}"; then
-		get_veth_name "${name}"
-		ip netns del "${name}"
-		ip link delete "${VETHNAME}" type veth peer name eth0
-	fi
-}
-
-setup_container_network() {
-	local name bridge_name
-
-	if [ "$#" -lt 2 ]; then
-		return 0
-	fi
-
-	name="${1}"
-	bridge_name="${2}"
-
-	clean_container_network "${name}"
-	get_veth_name "${name}"
-	# Add a namespace
-	ip netns add "${name}"
-	# Add a veth pair
-	ip link add "${VETHNAME}" type veth peer name eth0 netns "$name"
-	# Make veth on network side up
-	ip netns exec "$name" ip link set dev eth0 up
-	# Create loopback interface
-	ip netns exec "$name" ip link set lo up
-	# Make veth on host side up
-	ip link set dev "${VETHNAME}" up
-	# Link with host bridge
-	brctl addif "${bridge_name}" "${VETHNAME}"
-	# Get Ip from bridge and make the link ready
-	ip netns exec "$name" udhcpc -i eth0 -x hostname:"CRUN-${name}"
-	if [ "${du_status}" != "Installed" ]; then
-		return 0;
-	fi
-
-}
-
-run_container() {
-	local bundle name bridge
-
-	bundle="${1}"
-	name="${2}"
-	bridge="${3}"
-
-	if [ ! -d "${bundle:?}/${name:?}" ]; then
-		log "Bundle does not exist"
-		return 1
-	fi
-
-	setup_container_network "${name}" "${bridge}"
-	
-        script -q -c "crun run -b ${bundle}/${name} ${name}" /dev/null
-}
-
-update_network_ns() {
-    local type
-    json_select $2
-    json_get_var type type
-    if [ "${type}" == "network" ]; then
-        json_add_string path "/var/run/netns/${NAME}"
-	break;
-    fi
-    json_select ..
-}
-
-nginx_hack() {
-	# replace nginx user to root user
-	if [ -f "${BUNDLE:?}/${NAME:?}/rootfs/etc/nginx/nginx.conf" ]; then
-		sed -i 's/^user .*;$/user root;/' "${BUNDLE}/${NAME}/rootfs/etc/nginx/nginx.conf"
-	fi
-}
-
-update_config_json() {
-
-	if [ ! -f "${BUNDLE:?}/${NAME:?}/config.json" ]; then
-		log "config.json not found or bundle missing"
-		exit 0;
-	fi
-
-	if [ -f "/usr/share/libubox/jshn.sh" ]; then
-		. /usr/share/libubox/jshn.sh
-	else
-		log "jshn.sh missing in the system"
-		exit 1;
-	fi
-	cd "${BUNDLE}/${NAME}"
-	if cat config.json |jq '.linux.namespaces[] |select (.type == "network") |.path' |grep -q ${NAME}; then
-		exit 0;
-	fi
-
-	mv config.json config_orig.json
-	json_init
-	json_load_file "config_orig.json"
-	json_select linux
-	json_for_each_item update_network_ns namespaces
-	json_dump >config.json
-
-	nginx_hack
-}
-
-pull_image_from_registry() {
-	local temp disksize exsize
-
-	if [ -z "${BUNDLE}" -o -z "${NAME}" -o -z "${REGURL}" ]; then
-		log "Information missing for installation"
-		exit 1
-	fi
-
-	if [ -d "${BUNDLE}/${NAME}" ]; then
-		log "Container with same name already present"
-		exit 1
-	fi
-
-	check_binary skopeo
-	check_binary umoci
-	temp="$(mktemp -d)"
-	if [ ! -d "${temp}" ]; then
-		log "Failed to create temp directory"
-		exit 1
-	fi
-
-	cd "${temp}"
-	OPTS=""
-	INSPECT_OPT=""
-	if [ "${#LOGIN}" -gt 3 ]; then
-		OPTS="--src-creds ${LOGIN}"
-		INSPECT_OPT="--creds ${LOGIN}"
-	fi
-	if ! skopeo --command-timeout 4m copy ${OPTS} ${REGURL} oci:${NAME}_tmp:latest >/dev/null 2>&1; then
-		log "Failed to download image"
-		cd -
-		rm -rf "${temp}"
-		exit 1
-	fi
-	if ! umoci unpack --image ${NAME}_tmp:latest ${NAME} >/dev/null 2>&1; then
-		log "Failed to unpack image"
-		cd -
-		rm -rf "${temp}"
-		exit 1
-	fi
-	rm -rf "${NAME}_tmp"
-	if [ ! -f "${NAME}/config.json" ]; then
-		log "Failed to pull the image config missing"
-		cd -
-		rm -rf "${temp}"
-		exit 1
-	fi
-
-	# Check disk available space before copy
-	disksize=$(df -P -k ${BUNDLE} |tail -n +2 |awk '{print $4}')
-	exsize=$(du -s ${temp} |awk '{print $1}')
-	if [ "${disksize}" -lt "${exsize}" ]; then
-		log "Disk space ${disksize} less than required ${exsize}"
-		cd -
-		rm -rf "${temp}"
-		exit 1
-	fi
-
-	mv ${NAME} ${BUNDLE}/
-	if [ "$?" -ne 0 ]; then
-		log "Failed ${name} move in ${BUNDLE}"
-		cd -
-		rm -rf "${temp}"
-		rm -rf ${BUNDLE}/${NAME}
-		exit 1
-	fi
-
-	cd -
-	rm -rf "${temp}"
-	update_config_json
-}
-
-clean=0
-net_update=0
-update_json=0
-while getopts b:n:i:r:l:cuU options
-do
-	case "${options}" in
-		b) BUNDLE=${OPTARG};;
-		n) NAME=${OPTARG};;
-		i) BRIDGE=${OPTARG};;
-		r) REGURL=${OPTARG};;
-		l) LOGIN=${OPTARG};;
-		c) clean=1;;
-		u) net_update=1;;
-		U) update_json=1;;
-		*) log "Invalid options";;
-	esac
-done
-
-if [ -z "${NAME}" ]; then
-	log "Emtpy container name"
-	return 0;
-fi
-
-if [ "${update_json}" -eq 1 ]; then
-	update_config_json
-	return 0;
-fi
-
-if [ -n "${REGURL}" ]; then
-	pull_image_from_registry
-	return 0;
-fi
-
-if [ "$clean" -eq 1 ]; then
-	clean_container_network "${NAME}"
-	return 0;
-fi
-
-if [ -z "${BRIDGE}" ]; then
-	log "Empty bridge name"
-	return 0;
-fi
-
-if [ "${net_update}" -eq 1 ]; then
-	get_veth_name "${NAME}"
-	brctl addif "${BRIDGE}" "${VETHNAME}"
-	return 0;
-fi
-
-if [ -n "${BUNDLE}" ] ; then
-	run_container "${BUNDLE}" "${NAME}" "${BRIDGE}"
-fi

swmodd/files/etc/uci-defaults/01-fix-bundle-path

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-lxc=""
-lxc_bundle=""
-oci_bundle=""
-
-if [ -f "/etc/lxc/lxc.conf" ]; then
-	lxc=$(cat /etc/lxc/lxc.conf |grep "lxc.lxcpath"| cut -d "=" -f 2)
-fi
-
-config_load swmodd
-config_get lxc_bundle globals lxc_bundle_root ""
-config_get oci_bundle globals oci_bundle_root ""
-
-if [ -n "${lxc_bundle}" ]; then
-	# if lxc_bundle_root define in swmodd, update it in lxc path
-	mkdir -p /etc/lxc
-	echo "lxc.lxcpath = ${lxc_bundle}" > /etc/lxc/lxc.conf
-elif [ -n "${lxc}" ]; then
-	# if lxc_bundle_root not define in swmodd, update it with lxc path
-	uci_set swmodd globals lxc_bundle_root ${lxc}
-	uci_commit
-else
-	mkdir -p /etc/lxc
-	echo "lxc.lxcpath = /srv/" > /etc/lxc/lxc.conf
-	uci_set swmodd globals lxc_bundle_root "/srv/"
-	uci_commit
-fi
-
-if [ -z "${oci_bundle}" ] && [ -n "${lxc_bundle}" ]; then
-	# if oci_bundle_root not defined in swmodd, update it with lxc_bundle_root if defined
-	uci_set swmodd globals oci_bundle_root ${lxc_bundle}
-	uci_commit
-elif [ -z "${oci_bundle}" ] && [ -n "${lxc}" ]; then
-	# if oci_bundle_root not defined in swmodd, update it with lxc path
-	uci_set swmodd globals oci_bundle_root ${lxc}
-	uci_commit
-elif [ -z "${oci_bundle}" ]; then
-	uci_set swmodd globals oci_bundle_root "/srv/"
-	uci_commit
-fi

twamp/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -19,6 +19,7 @@ endif
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
+PKG_BUILD_DEPENDS:=bbf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,7 +28,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TWAMP Light Client(TR-390)
-  DEPENDS:=+libuci +ubox +libubus +libbbf_api
+  DEPENDS:=+libuci +ubox +libubus
 endef
 
 define Package/$(PKG_NAME)/description

udpecho/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.0.2
+PKG_VERSION:=2.0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -24,6 +24,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
+PKG_BUILD_DEPENDS:=bbf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,7 +35,7 @@ define Package/$(PKG_NAME)-server
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF UDP Echo Server
-  DEPENDS:=+libuci +libbbf_api
+  DEPENDS:=+libuci
 endef
 
 define Package/$(PKG_NAME)-client

umoci/Makefile

@@ -1,27 +1,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umoci
-PKG_VERSION:=0.4.7
-PKG_RELEASE:=$(AUTORELEASE)
-
+PKG_VERSION:=0.0.1
+PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_NAME:=umoci
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/opencontainers/umoci/archive/v$(PKG_VERSION)
-PKG_HASH:=c01b36de6fdc513eb65add57bc882d72f94fc3b4b65a8f9ef59826fb754af93e
+PKG_SOURCE_URL:=https://github.com/opencontainers/umoci.git
+PKG_SOURCE_VERSION:=2cec49f54b72684ef170f11c708c56140f298bf7
+PKG_MIRROR_HASH:=skip
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/opencontainers/umoci/
+GO_PKG_LDFLAGS_X:=main.gitCommit=$(PKG_SOURCE_VERSION) main.version=$(PKG_SOURCE_VERSION)
 
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 GOLANG_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-package.mk)
-GOLANG_HOST_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-host-build.mk)
 
 # verify that there is only one single file returned
 ifneq (1,$(words $(GOLANG_PACKAGE_MK)))
@@ -35,7 +36,6 @@ $(info found golang-package.mk at $(GOLANG_PACKAGE_MK))
 endif
 
 include $(GOLANG_PACKAGE_MK)
-include $(GOLANG_HOST_PACKAGE_MK)
 
 define Package/umoci
   SECTION:=utils
@@ -61,7 +61,5 @@ define Package/umoci/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/umoci $(1)/usr/bin
 endef
 
-$(eval $(call GoBinHostBuild))
-$(eval $(call HostBuild))
 $(eval $(call GoBinPackage,umoci))
 $(eval $(call BuildPackage,umoci))

usp-js/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usp-js
-PKG_VERSION:=1.0.1
+PKG_VERSION:=0.0.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git
@@ -17,55 +17,26 @@ PKG_MIRROR_HASH:=skip
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=node-yarn/host
 include $(INCLUDE_DIR)/package.mk
 
-define Package/usp-js/default
+define Package/usp-js
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A JS library for USP(TR369) protocol
+  DEPENDS:=+quickjs +quickjs-websocket
 endef
 
 define Package/usp-js/description
   A JS library to provide USP(TR369) protocol functionality for an usp controller.
 endef
 
-define Package/usp-js-quickjs
-  $(Package/usp-js/default)
-  TITLE += (QuickJS)
-  DEPENDS:=+quickjs +quickjs-websocket
-  VARIANT:=quickjs
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/usp-js-nodejs
-  $(Package/usp-js/default)
-  TITLE += (NodeJS)
-  DEPENDS:=+node
-  VARIANT:=nodejs
-endef
-
-ifeq ($(BUILD_VARIANT),nodejs)
 define Build/Compile
-	cd $(PKG_BUILD_DIR) && yarn install && yarn build
+	cd $(PKG_BUILD_DIR) && npm install @types/node --save-dev && yarn qjs
 endef
-else
-define Build/Compile
-	cd $(PKG_BUILD_DIR) && yarn install && yarn qjs
-endef
-endif
 
-define Package/usp-js-quickjs/install
+define Package/usp-js/install
 	$(INSTALL_DIR) $(1)/usr/lib/usp-js
 	$(CP) $(PKG_BUILD_DIR)/qjs/* $(1)/usr/lib/usp-js/
 endef
 
-define Package/usp-js-nodejs/install
-	$(INSTALL_DIR) $(1)/usr/lib/node_modules/usp-js
-	$(INSTALL_DIR) $(1)/usr/lib/node_modules/usp-js/node_modules
-	$(CP) $(PKG_BUILD_DIR)/node/* $(1)/usr/lib/node_modules/usp-js/
-	$(CP) $(PKG_BUILD_DIR)/node_modules/* $(1)/usr/lib/node_modules/usp-js/node_modules/
-endef
-
-$(eval $(call BuildPackage,usp-js-nodejs))
-$(eval $(call BuildPackage,usp-js-quickjs))
+$(eval $(call BuildPackage,usp-js))

uspd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.14
+PKG_VERSION:=2.2.14.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=1c3b886bb5e654049ae81cda726dffae950369c7
+PKG_SOURCE_VERSION:=b181ce224547265ad46a7b2777f76dddef1de5b5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

voicemngr/Makefile

@@ -16,7 +16,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/voicemngr.git
-PKG_SOURCE_VERSION:=4a8583a647d97aa8c3b1bf7ab71206c1438b86a6
+PKG_SOURCE_VERSION:=13a14593daa610a87c363a1a0acd19f31f405a71
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -33,7 +33,7 @@ else ifeq ($(CONFIG_TARGET_iopsys_qualcomm),y)
 endif
 
 export TARGET_PLATFORM
-export CONFIG_BRCM_SDK_VER_504040
+export CONFIG_BRCM_SDK_VER_504021
 export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk