map-agent: bsta clean default_disabled

When we know credentials clean default_disabled.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>

bbf/Config_bbfdm.in

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

bbf/Makefile

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

dslmngr/Makefile

@@ -28,12 +28,6 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
 else
   $(info Unexpected CONFIG_TARGET)
 endif

easy-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm)
+  DEPENDS:=@TARGET_iopsys_brcm63xx_arm
 endef
 
 define Package/easy-qos/description
@@ -39,11 +39,7 @@ define Package/easy-qos/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
-ifeq ($(CONFIG_TARGET_intel_mips),y)
-	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
-else
 	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
-endif
 	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
 endef

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

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

easy-soc-libs/Makefile

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

icwmp/Config_cwmp.in

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

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.3.0
+PKG_VERSION:=8.3.2
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9bd32215e6b9b82c1ac152d58a66b468855d3b48
+PKG_SOURCE_VERSION:=8df8a9a6a079775f79f4461be0c6e06dd7a17211
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -36,7 +36,8 @@ 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
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libwolfssl +curl +libcurl +libopenssl
+  MENU := 1
 endef
 
 define Package/$(PKG_NAME)/description
@@ -78,6 +79,18 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
+ifeq ($(CONFIG_CWMP_USE_WOLFSSL), y)
+CONFIGURE_ARGS += --enable-libwolfssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += "-lwolfssl"
+endif
+
+ifeq ($(CONFIG_CWMP_USE_OPENSSL), y)
+CONFIGURE_ARGS += --enable-libopenssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lssl"
+endif
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin

icwmp/files/etc/config/cwmp

@@ -16,10 +16,9 @@ config acs 'acs'
 	option ip_version '4'
 
 config cpe 'cpe'
-	option interface 'eth0.1'
 	option default_wan_interface 'wan'
 	option log_to_console 'disable'
-	option log_to_file 'enable'
+	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
 	option log_severity 'INFO'

icwmp/files/etc/icwmpd/update.sh

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

icwmp/files/etc/init.d/icwmpd

@@ -36,7 +36,7 @@ enable_dhcp_option43() {
 	fi
 
 	newreqopts="$reqopts 43"
-	if [ $proto == "dhcp" ]; then
+	if [ "${proto}" == "dhcp" ]; then
 		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
@@ -50,29 +50,13 @@ wait_for_resolvfile() {
 	local resolvfile="$(uci -q get dhcp.@dnsmasq[0].resolvfile)"
 	[ -n "$resolvfile" ] || return
 
-	while [ ! -f $resolvfile ]; do
+	while [ ! -f "$resolvfile" ]; do
 		sleep 1
-		[ $tm -ge $time ] && break
+		[ "$tm" -ge "$time" ] && break
 		tm=$((tm+1))
 	done
 }
 
-set_wan_interface() {
-	local wan_interface="${1}"
-	local l3_device=""
-
-	if [ -z "${wan_interface}" ]; then
-		return 0;
-	fi
-
-	json_load "$(ifstatus ${wan_interface})"
-	json_get_var l3_device l3_device
-	if [ -n "$l3_device" ]; then
-		uci -q set cwmp.cpe.interface="${l3_device}"
-		uci -q commit cwmp
-	fi
-}
-
 copy_cwmp_etc_files_to_varstate() {
 	if [ ! -f /var/state/cwmp ]
 	then
@@ -161,7 +145,7 @@ validate_defaults() {
 		return 1;
 	}
 
-	[ -z "${url}" -a -z "${dhcp_url}" ] && {
+	[ -z "${url}" ] && [ -z "${dhcp_url}" ] && {
 		log "ACS url is empty can't start"
 		return 1;
 	}
@@ -171,23 +155,17 @@ validate_defaults() {
 		return 1;
 	}
 
-	[ -z "${default_wan_interface}" ] && {
-		log "Wan interface is empty"
-		return 1;
-	}
-
 	return 0;
 }
 
 boot() {
-	local dhcp_url=""
-	local discovery="1"
+	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" -o "${dhcp_discovery}" == "1" ]; then
+	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
@@ -206,16 +184,13 @@ start_service() {
 	config_get dhcp_discovery acs dhcp_discovery
 	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "$enable_cwmp" = "0" -o "$enable_cwmp" = "false" ]; then
+	if [ "$enable_cwmp" = "0" ] || [ "$enable_cwmp" = "false" ]; then
 		log "CWMP is not enabled"
 		return 0
 	fi
 
-	# Set wan interface if not configured
-	set_wan_interface "${wan_interface}"
-
 	# Set dhcp option 43 if dhcp discovery enabled
-	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
+	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
 		enable_dhcp_option43 "${wan_interface}"
 	fi
 
@@ -223,20 +198,20 @@ start_service() {
 	[ -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
 
-	# Copy backup data so that if it restart latter on it gets the info
-	copy_cwmp_etc_files_to_varstate
-
 	validate_defaults || {
 		log "Validation of defaults failed"
 		return 1;
 	}
 
+	# Copy backup data so that if it restart latter on it gets the info
+	copy_cwmp_etc_files_to_varstate
+
 	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
 	procd_set_param respawn \
-		${respawn_threshold:-5} \
-		${respawn_timeout:-10} ${respawn_retry:-3}
+		"${respawn_threshold:-5}" \
+		"${respawn_timeout:-10}" "${respawn_retry:-3}"
 
 	procd_set_param watch network.interface
 	procd_close_instance

iop/scripts/feeds_update.sh

@@ -32,8 +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 iopsys-econet"
-    for target in $targets
+    for target in $(ls ./feeds/targets)
     do
 	rm -f target/linux/$target
 	./scripts/feeds install -p targets $target

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=7.1.15
+PKG_VERSION:=7.1.18
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c7c550c3bc01e969af9243b6bd7db5f4a69d85e5
+PKG_SOURCE_VERSION:=cbc88b2c935ff216e0452b5f06bfd4d8c82d8715
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS

map-agent/files/lib/wifi/multiap

@@ -465,6 +465,7 @@ brcm_bsta_to_wireless() {
 				uci -q set wireless.${section}.encryption=$encryption
 				uci -q set wireless.${section}.bssid="$bssid"
 				#uci -q set wireless.${section}.disabled=$disabled
+				uci -q set wireless.${section}.default_disabled="0"
 
 				[ "$disabled" != "1" ] && return
 				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.7
+PKG_VERSION:=6.0.9
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5a363bba9a26196879e528d62e83c54a8c54e2c0
+PKG_SOURCE_VERSION:=5adc5d12e6caf4f234a970d2a4f2586aee1dc1f7
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE

stunc/Config.in

@@ -0,0 +1,16 @@
+if PACKAGE_stunc
+
+choice
+	prompt "Select SSL utility"
+	default STUNC_USE_WOLFSSL
+
+config STUNC_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config STUNC_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+endif

stunc/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.1.2
 
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=eb1dbd92fefdc4282fd3138d421f39cdf04503f4
+PKG_SOURCE_VERSION:=fbd3cb0f101d115744ecf927516c2268c10cf3a0
 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
@@ -32,17 +32,27 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libwolfssl +libblobmsg-json +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libwolfssl +libblobmsg-json +libbbf_api +libopenssl
+  MENU := 1
 endef
 
 define Package/$(PKG_NAME)/description
 	BBF STUN Client
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
+ifeq ($(CONFIG_STUNC_USE_WOLFSSL), y)
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += -lwolfssl
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/stunc/* $(PKG_BUILD_DIR)/

uboot/Makefile

@@ -4,9 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# intel_mips branch:
-# iopsys 4.x: iop_grx-ugw-8.1.1-ga
-# iopsys 5.x: iop_grx-ugw-8.4.1.30 
 
 include $(TOPDIR)/rules.mk
 
@@ -15,10 +12,7 @@ PKG_VERSION:=2016.08
 
 PKG_SOURCE_PROTO:=git
 
-ifdef CONFIG_TARGET_intel_mips
-PKG_SOURCE_URL:=https://dev.iopsys.eu/intel/uboot.git
-PKG_SOURCE_VERSION:=feed838bd1bfeeb57a9afb93b4d704971f423d92
-else ifdef CONFIG_TARGET_iopsys_econet
+ifdef CONFIG_TARGET_iopsys_econet
 PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/u-boot.git
 PKG_SOURCE_VERSION:=1b320f0656bfc8504fa4f771dd77d8e403ed00e0
 else
@@ -65,41 +59,9 @@ define uboot/en7562
   UBOOT_IMG:=u-boot-nand.bin
 endef
 
-define uboot/sdx810_ap
-  TITLE:=U-Boot for the sdx810_ap
-  DEPENDS:=@TARGET_iopsys_ramips
-  PKG_RELEASE:=6
-endef
-
-define uboot/grx500
-  TITLE:=U-Boot for the grx
-  UBOOT_IMG:=u-boot-nand.bin
-  DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=12
-endef
-
-# obsolete: no longer supported
-define uboot/grx500_speedport_smart3
-  TITLE:=U-Boot for the Speedport Smart3
-  UBOOT_IMG:=u-boot-nand.bin
-  DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=7
-endef
-
-define uboot/grx500_norrland
-  TITLE:=U-Boot for Norrland Board
-  UBOOT_IMG:=u-boot-nand.bin
-  DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=17
-endef
-
 UBOOTS := \
 	ex400 \
-	en7562 \
-	sdx810_ap \
-	grx500 \
-	grx500_speedport_smart3 \
-	grx500_norrland
+	en7562
 
 define Package/uboot/template
 define Package/uboot-$(1)
@@ -145,8 +107,6 @@ endef
 define Package/uboot/install/default
 	$(INSTALL_DIR) $$(1)/lib/upgrade
 	$(CP) ./files/uboot-upgrade $$(1)/lib/upgrade/
-	$(if $(CONFIG_TARGET_intel_mips), ,$(INSTALL_DIR) $$(1)/etc/init.d)
-	$(if $(CONFIG_TARGET_intel_mips), ,$(CP) ./files/uboot $$(1)/etc/init.d/)
 
 	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
 	$(CP) \