map-topology:Version 3.0.2

bbf/Config_bbfdm.in

@@ -1,5 +1,7 @@
 if PACKAGE_libbbfdm
 
+menu "Configuration"
+
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -31,19 +33,5 @@ config BBFDM_ENABLE_JSON_PLUGIN
 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
 	default n
-
-choice
-	prompt "Select SSL utility"
-	default BBF_USE_WOLFSSL
-
-config BBF_USE_WOLFSSL
-	bool "Use WolfSSL for ssl utilities"
-	select CONFIG_PACKAGE_libwolfssl
-
-config BBF_USE_OPENSSL
-	bool "Use OpenSSL for ssl utilities"
-	select CONFIG_PACKAGE_libopenssl
-
-endchoice
-
+endmenu
 endif

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.20
+PKG_VERSION:=6.1.3
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=491a8b0c00680ba110fb42d17a51627365b1baed
+PKG_SOURCE_VERSION:=aa17126d32043a0eb92250671e281b51b9205c0f
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -27,7 +27,7 @@ define Package/libbbf_api
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for libbbfdm API
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libopenssl +libwolfssl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
 define Package/libbbfdm
@@ -35,8 +35,7 @@ define Package/libbbfdm
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libcurl +libopenssl +libwolfssl
-  MENU:=1
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
 endef
 
 define Package/libbbfdm/config
@@ -77,6 +76,11 @@ CONFIGURE_ARGS += \
 	--enable-tr143
 endif
 
+ifeq ($(CONFIG_PACKAGE_libopenssl),y)
+CONFIGURE_ARGS += \
+	--enable-libopenssl
+endif
+
 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
 CONFIGURE_ARGS += \
 	--enable-vendor-extension
@@ -97,18 +101,6 @@ CONFIGURE_ARGS += \
 	--enable-shared-library
 endif
 
-ifeq ($(CONFIG_BBF_USE_WOLFSSL), y)
-CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += "-lwolfssl"
-endif
-
-ifeq ($(CONFIG_BBF_USE_OPENSSL), y)
-CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lssl"
-endif
-
 define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
@@ -133,10 +125,8 @@ endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/

bulkdata/Makefile

@@ -8,19 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.3
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
-
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
@@ -39,14 +37,7 @@ define Package/$(PKG_NAME)/description
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/bulkdata/* $(PKG_BUILD_DIR)/
-endef
-endif
+	-D_GNU_SOURCE
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin

crashlog/Makefile

@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2019 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:=crashlog
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/crashlog
+  CATEGORY:=Utilities
+  TITLE:=Handling kernel crash logs
+endef
+
+define Package/crashlog/description
+	Handling kernel crash logs.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./files/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+endef
+
+define Package/crashlog/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,crashlog))

crashlog/files/etc/init.d/corelog

@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+
+START=01
+
+start()
+{
+    if [ -e /proc/sys/kernel/core_pattern ]
+    then
+	echo "|/sbin/logcore %e %s" > /proc/sys/kernel/core_pattern
+    fi
+}

crashlog/files/etc/init.d/crashlog

@@ -0,0 +1,55 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+
+send_log()
+{
+	nr=$(db get hw.board.serial_number)
+	hw=$(db get hw.board.model_name)
+	fam=$(db get hw.board.iopVerFam)
+	sw=$(db get hw.board.iopVersion)
+	server=$(/sbin/uci get system.crashlog.server)
+
+	while true
+	do
+	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${fam}_${hw}_${sw}_${nr}
+	    if [ $? == 0 ]
+	    then
+	       break;
+	    fi
+	    # wait for another minute then try again
+	    sleep 60
+	done
+}
+
+fill_in_default()
+{
+    /sbin/uci add system log
+    /sbin/uci rename system.@log[-1]=crashlog
+    /sbin/uci set system.crashlog.enable=no
+    /sbin/uci set system.crashlog.server="crashlog.iopsys.eu"
+    /sbin/uci commit
+}
+
+boot()
+{
+    # is crashlog enabled ?
+    enable=$(/sbin/uci get system.crashlog.enable)
+    case $enable in
+	0|no|NO|false|FALSE)
+	    exit 0
+	    ;;
+	"")
+	    fill_in_default
+	    exit 0
+	    ;;
+    esac
+
+    # is this boot a result from a crash ?
+    reason=$(cat /etc/boot_reason)
+    case $reason in
+	HW|WD)
+	    send_log&
+	    ;;
+    esac
+}

crashlog/files/sbin/logcore

@@ -0,0 +1,60 @@
+#! /bin/sh
+
+TMP_CORE=/tmp/new_core
+# first test if we can contact the log server.
+# if not abort directly the core file takes up memory
+alive()
+{
+	ping -c1 $server
+
+	if [ $? != 0 ]
+	then
+		# drain core file from kernel
+		cat >/dev/null
+		exit 0
+	fi
+}
+
+fill_in_default()
+{
+    /sbin/uci add system log
+    /sbin/uci rename system.@log[-1]=corelog
+    /sbin/uci set system.corelog.enable=no
+    /sbin/uci set system.corelog.server="corelog.iopsys.eu"
+    /sbin/uci commit
+}
+
+# is corelog enabled ?
+enable=$(/sbin/uci get system.corelog.enable)
+case $enable in
+    0|no|NO|false|FALSE)
+	# drain core file from kernel
+	cat >/dev/null
+	exit 0
+	;;
+    "")
+	fill_in_default
+	exit 0
+	;;
+esac
+
+server=$(/sbin/uci get system.corelog.server)
+
+alive
+
+# dump out the core to disk we need this as scp needs a size before we send data
+# and this is the only way to know how much data there is
+cat >$TMP_CORE
+
+# in case filesystem/memory is full at least kill the core in the kernel memory should give us some
+# more memory to work with. normally this would do nothing.
+cat >/dev/null
+
+nr=$(db get hw.board.serial_number)
+hw=$(db get hw.board.model_name)
+fam=$(hw.board.iopVerFam)
+sw=$(db get hw.board.iopVersion)
+
+scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${fam}_${hw}_${sw}_${nr}
+rm $TMP_CORE
+

crashlog/files/usr/sbin/logssh

@@ -0,0 +1,6 @@
+#!/bin/sh
+# we need to have the -y option to dropbear to not halt the scp when
+# transfering the log file to a new server for the first time.
+# since we already need this also put in the keyfile
+
+ssh -y -i /etc/dropbear/logid $@

crashlog/readme

@@ -0,0 +1,42 @@
+Install scp server.
+
+Create a user account on a server and make sure it's possible to login to it
+using ssh.
+
+For now the user has to be called "log"
+
+USER is the user name of the account
+HOME is the user home directory.
+Both should be changed to the correct value in all following example commands.
+
+create HOME/bin
+Put scp_upload in HOME/bin
+make it executable "chmod a+x HOME/bin/scp_upload" 
+
+create home/.ssh   (observer the dot .shh)
+
+create an empty file HOME/.ssh/authorized_keys
+
+-------------------------------
+Now everyhting is setup for use but we have not added any clients.
+What we need is the public key for the clients.
+
+For dropbear "dropbearkey -y -f files/etc/dropbear/logid" will generate the public key.
+
+----------
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@iopsys
+----------
+
+The public key should be just one line. Add that line to the 
+HOME/.ssh/authorized_keys file on the scp server. Then add the follwoing as
+the first text on the same line. that is insert before the key data.
+
+command="HOME/bin/scp_upload",no-port-forwarding,no-agent-forwarding,no-X11-forwarding 
+
+Do not forget to change HOME to the correct value for the server and there 
+should be one space separating the key data and the above text.
+---------------------------------
+Now test to make sure that you can upload new files, not download files
+and not overwrite files from the client.
+
+

crashlog/scp_upload

@@ -0,0 +1,53 @@
+#! /bin/bash
+# authorized_keys command="/home/boxi/my_scp",no-port-forwarding,no-agent-forwarding,no-X11-forwarding
+
+val=`expr match "$SSH_ORIGINAL_COMMAND" "scp"`
+if [ $val != 3 ]
+then
+    echo "only scp is allowed for this rsa key"
+    exit 1
+fi
+
+#strip out "scp" as getopts barf on anything not an option
+
+args=${SSH_ORIGINAL_COMMAND:3}
+
+# we must set args to positional paramters otherwise it's next to impossible
+# to get to the rest of the line that is not arguments.
+
+set -- $args
+while getopts "rftdvpq" Option
+do
+  case $Option in
+    r ) echo "recursive not allowed";exit 1;;
+    f ) echo "reading files not allowed";exit 1;;
+    t ) ;;
+    d ) ;;
+    v ) ;;
+    p ) ;;
+    q ) ;;
+    * ) ;;   # Default.
+  esac
+done
+
+shift $(($OPTIND - 1))
+
+file="$*"
+dir=$(dirname "$file")
+
+if [ "$dir" != "log" ]
+then
+    echo "only allowed to write to log/"
+    exit 1
+fi
+
+# try to create uniq files
+EXTRA=$((0))
+while [ -e "${file}_${EXTRA}" ]
+do
+    EXTRA=$((EXTRA +1))
+done
+
+logger -t scp_upload "${SSH_ORIGINAL_COMMAND}_${EXTRA}"
+
+exec ${SSH_ORIGINAL_COMMAND}_${EXTRA}

crun/Makefile

@@ -0,0 +1,81 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=crun
+PKG_VERSION:=0.20
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/containers/crun.git
+PKG_SOURCE_DATE:=2021-06-07
+PKG_SOURCE_VERSION:=8d6a8b5ab80461cfed19f020a36584af13c32038
+PKG_MIRROR_HASH:=9ca1f0e530b33ce8820bd03329eb6731c5050d6e7f35bd2463d9a81cc00382e0
+
+PKG_BUILD_DEPENDS:=argp-standalone
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/crun
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=crun
+  URL:=https://github.com/containers/crun
+  DEPENDS:=@!arc +libseccomp +libcap
+endef
+
+define Package/crun/description
+  A fast and low-memory footprint OCI Container Runtime fully written in C.
+endef
+
+CONFIGURE_ARGS+= \
+	--disable-systemd \
+	--enable-embedded-yajl \
+	--enable-caps \
+	--enable-dl \
+	--enable-seccomp \
+	--enable-bpf
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/crun.c
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default)
+
+	$(SED) '/#define PACKAGE \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define GIT_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_BUGREPORT \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_NAME \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_STRING \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_TARNAME \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+
+	echo "#define PACKAGE \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_NAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_STRING \"$(PKG_NAME) $(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_TARNAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_BUGREPORT \"bugs@openwrt.org\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define GIT_VERSION \"$(PKG_SOURCE_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+endef
+
+define Package/crun/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcrun.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,crun))

dectmngr/Config.in

@@ -1,11 +0,0 @@
-if PACKAGE_dectmngr
-
-menu "Configuration"
-
-config ENABLE_LINE_SETTINGS_EXTENSION
-	bool "Enable Line Settings List extension "
-	default y
-
-endmenu
-
-endif

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.1
+PKG_VERSION:=3.1.18
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cc475d5bfe663b73f4ae28d74c9035e210a8ad24
+PKG_SOURCE_VERSION:=0e937cfb839f845cf28922c4dde0572ec2842f85
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,41 +34,29 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
+	DEPENDS:= +libubox +ubus +uci
 endef
 
 define Package/$(PKG_NAME)/description
 	DECT manager is a daemon that provides UBUS RPC objects and sends UBUS events for communication with the DECT chip.
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	rsync -av --exclude=.* ~/git/voip/dectmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-TARGET_CFLAGS += \
-	-Wall \
-        -Werror \
-	-I$(STAGING_DIR)/usr/include/libxml2
-
-ifeq ($(CONFIG_ENABLE_LINE_SETTINGS_EXTENSION),y)
-TARGET_CFLAGS += -DENABLE_LINE_SETTINGS_EXTENSION
-endif
+MAKE_FLAGS += \
+	CFLAGS+="-Wall"
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
 	$(CP) ./files/etc/* $(1)/etc/
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dect $(1)/lib/upgrade/keep.d/dect
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/files/etc/config/dect

@@ -1,3 +1,2 @@
 config dect 'global'
- 	option log_dect_cmbs 'syslog'
-        option log_level 'realtime,warning,error'
+	option log_dect_cmbs '0'

dectmngr/files/etc/init.d/dectmngr

@@ -26,7 +26,6 @@ start_service() {
 	local opt_ext=
 	local rfpi=
 	local model_id=
-	local rxtun=
 
 	test $(db get hw.board.hasDect) = "0" && return
 
@@ -35,33 +34,24 @@ start_service() {
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
 
-	model_id=$(db -q get hw.board.dect_model_id)
-	[ -n "$model_id" -a ${#model_id} -eq 8 ] || {
-		echo "Invalid hw.board.dect_model_id:$model_id. Set to 30.3B.06"
-		model_id="30.3B.06"
-	}
-	opt_ext="$opt_ext -model $model_id"
-
-	rxtun=$(db -q get hw.board.dect_rxtun)
-	[ -n "$rxtun" -a ${#rxtun} -eq 2 ] && opt_ext="$opt_ext -rxtun $rxtun"
+	# model_id=$(db -q get hw.board.dect_model_id)
+	# Setting model_id to 0x010203 is a workaround to reduce synchronisation time of some handset
+	# TODO: remove below line and uncomment the line above to get value from db when the problem is solved
+	model_id="01.02.03"
+	[ -n "$model_id" -a ${#model_id} -eq 8 ] && opt_ext="$opt_ext -model $model_id"
 
 	config_load dect
-	config_get log_dect_cmbs global log_dect_cmbs syslog
+	config_get_bool log_dect_cmbs global log_dect_cmbs 0
 
 	procd_open_instance
-	if [ "$log_dect_cmbs" = "none" ]; then
+	if [ $log_dect_cmbs -eq 0 ]; then
 		echo "Starting dectmngr with cmbs logging disabled"
 		procd_set_param command $PROG -comname ttyH0 $opt_ext
 		rm -f $LOG_PATH/*
-	elif [ "$log_dect_cmbs" = "file" ]; then
-		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
 	else
-		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command $PROG -comname ttyH0 -syslog $opt_ext
-		rm -f $LOG_PATH/*
+		echo "Starting dectmngr with cmbs logging enabled"
+		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
 	fi
-
 	procd_set_param respawn 6 2 3
 	procd_set_param term_timeout 20
 	procd_set_param triggers asterisk
@@ -76,13 +66,13 @@ stop_service() {
 }
 
 reload_service() {
-	ubus call dect reload
+	stop_and_wait_dectmngr
+	start
 }
 
 service_triggers()
 {
-	procd_add_config_trigger "config.change" "asterisk" /etc/init.d/dectmngr restart
-	procd_add_config_trigger "config.change" "dect" /etc/init.d/dectmngr reload
+	procd_add_reload_trigger asterisk dect
 }
 
 boot() {

dectmngr/files/lib/upgrade/keep.d/dect

@@ -1 +0,0 @@
-/etc/dect/LA_DB

dslmngr/Makefile

@@ -28,6 +28,12 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
 else
   $(info Unexpected CONFIG_TARGET)
 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_intel_mips||TARGET_iopsys_brcm63xx_arm)
 endef
 
 define Package/easy-qos/description
@@ -39,7 +39,11 @@ define Package/easy-qos/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
+ifeq ($(CONFIG_TARGET_intel_mips),y)
+	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
+else
 	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
+endif
 	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
 endef

easy-qos/files/etc/init.d/easy_qos.classcfg

@@ -0,0 +1,301 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+RULE_LIST="/tmp/easy_qos_rule.list"
+CLIENT_LIST="/tmp/easy_qos_class_client.list"
+BRIDGE_INTF=""
+
+[ -f /etc/profile.d/intel.sh ] && {
+	. /etc/profile.d/intel.sh
+	sh /etc/profile.d/intel.sh
+}
+
+log() {
+	echo "${@}"|logger -t easy_qos_class -p debug
+}
+
+exec_log() {
+	${@}
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+	fi
+}
+
+exec_class_log() {
+	${@} |grep -i successful
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+		return 1
+	fi
+	return 0
+}
+
+get_priority() {
+	local prio=$(echo $1|tr [A-Z] [a-z]);
+	case "${prio}" in
+		"lowest")
+			echo 8;;
+		"low")
+			echo 7;;
+		"besteffort")
+			echo 6;;
+		"normal")
+			echo 5;;
+		"video")
+			echo 4;;
+		"medium")
+			echo 3;;
+		"high")
+			echo 2;;
+		"highest")
+			echo 1;;
+	esac
+}
+
+get_mark() {
+	local prio=$(echo $1|tr [A-Z] [a-z]);
+	case "${prio}" in
+		"lowest")
+			echo "0x41/0x3df";;
+		"low")
+			echo "0x82/0x3df";;
+		"besteffort")
+			echo "0xc3/0x3df";;
+		"normal")
+			echo "0x104/0x3df";;
+		"video")
+			echo "0x145/0x3df";;
+		"medium")
+			echo "0x186/0x3df";;
+		"high")
+			echo "0x1c7/0x3df";;
+		"highest")
+			echo "0x208/0x3df";;
+	esac
+}
+
+clean_client_entries() {
+	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
+}
+
+map_client_entries() {
+	local clients ip mac host
+
+	json_load "$(ubus call router.network 'clients')"
+	json_get_keys keys
+
+	for key in ${keys};
+	do
+		json_select ${key}
+		json_get_vars ipaddr macaddr hostname
+		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
+		json_select ..
+	done
+
+	json_init
+
+	IFS=";"
+	for client in ${clients};
+	do
+		macaddr=$(echo ${client} | cut -d" " -f1)
+		json_add_object "${macaddr//:/_}"
+		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
+		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
+		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
+		json_close_object
+	done
+
+	IFS=' '
+	echo `json_dump` > ${CLIENT_LIST}
+	json_cleanup
+}
+
+# Find the IP of a corresponding mac from arp table
+get_ipaddress() {
+	local clients ip mac host
+
+	json_load "$(cat ${CLIENT_LIST})"
+	json_get_keys keys
+
+	# jshn seems a bit iffy on having : in key, replace by _
+	json_select "${1//:/_}" 2 > /dev/null
+	json_get_var ip ip
+
+	echo "$ip"
+}
+
+check_and_create() {
+	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
+	# Create rule if not exists
+	if [ ${?} -ne 0 ]; then
+		exec_log iptables -t mangle -A PREROUTING ${@}
+	else
+		log "Rule exists for ${@}"
+	fi
+}
+
+create_ip_rule() {
+	local proto=$1; shift
+	local src_ip=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+
+	cmd="-j EXTMARK --set-mark ${mark}";
+	if [ "${proto}" != "icmp" ]; then
+		if [ -n "${ports}" ]; then
+			cmd="--match multiport --dports ${ports} ${cmd}";
+		fi
+	fi
+
+	if [ "${proto}" == "icmp" ]; then
+		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
+	elif [ "${proto}" == "all" ]; then
+		cmd="-p all $cmd"
+	else
+		cmd="-p ${proto} -m ${proto} $cmd"
+	fi
+	cmd="-s ${src_ip} $cmd"
+
+	check_and_create ${cmd}
+}
+
+is_lan_bridge() {
+	local _section=$1
+	local _type
+	local _is_lan
+
+	config_get _type "$section" "type"
+	config_get _is_lan "$section" "is_lan"
+
+	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
+		BRIDGE_INTF="br-${_section}"
+	fi
+}
+
+get_bridge_interface() {
+	config_load network
+	config_foreach is_lan_bridge interface
+}
+
+validate_rule_section()
+{
+	uci_validate_section easy_qos rule "${1}" \
+		'priority:string' \
+		'macaddr:string' \
+		'proto:string:none' \
+		'port:list(uinteger)' \
+		'comment:string:none'
+}
+
+# Clear existing rules before applying new rules
+clear_existing_rules() {
+	# execute the delete rules written onto a file then delete the file
+	[ -f ${RULE_LIST} ] || return 0
+
+	while read line
+	do
+		log "Deleting old classification rules"
+		exec_class_log classcfg -D ${line} -i ${BRIDGE_INTF}
+	done <${RULE_LIST}
+
+	local rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
+	while [ -n "${rule}" ]; do
+		exec_log iptables -t mangle ${rule}
+		rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
+	done
+	sync
+
+	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
+}
+
+# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
+create_rule() {
+	local proto=$1; shift
+	local mac_addr=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+	# Rule name is uniqe, so we take hash of all the input as rule_name
+	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
+
+	cmd="-j mark --mark ${mark}";
+
+	if [ "${mac_addr}" != "none" ]; then
+		cmd="--smac ${mac_addr} ${cmd}";
+	fi
+
+	if [ "${proto}" != "icmp" ]; then
+		if [ "${ports}" != "none" ]; then
+			IFS=","
+			for port in ${ports};
+			do
+				cmd="--dport ${port}:${port} ${cmd}";
+			done
+			IFS=' '
+		fi
+	fi
+	if [ "${proto}" != "none" ]; then
+		cmd="-p ${proto} $cmd"
+	fi
+	cmd="-i ${BRIDGE_INTF} $cmd"
+	cmd="-A ${rule_name} $cmd"
+
+	# Store the rule_names for cleanup on reload
+	exec_class_log classcfg ${cmd}
+	[ $? -eq 0 ] && \
+		echo ${rule_name}  >> ${RULE_LIST}
+}
+
+manage_rule() {
+	local cfg="$1"
+	local priority macaddr proto port comment prio_num port_list ip ipmark
+
+	validate_rule_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+
+	prio_num=$(get_priority ${priority})
+	port_list=$(echo ${port}|sed 's/ /,/g')
+	ipmark=$(get_mark ${priority})
+	ip=$(get_ipaddress ${macaddr})
+
+	if [ -n "${prio_num}" ]; then
+		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
+			create_rule tcp ${macaddr} ${prio_num} ${port_list}
+			create_rule udp ${macaddr} ${prio_num} ${port_list}
+			if [ -n "${ip}" ]; then
+				create_ip_rule tcp ${ip} ${ipmark} ${port_list}
+				create_ip_rule udp ${ip} ${ipmark} ${port_list}
+			fi
+		else
+			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
+			if [ -n "${ip}" ]; then
+				create_ip_rule ${proto} ${ip} ${ipmark} ${port_list}
+			fi
+		fi
+	fi
+}
+
+reload_service() {
+	get_bridge_interface
+	map_client_entries
+	clear_existing_rules
+	config_load easy_qos
+	config_foreach manage_rule rule
+	clean_client_entries
+}
+
+start_service() {
+	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
+	reload_service
+	log "Easy QoS class installed"
+}
+
+service_triggers() {
+	procd_add_reload_trigger "easy_qos" "network"
+}
+

easy-qos/files/etc/init.d/easy_qos.ebtables

@@ -15,7 +15,7 @@ exec_log() {
 }
 
 get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
+	local prio=$(echo $1|tr [A-Z] [a-z]);
 	case "${prio}" in
 		"lowest")
 			echo 0;;
@@ -98,7 +98,7 @@ manage_rule() {
 		return 1;
 	}
 
-	protocol=$(echo ${proto}|tr 'A-Z' 'a-z')
+	protocol=$(echo ${proto}|tr [A-Z] [a-z])
 	prio_num=$(get_priority ${priority})
 	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
 		for p in ${port}; do

easy-qos/files/etc/init.d/easy_qos.iptables

@@ -19,7 +19,7 @@ exec_log() {
 }
 
 get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
+	local prio=$(echo $1|tr [A-Z] [a-z]);
 	case "${prio}" in
 		"lowest")
 			echo 0;;

easy-soc-libs/Makefile

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

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=2390a3503990e04e33e8e448ad9dccc00f206908
+PKG_SOURCE_VERSION:=6d7b2e9c90234767cb56a1e7885f42825bd6287a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -56,10 +56,6 @@ define Build/Prepare
 endef
 endif
 
-TARGET_CFLAGS += \
-        -Wall \
-        -Werror
-
 define Package/endptmngr/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin

endptmngr/files/etc/init.d/endptmngr

@@ -7,8 +7,6 @@ USE_PROCD=1
 NAME=endptmngr
 
 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

evoice/Makefile

@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=evoice
-PKG_VERSION:=0.1
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=56a568164e84c8e2d7f2c7f06d26265e837b11ef
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-
-# All config variable that are passed to the make invocation, directly or
-# indirectly. This ensures that the package is rebuilt on config-changes.
-#PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Network
-	SUBMENU:=Telephony
-	TITLE:=Ensemble Voice
-	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp
-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 change the path below to your own git repository.
-define Build/Prepare
-	rsync -av /swdev/bide/evoice_clean/* $(PKG_BUILD_DIR)/
-endef
-endif
-export IDIR = $(STAGING_DIR)/usr/include
-export BDIR = bcm963xx/userspace/private/apps/voice
-export _XFLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc -I$(IDIR)/bcm963xx/xchg/bos/publicInc -I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
-
-define Build/Compile
-	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=SVrgBcmFxs LIF=cerder DBG=dbg
-endef
-
-define Package/evoice/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,evoice))

evoice/files/etc/config/voice

@@ -1,345 +0,0 @@
-
-config SIPClient 'Client1'
-	option Enable '1'
-	option RegisterMode 'RFC3261'
-	option AuthUserName '51234'
-	option AuthPassword '51234'
-	option Network 'Network1'
-	option MaxSessions '5'
-	option RegisiterURI '51234@sip-proxy.iopsys.eu'
-	option E164Format '1'
-
-config SIPClient 'Client2'
-	option Enable '1'
-	option RegisterMode 'RFC3261'
-	option AuthUserName '51235'
-	option AuthPassword '51235'
-	option Network 'Network1'
-	option MaxSessions '5'
-	option RegisiterURI '51235@sip-proxy.iopsys.eu'
-	option E164Format '1'
-
-config SIPNetwork 'Network1'
-	option Enable '1'
-	option ProxyServer 'sip-proxy.iopsys.eu'
-	option 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 Capabilities 'Capabilities'
-	option FacilityActions 'CW_ACTIVE,CFU_ACTIVE'
-
-config CapabilitiesCodec 'Codec1'
-	option Codec 'G.711ALaw'
-
-config CapabilitiesCodec 'Codec2'
-	option Codec 'G.711MuLaw'
-
-config CapabilitiesCodec 'Codec3'
-	option Codec 'G.726'
-
-config CapabilitiesCodec 'Codec4'
-	option Codec 'G.722'
-
-config CapabilitiesCodec 'Codec5'
-	option Codec 'G.729'
-
-config CodecProfile '1CodecProfile1'
-	option Enable '1'
-	option Codec 'Codec1'
-	option PacketizationPeriod '20'
-	option SilenceSupression '1'
-
-config CodecProfile '1CodecProfile2'
-	option Enable '1'
-	option Codec 'Codec2'
-	option PacketizationPeriod '20'
-	option SilenceSupression '1'
-
-config CodecProfile '1CodecProfile3'
-	option Enable '1'
-	option Codec 'Codec3'
-	option PacketizationPeriod '20'
-	option SilenceSupression '0'
-
-config CodecProfile '1CodecProfile4'
-	option Enable '1'
-	option Codec 'Codec4'
-	option PacketizationPeriod '20'
-	option SilenceSupression '0'
-
-config CodecProfile '1CodecProfile5'
-	option Enable '1'
-	option Codec 'Codec5'
-	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 'SE'
-
-config FXSPorts 'FXS1'
-	option Enable '1'
-	option DialType 'Tone'
-	option TransmitGain '4'
-	option ReceiveGain '4'
-	option EchoCancellationEnable '1'
-
-config FXSPorts 'FXS2'
-	option Enable '1'
-	option DialType 'Tone'
-	option TransmitGain '4'
-	option ReceiveGain '4'
-	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 '3PrefixInfo1'
-	list PrefixList '3PrefixInfo2'
-	list PrefixList '3PrefixInfo3'
-	list PrefixList '3PrefixInfo4'
-	list PrefixList '3PrefixInfo5'
-	list PrefixList '3PrefixInfo6'
-	list PrefixList '3PrefixInfo7'
-	list PrefixList '3PrefixInfo8'
-	list PrefixList '3PrefixInfo9'
-
-config NumberingPlan 'NumberingPlan3'
-	option MinimumNumberOfDigits '5'
-	option MaximumNumberOfDigits '15'
-	option InterDigitTimerStd '2000'
-	option InterDigitTimerOpen '2000'
-	option TerminationDigit '#'
-	list PrefixList '4PrefixInfo1'
-
-config PrefixInfo '3PrefixInfo1'
-	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 '3PrefixInfo2'
-	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 '3PrefixInfo3'
-	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 '3PrefixInfo4'
-	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 '3PrefixInfo5'
-	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 '3PrefixInfo6'
-	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 '3PrefixInfo7'
-	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 '3PrefixInfo8'
-	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 '3PrefixInfo9'
-	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 '4PrefixInfo1'
-	option Enable '1'
-	option PrefixRange '110|112'
-	option PrefixMinNumberOfDigits '7'
-	option PrefixMaxNumberOfDigits '7'
-	option NumberOfDigitsToRemove '0'
-	option PosOfDigitsToRemove '0'
-	option FacilityAction 'X_IOPSYS_EU_EMERGENCY'
-	option FacilityActionArgument ' '
-
-config DialPlan 'X_IOPSYS_EU_InternalNumber1'
-	option RegExp '1X#'
-

evoice/files/etc/evoice/voicedm

@@ -1,165 +0,0 @@
-# RO (Main)
-config account 'map_board'
-   option HW_Has_Voice 'hw.board.hasVoice'
-   option HW_Has_DECT 'hw.board.hasDect'
-   option HW_Nr_Of_POTS_Ports 'hw.board.VoicePorts'
-   option 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 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'
-
-config cs_xvendor 'map_np_cs'
-   option np_sc_actCW 'voice.X_IOPSYS_EU_NpSc@.CW_ACT'
-   option np_sc_actCW_output 'voice.X_IOPSYS_EU_NpSc@.CW_OUT'
-   option np_sc_deactCW 'voice.X_IOPSYS_EU_NpSc@.CW_DEACT'
-   option np_sc_isactCW 'voice.X_IOPSYS_EU_NpSc@.CW_ISACT'
-   option np_sc_actCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_ACT'
-   option np_sc_actCFU_output 'voice.X_IOPSYS_EU_NpSc@.CFU_OUT'
-   option np_sc_deactCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_DEACT'
-   option np_sc_actCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_ACT'
-   option np_sc_actCFB_output 'voice.X_IOPSYS_EU_NpSc@.CFB_OUT'
-   option np_sc_deactCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_DEACT'
-   option np_sc_actCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_ACT'
-   option np_sc_actCFNR_output 'voice.X_IOPSYS_EU_NpSc@.CFNR_OUT'
-   option np_sc_deactCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_DEACT'
-   option np_sc_actRA 'voice.X_IOPSYS_EU_NpSc@.RA_ACT'
-   option np_sc_deactRA 'voice.X_IOPSYS_EU_NpSc@.RA_DEACT'
-   option np_sc_actAC 'voice.X_IOPSYS_EU_NpSc@.AC_ACT'
-   option np_sc_deactAC 'voice.X_IOPSYS_EU_NpSc@.AC_DEACT'
-   option np_sc_actAA 'voice.X_IOPSYS_EU_NpSc@.AA_ACT'
-   option np_sc_deactAA 'voice.X_IOPSYS_EU_NpSc@.AA_DEACT'
-   option np_sc_actAD 'voice.X_IOPSYS_EU_NpSc@.AD_ACT'
-   option np_sc_actAD_output 'voice.X_IOPSYS_EU_NpSc@.AD_OUT'
-   option np_sc_deactAD 'voice.X_IOPSYS_EU_NpSc@.AD_DEACT'
-   option np_sc_actMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_ACT'
-   option np_sc_deactMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_DEACT'
-   option np_sc_actMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_ACT'
-   option np_sc_deactMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_DEACT'
-   option np_sc_redial 'voice.X_IOPSYS_EU_NpSc@.REDIAL'
-   option np_sc_setMiscConf 'voice.X_IOPSYS_EU_NpSc@.SET_MISC'
-
-config cc_xvendor 'map_np_in'
-   option np_in_limitExp 'voice.X_IOPSYS_EU_InternalNumber@.RegExp'
-
-config cc_xvendor 'map_np_sh'
-   option sh_no_str 'voice.X_IOPSYS_EU_ShortNumber@.RegExp'
-
-config cc_xvendor 'map_np_eme'
-   option np_eme 'voice.X_IOPSYS_EU_EmergencyNumber@.RegExp'
-   option np_eme_out 'voice.X_IOPSYS_EU_EmergencyNumber@.OutStr'
-
-config cc_xvendor 'map_np_rn'
-   option np_rn 'voice.X_IOPSYS_EU_RegularNumber@.RegExp'
-   option np_rn_out 'voice.X_IOPSYS_EU_RegularNumber@.OutStr'
-   option np_rn_account 'voice.X_IOPSYS_EU_RegularNumber@.AccStr'
-
-config cc_xvendor 'map_np_bn'
-   option np_bn 'voice.X_IOPSYS_EU_BarredNumber@.RegExp'
-   option np_bn_out 'voice.X_IOPSYS_EU_BarredNumber@.OutStr'
-
-config TR104NumberingPlan 'map_np_tr'
-   option min_digits 'voice.NumberingPlan@.MinimumNumberOfDigits'
-   option max_digits 'voice.NumberingPlan@.MaximumNumberOfDigits'
-   option tmo_std 'voice.NumberingPlan@.InterDigitTimerStd'
-   option tmo_open 'voice.NumberingPlan@.InterDigitTimerOpen'
-   option term_digit 'voice.NumberingPlan@.TerminationDigit'
-   option prefix_list 'voice.NumberingPlan@.PrefixList'
-
-config TR104NumberingPlanPrefix 'map_np_pf'
-   option enable 'voice.@PrefixInfo@.Enable'
-   option range 'voice.@PrefixInfo@.PrefixRange'
-   option prefix_min_digits 'voice.@PrefixInfo@.PrefixMinNumberOfDigits'
-   option prefix_max_digits 'voice.@PrefixInfo@.PrefixMaxNumberOfDigits'
-   option remove_digits 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
-   option remove_pos 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
-   option facility_act 'voice.@PrefixInfo@.FacilityAction'
-   option facility_arg 'voice.@PrefixInfo@.FacilityActionArgument'
-
-

evoice/files/etc/evoice/voicero

@@ -1,56 +0,0 @@
-config static_prm 'defaults'
-   option Print_Control '4'
-   option Print_UDP_Addr '192.168.1.3'
-   option Print_UDP_Port '60000'
-   option Verbosity 'Off'
-   option Failure_Log 'On'
-   option Message_Log 'Off'
-   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 Multiparty_Transp '0'
-   option Presence_Indication '0'
-   option Login_Note ' '
-   option Login_Description ' '
-   option Logout_Note ' '
-   option Logout_Description ' '
-   option Resolve_Every_Transaction '2'
-   option Translate_Plus '1'
-   option Mid_Call_Services '0'
-   option Account_Restriction '0'
-   option Answering_Machine_Enable '0'
-

evoice/files/etc/init.d/evoice

@@ -1,22 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=68
-STOP=12
-
-USE_PROCD=1
-NAME=evoice
-
-start_service() {
-	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
-
-	procd_open_instance
-	procd_set_param command $NAME
-	procd_set_param respawn "5" "0" "3"
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-

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:=ef46eb3be68ae1216d8699234f237fb2243289f1
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2
@@ -38,6 +38,9 @@ define Package/$(PKG_NAME)/description
 	Command to extract sub images from FIT images.
 endef
 
+MAKE_FLAGS += \
+	CFLAGS+="-Wall"
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 

gryphon-led-module/Makefile

@@ -28,7 +28,6 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel
   PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
@@ -41,21 +40,6 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m
 
 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
-	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)-
-	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"
-endif
-
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
 	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/

icwmp/Config_cwmp.in

@@ -1,5 +1,6 @@
 if PACKAGE_icwmp
 
+menu "Configuration"
 choice
 	prompt "Select ACS sever"
 	default CWMP_ACS_MULTI
@@ -18,19 +19,6 @@ config CWMP_DEBUG
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
-
-choice
-	prompt "Select SSL utility"
-	default CWMP_USE_WOLFSSL
-
-config CWMP_USE_WOLFSSL
-	bool "Use WolfSSL for ssl utilities"
-	select CONFIG_PACKAGE_libwolfssl
-
-config CWMP_USE_OPENSSL
-	bool "Use OpenSSL for ssl utilities"
-	select CONFIG_PACKAGE_libopenssl
-
-endchoice
+endmenu
 endif
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.0
+PKG_VERSION:=8.2.5-2021-10-26
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=473e8f449032cb195ae4aff2595e5c2efe623335
+PKG_SOURCE_VERSION:=bf33885bf7a4c61fa32d19a96d48acf0abf92d25
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -36,8 +36,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libwolfssl +curl +libcurl +libopenssl +mxml
-  MENU := 1
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl
 endef
 
 define Package/$(PKG_NAME)/description
@@ -79,34 +78,23 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-ifeq ($(CONFIG_CWMP_USE_WOLFSSL), y)
-CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += "-lwolfssl"
-endif
-
-ifeq ($(CONFIG_CWMP_USE_OPENSSL), y)
-CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lssl"
-endif
-
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/90-icwmp $(1)/etc/hotplug.d/iface/90-icwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-icwmp-generate-ssl $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
-	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

icwmp/files/etc/config/cwmp

@@ -1,9 +1,11 @@
 config acs 'acs'
+	option url ''
 	option userid '' #$OUI-$SER
 	option passwd 'iopsys'
 	option periodic_inform_enable 'true'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
+	option ParameterKey ''
 	option dhcp_discovery 'enable'
 	# compression possible configs: GZIP, Deflate, Disabled
 	option compression 'Disabled'
@@ -16,9 +18,10 @@ config acs 'acs'
 	option ip_version '4'
 
 config cpe 'cpe'
+	option interface 'eth0.1'
 	option default_wan_interface 'wan'
 	option log_to_console 'disable'
-	option log_to_file 'disable'
+	option log_to_file 'enable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
 	option log_severity 'INFO'

icwmp/files/etc/firewall.cwmp

@@ -1,9 +1,4 @@
-#!/bin/sh
-
 #created by the icwmp package
-log() {
-	echo "${@}"|logger -t firewall.cwmp -p info
-}
 
 if [ ! -f "/var/state/cwmp" ]; then
 	exit 0;
@@ -13,25 +8,24 @@ zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
 port=$(uci -q get cwmp.cpe.port)
 ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
 ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
+incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
 
-if [ -z "${zone_name}" ]; then
-	log "empty firewall zone name"
+if [ "$zone_name" = "" ]; then
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
 	iptables -nL zone_icwmp_input 2> /dev/null
 	if [ $? != 0 ]; then
-		iptables -w 1 -N zone_icwmp_input
-		iptables -w 1 -t filter -A INPUT -j zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -N zone_icwmp_input
+		iptables -t filter -A INPUT -j zone_icwmp_input
+		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
 	else			
-		iptables -w 1 -F zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -F zone_icwmp_input
+		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
 	fi			
 else
-	iptables -w 1 -F zone_icwmp_input 2> /dev/null
-	iptables -w 1 -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -w 1 -X zone_icwmp_input 2> /dev/null
+	iptables -F zone_icwmp_input 2> /dev/null
+	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
+	iptables -X zone_icwmp_input 2> /dev/null
 fi
 
 cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
@@ -75,6 +69,3 @@ if [ "$?" -eq 0 ]; then
 	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd6}
 fi
-
-uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
-uci -c /var/state -q commit cwmp

icwmp/files/etc/hotplug.d/iface/90-icwmp

@@ -0,0 +1,119 @@
+#!/bin/sh
+
+. /lib/functions/network.sh
+
+
+[ "$ACTION" == "ifup" ] || exit 0
+
+[ -f /etc/config/cwmp ] || exit 0
+
+handle_icwmp_restart() {
+	[ -f /tmp/switching_mode ] && exit 0
+	[ -f /tmp/wificontrol.txt -a -f /tmp/netmode-conf.pid ] && exit 0
+
+	[ "$INTERFACE" == "loopback" ] && exit 0
+
+	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+	[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
+
+	local islan="$(uci -q get network.$INTERFACE.is_lan)"
+	[ "$islan" == "1" ] && exit 0
+
+	local proto="$(uci -q get network.$INTERFACE.proto)"
+	[ "$proto" == "none" ] && exit 0
+
+	local ifname="$(uci -q get network.$INTERFACE.ifname)"
+	[ "${ifname:0:1}" == "@" ] && exit 0
+	
+	mkdir -p /tmp/ipv4
+
+	network_flush_cache
+
+	local previpaddr=""
+	local curipaddr=""
+	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
+	previpaddr=$(cat $ipaddrfile 2>/dev/null)
+	network_get_ipaddr curipaddr $INTERFACE
+	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+
+	local prevgateway=""
+	local curgateway=""
+	local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
+	prevgateway=$(cat $gatewayfile 2>/dev/null)
+	network_get_gateway curgateway $INTERFACE
+	[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
+
+	local prevsubnets=""
+	local cursubnets=""
+	local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
+	prevsubnets=$(cat $subnetsfile 2>/dev/null)
+	network_get_subnets cursubnets $INTERFACE
+	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
+
+	local prevdnsservers=""
+	local curdnsservers=""
+	local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
+	prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
+	network_get_dnsserver curdnsservers $INTERFACE
+	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
+
+	local prevdev=""
+	local curdev=""
+	local devfile=/tmp/ipv4/$INTERFACE-dev
+	prevdev=$(cat $devfile 2>/dev/null)
+	network_get_device curdev $INTERFACE
+	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
+
+	local vendorspecinf=`ubus call network.interface.${defwan} status | jsonfilter -e "@.data.vendorspecinf"`
+	[ -n "$vendorspecinf" ] && {
+		local url=""
+		case $vendorspecinf in
+			http://*|https://*)
+					url="$vendorspecinf"
+				;;
+			*)
+				for optval in $vendorspecinf; do
+				        case $optval in
+				                1=*)
+				                        url="$(echo $optval | cut -d"=" -f2-)"
+				                ;;
+				        esac
+				done
+			;;
+		esac
+		if [ ! -f /var/state/cwmp ]; then
+			touch /var/state/cwmp
+		fi
+		uci -q -c /var/state/ get cwmp.acs
+		if [ "$?" -ne 0 ]; then
+			unnamed=`uci -q -c /var/state/ add cwmp acs`
+			uci -c /var/state/ -q rename cwmp.$unnamed='acs'
+		fi
+		[ -n "$url" ] && uci -c /var/state -q set cwmp.acs.dhcp_url="$url"
+		uci -c /var/state commit cwmp
+	}
+                
+	local prevopt43url=""
+	local curopt43url=""
+	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
+	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
+	curopt43url="$(uci -c /var/state -q get cwmp.acs.dhcp_url)"
+	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
+
+	[ \
+		"$prevdev" == "$curdev" -a \
+		"$previpaddr" = "$curipaddr" -a \
+		"$prevgateway" = "$curgateway" -a \
+		"$prevsubnets" = "$cursubnets" -a \
+		"$prevdnsservers" = "$curdnsservers" \
+	] && {
+		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
+		[ -z "$prevopt43url" ] && exit 0
+	}
+
+	echo "Restarting icwmp"|logger -t cwmp.hotplug -p info
+
+	/etc/init.d/icwmpd reload &
+}
+
+handle_icwmp_restart

icwmp/files/etc/icwmpd/update.sh

@@ -1,93 +0,0 @@
-#!/bin/sh
-
-log() {
-	echo "$@" |logger -t cwmp.update -p info
-}
-
-handle_icwmp_update() {
-	local defwan vendorspecinf update
-
-	update="0"
-	defwan="$(uci -q get cwmp.cpe.default_wan_interface)"
-	vendorspecinf="$(ifstatus "${defwan}" | jsonfilter -e "@.data.vendorspecinf")"
-
-	log "Handling dhcp option value [${vendorspecinf}]"
-	[ -n "$vendorspecinf" ] && {
-		local url old_url
-		local prov_code old_prov_code
-		local min_wait_interval old_min_wait_interval
-		local retry_interval_multiplier old_retry_interval_multiplier
-
-		old_url="$(uci -q get cwmp.acs.dhcp_url)"
-		old_prov_code="$(uci -q get cwmp.cpe.dhcp_provisioning_code)"
-		old_min_wait_interval="$(uci -q get cwmp.acs.dhcp_retry_min_wait_interval)"
-		old_retry_interval_multiplier="$(uci -q get cwmp.acs.dhcp_retry_interval_multiplier)"
-
-		case $vendorspecinf in
-			http://*|https://*)
-					url="${vendorspecinf}"
-				;;
-			*)
-				for optval in $vendorspecinf; do
-				        case $optval in
-				                1=*)
-				                        url="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                2=*)
-				                        prov_code="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                3=*)
-				                        min_wait_interval="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                4=*)
-				                        retry_interval_multiplier="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				        esac
-				done
-			;;
-		esac
-
-		if [ -n "$url" ]; then
-			if [ "${url}" != "${old_url}" ]; then
-				log "## icwmp url[${old_url}] changed to [${url}]"
-				uci -q set cwmp.acs.dhcp_url="$url"
-				update=1
-			fi
-		fi
-		if [ -n "$prov_code" ]; then
-			if [ "${prov_code}" != "${old_prov_code}" ]; then
-				log "## icwmp prov_code[${old_prov_code}] changed to [${prov_code}]"
-				uci -q set cwmp.cpe.dhcp_provisioning_code="$prov_code"
-				update=1
-			fi
-		fi
-		if [ -n "$min_wait_interval" ]; then
-			if [ "${min_wait_interval}" != "${old_min_wait_interval}" ]; then
-				log "## icwmp min_wait_interval[${old_min_wait_interval}] changed to [${min_wait_interval}]"
-				uci -q set cwmp.acs.dhcp_retry_min_wait_interval="$min_wait_interval"
-				update=1
-			fi
-		fi
-		if [ -n "$retry_interval_multiplier" ]; then
-			if [ "${retry_interval_multiplier}" != "${old_retry_interval_multiplier}" ]; then
-				log "## icwmp retry_interval_multiplier[${old_retry_interval_multiplier}] changed to [${retry_interval_multiplier}]"
-				uci -q set cwmp.acs.dhcp_retry_interval_multiplier="$retry_interval_multiplier"
-				update=1
-			fi
-		fi
-	}
-	if [ "${update}" -eq "1" ]; then
-		log "CWMP uci changes, reload cwmp with uci commit"
-		ubus call uci commit '{"config":"cwmp"}'
-	else
-		if ubus list tr069 >/dev/null 2>&1 ; then
-			log "Trigger out of bound inform"
-			ubus call tr069 inform
-		else
-			log "Restarting icwmp tr069 object not found"
-			/etc/init.d/icwmpd restart
-		fi
-	fi
-}
-
-handle_icwmp_update

icwmp/files/etc/init.d/icwmpd

@@ -1,46 +1,130 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2015-2019 iopsys Software Solutions AB
 
+. /lib/functions.sh
+include /lib/network
+. /usr/share/libubox/jshn.sh
+
 START=99
-STOP=00
+STOP=10
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
 
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-include /lib/network
+EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
 
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
 
-enable_dhcp_option43() {
-	local wan="${1}"
+validate_url() {
+	# SCHEMA_LIST: contain list of possible schemas that could be present in the acs url
+	# Example: SCHEMA_LIST="http https"
+	SCHEMA_LIST="http"
 
-	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local newreqopts=""
-	local option43_present=0
-
-	for ropt in $reqopts; do
-		case $ropt in
-			43) option43_present=1 ;;
-			*) ;;
-		esac
+	for schema in $SCHEMA_LIST;	do
+		dest=`echo $1 | sed 's/$schema:\/\///g' | cut -f1 -d \/ | cut -f1 -d:`
+		if [ "_$dest" != "_" ]; then
+			return 0
+		fi
 	done
+	return 1
+}
 
-	if [ ${option43_present} -eq 1 ]; then
-		return;
+get_acs_url() {
+	local default_acs="http://10.10.1.6:8000/openacs/acs"
+	local acs_dhcp_discovery="$(uci -q get cwmp.acs.dhcp_discovery)"
+	local url="$(uci -q get cwmp.acs.url)"
+	local dhcp_url="$(uci -c /var/state -q get cwmp.acs.dhcp_url)"
+
+	if [ "$acs_dhcp_discovery" == "enable" -a -n "$dhcp_url" -o -z "$url" ]; then
+		url="$dhcp_url"
+		log "ACS URL from DHCP server: $url"
+		[ -n "$url" ] && uci -c /var/state -q set cwmp.acs.url="$url" || url="$default_acs"
+	elif [ -n "$url" ];then
+		url="$(uci -q get cwmp.acs.url)"
+		log "ACS URL from configuration: $url"
+	else
+		url="$default_acs"
+		log "Using default ACS URL: $url"
+		[ -n "$url" ] && uci -c /var/state -q set cwmp.acs.url="$url"
 	fi
 
-	newreqopts="$reqopts 43"
-	if [ "${proto}" == "dhcp" ]; then
+	validate_url "$url"
+	if [ "$?" != "0" ];then
+		echo "Invalid ACS URL: $url"
+		exit 1
+	fi
+}
+
+enable_dhcp_option43() {
+	local wan=$1
+	local discovery=0
+	case $2 in
+		enable|1) discovery=1 ;;
+	esac
+
+	### Ask for DHCP Option 43 only if CWMP is enabled ###
+	local enabled
+	local newreqopts=
+	local baseopts=
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local proto="$(uci -q get network.$wan.proto)"
+	local tropts="43"
+	local oldreqopts="$reqopts"
+	local ropt iopt
+	for ropt in $reqopts; do
+		case $ropt in
+			43) ;;
+			*) baseopts="$baseopts $ropt" ;;
+		esac
+	done
+	ropt=""
+	reqopts="$baseopts $tropts"
+	for ropt in $reqopts; do
+		case $ropt in
+			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
+			*) newreqopts="$newreqopts $ropt" ;;
+		esac
+	done
+	if [ $proto == "dhcp" ]; then
+		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		[ "$newreqopts" == "$oldreqopts" ] && return
 		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	fi
+	########################################################
+}
+
+wait_for_option43() {
+	local time=$1
+	local default_wan_interface dhcp_discovery url
+
+	config_get default_wan_interface cpe default_wan_interface "wan"
+	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get url acs url
+
+	enable_dhcp_option43 $default_wan_interface $dhcp_discovery
+
+	local tm=0
+
+	if [ "$dhcp_discovery" == "enable" -o "$dhcp_discovery" == "1" ]
+	then
+		log "Waiting for discovery of ACS URL from dhcp server ..."
+		while [ $tm -le $time ]
+		do
+			acs_url=`uci -c /var/state -q get cwmp.acs.dhcp_url`
+			if [ "$acs_url" != "" ]
+			then
+				break
+			else
+				sleep 1
+			fi
+			tm=$((tm+1))
+		done
+	fi
 }
 
 wait_for_resolvfile() {
@@ -50,184 +134,70 @@ wait_for_resolvfile() {
 	local resolvfile="$(uci -q get dhcp.@dnsmasq[0].resolvfile)"
 	[ -n "$resolvfile" ] || return
 
-	while [ ! -f "$resolvfile" ]; do
+	while [ ! -f $resolvfile ]; do
 		sleep 1
-		[ "$tm" -ge "$time" ] && break
+		[ $tm -ge $time ] && break
 		tm=$((tm+1))
 	done
 }
 
-copy_cwmp_etc_files_to_varstate() {
-	mkdir -p /var/run/icwmpd
+set_wan_interface() {
+	local l3_device=""
+	local default_wan_interface=""
 
-	if [ -f /etc/icwmpd/cwmp ]; then
-		uci -q -c /etc/icwmpd delete cwmp.acs
-		uci -q -c /etc/icwmpd commit cwmp
-		cp -f /etc/icwmpd/cwmp /var/state/cwmp
-	fi
-
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
-		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
-	fi
-
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]; then
-		cp -f /etc/icwmpd/dm_enabled_notify /var/run/icwmpd/ 2>/dev/null
+	config_get default_wan_interface cpe default_wan_interface "wan"
+	json_load "$(ifstatus $default_wan_interface)"
+	json_get_var l3_device l3_device
+	if [ "$l3_device" != "" ];then
+		uci -q set cwmp.cpe.interface="$l3_device"
+		uci -q commit cwmp
 	fi
 }
 
-copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]; then
-		cp -f /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd/ 2>/dev/null
-	fi
-
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]; then
-		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
-	fi
-
-	if [ -f /var/state/cwmp ]; then
-		cp -f /var/state/cwmp /etc/icwmpd/
-	fi
-
-	# move the successful custom notify import marker to persistent storage
-	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
-		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
-	fi
-}
-
-validate_acs_section()
-{
-	uci_validate_section cwmp acs "acs" \
-		'passwd:string' \
-		'periodic_inform_enable:bool' \
-		'periodic_inform_interval:uinteger' \
-		'periodic_inform_time:string' \
-		'url:string' \
-		'dhcp_url:string' \
-		'compression:or("GZIP","Deflate","Disabled")' \
-		'retry_min_wait_interval:range(1, 65535)' \
-		'retry_interval_multiplier:range(1000, 65535)' \
-		'https_ssl_capath:file' \
-		'ipv6_enable:bool'
-
-}
-
-validate_cpe_section()
-{
-	uci_validate_section cwmp cpe "cpe" \
-		'interface:string' \
-		'default_wan_interface:string' \
-		'log_to_console:or("enable","disable")' \
-		'log_to_file:or("enable","disable")' \
-		'log_severity:or("EMERG", "ALERT", "CRITIC" ,"ERROR", "WARNING", "NOTICE", "INFO", "DEBUG")' \
-		'log_file_name:string' \
-		'log_max_size:uinteger' \
-		'userid:string' \
-		'passwd:string' \
-		'port:uinteger' \
-		'provisioning_code:string:""' \
-		'amd_version:range(1, 6)' \
-		'instance_mode:or("InstanceNumber","InstanceAlias")' \
-		'session_timeout:uinteger' \
-		'notification:bool' \
-		'exec_download:bool' \
-		'periodic_notify_enable:bool' \
-		'enable:bool' \
-		'periodic_notify_interval:uinteger'
-}
-
-validate_defaults() {
-	config_load cwmp
-
-	validate_acs_section || {
-		log "Validation of acs section failed"
-		return 1;
-	}
-
-	[ -z "${url}" ] && [ -z "${dhcp_url}" ] && {
-		log "ACS url is empty can't start"
-		return 1;
-	}
-
-	validate_cpe_section || {
-		log "Validation of cpe section failed"
-		return 1;
-	}
-
-	return 0;
+service_running() {
+	ubus wait_for usp.raw
 }
 
 start_service() {
-	local enable_cwmp
-	local wan_interface
-	local dhcp_discovery
+	if [ ! -f /tmp/.icwmpd_boot ]; then
+		touch /etc/icwmpd/.icwmpd_boot
+		touch /tmp/.icwmpd_boot
+	else
+		[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
+		[ -f /etc/config/wireless ] && log "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
+		[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
+		[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
+		[ -f /usr/sbin/asterisk ] && log "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
 
-	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-	config_get dhcp_discovery acs dhcp_discovery
-	config_get wan_interface cpe default_wan_interface "wan"
+		log "Waiting for usp.raw to be started"
+		ubus wait_for usp.raw
 
-	if [ "$enable_cwmp" = "0" ] || [ "$enable_cwmp" = "false" ]; then
-		log "CWMP is not enabled"
-		return 0
+		config_load cwmp
+		set_wan_interface
+		wait_for_option43 20
+		get_acs_url
+
+		procd_open_instance icwmp
+		procd_set_param command "$PROG"
+		if [ "$1" = "GetRPCMethods" ];then
+			procd_append_param command -g
+		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
+			procd_append_param command -b
+		fi
+		procd_set_param respawn \
+			${respawn_threshold:-5} \
+			${respawn_timeout:-10} ${respawn_retry:-3}
+
+		procd_close_instance
 	fi
-
-	# Set dhcp option 43 if dhcp discovery enabled
-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
-		enable_dhcp_option43 "${wan_interface}"
-	fi
-
-	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-
-	validate_defaults || {
-		log "Validation of defaults failed"
-		return 1;
-	}
-
-	# Copy backup data so that if it restart latter on it gets the info
-	copy_cwmp_etc_files_to_varstate
-
-	procd_open_instance icwmp
-	procd_set_param command "$PROG"
-	procd_append_param command -b
-	procd_set_param respawn \
-		"${respawn_threshold:-5}" \
-		"${respawn_timeout:-10}" "${respawn_retry:-3}"
-
-	procd_set_param watch network.interface
-	procd_close_instance
-}
-
-service_stopped()
-{
-	copy_cwmp_varstate_files_to_etc
 }
 
 reload_service() {
-	log "Reloading CWMP client"
-	ubus -t 1 call tr069 command '{"command":"reload"}'
-	if [ "$?" -ne "0" ]; then
-		log "Restarting CWMP client"
-		stop
-		start
-	fi
+	stop
+	start
 }
 
 service_triggers() {
-       procd_add_reload_trigger "cwmp"
-
-       procd_open_trigger
-               json_add_array
-                       json_add_string "" "interface.update"
-                       json_add_array
-                               json_add_array
-                                       json_add_string "" "run_script"
-                                       json_add_string "" "/etc/icwmpd/update.sh"
-                               json_close_array
-                       json_close_array
-                       json_add_int "" "2000"
-               json_close_array
-       procd_close_trigger
+	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
 }
 

icwmp/files/etc/uci-defaults/85-cwmp-set-userid

@@ -1,18 +1,18 @@
 # Copy defaults by the factory to the cwmp UCI user section.
 
-# Get Manufacturer OUI.
-oui=$(uci -q get cwmp.cpe.manufacturer_oui)
-if [ -z "${oui}" ]; then
-	oui=$(db -q get device.deviceinfo.ManufacturerOUI)
-fi
 
-oui=$(echo "${oui}" | tr 'a-f' 'A-F')
+# Get factory base MAC.
+baseMac=$(db -q get hw.board.basemac)
+
+# Erase colon and space characters.
+baseMac=${baseMac//:/}
+baseMac=${baseMac// /}
+
+# Caseing and fixed length string.
+mac=$(printf "%12.12X" $((0x$baseMac)))
 
 # Get system serial number.
-serial=$(uci -q get cwmp.cpe.serial_number)
-if [ -z "${serial}" ]; then
-	serial=$(db -q get device.deviceinfo.SerialNumber)
-fi
+serial=$(db -q get hw.board.serial_number)
 
 # Get userid values
 acs_userid=$(uci -q get cwmp.acs.userid)
@@ -21,12 +21,12 @@ cpe_userid=$(uci -q get cwmp.cpe.userid)
 # Only set if they are empty
 if [ -z "$acs_userid" ]
 then
-    uci -q set cwmp.acs.userid="${oui}-${serial}"
+    uci -q set cwmp.acs.userid="${mac:0:6}-${serial}"
 fi
 
 if [ -z "$cpe_userid" ]
 then
-    uci -q set cwmp.cpe.userid="${oui}-${serial}"
+    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
 fi
 
 # No need for commit here, it is done by uci_apply_defaults().

icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+set_cwmp_reqopts() {
+	### Ask for DHCP Option 43 only if CWMP is enabled ###
+	local wan=$(uci -q get cwmp.cpe.default_wan_interface)
+	local dhcp_discovery=$(uci -q get cwmp.acs.dhcp_discovery)
+	local discovery=0
+	case $dhcp_discovery in
+		enable|1) discovery=1 ;;
+	esac
+
+	local newreqopts=
+	local baseopts=
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local proto="$(uci -q get network.$wan.proto)"
+	local tropts="43"
+	local oldreqopts="$reqopts"
+	local ropt iopt
+	for ropt in $reqopts; do
+		case $ropt in
+			43) ;;
+			*) baseopts="$baseopts $ropt" ;;
+		esac
+	done
+	ropt=""
+	reqopts="$baseopts $tropts"
+	for ropt in $reqopts; do
+		case $ropt in
+			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
+			*) newreqopts="$newreqopts $ropt" ;;
+		esac
+	done
+	if [ "$proto" == "dhcp" ]; then
+		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		[ "$newreqopts" == "$oldreqopts" ] && return
+		uci -q set network.$wan.reqopts="$newreqopts"
+		uci commit network
+	fi
+}
+
+regenerate_ssl_link(){
+	local cert_dir="/etc/ssl/certs"
+	local all_file=$(ls $cert_dir/*.pem)
+	for cfile in $all_file
+	do
+		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
+	done
+}
+
+set_cwmp_reqopts
+regenerate_ssl_link

icwmp/files/etc/uci-defaults/95-icwmp-generate-ssl

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-regenerate_ssl_link(){
-	[ ! -d "/etc/ssl/certs" ] && return 0;
-	[ ! -f "/etc/ssl/certs/*.pem" ] && return 0;
-
-	local cert_dir="/etc/ssl/certs"
-	local all_file=$(ls $cert_dir/*.pem)
-
-	for cfile in $all_file
-	do
-		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
-	done
-}
-
-regenerate_ssl_link

icwmp/files/lib/upgrade/keep.d/icwmp

@@ -1 +1 @@
-/var/run/icwmpd/icwmpd_backup_session.xml
+/etc/icwmpd/.icwmpd_backup_session.xml

ieee1905/Config.in

@@ -6,9 +6,5 @@ config IEEE1905_EXTENSION_ALLOWED
 	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
 	default y
 
-config IEEE1905_PLATFORM_HAS_WIFI
-	bool "Platform has WiFi"
-	default y if PACKAGE_libwifi
-
 endmenu
 endif

ieee1905/Config.map-plugin.in

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

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.7.4
+PKG_VERSION:=4.0.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=efe39a957f8512243e6ee6044e91d8f5a97c318e
+PKG_SOURCE_VERSION:=e99c9ad752ee165c37d40a3ac139e0906bf03e3c
 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
@@ -37,30 +37,26 @@ endef
 define Package/libieee1905
 $(call Package/ieee1905/Default,$(1))
   TITLE+= (library for CMDU and TLV handling)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
 	   +libjson-c +libblobmsg-json
 endef
 
 define Package/ieee1905
 $(call Package/ieee1905/Default,$(1))
   TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ubus +libpthread \
-	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+	   +libjson-c +libblobmsg-json +libwifi +ubus +libpthread \
+	   +libnl-genl +libieee1905
 endef
 
 
 define Package/map-plugin
 $(call Package/ieee1905/Default,$(1))
   TITLE:=Multi-AP (Easymesh) plugin
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/map-plugin/config
-  source "$(SOURCE)/Config.map-plugin.in"
-endef
-
 define Package/ieee1905/description
  This package provides IEEE Std 1905.1 stack.
 endef
@@ -74,15 +70,6 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
-TARGET_CFLAGS += -DHAS_WIFI
-endif
-
-ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
-TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
-endif
-
-
 MAKE_PATH:=src
 
 
@@ -113,7 +100,6 @@ define Build/InstallDev/map-plugin
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map2.h
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
 endef
@@ -129,7 +115,6 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
 endef
@@ -139,11 +124,6 @@ define Build/InstallDev
 	$(call Build/InstallDev/map-plugin,$(1),$(2))
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/ieee1905/ $(PKG_BUILD_DIR)/
-endef
-endif
 
 $(eval $(call BuildPackage,ieee1905))
 $(eval $(call BuildPackage,libieee1905))

ieee1905/files/etc/init.d/ieee1905

@@ -5,82 +5,7 @@ STOP=21
 
 USE_PROCD=1
 
-IS_CFG_VALID=1
-
-validate_ieee1905_section() {
-	uci_validate_section ieee1905 ieee1905 "ieee1905" \
-			'enabled:bool:true' \
-			'macaddress:or("auto",macaddr)' \
-			'registrar:string' \
-			'extension:bool:false' \
-			'extmodule:list(string)' \
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "ieee1905" "Validation of ieee1905 section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ali_section() {
-	local section="$1"
-
-	uci_validate_section ieee1905 $section "${1}" \
-			'ifname:string' \
-			'type:or("bridge",string)'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "ieee1905" "Validation of al-iface section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ap_section() {
-	local section="$1"
-
-	uci_validate_section ieee1905 $section "${1}" \
-			'band:or("2", "5", "60")' \
-			'ssid:string' \
-			'encryption:or("psk2", "sae-mixed", "sae", string)' \
-			'key:string' \
-			'uuid:string' \
-			'manufacturer:string' \
-			'model_name:string' \
-			'device_name:string' \
-			'model_number:string' \
-			'serial_number:string' \
-			'device_type:string' \
-			'os_version:uinteger'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "ieee1905" "Validation of ap section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ieee1905_config() {
-	IS_CFG_VALID=1
-
-	validate_ieee1905_section &&
-		config_foreach validate_ali_section "al-iface" &&
-		config_foreach validate_ap_section ap
-
-	[ "$IS_CFG_VALID" -ne 1 ] && {
-		logger -s -t "ieee1905" "Validation of ieee1905 UCI file failed"
-		return 1
-	}
-	return 0
-}
-
 start_service() {
-	config_load "ieee1905"
-	validate_ieee1905_config || return 1;
-
 	procd_open_instance
         procd_set_param command "/usr/sbin/ieee1905d"
 	procd_set_param respawn

iop/Config.in

@@ -1,7 +0,0 @@
-config TARGET_VERSION
-	string
-	prompt "Software Version"
-
-config TARGET_CUSTOMER
-	string
-	prompt "Customer ID"

iop/Makefile

@@ -24,10 +24,6 @@ define Package/iop/description
 	This package contains iopsysWrt SDK utilities
 endef
 
-define Package/iop/config
-	source "$(SOURCE)/Config.in"
-endef
-
 define Build/Compile
 	true
 endef

iop/config

@@ -1,138 +1,33 @@
-############
-# Generic #
-##########
-
-# Build #
-CONFIG_BUILD_LOG=y
+CONFIG_BUILD_NLS=y
+CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-# CONFIG_USE_SSTRIP is not set
-CONFIG_USE_STRIP=y
-# CONFIG_SIGNED_PACKAGES is not set
-
-# Image #
-CONFIG_TARGET_CUSTOMER="IOPSYS"
-CONFIG_TARGET_ROOTFS_TARGZ=y
-
-# /etc/banner and /etc/device_info #
-CONFIG_IMAGEOPT=y
-CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="iopsysWrt"
-CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
-
-# /lib/preinit #
-CONFIG_PREINITOPT=y
-# CONFIG_TARGET_PREINIT_SUPPRESS_STDERR is not set
-CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y
-CONFIG_TARGET_PREINIT_TIMEOUT=1
-# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set
-# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set
-CONFIG_TARGET_PREINIT_IFNAME=""
-CONFIG_TARGET_PREINIT_IP=""
-CONFIG_TARGET_PREINIT_NETMASK=""
-CONFIG_TARGET_PREINIT_BROADCAST=""
-
-# Mirror #
-CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
-
-
-##################
-# IOWRT Add-ons #
-################
-
-# EasySoC HAL #
-CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_peripheral_manager=y
-CONFIG_PACKAGE_port-management=y
-CONFIG_PACKAGE_wifimngr=y
-
-# Multi-AP #
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_wfadatad=y
-CONFIG_PACKAGE_wfadatad-collector=y
-
-# Network #
-CONFIG_PACKAGE_netmode=y
-CONFIG_PACKAGE_owsd=m
-CONFIG_PACKAGE_urlfilter=y
-
-# System #
-CONFIG_PACKAGE_imonitor=m
-CONFIG_PACKAGE_questd=y
-CONFIG_PACKAGE_rulengd=y
-
-# TR-x69 #
-CONFIG_PACKAGE_uspd=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata=y
-CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=m
-CONFIG_PACKAGE_swmodd=m
-CONFIG_PACKAGE_twamp=m
-CONFIG_PACKAGE_udpechoserver=m
-CONFIG_PACKAGE_xmppc=m
-
-# WebGUI #
-CONFIG_PACKAGE_sulu=y
-
-
-############
-# Network #
-##########
-
-# Protocols #
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
+CONFIG_PACKAGE_at=y
+CONFIG_PACKAGE_atftp=m
+CONFIG_PACKAGE_atftpd=m
+CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
 CONFIG_PACKAGE_comgt-ncm=y
-CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_gre=y
-CONFIG_PACKAGE_map=y
-CONFIG_PACKAGE_ntfs-3g=y
-CONFIG_PACKAGE_ntpd=y
-CONFIG_PACKAGE_odhcp6c=y
-CONFIG_PACKAGE_odhcpd=y
-CONFIG_PACKAGE_ppp-mod-pppoa=y
-CONFIG_PACKAGE_ppp-mod-pppoe=y
-CONFIG_PACKAGE_ppp-mod-pppol2tp=y
-CONFIG_PACKAGE_ppp-mod-pptp=y
-CONFIG_PACKAGE_ppp-multilink=y
-# CONFIG_PACKAGE_ppp is not set
-CONFIG_PACKAGE_relayd=y
-CONFIG_PACKAGE_umbim=y
-CONFIG_PACKAGE_uqmi=y
-CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_xl2tpd=y
-
-# Services #
-CONFIG_PACKAGE_atftp=m
-CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_ds-lite=y
+CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_getopt=y
+CONFIG_PACKAGE_glib2=y
+CONFIG_PACKAGE_gre=y
+CONFIG_PACKAGE_icwmp=y
+CONFIG_PACKAGE_ieee1905=y
+CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_nginx=y
-CONFIG_PACKAGE_openvpn-easy-rsa=y
-CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
-# CONFIG_PACKAGE_qos-scripts is not set
-CONFIG_PACKAGE_rdnssd=y
-CONFIG_PACKAGE_vsftpd-tls=m
-
-# Tools and Utilities #
-CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_libcurl=y
-CONFIG_LIBCURL_CRYPTO_AUTH=y
-# CONFIG_LIBCURL_MBEDTLS is not set
-CONFIG_LIBCURL_OPENSSL=y
-CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_wfadatad=y
+CONFIG_PACKAGE_imonitor=m
+CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
@@ -140,67 +35,73 @@ CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
-CONFIG_PACKAGE_ndisc6=y
-CONFIG_PACKAGE_rdisc6=y
-CONFIG_PACKAGE_resolveip=y
-CONFIG_PACKAGE_tcpdump=y
-CONFIG_PACKAGE_traceroute6=y
-
-
-############
-# System  #
-##########
-
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_getopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_libustream-openssl=y
-# CONFIG_PACKAGE_libustream-wolfssl is not set
+CONFIG_PACKAGE_libreswan=m
+CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_nand-utils=y
-CONFIG_PACKAGE_openssl-util=y
-CONFIG_OPENSSL_WITH_COMPRESSION=y
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-rpcsys=y
-CONFIG_PACKAGE_rpcd-mod-rrdns=y
-CONFIG_PACKAGE_strace=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_uledd=y
-# The urandom-seed package is very strange. It seeds urandom with urandom...
-# Disable it. Most SoCs nowadays has HW random generators anyway.
-# CONFIG_PACKAGE_urandom-seed is not set
-# CONFIG_PACKAGE_urngd is not set
-CONFIG_PACKAGE_usb-modeswitch=y
-CONFIG_PACKAGE_uuidgen=y
-CONFIG_PACKAGE_zoneinfo-core=y
-CONFIG_PACKAGE_zoneinfo-europe=y
-
-
-################
-# LuCI WebGUI #
-##############
-
-# BEGIN: luci-nginx metapackage with some changes
-# We do not want libiwinfo-lua on non-WiFi targets, but it is already
-# depended on by other luci-packages, so no need to take it in explicitly
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
+CONFIG_PACKAGE_luci-nginx=y
 # CONFIG_LUCI_JSMIN is not set
 # CONFIG_LUCI_CSSTIDY is not set
 CONFIG_PACKAGE_luci-mod-dashboard=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
-CONFIG_PACKAGE_nginx-mod-luci=y
-
-
-############
-# BusyBox #
-##########
-
-CONFIG_BUSYBOX_CUSTOM=y
+CONFIG_PACKAGE_map=y
+CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_mwan3=y
+CONFIG_PACKAGE_nand-utils=y
+CONFIG_PACKAGE_ndisc6=y
+CONFIG_PACKAGE_netmode=y
+CONFIG_PACKAGE_ntfs-3g=y
+CONFIG_PACKAGE_ntpd=y
+CONFIG_PACKAGE_obuspa=y
+CONFIG_PACKAGE_odhcp6c=y
+CONFIG_PACKAGE_odhcpd=y
+CONFIG_PACKAGE_openssl-util=y
+CONFIG_OPENSSL_WITH_COMPRESSION=y
+CONFIG_PACKAGE_openvpn-easy-rsa=y
+CONFIG_PACKAGE_openvpn-openssl=y
+CONFIG_PACKAGE_owsd=y
+CONFIG_PACKAGE_periodicstats=y
+CONFIG_PACKAGE_peripheral_manager=y
+CONFIG_PACKAGE_port-management=y
+CONFIG_PACKAGE_ppp-mod-pppoa=y
+CONFIG_PACKAGE_ppp-mod-pppoe=y
+CONFIG_PACKAGE_ppp-mod-pppol2tp=y
+CONFIG_PACKAGE_ppp-mod-pptp=y
+CONFIG_PACKAGE_ppp-multilink=y
+# CONFIG_PACKAGE_ppp is not set
+# CONFIG_PACKAGE_qos-scripts is not set
+CONFIG_PACKAGE_questd=y
+CONFIG_PACKAGE_rdisc6=y
+CONFIG_PACKAGE_rdnssd=y
+CONFIG_PACKAGE_relayd=y
+CONFIG_PACKAGE_resolveip=y
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-rpcsys=y
+CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_strace=y
+CONFIG_PACKAGE_sulu=y
+CONFIG_PACKAGE_swmodd=m
+CONFIG_PACKAGE_tcpdump=y
+CONFIG_PACKAGE_terminfo=y
+CONFIG_PACKAGE_traceroute6=y
+CONFIG_PACKAGE_uledd=y
+CONFIG_PACKAGE_umbim=y
+CONFIG_PACKAGE_uqmi=y
+CONFIG_PACKAGE_urlfilter=y
+CONFIG_PACKAGE_usb-modeswitch=y
+CONFIG_PACKAGE_uspd=y
+CONFIG_PACKAGE_vsftpd-tls=m
+CONFIG_PACKAGE_wwan=y
+CONFIG_PACKAGE_wifimngr=y
+CONFIG_PACKAGE_uuidgen=y
+CONFIG_PACKAGE_xl2tpd=y
+CONFIG_PACKAGE_zoneinfo-core=y
+CONFIG_PACKAGE_zoneinfo-europe=y
+CONFIG_TARGET_CUSTOMER="IOPSYS"
+# CONFIG_USE_SSTRIP is not set
+CONFIG_USE_STRIP=y
+CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
 CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
@@ -220,7 +121,6 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 CONFIG_BUSYBOX_CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-# CONFIG_BUSYBOX_CONFIG_IP is not set
 CONFIG_BUSYBOX_CONFIG_LAST_SYSTEM_ID=999
 CONFIG_BUSYBOX_CONFIG_LOGIN=y
 # CONFIG_BUSYBOX_CONFIG_LSMOD is not set
@@ -284,3 +184,42 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
+CONFIG_LIBCURL_CRYPTO_AUTH=y
+# CONFIG_LIBCURL_MBEDTLS is not set
+CONFIG_LIBCURL_OPENSSL=y
+CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
+# CONFIG_SIGNED_PACKAGES is not set
+CONFIG_KERNEL_DEVTMPFS=y
+CONFIG_KERNEL_DEVTMPFS_MOUNT=y
+# CONFIG_BUSYBOX_CONFIG_IP is not set
+CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
+
+# Generation of /etc/banner.
+CONFIG_IMAGEOPT=y
+CONFIG_VERSIONOPT=y
+CONFIG_VERSION_MANUFACTURER="iopsysWrt"
+CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
+
+# Disable as much as possible of OpenWrt messy "pre-init" stuff.
+CONFIG_PREINITOPT=y
+# CONFIG_TARGET_PREINIT_SUPPRESS_STDERR is not set
+CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y
+CONFIG_TARGET_PREINIT_TIMEOUT=1
+# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set
+# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set
+CONFIG_TARGET_PREINIT_IFNAME=""
+CONFIG_TARGET_PREINIT_IP=""
+CONFIG_TARGET_PREINIT_NETMASK=""
+CONFIG_TARGET_PREINIT_BROADCAST=""
+
+# Generate rootfs tar file
+CONFIG_TARGET_ROOTFS_TARGZ=y
+
+# The urandom-seed package is very strange. It seeds urandom with urandom...
+# Disable it. Most SoCs nowadays has HW random generators anyway.
+# CONFIG_PACKAGE_urandom-seed is not set
+# CONFIG_PACKAGE_urngd is not set
+
+# We use OpenSSL, no need to ship multiple TLS libraries
+CONFIG_PACKAGE_libustream-openssl=y
+# CONFIG_PACKAGE_libustream-wolfssl is not set

iop/scripts/feeds_update.sh

@@ -32,7 +32,8 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    for target in $(ls ./feeds/targets)
+    targets="iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt iopsys-bcm27xx iopsys-mediatek iopsys-econet"
+    for target in $targets
     do
 	rm -f target/linux/$target
 	./scripts/feeds install -p targets $target

iop/scripts/genconfig.sh

@@ -13,9 +13,12 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
+	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
+	mediatek="target/linux/iopsys-mediatek"
 	econet="target/linux/iopsys-econet"
+	intel_mips="target/linux/intel_mips"
 	x86="target/linux/iopsys-x86"
 	armvirt="target/linux/iopsys-armvirt"
 
@@ -111,15 +114,21 @@ function genconfig {
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
+		[ -e $mediatek/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 		[ -e $econet/genconfig ] &&
 			iopsys_econet=$(cd $econet; ./genconfig)
+		[ -e $intel_mips/genconfig ] &&
+			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $bcm27xx/genconfig ] &&
+			iopsys_bcm27xx=$(cd $bcm27xx; ./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_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -144,6 +153,14 @@ function genconfig {
 		fi
 	    done
 
+	    for p in $iopsys_mediatek; do
+		if [ $p == $profile ]; then
+		    target="iopsys_mediatek"
+			target_config_path="$mediatek/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_econet; do
 		if [ $p == $profile ]; then
 		    target="iopsys_econet"
@@ -152,6 +169,14 @@ function genconfig {
 		fi
 	    done
 
+	    for p in $iopsys_intel_mips; do
+		if [ $p == $profile ]; then
+		    target="intel_mips"
+			target_config_path="$intel_mips/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
@@ -167,6 +192,15 @@ function genconfig {
 		    return
 		fi
 	    done
+
+	    for p in $iopsys_bcm27xx; do
+		if [ $p == $profile ]; then
+		    target="iopsys_bcm27xx"
+			target_config_path="$bcm27xx/config"
+		    return
+		fi
+	    done
+
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -318,16 +352,32 @@ function genconfig {
 		    echo "" >> .config
 		fi
 
-		# Special handling for targets which use TARGET_DEVICES 
-		if [ "$target" = "iopsys_ramips" ]; then
+		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
+		if [ "$target" = "intel_mips" ]; then
+			subtarget="xrx500"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			device=$(echo $BOARDTYPE | tr a-z A-Z)
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		elif [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_mediatek" ]; then
+			subtarget="mt7622"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_${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
+		elif [ "$target" = "iopsys_bcm27xx" ]; then
+			subtarget="iopsys_bcm2711"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

iop/scripts/genconfig_min.sh

@@ -12,9 +12,12 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
+	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
+	mediatek="target/linux/iopsys-mediatek"
 	econet="target/linux/iopsys-econet"
+	intel_mips="target/linux/intel_mips"
 	x86="target/linux/iopsys-x86"
 	armvirt="target/linux/iopsys-armvirt"
 
@@ -110,15 +113,21 @@ function genconfig_min {
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
+		[ -e $mediatek/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 		[ -e $econet/genconfig ] &&
 			iopsys_econet=$(cd $econet; ./genconfig)
+		[ -e $intel_mips/genconfig ] &&
+			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $bcm27xx/genconfig ] &&
+			iopsys_bcm27xx=$(cd $bcm27xx; ./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_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -143,6 +152,14 @@ function genconfig_min {
 		fi
 	    done
 
+	    for p in $iopsys_mediatek; do
+		if [ $p == $profile ]; then
+		    target="iopsys_mediatek"
+			target_config_path="$mediatek/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_econet; do
 		if [ $p == $profile ]; then
 		    target="iopsys_econet"
@@ -151,6 +168,14 @@ function genconfig_min {
 		fi
 	    done
 
+	    for p in $iopsys_intel_mips; do
+		if [ $p == $profile ]; then
+		    target="intel_mips"
+			target_config_path="$intel_mips/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
@@ -166,6 +191,15 @@ function genconfig_min {
 		    return
 		fi
 	    done
+
+	    for p in $iopsys_bcm27xx; do
+		if [ $p == $profile ]; then
+		    target="iopsys_bcm27xx"
+			target_config_path="$bcm27xx/config"
+		    return
+		fi
+	    done
+
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -309,16 +343,34 @@ function genconfig_min {
 		    echo "" >> .config
 		fi
 
-		# Special handling for targets which use TARGET_DEVICES
-		if [ "$target" = "iopsys_ramips" ]; then
+		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
+		if [ "$target" = "intel_mips" ]; then
+			subtarget="xrx500"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			device=$(echo $BOARDTYPE | tr a-z A-Z)
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		elif [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_mediatek" ]; then
+			subtarget="mt7622"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_${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
+		elif [ "$target" = "iopsys_bcm27xx" ]; then
+			subtarget="iopsys_bcm2711"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

libjwt/Makefile

@@ -0,0 +1,54 @@
+
+# Copyright (C) 2018 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libjwt
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=866607c7741421c8ac99876e7201eb32d9af1b92
+PKG_SOURCE_URL:=https://github.com/benmcollins/libjwt.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_FIXUP:=autoreconf
+
+PKG_LICENSE:=LGPLv3
+PKG_LICENSE_FILES:=COPYING
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libjwt
+  CATEGORY:=Libraries
+  DEPENDS:=+libopenssl +jansson
+  TITLE:= libjwt
+endef
+
+
+#TARGET_CFLAGS += \
+#	-I$(STAGING_DIR)/usr/include
+#	-I$(STAGING_DIR)/usr/include/libnl3
+
+#MAKE_FLAGS += \
+#	CFLAGS="$(TARGET_CFLAGS)" \
+#	LDFLAGS="$(TARGET_LDFLAGS)" \
+#	FPIC="$(FPIC)" \
+#	PLATFORM="$(TARGET_PLATFORM)" \
+#	subdirs="$(subdirs)"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/include/jwt.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libjwt/.libs/libjwt.so* $(1)/usr/lib/
+endef
+
+define Package/libjwt/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libjwt/.libs/libjwt.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libjwt))

map-agent/Config.in

@@ -1,14 +0,0 @@
-if (PACKAGE_map-agent)
-
-menu "Configurations"
-
-config AGENT_SYNC_DYNAMIC_CNTLR_CONFIG
-	bool "Support Dynamic Controller configuration sync"
-	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
-
-config AGENT_ISLAND_PREVENTION
-	bool "Support Island Prevention"
-	default y if MULTIAP_AGENT_ISLAND_PREVENTION
-
-endmenu
-endif

map-agent/Makefile

@@ -5,21 +5,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=7.1.33
+PKG_VERSION:=6.0.8
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=9d37e0b65571a6e5b9ad05bd79f49dc04d9a1dbb
+PKG_SOURCE_VERSION:=3f0bb9c156dd334df6927dc7e6d7fc2ebbc7d520
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
-endif
+
+PKG_BUILD_DEPENDS:=map-plugin
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,26 +30,12 @@ define Package/map-agent
 	  +map-plugin
 endef
 
-
-define Package/dynbhd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Dynamic Backhaul Daemon
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +map-plugin +map-agent
-endef
-
-
 define Package/map-agent/description
  This package implements EasyMesh R2 compliant WiFi Agent.
 endef
 
-define Package/dynbhd/description
- Dyanmic LAN/WAN port detection and loop avoidance.
-endef
-
 define Package/map-agent/config
-	source "$(SOURCE)/Config.in"
+	#source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
@@ -58,14 +43,6 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
-TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
-endif
-
-ifeq ($(CONFIG_AGENT_ISLAND_PREVENTION),y)
-TARGET_CFLAGS += -DAGENT_ISLAND_PREVENTION
-endif
-
 MAKE_PATH:=src
 
 define Package/map-agent/install
@@ -76,21 +53,4 @@ define Package/map-agent/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 
-define Package/dynbhd/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/lib/wifi/dynbhd
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/ethernet
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/dynbhd $(1)/usr/sbin/dynbhd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/api $(1)/lib/wifi/dynbhd/api
-#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/map-dynamic-backhaul $(1)/etc/hotplug.d/ethernet/map-dynamic-backhaul
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/map-agent/ $(PKG_BUILD_DIR)/
-endef
-endif
-
 $(eval $(call BuildPackage,map-agent))
-$(eval $(call BuildPackage,dynbhd))

map-agent/files/etc/config/mapagent

@@ -4,7 +4,7 @@ config agent 'agent'
 	option profile '2'
 	option al_bridge 'br-lan'
 
-#config ap
+#config fh-iface
 #	option ifname 'wl0'
 #	option steer 'rssi bssload'
 #	list exclude '00:11:22:33:44:55'
@@ -17,17 +17,15 @@ config agent 'agent'
 #	option steer_legacy_retry_secs '3600'
 #	option assoc_ctrl_secs '30'
 #	option band '2'
-#	option type 'fronthaul'
 
-#config ap
+#config fh-iface
 #	option ifname 'wl1'
 #	option steer 'rssi bssload'
 #	list exclude '00:11:22:33:44:55'
 #	list exclude_btm '00:aa:bb:cc:dd:ee'
 #	option band '5'
-#	option type 'fronthaul'
 
-#config bsta
+#config bk-iface
 #	option ifname 'apclii0'
 #	option enabled '1'
 #	option onboarded '0'

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

@@ -1,78 +1,20 @@
 #!/bin/sh
 
-. /lib/network/utils.sh
+wan=$(db -q get hw.board.ethernetWanPort)
 
-conn_ports_file="/tmp/map.connected.ports"
-map_bh_file="/tmp/multiap.backhaul"
-al_bridge="$(uci -q get mapagent.agent.al_bridge)"
-[ "${al_bridge:0:3}" = "br-" ] || exit 0
-al_brnet="${al_bridge:3}"
-
-# Exit if the PORT is not member of the AL Bridge
-[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0
-
-############## Dynamic Backhaul Daemon ##############
-if [ -n "$(which dynbhd)" ]; then
-	pidof dynbhd >/dev/null && exit 0 # dynbhd is managing the links
-
-	if [ ! -f $conn_ports_file ]; then
-		touch $conn_ports_file
-		if [ "$LINK" = "up" ]; then
-			touch $conn_ports_file
-			echo "$PORT" > $conn_ports_file
-			brctl delif $al_bridge $PORT
-			#ubus call network.interface.lan remove_device "{\"name\":\"$PORT\"}"
-		fi
-	else
-		if [ "$LINK" = "up" ]; then
-			brctl delif $al_bridge $PORT
-			echo "$PORT" >> $conn_ports_file
-			#ubus call network.interface.lan remove_device "{\"name\":\"$PORT\"}"
-		else
-			sed -i -E "/(^|:)${PORT}(:|$)/d" $conn_ports_file
-			#ubus call network.interface.lan add_device "{\"name\":\"$PORT\"}"
-			brctl addif $al_bridge $PORT
-			[ "$(cat $conn_ports_file | wc -c)" = "0" ] && rm -f $conn_ports_file
-		fi
-	fi
-
-	exit 0
-fi
-########################################################
-
-################ Dedicated ETH WAN Port ################
-wanport="$(db -q get hw.board.ethernetWanPort)"
-if [ -n "$wanport" ]; then
-	[ "$wanport" = "$PORT" ] || exit 0
-########################################################
-else
-#################### DHCP Discovery ####################
-	[ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
-
-	if [ "$LINK" = "up" ]; then
-		brctl delif $al_bridge $PORT
-
-		udhcpc -qnRoC -i $PORT >/dev/null 2>&1 && dhcp=1
-
-		brctl addif $al_bridge $PORT
-
-		[ $dhcp -eq 1 ] || exit 0
-	else
-		[ -f $map_bh_file ] || exit 0
-		cur_bh="$(cat $map_bh_file  | jsonfilter -e @.ifname)"
-		[ "$cur_bh" = "$PORT" ] || exit 0
-	fi
-########################################################
-fi
+[ -z "$wan" ] && exit 1 # no configuration
+[ "$PORT" != "$wan" ] && exit 0
 
 remove_from_bridge() {
 	config_get ifname "$section" ifname
-	[ -n "$ifname" ] && ubus call network.interface.${al_brnet} remove_device '{"name":"$ifname"}'
+
+	ubus call network.interface.$bridge remove_device '{"name":"$ifname"}'
 }
 
 update_bstas() {
-	section="$1"
-	action="$2"
+	local section="$1"
+	local action="$2"
+	local ifname onboarded
 
 	config_get ifname "$section" ifname
 	config_get_bool enabled "$section" enabled 0
@@ -90,16 +32,14 @@ update_bstas() {
 }
 
 if [ "$LINK" = "up" ]; then
-	#touch "$map_bh_file"
-	config_load "mapagent"
-	config_foreach remove_from_bridge bsta
-	config_foreach update_bstas bsta down
+	touch /tmp/map.agent.bsta_global_disable
 
-	/lib/wifi/multiap set_uplink "eth" "$PORT"
+	config_load "mapagent"
+	bridge=$(uci get mapagent.agent.al_bridge | cut -d '-' -f2)
+	config_foreach remove_from_bridge bk-iface $bridge
+	config_foreach update_bstas bk-iface down
 else
-	/lib/wifi/multiap unset_uplink "eth"
-	#rm -f "$map_bh_file"
+	rm -f /tmp/map.agent.bsta_global_disable
 	config_load "mapagent"
-	config_foreach update_bstas bsta up
-
+	config_foreach update_bstas bk-iface up
 fi

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

@@ -5,44 +5,32 @@ STOP=20
 
 USE_PROCD=1
 
-IS_CFG_VALID=1
-
 MAP_DEV="map_dev"
 MAP_IF="map"
+MAP_VETH="lei"
 
 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_DEV}.bridge_empty=1
 
 	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
+	ubus -t 5 wait_for network.device
 
-	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
+	ip link add ${MAP_VETH} type veth peer name ${MAP_VETH}_lan 2>/dev/null
+	brctl addif br-map ${MAP_VETH} 2>/dev/null
+	brctl addif br-lan ${MAP_VETH}_lan 2>/dev/null
+	ip link set ${MAP_VETH} up 2>/dev/null
+	ip link set ${MAP_VETH}_lan up 2>/dev/null
 }
 
 remove_map() {
@@ -58,164 +46,8 @@ remove_map() {
 	ubus call network reload
 }
 
-start_dynbhd_service() {
-	rm -f /tmp/multiap.backhaul
-	procd_open_instance
-	procd_set_param command "/usr/sbin/dynbhd"
-	procd_set_param respawn
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-}
-
-validate_agent_section() {
-	uci_validate_section mapagent agent "agent" \
-		'enabled:bool:true' \
-		'debug:range(0,16)' \
-		'profile:range(1,2):2' \
-		'brcm_setup:bool:false' \
-		'controller_macaddr:macaddr' \
-		'al_bridge:string' \
-		'netdev:string' \
-		'vlan_segregation:bool:false' \
-		'resend_num:uinteger:0' \
-		'dyn_cntlr_sync:bool:true' \
-		'island_prevention:bool:true'
-
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of agent section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_cs_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${section}" \
-		'local:bool:false' \
-		'id:string' \
-		'probe_int:range(0,1000):20' \
-		'retry_int:range(0,255):3' \
-		'autostart:bool:false'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of controller_select section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ap_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'ifname:string' \
-			'device:string' \
-			'band:or("2", "5")' \
-			'enabled:bool:true' \
-			'onboarded:bool:false' \
-			'ssid:string' \
-			'key:string' \
-			'encryption:string' \
-			'disallow_bsta_p1:bool:false' \
-			'disallow_bsta_p2:bool:false'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of ap section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_radio_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'device:string' \
-			'band:or("2", "5")' \
-			'configured:bool:false' \
-			'onboarded:bool:false' \
-			'dedicated_backhaul:bool:false' \
-			'steer_policy:range(0,255)' \
-			'util_threshold:range(0,255)' \
-			'rcpi_threshold:range(0,255)' \
-			'report_rcpi_threshold:range(0,255)' \
-			'include_sta_stats:bool:false' \
-			'include_sta_metric:bool:false' \
-			'rcpi_hysteresis_margin:range(0,255)' \
-			'report_util_threshold:range(0,255)'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of radio section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_policy_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'report_interval:range(0,255)' \
-			'pvid:uinteger' \
-			'report_interval:range(0,255)' \
-			'pcp_default:range(0,255)' \
-			'report_scan:bool' \
-			'report_sta_assocfails:bool' \
-			'report_sta_assocfails_rate:uinteger' \
-			'steer_exclude:list(macaddr)' \
-			'steer_exclude_btm:list(macaddr)' \
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of policy section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_dyn_bh_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'missing_bh_timer:range(1,255)'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of dynamic backhaul section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_agent_config() {
-	IS_CFG_VALID=1
-
-	validate_agent_section &&
-		config_foreach validate_cs_section controller_select &&
-		config_foreach validate_ap_section ap &&
-		config_foreach validate_radio_section radio &&
-		config_foreach validate_policy_section policy &&
-		config_foreach validate_dyn_bh_section dynamic_backhaul
-
-	[ "$IS_CFG_VALID" -ne 1 ] && {
-		logger -s -t "mapagent" "Validation of mapagent UCI file failed"
-		return 1
-	}
-	return 0
-}
-
 start_service() {
-	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
-
 	config_load "mapagent"
-	validate_agent_config || return 1;
 
 	ubus -t 5 wait_for wifi
 
@@ -230,7 +62,7 @@ start_service() {
 	[ "$ts" -eq 1 ] && create_map #|| remove_map
 
 	procd_open_instance
-	procd_set_param command "/usr/sbin/mapagent" "-d"
+        procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1

map-agent/files/lib/wifi/multiap

@@ -10,11 +10,7 @@
 . /usr/share/libubox/jshn.sh
 . /lib/wifi/traffic_separation
 
-MAPFILE="/tmp/multiap.backhaul"
-
 diff=0
-onbrd_bssid=0
-onbrd_band=0
 
 usage() {
 	cat <<EOF
@@ -29,42 +25,12 @@ 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() {
+brcm_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
@@ -81,17 +47,6 @@ sync_credentials() {
 		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() {
@@ -109,43 +64,12 @@ sync_credentials() {
 			fi
 		done
 
-		config_foreach mapagent_process_fh ap $device
+		config_foreach mapagent_process_fh fh-iface $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}
 	}
@@ -154,13 +78,13 @@ sync_credentials() {
 	config_foreach ieee1905_del_ap ap
 
 	config_load mapagent
-	config_foreach mapagent_process_radio radio
+	config_foreach mapagent_process_radio wifi-radio
 
 	uci commit ieee1905
-	json_cleanup
 }
 
-write_credentials() {
+
+brcm_write_credentials() {
 	config_load mapagent
 
 	mapagent_apply_wireless() {
@@ -192,10 +116,8 @@ write_credentials() {
 		local bk_ssid="$3"
 		local bk_key="$4"
 
-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
 		config_get device $section device
+		config_get multi_ap $section multi_ap "0"
 
 		#echo found dev=$dev device=$device map=$multi_ap
 
@@ -214,10 +136,8 @@ write_credentials() {
 		local section=$1
 		local dev=$2
 
-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
 		config_get device $section device
+		config_get multi_ap $section multi_ap "0"
 		config_get enabled $section enabled "1"
 
 		#echo found dev=$dev device=$device map=$multi_ap
@@ -231,7 +151,7 @@ write_credentials() {
 
 		#echo found ssid="$ssid" key="$key"
 
-		config_foreach mapagent_find_fbss ap $dev "$ssid" "$key"
+		config_foreach mapagent_find_fbss fh-iface $dev "$ssid" "$key"
 	}
 
 	mapagent_process_radio() {
@@ -241,16 +161,16 @@ write_credentials() {
 
 		#echo found dev=$dev
 
-		config_foreach mapagent_find_bbss ap $device
+		config_foreach mapagent_find_bbss fh-iface $device
 	}
 
 
-	config_foreach mapagent_process_radio radio
+	config_foreach mapagent_process_radio wifi-radio
 
 	uci commit wireless
 }
 
-set_network() {
+brcm_set_network() {
 	local ifname=$1
 	local num=$2
 	local bssid=$3
@@ -280,7 +200,6 @@ write_bsta_config() {
 
 	#echo diff = $diff > /dev/console
 
-
 	config_load mapagent
 
 	mapagent_apply_wl_bsta() {
@@ -293,13 +212,7 @@ write_bsta_config() {
 
 			[ "$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
@@ -312,7 +225,6 @@ write_bsta_config() {
 		local section=$1
 		local bsta=$2
 
-
 		config_get ifname $section ifname
 		#echo bsta = $bsta > /dev/console
 
@@ -320,50 +232,22 @@ write_bsta_config() {
 		#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
-		}
+		[ "$ret" == "1" ] && diff=1
 	}
 
-	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
+	config_foreach mapagent_process_bk bk-iface $ifname
 
 	#echo result diff = $diff > /dev/console
 	[ "$diff" == "1" ] && {
-		config_foreach mapagent_apply_bssid_same_band bsta
-		#ubus call uci commit '{"config":"wireless"}'
+		ubus call uci commit '{"config":"wireless"}'
 		#echo reloading wireless > /dev/console
 	}
 
 }
 
-teardown_iface() {
+brcm_teardown_iface() {
 	config_load mapagent
 
 	local iface=$1
@@ -393,9 +277,6 @@ teardown_iface() {
 		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
@@ -410,13 +291,13 @@ teardown_iface() {
 	}
 
 
-	config_foreach mapagent_teardown_bss ap $iface
+	config_foreach mapagent_teardown_bss fh-iface $iface
 
 	uci commit wireless
 	uci commit mapagent
 }
 
-bsta_to_wireless() {
+brcm_bsta_to_wireless() {
 	config_load mapagent
 
 	mapagent_find_lowest_prio_onboarded() {
@@ -435,7 +316,7 @@ bsta_to_wireless() {
 		local sec=""
 		local prio="-1"
 
-		config_foreach mapagent_process_bk bsta
+		config_foreach mapagent_process_bk bk-iface
 		echo $sec
 	}
 
@@ -470,7 +351,7 @@ bsta_to_wireless() {
 				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'
+				#uci -q set wireless.${section}.disabled=$disabled
 
 				[ "$disabled" != "1" ] && return
 				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
@@ -508,7 +389,7 @@ bsta_to_wireless() {
 		config_get enabled $1 enabled "0"
 
 		if [ "$onboarded" = "0" ]; then
-			config_foreach mapagent_find_other_creds bsta $ifname $band $enabled
+			config_foreach mapagent_find_other_creds bk-iface $ifname $band $enabled
 		else
 			config_get ssid $1 ssid
 			config_get key $1 key
@@ -527,14 +408,13 @@ bsta_to_wireless() {
 #	sec=""
 #	prio=""
 #
-#	config_foreach mapagent_enable_best bsta $best
+#	config_foreach mapagent_enable_best bk-iface $best
 #	uci commit mapagent
 	config_load mapagent
 
-	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
+	diff=$(config_foreach mapagent_bsta_to_wireless bk-iface)
 
 #	[ "$diff" != "" ] && {
-
 		ubus call uci commit '{"config":"wireless"}'
 #	}
 }
@@ -629,38 +509,22 @@ sync_mapcontroller_from_wireless() {
 }
 
 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"
-	}
+	config_load mapagent
 
 	mapagent_enable_bk() {
 		config_get ifname $1 ifname
-		config_get band $1 band
 		config_get enabled $1 enabled
 
+		echo ifname $ifname enabled $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
+		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
 	}
 
-	config_load mapagent
-	config_foreach mapagent_onboarded_bands bsta
-	config_foreach mapagent_enable_bk bsta
+	config_foreach mapagent_enable_bk bk-iface
 }
 
 bsta_enable_all() {
@@ -671,7 +535,7 @@ bsta_enable_all() {
 
 	config_load mapagent
 
-	config_foreach mapagent_enable_bk bsta
+	config_foreach mapagent_enable_bk bk-iface
 	uci commit mapagent
 	bsta_scan_on_enabled
 }
@@ -730,10 +594,10 @@ bsta_disable_lower_priority() {
 
 	local bsta=$1
 
-	prio=$(config_foreach mapagent_get_priority bsta $bsta)
+	prio=$(config_foreach mapagent_get_priority bk-iface $bsta)
 	#echo bsta $bsta has prio $prio > /dev/console
 
-	config_foreach mapagent_disable_lower_bk bsta $bsta $prio
+	config_foreach mapagent_disable_lower_bk bk-iface $bsta $prio
 	uci commit mapagent
 
 #	ubus call uci commit '{"config":"wireless"}'
@@ -758,7 +622,7 @@ bsta_use_link() {
 
 	local bsta=$1
 
-	config_foreach mapagent_disable_bk bsta $bsta
+	config_foreach mapagent_disable_bk bk-iface $bsta
 }
 
 bsta_swap_to_link() {
@@ -770,69 +634,21 @@ bsta_swap_to_link() {
 	wpa_cli -i "$1" save_config > /dev/null
 }
 
-set_uplink_backhaul_info() {
-	local ul_1905id=$1
-	local ul_mac=$2
-
-	json_load "$(cat $MAPFILE)"
-	json_add_string "backhaul_device_id" "$ul_1905id"
-	json_add_string "backhaul_macddr" "$ul_mac"
-	json_dump > "$MAPFILE"
-	json_cleanup
-}
-
-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"
-	json_dump > "$MAPFILE"
-	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
-
-	rm -f "$MAPFILE" > /dev/null 2>&1
-}
 
 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;;
+	wireless_teardown) brcm_wireless_teardown;;
+	setup_network) brcm_setup_network;;
+	setup_wireless) brcm_setup_wireless;;
+	write_credentials) brcm_write_credentials;;
+	sync_credentials) brcm_sync_credentials;;
 	bsta_steer) bsta_steer $@;;
-	set_network) set_network $@;;
+	set_network) brcm_set_network $@;;
 	write_bsta_config) write_bsta_config $@;;
-	teardown_iface) teardown_iface $@;;
-	bsta_to_wireless) bsta_to_wireless $@;;
+	teardown_iface) brcm_teardown_iface $@;;
+	bsta_to_wireless) brcm_bsta_to_wireless $@;;
 	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
 	ts) ts_sub $@;;
 	bsta_enable_all) bsta_enable_all $@;;
@@ -840,9 +656,6 @@ case "$func" in
 	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

@@ -4,15 +4,11 @@
 
 ### Traffic Separation ###
 
-dbg() {
-	logger -t traffic_separation $@
-}
-
 ts_sub() {
 
 	ts_usage() {
 		cat <<EOF
-Usage: $0 [create|delete|populate|primary|reload]
+Usage: $0 [create|delete|populate]
 Traffic Separation related functions.
 create fh <iface> <vid>			- create vlan device and rules for wifi fronthaul
 create bh <iface> <vid> <profile>	- create vlan device and rules for wifi backhaul
@@ -20,7 +16,7 @@ create eth <iface> <vid> <pbits>	- create vlan device and rules for logical ethe
 delete <iface>				- delete vlan device
 populate eth <iface> <vid>		- add secondary network rules for logical ethernet interface
 primary get <iface>			- read primary VID for interface from driver (from Association Response frame IE)
-reload     				- reload network with new configuration
+     
 EOF
 	exit 1
 	}
@@ -30,102 +26,54 @@ EOF
 		echo $bridge
 	}
 
-	set_wireless_bridge() {
-		config_load wireless
-
-		_set_network() {
-			local sec=$1
-			local iface=$2
-			local bridge=$3
-
-			config_get ifname $sec ifname
-			[ "$iface" != "$ifname" ] && continue
-
-			config_get mode $sec mode
-			config_get multi_ap $sec multi_ap "0"
-			[ "$mode" = "sta" -a "$multi_ap" = "1" ] && continue
-
-			config_get network $sec network
-			local new_network=${bridge##br-}
-			if [ "$new_network" != "$network" ] ; then
-				uci -q set wireless.${sec}.network=${new_network}
-				uci commit wireless
-			fi
-
-			brctl addif $bridge $iface &> /dev/null
-		}
-
-		config_foreach _set_network wifi-iface ${1} ${2}
-	}
-
 	ts_create() {
 
 		_create_vlan_dev() {
 			iface=$1				# real iface
 			vid=$2					# Vlan ID
-			bridge=$3				# bridge iface should be connected
-			vlan_dev=$4
-
-			old_bridge="$(_get_bridge $iface)"	# bridge iface is connected to
+			bridge="$(_get_bridge $iface)"		# bridge iface is connected to
+			vlan_dev=${iface}_vlan${vid}		# name of vlan device to create
 
 			# remove interface from bridge if it is in one
-			[ -n "$old_bridge" ] && brctl delif $old_bridge $iface &> /dev/null
+			[ -n "$bridge" ] && brctl delif $bridge $iface &> /dev/null
 
-			# (re)create vlan device
-			ip link show $vlan_dev && vlanctl --if-delete $vlan_dev
+			# create vlan device
 			vlanctl --mcast --if-create-name $iface $vlan_dev --if $iface --set-if-mode-rg
 
-			vlanctl --if $iface --tx --tags 0 --default-miss-drop
-			vlanctl --if $iface --tx --tags 1 --default-miss-drop
-			vlanctl --if $iface --tx --tags 2 --default-miss-drop
-			vlanctl --if $iface --rx --tags 0 --default-miss-drop
-			vlanctl --if $iface --rx --tags 1 --default-miss-drop
-			vlanctl --if $iface --rx --tags 2 --default-miss-drop
-
 			# bring the vlan device up and add back to bridge if it was in one
-			brctl addif $bridge $vlan_dev &> /dev/null
+			[ -n "$bridge" ] && brctl addif $bridge $vlan_dev &> /dev/null
+			ip link set dev $vlan_dev up
+
+			echo $vlan_dev
 		}
 
 		ts_create_fh() {
 			iface=$1				# fh iface
 			vid=$2					# SSID specific (secondary) or primary vid
-			bridge=$3
 
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ]  || {
+			[ -n "$iface" ] && [ -n "$vid" ] || {
 				cat <<EOF
-Adding FH device requires IFACE, VID and bridge
+Adding FH device requires IFACE and VID.
 EOF
 				exit 1
 			}
 
 			# create vlan device
-			#set_wireless_bridge $iface $bridge
-
-			vlan_dev=${iface}_vlan${vid}
-			ip link set $vlan_dev down
-			_create_vlan_dev $iface $vid $bridge $vlan_dev
+			vlan_dev=$(_create_vlan_dev $iface $vid)
 
 			# add rules
+			# Note: removing these for now since these packets are read directly from the iface anyway
+#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x888e --set-rxif $vlan_dev --rule-append		# incoming EAPOL
 #			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x886c --set-rxif $vlan_dev --rule-append		# incoming brcm
-
-			# EAPOL frames
-			vlanctl --if $iface --rx --tags 0 --filter-ethertype 34958 --set-rxif $vlan_dev --rule-append
-			vlanctl --if $iface --rx --tags 1 --filter-ethertype 34958 --pop-tag --set-rxif $vlan_dev --rule-append
-			vlanctl --if $iface --tx --tags 0 --filter-txif $vlan_dev --filter-ethertype 34958 --rule-append
-
-			# 8021q vlan id TAG/UNTAG
 			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
 			vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --filter-vid $vid 0 --pop-tag --dscp2pbits 0 --rule-append
-
-			ip link set $iface up
-			ip link set $vlan_dev up
 		}
 
+# Note: Currently not used (will be needed for Profile 1)
 		ts_create_bh() {
 			iface=$1				# bh iface
 			vid=$2					# primary vid
 			profile=$3				# agent profile (1 or 2)
-			bridge=$4				# bridge interface should be connected to
 
 			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
 				cat <<EOF
@@ -134,13 +82,40 @@ EOF
 				exit 1
 			}
 
-			#[ -n "$bridge" ] && set_wireless_bridge $iface $bridge
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
 
-			old_vid=$(wl -i $1 map_8021q_settings)
-			old_vid=${old_vid##* }
-			old_profile=$(wl -i $1 map_profile | cut -d ' ' -f 3)
+			# add rules
+			case "$profile" in
+				1 | profile_1 | profile1 | Profile_1 | Profile1)
+					vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
+					vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --pop-tag --rule-append
+					;;
+				2 | profile_2 | profile2 | Profile_2 | Profile2)
+					vlanctl --if $iface --rx --tags 1 --set-rxif $vlan_dev --rule-append
+					vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --rule-append								# note: already default
+					vlanctl --if $iface --tx --tags 0 --filter-ethertype 0x893a --filter-txif $vlan_dev --push-tag --set-vid $vid 0 --rule-append	# note: outgoing IEEE1905.1
+					vlanctl --if $iface --tx --tags 0 --filter-ethertype 0x888e --filter-txif $vlan_dev --push-tag --set-vid $vid 0 --rule-append	# note: outgoing EAPOL
+					;;
+				*)
+					ts_delete $iface
+					ts_usage
+					exit 1
+					;;
+			esac
+		}
 
-			[ "$old_vid" = "$vid" -a "$old_profile" = "$profile" ] && return
+		ts_create_bh_drv() {
+			iface=$1				# bh iface
+			vid=$2					# primary vid
+			profile=$3				# agent profile (1 or 2)
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
+				cat <<EOF
+Adding BH device requires IFACE, VID and PROFILE (1 or 2).
+EOF
+				exit 1
+			}
 
 			wl vlan_mode 0 &> /dev/null				# make sure this is OFF, else driver won't handle vlan
 			wl -i $iface down &> /dev/null
@@ -149,118 +124,53 @@ EOF
 			wl -i $iface up &> /dev/null
 		}
 
-		ts_create_lei() {
-			vid=$1					# primary vid
-			pbits=$2				# default pbits to apply
-			vlan_bridge=$3				# name of ts subsystem bridge
-			lan_bridge=$4				# name of node local bridge
+		ts_create_eth() {
 
-			[ -n "$vid" ] && [ -n "$pbits" ] && [ -n "$vlan_bridge" ] && [ -n "$lan_bridge" ] || {
-				cat <<EOF
-Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
-EOF
-				exit 1
+			_ts_setup() {
+				vlan_bridge=$1
+				lan_bridge=$2
+				vlan_dev=$3
+				lan_dev=${vlan_dev}_lan
+
+				ip link show $vlan_dev &> /dev/null || ip link add $vlan_dev type veth peer name $lan_dev
+				brctl addif $vlan_bridge $vlan_dev &> /dev/null
+				brctl addif $lan_bridge $lan_dev &> /dev/null
+				ip link set $vlan_dev up
+				ip link set $lan_dev up
 			}
 
-			ip link show lei &> /dev/null || {
-				ip link add link lei name lei_lan type vlan id 1 2>/dev/null
-			}
-
-			old_vid=$(ip -d link show lei_lan | sed -n 's/vlan.*id \([0-9][0-9]*\) .*/\1/p')
-
-			[ "$old_vid" != "$vid" ] && {
-				ip link del lei_lan
-				ip link add link lei name lei_lan type vlan id ${vid}
-			}
-
-			brctl addif ${lan_bridge} lei_lan &>/dev/null
-			brctl addif ${vlan_bridge} lei_map &>/dev/null
-
-			ip link set lei up
-			ip link set lei_map up
-			ip link set lei_lan up
-		}
-
-		_create_eth() {
 			iface=$1				# Multi-AP Logical Ethernet Interface
 			vid=$2					# primary vid
-			bridge=$3				# name of ts subsystem bridge
-			pbits=0
+			pbits=$3				# default pbits to apply
+			vlan_bridge=$4				# name of ts subsystem bridge
+			lan_bridge=$5				# name of node local bridge
 
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ] || {
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$pbits" ] && [ -n "$vlan_bridge" ] && [ -n "$lan_bridge" ] || {
 				cat <<EOF
 Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
 EOF
 				exit 1
 			}
 
-			dbg create $@
+			# create virtual eth device between bridges (if it doesn't exist))
+			_ts_setup $vlan_bridge $lan_bridge $iface
 
-			ip link set $iface down
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
 
-			vlan_dev=${iface}_vlan${vid}
-			ip link set $vlan_dev down
-			_create_vlan_dev $iface $vid $bridge $vlan_dev
+			# TODO: how to disable returning traffic back to incoming interface?
 
+			# add rules
 			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --set-pbits $pbits 0 --rule-append
 			vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --pop-tag --rule-append
-
-			[ $# -le 3 ] && exit 0
-			shift 3
-
-			while [ -n "$1" ] ; do
-				vid=$1
-				vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append
-				vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append
-				shift
-			done
-
-			ip link set $iface up
-			ip link set $vlan_dev up
-		}
-
-		ts_create_eths() {
-			pvid=$1					# primary vid
-			bridge=$2				# name of ts subsystem bridge
-
-			shift 2
-			# TODO use ieee1905 bridge
-			for iface in $(uci get network.br_lan.ports) ; do
-				[ "$iface" = "lei_lan" ] && continue
-				_create_eth $iface $pvid $bridge $@
-				ubus call ieee1905 del_interface "{\"ifname\":\"$iface\"}"
-			done
 		}
 
 		ts_create_dhcp() {
-			local diff=""
-
-                        _net_setup() {
-				local name=$1
-				local devname=$2
-				local vid=$3
-
-				[ -z "$(uci -q get network.${name})" ] && {
-					uci -q set network.${name}="interface"
-					uci -q set network.${name}.device="$devname"
-					uci -q set network.${name}.is_lan="1"
-					uci -q set network.${name}.proto="static"
-					# TODO vid > 255
-					local ip_addr="192.168.${vid}.1"
-					[ "${vid}" = "1" ] && ip_addr="192.168.${vid}.2"
-					uci -q set network.${name}.ipaddr="${ip_addr}"
-					uci -q set network.${name}.netmask="255.255.255.0"
-
-					diff="1"
-				}
-
-				[ "$diff" = "1" ] && uci -q commit network
-			}
-
 			_br_setup() {
 				local name=$1
 				local sinkname=$2
 				local vid=$3
+				local diff=""
 
 				[ -z "$(uci -q get network.${name}_dev)" ] && {
 					uci -q set network.${name}_dev="device"
@@ -283,7 +193,11 @@ EOF
 					diff="1"
 				}
 
-				[ "$diff" = "1" ] && uci -q commit network
+				[ "$diff" = "1" ] && {
+					uci -q commit network
+					ubus call network reload
+					ubus -t 5 wait_for network.device
+				}
 			}
 
 			_dhcp_setup() {
@@ -303,44 +217,43 @@ EOF
 				uci -q add_list dhcp.${name}.ra_flags="managed-config"
 				uci -q add_list dhcp.${name}.ra_flags="other-config"
 
-				diff="1"
 				uci -q commit dhcp
+				ubus call uci commit '{"config":"dhcp"}'
 			}
 
-			_firewall_setup() {
+			_wan_setup() {
 				local name=$1
-				local network=$2
-				local zone_exist=0
 
 				config_load firewall
 
 				_process_zone() {
 					local section=$1
-					local new_name=$2
+					local sink=$2
 					local name
+					local exists=false
 
 					config_get name $section name
 
-					[ "$name" == "$new_name" ] && zone_exist=1
+					[ "$name" == "lan" ] || return
+
+					_process_list() {
+						local value=$1
+
+						[ "$value" == "$sink" ] && exists=true && return 1
+					}
+
+					config_list_foreach "$section" network _process_list 
+
+					[ $exists = false ] && {
+						uci -q add_list firewall.${section}.network="${sink}"
+						uci -q commit firewall
+						ubus call uci commit '{"config":"firewall"}'
+					}
+
+					return 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"
-
-				diff="1"
-				uci -q commit firewall
 			}
 
 			vid=$1					# primary vid
@@ -352,26 +265,20 @@ EOF
 				exit 1
 			}
 
-			ip link show sink${vid} || {
-				ip link add sink${vid} type veth peer name sink${vid}_vlan
-				ip link add link sink${vid} name sink${vid}_peer type vlan id ${vid}
-			}
+			br_dev=sink_vlan${vid}			# name of vlan device to create
 
-			ip link set sink${vid} up
-			ip link set sink${vid}_peer up
-			ip link set sink${vid}_vlan up
 
-			diff=""
-			_net_setup sink${vid} sink${vid}_peer ${vid}
-			_dhcp_setup sink${vid}
-			_firewall_setup lan${vid} sink${vid}
+			ip l a sink1_vlan${vid} type veth peer name sink2_vlan${vid}
+			vlanctl --mcast --if-create-name sink2_vlan${vid} sink3_vlan${vid} --if sink2_vlan${vid} --set-if-mode-rg
+			vlanctl --if sink2_vlan${vid} --rx --tags 1 --filter-vid ${vid} 0 --set-rxif sink3_vlan${vid} --pop-tag --rule-append
+			vlanctl --if sink2_vlan${vid} --tx --tags 0 --filter-txif sink3_vlan${vid} --push-tag --set-vid ${vid} 0 --rule-append
+			ip l s sink1_vlan${vid} up
+			ip l s sink2_vlan${vid} up
+			ip l s sink3_vlan${vid} up
 
-			[ "$diff" = "1" ] && {
-				ubus call network reload
-				ubus -t 5 wait_for network.interface.sink${vid}
-			}
-
-			brctl addif br-map sink${vid}_vlan &> /dev/null
+			_br_setup $br_dev sink3_vlan${vid} $vid
+			_dhcp_setup $br_dev
+			_wan_setup $br_dev
 		}
 
 	local type=$1
@@ -379,9 +286,9 @@ EOF
 
 	case "$type" in
 		fh) ts_create_fh $@;;
-		bh) ts_create_bh $@;;
-		lei) ts_create_lei $@;;
-		eths) ts_create_eths $@;;
+#		bh) ts_create_bh $@;;
+		bh) ts_create_bh_drv $@;;
+		eth) ts_create_eth $@;;
 		dhcp) ts_create_dhcp $@;;
 		--help|help) ts_usage;;
 		*) ts_usage; exit 1;;
@@ -393,15 +300,12 @@ EOF
 
 		path=$(ls -d /sys/class/net/${iface}/upper_*)
 		[ -z "$path" ] && exit 0
-
 		vlan_dev=${path##*upper_}
 		bridge="$(_get_bridge $vlan_dev)"
 
-		[ -n "$bridge" ] && {
-			vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
-			brctl addif $bridge $iface &> /dev/null # needed to add again
-                }
+		vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
 
+		brctl addif $bridge $iface &> /dev/null
 	}
 
 	ts_populate() {
@@ -423,8 +327,8 @@ EOF
 		vlan_dev=${path##*upper_}
 
 		# add rules
-		#vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append		# note: retain secondary vids
-		#vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append		# note: already default
+		vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append		# note: retain secondary vids
+		vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append		# note: already default
 	}
 
 	ts_primary() {
@@ -461,50 +365,16 @@ EOF
 		ebtables -t broute -I BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
 	}
 
-	ts_reload() {
-		local dhcp_reload=$1
-
-		# workaround for missing backhaul wifi.ap.* ubus obj's:
-		# iterate in config and setup bh
-		config_load wireless
-
-		_setup_bh_iface() {
-			local sec=$1
-			local iface=$2
-			local bridge=$3
-
-			config_get ifname $sec ifname
-
-			config_get mode $sec mode
-			config_get multi_ap $sec multi_ap "0"
-			[ "$mode" = "ap" -a "$multi_ap" = "1" ] && {
-				ts_create bh $ifname 1 2 br-map
-			}
-		}
-
-		config_foreach _setup_bh_iface wifi-iface
-
-		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
-
-		# another workaround for netif? removed
-		# sink devices for br-map bridge
-		for sink in $(ubus list network.interface.sink*) ; do
-			local sink_vlan=${sink/network.interface./}_vlan
-			brctl addif br-map $sink_vlan &> /dev/null
-		done
-	}
-
 	local func=$1
 	shift
 
 	case "$func" in
-		create) dbg "create $@"; ts_create $@;;
-		delete) dbg "delete $@"; ts_delete $@;;
-		populate) dbg "populate $@"; ts_populate $@;;
-		primary) dbg "primary $@"; ts_primary $@;;
-		unicast) dbg "unicast $@"; ts_unicast $@;;
-		multicast) dbg "multicast $@"; ts_multicast $@;;
-		reload) dbg "reload $@"; ts_reload $@;;
+		create) ts_create $@;;
+		delete) ts_delete $@;;
+		populate) ts_populate $@;;
+		primary) ts_primary $@;;
+		unicast) ts_unicast $@;;
+		multicast) ts_multicast $@;;
 		--help|help) ts_usage;;
 		*) ts_usage; exit 1;;
 	esac

map-controller/Config.in

@@ -1,10 +0,0 @@
-if (PACKAGE_map-controller)
-
-menu "Configurations"
-
-config CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
-	bool "Support Dynamic Controller configuration sync"
-	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
-
-endmenu
-endif

map-controller/Makefile

@@ -5,20 +5,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.18
+PKG_VERSION:=5.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4029fa48a18e3a6c8af3a2478558e74184fd1786
+PKG_SOURCE_VERSION:=40fbe4dfd9634bf06e0cab1cb2fc6a811487b5b4
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
-endif
+
+
+PKG_BUILD_DEPENDS:=map-plugin
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,7 +34,7 @@ define Package/map-controller/description
 endef
 
 define Package/map-controller/config
-	source "$(SOURCE)/Config.in"
+	#source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
@@ -44,10 +44,6 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
-ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
-TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
-endif
-
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
@@ -55,10 +51,4 @@ define Package/map-controller/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/map-controller/ $(PKG_BUILD_DIR)/
-endef
-endif
-
 $(eval $(call BuildPackage,map-controller))

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

@@ -5,8 +5,6 @@ STOP=20
 
 USE_PROCD=1
 
-IS_CFG_VALID=1
-
 handle_controller_select() {
 	local section="$1"
 
@@ -14,122 +12,10 @@ handle_controller_select() {
 	return 1
 }
 
-validate_controller_section() {
-	uci_validate_section mapcontroller controller "controller" \
-		'enabled:bool:true' \
-		'registrar:string' \
-		'debug:range(0,16)' \
-		'resend_num:uinteger:0' \
-		'enable_sta_steer:bool:false' \
-		'enable_bsta_steer:bool:false' \
-		'use_bcn_metrics:bool:false' \
-		'use_usta_metrics:bool:false'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of controller section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ap_section() {
-	local section="$1"
-
-	uci_validate_section mapcontroller $section "${1}" \
-			'band:or("2", "5")' \
-			'ssid:string' \
-			'encryption:or("sae", "sae+aes", "psk2",
-				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
-			'key:string' \
-			'vid:range(1,65535):1' \
-			'type:or("backhaul", "fronthaul", "combined")' \
-			'disallow_bsta:list(range(0,255)):0' \
-			'enabled:bool:true'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of ap section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_node_section() {
-	local section="$1"
-
-	uci_validate_section mapcontroller $section "${1}" \
-			'agent_id:macaddr' \
-			'backhaul_ul_macaddr:macaddr' \
-			'backhaul_dl_macaddr:macaddr' \
-			'backhaul_type:or("none")' \
-			'primary_vid:range(0,255):1' \
-			'primary_pcp:range(0,255):0' \
-			'report_sta_assocfails:bool:false' \
-			'report_sta_assocfails_rate:uinteger' \
-			'report_metric_periodic:range(0,255)' \
-			'report_scan:bool:false' \
-			'steer_exclude:list(macaddr)' \
-			'steer_exclude_btm:list(macaddr)' \
-			'steer_disallow:bool:false' \
-			'coordinated_cac:bool:false' \
-			'traffic_separation:bool:false' \
-			'sta_steer:bool:false'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of node section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_radio_section() {
-	local section="$1"
-
-	uci_validate_section mapcontroller $section "${1}" \
-			'agent_id:macaddr' \
-			'macaddr:macaddr' \
-			'band:or("2", "5")' \
-			'steer_policy:range(0,2)' \
-			'util_threshold:range(0,255)' \
-			'rcpi_threshold:range(0,255)' \
-			'report_rcpi_threshold:range(0,255)' \
-			'report_util_threshold:range(0,255)' \
-			'report_rcpi_hysteresis_margin:range(0,255)' \
-			'include_sta_stats:bool:false' \
-			'include_sta_metric:bool:false'
-
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of radio section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_controller_config() {
-	IS_CFG_VALID=1
-
-	validate_controller_section &&
-		config_foreach validate_ap_section ap &&
-		config_foreach validate_node_section node &&
-		config_foreach validate_radio_section radio
-
-	[ "$IS_CFG_VALID" -ne 1 ] && {
-		logger -s -t "mapcontroller" "Validation of mapcontroller UCI file failed"
-		return 1
-	}
-	return 0
-}
-
 start_service() {
 	local enabled
 
 	config_load "mapcontroller"
-	validate_controller_config || return 1;
-
 	config_get_bool enabled controller enabled 1
 	[ "$enabled" -eq 0 ] && return
 

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=3.2.12
+PKG_VERSION:=3.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=dc59897b52ed1406175cd9314759c00aa12ed0a4
+PKG_SOURCE_VERSION:=6070844e380d492e09d0b690584af1693a158994
 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
@@ -30,9 +30,7 @@ define Package/map-topology
 endef
 
 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
+	-I$(STAGING_DIR)/usr/include
 
 define Package/map-topology/description
 	Constructs network topology and show it as json structure over UBUS

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

@@ -5,72 +5,7 @@ STOP=21
 
 USE_PROCD=1
 
-IS_CFG_VALID=1
-
-validate_topology_config() {
-	uci_validate_section topology topology "topology" \
-			'enabled:bool:true' \
-			'depth:range(0,16)' \
-			'interval:range(0,65535)' \
-			'maxlog:range(0,128)' \
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "topology" "Validation of topology UCI file failed"
-		return 1
-	}
-	return 0
-}
-
-validate_global_section() {
-	uci_validate_section hosts global "global" \
-		'ageing_timer:uinteger' \
-		'reboot_persistent:bool'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "hosts" "Validation of global section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_host_section() {
-	local section="$1"
-
-	uci_validate_section hosts $section "${1}" \
-			'macaddr:macaddr' \
-			'interface_type:or("wifi","eth")' \
-			'active:bool' \
-			'active_last_change:string'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "hosts" "Validation of host section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_hosts_config() {
-	IS_CFG_VALID=1
-
-	validate_global_section &&
-		config_foreach validate_host_section host
-
-	[ "$IS_CFG_VALID" -ne 1 ] && {
-		logger -s -t "topology" "Validation of hosts UCI file failed"
-		return 1
-	}
-	return 0
-}
-
 start_service() {
-	config_load "topology"
-	validate_topology_config || return 1;
-
-	config_load "hosts"
-	validate_hosts_config || return 1;
-
 	procd_open_instance
         procd_set_param command "/usr/sbin/topologyd"
 	procd_set_param respawn

mcastmngr/files/lib/mcast/broadcom.sh

@@ -59,6 +59,9 @@ mld_p_up_interfaces=""
 mld_p_down_interfaces=""
 mld_p_exceptions=""
 
+# Standard parameters need by BCM's multicast daemon
+allow_brdevice=0
+
 proxdevs=""
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 
@@ -167,36 +170,6 @@ config_mcast_querier_params() {
 	echo "${protocol}-last-member-query-interval $last_mem_q_int" >> $CONFFILE
 }
 
-config_snooping_upstream_interface() {
-	local snooping_upstream_intf=""
-
-	json_load "$(devstatus $1)"
-	logger -t "mcastconf" "$(devstatus $1)"
-	itr=1
-	json_select bridge-members
-
-	# loop over the bridge and find the device on wan port
-	while json_get_var dev $itr; do
-		case "$dev" in
-			*.*)
-				port="$(echo "$dev" | cut -d'.' -f 1)"
-				if [ $port == $ethwan ]; then
-					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
-				fi
-				;;
-		esac
-		itr=$(($itr + 1))
-	done
-	json_select ..
-
-	# if none of the bridge members are on wan port, set the wan port itself
-	if [ -n "$snooping_upstream_intf" ]; then
-		echo "upstream-interface $snooping_upstream_intf" >>$CONFFILE
-	else
-		echo "upstream-interface $ethwan" >>$CONFFILE
-	fi
-}
-
 config_snooping_on_bridge() {
 	local protocol="$1"
 	local bcm_mcast_p=1
@@ -214,6 +187,39 @@ config_snooping_on_bridge() {
 	done
 }
 
+handle_bridged_proxy_interface() {
+	local p2="$1"
+	local p_enable=0
+
+	if [ "$p2" == "igmp" ]; then
+		p_enable=$igmp_p_enable
+	else
+		p_enable=$mld_p_enable
+	fi
+
+	if [ $p_enable -eq 1 -a $allow_brdevice -eq 1 ]
+	then
+		proxdevs="$proxdevs $2"
+		echo "upstream-interface $2" >>$CONFFILE
+	else
+		json_load "$(devstatus $2)"
+		itr=1
+		json_select bridge-members
+		while json_get_var dev $itr; do
+			case "$dev" in
+				*.*)
+					port="$(echo "$dev" | cut -d'.' -f 1)"
+					if [ $port == $ethwan ]; then
+						ifconfig $dev | grep RUNNING >/dev/null && proxdevs="$proxdevs $dev" && break
+					fi
+					;;
+			esac
+			itr=$(($itr + 1))
+		done
+		json_select ..
+	fi
+}
+
 config_mcast_proxy_interface() {
 	local itr
 	local p1="$1"
@@ -228,8 +234,7 @@ config_mcast_proxy_interface() {
 	for proxif in $2; do
 		case "$proxif" in
 			br-*)
-				proxdevs="$proxdevs $proxif"
-				echo "upstream-interface $proxif" >>$CONFFILE
+				handle_bridged_proxy_interface $p1 $proxif
 			;;
 			*)
 				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
@@ -241,12 +246,7 @@ config_mcast_proxy_interface() {
 		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
 	fi
 
-	# if proxdevs is empty set the wan port as mcast-interface
-	if [ -n "$proxdevs" ]; then
-		echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
-	else
-		echo "${p1}-mcast-interfaces $ethwan" >> $CONFFILE
-	fi
+	[ -n "$proxdevs" ] && echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
 }
 
 configure_mcpd_snooping() {
@@ -259,14 +259,14 @@ configure_mcpd_snooping() {
 	if [ "$protocol" == "igmp" ]; then
 		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
 		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
-		config_snooping_upstream_interface "$igmp_s_iface"
+		config_mcast_proxy_interface $protocol "$igmp_s_iface"
 		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
 		exceptions=$igmp_s_exceptions
 		fast_leave=$igmp_s_fast_leave
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
 		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
-		config_snooping_upstream_interface "$mld_s_iface"
+		config_mcast_proxy_interface $protocol "$mld_s_iface"
 		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
 		exceptions=$mld_s_exceptions
 		fast_leave=$mld_s_fast_leave
@@ -458,7 +458,7 @@ read_mcast_stats() {
 		case $line in
 		br-*)
 			found_ip=0
-			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
+			grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
 			if [ -z "$mcast_addrs" ]; then
 				mcast_addrs="$grp_ip"
 				continue
@@ -510,7 +510,7 @@ read_mcast_stats() {
 					if [ "$snoop_iface" != "$intf" ]; then
 						continue
 					fi
-					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
+					grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
 					if [ "$grp_ip" != "$gip_addr" ]; then
 						continue
 					fi
@@ -523,12 +523,12 @@ read_mcast_stats() {
 					fi
 
 					json_add_object ""
-					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
+					host_ip="$(echo $line | awk -F ' ' '{ print $13 }')"
 					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
 					json_add_string "ipaddr" "$h_ip"
 					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
 					json_add_string "device" "$src_port"
-					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
+					timeout="$(echo $line | awk -F ' ' '{ print $14 }')"
 					json_add_int "timeout" "$timeout"
 					json_close_object #close the associated device object
 					;;

mqtt-ciotc/Makefile

@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2020 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=mqtt-ciotc
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=00da3fb1f1691d836037dc4d93e38d0835ba46a4
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifilife-testbed.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(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:=Apache-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mqtt-ciotc
+	CATEGORY:=Utilities
+	DEPENDS:=+libjwt +lib-paho-mqtt +libopenssl +libubox +ubus +libblobmsg-json
+	TITLE:=mqtt google iot clinet
+endef
+
+define Package/mqtt-ciotc/description
+	mqtt google iot client
+endef
+
+define Package/mqtt-ciotc/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mqtt_ciotc $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,mqtt-ciotc))

mqtt-ciotc/files/etc/config/mqtt_ciotc

@@ -0,0 +1,3 @@
+config certs 'certs'
+	option private '/etc/mqtt-ciotc/rsa_private.pem'
+	option root '/etc/mqtt-ciotc/roots.pem'

mqtt-ciotc/files/etc/init.d/mqtt_ciotc

@@ -0,0 +1,35 @@
+#!/bin/sh /etc/rc.common
+
+START=96
+STOP=10
+PROG=/sbin/mqtt_ciotc
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	config_load mqtt_ciotc
+	config_get private certs private
+	config_get root certs root
+
+	[ -n $private ] && procd_append_param command --private-cert $private
+	[ -n $root ] && procd_append_param command --root-cert $root
+	procd_set_param respawn
+	procd_close_instance
+}
+
+stop_service()
+{
+	service_stop ${PROG}
+}
+
+reload_service() {
+#	procd_send_signal wifilife # use SIGHUP
+	stop
+	start
+}
+
+service_triggers() {
+        procd_add_reload_trigger "mqtt_ciotc"
+}

netmode/Makefile

@@ -8,26 +8,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=0.3.0
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPL-2.0-only
+PKG_VERSION:=0.2.0
+
+PKG_SOURCE_VERSION:=5c8abbdf86e4651c7c6f14f784cfb52e69979f96
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(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
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netmode
-  CATEGORY:=Utilities
-  TITLE:=Network Modes and Utils
+	CATEGORY:=Base system
+	DEPENDS:=+fping +ubus +libubox +libuci
+	TITLE:=Predefined Network Modes
 endef
 
 define Package/netmode/description
-	Network Modes and Utils
-endef
-
-define Build/Compile
+	Predefined Network Modes
 endef
 
 define Package/netmode/install
 	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netmoded $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,netmode))

netmode/files/etc/config/netmode

@@ -1,10 +1,8 @@
-config netmode global
-	option enabled 0
+config netmoded 'netmoded'
+	option enabled '0'
+
+config setup 'setup'
+	option enabled '0'
+        option dir '/etc/netmodes'
 #	option mode 'router'
 
-#config testnet testnet
-#	option enabled 1
-#	option destination '8.8.8.8'
-	
-#config shiftrange shiftrange
-#	option enabled 1

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

@@ -1,16 +1,16 @@
 #!/bin/sh
 
-# do not start testnet if the feature is explicitly disabled
-[ "$(uci -q get netmode.testnet.enabled)" = "0" ] && exit 0
-
 [ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 0
 
 interface_check() {
-	[ "$(uci -q get network.$INTERFACE.is_lan)" = "1" ] && exit 0
+	local islan="$(uci -q get network.$INTERFACE.is_lan)"
+	[ "$islan" == "1" ] && exit 0
 
-	[ "$(uci -q get network.$INTERFACE.proto)" = "none" ] && exit 0
+	local proto="$(uci -q get network.$INTERFACE.proto)"
+	[ "$proto" == "none" ] && exit 0
 
-	[ "$(uci -q get network.$INTERFACE.defaultroute)" = "0" ] && exit 0
+	local defroute="$(uci -q get network.$INTERFACE.defaultroute)"
+	[ "$defroute" == "0" ] && exit 0
 }
 
 interface_check
@@ -19,3 +19,4 @@ if [ -n "$(pgrep -f testnet)" ]; then
 else
 	testnet &
 fi
+

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

@@ -2,9 +2,6 @@
 # this scripts shifts the lan network prefixes
 # if a wan interface has the same network prefix.
 
-# do not shift range if the feature is explicitly disabled
-[ "$(uci -q get netmode.shiftrange.enabled)" == "0" ] && exit 0
-
 . /lib/functions.sh
 . /lib/functions/network.sh
 

netmode/files/etc/init.d/netmode

@@ -3,72 +3,44 @@
 START=10
 USE_PROCD=1
 
+NETMODED="/sbin/netmoded"
+
 . /lib/functions.sh
+. /lib/functions/netmode.sh
 
-MODEDIR="/etc/netmodes"
+start_netmoded() {
+	config_load netmode
 
-libnetmode_exec() {
-	when="$1"
-	# Execute /lib/netmode scripts
-	if [ -d /lib/netmode/$when ]; then
-		logger -s -p user.info -t "netmode" "Executing /lib/netmode/$when scripts"
-		for script in $(ls /lib/netmode/$when/); do
-			sh /lib/netmode/$when/$script
-		done
+        config_get enabled netmoded enabled 0
+        if [ "$enabled" != "1" ]; then
+		return
 	fi
+
+	procd_open_instance
+	procd_set_param command $NETMODED
+
+	procd_append_param command --verbose warning -i macaddr
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+
+	procd_set_param respawn
+	procd_close_instance
 }
 
 start_service() {
-	[ -f /etc/config/netmode ] || return
+	populate_netmodes
 
-	config_load netmode
+	start_netmoded
+}
 
-	config_get_bool enabled global enabled '0'
-	[ $enabled -eq 0 ] && return
+reload_service() {
+        switch_netmode
 
-	# Get the desired netmode from config
-	config_get mode global mode
-	# Check if netmode is set as boot environment parameter
-	[ -n "$mode" ] || mode="$(fw_printenv -n netmode 2>/dev/null)"
-	# Return if mode is not set
-	[ -n "$mode" ] || return
-
-	# Get the last saved mode
-	lastmode="$(cat $MODEDIR/.last_mode 2>/dev/null)"
-	# Return if desired mode is same as last saved mode
-	[ "$mode" == "$lastmode" ] && return
-
-	# Save mode as last mode
-	[ -d $MODEDIR ] || mkdir -p $MODEDIR
-	echo "$mode" > $MODEDIR/.last_mode
-
-	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
-
-	# Execute netmode generic pre-mode-switch scripts
-	libnetmode_exec "pre"
-
-	# Copy netmode UCI config files
-	if [ -d $MODEDIR/$mode/uci ]; then
-		logger -s -p user.info -t "netmode" "Copying $MODEDIR/$mode/uci/* to /etc/config/"
-		cp $MODEDIR/$mode/uci/* /etc/config/ 2>/dev/null
-	fi
-
-	# Execute netmode generic scripts
-	libnetmode_exec
-
-	# Execute mode specific scripts
-	if [ -d $MODEDIR/$mode/scripts ]; then
-		logger -s -p user.info -t "netmode" "Executing $MODEDIR/$mode/scripts/* scripts"
-		for script in $(ls $MODEDIR/$mode/scripts/); do
-			sh $MODEDIR/$mode/scripts/$script
-		done
-	fi
-
-	# Execute netmode generic post-mode-switch scripts
-	libnetmode_exec "post"
+	start_netmoded
 }
 
 service_triggers()
 {
 	procd_add_reload_trigger netmode
 }
+

netmode/files/etc/netmodes/bridge/DETAILS

@@ -0,0 +1,9 @@
+{
+	"description": [
+		{ "en" : "Bridge Mode" }
+	],
+	"explanation": [
+		{ "en" : "NAT is disabled." }
+	],
+	"reboot" : 0
+}

netmode/files/etc/netmodes/bridge/scripts/pre/bridge_mode.sh

@@ -0,0 +1,92 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+BRIDGEPORTS=""
+
+get_vlan() {
+	local device="$1"
+	for section in $(uci show network | grep "=device" | cut -d '=' -f1); do
+		if [ "$(uci -q get $section.ifname)" == "$device" ]; then
+			uci -q get $section.name
+			break
+		fi
+	done
+}
+
+add_wifi_devs()
+{
+
+	add_wdev()
+	{
+		local cfg=$1
+#		local disabled
+
+#		config_get_bool disabled $cfg disabled 0
+#		config_get_bool ifname $cfg ifname
+	
+#		if [ $disabled -eq 0 -a -n "$ifname" ]; then
+#			BRIDGEPORTS="$ifname"
+#		fi
+
+		uci -q set wireless.$cfg.network="wan"
+	}
+
+	config_load wireless
+	config_foreach add_wdev "wifi-iface"
+
+	uci -q commit wireless
+}
+
+add_xtm_devs() {
+	local section device vlan
+
+	for section in $(uci show dsl | grep "=.*tm-device" | cut -d'=' -f1); do
+		if [ -n "$(uci -q get $section.device)" ]; then
+
+			vlan="$(get_vlan $device)"
+			[ -n "$vlan" ] && device="$vlan"
+		
+			if [ -n "$device" ]; then
+				BRIDGEPORTS="$BRIDGEPORTS $device"
+			fi
+
+		fi
+	done
+}
+
+add_eth_ports() {
+
+	add_port()
+	{
+		local cfg=$1
+		local ifname vlan
+
+		config_get ifname $cfg ifname
+
+		vlan="$(get_vlan $ifname)"
+		[ -n "$vlan" ] && ifname="$vlan"
+	
+		if [ -n "$ifname" ]; then
+			BRIDGEPORTS="$BRIDGEPORTS $ifname"
+		fi
+	}
+
+	config_load ports
+	config_foreach add_port "ethport"
+}
+
+add_xtm_devs
+add_eth_ports
+add_wifi_devs
+
+BRIDGEPORTS="$(echo $BRIDGEPORTS | sed -e 's/[[:space:]]*$//')"
+
+uci -q set network.wan.type="bridge"
+uci -q set network.wan.ifname="$BRIDGEPORTS"
+uci -q set network.wan6.ifname="@wan"
+uci -q delete network.lan.ifname
+
+ubus call uci commit '{"config":"network"}'
+

netmode/files/etc/netmodes/router/DETAILS

@@ -0,0 +1,9 @@
+{
+	"description": [
+		{ "en" : "Router Mode" }
+	],
+	"explanation": [
+		{ "en" : "NAT is enabled." }
+	],
+	"reboot" : 0
+}

netmode/files/etc/netmodes/router/scripts/pre/router_mode.sh

@@ -0,0 +1,94 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+WANPORTS=""
+LANPORTS=""
+
+get_vlan() {
+	local device="$1"
+	for section in $(uci show network | grep "=device" | cut -d '=' -f1); do
+		if [ "$(uci -q get $section.ifname)" == "$device" ]; then
+			uci -q get $section.name
+			break
+		fi
+	done
+}
+
+add_wifi_devs()
+{
+
+	add_wdev()
+	{
+		local cfg=$1
+
+		config_get mode $cfg mode "ap"
+
+		if [ "$mode" == "ap" ]; then
+			uci -q set wireless.$cfg.network="lan"
+		fi
+	}
+
+	config_load wireless
+	config_foreach add_wdev "wifi-iface"
+
+	uci -q commit wireless
+}
+
+add_xtm_devs() {
+	local section device vlan
+
+	for section in $(uci show dsl | grep "=.*tm-device" | cut -d'=' -f1); do
+		device="$(uci -q get $section.device)"
+
+		if [ -n "$device" ]; then
+			vlan="$(get_vlan $device)"
+			[ -n "$vlan" ] && device="$vlan"
+
+			if [ -n "$device" ]; then
+				WANPORTS="$WANPORTS $device"
+			fi
+		fi
+	done
+}
+
+add_eth_ports() {
+
+	add_port()
+	{
+		local cfg=$1
+		local uplink ifname vlan
+
+		config_get ifname $cfg ifname
+		config_get_bool uplink $cfg uplink 0
+	
+		vlan="$(get_vlan $ifname)"
+		[ -n "$vlan" ] && ifname="$vlan"
+
+		if [ $uplink -eq 1 ]; then
+			WANPORTS="$WANPORTS $ifname"
+		else
+			LANPORTS="$LANPORTS $ifname"
+		fi
+	}
+
+	config_load ports
+	config_foreach add_port "ethport"
+}
+
+add_xtm_devs
+add_eth_ports
+add_wifi_devs
+
+WANPORTS="$(echo $WANPORTS | sed -e 's/[[:space:]]*$//')"
+LANPORTS="$(echo $LANPORTS | sed -e 's/[[:space:]]*$//')"
+
+uci -q set network.wan.type="anywan"
+uci -q set network.wan.ifname="$WANPORTS"
+uci -q set network.wan6.ifname="@wan"
+uci -q set network.lan.type="bridge"
+uci -q set network.lan.ifname="$LANPORTS"
+
+ubus call uci commit '{"config":"network"}'
+

netmode/files/etc/uci-defaults/998-netmode-opreqs

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+add_owsd_ubusproxy_object_netmode() {
+	local netmd=$(uci -q get owsd.ubusproxy.object | grep netmode)
+	if [ -z "$netmd" ]; then
+		uci -q add_list owsd.ubusproxy.object="netmode"
+		uci commit owsd
+	fi
+}
+
+add_owsd_ubusproxy_object_netmode

netmode/files/lib/functions/netmode.sh

@@ -0,0 +1,150 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+MODEDIR=$(uci -q get netmode.setup.dir)
+
+[ -n "$MODEDIR" ] || MODEDIR="/etc/netmodes"
+
+run_netmode_scripts() {
+	local mode=$1
+	local when=$2
+	local script
+	local path
+
+	path=$(readlink -f /etc/netmodes/$mode/)
+	[ "${path:0:14}" == "/etc/netmodes/" ] || exit
+
+	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
+		logger -s -p user.info -t "netmode" "Executing $when netmode scripts" >/dev/console
+		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do
+			sh /etc/netmodes/$mode/scripts/$when/$script
+		done
+	fi
+}
+
+switch_netmode() {
+	[ -f /etc/config/netmode -a -d $MODEDIR ] || return
+
+	config_load netmode
+
+	local enabled
+	config_get_bool enabled setup enabled '0'
+	[ $enabled -eq 0 ] && return 
+
+	local mode
+	config_get mode setup mode
+
+	[ -d "/etc/netmodes/$mode" ] || return
+
+	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
+
+	run_netmode_scripts $mode "pre"
+
+	local reboot=$(uci -q get netmode.$mode.reboot)
+
+	if [ "$reboot" == "1" ]; then
+		#run_netmode_scripts $mode "post"
+		reboot &
+		exit
+	fi
+
+	#run_netmode_scripts $mode "post"
+}
+
+populate_netmodes() {
+	[ -f /etc/config/netmode -a -d $MODEDIR ] || return
+
+	config_load netmode
+
+	local enabled
+	config_get_bool enabled setup enabled '0'
+	[ $enabled -eq 0 ] && return 
+
+	delete_netmode() {
+		uci delete netmode.$1
+	}
+
+	config_foreach delete_netmode netmode
+	uci commit netmode
+
+	local hardware=$(db -q get hw.board.model_name)
+	local keys lang desc exp exclude support
+	for mode in $(ls $MODEDIR); do
+			lang=""
+			desc=""
+			exp=""
+			uci -q set netmode.$mode=netmode
+			json_load "$(cat $MODEDIR/$mode/DETAILS)"
+
+			if json_select excluded_boards; then
+				exclude=0
+				_i=1
+				while json_get_var board $_i; do
+					case "$hardware" in
+						$board)
+							uci -q delete netmode.$mode
+							exclude=1
+							break
+						;;
+					esac
+					_i=$((_i+1))
+				done
+				json_select ..
+				[ $exclude -eq 1 ] && continue
+			elif json_select supported_boards; then
+				support=0
+				_i=1
+				while json_get_var board $_i; do
+					case "$hardware" in
+						$board)
+							support=1
+							break
+						;;
+					esac
+					_i=$((_i+1))
+				done
+				json_select ..
+				[ $support -eq 1 ] || {
+					uci -q delete netmode.$mode
+					continue
+				}
+			fi
+
+			json_select description
+			json_get_keys keys
+			for k in $keys; do
+				json_get_keys lang $k
+				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
+				json_select $k
+				json_get_var desc $lang
+				uci -q set netmode.$mode."desc_$lang"="$desc"
+				[ "$lang" == "en" ] && uci -q set netmode.$mode."desc"="$desc"
+				json_select ..
+			done
+			json_select ..
+
+			json_select explanation
+			json_get_keys keys
+			for k in $keys; do
+				json_get_keys lang $k
+				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
+				json_select $k
+				json_get_var exp $lang
+				uci -q set netmode.$mode."exp_$lang"="$exp"
+				[ "$lang" == "en" ] && uci -q set netmode.$mode."exp"="$exp"
+				json_select ..
+			done
+			json_select ..
+
+			json_get_var cred credentials
+			uci -q set netmode.$mode.askcred="$cred"
+			json_get_var ulb uplink_band
+			uci -q set netmode.$mode.uplink_band="$ulb"
+			json_get_var reboot reboot
+			uci -q set netmode.$mode.reboot="$reboot"
+	done
+
+	uci commit netmode
+}

netmode/files/sbin/testnet

@@ -31,10 +31,7 @@ test_connection() {
 internet_test() {
 	local link dest
 
-	# use the destination address given in config for connectivity check
-	dest="$(uci -q get netmode.testnet.destination)"
-	# for backwards compatibility
-	[ -n "$dest" ] || dest="$(uci -q get diagnostics.@connectivity[0].destination)"
+	dest="$(uci -q get diagnostics.@connectivity[0].destination)"
 
 	test_connection $dest
 

obuspa/Config.in

@@ -2,24 +2,16 @@ if PACKAGE_obuspa
 
 menu "Configuration"
 
-config OBUSPA_DB_PATH
-	string "Configure path for usp.db file"
-	default "/tmp/"
-
-config OBUSPA_MTP_ENABLE_MQTT
-	bool "Enable MQTT as mtp protocol"
-	default y
-
-config OBUSPA_MTP_ENABLE_WEBSOCKETS
-	bool "Enable WebSockets as mtp protocol"
-	default y
-
 config OBUSPA_MTP_ENABLE_STOMP
 	bool "Enable STOMP as mtp protocol"
 	default y
 
+config OBUSPA_MTP_ENABLE_MQTT
+	bool "Enable MQTT as mtp protocol"
+	default y
+
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
-	default n
+	default y
 endmenu
 endif

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.7
+PKG_VERSION:=4.1.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=79958289d3b5c3ffd3bd0af62e493e1bac757e77
+PKG_SOURCE_VERSION:=a52205791ef71cb54fa468064075ff85c7f5a638
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -31,7 +31,7 @@ define Package/obuspa
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=USP agent
-  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto-ssl +libwebsockets-openssl
+  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto
 endef
 
 define Package/obuspa/description
@@ -44,14 +44,7 @@ endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-	-Wall \
-	-Werror
-
-ifneq ($(CONFIG_OBUSPA_DB_PATH),)
-  CONFIGURE_ARGS += \
-	--localstatedir="$(CONFIG_OBUSPA_DB_PATH)"
-endif
+	-D_GNU_SOURCE
 
 ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_STOMP),y)
   CONFIGURE_ARGS += \
@@ -77,14 +70,6 @@ else
 	--disable-coap
 endif
 
-ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_WEBSOCKETS),y)
-  CONFIGURE_ARGS += \
-	--enable-websockets
-else
-  CONFIGURE_ARGS += \
-	--disable-websockets
-endif
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
@@ -96,13 +81,13 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_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_BIN) ./files/etc/hotplug.d/iface/85-obuspa $(1)/etc/hotplug.d/iface/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,10 +1,9 @@
 config obuspa 'global'
 	option enabled '1'
-	option interface 'loopback'
-	#option ifname 'lo'
-	option debug '1'
+	option interface 'wan'
+	#option ifname 'eth0.1'
+	option debug '0'
 	option log_level '1'
-	option prototrace '0'
 	#option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
@@ -47,7 +46,7 @@ config subscription
 #	option Description 'Request to get Administrative access'
 #	option role_name 'full_access'
 #	option Enable '1'
-#	option Value 'YWRtaW4='
+#	option Value 'admin'
 #	option Retries 2
 #	option LockoutPeriod 60
 
@@ -55,6 +54,6 @@ config subscription
 #	option Description 'Request to get User access'
 #	option role_name 'user'
 #	option Enable '1'
-#	option Value 'dXNlcg=='
+#	option Value 'user'
 #	option Retries 3
 #	option LockoutPeriod 30

obuspa/files/etc/hotplug.d/iface/85-obuspa

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+[ "$(uci -q get obuspa.global.interface)" == "$INTERFACE" ] || exit 0
+
+[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
+[ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" ] && exit 0
+
+echo "Restarting obuspa"|logger -t obuspa.hotplug -p debug
+
+/etc/init.d/obuspa reload
+

obuspa/files/etc/init.d/obuspa

@@ -31,11 +31,11 @@ cleanup() {
 trap cleanup EXIT
 
 log() {
-	echo "$*"|logger -t obuspa.init -p debug
+	echo "${@}"|logger -t obuspa.init -p debug
 }
 
 db_set() {
-	if [ -n "${1}" ] && [ -n "${2}" ]; then
+	if [ -n "${1}" ]; then
 		echo "${1} \"${2}\"">>${PARAM_FILE}
 	else
 		echo >>${PARAM_FILE}
@@ -49,8 +49,9 @@ update_keep() {
 		return;
 	fi
 
-	if grep -q "${keep_file}" ${KEEP_FILES}; then
-		echo "${keep_file}" >> ${KEEP_FILES}
+	grep -q "${keep_file}" ${KEEP_FILES}
+	if [ "$?" -ne 0 ]; then
+		echo ${keep_file} >> ${KEEP_FILES}
 	fi
 }
 
@@ -62,12 +63,11 @@ get_index() {
 }
 
 get_role_index_from_json() {
-	local role="$*"
+	local role="${@}"
 	local num=0
-	local roles_obj
 
 	# In case of role is empty or file not present
-	if [ -z "${role}" ] || [ ! -f "${role_def_file}" ]; then
+	if [ -z "${role}" -o ! -f ${role_def_file} ]; then
 		return 0
 	fi
 
@@ -79,11 +79,11 @@ get_role_index_from_json() {
 
 	for k in ${roles_obj}; do
 		local rname
-		json_select "$k"
+		json_select $k
 		json_get_var rname name
 		json_select ..
 
-		if [ "${rname}" != "Untrusted" ] && [ "${rname}" != "full_access" ]; then
+		if [ "${rname}" != "Untrusted" -a "${rname}" != "full_access" ]; then
 			num=$(( num + 1 ))
 		fi
 
@@ -98,14 +98,14 @@ get_role_index_from_json() {
 get_uci_ref_index() {
 	local val;
 
-	[ -f "${USP_TEMP_FILE}" ] && rm -f ${USP_TEMP_FILE}
+	[ -f ${USP_TEMP_FILE} ] && rm -f ${USP_TEMP_FILE}
 
 	index=0
 	config_load $CONFIGURATION
-	config_foreach get_index "$1" "$2"
+	config_foreach get_index $1 $2
 	val=$(cat ${USP_TEMP_FILE})
 
-	if [ -z "${val}" ]; then
+	if [ -z $val ]; then
 		val=0
 	fi
 
@@ -121,9 +121,8 @@ validate_obuspa_section()
 		'trust_cert:file' \
 		'client_cert:file' \
 		'interface:string' \
-		'ifname:string' \
+		'ifname:string:br-lan' \
 		'debug:bool:false' \
-		'prototrace:bool:false' \
 		'log_level:uinteger' \
 		'log_dest:string' \
 		'db_file:string' \
@@ -134,6 +133,7 @@ validate_localagent_section()
 {
 	uci_validate_section ${CONFIGURATION} localagent "${1}" \
 		'Enable:bool:true' \
+		'ParameterName:string:Device.DeviceInfo.SoftwareVersion' \
 		'EndpointID:string'
 }
 
@@ -149,23 +149,15 @@ validate_controller_section()
 		'USPNotifRetryMinimumWaitInterval:uinteger:5' \
 		'USPNotifRetryIntervalMultiplier:uinteger:2000' \
 		'ControllerCode:string' \
-		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
+		'Protocol:or("STOMP","CoAP","MQTT")' \
 		'Reference:string' \
 		'Destination:string:controller-notify-dest' \
 		'Topic:string' \
-		'ParameterName:list(string)' \
 		'coap_host:host' \
 		'coap_path:string' \
 		'coap_port:port' \
 		'mqtt:string' \
-		'stomp:string' \
-		'Host:host' \
-		'Port:port' \
-		'Path:string' \
-		'EnableEncryption:bool' \
-		'KeepAliveInterval:uinteger' \
-		'SessionRetryIntervalMultiplier:uinteger' \
-		'SessionRetryMinimumWaitInterval:uinteger'
+		'stomp:string'
 }
 
 validate_subscription_section()
@@ -184,7 +176,7 @@ validate_mtp_section()
 {
 	uci_validate_section ${CONFIGURATION} mtp "${1}" \
 		'Enable:bool:true' \
-		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
+		'Protocol:or("STOMP","CoAP","MQTT")' \
 		'Reference:string' \
 		'ResponseTopicConfigured:string' \
 		'PublishQoS:uinteger' \
@@ -192,12 +184,7 @@ validate_mtp_section()
 		'coap_path:string' \
 		'coap_port:port' \
 		'mqtt:string' \
-		'stomp:string' \
-		'Path:string' \
-		'Port:port' \
-		'EnableEncryption:bool' \
-		'KeepAliveInterval:uinteger'
-
+		'stomp:string'
 }
 
 validate_stomp_connection_section()
@@ -235,69 +222,9 @@ validate_mqtt_client_section()
 		'ConnectRetryMaxInterval:uinteger:60'
 }
 
-validate_challenge_section()
-{
-	uci_validate_section ${CONFIGURATION} challenge "${1}" \
-		'Enable:bool:true' \
-		'Alias:string' \
-		'Description:string' \
-		'role_name:string' \
-		'Role:string' \
-		'Value:string' \
-		'Retries:uinteger:3' \
-		'LockoutPeriod:uinteger:0'
-}
-
-get_oui_from_db() {
-	db -q get device.deviceinfo.ManufacturerOUI
-}
-
-get_serial_from_db() {
-	db -q get device.deviceinfo.SerialNumber
-}
-
-publish_endpoint() {
-	local AgentEndpointID serial oui user pass
-
-	if ! uci -q get obuspa.localmqtt; then
-		log "Remote mqtt broker configured, skip publishing endpoint"
-		return 0;
-	fi
-
-	# return if mosquitto_pub is not present
-	if [ ! "$(command -v mosquitto_pub)" ]; then
-		log "mosquitto_pub not present can't publish EndpointID"
-		return 0;
-	fi
-
-	# Get endpoint id from obuspa config first
-	config_load obuspa
-	config_get AgentEndpointID localagent EndpointID ""
-	if [ -z "${AgentEndpointID}" ]; then
-		serial=$(get_serial_from_db)
-		oui=$(get_oui_from_db)
-		AgentEndpointID="os::${oui}-${serial}"
-	fi
-
-	config_get user localmqtt Username
-	config_get pass localmqtt Password
-
-	# publish Agent's EndpointID in mosquito broker for discovery by usp-js
-	# This is a work around till obuspa adds supports for mDNS discovery
-	if [ -n "${user}" ] && [ -n "${pass}" ]; then
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker with username, password"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" -u "${user}" -P "${pass}"
-	elif [ -n "${user}" ]; then
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker with username only"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" -u "${user}"
-	else
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}"
-	fi
-}
-
 configure_localagent() {
-	local Enable EndpointID
+	local Enable ParameterName EndpointID
+	local _num
 
 	validate_localagent_section 'localagent' || {
 		log "Validation of localagent section failed"
@@ -308,55 +235,48 @@ configure_localagent() {
 		db_set Device.LocalAgent.EndpointID "${EndpointID}"
 	fi
 
+	_num=1
+	while [ ${_num} -le ${controller_num} ]
+	do
+		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.Enable "${Enable}"
+		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.ParameterName "${ParameterName}"
+		_num=$(( ${_num} + 1 ))
+	done
+
 	db_set
 }
 
 configure_controller() {
 	local EndpointID Enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPNotifRetryMinimumWaitInterval
 	local USPNotifRetryIntervalMultiplier ControllerCode Protocol Destination coap_host coap_path coap_port
-	local Reference Topic mqtt stomp assigned_role_name ParameterName
-	local Host Port Path EnableEncryption KeepAliveInterval
-	local SessionRetryIntervalMultiplier SessionRetryMinimumWaitInterval
+	local Reference Topic mqtt stomp assigned_role_name
 
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
 		return 1;
 	}
 
-	if [ -z "${EndpointID}" ] || [ -z "${Protocol}" ]; then
+	if [ -z "${EndpointID}" -o -z "${Protocol}" ]; then
 		log "controller:: EndpointID id and Protocol cannot be empty"
 		return 1;
 	fi
 
-	# Support for backward compatibility for coap uci parameters
-	if [ -n "${coap_host}" ] && [ -z "${Host}" ]; then
-		Host="${coap_host}"
-	fi
-
-	if [ -n "${coap_path}" ] && [ -z "${Path}" ]; then
-		Path="${coap_path}"
-	fi
-
-	if [ -n "${coap_port}" ] && [ -z "${Port}" ]; then
-		Port="${coap_port}"
-	fi
-
-	if [ -z "${stomp}" ] && [ -z "${Reference}" ] && [ -z "${mqtt}" ] && [ -z "${Host}" ]; then
+	if [ -z "${stomp}" -a -z "${Reference}"  -a -z "${mqtt}" -a -z "${coap_path}" ]; then
 		log "controller:: Invalid configuration"
 		return 1;
 	fi
 
-	if [ -z "${Reference}" ]; then
-		if [ "${Protocol}" = "STOMP" ]; then
-			val=$(get_uci_ref_index stomp "${stomp}")
-			if [ "${val}" -eq 0 ]; then
+	if [ -z ${Reference} ]; then
+		if [ ${Protocol} = "STOMP" ]; then
+			val=$(get_uci_ref_index stomp ${stomp})
+			if [ ${val} -eq 0 ]; then
 				log "Not able to find the referred stomp section"
 				return 1;
 			fi
 			Reference="Device.STOMP.Connection.${val}"
-		elif [ "${Protocol}" = "MQTT" ]; then
-			val=$(get_uci_ref_index mqtt "${mqtt}")
-			if [ "${val}" -eq 0 ]; then
+		elif [ ${Protocol} = "MQTT" ]; then
+			val=$(get_uci_ref_index mqtt ${mqtt})
+			if [ ${val} -eq 0 ]; then
 				log "Not able to find the referred mqtt section"
 				return 1;
 			fi
@@ -373,7 +293,7 @@ configure_controller() {
 		db_set Device.LocalAgent.Controller.${controller_num}.AssignedRole "${AssignedRole}"
 	else
 		if [ -n "${assigned_role_name}" ]; then
-			AssignedRole=$(get_role_index "${assigned_role_name}")
+			AssignedRole=$(get_role_index ${assigned_role_name})
 			db_set Device.LocalAgent.Controller.${controller_num}.AssignedRole "${AssignedRole}"
 		fi
 	fi
@@ -399,33 +319,13 @@ configure_controller() {
 		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Reference "${Reference}"
 		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Destination "${Destination}"
 	elif [ "${Protocol}" = "CoAP" ]; then
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${Host}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${Path}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${Port}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.EnableEncryption "${EnableEncryption}"
-	elif [ "${Protocol}" = "WebSocket" ]; then
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Host "${Host}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Port "${Port}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Path "${Path}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.EnableEncryption "${EnableEncryption}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.KeepAliveInterval "${KeepAliveInterval}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.SessionRetryIntervalMultiplier "${SessionRetryIntervalMultiplier}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.SessionRetryMinimumWaitInterval "${SessionRetryMinimumWaitInterval}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${coap_host}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${coap_path}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${coap_port}"
 	else
 		log "Unsupported Protocol ${Protocol}"
 	fi
 
-	local param
-	local _pnum=1
-
-	for param in ${ParameterName}
-	do
-		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.Alias "cpe-${_pnum}"
-		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.Enable "${Enable}"
-		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.ParameterName "${param}"
-		_pnum=$(( _pnum + 1 ))
-	done
-
 	db_set
 }
 
@@ -438,14 +338,13 @@ configure_subscription(){
 		return 1;
 	}
 
-	if [ -z "${Recipient}" ] && [ -z "${controller}" ]; then
+	if [ -z "${Recipient}" -a -z "${controller}" ]; then
 		log "No recipient for subscription"
-		return 1;
 	fi
 
-	if [ -z "${Recipient}" ]; then
-		val=$(get_uci_ref_index controller "${controller}")
-		if [ "${val}" -eq 0 ]; then
+	if [ -z ${Recipient} ]; then
+		val=$(get_uci_ref_index controller ${controller})
+		if [ ${val} -eq 0 ]; then
 			log "Not able to find the referred controller section"
 				return 1;
 		fi
@@ -461,15 +360,28 @@ configure_subscription(){
 	db_set Device.LocalAgent.Subscription.${subs_num}.ReferenceList "${ReferenceList}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Persistent "${Persistent}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Recipient "${Recipient}"
-	db_set Device.LocalAgent.Subscription.${subs_num}.CreationDate "$(date -I'seconds')"
+}
+
+validate_challenge_section()
+{
+	uci_validate_section ${CONFIGURATION} challenge "${1}" \
+		'Enable:bool:true' \
+		'Alias:string' \
+		'Description:string' \
+		'role_name:string' \
+		'Role:string' \
+		'Value:string' \
+		'Retries:uinteger:3' \
+		'LockoutPeriod:uinteger:0'
 }
 
 check_json_load()
 {
 	local ret=0
-	if [ -f "${role_def_file}" ]; then
+	if [ -f ${role_def_file} ]; then
 		json_init
-		if json_load_file "${role_def_file}" 2>&1 |grep -q Failed; then
+		json_load_file ${role_def_file} 2>&1 |grep -q Failed
+		if [ $? -eq 0 ]; then # In case of invalid json file
 			log "failed to load [${role_def_file}]"
 			ret=1
 		fi
@@ -481,7 +393,7 @@ check_json_load()
 get_role_index() {
 	local role="Device.LocalAgent.ControllerTrust.Role"
 	local idx=0
-	local role_name="$*"
+	local role_name="${@}"
 
 	case "${role_name}" in
 	'full_access')
@@ -493,9 +405,10 @@ get_role_index() {
 	 *)
 		local ji=0
 
-		ji=$(check_json_load)
-		if [ "${ji}" -eq 0 ]; then
-			get_role_index_from_json "${role_name}"
+		check_json_load
+		if [ $? -eq 0 ]; then
+			get_role_index_from_json ${role_name}
+			ji=$?
 		fi
 		idx=$(( ji + 2 )) # Add predefined roles
 	 esac
@@ -511,7 +424,7 @@ configure_challenges() {
 		exit 1;
 	}
 
-	if [ -z "${role_name}" ] && [ -z "${Role}" ]; then
+	if [ -z "${role_name}" -a -z ${Role} ]; then
 		log "Either role_name or Role must defined for a challenge";
 		return 1;
 	fi
@@ -524,10 +437,10 @@ configure_challenges() {
 	fi
 
 	if [ -z "${Role}" ]; then
-		Role=$(get_role_index "${role_name}")
+		Role=$(get_role_index ${role_name})
 	fi
 
-	if [ -z "${Alias}" ] && [ -n "${role_name}" ]; then
+	if [ -z "${Alias}" -a -n "${role_name}" ]; then
 		Alias=${role_name}
 	fi
 
@@ -541,32 +454,23 @@ configure_challenges() {
 configure_mtp() {
 	local Enable Protocol Reference ResponseTopicConfigured PublishQoS
 	local stomp mqtt
-	local Path Port EnableEncryption KeepAliveInterval
 
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
 		return 1;
 	}
 
-	if [ -n "${coap_path}" ] && [ -z "${Path}" ]; then
-		Path="${coap_path}"
-	fi
-
-	if [ -n "${coap_port}" ] && [ -z "${Port}" ]; then
-		Port="${coap_port}"
-	fi
-
-	if [ -z "${Reference}" ]; then
-		if [ "${Protocol}" = "STOMP" ]; then
-			val=$(get_uci_ref_index stomp "${stomp}")
-			if [ "${val}" -eq 0 ]; then
+	if [ -z ${Reference} ]; then
+		if [ ${Protocol} = "STOMP" ]; then
+			val=$(get_uci_ref_index stomp ${stomp})
+			if [ ${val} -eq 0 ]; then
 				log "Referred stomp section not found"
 				return 1;
 			fi
 			Reference="Device.STOMP.Connection.${val}"
-		elif [ "${Protocol}" = "MQTT" ]; then
-			val=$(get_uci_ref_index mqtt "${mqtt}")
-			if [ "${val}" -eq 0 ]; then
+		elif [ ${Protocol} = "MQTT" ]; then
+			val=$(get_uci_ref_index mqtt ${mqtt})
+			if [ ${val} -eq 0 ]; then
 				log "Referred mqtt section not found"
 				return 1;
 			fi
@@ -588,13 +492,8 @@ configure_mtp() {
 		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Reference "${Reference}"
 		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Destination "${Destination}"
 	elif [ "${Protocol}" = "CoAP" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${Path}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${Port}"
-	elif [ "${Protocol}" = "WebSocket" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.Path "${Path}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.Port "${Port}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.EnableEncryption "${EnableEncryption}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.KeepAliveInterval "${KeepAliveInterval}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${coap_path}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${coap_port}"
 	else
 		log "Unsupported Protocol ${Protocol} in mtp"
 	fi
@@ -634,7 +533,7 @@ configure_stomp_connection() {
 
 configure_mqtt_client(){
 	local BrokerAddress BrokerPort Enable Username Password ProtocolVersion KeepAliveTime
-	local TransportProtocol ConnectRetryTime ConnectRetryMaxInterval ConnectRetryIntervalMultiplier ClientID
+	local TransportProtocol ConnectRetryTime ConnectRetryMaxInterval ConnectRetryIntervalMultiplier
 
 	validate_mqtt_client_section "${1}" || {
 		log "Validation of mqtt section failed"
@@ -667,134 +566,111 @@ configure_mqtt_client(){
 
 
 configure_obuspa() {
-	local enabled trust_cert ifname interface debug prototrace log_level db_file log_dest role_file
-	local client_cert
+	local enabled trust_cert ifname interface debug log_level db_file log_dest role_file
 
-	validate_obuspa_section "global"
+	validate_obuspa_section "global" || {
+		log "Validation of global section failed"
+		return 1;
+	}
 
 	role_def_file="${role_file}"
 
-	if [ "${debug}" -eq 1 ]; then
+	if [ ${debug} -eq 1 ]; then
 		# Forward stdout of the command to logd
 		procd_set_param stdout 1
 		# Same for stderr
 		procd_set_param stderr 1
-	fi
-
-	if [ "${debug}" -eq 1 ] && [ "${prototrace}" -eq 1 ]; then
 		procd_append_param command -p
 	fi
 
-	if [ "${debug}" -eq 1 ] && [ -n "${log_level}" ]; then
-		procd_append_param command -v "${log_level}"
+	if [ -n ${log_level} ]; then
+		procd_append_param command -v ${log_level}
 	fi
 
 	if [ -n "${log_dest}" ]; then
-		procd_append_param command -l "${log_dest}"
+		procd_append_param command -l ${log_dest}
 	fi
 
 	if [ -n "${interface}" ]; then
-		network_get_physdev ifname "${interface}"
+		network_get_physdev ifname ${interface}
+		log "ifname from ${interface} is ${ifname}"
 	fi
 
-	if [ -n "${ifname}" ]; then
-		procd_set_param env USP_BOARD_IFNAME="${ifname}"
-		# Set this variable for root user and obuspa -c tool
-		if [ -f "${PROFILE}" ]; then
-			if grep -q "export USP_BOARD_IFNAME=${ifname}" ${PROFILE}; then
-				if grep -q "export USP_BOARD_IFNAME" ${PROFILE}; then
-					sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
-				fi
-			fi
-		fi
-		echo "export USP_BOARD_IFNAME=${ifname}" >> ${PROFILE}
-	else
-		if [ -f "$PROFILE" ]; then
-			if grep -q "export USP_BOARD_IFNAME" ${PROFILE}; then
+	# Set this variable for root user and obuspa -c tool
+	if [ -f "${PROFILE}" ]; then
+		grep -q "export USP_BOARD_IFNAME=${ifname}" ${PROFILE}
+		if [ "$?" -ne 0 ]; then
+			grep -q "export USP_BOARD_IFNAME" ${PROFILE}
+			if [ "$?" -eq 0 ]; then
 				sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
 			fi
+			echo "export USP_BOARD_IFNAME=${ifname}" >> ${PROFILE}
 		fi
+	else
+		echo "export USP_BOARD_IFNAME=${ifname}" > ${PROFILE}
 	fi
 
 	if [ -n "${db_file}" ]; then
 		update_keep "${db_file}"
-		procd_append_param command -f "${db_file}"
+		procd_append_param command -f ${db_file}
 	fi
 
 	if [ -n "${trust_cert}" ]; then
 		update_keep "${trust_cert}"
 		if [ -f "${trust_cert}" ]; then
-			procd_append_param command -t "${trust_cert}"
+			procd_append_param command -t ${trust_cert}
 		fi
 	fi
 
 	if [ -n "${client_cert}" ]; then
 		update_keep "${client_cert}"
 		if [ -f "${client_cert}" ]; then
-			procd_append_param command -a "${client_cert}"
+			procd_append_param command -a ${client_cert}
 		fi
 	fi
+
+	procd_set_param env USP_BOARD_IFNAME=${ifname}
 }
 
 # Create factory reset file
 db_init() {
 	# Load configuration
 	config_load $CONFIGURATION
-
+	config_foreach configure_obuspa obuspa
 	config_foreach configure_controller controller
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_localagent localagent
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_mtp mtp
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_stomp_connection stomp
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_mqtt_client mqtt
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_subscription subscription
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_challenges challenge
-	[ "$?" -ne 0 ] && return 1;
 
 	db_set Internal.Reboot.Cause "LocalFactoryReset"
-	return 0;
-}
-
-register_service()
-{
-	procd_open_instance ${CONFIGURATION}
-	procd_set_param command ${PROG}
-	procd_append_param command -r ${PARAM_FILE}
-
-	configure_obuspa
-	procd_set_param respawn \
-			"${respawn_threshold:-5}" \
-			"${respawn_timeout:-10}" "${respawn_retry:-3}"
-
-	procd_set_param watch usp.raw
-	procd_close_instance
-}
-
-service_running() {
-	publish_endpoint
 }
 
 start_service() {
 	local enabled
 
-	mkdir -p /tmp/obuspa/
 	config_load obuspa
-	config_get_bool enabled global enabled 0
+	config_get enabled global enabled
 
 	if [ "${enabled}" -eq 0 ]; then
 		log "OBUSPA not enabled"
 		return 0;
 	fi
 
-	db_init
-	[ "$?" -ne 0 ] && return 1;
+	ubus wait_for usp.raw
 
-	register_service
+	procd_open_instance ${CONFIGURATION}
+	procd_set_param command ${PROG}
+	db_init
+	procd_append_param command -r ${PARAM_FILE}
+	procd_set_param respawn \
+			${respawn_threshold:-5} \
+			${respawn_timeout:-10} ${respawn_retry:-3}
+
+	procd_set_param watch usp.raw
+	procd_close_instance
 }
 
 stop_service() {
@@ -803,14 +679,14 @@ stop_service() {
 	config_load obuspa
 	config_get db_file global db_file
 
-	${PROG} -c stop >/dev/null 2>&1
+	${PROG} -c stop 2>&1 >/dev/null
 
 	if [ -z "${db_file}" ]; then
-		db_file="/tmp/obuspa/usp.db"
+		db_file="/tmp/usp.db"
 	fi
 
-	[ -f "${db_file}" ] && rm -f ${db_file}
-	[ -f "${PARAM_FILE}" ] && rm -f ${PARAM_FILE}
+	[ -f ${db_file} ] && rm -f ${db_file}
+	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
 }
 
 reload_service() {
@@ -841,14 +717,4 @@ service_triggers() {
 			json_add_int "" "2000"
 		json_close_array
 	procd_close_trigger
-
-	procd_open_validate
-	validate_obuspa_section
-	validate_localagent_section
-	validate_controller_section
-	validate_subscription_section
-	validate_mtp_section
-	validate_stomp_connection_section
-	validate_mqtt_client_section
-	procd_close_validate
 }

owsd/Makefile

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

owsd/files/owsd.init

@@ -289,8 +289,8 @@ parser_timeout()
 #data format is  digital with time unit
 #10s-10 seconds 10m-10 minutes 10h-10 hours 10d-10 days
 	if [ -n "$1" ]; then
-		flag=$(echo "$1"| tr -d '0-9' | tr 'A-Z' 'a-z')
-		data=$(echo "$1"| tr -cd '0-9')
+		flag=$(echo "$1"| tr -d [0-9] | tr '[A-Z]' '[a-z]')
+		data=$(echo "$1"| tr -cd [0-9])
 
 		case $flag in
 			m)

paho-mqtt-c/Makefile

@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2020 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=lib-paho-mqtt
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=9f715d0862a8e16099b5837c4e53a1bf6a6a0675
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/eclipse/paho.mqtt.c.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=edl-v10
+PKG_LICENSE_FILES:=LICENSE
+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lib-paho-mqtt
+	CATEGORY:=Libraries
+	DEPENDS:=+libopenssl
+	TITLE:=package for mqtt stuff
+endef
+
+
+define Package/lib-paho-mqtt/description
+	a library
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/*.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/output/*.so* $(1)/usr/lib/
+endef
+
+define	Package/lib-paho-mqtt/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/build/output/*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,lib-paho-mqtt))

periodicstats/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7426c7458f792cc66920c206d62869c5620f1400
+PKG_SOURCE_VERSION:=312573b91b2ae10d0fe04a4d11ae37898f526fdb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -26,7 +26,7 @@ define Package/periodicstats
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Periodic Statistics Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbf_api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm +libbbf_api +uspd
 endef
 
 define Package/periodicstats/description

periodicstats/files/etc/init.d/periodicstats

@@ -4,23 +4,26 @@ START=99
 STOP=10
 
 USE_PROCD=1
+NAME=periodicstatsd
 PROG=/usr/sbin/periodicstatsd
 
-service_running() {
-	ubus -t 10 wait_for usp.raw
-}
+. /lib/functions.sh
 
 start_service() {
-	enable=$(uci -q get periodicstats.globals.enable)
-
-	if [ "$(enable)" != "1" ]; then
-		return 0;
+	ubus wait_for usp
+	if [ -f "/etc/config/periodicstats" ]; then
+		if [ "$(uci -q get periodicstats.globals.enable)" == "1" ]; then
+			procd_open_instance periodicstatsd
+			procd_set_param command ${PROG}
+			procd_set_param respawn
+			procd_close_instance
+		fi
 	fi
+}
 
-	procd_open_instance periodicstatsd
-	procd_set_param command ${PROG}
-	procd_set_param respawn
-	procd_close_instance
+stop() {
+	#stop_service() is called after procd killed the service
+	echo ;
 }
 
 service_triggers() {

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=21522c2003b8c61904acc61ff97e54fc9b0c3c92
+PKG_SOURCE_VERSION:=785166a9861a119623556163179915727896156b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 

peripheral_manager/files/etc/init.d/ledmngr

@@ -1,62 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=20
-USE_PROCD=1
-
-setled() {
-	local enable
-	local brightness
-
-	config_get_bool enable $1 enable 1
-	config_get brightness $1 brightness 100
-	ubus call led.$1 set "{\"enable\":$enable,\"brightness\":$brightness}"
-}
-
-start_service() {
-	local enable
-
-	config_load leds
-	config_foreach setled led
-	config_get_bool enable leds enable 1
-
-	if [ "$enable" == "0" ]; then
-		ubus call leds set  '{"state" : "alloff"}'
-	else
-		ubus call leds set  '{"state" : "normal"}'
-	fi
-}
-
-boot() {
-	local led ledname
-
-	ubus list led* >/dev/null || sleep 1
-	ubus list led* >/dev/null || sleep 1
-
-	[ -f /etc/config/leds ] || touch /etc/config/leds
-
-	if ! uci -q get leds.leds >/dev/null; then
-		uci set leds.leds=leds
-		uci set leds.leds.enable=1
-	fi
-
-	for led in $(ubus list led.*); do
-		ledname=${led:4}
-		case $ledname in
-			*phy*) continue ;;
-		esac
-		if ! uci -q  get leds.$ledname >/dev/null; then
-			uci set leds.$ledname=led
-			uci set leds.$ledname.enable=1
-		fi
-	done
-
-	uci commit leds
-
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "leds"
-}
-

peripheral_manager/files/sbin/ledctl

@@ -6,11 +6,11 @@ usage () {
 }
 
 [ $# -ne 1 ] && usage
-ledstate=$(echo $1 | tr 'A-Z' 'a-z')
+ledstate=$(echo $1 | tr '[A-Z]' '[a-z]')
 
 case $ledstate in
 	normal|test|allon|alloff|production)
-		ubus call leds set "{\"state\" : \"$ledstate\"}"
+		ubus call leds set  "{\"state\" : \"$ledstate\"}"
 	;;
 	*)
 		usage

ponmngr/Makefile

@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2013-2021 iopsys
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ponmngr
-PKG_VERSION:=1.0.0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ponmngr
-	CATEGORY:=Utilities
-	TITLE:=ponmngr packets manager daemon
-endef
-
-define Package/ponmngr/description
-	Configures pon
-endef
-
-#define Build/Prepare
-#	$(CP) -rf ./ponmngr/* $(PKG_BUILD_DIR)/
-#endef
-
-define Build/Compile
-endef
-
-define Package/ponmngr/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,ponmngr))

ponmngr/files/etc/init.d/pon

@@ -1,36 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=98
-STOP=10
-
-USE_PROCD=1
-NAME=ponmngr
-PROG="/usr/sbin/omcid start"
-
-include /lib/pon
-
-
-start_service() {
-       if [ -f "/etc/config/pon" ]; then
-		procd_open_instance $NAME
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance
-                start_gpon
-       fi
-}
-
-boot() {
-        start
-}
-
-stop_service() {
-	service_stop ${PROG}
-        stop_gpon
-}
-
-reload_service() {
-        stop
-        start
-}
-