obuspa: Merge obuspa-4.1.0 release

make iptv work with openwrt 21.02 lift

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=4.1.5
+PKG_VERSION:=4.5.1
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=838372a16ed0029cd681626bb5adb722f6a7681e
+PKG_SOURCE_VERSION:=f25f6816e27ac9f994b8e90fb7e85a48bfc87234
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

crun/Makefile

@@ -1,14 +1,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crun
-PKG_VERSION:=0.18
+PKG_VERSION:=0.20
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/containers/crun.git
-PKG_SOURCE_DATE:=2021-03-18
-PKG_SOURCE_VERSION:=496e81bdd69f117f10e4477e4204e4611a94b68f
-PKG_MIRROR_HASH:=26941b0d84bbeabeb5e982af48d131f55d0aa16f4a2f2ca3279a5c812cdeea8b
+PKG_SOURCE_DATE:=2021-06-07
+PKG_SOURCE_VERSION:=8d6a8b5ab80461cfed19f020a36584af13c32038
+PKG_MIRROR_HASH:=9ca1f0e530b33ce8820bd03329eb6731c5050d6e7f35bd2463d9a81cc00382e0
 
 PKG_BUILD_DEPENDS:=argp-standalone
 PKG_BUILD_PARALLEL:=1
@@ -74,8 +74,7 @@ define Package/crun/install
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcrun.* $(1)/usr/lib/
 endef
 

dectmngr/Makefile

@@ -8,17 +8,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.0.13
+PKG_VERSION:=3.1.9
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c4fdf3f3ffc299c7596e6d0dc4be86485250533
+PKG_SOURCE_VERSION:=62bc59d8d19803ace6bddf5b4cd891e32d8f4074
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
 RSTRIP:=true

dectmngr/files/etc/config/dectmngr

@@ -0,0 +1,2 @@
+config dectmngr 'general'
+	option log_dect_cmbs '0'

dectmngr/files/etc/init.d/dectmngr

@@ -9,6 +9,7 @@ USE_PROCD=1
 NAME=dectmngr
 PROG=/usr/sbin/dectmngr
 LOG_PATH=/var/log/dectmngr
+DB_PATH=/etc/dect
 
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
@@ -22,17 +23,35 @@ stop_and_wait_dectmngr() {
 }
 
 start_service() {
+	local opt_ext=
 	local rfpi=
-	local opt_rfpi=
+	local model_id=
+
 	test $(db get hw.board.hasDect) = "0" && return
 
 	echo 1 > /sys/class/gpio/gpio14/value
 
 	rfpi=$(db -q get hw.board.dect_rfpi)
-	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_rfpi="-rfpi $rfpi"
+	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
+
+	# 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 dectmngr
+	config_get_bool log_dect_cmbs general log_dect_cmbs 0
 
 	procd_open_instance
-	procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_rfpi
+	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/*
+	else
+		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
@@ -61,6 +80,7 @@ boot() {
 	echo out > /sys/class/gpio/gpio14/direction
 
 	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
+	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH
 	start
 }
 

dslmngr/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.1.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d17c699c1fc9588303d6da35ac2250903bf17cd8
+PKG_SOURCE_VERSION:=b7aa02e86a383e2f9eedd1333b2148270daf5242
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.2.19
+PKG_VERSION:=6.2.34
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d1fd660106d9ac3c937d005775608df43e1aa17c
+PKG_SOURCE_VERSION:=d12db0f3c871e92763c8830b2e1518e9f3aaeacb
 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

@@ -9,11 +9,14 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=endptmngr
 PKG_VERSION:=0.5
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=d3938443caffea15641bff72837d2de0cf87d62c
+PKG_SOURCE_VERSION:=76c02a334ddd238f4412ba954e3dd739fb3709af
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+endif
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@@ -47,6 +50,12 @@ define Package/endptmngr/description
 	endptmngr
 endef
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        rsync -av --exclude=.* ~/git/endptmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/endptmngr/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin

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:=485a38bc4eaf2a54d080b8529d5130b2955626d1
+PKG_SOURCE_VERSION:=cc2831addca083f86c74fbaec2630d080c981aa4
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=7.0.1-2021-05-14
+PKG_VERSION:=8.0.1-2021-08-11
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f70cc81e5688e32aa82084faae5bc6ff710bb81b
+PKG_SOURCE_VERSION:=30795d2be548196ad2bcef4ea7ff71842f78d97c
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

icwmp/files/etc/init.d/icwmpd

@@ -13,6 +13,10 @@ PROG="/usr/sbin/icwmpd"
 
 EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
 
+log() {
+	echo "${@}"|logger -t cwmp.init -p info
+}
+
 validate_url() {
 	# SCHEMA_LIST: contain list of possible schemas that could be present in the acs url
 	# Example: SCHEMA_LIST="http https"
@@ -35,14 +39,14 @@ get_acs_url() {
 
 	if [ "$acs_dhcp_discovery" == "enable" -a -n "$dhcp_url" -o -z "$url" ]; then
 		url="$dhcp_url"
-		echo "ACS URL from DHCP server: $url"
+		log "ACS URL from DHCP server: $url"
 		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url" || url="$default_acs"
 	elif [ -n "$url" ];then
 		url="$(uci -q get cwmp.acs.url)"
-		echo "ACS URL from configuration: $url"
+		log "ACS URL from configuration: $url"
 	else
 		url="$default_acs"
-		echo "Using default ACS URL: $url"
+		log "Using default ACS URL: $url"
 		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url"
 	fi
 
@@ -108,7 +112,7 @@ wait_for_option43() {
 
 	if [ "$dhcp_discovery" == "enable" -o "$dhcp_discovery" == "1" ]
 	then
-		echo "Waiting for discovery of ACS URL from dhcp server ..."
+		log "Waiting for discovery of ACS URL from dhcp server ..."
 		while [ $tm -le $time ]
 		do
 			acs_url=`uci -P /var/state -q get cwmp.acs.dhcp_url`
@@ -155,25 +159,28 @@ start_service() {
 		touch /etc/icwmpd/.icwmpd_boot
 		touch /tmp/.icwmpd_boot
 	else
-		[ -f /sbin/netifd ] && echo "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-		[ -f /etc/config/wireless ] && echo "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
-		[ -f /usr/sbin/dnsmasq ] && echo "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-		[ -f /etc/config/dhcp ] && echo "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-		[ -f /usr/sbin/asterisk ] && echo "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
+		[ -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
 		set_wan_interface
 		wait_for_option43 20
 		get_acs_url
 
-		procd_open_instance
+		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 "3" "7" "0"
+		procd_set_param respawn \
+			${respawn_threshold:-5} \
+			${respawn_timeout:-10} ${respawn_retry:-3}
+			
 		procd_close_instance
 	fi
 }

ieee1905/Config.in

@@ -1,29 +1,10 @@
-if PACKAGE_ieee1905 || PACKAGE_lib1905al
+if (PACKAGE_ieee1905)
 
-menu "developer/debug options"
+menu "Configurations"
 
-	config IEEE1905_MAP_COMPLETE_NETWORK
-		bool "Create network topology for complete network"
-		default n
+config IEEE1905_EXTENSION_ALLOWED
+	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
+	default y
 
-	config IEEE1905_SPEED_UP_DISCOVERY
-		bool "Speed up discovery of an AL in network"
-		default y
-
-	config IEEE1905_DO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
-		bool "Do not accept M1/M2 messages from unknown AL(s)"
-		default y
-
-	choice
-		prompt "Select ALME support"
-		default IEEE1905_ALME_OVER_UBUS
-
-		config IEEE1905_ALME_OVER_UBUS
-			bool "ALME methods supported over ubus"
-
-		#config IEEE1905_ALME_OVER_TCP
-		#	bool "ALME server over TCP port"
-
-	endchoice
 endmenu
 endif

ieee1905/Makefile

@@ -1,142 +1,129 @@
 #
-# Copyright (C) 2019 Iopsys
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=2.1.44
+PKG_VERSION:=3.3.3
 
-LOCAL_DEV:=0
+LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=33d05c2223023ce5b57001008555bd0f82e88541
+PKG_SOURCE_VERSION:=90c9d16b1595261a4bf459211c1a8239035322e4
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 
-define Package/ieee1905
+
+define Package/ieee1905/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=IEEE1905 daemon
-  DEPENDS:= +libuci +libjson-c +libieee1905 +ubox +libpcap +libopenssl +libwifi +libeasy
+  SUBMENU:=IEEE-1905.1 stack
 endef
 
 define Package/ieee1905/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/ieee1905/description
- IEEE1905 stack with extended functionalities.
+  source "$(SOURCE)/Config.in"
 endef
 
 define Package/libieee1905
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=IEEE1905 cmdu tlv utility library
+$(call Package/ieee1905/Default,$(1))
+  TITLE+= (library for CMDU and TLV handling)
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+	   +libjson-c +libblobmsg-json
 endef
 
-define Package/libwsc
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Wifi Simple Configuration building and processing library
-  DEPENDS= +libopenssl +libuci +libubus
+define Package/ieee1905
+$(call Package/ieee1905/Default,$(1))
+  TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+	   +libjson-c +libblobmsg-json +libwifi +ubus +libpthread \
+	   +libnl-genl +libieee1905
 endef
 
-define Package/lib1905hle
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=IEEE1905 hle stack library
+
+define Package/map-plugin
+$(call Package/ieee1905/Default,$(1))
+  TITLE:=Multi-AP (Easymesh) plugin
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-LIBS := \
-	$(if $(CONFIG_PACKAGE_libwsc),libwsc.so)
+define Package/ieee1905/description
+ This package provides IEEE Std 1905.1 stack.
+endef
+
+define Package/libieee1905/description
+ This package provides library functions for IEEE Std 1905.1 stack.
+endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-	-fstrict-aliasing \
-	-Wall \
-	-Wextra
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
 
-MAKE_FLAGS += \
-	LIBS="$(LIBS)"
+MAKE_PATH:=src
 
-ifeq ($(CONFIG_IEEE1905_SPEED_UP_DISCOVERY),y)
-TARGET_CFLAGS += -DSPEED_UP_DISCOVERY
-endif
-ifeq ($(CONFIG_IEEE1905_DO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS),y)
-TARGET_CFLAGS += -DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
-endif
-ifeq ($(CONFIG_IEEE1905_ALME_OVER_TCP),y)
-TARGET_CFLAGS += -DALME_OVER_TCP
-endif
-ifeq ($(CONFIG_IEEE1905_ALME_OVER_UBUS),y)
-TARGET_CFLAGS += -DALME_OVER_UBUS
-endif
-ifeq ($(CONFIG_IEEE1905_MAP_COMPLETE_NETWORK),y)
-TARGET_CFLAGS += -DIEEE1905_MAP_COMPLETE_NETWORK
-endif
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/ieee1905/* $(PKG_BUILD_DIR)/
-endef
-endif
 
 define Package/ieee1905/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/ieee1905
-	$(INSTALL_DIR) $(1)/usr/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/etc/init.d/ieee1905 $(1)/etc/init.d/ieee1905
-	$(INSTALL_DATA) ./files/etc/config/ieee1905 $(1)/etc/config/ieee1905
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ieee1905d $(1)/usr/sbin/
-endef
-
-define Package/lib1905hle/install
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/lib1905hle.so $(1)/usr/lib/lib1905hle.so
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
 endef
 
 define Package/libieee1905/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib/libieee1905.so
+	$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
 endef
 
-define Package/libwsc/install
+define Package/map-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/libwsc.so
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
 endef
 
-define Build/InstallDev/libwsc.so
+define Build/InstallDev/map-plugin
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map2.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
+endef
+
+
+define Build/InstallDev/libieee1905
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwsc/include/wsc.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/ieee1905
-	$(INSTALL_DIR) $(1)/usr/include/ieee1905
-	$(INSTALL_DIR) $(1)/usr/include/lib1905hle
-	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/ieee1905/
-	$(CP) $(PKG_BUILD_DIR)/libieee1905/include/*.h $(1)/usr/include/ieee1905/
-	$(CP) $(PKG_BUILD_DIR)/lib1905hle/include/*.h $(1)/usr/include/lib1905hle/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib
-	$(foreach lib,$(LIBS),$(call Build/InstallDev/$(lib),$(1),$(2));)
+	$(call Build/InstallDev/libieee1905,$(1),$(2))
+	$(call Build/InstallDev/map-plugin,$(1),$(2))
 endef
 
-$(eval $(call BuildPackage,libieee1905))
-$(eval $(call BuildPackage,lib1905hle))
-$(eval $(call BuildPackage,libwsc))
+
 $(eval $(call BuildPackage,ieee1905))
+$(eval $(call BuildPackage,libieee1905))
+$(eval $(call BuildPackage,map-plugin))

ieee1905/files/etc/config/ieee1905

@@ -1,17 +1,22 @@
 config ieee1905 'ieee1905'
-        option enabled '1'
-        option debug  true
-        option debug_level  2
-        option macaddress 'auto'
-        option registrar 0
-        option cmdu_event 1
-        option map_plugin 1
+	option enabled '1'
+	option extension '1'
+	list extmodule 'map'
+	option registrar '2 5'
 
-config security 'security'
-        list method 'PBC'
+config ap
+	option band '2'
+	option ssid 'TestSSID.2'
+	option encryption 'psk2'
+	option key '5555500000'
+
+config ap
+	option band '5'
+	option ssid 'TestSSID.5'
+	option encryption 'psk2'
+	option key '2222200000'
 
 config al-iface
-        option enabled 1
-        option ifname 'br-lan'
-        option media 'bridge'
-
+	option enabled 1
+	option ifname 'br-lan'
+	option type 'bridge'

ieee1905/files/etc/init.d/ieee1905

@@ -1,72 +1,25 @@
 #!/bin/sh /etc/rc.common
 
 START=96
-STOP=22
+STOP=21
 
 USE_PROCD=1
-PROG=/usr/sbin/ieee1905d
-
-validate_ieee1905_section()
-{
-	uci_validate_section ieee1905 ieee1905 "${1}" \
-		'debug:bool:false' \
-		'enabled:bool:false'
-}
-
-configure_ieee1905()
-{
-	local enabled debug
-
-	validate_ieee1905_section ${1} || {
-		echo "Validation of ieee1905 section failed"
-		exit 1;
-	}
-
-	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 [ ${enabled} -ne 1 ]; then
-		exit 0;
-	fi
-}
-
-configure_network()
-{
-	ebtables -L FORWARD|grep -iqE "1:80:C2:(0)+:(0)+:13.*-j.*DROP"
-	if [ "$?" -ne 0 ]; then
-		echo "Applying drop rule to drop pkts forwared by kernel to 1905.1 multicast mac"
-		ebtables -A FORWARD -d 01:80:c2:00:00:13 -j DROP
-	fi
-}
-
-service_running() {
-        ubus -t 2 wait_for wifi
-}
 
 start_service() {
-
-	[ -d /usr/lib/ieee1905 ] || mkdir -p /usr/lib/ieee1905
-
-	procd_open_instance ieee1905
-	procd_set_param command ${PROG}
-	configure_ieee1905 "ieee1905"
-	configure_network
+	procd_open_instance
+        procd_set_param command "/usr/sbin/ieee1905d"
 	procd_set_param respawn
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
 	procd_close_instance
 }
 
+service_triggers()
+{
+	procd_add_reload_trigger "ieee1905"
+}
+
 reload_service() {
 	stop
 	start
 }
-
-service_triggers() {
-	procd_add_reload_trigger "network"
-	procd_add_reload_trigger "wireless"
-	procd_add_reload_trigger "netmode"
-	procd_add_reload_trigger "ieee1905"
-}

iop/config

@@ -22,14 +22,12 @@ CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_gre=y
 CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-1905=y
 CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_wfadatad=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_iopupgrade=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
@@ -42,7 +40,7 @@ CONFIG_PACKAGE_jq=y
 CONFIG_PACKAGE_libreswan=m
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_luci=y
+CONFIG_PACKAGE_luci-nginx=y
 # CONFIG_LUCI_JSMIN is not set
 # CONFIG_LUCI_CSSTIDY is not set
 CONFIG_PACKAGE_luci-mod-dashboard=y
@@ -63,6 +61,7 @@ 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
@@ -81,6 +80,7 @@ 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

iop/scripts/feeds_update.sh

@@ -32,7 +32,7 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt iopsys-bcm27xx iopsys-mediatek"
+    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

iop/scripts/genconfig.sh

@@ -17,8 +17,9 @@ function genconfig {
 	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
-	intel_mips="target/linux/intel_mips"
 	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"
 
@@ -116,6 +117,8 @@ function 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 ] &&
@@ -126,7 +129,7 @@ function genconfig {
 			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_mediatek iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; 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"
@@ -159,6 +162,14 @@ function genconfig {
 		fi
 	    done
 
+	    for p in $iopsys_econet; do
+		if [ $p == $profile ]; then
+		    target="iopsys_econet"
+			target_config_path="$econet/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
@@ -360,26 +371,26 @@ function genconfig {
 			subtarget="xrx500"
 			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
 			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_${target}_${subtarget}_DEVICE_${BOARDTYPE}=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
@@ -444,9 +455,6 @@ function genconfig {
 		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
 		fi
 
-		# Force regeneration of themes
-		touch package/feeds/iopsys/juci/Makefile
-
 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets
 		touch package/kernel/linux/Makefile

iop/scripts/genconfig_min.sh

@@ -324,23 +324,29 @@ function genconfig_min {
 			subtarget="xrx500"
 			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
 			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
-                        device=$(echo $BOARDTYPE | tr a-z A-Z)
-                        echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+			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

iop/scripts/install_key.sh

@@ -1,12 +1,29 @@
 # this is a developer helper script to install the public ssh key in the created image
 
+DROPBEAR_AUTHORIZED_KEYS_FILE=/etc/dropbear/authorized_keys
+
+function get_ssh_public_keys {
+    (
+        shopt -s nullglob
+        # home directory, not all of those are supported by dropbear,
+        # but let's include them now already to decrease future maintenance
+        cat /dev/null ~/.ssh/{id_rsa,id_dsa,id_ecdsa,id_ecdsa_sk,id_ed25519,id_ed25519_sk,id_xmss}.pub 2> /dev/null
+        # keys added manually or automatically to the build dir
+        cat "files${DROPBEAR_AUTHORIZED_KEYS_FILE}" 2>/dev/null
+        # keys in the agent (useful when using SSH agent forwarding)
+        ssh-add -L 2> /dev/null
+    ) | sort | uniq
+}
+
 function install_key {
-
-    mkdir -p files/etc/dropbear
-    test -e ~/.ssh/id_dsa.pub && cat ~/.ssh/id_dsa.pub >>files/etc/dropbear/authorized_keys
-    test -e ~/.ssh/id_rsa.pub && cat ~/.ssh/id_rsa.pub >>files/etc/dropbear/authorized_keys
-    chmod 0644 files/etc/dropbear/authorized_keys
-
+    local build_dir_dropbear_authorized_keys_file="files${DROPBEAR_AUTHORIZED_KEYS_FILE}"
+    mkdir -p "$(dirname "$build_dir_dropbear_authorized_keys_file")"
+    get_ssh_public_keys > "$build_dir_dropbear_authorized_keys_file"
+    chmod 0644 "$build_dir_dropbear_authorized_keys_file"
+    echo "Keys in "$build_dir_dropbear_authorized_keys_file" are now:"
+    cat "$build_dir_dropbear_authorized_keys_file"
+    echo
+    echo "Disabling login on serial console..."
     echo "::sysinit:/etc/init.d/rcS S boot" >files/etc/inittab
     echo "::shutdown:/etc/init.d/rcS K shutdown" >>files/etc/inittab
     echo "console::askconsolelate:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
@@ -14,4 +31,25 @@ function install_key {
     echo Done
 }
 
+function ssh_install_key_help() {
+    echo Usage: $0 ssh_install_key HOSTNAME
+    echo
+    echo "Installs SSH public keys to a device's authorized_keys file"
+}
+
+
+# this is a developer helper script to install the public ssh key on host running dropbear
+function ssh_install_key {
+    if [ $# -ne 1 ] || [ "$1" == '--help' ]; then
+        ssh_install_key_help
+        [ $# -eq 1 ]; return
+    fi
+    host="$1"
+    local keys="$(get_ssh_public_keys)"
+    echo "Adding the following keys to $DROPBEAR_AUTHORIZED_KEYS_FILE on $host:"
+    echo "$keys"
+    ssh root@$host "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
+}
+
+register_command "ssh_install_key" "Install the users public ssh key on host running dropbear"
 register_command "install_key" "Install the user's public ssh key in the created image"

iop/scripts/ssh_install_key.sh

@@ -1,17 +0,0 @@
-# this is a developer helper script to install the public ssh key on host running dropbear
-
-function ssh_install_key {
-	if [ -e ~/.ssh/id_rsa.pub ]; then
-		echo "Adding public RSA key to $1"
-		KEY=`cat ~/.ssh/id_rsa.pub`
-	elif [ -e ~/.ssh/id_dsa.pub ]; then
-		echo "Adding public DSA key to $1"
-		KEY=`cat ~/.ssh/id_dsa.pub`
-	else
-		echo "No public key found"
-		exit 1
-	fi
-	ssh root@$1 "echo '$KEY' >> /etc/dropbear/authorized_keys" && echo ok
-}
-
-register_command "ssh_install_key" "Install the users public ssh key on host running dropbear"

iop/scripts/taas.sh

@@ -26,14 +26,8 @@ function taas-init() {
 		exit 1
 	fi
 
-	# NAND erase block size.
-	nandBlkSz=$(grep CONFIG_TARGET_NAND_BLOCKSZ .config | \
-		tr -s "=\"" " " | cut -d " " -f 2)
-	nandBlkSz=$((nandBlkSz / 1024))
-
 	# Create a list of all images which might be of use.
-	for f in ${PWD}/bin/targets/iopsys-*/generic/last.* \
-			${PWD}/build_dir/target-arm*/bcmkernel/bcm963xx/targets/9*/bcm*_linux_raw_image_${nandBlkSz}.bin; do
+	for f in ${PWD}/bin/targets/iopsys-*/generic/last.*; do
 		[[ -s "$f" ]] && images+=("$f")
 	done
 

iop/scripts/update_package.sh

@@ -492,7 +492,8 @@ check_feeds()
     echo "Now checking if any changes have been done to the feeds."
     echo -e "${Green}_______________________________________________________________________________${Color_Off}"
 
-    feeds=$(grep -v "^#" feeds.conf| awk '{print $2}')
+    feeds="$1"
+    [ -n "$feeds" ] || feeds=$(grep -v "^#" feeds.conf| awk '{print $2}')
     for feed in `echo $feeds`
     do
 		feed_hash=$(feeds_hash $feed)
@@ -552,7 +553,7 @@ check_feeds()
     done
 }
 
-feeds_at_top()
+is_local_and_remote_same()
 {
     git remote update 2>/dev/null 1>/dev/null
     LOCAL=$(git rev-parse @)
@@ -581,7 +582,7 @@ feeds_at_top()
 usage(){
 	echo -e "$0 [flags]"
 	echo -e "flags:"
-	echo -e "  -v\tVerbose mode"
+	echo -e "  -f\tFeed to update"
 	echo -e "  -h\tShow this help"
 	echo -e "  -u\tUpdate package version\n"
 }
@@ -589,7 +590,7 @@ usage(){
 # Exported interface
 function update_package {
 
-	UPDATE=0
+    UPDATE=0
 
     Color_Off='\033[0m'       # Text Reset
 
@@ -603,18 +604,18 @@ function update_package {
     Cyan='\033[0;36m'         # Cyan
     White='\033[0;37m'        # White
 
-    while getopts "v:hu" opt; do
+    while getopts "f:hu" opt; do
 	case $opt in
-	    v)
-		verbose=$OPTARG
+	    f)
+		feed=$OPTARG
 		;;
 	    h)
-			usage
-			exit 1
-			;;
-		u)
-			UPDATE=1
-			;;
+		usage
+		exit 1
+		;;
+	    u)
+		UPDATE=1
+		;;
 	    \?)
 		echo "Invalid option: -$OPTARG" >&2
 		exit 1
@@ -637,9 +638,9 @@ function update_package {
     set -E
     trap '[ "$?" -ne 99 ] || exit 99' ERR
 
-    feeds_at_top
-    check_packages
-    check_feeds
+    is_local_and_remote_same
+    [ -n "$feed" ] || check_packages
+    check_feeds $feed
 }
 
 register_command "update_package" "Publish changes to packages and feeds"

iopupgrade/Makefile

@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2019 iopsys
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=iopupgrade
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=01f2afd6c831d6f9eb2940c7e7af16f7e4d439c2
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopupgrade
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-# support parallel build
-PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/iopupgrade
-	CATEGORY:=Utilities
-	TITLE:=Iopsys system upgrade utility
-	URL:=
-#	DEPENDS:=
-endef
-
-define Package/iopupgrade/description
-	Application handling peripheral
-endef
-
-define Package/iopupgrade/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iopupgrade $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,iopupgrade))
- 

iopupgrade/files/sbin/iopu

@@ -1,329 +0,0 @@
-#!/bin/sh
-
-###############################################################################
-# Global variables. can be used directly in any function called.
-cur_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
-		# eg: rootfs_0 or rootfs_1, currently used
-upd_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
-		# eg: rootfs_0 or rootfs_1, the one we want to update
-cmdline=""	# command line settings.
-cmdline_match="" # Headers to match to the image
-
-###############################################################################
-# file local variables. should not be used in imported functions. Can be used
-# by functions declared in this script
-chroot_cmdline=""	# command line for the iop_chroot command.
-board=""		# string, Board name that is going to be matched
-			# against header of firmware image
-upd_ubi_id=""		# num,	UBI volume number for the volume name
-			# "rootfs_$upd_vol", use to know what volume to run
-			# ubiupdatevol on.
-run_cleanup=0		# if set the cleanup should be run otherwise we skip it.
-run_mount_cleanup=0	# set if we should run umount in cleanup
-upd_kernel=0		# set to 1 if system has the kernel in own mtd partition
-log_stdout=1		# set to 0 to prevent the log to also print to stdout
-upd_noreboot=0		# set to 1 if we should not reboot after programming
-upd_forceimage=0	# set this to force upgrade even if image is for wrong board.
-upd_forceboot=0		# set this to force upgrade of boot loader
-upd_keepconfig=0	# set this to keep the current configuration.
-###############################################################################
-# import external functions
-source /lib/upgrade/iopsys.sh
-[ -f /lib/upgrade/iopupgrade ] && source /lib/upgrade/iopupgrade
-
-# only call function if it exists
-function_call() {
-    if type "$1" 2>/dev/null >/dev/null
-    then
-	$1 $@
-    fi
-}
-
-###############################################################################
-# Cleanup and error handling functions.
-function log {
-    TIME=$(date)
-    [ $log_stdout -eq 1 ] && echo "$@"
-    echo "[$TIME] $@" >>/tmp/upd_log
-}
-
-# we need to handle ctrl-c, segmentation fault, sigpipe and other abnormal
-# terminations. no printing to stdout/stderr allowed in this function or
-# anyhting it calls as stdout/stderr might no longer exist
-function finish {
-
-    if [ $run_cleanup -eq 1 ]
-    then
-
-	function_call upd_cleanup
-	run_cleanup=0
-	log ""
-    fi
-
-    if [ $run_mount_cleanup -eq 1 ]
-    then
-	log "Cleaning up after mount"
-	umount_newroot
-    fi
-    # always kill the timeout process, will leave the sleep but that is harmless
-    # as long as the kill will nerver be run.
-    if [ -n "$TIMEOUT_PID" ]; then
-        kill $TIMEOUT_PID 2>/dev/null
-        TIMEOUT_PID=""
-    fi
-
-    lock -u /tmp/iopu.lock
-}
-
-function ctrl_c {
-
-    # on ctrl-c we remove the exit handler as it is called directly.
-    trap - EXIT
-
-    # call cleanup function
-    finish
-
-    # do not continue program
-    exit 1
-}
-
-function sig_pipe {
-    log_stdout=0  # stdin,stdout,stderr do not exist anymore
-    log "Got sigpipe. Turning of log printing to stdout"
-}
-
-# if a timout happens terminate
-function timeout {
-    exit 1
-}
-
-# Not much that can be done if the mount fails but to try again.
-# if after 10 seconds there still is errors abort program.
-# UBIFS has some wierd time intervall after ubiupdatevol where
-# a mount of the newly written data results in a busy error.
-function mount_retry {
-    local tries=0
-
-    while [ $tries -lt 10 ]
-    do
-	if mount $@ 2>/dev/null
-	then
-	    return
-	fi
-	tries=$((tries + 1))
-	sleep 1
-    done
-
-    log "mount failed for command [mount $@] so upgrade failed."
-
-    exit 1
-}
-
-function mount_newroot {
-    run_mount_cleanup=1
-    mkdir -p /tmp/newroot
-    mkdir -p /tmp/newroot_overlay
-
-    mount_retry -t ubifs ubi0:rootfs_$upd_vol /tmp/newroot
-
-    mount_retry -o noatime,lowerdir=/tmp/newroot,upperdir=/tmp/newroot/overlay,workdir=/tmp/newroot/lib/overlay.tmp -t overlay "overlayfs:/tmp/newroot/overlay" /tmp/newroot_overlay
-    mount_retry --bind /tmp/newroot/ /tmp/newroot_overlay/rom
-
-    mount_retry --bind /dev /tmp/newroot_overlay/dev
-    mount_retry --bind /proc /tmp/newroot_overlay/proc
-    mount_retry --bind /sys /tmp/newroot_overlay/sys
-    mount_retry -t tmpfs -o noatime,mode=0755 root /tmp/newroot_overlay/tmp
-
-    mkdir -p /tmp/newroot_overlay/tmp/oldroot
-    mount_retry --bind / /tmp/newroot_overlay/tmp/oldroot
-    mount_retry --bind /tmp /tmp/newroot_overlay/tmp/oldroot/tmp
-}
-
-function umount_newroot {
-    umount /tmp/newroot_overlay/tmp/oldroot/tmp
-    umount /tmp/newroot_overlay/tmp/oldroot
-    umount /tmp/newroot_overlay/tmp
-    umount /tmp/newroot_overlay/sys
-    umount /tmp/newroot_overlay/proc
-    umount /tmp/newroot_overlay/dev
-    umount /tmp/newroot_overlay/rom
-    umount /tmp/newroot_overlay
-    umount /tmp/newroot
-    rmdir /tmp/newroot_overlay /tmp/newroot
-    run_mount_cleanup=0
-}
-
-function usage {
-    echo "usage: $0 iopu [opts] "
-    echo ""
-    echo "opts:"
-    echo ""
-    echo "	-n		Do not do the final reboot of the target board"
-    echo "	-c		Keep configuration"
-    echo "	-x		Force install even if firmware is not for this board"
-    echo "	-b		Force install of bootloader regardless of version installed"
-    echo "	-r		Jump into chroot env of other system"
-    echo "	-f		Firmware file to use"
-    echo "	-C \"command\"	Execute command in chroot env of other system"
-}
-
-# Execute command in newroot(other system root)
-function newroot_exec {
-
-    upd_vol=$(get_flashbank_next)
-    mount_newroot
-    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay "$@")
-    echo ""
-    umount_newroot
-
-}
-
-function system_is_y_image {
-
-    # find out what rootfs volume is active.
-    cur_vol=$(get_flashbank_current)
-    upd_vol=$(get_flashbank_next)
-
-    # convert volume name "rootfs_$upd_vol" into ubi volume id
-    upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
-    log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
-
-    # prepare to match dsl.
-    function_call upd_conf_dsl
-
-    log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
-    run_cleanup=1	# When we start to actually write data there might be some
-                        # things that need cleanup if we get an error/crash
-    if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; then
-	log "iopupgrade program Failed"
-	exit 1
-    fi
-
-    log "Firmware programmed to flash."
-
-    # Force upgrade of boot loader
-    [ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
-
-    if [ $upd_keepconfig -eq 1 ]; then
-	log "Transfering configuration to new system."
-	chroot_cmdline="$chroot_cmdline -c"
-    fi
-
-    mount_newroot
-    if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
-	log "Configuration migration failed!"
-	exit 1
-    fi
-    umount_newroot
-
-    log "New firmware fully installed."
-    run_cleanup=0
-
-
-    # Now make sure that we actually boot the new system on the next reboot
-    upd_finnish
-
-}
-
-function system_is_FIT_image {
-
-    # prepare to match dsl.
-    #function_call upd_conf_dsl
-
-    #here we write data 
-    bcm_flasher $firmware_file
-    bcm_bootstate 1
-    log "Firmware programmed to flash."
-}
-
-###############################################################################
-
-# just one instance
-# this check has to be done before we install handler to avoid removing the
-# lock even if it was not available.
-if  ! lock -n /tmp/iopu.lock
-then
-    echo "Another instance of iopu already running"
-    echo "If you are sure this is wrong remove file /tmp/iopu.lock"
-    exit 1
-fi
-
-trap finish EXIT
-trap ctrl_c INT
-trap timeout SIGALRM
-trap sig_pipe SIGPIPE
-
-while getopts "nrxbhcC:f:" opt; do
-    case $opt in
-	n)
-	    upd_noreboot=1
-	    ;;
-	x)
-	    upd_forceimage=1
-	    ;;
-	b)
-	    upd_forceboot=1
-	    ;;
-	c)
-	    upd_keepconfig=1
-	    ;;
-	r)
-	    newroot_exec /bin/sh
-	    exit
-	    ;;
-	C)
-	    newroot_exec "${OPTARG}"
-	    exit
-	    ;;
-	f)
-	    firmware_file="${OPTARG}"
-	    ;;
-	h)
-	    usage
-	    exit 1
-	    ;;
-    esac
-done
-
-# put a timeout on this if it takes longer than 120 seconds we should abort
-# and clean up
-(
-	sleep 120 && kill -ALRM $$ 2>/dev/null		# send it a SIGALRM signal
-)&
-TIMEOUT_PID=$!
-
-log "Firmware upgrade started"
-
-# Should board name be checked
-if [ $upd_forceimage -eq 0 ]
-then
-   board=$(db get hw.board.model_name)
-   cmdline_match="board=$board"
-fi
-
-# BUG: should probably read a config file.
-if [ -f /proc/nvram/boardid ]
-then
-    system_is_FIT_image
-else
-    system_is_y_image
-fi
-
-# spawn the reboot to a subshell to allow the main program to quit before reset
-# to avoid any hanged network connection like ssh
-if [ $upd_noreboot -eq 0 ]
-then
-    (
-	log_stdout=0	# stdin,stdout,stderr do not exist anymore, we are in a
-			# subshell and then the trap is no longer working.
-	sleep 1
-	log "Rebooting NOW!!!"
-	log ""
-	reboot
-    )&
-    log "Reboot initiated"
-else
-    log "Skipping reboot"
-fi
-
-

iopupgrade/files/sbin/iopu_chroot

@@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# This program is intended to be run in a chroot environment where the old system
-# is mounted in /tmp/oldroot
-#
-
-
-###############################################################################
-# Global variables. can be used directly in any function called.
-
-
-###############################################################################
-# file local variables. should not be used in imported functions. Can be used
-# by functions declared in this script
-upd_forceboot=0
-log_stdout=1		# set to 0 to prevent the log to also print to stdout
-upd_keepconfig=0	# set this to keep the current configuration.
-
-###############################################################################
-# import external functions
-
-source /lib/upgrade/iopsys.sh
-[ -f /lib/upgrade/iopupgrade ] && source /lib/upgrade/iopupgrade
-
-
-# only call function if it exists
-function_call() {
-	if [ -n "$1" ] && type "$1" 2>/dev/null >/dev/null
-	then
-		$1 "$@" || exit
-	fi
-}
-# Cleanup and error handling functions.
-function log {
-	TIME=$(date)
-	[ $log_stdout -eq 1 ] && echo "$@"
-	echo "[$TIME] $@" >>/root/upd_log
-}
-
-
-while getopts "hbc" opt; do
-	case $opt in
-		h)
-			upd_usage
-			exit 1
-			;;
-		c)
-			upd_keepconfig=1
-			;;
-		b)
-			upd_forceboot=1
-			;;
-		\?)
-			echo "Invalid option: -$OPTARG" >&2
-			exit 1
-			;;
-	esac
-done
-
-# copy old install log over
-cp /tmp/oldroot/tmp/upd_log /root/upd_log
-
-# Upgrade boot loader if needed.
-function_call upd_program_boot
-
-# Let the new upgrade do whatever it needs,
-# such as configuration migration etc.
-if [ $upd_keepconfig -eq 1 -a -x /lib/upgrade/post-rootfs-fixup ]; then
-	(/lib/upgrade/post-rootfs-fixup /dev/null /tmp/oldroot) || exit
-fi
-

iopupgrade/files/sbin/iopu_chroot_env

@@ -1,18 +0,0 @@
-#!/bin/sh
-# this is run when "iopr -r" is executed.
-# intended to just show what environment is actually started.
-
-cat /etc/banner
-
-echo "/tmp/oldroot:"
-echo "	Contains the running root filesystem. It is live so files are in use"
-echo "	Anything copying/reading files from there needs to make sure it is done safely."
-echo ""
-
-Color_Off='\033[0m'       # Text Reset
-Red='\033[0;31m'          # Red
-
-PS1="${Red}chroot_new${Color_Off}:\w\#"
-export PS1
-export Red
-export Color_Off

map-1905/Makefile

@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2019 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=map-1905
-PKG_VERSION:=0.0.19
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=46afa4c0aa56d8762d9402cfdaddf4adaa8a058a
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/map-1905
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:= MultiAP Stack
-  DEPENDS:= +ubox +ieee1905
-endef
-
-define Package/map-1905/description
- MultiAP plugin for ieee1905d based on Wifi alliance's MAP-r2 specification
-endef
-
-define Package/libmaputils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=WFA MultiAP utility library
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-	-fstrict-aliasing \
-	-Wall \
-	-Wextra
-
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/map-1905/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/map-1905/install
-	$(INSTALL_DIR) $(1)/usr/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/libwifimap2.so $(1)/usr/lib/ieee1905/
-endef
-
-define Package/libmaputils/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmaputils.so $(1)/usr/lib/libmaputils.so
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/map1905
-	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/map1905/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmaputils.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmaputils))
-$(eval $(call BuildPackage,map-1905))

map-agent/Makefile

@@ -1,13 +1,13 @@
 #
-# Copyright (C) 2020 IOPSYS Software Solutions AB
+# Copyright (C) 2020-21 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=3.5.20
+PKG_VERSION:=5.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f396b503f111461e7869f302907e1d9ec639ca3a
+PKG_SOURCE_VERSION:=26077339df63c883239564336912325bd2076976
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -18,13 +18,16 @@ PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-agent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 
+PKG_BUILD_DEPENDS:=map-plugin
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/map-agent
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libmaputils +libwsc +libeasy
+  DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
+	  +map-plugin
 endef
 
 define Package/map-agent/description
@@ -42,20 +45,11 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/map-agent
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/include/*.h $(1)/usr/include/map-agent
-	$(CP) $(PKG_BUILD_DIR)/src/utils/timer_impl.h $(1)/usr/include/map-agent
-	$(CP) $(PKG_BUILD_DIR)/src/utils/*.so* $(1)/usr/lib/
-endef
-
 define Package/map-agent/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/src/utils/*.so* $(1)/usr/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 

map-agent/files/etc/hotplug.d/ethernet/map-loop-detection

@@ -1,84 +1,29 @@
 #!/bin/sh
 
-diff=0
-wan=$(uci -q get ports.WAN.ifname)
+wan=$(db -q get hw.board.ethernetWanPort)
 
-[ "$wan" == "" ] && exit 1 # no configuration
+[ -z "$wan" ] && exit 1 # no configuration
 [ "$PORT" != "$wan" ] && exit 0
 
-get_bridge() {
-	local id
-	local ifname="$1"
-	local bridge=""
-	id=$(cat /sys/class/net/${ifname}/brport/bridge/bridge/bridge_id)
+update_bstas() {
+	local section="$1"
+	local action="$2"
+	local ifname onboarded
 
-	#echo "bridge id = $id" > /dev/console
-
-	[ "$id" = "" ] && return
-
-	bridge=$(brctl show | grep $id | cut -f1)
-
-	case "$bridge" in
-		br-*)
-			bridge=$(echo $bridge | cut -c4-)
-		;;
-	esac
-
-	echo $bridge
-}
-
-disable_bstas() {
-	section="$1"
-
-	config_get mode "$section" mode "ap"
 	config_get ifname "$section" ifname
-	config_get device "$section" device
-	#echo mode=$mode ifname=$ifname > /dev/console
+	config_get_bool onboarded "$section" onboarded 0
 
-	[ "$mode" == "sta" ] || return
+	[ "$onboarded" -eq 0 ] && return
 
-	uci set wireless.$section.disabled=1
-	bridge=$(get_bridge $ifname)
-	if [ "$bridge" != "" ]; then
-		#echo got bridge = $bridge > /dev/console
-		ubus call network.interface.$bridge remove_device '{"name":"$ifname"}'
-	fi
-	ifconfig "$ifname" down
-
-	diff=1
-	#echo disabled $ifname > /dev/console
+	wpa_cli -i "$ifname" "$action" > /dev/null 2>&1
 }
 
-enable_bstas() {
-	section="$1"
-	config_load "wireless"
-
-	config_get mode "$section" mode "ap"
-	config_get ifname "$section" ifname
-	config_get device "$section" device
-	#echo mode=$mode ifname=$ifname > /dev/console
-
-	[ "$mode" == "sta" ] || return
-
-	uci set wireless.$section.disabled=0
-	ifconfig "$ifname" up
-
-	diff=1
-	#echo enabled $ifname > /dev/console
-}
-
-config_load "wireless"
-
-if [ "$LINK" == "up" ]; then
-	config_foreach disable_bstas wifi-iface
+if [ "$LINK" = "up" ]; then
+	touch /tmp/map.agent.bsta_global_disable
+	config_load "mapagent"
+	config_foreach update_bstas bk-iface disconnect
 else
-	config_foreach enable_bstas wifi-iface
+	rm -f /tmp/map.agent.bsta_global_disable
+	config_load "mapagent"
+	config_foreach update_bstas bk-iface reconnect
 fi
-
-#echo diff = $diff > /dev/console
-
-uci -q commit wireless
-[ "$diff" == "1" ] && {
-	#echo reloading via uci > /dev/console
-	ubus call uci commit '{"config":"wireless"}'
-}

map-agent/files/etc/hotplug.d/ethernet/map-topology-discovery

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+[ "$LINK" == "up" ] || exit 0
+[ "$PORT" == "" ] && exit 1
+
+ubus list ieee1905 > /dev/null 2>&1
+
+rc="$?"
+
+[ "$rc" != 0 ] && exit 1
+
+issue_discovery() {
+	local iface="$1"
+
+	res=$(ubus -t5 call ieee1905 buildcmdu "{\"type\":0, \"ifname\":\"${iface}\"}")
+	json_load "$res" > /dev/null 2>&1
+	json_get_var data data
+
+	[ "$data" == "" ] && return
+
+	ubus call ieee1905 cmdu "{\"dst\":\"01:80:c2:00:00:13\", \"type\":0, \"data\":\"${data}\"}"
+}
+
+process_vlans() {
+	section="$1"
+
+	config_get ifname "$section" ifname
+	config_get name "$section" name
+
+	[ "$2" == "$ifname" ] || return
+	[ "$name" == "" ] && return
+
+	issue_discovery $name
+
+	json_cleanup
+}
+
+# find and publish over any vlans
+config_load network
+config_foreach process_vlans interface $PORT
+config_foreach process_vlans device $PORT
+
+issue_discovery $PORT

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

@@ -8,6 +8,10 @@ USE_PROCD=1
 start_service() {
 	config_load "mapagent"
 
+	ubus -t 5 wait_for wifi
+
+	sleep 2
+
 	local enabled
 	config_get_bool enabled agent enabled 1
 	[ "$enabled" -eq 0 ] && return 1

map-agent/files/lib/wifi/multiap

@@ -0,0 +1,298 @@
+#!/bin/sh
+
+# functions
+# wireless_teardown - tear down ifaces based on mapagent config
+# setup_network     - prepare /etc/config/network if necessary
+# setup_wireless    - prepare /etc/config/wireless based on mapagent config
+# write_credentials - write bBSS credentials to fBSS
+
+. /lib/functions.sh
+
+diff=0
+
+usage() {
+	cat <<EOF
+Usage: $0 [wireless_teardown|setup_network|setup_wireless|write_credentials]
+Platform specific Multi-AP script to prepare network and wifi subsystem based on
+mapagent configuration.
+wireless_teardown - tear down ifaces in /etc/config/wireless
+setup_network     - prepare /etc/config/network
+setup_wireless    - prepare /etc/config/wireless
+write_credentials - write bBSS credentials to fBSS
+EOF
+	exit 1
+}
+
+brcm_sync_credentials() {
+	bands=""
+	mapagent_process_fh() {
+		local section=$1
+		local dev=$2
+
+		config_get device $section device
+
+		[ "$dev" != "$device" ] && return
+
+		config_get band $section band
+		config_get ssid $section ssid
+		config_get encryption $section encryption
+		config_get key $section key
+
+		section=$(uci add ieee1905 ap)
+		[ "$section" == "" ] && return
+
+		uci set ieee1905.${section}.band=$band
+		uci set ieee1905.${section}.ssid=$ssid
+		uci set ieee1905.${section}.encryption=$encryption
+		uci set ieee1905.${section}.key=$key
+	}
+
+	mapagent_process_radio() {
+		local section=$1
+
+		config_get device $section device
+		config_get band $section band
+		config_get dedicated_backhaul $section dedicated_backhaul 0
+
+		[ "$dedicated_backhaul" != "0" ] && return
+
+		for b in $bands; do
+			if [ "$b" == "$band" ]; then
+				return
+			fi
+		done
+
+		config_foreach mapagent_process_fh fh-iface $device
+		bands="$bands $band"
+	}
+
+	ieee1905_del_ap() {
+		local section=$1
+
+		uci -q delete ieee1905.${section}
+	}
+
+	config_load ieee1905
+	config_foreach ieee1905_del_ap ap
+
+	config_load mapagent
+	config_foreach mapagent_process_radio wifi-radio
+
+	uci commit ieee1905
+}
+
+
+brcm_write_credentials() {
+	config_load mapagent
+
+	mapagent_apply_wireless() {
+		write_wireless() {
+			local section=$1
+			local map_ifname=$2
+			local bk_ssid=$3
+			local bk_key=$4
+
+			config_get ifname $section ifname
+
+			#echo found device=$device map=$multi_ap ifname=$ifname mapifname=$map_ifname
+
+			[ "$ifname" != "$map_ifname" ] && return
+
+			#echo applying bk_ssid = $bk_ssid bk_key = $bk_key
+
+			uci -q set wireless.${section}.multi_ap_backhaul_ssid="$bk_ssid"
+			uci -q set wireless.${section}.multi_ap_backhaul_key="$bk_key"
+		}
+		config_load wireless
+
+		config_foreach write_wireless wifi-iface $1 $2 $3
+	}
+
+	mapagent_find_fbss() {
+		local section=$1
+		local dev=$2
+		local bk_ssid=$3
+		local bk_key=$4
+
+		config_get device $section device
+		config_get multi_ap $section multi_ap "0"
+
+		#echo found dev=$dev device=$device map=$multi_ap
+
+		[ "$device" != "$dev" ] && return
+		[ "$multi_ap" != "2" ] && return
+
+		config_get ifname $section ifname
+
+		#echo applying bk_ssid = $bk_ssid bk_key = $bk_key
+
+		# subshell in hopes to maintain mapagent config loaded
+		$(mapagent_apply_wireless $ifname $bk_ssid $bk_key)
+	}
+
+	mapagent_find_bbss() {
+		local section=$1
+		local dev=$2
+
+		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
+
+		[ "$enabled" == "0" ] && return
+		[ "$device" != "$dev" ] && return
+		[ "$multi_ap" != "1" ] && return
+
+		config_get ssid $1 ssid
+		config_get key $1 key
+
+		#echo found ssid=$ssid key=$key
+
+		config_foreach mapagent_find_fbss fh-iface $dev $ssid $key
+	}
+
+	mapagent_process_radio() {
+		local section=$1
+
+		config_get device $section device
+
+		#echo found dev=$dev
+
+		config_foreach mapagent_find_bbss fh-iface $device
+	}
+
+
+	config_foreach mapagent_process_radio wifi-radio
+
+	uci commit wireless
+}
+
+bsta_steer() {
+	local ifname=$1
+	local bssid=$2
+
+	wpa_cli -i $ifname set_n 0 bssid $bssid
+	wpa_cli -i $ifname roam $bssid
+}
+
+write_bsta_config() {
+	local ifname=$1
+
+	#echo diff = $diff > /dev/console
+
+	config_load mapagent
+
+	mapagent_apply_wl_bsta() {
+		apply_config() {
+			local section=$1
+			local bsta=$2
+			local bssid=$3
+
+			config_get ifname $section ifname
+
+			[ "$bsta" == "$ifname" ] || return
+			#echo setting diff = $diff > /dev/console
+			uci set wireless.${section}.bssid=$bssid
+			echo 1
+		}
+		config_load wireless
+
+		config_foreach apply_config wifi-iface $1 $2
+		uci commit wireless
+	}
+
+	mapagent_process_bk() {
+		local section=$1
+		local bsta=$2
+
+		config_get ifname $section ifname
+		#echo bsta = $bsta > /dev/console
+
+		[ "$bsta" == "$ifname" ] || return
+		#echo found ifname=$ifname > /dev/console
+
+		config_get bssid $section bssid
+		ret=$(mapagent_apply_wl_bsta $ifname $bssid)
+		[ "$ret" == "1" ] && diff=1
+	}
+
+
+	config_foreach mapagent_process_bk bk-iface $ifname
+
+	#echo result diff = $diff > /dev/console
+	[ "$diff" == "1" ] && {
+		ubus call uci commit '{"config":"wireless"}'
+		#echo reloading wireless > /dev/console
+	}
+
+}
+
+brcm_teardown_iface() {
+	config_load mapagent
+
+	local iface=$1
+
+	mapagent_teardown_wireless() {
+		write_wireless() {
+			local section=$1
+			local map_ifname=$2
+
+			config_get ifname $section ifname
+
+			[ "$ifname" != "$map_ifname" ] && return
+
+			uci -q set wireless.${section}.start_disabled="1"
+			uci -q set wireless.${section}.ssid="DISABLED-SSID"
+			uci -q set wireless.${section}.key="DISABLED-KEY"
+			uci -q delete wireless.${section}.multi_ap_backhaul_ssid
+			uci -q delete wireless.${section}.multi_ap_backhaul_key
+		}
+
+		config_load wireless
+
+		config_foreach write_wireless wifi-iface $1
+	}
+
+	mapagent_teardown_bss() {
+		local section=$1
+		local iface=$2
+
+		config_get ifname $section ifname
+
+		[ "$iface" != "$ifname" ] && return
+
+		config_get ifname $section ifname
+		uci -q set mapagent.${section}.enabled="0"
+		uci -q set mapagent.${section}.ssid="DISABLED-SSID"
+		uci -q set mapagent.${section}.key="DISABLED-KEY"
+
+		# subshell in hopes to maintain mapagent config loaded
+		$(mapagent_teardown_wireless $ifname)
+	}
+
+
+	config_foreach mapagent_teardown_bss fh-iface $iface
+
+	uci commit wireless
+	uci commit mapagent
+}
+
+
+
+func=$1
+shift
+
+case "$func" in
+	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 $@;;
+	write_bsta_config) write_bsta_config $@;;
+	teardown_iface) brcm_teardown_iface $@;;
+	--help|help) usage;;
+	*) usage; exit 1;;
+esac
+

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.4.12
+PKG_VERSION:=4.0.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e4d286f6348519de2613d4ba3548ec811c60ad7b
+PKG_SOURCE_VERSION:=3e6e113fdbfdb8a2e230fc74ebe8a36f9696ede2
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
@@ -17,13 +17,16 @@ PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-controller.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 
+
+PKG_BUILD_DEPENDS:=map-plugin
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libmaputils +libwsc +libeasy
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin
 endef
 
 define Package/map-controller/description

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

@@ -14,7 +14,6 @@ handle_controller_select() {
 
 start_service() {
 	local enabled
-	local local_ctrl=0
 
 	config_load "mapcontroller"
 	config_get_bool enabled controller enabled 1
@@ -23,9 +22,13 @@ start_service() {
 	procd_open_instance
 	procd_set_param command "/usr/sbin/mapcontroller" "-d"
 
-	config_load "mapagent"
-	config_foreach handle_controller_select controller_select
-	[ "$local_ctrl" -eq 0 ] && procd_append_param command "-w"
+	if [ -f /etc/config/mapagent ]; then
+	        local local_ctrl=0
+
+	        config_load "mapagent"
+	        config_foreach handle_controller_select controller_select
+	        [ "$local_ctrl" -eq 0 ] && procd_append_param command "-w"
+	fi
 
 	procd_set_param respawn
 #	procd_set_param stdout 1

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.1.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=eec19fb7f18863312760fe0db953d2f4e5ec9f5a
+PKG_SOURCE_VERSION:=c75cecf3b3862b709386fd1c8e88da2ce877c452
 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
@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/map-topology
 	CATEGORY:=Utilities
 	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
-		+libieee1905 +libavahi-nodbus-support
+		+libieee1905 +map-plugin +libavahi-nodbus-support
 	TITLE:=Utility to build topology of a multi-AP network
 endef
 

map-topology/files/etc/config/hosts

@@ -0,0 +1,4 @@
+
+config global 'global'
+	option ageing_timer '1440'
+	option reboot_persistent '0'

mcastmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

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

@@ -22,7 +22,7 @@ generate_igmp_global_params(){
 
 generate_mcast_config(){
 
-	up_itf="$(uci -q get network.wan.ifname)"
+	up_itf="$(uci -q get network.wan.device)"
 
 	uci add mcast proxy
 	uci rename mcast.@proxy[-1]="igmp_proxy_1"
@@ -35,7 +35,6 @@ generate_mcast_config(){
 	uci set mcast.@proxy[-1].last_member_query_interval="10"
 	uci set mcast.@proxy[-1].fast_leave="1"
 	uci set mcast.@proxy[-1].snooping_mode="2"
-	uci set mcast.@proxy[-1].lan_to_lan="0"
 	uci add_list mcast.@proxy[-1].downstream_interface="br-lan"
 
 	IFS=" "

mcastmngr/files/lib/mcast/broadcom.sh

@@ -60,7 +60,6 @@ mld_p_down_interfaces=""
 mld_p_exceptions=""
 
 # Standard parameters need by BCM's multicast daemon
-l_2_l_mcast=0
 allow_brdevice=0
 
 proxdevs=""
@@ -89,7 +88,6 @@ read_snooping() {
 		config_get igmp_s_mode "$config" snooping_mode 0
 		config_get igmp_s_iface "$config" interface
 		config_get igmp_s_exceptions "$config" filter
-		config_get l_2_l_mcast "$config" lan_to_lan
 		return
 	fi
 
@@ -104,7 +102,6 @@ read_snooping() {
 		config_get mld_s_mode "$config" snooping_mode 0
 		config_get mld_s_iface "$config" interface
 		config_get mld_s_exceptions "$config" filter
-		config_get l_2_l_mcast "$config" lan_to_lan
 		return
 	fi
 }
@@ -133,7 +130,6 @@ read_proxy() {
 		config_get igmp_p_up_interfaces "$config" upstream_interface
 		config_get igmp_p_down_interfaces "$config" downstream_interface
 		config_get igmp_p_exceptions "$config" filter
-		config_get l_2_l_mcast "$config" lan_to_lan
 		return
 	fi
 
@@ -149,7 +145,6 @@ read_proxy() {
 		config_get mld_p_up_interfaces "$config" upstream_interface
 		config_get mld_p_down_interfaces "$config" downstream_interface
 		config_get mld_p_exceptions "$config" filter
-		config_get l_2_l_mcast "$config" lan_to_lan
 		return
 	fi
 }
@@ -187,8 +182,6 @@ config_snooping_on_bridge() {
 			br-*)
 				# set snooping mode on the bridge
 				bcmmcastctl mode -i $snpif -p $bcm_mcast_p -m $3
-				# set L2L snooping mode on the bridge
-				bcmmcastctl l2l -i $snpif -p $bcm_mcast_p -e $l_2_l_mcast # set L2L snooping mode on the bridge
 			;;
 		esac
 	done
@@ -350,7 +343,6 @@ disable_snooping() {
 
 	for br in $(brctl show | grep 'br-' | awk '{print$1}' | tr '\n' ' '); do
 		bcmmcastctl mode -i $br -p $bcm_mcast_p -m 0 # disable snooping on all bridges
-		bcmmcastctl l2l -i $br -p $bcm_mcast_p -e 0 # disable L2L snooping on all bridges
 	done
 }
 

obuspa/Makefile

@@ -5,15 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=3.0.0.28
+PKG_VERSION:=4.1.0.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=31d80ee826076953c24bdd1a67bc61560ed3e69f
+PKG_SOURCE_VERSION:=619ba11d7bff1b5b4903e55546c9375aecd24f71
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -85,6 +85,7 @@ define Package/obuspa/install
 	$(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_BIN) ./files/etc/hotplug.d/iface/85-obuspa $(1)/etc/hotplug.d/iface/
 endef
 

obuspa/files/etc/config/obuspa

@@ -5,7 +5,8 @@ config obuspa 'global'
 	option debug '0'
 	option log_level '1'
 	#option db_file '/etc/obuspa/usp.db'
-	option role_file '/etc/obuspa/roles.json'
+	#option role_file '/etc/obuspa/roles.json'
+	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
@@ -19,7 +20,7 @@ config controller 'localcontroller'
 	option Protocol 'MQTT'
 	option Topic '/usp/controller'
 	option mqtt 'localmqtt'
-	option assigned_role_name 'Full Access'
+	option assigned_role_name 'full_access'
 
 # Adds Device.LocalAgent.MTP.
 config mtp
@@ -32,8 +33,6 @@ config mqtt 'localmqtt'
 	option BrokerAddress '127.0.0.1'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
-	option Username 'admin'
-	option Password 'admin'
 
 # Add Device.LocalAgent.Subscription.
 config subscription
@@ -43,18 +42,18 @@ config subscription
 	option Persistent 'true'
 	option controller 'localcontroller'
 
-config challenge 'admin'
-	option Description 'Request to get Administrative access'
-	option role_name 'Full Access'
-	option Enable '1'
-	option Value 'admin'
-	option Retries 2
-	option LockoutPeriod 60
+#config challenge 'admin'
+#	option Description 'Request to get Administrative access'
+#	option role_name 'full_access'
+#	option Enable '1'
+#	option Value 'admin'
+#	option Retries 2
+#	option LockoutPeriod 60
 
-config challenge 'user'
-	option Description 'Request to get User access'
-	option role_name 'user'
-	option Enable '1'
-	option Value 'user'
-	option Retries 3
-	option LockoutPeriod 30
+#config challenge 'user'
+#	option Description 'Request to get User access'
+#	option role_name 'user'
+#	option Enable '1'
+#	option Value 'user'
+#	option Retries 3
+#	option LockoutPeriod 30

obuspa/files/etc/init.d/obuspa

@@ -32,7 +32,7 @@ cleanup() {
 trap cleanup EXIT
 
 log() {
-	echo "${@}"|logger -t obuspa -p debug
+	echo "${@}"|logger -t obuspa.init -p debug
 }
 
 db_set() {
@@ -52,33 +52,35 @@ get_index() {
 
 get_role_index_from_json() {
 	local role="${@}"
+	local num=0
 
 	# In case of role is empty or file not present
 	if [ -z "${role}" -o ! -f ${role_def_file} ]; then
-		echo 0
 		return 0
 	fi
 
 	json_init
 	json_load_file ${role_def_file}
-	if [ $? -ne 0 ]; then # In case of invalid json file
-		echo 0
-		return 0
-	fi
 
 	json_select roles
 	json_get_keys roles_obj
 
 	for k in ${roles_obj}; do
+		local rname
 		json_select $k
-		json_get_var name name
+		json_get_var rname name
 		json_select ..
-		if [ "${role}" = "${name}" ]; then
-			echo "${k}"
-			return 0
+
+		if [ "${rname}" != "Untrusted" -a "${rname}" != "full_access" ]; then
+			num=$(( num + 1 ))
+		fi
+
+		if [ "${role}" = "${rname}" ]; then
+			return ${num}
 		fi
 	done
-	echo 0
+
+	return 0
 }
 
 get_uci_ref_index() {
@@ -107,11 +109,11 @@ validate_obuspa_section()
 		'trust_cert:file' \
 		'client_cert:file' \
 		'interface:string' \
-		'ifname:string:"br-lan"' \
+		'ifname:string:br-lan' \
 		'debug:bool:false' \
 		'log_level:uinteger' \
-		'log_dest:file' \
-		'db_file:file' \
+		'log_dest:string' \
+		'db_file:string' \
 		'role_file:file'
 }
 
@@ -361,24 +363,45 @@ validate_challenge_section()
 		'LockoutPeriod:uinteger:0'
 }
 
+check_json_load()
+{
+	local ret=0
+	if [ -f ${role_def_file} ]; then
+		json_init
+		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
+	fi
+	json_init
+	return ${ret}
+}
+
 get_role_index() {
 	local role="Device.LocalAgent.ControllerTrust.Role"
-	local index=0
+	local idx=0
 	local role_name="${@}"
 
 	case "${role_name}" in
-	'Full Access')
-	     index=1;
-	     ;;
+	'full_access')
+		idx=1;
+		;;
 	'Untrusted')
-	     index=2;
-	     ;;
+		idx=2;
+		;;
 	 *)
-	     local ji=$(get_role_index_from_json ${role_name})
-	     index=$(( ji + 2 )) # Add predefined roles
+		local ji=0
+
+		check_json_load
+		if [ $? -eq 0 ]; then
+			get_role_index_from_json ${role_name}
+			ji=$?
+		fi
+		idx=$(( ji + 2 )) # Add predefined roles
 	 esac
 
-	 echo "${role}.${index}"
+	 echo "${role}.${idx}"
 }
 
 configure_challenges() {
@@ -539,7 +562,6 @@ configure_obuspa() {
 	}
 
 	role_def_file="${role_file}"
-	[ ${enabled} -eq 0 ] && return 0
 
 	if [ ${debug} -eq 1 ]; then
 		# Forward stdout of the command to logd
@@ -626,35 +648,21 @@ remove_db() {
 }
 
 service_running() {
-	local AgentEndpointID serial oui user pass
-	local opt=""
-
 	ubus -t 10 wait_for usp.raw
-	config_load obuspa
-	config_get AgentEndpointID localagent EndpointID ""
-	if [ -z "${AgentEndpointID}" ]; then
-		serial=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.SerialNumber"}'|jsonfilter -e '@["parameters"][0].value')
-		oui=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.ManufacturerOUI"}'|jsonfilter -e '@["parameters"][0].value')
-		AgentEndpointID="os::${oui}-${serial}"
-	fi
-
-	config_get user localmqtt Username
-	if [ -n "${user}" ]; then
-		opt="-u ${user}"
-	fi
-	config_get pass localmqtt Password
-	if [ -n "${pass}" ]; then
-		opt="${opt} -P ${pass}"
-	fi
-	# publish Agent's EndpointID in mosquito broker for discovery
-	# This is a work around till obuspa does not support advertising
-	log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
-	mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" ${opt}
-
 	procd_running ${CONFIGURATION}
 }
 
 start_service() {
+	local enabled
+
+	config_load obuspa
+	config_get enabled global enabled
+
+	if [ "${enabled}" -eq 0 ]; then
+		log "OBUSPA not enabled"
+		return 0;
+	fi
+
 	ubus wait_for usp.raw
 	if [ "$?" -ne 0 ]; then
 		log "OBUSPA failed to start usp.raw not available"

obuspa/files/etc/obuspa/dmcaching_exclude.json

@@ -0,0 +1,6 @@
+{
+  "dmcaching_exclude": [
+    "Device.DeviceInfo.ProcessStatus.Process.",
+    "Device.Hosts.Host."
+  ]
+}

periodicstats/Makefile

@@ -5,14 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=91b15f9779baccc93213ce3ca164c326235d3096
+PKG_SOURCE_VERSION:=d53b540a89165753922707ed624b315d58abd10a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -25,7 +26,7 @@ define Package/periodicstats
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Periodic Statistics Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm +libbbf_api +uspd
 endef
 
 define Package/periodicstats/description

periodicstats/files/etc/config/periodicstats

@@ -1,3 +1,4 @@
 config globals 'globals'
 	option enable '0'
+	option base_interval '5'
 

periodicstats/files/etc/init.d/periodicstats

@@ -10,6 +10,7 @@ PROG=/usr/sbin/periodicstatsd
 . /lib/functions.sh
 
 start_service() {
+	ubus wait_for usp
 	if [ -f "/etc/config/periodicstats" ]; then
 		if [ "$(uci -q get periodicstats.globals.enable)" == "1" ]; then
 			procd_open_instance periodicstatsd
@@ -25,12 +26,8 @@ stop() {
 	echo ;
 }
 
-boot() {
-	start
-}
-
 service_triggers() {
-	procd_add_reload_trigger periodicstats
+	procd_add_reload_trigger periodicstats uspd
 }
 
 reload_service() {
@@ -38,6 +35,3 @@ reload_service() {
 	start
 }
 
-restart() {
-	start
-}

prj-unish/Makefile

@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2021 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=prj-unish
-PKG_VERSION:=1.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a47110968d57fa1d0765900254b63c8ef983e741
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/prj-unish.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/prj-unish
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Project unish
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl
-endef
-
-define Package/prj-unish/description
- This package provides unish-paanch.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-MAKE_PATH:=src
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-  rsync -r --exclude=.* ~/git/prj-unish/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Build/InstallDev
-	#$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	#$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(STAGING_DIR)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/lib*.so* $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/lib*.so* $(1)/usr/lib/
-endef
-
-
-define Package/prj-unish/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/lib*.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/i1905d $(1)/usr/sbin/
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,prj-unish))

prj-unish/files/etc/config/i1905

@@ -1,23 +0,0 @@
-
-config ieee1905 'ieee1905'
-        option enabled '1'
-        option extension 0
-	option macaddress 'aa:aa:aa:10:20:30'
-	option registrar '2 5'
-
-config ap
-	option band '2'
-	option ssid 'TestSSID.2'
-	option encryption 'psk2'
-	option key '5555500000'
-
-config ap
-	option band '5'
-	option ssid 'TestSSID.5'
-	option encryption 'psk2'
-	option key '2222200000'
-
-config al-iface
-        option enabled 1
-        option ifname 'br-lan'
-	option type 'bridge'

qosmngr/Makefile

@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=03df56c6eb7c6737ce95576e89c915df77396953
+PKG_SOURCE_VERSION:=460327011d932580f55c7b70acb1e652dd3c95a3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 

qosmngr/files/etc/uci-defaults/60-qos_queue_generate

@@ -3,7 +3,7 @@
 . /lib/functions.sh
 
 ethwan="$(db -q get hw.board.ethernetWanPort)"
-cpu_model="$(grep Hardware /proc/cpuinfo  | awk '{print$NF}')"
+cpu_model="$(brcm_fw_tool -k info)"
 
 generate_queue(){
 	section="$1"
@@ -19,7 +19,7 @@ generate_queue(){
 
         if [ $is_lan -eq 1 ]; then
 		case $cpu_model in
-			BCM968*) no_of_q="0 1 2 3" ;;
+			68*) no_of_q="0 1 2 3" ;;
 		esac
 	fi
 

qosmngr/files/lib/qos/broadcom.sh

@@ -52,7 +52,7 @@ configure_precedence_to_file() {
 	line="$2"
 	order_file="$3"
 
-	if [ $order == $PREV_ORDER ]; then
+	if [ $order == "$PREV_ORDER" ]; then
 		queue_id=${line#*_}
 		val=${CURR_ORDER}_${queue_id}
 		echo $val >> $order_file
@@ -122,7 +122,7 @@ handle_queue() {
 	fi
 
 	# This is to get the qid per interface.
-	if [ $INTF_NAME == $ifname ]; then
+	if [ "$INTF_NAME" == $ifname ]; then
 		Q_COUNT=$((Q_COUNT + 1))
 	else
 		Q_COUNT='0'
@@ -231,6 +231,12 @@ handle_shaper() {
 	fi
 
 	config_get rate "$sid" "rate"
+	# Convert the rate from bps to kbps.
+	if [ $rate -lt 1000 ];then
+		return
+	fi
+
+	rate=$(($rate / 1000))
 	config_get bs "$sid" "burst_size"
 	tmctl setportshaper --devtype 0 --if $ifname --shapingrate $rate --burstsize $bs
 }
@@ -299,7 +305,20 @@ broute_filter_on_dst_mac() {
 }
 
 broute_filter_on_pcp() {
-	BR_RULE="$BR_RULE --skbvlan-prio $1"
+	# 5.04 onwards the vlan extension in ebtables is used for classification
+	# on the basis of vlan params which needs proto to be defined as 802_1Q in
+	# order to add a rule, now, proto can also be defined by specifying proto uci
+	# option as well as the rule may have a vlan id as well in which case the
+	# proto will already be present, hence, this check to not add --proto more
+	# than once
+	case "$BR_RULE" in
+	*proto*)
+		BR_RULE="$BR_RULE --vlan-prio $1"
+		;;
+	*)
+		BR_RULE="$BR_RULE --proto 802_1Q --vlan-prio $1"
+		;;
+	esac
 }
 
 broute_filter_on_ether_type() {
@@ -307,7 +326,14 @@ broute_filter_on_ether_type() {
 }
 
 broute_filter_on_vid() {
-	BR_RULE="$BR_RULE --skbvlan-id $1"
+	case "$BR_RULE" in
+	*proto*)
+		BR_RULE="$BR_RULE --vlan-id $1"
+		;;
+	*)
+		BR_RULE="$BR_RULE --proto 802_1Q --vlan-id $1"
+		;;
+	esac
 }
 
 broute_rule_set_traffic_class() {

sulu/Makefile

@@ -5,41 +5,40 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=0.2.3
+PKG_VERSION:=0.2.18
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
-PKG_SOURCE_VERSION:=5f9c2ffb64a4cc46ffee59b6bbfafdaa26a7ab4f
+PKG_SOURCE_VERSION:=06411282a6c2d02d21599786c0dd12c00c711847
 
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
 PKG_RELEASE=$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/sulu
-#  $(Package/sulu/default)
-  SECTION:=sulu
-  CATEGORY:=Utilities
-  MENU=1
-  TITLE:=SULU-CE ReactJS based Web UI Package
-  DEPENDS:=+nginx
+	SECTION:=sulu
+	CATEGORY:=Utilities
+	MENU=1
+	TITLE:=SULU-CE ReactJS based Web UI Package
+	DEPENDS:=+nginx
 endef
 
 define Package/sulu/description
- SULU-CE ReactJS based Web UI.
+	SULU-CE ReactJS based Web UI.
 endef
 
 define Package/sulu/install
 	$(INSTALL_DIR) $(1)/sulu
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
-#	$(CP) ./files/* $(1)/
+	$(CP) ./files/* $(1)/
 endef
 
 $(eval $(call BuildPackage,sulu))

sulu/files/etc/init.d/sulu

@@ -0,0 +1,63 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+
+log() {
+	echo "${@}"|logger -t sulu.init -p debug
+}
+
+publish_endpoint() {
+	local AgentEndpointID serial oui user pass
+	local opt=""
+
+	# return if mosquitto_pub is not present
+	if ! which mosquitto_pub; then
+		log "mosquitto_pub not present can't publish endpointid"
+		return 0;
+	fi
+
+	ubus -t 10 wait_for usp.raw
+
+	# Get endpoint id from obuspa config first
+	config_load obuspa
+	config_get AgentEndpointID localagent EndpointID ""
+	if [ -z "${AgentEndpointID}" ]; then
+		serial=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.SerialNumber"}'|jsonfilter -e '@["parameters"][0].value')
+		oui=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.ManufacturerOUI"}'|jsonfilter -e '@["parameters"][0].value')
+		AgentEndpointID="os::${oui}-${serial}"
+	fi
+
+	config_get user localmqtt Username
+	if [ -n "${user}" ]; then
+		opt="-u ${user}"
+	fi
+	config_get pass localmqtt Password
+	if [ -n "${pass}" ]; then
+		opt="${opt} -P ${pass}"
+	fi
+
+	# publish Agent's EndpointID in mosquito broker for discovery
+	# This is a work around till obuspa does not support advertising
+	log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
+	mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" ${opt}
+}
+
+start_service() {
+	procd_open_instance sulu
+	publish_endpoint
+	procd_close_instance
+
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers()
+{
+	procd_add_config_trigger "config.change" "obuspa" /etc/init.d/sulu reload
+}

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

@@ -0,0 +1,18 @@
+# proxy required for nginx to save the file
+location /upload_proxy {
+    return 200 "File upload is successful \n";
+}
+
+location /upload {
+	limit_except POST { deny all; }
+	client_body_temp_path /tmp/sulu; # the directory to which uploads will be saved, make sure to create the directory you wish to use
+	client_body_in_file_only on;
+	client_body_buffer_size 128K;
+	client_max_body_size 50M;
+	proxy_pass_request_headers on;
+	proxy_set_header X-FILE $request_body_file;
+	proxy_set_body $request_body_file;
+	proxy_redirect off;
+	#proxy_pass is necessary. body is only stored when being passed to middleware, so we are providing a proxy that just returns 200.
+	proxy_pass http://127.0.0.1:8080/upload_proxy;
+}

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

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

swmodd/Makefile

@@ -6,13 +6,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=1.1.0
+PKG_VERSION:=2.0.4
 
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c8cc4a3b332ea931dbf2fe7e6b94bebf5c4bcc33
+PKG_SOURCE_VERSION:=8c18c55738966889f2661afaefe7c5eac1116a10
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -21,12 +24,14 @@ include $(INCLUDE_DIR)/package.mk
 define Package/swmodd
 	SECTION:=utils
 	CATEGORY:=Utilities
-	TITLE:=SWMOD - software modules ubus backend
-	DEPENDS:=+libuci +libubox +ubus +libuuid +PACKAGE_liblxc:liblxc
+	TITLE:= Software Modules Daemon
+	DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +opkg \
+	    +PACKAGE_liblxc:liblxc +PACKAGE_liblxc:cgroupfs-mount \
+	    +@BUSYBOX_CONFIG_BUSYBOX +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
 endef
 
 define Package/swmodd/description
-	Ubus based backend for software modules which can be used by other applications running on top of it.
+	Software module daemon to manage software/deployment units using TR181 datamodel.
 endef
 
 TARGET_CFLAGS += \
@@ -38,13 +43,27 @@ MAKE_FLAGS += \
 	SWMOD_LXC="yes"
 endif
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/swmodd/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/swmodd.init $(1)/etc/init.d/swmodd
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/etc/swmod
-	$(INSTALL_CONF) ./files/map_du $(1)/etc/swmod/map_du
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_CONF) ./files/map_du $(1)/etc/swmod/map_du
+	$(INSTALL_BIN) ./files/swmodd.init $(1)/etc/init.d/swmodd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swmodd $(1)/usr/sbin/swmodd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libswmodd.so $(1)/usr/lib/bbfdm/libswmodd.so
+ifeq ($(CONFIG_PACKAGE_liblxc),y)
+	$(INSTALL_DIR) $(1)/usr/share/lxc/templates/
+	$(INSTALL_DIR) $(1)/usr/share/swmodd/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/templates/lxc-iopsys $(1)/usr/share/lxc/templates/lxc-iopsys
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/opkg_offline.sh $(1)/usr/share/swmodd/opkg_offline
+endif
 endef
 
 $(eval $(call BuildPackage,swmodd))

swmodd/files/swmodd.init

@@ -7,7 +7,7 @@ USE_PROCD=1
 PROG=/usr/sbin/swmodd
 
 start_service() {
-	procd_open_instance
+	procd_open_instance swmodd
 	procd_set_param command ${PROG}
 	procd_set_param respawn
 	procd_close_instance

urlfilter/Makefile

@@ -6,14 +6,15 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=891e8d36446c0b1e7999c5798375985b1804fcf1
+PKG_SOURCE_VERSION:=a2fca29140673d058eb0bfb2b3b3c9e61d7f301f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -26,7 +27,7 @@ define Package/urlfilter
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=URL filter
-  DEPENDS:=+libuci +libnetfilter-queue +libnfnetlink +iptables-mod-nfqueue +libpthread +libubox +ubus
+  DEPENDS:=+libuci +libnetfilter-queue +libnfnetlink +iptables-mod-nfqueue +libpthread +libubox +ubus +conntrack
 endef
 
 define Package/urlfilter/description

urlfilter/files/etc/init.d/urlfilter

@@ -9,14 +9,31 @@ PROG=/usr/sbin/urlfilter
 
 configure_firewall()
 {
-	iptables -L FORWARD|grep -iqE "NFQUEUE"
+	iptables -w -L FORWARD|grep -iqE "NFQUEUE"
 	if [ "$?" -ne 0 ]; then
-		echo "Applying firewall rule to setup NFQUEUE on forward traffic for urlfiltering"
-		iptables -I FORWARD 1 -p tcp --dport 80 -j NFQUEUE --queue-num 0
-		iptables -I FORWARD 2 -p tcp --dport 443 -j NFQUEUE --queue-num 0
-		iptables -I INPUT 1 -p udp --dport 53 -j NFQUEUE --queue-num 0
-		iptables -I INPUT 2 -p udp --sport 53 -j NFQUEUE --queue-num 0
+		# setup netfilter queue 0, use queue bypass so that if no application is
+		# listening to this queue then traffic is unaffected.
+		iptables -w -I FORWARD 1 -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I FORWARD 2 -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I FORWARD 3 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I FORWARD 4 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I INPUT 1 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I INPUT 2 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+
+		# disable acceleration for https packet so that they can be read by urlfilter
+		ebtables -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG
 	fi
+	ip6tables -w -L FORWARD|grep -iqE "NFQUEUE"
+	if [ "$?" -ne 0 ]; then
+		#ip6table rules
+		ip6tables -w -I FORWARD 1 -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I FORWARD 2 -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I FORWARD 3 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I FORWARD 4 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I INPUT 1 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I INPUT 2 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+	fi
+
 }
 
 start_service() {
@@ -26,34 +43,44 @@ start_service() {
 		configure_firewall
 		procd_set_param respawn
 		procd_close_instance
+
+		# Now flush the existing connections, otherwise,
+		# URL filtering cannot be performed on already open sites.
+		if [ -n "$(which conntrack)" ]; then
+			sleep 5
+			conntrack -F
+		fi
 	fi
 }
 
 stop_service() {
-	pidof $NAME >/dev/null
-        if [ "$?" -eq 0 ]; then
-                pidof $NAME > /dev/null 2>&1 && killall -q $NAME
-                pidof $NAME > /dev/null 2>&1
-                while pidof $NAME > /dev/null 2>&1; do
-                        killall -q -9 $NAME
-                done
-        fi
-
-	iptables -L FORWARD|grep -iqE "NFQUEUE"
+	iptables -w -L FORWARD|grep -iqE "NFQUEUE"
 	if [ "$?" -eq 0 ]; then
-		echo "Deleting firewall rule to setup NFQUEUE on forward traffic for urlfiltering"
-		iptables -D FORWARD -p tcp --dport 80 -j NFQUEUE --queue-num 0
-		iptables -D FORWARD -p tcp --dport 443 -j NFQUEUE --queue-num 0
-		iptables -D INPUT -p udp --dport 53 -j NFQUEUE --queue-num 0
-		iptables -D INPUT -p udp --sport 53 -j NFQUEUE --queue-num 0
+		iptables -w -D FORWARD -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D FORWARD -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D FORWARD -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D INPUT -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D INPUT -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ebtables -D FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG
+	fi
+	ip6tables -w -L FORWARD|grep -iqE "NFQUEUE"
+	if [ "$?" -eq 0 ]; then
+		#ip6table rules
+		ip6tables -w -D FORWARD -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D FORWARD -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D FORWARD -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D INPUT -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D INPUT -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 	fi
 }
-
 reload_service() {
 	stop
 	start
 }
 
+
 service_triggers() {
 	procd_add_reload_trigger "urlfilter"
 	procd_add_reload_trigger "firewall"

uspd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.1.17
+PKG_VERSION:=2.1.24
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8f31734007fa2d9d4c551578f9f3436ca55a5c17
+PKG_SOURCE_VERSION:=9ac7cd1680807cfff751d044f2fc9e714e8b8039
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

wfadatad/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=3.3.1
+PKG_VERSION:=4.0.8
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9d7e1fea212fc06d7a1d37a5a52d9a55be0c36f2
+PKG_SOURCE_VERSION:=b206069d669200dedc2af20f5e912b3b3d6d3616
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -17,6 +17,9 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
+
+PKG_BUILD_DEPENDS:=map-plugin
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wfadatad
@@ -24,7 +27,7 @@ define Package/wfadatad
   CATEGORY:=Utilities
   TITLE:=WiFi Data Elements-1.0 Agent and Collector
   DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \
-	  +!WFA_DELM_STANDALONE:map-agent +WFA_DELM_MULTIAP_MODE:libmaputils
+	  +!WFA_DELM_STANDALONE:map-agent +libieee1905 +map-plugin
 endef
 
 define Package/wfadatad/description

wfadatad/files/wfadatad.init

@@ -7,12 +7,12 @@ USE_PROCD=1
 PROG=/usr/sbin/wfadatad
 
 service_running() {
-	ubus -t 2 wait_for ieee1905 map.1905
+	ubus -t 2 wait_for ieee1905 ieee1905.map
 }
 
 start_service() {
 	procd_open_instance
-	procd_set_param command "$PROG" "-d"
+	procd_set_param command "$PROG" "-d" "-t 15"
 	#procd_set_param respawn
 	procd_close_instance
 

wifimngr/Makefile

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