iup: option 224 follows standard

-------------------------------------------------------------------------------
* 5de4432 do not share object
-------------------------------------------------------------------------------
commit 5de4432d19b043677b9c729701057ae8c0c37589
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2016-04-05 15:47:48 +0200

    do not share object

Base directory -> /
 Makefile  |  4 ++--
 scriptd.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 tools.c   |  2 +-
 3 files changed, 53 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------

ice-client/Makefile

@@ -16,14 +16,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
 BASE_PKG_VERSION:=3.4.1
-PKG_RELEASE:=RC8
+PKG_RELEASE:=RC9
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
 PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git
-PKG_SOURCE_VERSION:=ecad8b60183b43ecf86543c0c29db46cda8aae29
+PKG_SOURCE_VERSION:=d3065ee24d72d3fffd5ff75b617bf54fb5377561
 ifeq ($(CONFIG_ICE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
@@ -897,10 +897,20 @@ endef
 define Package/ice-client-bcmspeedmgr/install
 	$(INSTALL_DIR) $(1)/bin
 	$(CP) $(PKG_BUILD_DIR)/daemons/bcmspeedmgr/obj/iopsys/bcmspeedmgr $(1)/bin
+	$(CP) $(PKG_BUILD_DIR)/daemons/bcmspeedmgr/obj/iopsys/speedsvc $(1)/bin
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(CP) $(PKG_BUILD_DIR)/platforms/iopsys/bcmspeedtestservice $(1)/etc/init.d/bcmspeedtestservice
 endef
+
+define Package/ice-client-bcmspeedmgr/postinst
+#!/bin/sh
+/etc/init.d/bcmspeedtestservice stop
+/etc/init.d/bcmspeedtestservice start
+exit 0
+endef
+
 endif
+
 # This line executes the necessary commands to compile our program.
 # The above define directives specify all the information needed, but this
 # line calls BuildPackage which in turn actually uses this information to

iup/files/etc/init.d/iup

@@ -13,6 +13,23 @@ include /lib/network
 CRONPATH="/etc/crontabs/root"
 RANGE=60
 
+management_interfaces() {
+	local DHCP_IFACES=""
+
+	is_notbridged_dhcp() {
+		local config="$1"
+		local proto="$(uci -q get network.$config.proto)"
+		local typ="$(uci -q get network.$config.type)"
+		if [ "$proto" == "dhcp" -a "$typ" != "bridge" ]; then
+			DHCP_IFACES="$DHCP_IFACES $config"
+		fi
+	}
+
+	config_load network
+	config_foreach is_notbridged_dhcp interface
+	echo $DHCP_IFACES
+}
+
 init_iup() {
 	local interval
 	local starttime
@@ -35,9 +52,9 @@ init_iup() {
 	local newreqopts=
 	local baseopts=
 	local reqopts="$(uci -q get network.wan.reqopts)"
-	local proto="$(uci -q get network.wan.proto)"
 	local iupopts="66 67 128 224"
 	local ropt iopt
+	local net
 	config_get enabled iup enabled "on"
 	for ropt in $reqopts; do
 		case $ropt in
@@ -53,12 +70,13 @@ init_iup() {
 			*) newreqopts="$newreqopts $ropt" ;;
 		esac
 	done
-	if [ "$proto" == "dhcp" ]; then
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		uci -q set network.wan.reqopts="$newreqopts"
-		uci commit network
-		ubus call network reload
-	fi
+
+	newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+	for net in $(management_interfaces); do
+		uci -q set network.$net.reqopts="$newreqopts"
+	done
+	uci commit network
+	ubus call network reload
 	#################################################################
 
 	if [ $interval == "weekly" ]; then

iup/files/sbin/iup224

@@ -32,7 +32,7 @@ elif [ $a ] && [ $b ] && [ $a -lt 25 ] ; then
 	now=$(date +%s)
 	end=$((begin+3600*$b))
 	if [ $now -gt $begin ] && [ $now -lt $end ] ; then
-		active=1 
+		active=1
 	fi
 elif [ $a ] && [ $b ] && [ $c ] && [ $a -gt 25 ]  ; then
 	#Date
@@ -43,7 +43,7 @@ elif [ $a ] && [ $b ] && [ $c ] && [ $a -gt 25 ]  ; then
 	now=$(date +%s)
 	end=$((begin+3600*$c))
 	if [ $now -gt $begin ] && [ $now -lt $end ] ; then
-		active=1 
+		active=1
 	fi
 else
 	echo "Bad format"
@@ -53,23 +53,25 @@ fi
 sofwareminuspath=${url##*/}
 
 if [ $url ] && [ $active -eq 1 ]; then
-	echo "Software version to download $sofwareminuspath"	
+	echo "Software version to download $sofwareminuspath"
 	local sysinfo=$(ubus call router quest "{ \"info\": \"system\" }")
 	json_load "$sysinfo"
 	json_get_var firmware firmware
 	json_get_var filesystem filesystem                                  
-        if [ "$filesystem" == "JFFS2" ] ; then                               
-                firmware=$firmware.w                                                                                                           
-        else                                                                 
-                firmware=$firmware.y                                         
-        fi     
-	if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
+        if [ "$filesystem" == "JFFS2" ] ; then
+		firmware=$firmware.w
+		firmware2=$firmware.w
+        else
+		firmware=$firmware.y
+		firmware2=$firmware.y2
+        fi
+	if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" -o "$sofwareminuspath" == "${sofwareminuspath/$firmware2/}" ] ; then
 		echo "Image found $url will start flashing"
-		/sbin/sysupgrade -v $url
+		/sbin/sysupgrade -v $url &
+		exit 1
 	else
 		echo "Will not update software, already up to date"
+		exit 0
 	fi
 fi
 
-
-

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.0.0
+PKG_VERSION:=3.1.0
 
-PKG_SOURCE_VERSION:=4ec2f7e451941fbfbb990113b82c82bc8d906f57
+PKG_SOURCE_VERSION:=f7e856ec68627842c1e79eadb5b856ec629bb637
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 
@@ -45,6 +45,8 @@ define Package/questd/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_DIR) $(1)/tmp
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ueventd $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,questd))

questd/files/etc/init.d/quest

@@ -5,17 +5,28 @@ STOP=96
 
 USE_PROCD=1
 NAME=questd
-PROG=/sbin/questd
 
 start_service() {
 	procd_open_instance
-	procd_set_param command "$PROG"
+	procd_set_param command "/sbin/questd"
+	procd_set_param respawn
+	procd_close_instance
+
+	procd_open_instance
+	procd_set_param command "/sbin/uscriptd"
+	procd_set_param respawn
+	procd_close_instance
+
+	procd_open_instance
+	procd_set_param command "/sbin/ueventd"
 	procd_set_param respawn
 	procd_close_instance
 }
 
 stop() {
 	service_stop /sbin/questd
+	service_stop /sbin/uscriptd
+	service_stop /sbin/ueventd
 }
 
 service_triggers()

questd/files/tmp/igmp_snooping

@@ -1,5 +0,0 @@
-igmp snooping 2  proxy 1  lan2lan-snooping 0/0, rate-limit 0pps, priority -1
-bridge device src-dev #tags lan-tci  wan-tci    group      mode RxGroup    source     reporter   timeout Index      ExcludPt
-br-lan eth5   eth2.1  00    0x0000   0xffffffff 0xe0027ffe EX   0xe0027ffe 0x00000000 0xc0a801f1 258     0x401e0001 -1
-br-lan eth5   eth2.1  00    0x0000   0xffffffff 0xefc3ffff EX   0xefc3ffff 0x00000000 0xc0a801f1 258     0x400e0001 -1
-br-lan eth5   eth2.1  00    0x0000   0xffffffff 0xefffffff EX   0xefffffff 0x00000000 0xc0a801f1 258     0x40070001 -1