iup: refactor code

-------------------------------------------------------------------------------
* 8d89f66 router.network: update linkspeed of a port for each call
-------------------------------------------------------------------------------
commit 8d89f663e30b93cd314df708bf6abbef342d52ee
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2017-04-05 12:41:22 +0200

    router.network: update linkspeed of a port for each call

Base directory -> /
 network.c | 7 +++++++
 1 file changed, 7 insertions(+)
-------------------------------------------------------------------------------

ice-client/Makefile

@@ -20,13 +20,13 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
 BASE_PKG_VERSION:=4.3.0
-PKG_RELEASE:=RC10
+PKG_RELEASE:=RC13
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=f133275635c84968be8207eaa787dd82beed24c1
+PKG_SOURCE_VERSION:=e688de3925debceee8f82d7c50cacd3c90ee1bc1
 ifeq ($(CONFIG_ICE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2017-03-24
+PKG_VERSION:=3.0-2017-04-10
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d99d4a513759f754aaaeb06a7ef667de1df59f61
+PKG_SOURCE_VERSION:=c628b80e78c0b818daaded3872a67f83ea6eec10
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

iup/files/sbin/iup

@@ -181,14 +181,11 @@ handle_provisioning() {
 	local url
 	local tftpfile
 	local host
-	local md5
 	local defaultreset
-	local pack
-	local packname
-	local number=$RANDOM
+	local deckey
 	local retry=1
-	local number
 	local incsleep=$SLEEP
+	local number=$RANDOM
 	let "number %= $RANGE"
 	if [[ ! -e $IUPTEMP ]]; then
 		mkdir $IUPTEMP
@@ -197,38 +194,44 @@ handle_provisioning() {
 	config_get_bool enabled "$config" enabled "$default"
 	config_get_bool defaultreset "$config" defaultreset
 	config_get deckey "$config" deckey
-	if [ "$enabled" -eq 1	]; then
-		if [ "$config" == "iup" ]; then
-			v "Using url received in dhcp options"
-			config_get url "$config" urliup
-		else
-			config_get url "$config" url
-		fi
-		url=${url//\$MAC/$MAC}
-		v "Downloading from url \"$url\""
+	if [ "$enabled" -ne 1 ]; then
+		reboot="off"
+		CONF=0
+		return
+	fi
 
-		while [ $retry -le $RETRYSTOP ]
-		do
-		  if [ ${url%%:*} == "tftp" ]; then
+	# get the url
+	if [ "$config" == "iup" ]; then
+		config_get url "$config" urliup
+		v "Using url received in dhcp options $url"
+	else
+		config_get url "$config" url
+		v "Using url $url"
+	fi
+	url=${url//\$MAC/$MAC}
+	v "Downloading from url \"$url\""
+
+	# download the file
+	while [ $retry -le $RETRYSTOP ]; do
+		if [ ${url%%:*} == "tftp" ]; then
 			tftpfile=${url#*\/\/}
 			host=${tftpfile%%\/*}
 			tftpfile=${tftpfile#*\/}
-
 			/usr/bin/tftp -l $IUPCONFFILES -r "$tftpfile" -g "$host"
-		  else
+		else
 			get_image "$url" "cat" > $IUPCONFFILES
-		  fi
-		  if [ -s $IUPCONFFILES ]; then
+		fi
+		if [ -s $IUPCONFFILES ]; then
 			v "Download finished"
 			retry=$((RETRYSTOP + 1))
-		  else
-		  v "Download failed, retrying in $incsleep seconds"
-		  sleep $incsleep
-		  incsleep=$((incsleep * retry + number))
-		  retry=$((retry+1))
-		  fi
-		done
-	fi
+		else
+			v "Download failed, retrying in $incsleep seconds"
+			sleep $incsleep
+			incsleep=$((incsleep * retry + number))
+			retry=$((retry+1))
+		fi
+	done
+
 	if [ ! -s "$IUPCONFFILES" ]; then
 		echo "File not Found"
 		reboot="off"
@@ -242,6 +245,9 @@ handle_Downloaded_file()
 {
 	local DECKEY
 	local KEY
+	local md5
+	local pack
+	local packname
 	[ -n "$1" ] && DECKEY=$(echo $1 | tr -d '\n' | hexdump -e '16/1 "%02x"')
 	KEY=${DECKEY:-$DESKEY}
 	local img_type

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.38
 
-PKG_SOURCE_VERSION:=f241dd296dc22301093bc98a4d623ab47fa5feee
+PKG_SOURCE_VERSION:=8d89f663e30b93cd314df708bf6abbef342d52ee
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd