swmodd: Add support to pull images from registries

Fix get/set handlers for CodecProfile.Codec in libvoiceservice

ated/Makefile

@@ -1,78 +0,0 @@
-#
-# 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.8.9.25
+PKG_VERSION:=6.8.21
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=e87b25b08294c608aef1e73d1268b35073097592
+PKG_SOURCE_VERSION:=ace24d82fcbf47d9437f21a1a96fa821e87a473f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -142,10 +142,8 @@ define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
-	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
 endef
 
 define Package/libbbfdm/default/prerm

bulkdata/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.3.1
+PKG_VERSION:=2.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
+PKG_SOURCE_VERSION:=85d7486a21a9eb0e0f345b587b3ac506edcb72fe
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

dectmngr/Makefile

@@ -14,7 +14,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cf4e91ffe0a1d83140fef5b41d16e581e5341cec
+PKG_SOURCE_VERSION:=c5695bc92f7f22089c9a85d3e1f4dac7c12ca900
 PKG_MIRROR_HASH:=skip
 endif
 

easy-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@TARGET_iopsys_brcm63xx_arm
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
 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.4.52
+PKG_VERSION:=6.5.8
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=822e9a50790970d14db254ffe3d7464709bcd3ca
+PKG_SOURCE_VERSION:=0b7292471d89793a050fe44fbc70ea129e7c9291
 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,26 +38,36 @@ 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_CFLAGS +=-DIOPSYS_MEDIATEK
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MAC80211
 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) \
@@ -87,6 +97,7 @@ 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
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_econet:ecnt_api
 endef
 
 define Package/libethernet/config

endptmngr/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptmngr
-PKG_VERSION:=0.7
+PKG_VERSION:=0.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=dc12712af8c4088f7873502ca845e51c68a1ada9
+PKG_SOURCE_VERSION:=9ab16cb0985d9614d63e2e38ce2a14ce445a226f
 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_504021
+export CONFIG_BRCM_SDK_VER_504040
 export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk

evoice/Makefile

@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=evoice
+PKG_VERSION:=0.2.25
+
+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:=3f41b639b02e0de8b9da13cbab55b6af8aa768e9
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=bbf
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+#PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Network
+	SUBMENU:=Telephony
+	TITLE:=Ensemble Voice
+	URL:=
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl\
+		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
+		+TARGET_iopsys_econet:kmod-voip_driver\
+		+TARGET_iopsys_econet:voip_app
+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
+else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
+	TARGET_PLATFORM=ECONET
+	TONES_INI_REQUIRED=y
+	TRG=SVrgMtekOwrt
+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
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/
+endef
+
+$(eval $(call BuildPackage,evoice))

evoice/files/etc/config/voice

@@ -0,0 +1,327 @@
+
+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 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'
+	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 '1'
+	option Extension 'Extension2'
+	option Line 'Line1'
+
+config OutgoingMap 'OutgoingMap1'
+	option Enable '1'
+	option Extension 'Extension1'
+	option Line 'Line1'
+
+config OutgoingMap 'OutgoingMap2'
+	option Enable '1'
+	option Extension 'Extension2'
+	option Line 'Line2'
+
+config CallingFeatures 'Set1'
+	option CallerIDEnable '1'
+	option CallerIDNameEnable '1'
+	option CallForwardUnconditionalEnable '0'
+	option CallForwardUnconditionalNumber ' '
+	option CallForwardOnBusyEnable '0'
+	option CallForwardOnBusyNumber ' '
+	option CallForwardOnNoAnswerEnable '0'
+	option CallForwardOnNoAnswerRingTimeout '24'
+	option CallForwardOnNoAnswerNumber ' '
+	option CallTransferEnable '1'
+	option MWIEnable '1'
+	option VMWIEnable '1'
+	option LineMessagesWaiting '0'
+	option AnonymousCallRejectionEnable '0'
+	option AnonymousCallEnable '1'
+	option DoNotDisturbEnable '1'
+	option RepeatDialEnable '1'
+	option VoiceMailEnable '1'
+	option CallPickUpEnable '1'
+	option CCBSEnable '1'
+	option CallWaitingEnable '0'
+
+config CallingFeatures 'Set2'
+	option CallerIDEnable '1'
+	option CallerIDNameEnable '1'
+	option CallForwardUnconditionalEnable '0'
+	option CallForwardUnconditionalNumber ' '
+	option CallForwardOnBusyEnable '0'
+	option CallForwardOnBusyNumber ' '
+	option CallForwardOnNoAnswerEnable '0'
+	option CallForwardOnNoAnswerRingTimeout '24'
+	option CallForwardOnNoAnswerNumber ' '
+	option CallTransferEnable '1'
+	option MWIEnable '1'
+	option VMWIEnable '1'
+	option LineMessagesWaiting '0'
+	option AnonymousCallRejectionEnable '0'
+	option AnonymousCallEnable '1'
+	option DoNotDisturbEnable '1'
+	option RepeatDialEnable '1'
+	option VoiceMailEnable '1'
+	option CallPickUpEnable '1'
+	option CCBSEnable '1'
+	option CallWaitingEnable '1'
+
+config NumberingPlan 'NumberingPlan1'
+	option MinimumNumberOfDigits '1'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit '#'
+
+config NumberingPlan 'NumberingPlan2'
+	option MinimumNumberOfDigits '5'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit ' '
+	list PrefixList '2PrefixInfo1'
+	list PrefixList '2PrefixInfo2'
+	list PrefixList '2PrefixInfo3'
+	list PrefixList '2PrefixInfo4'
+	list PrefixList '2PrefixInfo5'
+	list PrefixList '2PrefixInfo6'
+	list PrefixList '2PrefixInfo7'
+	list PrefixList '2PrefixInfo8'
+	list PrefixList '2PrefixInfo9'
+
+config NumberingPlan 'NumberingPlan3'
+	option MinimumNumberOfDigits '5'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit '#'
+	list PrefixList '3PrefixInfo1'
+
+config PrefixInfo '2PrefixInfo1'
+	option Enable '1'
+	option PrefixRange '*43#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CW_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo2'
+	option Enable '1'
+	option PrefixRange '#43#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CW_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo3'
+	option Enable '1'
+	option PrefixRange '*21*(X+)#'
+	option PrefixMinNumberOfDigits '9'
+	option PrefixMaxNumberOfDigits '9'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFU_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo4'
+	option Enable '1'
+	option PrefixRange '#21#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFU_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo5'
+	option Enable '1'
+	option PrefixRange '*67*(X+)#'
+	option PrefixMinNumberOfDigits '9'
+	option PrefixMaxNumberOfDigits '9'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFB_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo6'
+	option Enable '1'
+	option PrefixRange '#67#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFB_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo7'
+	option Enable '1'
+	option PrefixRange '*61*(X+(*X+)?)#'
+	option PrefixMinNumberOfDigits '15'
+	option PrefixMaxNumberOfDigits '15'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFNR_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo8'
+	option Enable '1'
+	option PrefixRange '#61#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFNR_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo9'
+	option Enable '1'
+	option PrefixRange '*31*'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CA_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo1'
+	option Enable '1'
+	option PrefixRange '110|112'
+	option PrefixMinNumberOfDigits '7'
+	option PrefixMaxNumberOfDigits '7'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'X_IOPSYS_EU_EMERGENCY'
+	option FacilityActionArgument ' '
+
+config DialPlan 'X_IOPSYS_EU_InternalNumber1'
+	option RegExp '1X#'
+

evoice/files/etc/evoice/voicedm

@@ -0,0 +1,174 @@
+# 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 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'
+
+config VoIPProfile 'map_voip'
+   option Enable 'voice.VoIPProfile@.Enable'
+   option DTMF_Method 'voice.VoIPProfile@.DTMFMethod'
+   option RTP 'voice.VoIPProfile@.RTP'
+
+config RTP 'map_rtp'
+   option RTP_Port_Base 'voice.@RTP@.LocalPortMin'
+   option RTP_Port_End 'voice.@RTP@.LocalPortMax'
+
+config codecs 'map_codec'
+   option Codec 'voice.CodecProfile@.Codec'
+   option enable 'voice.CodecProfile@.Enable'
+   option ptime 'voice.CodecProfile@.PacketizationPeriod'
+   option dtx 'voice.CodecProfile@.SilenceSupression'
+
+config fxsinfo 'map_fxs'
+   option Enable 'voice.FXS@.Enable'
+   option DialType 'voice.FXS@.DialType'
+   option TransmitGain 'voice.FXS@.TransmitGain'
+   option ReceiveGain  'voice.FXS@.ReceiveGain'
+   option EchoCancellationEnable 'voice.FXS@.EchoCancellationEnable'
+
+config extensioninfo 'map_ext'
+   option Enable 'voice.Extension@.Enable'
+   option Internal_Number_Phone 'voice.Extension@.ExtensionNumber'
+   option Display_Name_Phone 'voice.Extension@.Name'
+
+config capabilities 'map_capa'
+   option Call_Waiting_Enable 'voice.Capabilities@FacilityActions'
+   option Enable_Call_Diversion 'voice.Capabilities@FacilityActions'
+
+config cs_account 'map_set'
+   option BusyCallWait 'voice.Set@.CallWaitingEnable'
+   option AlwaysDivert 'voice.Set@.CallForwardUnconditionalEnable'
+   option CFU_Number 'voice.Set@.CallForwardUnconditionalNumber'
+   option BusyDivert 'voice.Set@.CallForwardOnBusyEnable'
+   option CFB_Number 'voice.Set@.CallForwardOnBusyNumber'
+   option NoAnswDivert 'voice.Set@.CallForwardOnNoAnswerEnable'
+   option CFNR_Number 'voice.Set@.CallForwardOnNoAnswerNumber'
+   option CFNR_Timeout 'voice.Set@.CallForwardOnNoAnswerRingTimeout'
+   option Enable_Call_Transfer 'voice.Set@.CallTransferEnable'
+   option AnonymousReject 'voice.Set@.AnonymousCallRejectionEnable'
+   option AllowAnonymousConf 'voice.Set@.AnonymousCallEnable'
+   option CallerIDEnable 'voice.Set@.CallerIDEnable'
+
+config cs_xvendor 'map_np_cs'
+   option np_sc_actCW 'voice.X_IOPSYS_EU_NpSc@.CW_ACT'
+   option np_sc_actCW_output 'voice.X_IOPSYS_EU_NpSc@.CW_OUT'
+   option np_sc_deactCW 'voice.X_IOPSYS_EU_NpSc@.CW_DEACT'
+   option np_sc_isactCW 'voice.X_IOPSYS_EU_NpSc@.CW_ISACT'
+   option np_sc_actCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_ACT'
+   option np_sc_actCFU_output 'voice.X_IOPSYS_EU_NpSc@.CFU_OUT'
+   option np_sc_deactCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_DEACT'
+   option np_sc_actCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_ACT'
+   option np_sc_actCFB_output 'voice.X_IOPSYS_EU_NpSc@.CFB_OUT'
+   option np_sc_deactCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_DEACT'
+   option np_sc_actCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_ACT'
+   option np_sc_actCFNR_output 'voice.X_IOPSYS_EU_NpSc@.CFNR_OUT'
+   option np_sc_deactCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_DEACT'
+   option np_sc_actRA 'voice.X_IOPSYS_EU_NpSc@.RA_ACT'
+   option np_sc_deactRA 'voice.X_IOPSYS_EU_NpSc@.RA_DEACT'
+   option np_sc_actAC 'voice.X_IOPSYS_EU_NpSc@.AC_ACT'
+   option np_sc_deactAC 'voice.X_IOPSYS_EU_NpSc@.AC_DEACT'
+   option np_sc_actAA 'voice.X_IOPSYS_EU_NpSc@.AA_ACT'
+   option np_sc_deactAA 'voice.X_IOPSYS_EU_NpSc@.AA_DEACT'
+   option np_sc_actAD 'voice.X_IOPSYS_EU_NpSc@.AD_ACT'
+   option np_sc_actAD_output 'voice.X_IOPSYS_EU_NpSc@.AD_OUT'
+   option np_sc_deactAD 'voice.X_IOPSYS_EU_NpSc@.AD_DEACT'
+   option np_sc_actMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_ACT'
+   option np_sc_deactMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_DEACT'
+   option np_sc_actMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_ACT'
+   option np_sc_deactMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_DEACT'
+   option np_sc_redial 'voice.X_IOPSYS_EU_NpSc@.REDIAL'
+   option np_sc_setMiscConf 'voice.X_IOPSYS_EU_NpSc@.SET_MISC'
+
+config cc_xvendor 'map_np_in'
+   option np_in_limitExp 'voice.X_IOPSYS_EU_InternalNumber@.RegExp'
+
+config cc_xvendor 'map_np_sh'
+   option sh_no_str 'voice.X_IOPSYS_EU_ShortNumber@.RegExp'
+
+config cc_xvendor 'map_np_eme'
+   option np_eme 'voice.X_IOPSYS_EU_EmergencyNumber@.RegExp'
+   option np_eme_out 'voice.X_IOPSYS_EU_EmergencyNumber@.OutStr'
+
+config cc_xvendor 'map_np_rn'
+   option np_rn 'voice.X_IOPSYS_EU_RegularNumber@.RegExp'
+   option np_rn_out 'voice.X_IOPSYS_EU_RegularNumber@.OutStr'
+   option np_rn_account 'voice.X_IOPSYS_EU_RegularNumber@.AccStr'
+
+config cc_xvendor 'map_np_bn'
+   option np_bn 'voice.X_IOPSYS_EU_BarredNumber@.RegExp'
+   option np_bn_out 'voice.X_IOPSYS_EU_BarredNumber@.OutStr'
+
+config TR104NumberingPlan 'map_np_tr'
+   option min_digits 'voice.NumberingPlan@.MinimumNumberOfDigits'
+   option max_digits 'voice.NumberingPlan@.MaximumNumberOfDigits'
+   option tmo_std 'voice.NumberingPlan@.InterDigitTimerStd'
+   option tmo_open 'voice.NumberingPlan@.InterDigitTimerOpen'
+   option term_digit 'voice.NumberingPlan@.TerminationDigit'
+   option prefix_list 'voice.NumberingPlan@.PrefixList'
+
+config TR104NumberingPlanPrefix 'map_np_pf'
+   option enable 'voice.@PrefixInfo@.Enable'
+   option range 'voice.@PrefixInfo@.PrefixRange'
+   option prefix_min_digits 'voice.@PrefixInfo@.PrefixMinNumberOfDigits'
+   option prefix_max_digits 'voice.@PrefixInfo@.PrefixMaxNumberOfDigits'
+   option remove_digits 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
+   option remove_pos 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
+   option facility_act 'voice.@PrefixInfo@.FacilityAction'
+   option facility_arg 'voice.@PrefixInfo@.FacilityActionArgument'
+
+

evoice/files/etc/evoice/voicero

@@ -0,0 +1,57 @@
+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 SIP_SessTmrEnable '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

@@ -4,16 +4,15 @@ START=68
 STOP=12
 
 USE_PROCD=1
-NAME=voicemngr
+NAME=evoice
+VOICE_UCI_CONFIG=voice
 
 start_service() {
 	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
 
 	procd_open_instance
-	procd_set_param env hw_board_hasDect=$(db get hw.board.hasDect)
 	procd_set_param command $NAME
 	procd_set_param respawn "5" "0" "3"
-	procd_set_param nice -12
 	procd_close_instance
 }
 
@@ -23,5 +22,5 @@ reload_service() {
 }
 
 service_triggers() {
-	procd_add_reload_trigger asterisk
+	procd_add_reload_trigger $VOICE_UCI_CONFIG
 }

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:=0ebaf1e7d1f09318ae75d0f475a25280742b790e
+PKG_SOURCE_VERSION:=e3cefda3b26c9aea3021b20725ce7b31b33eebc4
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2

gryphon-led-module/Makefile

@@ -44,13 +44,17 @@ MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
-	MODULES_SUBDIR:=lib/modules/4.19.183
+	MODULES_SUBDIR:=lib/modules/4.19.225
 	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

@@ -1,14 +0,0 @@
-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

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.25.10
+PKG_VERSION:=8.5.9
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=cb601366e6a91db532ba7d577f653a2b86c4a479
+PKG_SOURCE_VERSION:=5553a890ae29692d8e3c7e1b1734adb0722b020a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -21,9 +21,8 @@ PKG_RELEASE=$(PKG_SOURCE_VERSION)
 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
@@ -33,10 +32,6 @@ define Package/icwmp/default
   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)
@@ -62,15 +57,15 @@ define Package/icwmp-mbedtls
 endef
 
 ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
 endif
 
 ifeq ($(BUILD_VARIANT),wolfssl)
-CONFIGURE_ARGS += --enable-libwolfssl
+CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
+CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)

icwmp/files/etc/init.d/icwmpd

@@ -77,7 +77,7 @@ convert_to_hex() {
 	OPTIND=1
 	while getopts ":" opt "-$optval"
 	do
-		temp=$(printf "%02X" "'${OPTARG:-:}")
+		temp=$(printf "%X" "'${OPTARG:-:}")
 		val="${val}:${temp}"
 	done
 
@@ -133,14 +133,14 @@ configure_send_op125() {
 		opt125_len=$((opt125_len + 4))
 	fi
 
-	hex_opt125_len=$(printf "%02X" "${opt125_len}")
+	hex_opt125_len=$(printf "%X" "${opt125_len}")
 	opt125="${opt125}:${hex_opt125_len}"
 	hex_oui=$(convert_to_hex "${oui}")
 	if [ -z "${hex_oui}" ]; then
 		return 0
 	fi
 
-	hex_oui_len=$(printf "%02X" "${oui_len}")
+	hex_oui_len=$(printf "%X" "${oui_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
 	else
@@ -152,7 +152,7 @@ configure_send_op125() {
 		return 0
 	fi
 
-	hex_serial_len=$(printf "%02X" "${serial_len}")
+	hex_serial_len=$(printf "%X" "${serial_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
 	else
@@ -165,7 +165,7 @@ configure_send_op125() {
 			return 0
 		fi
 
-		hex_class_len=$(printf "%02X" "${class_len}")
+		hex_class_len=$(printf "%X" "${class_len}")
 		if [ "${uci}" = "network" ]; then
 			opt125="${opt125}:03:${hex_class_len}${hex_class}"
 		else
@@ -313,8 +313,6 @@ copy_cwmp_varstate_files_to_etc() {
 	fi
 
 	if [ -f /var/state/cwmp ]; then
-		uci -q -c /var/state delete cwmp.sess_status
-		uci -q -c /var/state commit cwmp
 		cp -f /var/state/cwmp /etc/icwmpd/
 	fi
 
@@ -462,11 +460,6 @@ service_stopped()
 	copy_cwmp_varstate_files_to_etc
 }
 
-stop_service()
-{
-	copy_cwmp_varstate_files_to_etc
-}
-
 reload_service() {
 	local ret
 
@@ -476,7 +469,6 @@ reload_service() {
 	ret="0"
 	if [ "$enable_cwmp" = "0" ]; then
 		stop
-		start
 		return 0
 	fi
 

ieee1905/Makefile

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2021-2022 IOPSYS
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.10.28
+PKG_VERSION:=4.10.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e10385f117bc20a8d16f1b57ad4f86d4a98552c0
+PKG_SOURCE_VERSION:=a213ee8c1f2195bbce1756e033e7a774ef4b5d2a
 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
@@ -70,6 +70,7 @@ define Package/libieee1905/description
 endef
 
 TARGET_CFLAGS += \
+	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

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

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

iop/config

@@ -50,6 +50,8 @@ 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
 
@@ -115,7 +117,8 @@ CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_dnsmasq=y
+CONFIG_PACKAGE_miniupnpd-iptables=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -137,7 +140,7 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables=y
+CONFIG_PACKAGE_iptables-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -162,6 +165,7 @@ 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
@@ -285,3 +289,10 @@ 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,57 +2,65 @@
 
 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
 
-    git remote -v | grep -qE '(git@|ssh://)' && developer=1
+	cp .config .genconfig_config_bak
 
-    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
+	#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
 
-    # install all packages
-    ./scripts/feeds install -a
+	# 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
 
-    # remove broken symlinks ( for packages that are no longer in the feed )
-    find -L package/feeds -maxdepth 2 -type l -delete
+	# install all packages
+	./scripts/feeds install -a
 
-    cp .genconfig_config_bak .config
-    make defconfig
+	# remove broken symlinks ( for packages that are no longer in the feed )
+	find -L package/feeds -maxdepth 2 -type l -delete
 
-    # record when we last run this script
-    touch tmp/.iop_bootstrap
+	cp .genconfig_config_bak .config
+	make defconfig
 
-    # always return true
-    exit 0
+	# record when we last run this script
+	touch tmp/.iop_bootstrap
+
+	# always return true
+	exit 0
 }
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
-

iop/scripts/genconfig.sh

@@ -13,11 +13,12 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	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"
+	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
+	ramips="target/linux/feeds/iopsys-ramips"
+	econet="target/linux/feeds/iopsys-econet"
+	x86="target/linux/feeds/iopsys-x86"
+	armvirt="target/linux/feeds/iopsys-armvirt"
+	mediatek="target/linux/feeds/iopsys-mediatek"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -83,8 +84,8 @@ function genconfig {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
+			local targetpath="./target/linux/feeds/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -117,9 +118,11 @@ function genconfig {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $mediatek/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -167,6 +170,14 @@ 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
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -319,19 +330,25 @@ function genconfig {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES 
-		if [ "$target" = "iopsys_ramips" ]; then
-			subtarget="mt7621"
+		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}")"
 			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
-		fi
+			;;
+		esac
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

iop/scripts/genconfig_min.sh

@@ -12,11 +12,12 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	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"
+	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
+	ramips="target/linux/feeds/iopsys-ramips"
+	econet="target/linux/feeds/iopsys-econet"
+	x86="target/linux/feeds/iopsys-x86"
+	armvirt="target/linux/feeds/iopsys-armvirt"
+	mediatek="target/linux/feeds/iopsys-mediatek"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -82,8 +83,8 @@ function genconfig_min {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
+			local targetpath="./target/linux/feeds/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -116,9 +117,11 @@ function genconfig_min {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $mediatek/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -166,6 +169,14 @@ 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
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -310,19 +321,25 @@ function genconfig_min {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES
-		if [ "$target" = "iopsys_ramips" ]; then
-			subtarget="mt7621"
+		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}")"
 			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
-		fi
+			;;
+		esac
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

map-agent/Config.in

@@ -13,22 +13,5 @@ config AGENT_ISLAND_PREVENTION
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
-
-config AGENT_EASYMESH_VENDOR_EXT
-	bool "Enable extra features through Easymesh vendor extension"
-	default y
-
-config AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
-
-config AGENT_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
-	default AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	help
-	Extra features not covered by the base Easymesh specification can be
-	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
-	through which such features would be exposed.
-
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.2.2
+PKG_VERSION:=2.10.2.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4ed3f9bf0743086a85e1b7cf49c47eb49ab05015
+PKG_SOURCE_VERSION:=aed9b1fa91772fe9c15d5ca93833e8bfbdbeda57
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -28,7 +28,7 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +map-plugin +ip-bridge
+	  +map-plugin
 endef
 
 
@@ -56,6 +56,7 @@ 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)
@@ -70,12 +71,6 @@ ifeq ($(CONFIG_AGENT_EASYMESH_R2_CERT),y)
 TARGET_CFLAGS += -DEASYMESH_R2_CERT
 endif
 
-ifeq ($(CONFIG_AGENT_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)\\\"
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
-endif
-
-
 MAKE_PATH:=src
 
 define Package/map-agent/install
@@ -83,6 +78,8 @@ 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,8 +6,6 @@ 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

@@ -10,6 +10,53 @@ IS_CFG_VALID=1
 MAP_DEV="map_dev"
 MAP_IF="map"
 
+create_map() {
+	ip link add lei type veth peer name lei_map 2>/dev/null
+	ip link add link lei name lei_lan type vlan id 1 2>/dev/null
+
+	uci -q set network.${MAP_DEV}=device
+	uci -q set network.${MAP_DEV}.name=br-map
+	uci -q set network.${MAP_DEV}.type=bridge
+
+	uci -q show network.${MAP_DEV}.ports | grep -q lei_map || {
+		uci -q add_list network.${MAP_DEV}.ports='lei_map'
+	}
+
+	uci -q set network.${MAP_IF}=interface
+	uci -q set network.${MAP_IF}.device=br-map
+	uci -q set network.${MAP_IF}.is_lan=1
+
+	uci -q show network.br_lan.ports | grep -q lei_lan || {
+		uci -q add_list network.br_lan.ports="lei_lan"
+	}
+
+	uci -q set mapagent.agent.al_bridge=br-map
+
+	uci -q commit
+
+	ubus call network reload
+	ubus -t 5 wait_for network.interface.map
+
+	brctl addif br-map lei_map 2>/dev/null
+	brctl addif br-lan lei_lan 2>/dev/null
+
+	ip link set lei up 2>/dev/null
+	ip link set lei_map up 2>/dev/null
+	ip link set lei_lan up 2>/dev/null
+}
+
+remove_map() {
+	ip link delete ${MAP_VETH} &>/dev/null
+
+	uci -q delete network.${MAP_DEV}
+	uci -q delete network.${MAP_IF}
+
+	uci -q set mapagent.agent.al_bridge=br-lan
+
+	uci -q commit
+
+	ubus call network reload
+}
 
 start_dynbhd_service() {
 	rm -f /tmp/multiap.backhaul
@@ -69,7 +116,7 @@ validate_ap_section() {
 	uci_validate_section mapagent $section "${1}" \
 			'ifname:string' \
 			'device:string' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'enabled:bool:true' \
 			'onboarded:bool:false' \
 			'ssid:string' \
@@ -182,6 +229,10 @@ start_service() {
 	config_get_bool enabled agent enabled 1
 	[ "$enabled" -eq 0 ] && return 1
 
+	local ts
+	config_get_bool ts agent vlan_segregation 0
+	[ "$ts" -eq 1 ] && create_map #|| remove_map
+
 	procd_open_instance
 	procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
@@ -190,6 +241,10 @@ start_service() {
 	procd_close_instance
 }
 
+#stop_service() {
+#	remove_map
+#}
+
 service_triggers()
 {
 	procd_add_reload_trigger "mapagent"

map-agent/files/lib/wifi/multiap

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

@@ -1,460 +0,0 @@
-#!/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/Config.in

@@ -6,21 +6,5 @@ config CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 	bool "Support Dynamic Controller configuration sync"
 	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 
-config CONTROLLER_EASYMESH_VENDOR_EXT
-	bool "Enable extra features through Easymesh vendor extension"
-	default y
-
-config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
-
-config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
-	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	help
-	Extra features not covered by the base Easymesh specification can be
-	enabled through CONTROLLER_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
-	through which such features would be exposed.
-
 endmenu
 endif

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.8.0.15
+PKG_VERSION:=2.11.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e71a5f4f7f947f4c7819b4caf238fd1bec9b4fe8
+PKG_SOURCE_VERSION:=f74c6625967c6ab7f413a70fe72a876e5757ac22
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -38,6 +38,7 @@ 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
@@ -48,18 +49,11 @@ ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
 
-ifeq ($(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)\\\"
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
-endif
-
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
-	$(CP) $(PKG_BUILD_DIR)/src/plugins/steer/rcpi/rcpi.so $(1)/usr/lib/mapcontroller/rcpi.so
 endef
 
 ifeq ($(LOCAL_DEV),1)

map-controller/files/etc/config/mapcontroller

@@ -6,9 +6,8 @@ config controller 'controller'
 	option enable_bsta_steer '0'
 	option use_bcn_metrics '0'
 	option use_usta_metrics '0'
-	option primary_vid '1'
+	option primary_vid '0'
 	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")' \
+			'band:or("2", "5", "6")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
 				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \

map-topology/Config.in

@@ -1,22 +0,0 @@
-if (PACKAGE_map-topology)
-
-menu "Configurations"
-
-config TOPOLOGYD_EASYMESH_VENDOR_EXT
-	bool "Enable extra features through Easymesh vendor extension"
-	default y
-
-config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
-
-config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
-	default TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	help
-	Extra features not covered by the base Easymesh specification can be
-	enabled through TOPOLOGYD_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
-	through which such features would be exposed.
-
-endmenu
-endif

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.0.13
+PKG_VERSION:=2.5.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=413330b08fc4608ea2f5f740cf829f62d5a8bba0
+PKG_SOURCE_VERSION:=01a58d068adea4636e984291f39d7694ea30860c
 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
@@ -31,11 +31,8 @@ define Package/map-topology
 	TITLE:=Utility to build topology of a multi-AP network
 endef
 
-define Package/map-topology/config
-	source "$(SOURCE)/Config.in"
-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 \
@@ -47,11 +44,6 @@ endef
 
 MAKE_PATH:=src
 
-ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
-endif
-
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/map-topology/* $(PKG_BUILD_DIR)/

map-topology/files/etc/config/hosts

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

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

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

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.16.5
+PKG_VERSION:=5.0.0.20
 
 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:=c71da7f9b66f4d7fd240e6eb7078044c6b43b72b
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -91,7 +91,6 @@ endif
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
-        $(Build/Patch)
 endef
 endif
 
@@ -101,6 +100,7 @@ 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/
@@ -108,6 +108,7 @@ 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,30 +1,17 @@
 config obuspa 'global'
 	option enabled '1'
-	option interface 'loopback'
-	#option ifname 'lo'
 	option debug '1'
 	option log_level '1'
-	option prototrace '0'
-	#option db_file '/etc/obuspa/usp.db'
+	option prototrace '1'
+	option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#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
+config mtp 'agent_mtp'
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
 	option mqtt 'localmqtt'
@@ -35,13 +22,30 @@ 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
-	option ID 'default-boot-event-ACS'
-	option NotifType 'Event'
-	option ReferenceList 'Device.Boot!'
-	option Persistent 'true'
-	option controller 'localcontroller'
+#config subscription 'sub_event'
+#    option ID 'uci-sub-events'
+#    option NotifType 'Event'
+#    list ReferenceList 'Device.Boot!'
+#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
+#    option Persistent 'true'
+#    option controller 'localcontroller'
+
+#config subscription 'sub_op_comp'
+#   option ID 'uci-sub-op_complete'
+#   option NotifType 'OperationComplete'
+#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
+#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
+#   option Persistent 'true'
+#   option controller 'localcontroller'
 
 #config challenge 'admin'
 #	option Description 'Request to get Administrative access'

obuspa/files/etc/obuspa/dmcaching_exclude.json

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

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

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+fix_stomp_section() {
+	local encryption
+
+	config_get_bool encryption $1 encryption "1"
+	uci_set obuspa $1 encryption ""
+	uci_set obuspa $1 EnableEncryption "$encryption"
+}
+
+# Copy defaults by the factory to the cwmp UCI user section.
+config_load obuspa
+config_foreach fix_stomp_section stomp
+uci_commit
+
+# No need for commit here, it is done by uci_apply_defaults().

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

@@ -1,42 +0,0 @@
---- a/src/core/cli_server.c
-+++ b/src/core/cli_server.c
-@@ -733,10 +733,6 @@ int ExecuteCli_Get(char *arg1, char *arg
-             USP_ASSERT(gge->value != NULL);
-             SendCliResponse("%s => %s\n", gge->path, gge->value);
-         }
--        else
--        {
--            SendCliResponse("ERROR: %d retrieving %s (%s)\n", gge->err_code, gge->path, gge->err_msg);
--        }
-     }
- 
-     GROUP_GET_VECTOR_Destroy(&ggv);
---- a/src/core/handle_get.c
-+++ b/src/core/handle_get.c
-@@ -252,24 +252,14 @@ void FormPathExprResponse(int get_expr_i
-         return;
-     }
- 
--    // If there was an error in getting any of the parameters associated with the path expression,
--    // then just add the first error, without any of the parameter values, for this path expression result
--    for (i=0; i < gi->num_entries; i++)
--    {
--        gge = &ggv->vector[gi->index + i];
--        if (gge->err_code != USP_ERR_OK)
--        {
--            (void)AddGetResp_ReqPathRes(resp, path_expr, gge->err_code, gge->err_msg);
--            return;
--        }
--    }
--
-     // If the code gets here, then the value of all parameters were retrieved successfully, so add their values to the result_params
-     req_path_result = AddGetResp_ReqPathRes(resp, path_expr, USP_ERR_OK, "");
-     for (i=0; i < gi->num_entries; i++)
-     {
-         gge = &ggv->vector[gi->index + i];
- 
-+        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);

ponmngr/Makefile

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

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

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+set_serial_number() {
+	vendor_id=$1
+	vssn=$2
+
+	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
+}
+
+init_xpon() {
+	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
+}
+

ponmngr/files/common/etc/init.d/xpon

@@ -9,16 +9,14 @@ USE_PROCD=1
 include /lib/xpon
 
 configure_serial_number() {
-	# serial number generation is taken care in the uci defaults, so if
-	# serial number is not found here its a misconfig
 	serial_number="$(uci -q get xpon.ani.serial_number)"
 	if [ ${#serial_number} -eq 12 ]; then
 		vendor_id="${serial_number:0:4}"
 		vssn="${serial_number:4:8}"
 	else
-		logger -s -t "xpon" "Serial number not found in uci, ont will probably not be registered at the olt"
-		logger -s -t "xpon" "Please configure a valid serial number"
-		return
+		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
+		vendor_id="IOPS"
+		vssn="${macaddr:4:8}"
 	fi
 
 	set_serial_number $vendor_id $vssn

ponmngr/files/common/etc/uci-defaults/60-xpon-generate

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ -s "/etc/config/xpon" ]; then
+        if uci -q get xpon.ani >/dev/null; then
+                # return if there is any valid content
+                exit                                  
+        else                                          
+                rm -f /etc/config/xpon
+        fi                           
+fi                                   
+touch /etc/config/xpon
+                     
+                          
+uci set xpon.ani=ani
+uci set xpon.ani.enable="1"
+                                           
+uci commit xpon  

ponmngr/files/etc/uci-defaults/60-xpon-generate

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-
-configure_serial_number() {
-	# check if serial number is present in the production data
-	production_sn="$(fw_printenv -n gponsn)"
-	if [ ${#production_sn} -eq 12 ]; then
-		uci set xpon.ani.serial_number=$production_sn
-	else
-		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-		vendor_id="IOPS"
-		vssn="${macaddr:4:8}"
-		uci set xpon.ani.serial_number=$vendor_id$vssn
-	fi
-}
-
-if [ -s "/etc/config/xpon" ]; then
-        if uci -q get xpon.ani >/dev/null; then
-                # generate serial number in case its not present and return
-		serial_number="$(uci -q get xpon.ani.serial_number)"
-		if [ ${#serial_number} -ne 12 ]; then
-			configure_serial_number
-		fi
-                exit                                  
-        else                                          
-                rm -f /etc/config/xpon
-        fi                           
-fi                                   
-touch /etc/config/xpon
-
-uci set xpon.ani=ani
-uci set xpon.ani.enable="1"
-configure_serial_number
-

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

@@ -30,17 +30,25 @@ populate_config_from_db() {
 }
 
 populate_config_from_device_tree() {
-	for port in $(find /proc/device-tree/ -name "port@*"); do
-		port="$(cat $port/label)"
+	for path in $(find /proc/device-tree/ -name "port@*"); do
+		port="$(cat $path/label)"
 		[ -n "$port" ] || continue
 		[ "$port" = "cpu" ] && continue
+		speed=1000
+		if [ -e "$path/phy-mode" ]; then
+			phymode="$(cat $path/phy-mode)"
+			case "$phymode" in
+				10000*) speed=10000 ;;
+				2500*) speed=2500 ;;
+			esac
+		fi
 		PORT="$(echo $port | tr '[a-z]' '[A-Z]')"
 		uci add ports ethport
 		uci rename ports.@ethport[-1]="$PORT"
 		uci set ports.@ethport[-1].enabled=1
 		uci set ports.@ethport[-1].name="$PORT"
 		uci set ports.@ethport[-1].ifname="$port"
-		uci set ports.@ethport[-1].speed=1000
+		uci set ports.@ethport[-1].speed="$speed"
 		uci set ports.@ethport[-1].duplex="full"
 		uci set ports.@ethport[-1].autoneg=1
 		uci set ports.@ethport[-1].eee=0

qosmngr/Makefile

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

skopeo/Makefile

@@ -0,0 +1,77 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=skopeo
+PKG_VERSION:=1.9.2
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_NAME:=skopeo
+PKG_SOURCE_URL:=https://github.com/containers/skopeo.git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+
+HOST_BUILD_DEPENDS:=golang/host
+HOST_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

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

sulu-builder/Config.in

@@ -0,0 +1,126 @@
+menu "Configuration"
+	depends on PACKAGE_sulu-builder
+
+menu "SULU_CORE"
+	depends on PACKAGE_sulu-builder
+	config SULU_CORE_ENABLE
+	bool "Enable this plugin"
+	default y
+
+	config SULU_CORE_URL
+		string "SULU url"
+		default "https://dev.iopsys.eu/websdk/sulu.git"
+
+	config SULU_CORE_VERSION
+		string "SULU repo version"
+		default "0342f68af7e74a71d771ed4b562af64e15877721"
+endmenu
+
+menu "SULU_PLUGIN_LCM"
+	depends on PACKAGE_sulu-builder
+	config SULU_PLUGIN_LCM_ENABLE
+	bool "Enable this plugin"
+	default y
+
+	config SULU_PLUGIN_LCM_NAME
+		depends on SULU_PLUGIN_LCM_ENABLE
+		string "Plugin_name"
+		default "sulu-lcm"
+
+	config SULU_PLUGIN_LCM_URL
+		depends on SULU_PLUGIN_LCM_ENABLE
+		string "URL"
+		default "https://dev.iopsys.eu/websdk/sulu-lcm.git"
+
+	config SULU_PLUGIN_LCM_VERSION
+		depends on SULU_PLUGIN_LCM_ENABLE
+		string "Version"
+		default "ae0da97828665aa953459c7f49ed26c656819d4d"
+endmenu
+
+menu "SULU_PLUGIN_MULTIAP"
+	depends on PACKAGE_sulu-builder
+	config SULU_PLUGIN_MULTIAP_ENABLE
+	bool "Enable this plugin"
+	default y
+
+	config SULU_PLUGIN_MULTIAP_NAME
+		depends on SULU_PLUGIN_MULTIAP_ENABLE
+		string "Plugin_name"
+		default "sulu-multi-ap"
+
+	config SULU_PLUGIN_MULTIAP_URL
+		depends on SULU_PLUGIN_MULTIAP_ENABLE
+		string "URL"
+		default "https://dev.iopsys.eu/websdk/sulu-multi-ap.git"
+
+	config SULU_PLUGIN_MULTIAP_VERSION
+		depends on SULU_PLUGIN_MULTIAP_ENABLE
+		string "Version"
+		default "0ee8a4dd07d722d06dd7617d2debf138da6df8b7"
+endmenu
+
+menu "SULU_THEME_IOPSYS"
+	depends on PACKAGE_sulu-builder
+	config SULU_THEME_IOPSYS_ENABLE
+	bool "Enable this plugin"
+	default y
+
+	config SULU_THEME_IOPSYS_NAME
+		depends on SULU_THEME_IOPSYS_ENABLE
+		string "Plugin_name"
+		default "sulu-theme-iopsys"
+
+	config SULU_THEME_IOPSYS_URL
+		depends on SULU_THEME_IOPSYS_ENABLE
+		string "URL"
+		default "https://dev.iopsys.eu/websdk/sulu-theme-iopsys.git"
+
+	config SULU_THEME_IOPSYS_VERSION
+		depends on SULU_THEME_IOPSYS_ENABLE
+		string "Version"
+		default "e80fea80cdf8d49db0ae70b5c26a5dab49b8a20d"
+endmenu
+
+menu "SULU_PLUGIN_CUSTOM"
+	depends on PACKAGE_sulu-builder
+	config SULU_PLUGIN_CUSTOM_ENABLE
+	bool "Enable this plugin"
+	default n
+
+	config SULU_PLUGIN_CUSTOM_NAME
+		depends on SULU_PLUGIN_CUSTOM_ENABLE
+		string "Plugin_name"
+		default "custom_app"
+
+	config SULU_PLUGIN_CUSTOM_URL
+		depends on SULU_PLUGIN_CUSTOM_ENABLE
+		string "URL"
+		default ""
+
+	config SULU_PLUGIN_CUSTOM_VERSION
+		depends on SULU_PLUGIN_CUSTOM_ENABLE
+		string "Version"
+endmenu
+
+menu "SULU_THEME_CUSTOM"
+	depends on PACKAGE_sulu-builder
+	config SULU_THEME_CUSTOM_ENABLE
+	bool "Enable this plugin"
+	default n
+
+	config SULU_THEME_CUSTOM_NAME
+		depends on SULU_THEME_CUSTOM_ENABLE
+		string "Plugin_name"
+		default "plugin_theme_custom"
+
+	config SULU_THEME_CUSTOM_URL
+		depends on SULU_THEME_CUSTOM_ENABLE
+		string "URL"
+		default ""
+
+	config SULU_THEME_CUSTOM_VERSION
+		depends on SULU_THEME_CUSTOM_ENABLE
+		string "Version"
+endmenu
+endmenu

sulu-builder/Makefile

@@ -0,0 +1,155 @@
+#
+# Copyright (C) 2021-2022 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sulu-builder
+PKG_VERSION:=1.0.15
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
+PKG_SOURCE_VERSION:=fc53497b2783d2c5f372aa9b8a803224cdc85f83
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=node-yarn/host
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/${PKG_NAME}
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=Build sulu from source
+	DEPENDS:=+nginx +mosquitto-auth-shadow
+	MENU:=1
+endef
+
+define Package/${PKG_NAME}/description
+	SULU-CE ReactJS based Web UI builder.
+endef
+
+define Package/${PKG_NAME}/config
+	source "$(SOURCE)/Config.in"
+endef
+
+# Sulu core and other dependent needs to be updated in Config.in
+SULU_DL_FILE:=sulu-${PKG_VERSION}-${CONFIG_SULU_CORE_VERSION}.tar.gz
+define Download/sulu_core
+  FILE:=$(SULU_DL_FILE)
+  URL:=$(CONFIG_SULU_CORE_URL)
+  PROTO:=git
+  SUBDIR:=core
+  VERSION:=${CONFIG_SULU_CORE_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_CORE_ENABLE),y)
+$(eval $(call Download,sulu_core))
+endif
+
+SULU_PLUGIN_LCM_DL:=${CONFIG_SULU_PLUGIN_LCM_NAME}_plugin-${CONFIG_SULU_PLUGIN_LCM_VERSION}.tar.gz
+define Download/sulu_plugin_lcm
+  FILE:=${SULU_PLUGIN_LCM_DL}
+  URL:=${CONFIG_SULU_PLUGIN_LCM_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_LCM_NAME}
+  VERSION:=${CONFIG_SULU_PLUGIN_LCM_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_PLUGIN_LCM_ENABLE),y)
+$(eval $(call Download,sulu_plugin_lcm))
+endif
+
+SULU_PLUGIN_MULTIAP_DL:=${CONFIG_SULU_PLUGIN_MULTIAP_NAME}_plugin-${CONFIG_SULU_PLUGIN_MULTIAP_VERSION}.tar.gz
+define Download/sulu_plugin_multiap
+  FILE:=${SULU_PLUGIN_MULTIAP_DL}
+  URL:=${CONFIG_SULU_PLUGIN_MULTIAP_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_MULTIAP_NAME}
+  VERSION:=${CONFIG_SULU_PLUGIN_MULTIAP_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_PLUGIN_MULTIAP_ENABLE),y)
+$(eval $(call Download,sulu_plugin_multiap))
+endif
+
+SULU_THEME_IOPSYS_DL:=${CONFIG_SULU_THEME_IOPSYS_NAME}_plugin-${CONFIG_SULU_THEME_IOPSYS_VERSION}.tar.gz
+define Download/sulu_theme_iopsys
+  FILE:=${SULU_THEME_IOPSYS_DL}
+  URL:=${CONFIG_SULU_THEME_IOPSYS_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_THEME_IOPSYS_NAME}
+  VERSION:=${CONFIG_SULU_THEME_IOPSYS_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_THEME_IOPSYS_ENABLE),y)
+$(eval $(call Download,sulu_theme_iopsys))
+endif
+
+SULU_PLUGIN_CUSTOM_DL:=${CONFIG_SULU_PLUGIN_CUSTOM_NAME}_plugin-${CONFIG_SULU_PLUGIN_CUSTOM_VERSION}.tar.gz
+define Download/sulu_plugin_custom
+  FILE:=${SULU_PLUGIN_CUSTOM_DL}
+  URL:=${CONFIG_SULU_PLUGIN_CUSTOM_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_CUSTOM_NAME}
+  VERSION:=${CONFIG_SULU_PLUGIN_CUSTOM_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_PLUGIN_CUSTOM_ENABLE),y)
+$(eval $(call Download,sulu_plugin_custom))
+endif
+
+SULU_THEME_CUSTOM_DL:=${CONFIG_SULU_THEME_CUSTOM_NAME}_plugin-${CONFIG_SULU_THEME_CUSTOM_VERSION}.tar.gz
+define Download/sulu_theme_custom
+  FILE:=${SULU_THEME_CUSTOM_DL}
+  URL:=${CONFIG_SULU_THEME_CUSTOM_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_THEME_CUSTOM_NAME}
+  VERSION:=${CONFIG_SULU_THEME_CUSTOM_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
+$(eval $(call Download,sulu_theme_custom))
+endif
+
+define Build/Prepare
+	$(Build/Prepare/Default)
+	tar xzf $(DL_DIR)/${SULU_DL_FILE} -C $(PKG_BUILD_DIR)
+ifeq ($(CONFIG_SULU_PLUGIN_LCM_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_PLUGIN_LCM_DL} -C $(PKG_BUILD_DIR)
+endif
+ifeq ($(CONFIG_SULU_PLUGIN_MULTIAP_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_PLUGIN_MULTIAP_DL} -C $(PKG_BUILD_DIR)
+endif
+ifeq ($(CONFIG_SULU_THEME_IOPSYS_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_THEME_IOPSYS_DL} -C $(PKG_BUILD_DIR)
+endif
+ifeq ($(CONFIG_SULU_PLUGIN_CUSTOM_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_PLUGIN_CUSTOM_DL} -C $(PKG_BUILD_DIR)
+endif
+ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_THEME_CUSTOM_DL} -C $(PKG_BUILD_DIR)
+endif
+endef
+
+define Package/${PKG_NAME}/install
+	$(INSTALL_DIR) $(1)/sulu
+	$(INSTALL_DIR) $(1)/sulu/config
+	$(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/widgets/*.json $(1)/sulu/config/
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,${PKG_NAME}))
+

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

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

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

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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,10 @@
+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/Makefile

@@ -1,15 +1,15 @@
 #
-# Copyright (C) 2021-2022 IOPSYS
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.3.15
+PKG_VERSION:=1.0.15
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=81d4bb268914dc3822293e93519ae6adbd6ddbea
+PKG_SOURCE_VERSION:=fc53497b2783d2c5f372aa9b8a803224cdc85f83
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -26,6 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sulu
 	SECTION:=sulu
 	CATEGORY:=Utilities
+	MENU=1
 	TITLE:=SULU-CE ReactJS based Web UI Package
 	DEPENDS:=+nginx +mosquitto-auth-shadow
 endef
@@ -37,16 +38,10 @@ endef
 define Package/sulu/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)/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
+	$(CP) $(PKG_BUILD_DIR)/config/* $(1)/sulu/config
 	$(CP) ./files/* $(1)/
 endef
 

swmodd/Config.in

@@ -1,9 +0,0 @@
-if PACKAGE_swmodd
-
-menu "Configuration"
-
-config SWMOD_HOST_IS_EXECENV
-	bool "Enable host system as execution environment"
-	default n
-endmenu
-endif

swmodd/Makefile

@@ -1,17 +1,16 @@
 #
-# Copyright (C) 2020 IOPSYS
+# Copyright (C) 2022 IOPSYS Software Solutions AB
 #
-# 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.5.1
+PKG_VERSION:=2.1.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2f953ea76b5779a73a540777dfb450982802e4f8
+PKG_SOURCE_VERSION:=2941682d0e8c3a509b8e5b03e6b03609619ca542
 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
@@ -33,17 +32,13 @@ 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
+	    +swmodd-cgroup +jq
 endef
 
 define Package/swmodd/description
 	Software module daemon to manage software/deployment units using TR181 datamodel.
 endef
 
-define Package/swmodd/config
-	source "$(SOURCE)/Config.in"
-endef
-
 define Package/swmodd-cgroup
   SECTION:=utils
   CATEGORY:=Utilities
@@ -53,20 +48,19 @@ 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)/
@@ -77,7 +71,6 @@ 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
@@ -89,6 +82,15 @@ 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

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

swmodd/files/etc/config/swmodd

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

swmodd/files/etc/init.d/crun

@@ -0,0 +1,165 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=01
+
+USE_PROCD=1
+
+log() {
+	echo "${@}"|logger -t crun.init -p info
+}
+
+validate_container_section() {
+	uci_validate_section swmodd du_eu_assoc "${1}" \
+		'name:string' \
+		'type:string' \
+		'autostart:bool:1' \
+		'du_status:string' \
+		'requested_state:string' \
+		'url:string' \
+		'username:string' \
+		'password:string'
+}
+
+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"
+
+	validate_container_section "${1}" || {
+		log "Validation of container section failed"
+		return 0;
+	}
+
+	BUNDLE="${2}"
+	BRIDGE="${3}"
+
+	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 swmodd ${1} du_status Installing_start
+		uci_set swmodd ${1} username ""
+		uci_set swmodd ${1} password ""
+		result=$(${RUNNER} -b "${BUNDLE}" -n "${name}" -r "${url}" -l "${username}:${password}")
+		if [ "$?" -eq 0 ]; then
+			uci_set swmodd ${1} du_status Installing_success
+			du_status="Installed"
+		else
+			uci_set swmodd ${1} du_status Installing_failed
+			uci_set swmodd ${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 swmodd ${1} du_status Uninstalling_failed
+			uci_set swmodd ${1} fault_string "Failed to remove ${BUNDLE}/${name}"
+		else
+			uci_set swmodd ${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}"
+	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 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
+
+	mkdir -p "${bundle}"
+	config_foreach configure_crun_container du_eu_assoc "${bundle}" "${bridge}"
+	uci_commit
+	ubus -t 5 call swmodules reload
+}
+
+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,14 +12,12 @@ validate_globals_section()
 		'enabled:bool:1' \
 		'debug:bool:false' \
 		'log_level:uinteger:1' \
+		'bundle_root:string' \
 		'sock:string'
 }
 
 start_service() {
-	local enabled debug log_level sock
-
-	# creating fallback shared mount-point
-	mkdir -p /tmp/swmodd_dw
+	local enabled debug log_level sock bundle_root
 
 	config_load swmodd
 
@@ -30,28 +28,31 @@ start_service() {
 
 	[ "${enabled}" -eq 0 ] && return 0
 
+	[ -z "${bundle_root}" ] && return 0
+
+	mkdir -p "${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
 }
 
-stop_service() {
-	service_stop ${PROG}
-}
-
 reload_service() {
 	stop
 	start
 }
+
+service_triggers() {
+       procd_add_reload_trigger "swmodd"
+}

swmodd/files/etc/swmodd/run.sh

@@ -0,0 +1,228 @@
+#!/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 exists"
+		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 ..
+}
+
+update_config_json() {
+
+	if [ ! -f "${BUNDLE:?}/${NAME:?}/config.json" ]; then
+		log "config.json not found"
+		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
+}
+
+pull_image_from_registry() {
+	local temp
+
+	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)"
+	cd "${temp}"
+	OPTS=""
+	if [ "${#LOGIN}" -gt 3 ]; then
+		OPTS="--src-creds ${LOGIN}"
+	fi
+	# inspect and get size check system
+	# skopeo inspect --raw docker://mengel38/finalfate:latest-arm32v7 |jq '[ .layers[].size ] | add'
+	skopeo --command-timeout 4m copy ${OPTS} ${REGURL} oci:${NAME}_tmp:latest >/dev/null 2>&1
+	umoci unpack --image ${NAME}_tmp:latest ${NAME} >/dev/null 2>&1
+	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
+
+	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

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+# if bundle_root not define in swmodd, update it with lxc path
+lxc=""
+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 bundle globals bundle_root ""
+if [ -z "${bundle}" ] && [ -n "${lxc}" ]; then
+	uci_set swmodd globals bundle_root ${lxc}
+	uci_commit
+elif [ -z "${bundle}" ]; then
+	uci_set swmodd globals bundle_root "/tmp/"
+	uci_commit
+fi

twamp/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp-light.git
-PKG_SOURCE_VERSION:=b0111c35ff4908edd82c5d5f4a3c0d6809605b94
+PKG_SOURCE_VERSION:=4dfc8609fb0cefaaf9e86b559b1e10488117cf07
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -41,7 +41,7 @@ TARGET_CFLAGS += \
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	$(CP) -rf ~/git/twamp-light/* $(PKG_BUILD_DIR)/
+	$(CP) -rf ~/git/twamp/* $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -58,7 +58,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) ./files/etc/init.d/twampd $(1)/etc/init.d/twampd
 	$(INSTALL_BIN) ./files/etc/firewall.twamp $(1)/etc/firewall.twamp
 	$(INSTALL_BIN) ./files/etc/uci-defaults/92-twampfirewall $(1)/etc/uci-defaults/92-twampfirewall
-	$(INSTALL_BIN) ./files/etc/uci-defaults/93-twamp_fix_reflector $(1)/etc/uci-defaults/93-twamp_fix_reflector
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

twamp/files/etc/config/twamp

@@ -1,5 +1,11 @@
+
 config twamp 'twamp'
 	option enable '0'
 	#Log levels: Critical=0, Error=1, Warning=2, Notice=3, Info=4, Debug=5
-	option log_level '3'
+	option log_level '4'
 
+config twamp_reflector 'reflector_1'
+	option enable '0'
+	option interface 'wan'
+	option port '862'
+	option max_ttl '1'

twamp/files/etc/firewall.twamp

@@ -29,11 +29,8 @@ function configure_firewall()
 
 function delete_rule()
 {
-        while iptables -w 1 -L zone_${1}_input --line-numbers 2>/dev/null | grep "TWAMP reflector port"; do
-		rule_num="$(iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}')"
-		if [ -n "${rule_num}" ]; then
-			iptables -w 1 -D zone_${1}_input ${rule_num};
-		fi
+        while iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" > /dev/null; do
+		iptables -w 1 -D zone_${1}_input $(iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}');
 	done
 }
 

twamp/files/etc/uci-defaults/93-twamp_fix_reflector

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-function rename_section()
-{
-	local enable inst
-
-	config_get interface ${1} interface ""
-	if [ -z "${interface}" ]; then
-		return 0
-	fi
-
-	inst="$(echo ${1}|cut -d '_' -f 2)"
-	uci_rename twamp ${1} "${interface}_${inst}"
-}
-
-config_load twamp
-config_foreach rename_section twamp_reflector
-
-exit 0
-

umoci/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umoci
-PKG_VERSION:=0.0.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.4.7
+PKG_RELEASE:=$(AUTORELEASE)
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
@@ -10,7 +10,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_NAME:=umoci
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/opencontainers/umoci.git
-PKG_SOURCE_VERSION:=2cec49f54b72684ef170f11c708c56140f298bf7
+PKG_SOURCE_VERSION:=17f38511d61846e2fb8ec01a1532f3ef5525e71d
 PKG_MIRROR_HASH:=skip
 
 PKG_BUILD_DEPENDS:=golang/host
@@ -18,11 +18,12 @@ 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)))
@@ -36,6 +37,7 @@ $(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,5 +63,7 @@ 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:=0.0.1
+PKG_VERSION:=1.0.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git
@@ -17,26 +17,55 @@ 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
+define Package/usp-js/default
   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 Build/Compile
-	cd $(PKG_BUILD_DIR) && npm install @types/node --save-dev && yarn qjs
+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/install
+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
+endef
+else
+define Build/Compile
+	cd $(PKG_BUILD_DIR) && yarn install && yarn qjs
+endef
+endif
+
+define Package/usp-js-quickjs/install
 	$(INSTALL_DIR) $(1)/usr/lib/usp-js
 	$(CP) $(PKG_BUILD_DIR)/qjs/* $(1)/usr/lib/usp-js/
 endef
 
-$(eval $(call BuildPackage,usp-js))
+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))

uspd/Makefile

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

voicemngr/Makefile

@@ -1,70 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=voicemngr
-PKG_VERSION:=0.1
-PKG_LICENSE:=PROPRIETARY
-PKG_LICENSE_FILES:=LICENSE
-
-LOCAL_SRC_DIR:=~/git/voip/voicemngr
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/voicemngr.git
-PKG_SOURCE_VERSION:=13a14593daa610a87c363a1a0acd19f31f405a71
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-# All config variable that are passed to the make invocation, directly or
-# indirectly. This ensures that the package is rebuilt on config-changes.
-PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
-
-TARGET_PLATFORM:=
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-	TARGET_PLATFORM:=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_qualcomm),y)
-	TARGET_PLATFORM:=QUALCOMM
-endif
-
-export TARGET_PLATFORM
-export CONFIG_BRCM_SDK_VER_504021
-export CONFIG_BCM_CHIP_ID
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += -Wall -Werror
-
-define Package/voicemngr
-	CATEGORY:=Utilities
-	TITLE:=IOPSYS Voice Manager
-	URL:=
-	DEPENDS:= +libubox +ubus +libpicoevent +uci +TARGET_iopsys_brcm63xx_arm:bcmkernel +TARGET_iopsys_qualcomm:vtsp
-endef
-
-define Package/voicemngr/description
-	Voice manager is a daemon that bridges Asterisk and platform specific DSP/SLIC APIs
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	@echo "Building from the local source. TARGET_PLATFORM=$(TARGET_PLATFORM)"
-	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/voicemngr/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/voicemngr $(1)/usr/sbin/
-	$(CP) $(PKG_BUILD_DIR)/libvoice/libvoice.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,voicemngr))
-

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.10.0.6
+PKG_VERSION:=2.8.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=70cc85371e2fa8e1eedf3601eaed03fe0bc2fe96
+PKG_SOURCE_VERSION:=3c3f09d319da1b71ff2ea5c92317010aebeb1bb6
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -60,6 +60,7 @@ MAKE_FLAGS += DEBUG=1
 endif
 
 TARGET_CFLAGS += \
+	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

wifimngr/Makefile

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