swmodd: update Makefile

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=2.0-2020-09-08
+PKG_VERSION:=1.6-2020-07-10
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8d721664e64aefb4625160909f5fdc176578afdb
+PKG_SOURCE_VERSION:=6a0545cf50b2d1c5c4e63b0640f1733e59d0ee34
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=4.8.6
+PKG_VERSION:=4.4.1
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7ee57451ac6ed25fd2c1c38e58a508b0362245a7
+PKG_SOURCE_VERSION:=4fdb0869c395825379c15c520d6dd35e624bd232
 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
@@ -64,17 +64,8 @@ ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
   KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM \
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-  ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_panther),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM96846
-  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_tiger),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM96858
-  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_eagle),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM963178
-  else
-    TARGET_CFLAGS +=-DCONFIG_BCM963138
-  endif
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_MEDIATEK

endptmngr/Makefile

@@ -18,7 +18,6 @@ PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION
 PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=endptmngr-open
 PATCH_DIR:=
-PKG_HASH:=skip
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
 PKG_SOURCE_PROTO:=git
@@ -43,7 +42,7 @@ define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +bcmkernel @TARGET_HAS_VOICE @!TARGET_NO_VOICE
+  DEPENDS:= +libubox +ubus +libpicoevent +bcmkernel @TARGET_HAS_VOICE
 endef
 
 define Package/endptmngr/description

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2020-09-08
+PKG_VERSION:=4.0-2020-07-07
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3499487844071f83116df520f09a1144d24028ed
+PKG_SOURCE_VERSION:=03a438d926247ac3eff5df1c5eeea3d6d2babd2b
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -74,13 +74,6 @@ define Package/icwmp-tr098
   DEPENDS:=+PACKAGE_icwmp-tr098:libuci +PACKAGE_icwmp-tr098:libmicroxml +PACKAGE_icwmp-tr098:libubox +PACKAGE_icwmp-tr098:jshn +PACKAGE_icwmp-tr098:libubus +PACKAGE_icwmp-tr098:libblobmsg-json +PACKAGE_icwmp-tr098:libpthread +PACKAGE_icwmp-tr098:ubusd +PACKAGE_icwmp-tr098:shflags +PACKAGE_icwmp-tr098:getopt +PACKAGE_icwmp-tr098:zlib +PACKAGE_icwmp-tr098:libjson-c +PACKAGE_icwmp-tr098:libopenssl +PACKAGE_icwmp-tr098:curl +PACKAGE_icwmp-tr098:libcurl +PACKAGE_icwmp-tr098:libtr098
 endef
 
-define Package/icwmp_notifd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=CWMP Active Notifications Detect tool
-  DEPENDS:=+PACKAGE_icwmp_notifd:libubox +PACKAGE_icwmp_notifd:libuci +PACKAGE_icwmp_notifd:libbbfdm +PACKAGE_icwmp_notifd:libjson-c +PACKAGE_icwmp_notifd:libubus +PACKAGE_icwmp_notifd:libblobmsg-json
-endef
-
 define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
@@ -150,11 +143,6 @@ CONFIGURE_ARGS += \
 	--enable-icwmp_bulkdata
 endif
 
-ifeq ($(CONFIG_PACKAGE_icwmp_notifd),y)
-CONFIGURE_ARGS += \
-	--enable-icwmp_notifd
-endif
-
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -275,15 +263,6 @@ define Package/icwmp_bulkdata/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
 endef
 
-define Package/icwmp_notifd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_notifd $(1)/usr/sbin/icwmp_notifd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_notifd $(1)/etc/init.d/icwmp_notifd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/icwmp_notifd $(1)/etc/config
-endef
-
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -310,5 +289,4 @@ $(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp_twamp))
 $(eval $(call BuildPackage,icwmp_bulkdata))
 $(eval $(call BuildPackage,icwmp-tr098))
-$(eval $(call BuildPackage,icwmp_notifd))
 #$(eval $(call BuildPackage,icwmp-zstream))

ieee1905/Config.in

@@ -21,8 +21,8 @@ menu "developer/debug options"
 		config IEEE1905_ALME_OVER_UBUS
 			bool "ALME methods supported over ubus"
 
-		#config IEEE1905_ALME_OVER_TCP
-		#	bool "ALME server over TCP port"
+		config IEEE1905_ALME_OVER_TCP
+			bool "ALME server over TCP port"
 
 	endchoice
 endmenu

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=2.0.26
+PKG_VERSION:=2.0.21
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b7840dfe0b57cbdd47ec3167cbc7d2a6f9e41fd4
+PKG_SOURCE_VERSION:=f1e130983a90c76f730741e4e211db72a6c543c0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
@@ -23,7 +23,7 @@ define Package/ieee1905
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 daemon
-  DEPENDS:= +libuci +libjson-c +libieee1905 +ubox +libpcap +libopenssl +libwifi +libeasy
+  DEPENDS:= +libuci +libjson-c +lib1905 +ubox +libpcap +libopenssl +libwifi +libeasy
 endef
 
 define Package/ieee1905/config
@@ -34,7 +34,7 @@ define Package/ieee1905/description
  IEEE1905 stack with extended functionalities.
 endef
 
-define Package/libieee1905
+define Package/lib1905
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 cmdu tlv utility library
@@ -92,23 +92,23 @@ define Package/lib1905hle/install
 	$(CP) $(PKG_BUILD_DIR)/lib/lib1905hle.so $(1)/usr/lib/lib1905hle.so
 endef
 
-define Package/libieee1905/install
+define Package/lib1905/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib/libieee1905.so
+	$(CP) $(PKG_BUILD_DIR)/lib/lib1905.so $(1)/usr/lib/lib1905.so
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/ieee1905
+	$(INSTALL_DIR) $(1)/usr/include/lib1905
 	$(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)/lib1905/include/*.h $(1)/usr/include/lib1905/
 	$(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
+	$(CP) $(PKG_BUILD_DIR)/lib/lib1905.so $(1)/usr/lib
 endef
 
-$(eval $(call BuildPackage,libieee1905))
+$(eval $(call BuildPackage,lib1905))
 $(eval $(call BuildPackage,lib1905hle))
 $(eval $(call BuildPackage,ieee1905))

ieee1905/files/etc/config/ieee1905

@@ -9,6 +9,7 @@ config ieee1905 'ieee1905'
 
 config security 'security'
         list method 'PBC'
+        option key 'TESTPASSWORD'
 
 config al-iface
         option enabled 1

ieee1905/files/etc/init.d/ieee1905

@@ -64,5 +64,4 @@ service_triggers() {
 	procd_add_reload_trigger "network"
 	procd_add_reload_trigger "wireless"
 	procd_add_reload_trigger "netmode"
-	procd_add_config_trigger "config.change" "ieee1905" /etc/init.d/ieee1905 restart
 }

iop/config

@@ -14,15 +14,10 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_ethtool=y
-CONFIG_PACKAGE_fatrace=y
 CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_icwmp-curl=y
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-1905=y
-CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_wfadatad=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_iopupgrade=m
@@ -66,7 +61,6 @@ CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_owsd=y
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_ppp-mod-pppoa=y
@@ -108,14 +102,13 @@ CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
 CONFIG_BUSYBOX_CONFIG_ARPING=y
-CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
 # CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
-# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
+CONFIG_BUSYBOX_CONFIG_HTTPD=y
 # CONFIG_BUSYBOX_CONFIG_INSMOD is not set
 # CONFIG_BUSYBOX_CONFIG_MODINFO is not set
 # CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
@@ -171,22 +164,6 @@ CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION=y
 CONFIG_BUSYBOX_CONFIG_USLEEP=y
 CONFIG_BUSYBOX_CONFIG_REALPATH=y
 CONFIG_BUSYBOX_CONFIG_TTY=y
-CONFIG_BUSYBOX_CONFIG_BLOCKDEV=y
-CONFIG_BUSYBOX_CONFIG_PARTPROBE=y
-CONFIG_BUSYBOX_CONFIG_LFS=y
-CONFIG_BUSYBOX_CONFIG_FDISK=y
-CONFIG_BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GPT_LABEL=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_BUSYBOX_CONFIG_IONICE=y
-CONFIG_BUSYBOX_CONFIG_RENICE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_F2FS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
-CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y

map-1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-1905
-PKG_VERSION:=0.0.10
+PKG_VERSION:=0.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7cdc6d38674bef2c6003a4b60b63be8a789421be
+PKG_SOURCE_VERSION:=2164f205d0a677fcd1e6bbe0095073a98fee116c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif

map-topology/Makefile

@@ -1,21 +1,22 @@
 #
-# Copyright (C) 2020 iopsys
+# Copyright (C) 2019 iopsys
 #
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=1.4.2
+PKG_VERSION:=0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=e22b79c1a1ec443fcc816439658fb4e8cedf21fb
+PKG_SOURCE_VERSION:=2242b834c82eaf064022c76a2f52eec20de351fe
 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
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif
 
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
@@ -23,15 +24,15 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/map-topology
 	CATEGORY:=Utilities
-	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy +libieee1905
-	TITLE:=Utility to build topology of a multi-AP network
+	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy +libmaputils
+	TITLE:=Map topology daemon
 endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include
 
 define Package/map-topology/description
-	Constructs network topology and show it as json structure over UBUS
+	gathers topology information and presents it as json structure
 endef
 
 MAKE_PATH:=src
@@ -44,8 +45,8 @@ endif
 
 define Package/map-topology/install
 	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/topologyd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/topo1905d $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,map-topology))

map-topology/files/etc/config/topology

@@ -1,6 +0,0 @@
-
-config topology 'topology'
-	option enabled '1'
-	option depth '8'
-	option interval '60'
-	option maxlog '32'

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

@@ -7,7 +7,8 @@ USE_PROCD=1
 
 start_service() {
 	procd_open_instance
-        procd_set_param command "/usr/sbin/topologyd"
+        procd_set_param command "/sbin/topo1905d"
+
 	procd_set_param respawn
 #	procd_set_param stdout 1
 	procd_set_param stderr 1

mcastmngr/files/lib/mcast/broadcom.sh

@@ -11,10 +11,6 @@ PROG_EXE=/usr/sbin/mcpd
 # Parameters available in snooping configuration
 igmp_s_enable=0
 igmp_s_version=2
-igmp_s_query_interval=125
-igmp_s_q_resp_interval=100
-igmp_s_last_mem_q_int=10
-igmp_s_fast_leave=1
 igmp_s_robustness=2
 igmp_s_mode=0
 igmp_s_iface=""
@@ -81,10 +77,6 @@ read_snooping() {
 	if [ "$proto" == "igmp" ]; then
 		igmp_s_enable=$sec_enable
 		config_get igmp_s_version "$config" version 2
-		config_get igmp_s_query_interval "$config" query_interval 125
-		config_get igmp_s_q_resp_interval "$config" query_response_interval 100
-		config_get igmp_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get igmp_s_fast_leave "$config" fast_leave 1
 		config_get igmp_s_robustness "$config" robustness 2
 		config_get igmp_s_mode "$config" snooping_mode 0
 		config_get igmp_s_iface "$config" interface
@@ -96,10 +88,6 @@ read_snooping() {
 	if [ "$proto" == "mld" ]; then
 		mld_s_enable=$sec_enable
 		config_get mld_s_version "$config" version 2
-		config_get mld_s_query_interval "$config" query_interval 125
-		config_get mld_s_q_resp_interval "$config" query_response_interval 100
-		config_get mld_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get mld_s_fast_leave "$config" fast_leave 1
 		config_get mld_s_robustness "$config" robustness 2
 		config_get mld_s_mode "$config" snooping_mode 0
 		config_get mld_s_iface "$config" interface
@@ -260,28 +248,23 @@ configure_mcpd_snooping() {
 	local protocol="$1"
 	local exceptions
 	local filter_ip=""
-	local fast_leave=0
 	
 	# Configure snooping related params
 	if [ "$protocol" == "igmp" ]; then
-		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
-		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
+		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_s_mode
+		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$igmp_s_iface"
 		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
 		exceptions=$igmp_s_exceptions
-		fast_leave=$igmp_s_fast_leave
 	elif [ "$protocol" == "mld" ]; then
-		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
-		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
+		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_s_mode
+		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$mld_s_iface"
 		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
 		exceptions=$mld_s_exceptions
-		fast_leave=$mld_s_fast_leave
 	fi
 
 	echo "${protocol}-proxy-enable 0" >> $CONFFILE
-	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
-
 	if [ -n "$exceptions" ]; then
 		IFS=" "
 		for excp in $exceptions; do

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=2.0.21
+PKG_VERSION:=2.0.19
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=25b920c13160360de16300a8d04a068feb197c50
+PKG_SOURCE_VERSION:=2ae909080f04fe2c4edd12048f161d0f3318f513
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif

owsd/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=fd696e9d1be8278db3eb1d9be97e1a66afd6e1f6
+PKG_SOURCE_VERSION:=e606e7d389ae516d213344e503e76a5de2cf9d33
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1

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

@@ -37,4 +37,4 @@ populate_config(){
 	[ $DEBUG ] && cat /etc/config/ports
 }
 
-[ -f /sbin/db -a -f /etc/board-db/config/hw ] && populate_config
+[ -f /sbin/db -a -f /lib/db/config/hw ] && populate_config

qosmngr/files/lib/qos/broadcom.sh

@@ -3,7 +3,6 @@
 
 IP_RULE=""
 BR_RULE=""
-is_bcm968=0
 
 #function to handle a queue section
 handle_queue() {
@@ -22,7 +21,6 @@ handle_queue() {
 		return
 	fi
 
-	local q_no=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
 	#lower the value, lower the priority of queue on this chip
 	config_get order "$qid" "precedence"
 
@@ -46,27 +44,7 @@ handle_queue() {
 	esac
 
 	# Call tmctl which is a broadcomm command to configure queues on a port.
-	tmctl setqcfg --devtype 0 --if $ifname --qid $q_no --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
-
-	# In BCM968 chips, the counters for queues are read, on other model, its read and reset. So, to maintain counter
-	# value and uniform behaviour, we are storing counter value for each queue in files
-	local d_name="/tmp/qos/queue_stats/${ifname}/q_${q_no}"
-	mkdir $d_name
-	local f_name="$d_name/txPackets"
-	touch $f_name
-	echo 0 > $f_name
-	f_name="$d_name/txBytes"
-	touch $f_name
-	echo 0 > $f_name
-	f_name="$d_name/droppedPackets"
-	touch $f_name
-	echo 0 > $f_name
-	f_name="$d_name/droppedBytes"
-	touch $f_name
-	echo 0 > $f_name
-
-	q_no=$((q_no + 1))
-	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
+	tmctl setqcfg --devtype 0 --if $ifname --qid $order --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
 }
 
 #function to handle a shaper section
@@ -94,12 +72,7 @@ handle_shaper() {
 setup_qos() {
 	ebtables -t broute -N qos
 	ret=$?
-	if [ $ret -eq 0 ]; then
-		ebtables -t broute -I BROUTING -j qos
-	else
-		ebtables -t broute -D BROUTING -j qos
-		ebtables -t broute -I BROUTING -j qos
-	fi
+	[ $ret -eq 0 ] && ebtables -t broute -I BROUTING -j qos
 
 	iptables -t mangle -N qos_forward
 	ret=$?
@@ -437,10 +410,6 @@ handle_classify() {
 }
 
 configure_shaper() {
-	# Delete existing shaper
-	for intf in $(db get hw.board.ethernetPortOrder); do
-		tmctl setportshaper --devtype 0 --if $intf --shapingrate 0 --burstsize -1
-	done
 	# Load UCI file
 	config_load qos
 	# Processing shaper section(s)
@@ -470,21 +439,11 @@ configure_classify() {
 	sh /tmp/qos/classify.ebtables
 	sh /tmp/qos/classify.iptables
 	sh /tmp/qos/classify.ip6tables
-	# broadcom recommends that each time traffic class is set,
-	# the flows should be flushed for the new mapping to take
-	# effect, it then makes sense to make it a part of the
-	# qosmngr package itself.
-	fcctl flush
 }
 
 configure_queue() {
 	# Delete queues
-	rm -rf /tmp/qos/queue_stats
-
 	for intf in $(db get hw.board.ethernetPortOrder); do
-		mkdir -p /tmp/qos/queue_stats/$intf
-		touch /tmp/qos/queue_stats/$intf/q_idx
-		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
 		i=0
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
@@ -517,136 +476,72 @@ reload_qos() {
 
 get_queue_stats() {
 	local ifname
-	local f_name
-	local tmp_val
-	local q_index=0
-	local max_q_index=0
-
 	json_init
 	json_add_array "queues"
+	i=0
+	while :
+	do
+		ifname=$(uci -q  get qos.@queue[$i].ifname)
 
-	if [ -n "$1" ]; then
-		ifname=$1
-		max_q_index=$(cat /tmp/qos/queue_stats/${ifname}/q_idx)
-		while :
-		do
-			if [ $q_index -eq $max_q_index ]; then
-				break
-			fi
-			stats="$(tmctl getqstats --devtype 0 --if $ifname --qid $q_index)"
-			ret="$(echo $stats | awk '{print substr($0,0,5)}')"
-			#check tmctl ERROR condition
-			if [ $ret == 'ERROR' ]; then
-				q_index=$((q_index + 1))
+		# if ifname is empty that is good enough to break
+		if [ -z "$ifname" ];then
+			break
+		fi
+
+		if [ -n "$1" ]; then
+			if [ "$ifname" != "$1" ]; then
+				i=$((i + 1))
 				continue
 			fi
-			json_add_object ""
-			json_add_int "qid" "$q_index"
-			json_add_string "iface" "$ifname"
+		fi
 
-			IFS=$'\n'
-			for stat in $stats; do
-				pname="$(echo $stat | awk '{print$1}')"
-				if [ $pname == 'ret' ]; then
-					continue
-				fi
+		order=$(uci -q get qos.@queue[$i].precedence)
+		stats="$(tmctl getqstats --devtype 0 --if $ifname --qid $order)"
+		ret="$(echo $stats | awk '{print substr($0,0,5)}')"
 
-				val="$(echo $stat | awk '{print$2}')"
+		#check tmctl ERROR condition
+		if [ $ret == 'ERROR' ]; then
+			i=$((i + 1))
+			continue
+		fi
 
-				# remove trailing : from the name
-				pname="${pname::-1}"
-				local f_name="/tmp/qos/queue_stats/${ifname}/q_${q_index}/${pname}"
-				# In non BCM968* chips, read operation on queues is actually a read and reset,
-				# so values need to be maintained to present cumulative value
-				if [ $is_bcm968 -eq 0 ]; then
-					tmp_val=$(cat $f_name)
-					val=$((val + tmp_val))
-				fi
-				echo $val > $f_name
+		json_add_object ""
+		json_add_int "qid" "$order"
+		json_add_string "iface" "$ifname"
 
-				# convert to iopsyswrt names
-				case "$pname" in
-					txPackets)
-						json_add_int "tx_packets" "$val"
-						;;
-					txBytes)
-						json_add_int "tx_bytes" "$val"
-						;;
-					droppedPackets)
-						json_add_int "tx_dropped_packets" "$val"
-						;;
-					droppedBytes)
-						json_add_int "tx_dropped_bytes" "$val"
-						;;
-				esac
-			done
-			json_close_object
+		IFS=$'\n'
+		for stat in $stats; do
+			pname="$(echo $stat | awk '{print$1}')"
+			if [ $pname == 'ret' ]; then
+				continue
+			fi
 
-			q_index=$((q_index + 1))
+			val="$(echo $stat | awk '{print$2}')"
+
+			# remove trailing : from the name
+			pname="${pname::-1}"
+
+			# convert to iopsyswrt names
+			case "$pname" in
+				txPackets)
+					json_add_int "tx_packets" "$val"
+				;;
+				txBytes)
+					json_add_int "tx_bytes" "$val"
+				;;
+				droppedPackets)
+					json_add_int "tx_dropped_packets" "$val"
+				;;
+				droppedBytes)
+					json_add_int "tx_dropped_bytes" "$val"
+				;;
+			esac
 		done
-	else
-		for intf in $(db get hw.board.ethernetPortOrder); do
-			ifname=$intf
-			q_index=0
-			max_q_index=$(cat /tmp/qos/queue_stats/${ifname}/q_idx)
-			while :
-			do
-				if [ $q_index -eq $max_q_index ]; then
-					break
-				fi
-				stats="$(tmctl getqstats --devtype 0 --if $ifname --qid $q_index)"
-				ret="$(echo $stats | awk '{print substr($0,0,5)}')"
-				#check tmctl ERROR condition
-				if [ $ret == 'ERROR' ]; then
-					q_index=$((q_index + 1))
-					continue
-				fi
-				json_add_object ""
-				json_add_int "qid" "$q_index"
-				json_add_string "iface" "$ifname"
 
-				IFS=$'\n'
-				for stat in $stats; do
-					pname="$(echo $stat | awk '{print$1}')"
-					if [ $pname == 'ret' ]; then
-						continue
-					fi
+		json_close_object
 
-					val="$(echo $stat | awk '{print$2}')"
-
-					# remove trailing : from the name
-					pname="${pname::-1}"
-					local f_name="/tmp/qos/queue_stats/${ifname}/q_${q_index}/${pname}"
-					# In non BCM968* chips, read operation on queues is actually a read and reset,
-					# so values need to be maintained to present cumulative value
-					if [ $is_bcm968 -eq 0 ]; then
-						tmp_val=$(cat $f_name)
-						val=$((val + tmp_val))
-					fi
-					echo $val > $f_name
-
-					# convert to iopsyswrt names
-					case "$pname" in
-						txPackets)
-							json_add_int "tx_packets" "$val"
-							;;
-						txBytes)
-							json_add_int "tx_bytes" "$val"
-							;;
-						droppedPackets)
-							json_add_int "tx_dropped_packets" "$val"
-							;;
-						droppedBytes)
-							json_add_int "tx_dropped_bytes" "$val"
-							;;
-					esac
-				done
-				json_close_object
-
-				q_index=$((q_index + 1))
-			done
-		done
-	fi
+		i=$((i + 1))
+	done
 
 	json_close_array
 	json_dump
@@ -657,7 +552,6 @@ get_eth_q_stats() {
 	json_add_array "queues"
 
 	ifname="$1"
-	local tmp_val=0
 
 	# if ifname is empty that is good enough to break
 	if [ -z "$ifname" ];then
@@ -692,14 +586,6 @@ get_eth_q_stats() {
 
 		# remove trailing : from the name
 		pname="${pname::-1}"
-		local f_name="/tmp/qos/queue_stats/${ifname}/q_${qid}/${pname}"
-		# In non BCM968* chips, read operation on queues is actually a read and reset,
-		# so values need to be maintained to present cumulative value
-		if [ $is_bcm968 -eq 0 ]; then
-			tmp_val=$(cat $f_name)
-			val=$((val + tmp_val))
-		fi
-		echo $val > $f_name
 
 		# convert to iopsyswrt names
 		case "$pname" in
@@ -727,10 +613,6 @@ get_eth_q_stats() {
 read_queue_stats() {
 	itf="$1"
 	q_idx="$2"
-	local cpu_model="$(grep Hardware /proc/cpuinfo  | awk '{print$NF}')"
-	case $cpu_model in
-		BCM968*) is_bcm968=1 ;;
-	esac
 
 	if [ -n "$itf" -a -n "$q_idx" ]; then
 		get_eth_q_stats $itf $q_idx

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=5.2.1
+PKG_VERSION:=5.1.11
 
-PKG_SOURCE_VERSION:=d4ac29b535bf1ec0f58c4c9eea08ec7db08775d1
+PKG_SOURCE_VERSION:=6b64dafae52d0cd28a31d364aeed80380875293b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 

swmodd/Makefile

@@ -6,10 +6,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.1.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3bfc97cd6f8e22f561601c47b79203b17fdb0fbe
+PKG_SOURCE_VERSION:=fc160d427161d9545656f0850e3f01cfb18cd6e7
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -21,7 +21,7 @@ define Package/swmodd
 	SECTION:=utils
 	CATEGORY:=Utilities
 	TITLE:=SWMOD - software modules ubus backend
-	DEPENDS:=+libuci +libubox +ubus +libuuid
+	DEPENDS:=+libuci +libubox +ubus +libuuid +libopkg +PACKAGE_liblxc:liblxc
 endef
 
 define Package/swmodd/description
@@ -32,11 +32,24 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE
 
+ifeq ($(CONFIG_PACKAGE_liblxc),y)
+MAKE_FLAGS += \
+	SWMOD_LXC="yes"
+endif
+
+#ifeq ($(CONFIG_PACKAGE_docker-ce),y)
+#MAKE_FLAGS += \
+#	SWMOD_DOCKER="yes"
+#endif
+
 define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/swmodd.init $(1)/etc/init.d/swmodd
 	$(INSTALL_DIR) $(1)/etc/swmod
 	$(INSTALL_CONF) ./files/map_du $(1)/etc/swmod/map_du
+#ifeq ($(CONFIG_PACKAGE_docker-ce),y)
+#	$(INSTALL_CONF) ./files/map_docker_du $(1)/etc/swmod/map_docker_du
+#endif
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swmodd $(1)/usr/sbin/swmodd
 endef

uspd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.0.3
+PKG_VERSION:=1.0.26
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8045528fcfd44216b357fe671acc40847866bdc4
+PKG_SOURCE_VERSION:=aed1e1e9b0b8152329c253aaac7260c811843907
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif

uspd/files/uspd.init

@@ -20,5 +20,6 @@ reload_service() {
 
 service_triggers()
 {
+	procd_add_reload_trigger "cwmp"
 	procd_add_config_trigger "config.change" "uspd" /etc/init.d/uspd restart
 }

wfadatad/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.2.2
+PKG_VERSION:=2.0.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b6d42b7459248e9fbbce9d828f50360e67bfe6c6
+PKG_SOURCE_VERSION:=578cad4e52235fa3eb979859fcabddd785ea3fc5
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -22,18 +22,17 @@ define Package/wfadatad
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Data Elements-1.0 Agent
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \
-	  +!WFA_DELM_STANDALONE:map-agent +WFA_DELM_MULTIAP_MODE:libmaputils
+  DEPENDS:=+libwifi +map-agent +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/wfadatad/description
- This package implements WiFi Alliance's Data Elements v.1.0.
+ This package implements WiFi Alliance's Data Elements Agent.
  It collects WiFi network's diagnostic data and reports them
  to the Data Elements Collector.
- In Data Elements Agent mode, the package by default is built
- as a loadable plugin module to the MultiAP Agent.
- The package can also be built as a standalone daemon running
- independently of a MultiAP Agent.
+ By default, the package is built as a dynamically loadable
+ plugin module to the MultiAP Agent.
+ Alternatively, for debugging purpose, the package can be built
+ as a standalone daemon.
 endef
 
 
@@ -53,14 +52,17 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
+#define Build/Prepare
+#        $(CP) -rf ./wfadatad/src/* $(PKG_BUILD_DIR)/
+#endef
 
 define Package/wfadatad/install
 
 ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/wfa_delm.init $(1)/etc/init.d/wfadatad
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wfadatad $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/wfa_delm.init $(1)/etc/init.d/wfa_delm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wfa_delm $(1)/usr/sbin/
 else
 	$(INSTALL_DIR) $(1)/usr/lib/map-plugins
 	$(CP) $(PKG_BUILD_DIR)/src/wfa_delm.so $(1)/usr/lib/map-plugins

wfadatad/files/wfa_delm.init

@@ -4,7 +4,7 @@ START=98
 STOP=11
 
 USE_PROCD=1
-PROG=/usr/sbin/wfadatad
+PROG=/usr/sbin/wfa_delm
 
 start_service() {
 	procd_open_instance

wifimngr/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=7.8.0
+PKG_VERSION:=3.4.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a87fb7c82800d4d731205eee2ff956886353c086
+PKG_SOURCE_VERSION:=4ee0e54caf99d524ff741851190ab7e72830d33f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 

wifimngr/files/wifimngr.init

@@ -10,7 +10,6 @@ start_service() {
 	procd_open_instance
 	procd_set_param command ${PROG}
 #	procd_set_param env IOP_LLA_LIBS_DEBUG=3    #for debugging only
-#	procd_set_param stderr 1                    #for debugging only
 	procd_set_param respawn
 	procd_close_instance
 }