icwmp: 8.4.0

The previous config only allows the fixed number of digits as a called number. With
MinimumNumberOfDigits as 5, MaximumNumberOfDigits as 15 and TerminationDigit as ' ',
users can only dial 5 digits as a called number. That is wrong.

After this change, the number of digits for a called number is in the range between
MinimumNumberOfDigits (1) and MaximumNumberOfDigits (15). But the number must terminate
with '#' which is not a part of called number and will be strapped off.

TODO: support variable length of called numbers without termination digit.

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.10
+PKG_VERSION:=6.6.20
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3efc5ce5e6f639e50894e7b9e69b6e2408875db6
+PKG_SOURCE_VERSION:=491a8b0c00680ba110fb42d17a51627365b1baed
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -14,7 +14,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e609d736f572d3ff5e33aa6b585d6ccb7c8e14cf
+PKG_SOURCE_VERSION:=cc475d5bfe663b73f4ae28d74c9035e210a8ad24
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2
+	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
 endef
 
 define Package/$(PKG_NAME)/description

easy-soc-libs/Makefile

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

evoice/Makefile

@@ -10,8 +10,8 @@ PKG_VERSION:=0.1
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/evoice.git
-PKG_SOURCE_VERSION:=1f790ba0cbc1b62c4bff9fd09a20cb0c299422da
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
+PKG_SOURCE_VERSION:=56a568164e84c8e2d7f2c7f06d26265e837b11ef
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

evoice/files/etc/config/voice

@@ -6,7 +6,7 @@ config SIPClient 'Client1'
 	option AuthPassword '51234'
 	option Network 'Network1'
 	option MaxSessions '5'
-	option RegisiterURI '51234@192.164.4.210'
+	option RegisiterURI '51234@sip-proxy.iopsys.eu'
 	option E164Format '1'
 
 config SIPClient 'Client2'
@@ -16,22 +16,22 @@ config SIPClient 'Client2'
 	option AuthPassword '51235'
 	option Network 'Network1'
 	option MaxSessions '5'
-	option RegisiterURI '51235@192.164.4.210'
+	option RegisiterURI '51235@sip-proxy.iopsys.eu'
 	option E164Format '1'
 
 config SIPNetwork 'Network1'
 	option Enable '1'
-	option ProxyServer '192.168.4.210'
+	option ProxyServer 'sip-proxy.iopsys.eu'
 	option ProxyServerPort '5060'
 	option ProxyServerTransport 'UDP'
-	option RegistrarServer '192.168.4.210'
+	option RegistrarServer 'sip-proxy.iopsys.eu'
 	option RegistrarServerPort '5060'
 	option RegistrarServerTransport 'UDP'
 	option RegistrationPeriod '3240'
 	option RegisterExpires '3600'
-    option UserAgentDomain ' '
+	option UserAgentDomain ' '
 	option TimerRegistrationFailed '120'
-    option TimerT1 '500'
+	option TimerT1 '500'
 	option VoIPProfile 'VoIPProfile1'
 	list CodecList '1CodecProfile1'
 	list CodecList '1CodecProfile2'
@@ -210,20 +210,13 @@ config CallingFeatures 'Set2'
 	option CallWaitingEnable '1'
 
 config NumberingPlan 'NumberingPlan1'
-	option MinimumNumberOfDigits '5'
-	option MaximumNumberOfDigits '15'
-	option InterDigitTimerStd '2000'
-	option InterDigitTimerOpen '2000'
-	option TerminationDigit ' '
-
-config NumberingPlan 'NumberingPlan2'
-	option MinimumNumberOfDigits '5'
+	option MinimumNumberOfDigits '1'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit '#'
 
-config NumberingPlan 'NumberingPlan3'
+config NumberingPlan 'NumberingPlan2'
 	option MinimumNumberOfDigits '5'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
@@ -239,7 +232,7 @@ config NumberingPlan 'NumberingPlan3'
 	list PrefixList '3PrefixInfo8'
 	list PrefixList '3PrefixInfo9'
 
-config NumberingPlan 'NumberingPlan4'
+config NumberingPlan 'NumberingPlan3'
 	option MinimumNumberOfDigits '5'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
@@ -255,7 +248,7 @@ config PrefixInfo '3PrefixInfo1'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CW_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo2'
 	option Enable '1'
@@ -265,7 +258,7 @@ config PrefixInfo '3PrefixInfo2'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CW_DEACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo3'
 	option Enable '1'
@@ -275,7 +268,7 @@ config PrefixInfo '3PrefixInfo3'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFU_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo4'
 	option Enable '1'
@@ -285,7 +278,7 @@ config PrefixInfo '3PrefixInfo4'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFU_DEACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo5'
 	option Enable '1'
@@ -295,7 +288,7 @@ config PrefixInfo '3PrefixInfo5'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFB_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo6'
 	option Enable '1'
@@ -305,7 +298,7 @@ config PrefixInfo '3PrefixInfo6'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFB_DEACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo7'
 	option Enable '1'
@@ -315,7 +308,7 @@ config PrefixInfo '3PrefixInfo7'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFNR_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo8'
 	option Enable '1'
@@ -325,7 +318,7 @@ config PrefixInfo '3PrefixInfo8'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFNR_DEACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo9'
 	option Enable '1'
@@ -335,7 +328,7 @@ config PrefixInfo '3PrefixInfo9'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CA_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config PrefixInfo '4PrefixInfo1'
 	option Enable '1'
@@ -345,7 +338,7 @@ config PrefixInfo '4PrefixInfo1'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'X_IOPSYS_EU_EMERGENCY'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '
 
 config DialPlan 'X_IOPSYS_EU_InternalNumber1'
 	option RegExp '1X#'

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.3.5
+PKG_VERSION:=8.4.0
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4dd933047dcce4d297b17cafcb0ee2ad39004c15
+PKG_SOURCE_VERSION:=473e8f449032cb195ae4aff2595e5c2efe623335
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -36,7 +36,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libwolfssl +curl +libcurl +libopenssl
+  DEPENDS:=+libuci +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libwolfssl +curl +libcurl +libopenssl +mxml
   MENU := 1
 endef
 

icwmp/files/etc/firewall.cwmp

@@ -6,7 +6,6 @@ log() {
 }
 
 if [ ! -f "/var/state/cwmp" ]; then
-	touch "/var/state/cwmp"
 	exit 0;
 fi
 

icwmp/files/etc/init.d/icwmpd

@@ -1,16 +1,16 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2015-2019 iopsys Software Solutions AB
 
-. /lib/functions.sh
-include /lib/network
-. /usr/share/libubox/jshn.sh
-
 START=99
-STOP=2
+STOP=00
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
 
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+include /lib/network
+
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
@@ -58,41 +58,39 @@ wait_for_resolvfile() {
 }
 
 copy_cwmp_etc_files_to_varstate() {
-	if [ ! -f /var/state/cwmp ]
-	then
-		if [ -f /etc/icwmpd/cwmp ]
-		then
-			uci -q -c /etc/icwmpd delete cwmp.acs
-			uci -q -c /etc/icwmpd commit cwmp
-			cp /etc/icwmpd/cwmp /var/state/cwmp
-		else
-			touch /var/state/cwmp
-		fi
+	mkdir -p /var/run/icwmpd
+
+	if [ -f /etc/icwmpd/cwmp ]; then
+		uci -q -c /etc/icwmpd delete cwmp.acs
+		uci -q -c /etc/icwmpd commit cwmp
+		cp -f /etc/icwmpd/cwmp /var/state/cwmp
 	fi
 
-	mkdir -p /var/run/icwmpd
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
-	then
-		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
+	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
+		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
-	then
-		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
+
+	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]; then
+		cp -f /etc/icwmpd/dm_enabled_notify /var/run/icwmpd/ 2>/dev/null
 	fi
 }
 
 copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/state/cwmp ]
-	then
-		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
+	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]; then
+		cp -f /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
-	then
-		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
+
+	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]; then
+		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
-	then
-		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
+
+	if [ -f /var/state/cwmp ]; then
+		cp -f /var/state/cwmp /etc/icwmpd/
+	fi
+
+	# move the successful custom notify import marker to persistent storage
+	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
+		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
 	fi
 }
 
@@ -158,22 +156,6 @@ validate_defaults() {
 	return 0;
 }
 
-boot() {
-	local dhcp_url dhcp_discovery
-
-	config_load cwmp
-	config_get_bool dhcp_discovery acs dhcp_discovery 1
-	config_get dhcp_url acs dhcp_url ""
-
-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
-		if [ -z "${dhcp_url}" ]; then
-			log "dhcp discovery enabled but no dhcp url, trigger update"
-			/etc/icwmpd/update.sh
-		fi
-	fi
-	start
-}
-
 start_service() {
 	local enable_cwmp
 	local wan_interface
@@ -217,15 +199,19 @@ start_service() {
 	procd_close_instance
 }
 
-stop_service()
+service_stopped()
 {
 	copy_cwmp_varstate_files_to_etc
 }
 
 reload_service() {
-	log "Restarting CWMP client"
-	stop
-	start
+	log "Reloading CWMP client"
+	ubus -t 1 call tr069 command '{"command":"reload"}'
+	if [ "$?" -ne "0" ]; then
+		log "Restarting CWMP client"
+		stop
+		start
+	fi
 }
 
 service_triggers() {

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.6.22
+PKG_VERSION:=4.7.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b5b5379bb7f8ec0c351bfa34385b74b21306d107
+PKG_SOURCE_VERSION:=efe39a957f8512243e6ee6044e91d8f5a97c318e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

map-agent/Config.in

@@ -6,5 +6,9 @@ config AGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 	bool "Support Dynamic Controller configuration sync"
 	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 
+config AGENT_ISLAND_PREVENTION
+	bool "Support Island Prevention"
+	default y if MULTIAP_AGENT_ISLAND_PREVENTION
+
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=7.1.22
+PKG_VERSION:=7.1.33
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c3cf2f442ce79ffafe2e4e66e4120587f98b4da8
+PKG_SOURCE_VERSION:=9d37e0b65571a6e5b9ad05bd79f49dc04d9a1dbb
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -62,6 +62,10 @@ ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
 
+ifeq ($(CONFIG_AGENT_ISLAND_PREVENTION),y)
+TARGET_CFLAGS += -DAGENT_ISLAND_PREVENTION
+endif
+
 MAKE_PATH:=src
 
 define Package/map-agent/install

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

@@ -97,7 +97,9 @@ if [ "$LINK" = "up" ]; then
 
 	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
-	rm -f "$map_bh_file"
+	/lib/wifi/multiap unset_uplink "eth"
+	#rm -f "$map_bh_file"
 	config_load "mapagent"
 	config_foreach update_bstas bsta up
+
 fi

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

@@ -59,7 +59,7 @@ remove_map() {
 }
 
 start_dynbhd_service() {
-	rm -f /tmp/map.agent.bsta_global_disable
+	rm -f /tmp/multiap.backhaul
 	procd_open_instance
 	procd_set_param command "/usr/sbin/dynbhd"
 	procd_set_param respawn
@@ -79,7 +79,9 @@ validate_agent_section() {
 		'netdev:string' \
 		'vlan_segregation:bool:false' \
 		'resend_num:uinteger:0' \
-		'dyn_cntlr_sync:bool:true'
+		'dyn_cntlr_sync:bool:true' \
+		'island_prevention:bool:true'
+
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of agent section failed"
@@ -139,7 +141,7 @@ validate_radio_section() {
 			'configured:bool:false' \
 			'onboarded:bool:false' \
 			'dedicated_backhaul:bool:false' \
-            'steer_policy:range(0,255)' \
+			'steer_policy:range(0,255)' \
 			'util_threshold:range(0,255)' \
 			'rcpi_threshold:range(0,255)' \
 			'report_rcpi_threshold:range(0,255)' \
@@ -178,14 +180,29 @@ validate_policy_section() {
 	return 0
 }
 
+validate_dyn_bh_section() {
+	local section="$1"
+
+	uci_validate_section mapagent $section "${1}" \
+			'missing_bh_timer:range(1,255)'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapagent" "Validation of dynamic backhaul section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
 validate_agent_config() {
 	IS_CFG_VALID=1
 
 	validate_agent_section &&
 		config_foreach validate_cs_section controller_select &&
 		config_foreach validate_ap_section ap &&
-        config_foreach validate_radio_section radio &&
-        config_foreach validate_policy_section policy
+		config_foreach validate_radio_section radio &&
+		config_foreach validate_policy_section policy &&
+		config_foreach validate_dyn_bh_section dynamic_backhaul
 
 	[ "$IS_CFG_VALID" -ne 1 ] && {
 		logger -s -t "mapagent" "Validation of mapagent UCI file failed"
@@ -213,7 +230,7 @@ start_service() {
 	[ "$ts" -eq 1 ] && create_map #|| remove_map
 
 	procd_open_instance
-        procd_set_param command "/usr/sbin/mapagent" "-d"
+	procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1

map-agent/files/lib/wifi/multiap

@@ -794,10 +794,29 @@ set_uplink() {
 	json_add_string "macaddr" "$hwaddr"
 	json_dump > "$MAPFILE"
 	json_cleanup
+
+	config_load mapagent
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":true, "prevent_island":true, "ifname":"all"}'
+	fi
+
 }
 
 unset_uplink() {
-	rm "$MAPFILE" > /dev/null 2>&1
+	local type=${1:-wifi}
+
+	config_load mapagent
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
+	fi
+
+	rm -f "$MAPFILE" > /dev/null 2>&1
 }
 
 func=$1

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.11
+PKG_VERSION:=6.0.18
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ec686a5e8e667925dc69ac53554709e40c0c81fd
+PKG_SOURCE_VERSION:=4029fa48a18e3a6c8af3a2478558e74184fd1786
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=3.2.9
+PKG_VERSION:=3.2.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=5d9b0bc94f8d01ecc7a2026ca1d6faf19ca0ede2
+PKG_SOURCE_VERSION:=dc59897b52ed1406175cd9314759c00aa12ed0a4
 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

netmode/files/etc/init.d/netmode

@@ -34,12 +34,13 @@ start_service() {
 	[ -n "$mode" ] || return
 
 	# Get the last saved mode
-	lastmode="$(cat /etc/netmodes/.last_mode 2>/dev/null)"
+	lastmode="$(cat $MODEDIR/.last_mode 2>/dev/null)"
 	# Return if desired mode is same as last saved mode
 	[ "$mode" == "$lastmode" ] && return
 
 	# Save mode as last mode
-	echo "$mode" > /etc/netmodes/.last_mode
+	[ -d $MODEDIR ] || mkdir -p $MODEDIR
+	echo "$mode" > $MODEDIR/.last_mode
 
 	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
 

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.3
+PKG_VERSION:=5.0.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9d957848b9ac1d381149ce43b59775c21b1e24e0
+PKG_SOURCE_VERSION:=79958289d3b5c3ffd3bd0af62e493e1bac757e77
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -96,11 +96,13 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/init.d/obuspa

@@ -35,7 +35,7 @@ log() {
 }
 
 db_set() {
-	if [ -n "${1}" ]; then
+	if [ -n "${1}" ] && [ -n "${2}" ]; then
 		echo "${1} \"${2}\"">>${PARAM_FILE}
 	else
 		echo >>${PARAM_FILE}
@@ -149,7 +149,7 @@ validate_controller_section()
 		'USPNotifRetryMinimumWaitInterval:uinteger:5' \
 		'USPNotifRetryIntervalMultiplier:uinteger:2000' \
 		'ControllerCode:string' \
-		'Protocol:or("STOMP","CoAP","MQTT")' \
+		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
 		'Reference:string' \
 		'Destination:string:controller-notify-dest' \
 		'Topic:string' \
@@ -158,7 +158,14 @@ validate_controller_section()
 		'coap_path:string' \
 		'coap_port:port' \
 		'mqtt:string' \
-		'stomp:string'
+		'stomp:string' \
+		'Host:host' \
+		'Port:port' \
+		'Path:string' \
+		'EnableEncryption:bool' \
+		'KeepAliveInterval:uinteger' \
+		'SessionRetryIntervalMultiplier:uinteger' \
+		'SessionRetryMinimumWaitInterval:uinteger'
 }
 
 validate_subscription_section()
@@ -177,7 +184,7 @@ validate_mtp_section()
 {
 	uci_validate_section ${CONFIGURATION} mtp "${1}" \
 		'Enable:bool:true' \
-		'Protocol:or("STOMP","CoAP","MQTT")' \
+		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
 		'Reference:string' \
 		'ResponseTopicConfigured:string' \
 		'PublishQoS:uinteger' \
@@ -185,7 +192,12 @@ validate_mtp_section()
 		'coap_path:string' \
 		'coap_port:port' \
 		'mqtt:string' \
-		'stomp:string'
+		'stomp:string' \
+		'Path:string' \
+		'Port:port' \
+		'EnableEncryption:bool' \
+		'KeepAliveInterval:uinteger'
+
 }
 
 validate_stomp_connection_section()
@@ -303,6 +315,8 @@ configure_controller() {
 	local EndpointID Enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPNotifRetryMinimumWaitInterval
 	local USPNotifRetryIntervalMultiplier ControllerCode Protocol Destination coap_host coap_path coap_port
 	local Reference Topic mqtt stomp assigned_role_name ParameterName
+	local Host Port Path EnableEncryption KeepAliveInterval
+	local SessionRetryIntervalMultiplier SessionRetryMinimumWaitInterval
 
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
@@ -314,7 +328,20 @@ configure_controller() {
 		return 1;
 	fi
 
-	if [ -z "${stomp}" ] && [ -z "${Reference}" ] && [ -z "${mqtt}" ] && [ -z "${coap_path}" ]; then
+	# Support for backward compatibility for coap uci parameters
+	if [ -n "${coap_host}" ] && [ -z "${Host}" ]; then
+		Host="${coap_host}"
+	fi
+
+	if [ -n "${coap_path}" ] && [ -z "${Path}" ]; then
+		Path="${coap_path}"
+	fi
+
+	if [ -n "${coap_port}" ] && [ -z "${Port}" ]; then
+		Port="${coap_port}"
+	fi
+
+	if [ -z "${stomp}" ] && [ -z "${Reference}" ] && [ -z "${mqtt}" ] && [ -z "${Host}" ]; then
 		log "controller:: Invalid configuration"
 		return 1;
 	fi
@@ -372,9 +399,18 @@ configure_controller() {
 		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Reference "${Reference}"
 		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Destination "${Destination}"
 	elif [ "${Protocol}" = "CoAP" ]; then
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${coap_host}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${coap_path}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${coap_port}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${Host}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${Path}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${Port}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.EnableEncryption "${EnableEncryption}"
+	elif [ "${Protocol}" = "WebSocket" ]; then
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Host "${Host}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Port "${Port}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Path "${Path}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.EnableEncryption "${EnableEncryption}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.KeepAliveInterval "${KeepAliveInterval}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.SessionRetryIntervalMultiplier "${SessionRetryIntervalMultiplier}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.SessionRetryMinimumWaitInterval "${SessionRetryMinimumWaitInterval}"
 	else
 		log "Unsupported Protocol ${Protocol}"
 	fi
@@ -425,6 +461,7 @@ configure_subscription(){
 	db_set Device.LocalAgent.Subscription.${subs_num}.ReferenceList "${ReferenceList}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Persistent "${Persistent}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Recipient "${Recipient}"
+	db_set Device.LocalAgent.Subscription.${subs_num}.CreationDate "$(date -I'seconds')"
 }
 
 check_json_load()
@@ -504,12 +541,21 @@ configure_challenges() {
 configure_mtp() {
 	local Enable Protocol Reference ResponseTopicConfigured PublishQoS
 	local stomp mqtt
+	local Path Port EnableEncryption KeepAliveInterval
 
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
 		return 1;
 	}
 
+	if [ -n "${coap_path}" ] && [ -z "${Path}" ]; then
+		Path="${coap_path}"
+	fi
+
+	if [ -n "${coap_port}" ] && [ -z "${Port}" ]; then
+		Port="${coap_port}"
+	fi
+
 	if [ -z "${Reference}" ]; then
 		if [ "${Protocol}" = "STOMP" ]; then
 			val=$(get_uci_ref_index stomp "${stomp}")
@@ -542,8 +588,13 @@ configure_mtp() {
 		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Reference "${Reference}"
 		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Destination "${Destination}"
 	elif [ "${Protocol}" = "CoAP" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${coap_path}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${coap_port}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${Path}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${Port}"
+	elif [ "${Protocol}" = "WebSocket" ]; then
+		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.Path "${Path}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.Port "${Port}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.EnableEncryption "${EnableEncryption}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.KeepAliveInterval "${KeepAliveInterval}"
 	else
 		log "Unsupported Protocol ${Protocol} in mtp"
 	fi

peripheral_manager/files/etc/init.d/ledmngr

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

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

@@ -1,16 +1,20 @@
 #!/bin/sh
 
 populate_config_from_db() {
-	. /lib/network/utils.sh
+	. /lib/functions.sh
+	include /lib/network
 
 	portorder="$(db -q get hw.board.ethernetPortOrder)"
 	for port in $portorder; do
+		speed="$(get_max_port_speed $port 2>/dev/null)"
+		speed="${speed:-1000}"
+
 		uci add ports ethport
 		uci rename ports.@ethport[-1]="$(get_port_name $port)"
 		uci set ports.@ethport[-1].enabled=1
 		uci set ports.@ethport[-1].name="$(get_port_name $port)"
 		uci set ports.@ethport[-1].ifname="$port"
-		uci set ports.@ethport[-1].speed=1000
+		uci set ports.@ethport[-1].speed="$speed"
 		uci set ports.@ethport[-1].duplex="full"
 		uci set ports.@ethport[-1].autoneg=1
 		uci set ports.@ethport[-1].eee=0

qosmngr/files/lib/qos/broadcom.sh

@@ -337,6 +337,11 @@ broute_filter_on_dscp() {
 }
 
 broute_filter_on_vid() {
+
+	if [ $1 -lt 0 ]; then
+		return
+	fi
+
 	case "$BR_RULE" in
 	*proto*)
 		BR_RULE="$BR_RULE --vlan-id $1"

stunc/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fbd3cb0f101d115744ecf927516c2268c10cf3a0
+PKG_SOURCE_VERSION:=c5de804fb976d17fd9a7ed7967d760d0c7e4c224
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

stunc/files/etc/init.d/stunc

@@ -36,11 +36,6 @@ start_service() {
 		return 0;
 	fi
 
-	if [ -z "${server_address}" ]; then
-		log "Stun server address not defined or invalid"
-		return 0;
-	fi
-
 	procd_open_instance stunc
 	procd_set_param command ${PROG}
 	procd_set_param respawn "3" "7" "0"

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=0.2.31
+PKG_VERSION:=1.0.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
-PKG_SOURCE_VERSION:=0c51dc71506d8e67fe8c924e2a8009b969ef8cf9
+PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
+PKG_SOURCE_VERSION:=ab01473ad17974714f7cc91fcb345746fb7ddd6d
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

uboot/Makefile

@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/u-boot.git
 PKG_SOURCE_VERSION:=1b320f0656bfc8504fa4f771dd77d8e403ed00e0
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
-PKG_SOURCE_VERSION:=826af23a7723ee05dc9bc023d12a83f44aa649f4
+PKG_SOURCE_VERSION:=4cd73fe5db0ebfc1242ca9c85c14d7f0718eaf73
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

uspd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.2
+PKG_VERSION:=2.2.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dba7c77af8f8aae6315365c6db2f6ee9f86cd1bc
+PKG_SOURCE_VERSION:=ff39170a3e0595a67763a61ac81b2f99b5bf11d7
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=6.11.2
+PKG_VERSION:=6.12.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=78e2ef1e8308e5c4b033018cc9c2e12da4353747
+PKG_SOURCE_VERSION:=090f5e7c3a379cc46b3473d997a7aaee6b255000
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=14.0.6
+PKG_VERSION:=14.0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a248c1508bab5f30297d5b9c12719a90a86d81aa
+PKG_SOURCE_VERSION:=981ce51b2f135926d6e9135772dcd43d73c39b64
 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