layer2interface: adsl and vdsl init scripts are xtmctl version aware

-------------------------------------------------------------------------------
* b279429 fix empty client list on wl1 when wl0 is disabled ref #13485
* 1c47a44 change strndup to strdup to avoid warnings
-------------------------------------------------------------------------------
commit b2794295fdf9469b6cd8ba1544f291d4b83a7d5a
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-12-15 11:33:13 +0100

    fix empty client list on wl1 when wl0 is disabled ref #13485

Base directory -> /
 network.c |  5 +++--
 port.c    | 17 +++++++++++++++++
 port.h    |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 1c47a44bfcb863319282900446bf20965c9eccbc
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-12-15 11:24:01 +0100

    change strndup to strdup to avoid warnings

Base directory -> /
 port.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------

ice-client/Makefile

@@ -19,14 +19,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:=5.0.0
+BASE_PKG_VERSION:=5.0.1
-PKG_RELEASE:=RC8
+PKG_RELEASE:=RC0
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=57b19721eb8906cb0c5e34a28eba080bc5b74a26
+PKG_SOURCE_VERSION:=4a0ebce9e55b0bd9b44bfe5e96e820336cc9dc0f
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

layer2interface/broadcom/etc/init.d/layer2_interface_adsl

@@ -6,6 +6,8 @@ include /lib/network
 START=22
 USE_PROCD=1
 
+XTMCTLVER="$(xtmctl --version 2>&1 | awk '{print$3}')"
+
 checkpvc() {
 	local retur
 	local vpi=$1
@@ -102,9 +104,15 @@ atm_inf_conf() {
 		checkxtmlist $atmtype $pcr $scr $mbs
 		ret="$?"
 		xtmctl operate conn --add 1.$vpi.$vci aal5 $encaps 0 1 $ret
-		xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low  priority queue
+		if [ "$XTMCTLVER" == "2.5" ]; then
-		xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low  priority queue
-		xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp
+			xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp
+		else
+			xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 dt # low  priority queue
+			xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 dt # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 dt # high priority queue, internal traffic dhcp igmp dns and icmp
+		fi
 		xtmctl operate conn --createnetdev 1.$vpi.$vci ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
 

layer2interface/broadcom/etc/init.d/layer2_interface_vdsl

@@ -6,6 +6,8 @@ include /lib/network
 START=22
 USE_PROCD=1
 
+XTMCTLVER="$(xtmctl --version 2>&1 | awk '{print$3}')"
+
 checkptm() {
 	local retur
 	local ptmprio=$1
@@ -44,10 +46,17 @@ ptm_inf_conf() {
 	ret=$?
 
 	if [ "$ret" -eq 0 ]; then
-		xtmctl operate conn --add $dslat.$ptmprio 0 1
+		if [ "$XTMCTLVER" == "2.5" ]; then
-		xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000 # low  priority queue
+			xtmctl operate conn --add $dslat.$ptmprio 0 1
-		xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 -1 -1 3000 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000 # low  priority queue
-		xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
+			xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 -1 -1 3000 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
+		else
+			xtmctl operate conn --add $dslat.$ptmprio
+			xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 dt -1 -1 3000 # low  priority queue
+			xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 dt -1 -1 3000 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 dt -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
+		fi
 		xtmctl operate conn --createnetdev $dslat.$ptmprio ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
 		xtmctl start
@@ -63,7 +72,11 @@ remove_netdevices() {
 	for i in `xtmctl operate conn --show | grep "PTM\|mode"`
 	do
 		if [ $x -eq 1 ]; then
-			delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$10}')
+			if [ "$XTMCTLVER" == "2.5" ]; then
+				delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$10}')
+			else
+				delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$11}')
+			fi
 			echo "xtmctl operate conn --delete $delptm"
 			xtmctl operate conn --delete $delptm
 			xtmctl operate conn --deletenetdev $delptm

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.1.39
+PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=10cba850fb80668502ca5ce0bc57533089062741
+PKG_SOURCE_VERSION:=b2794295fdf9469b6cd8ba1544f291d4b83a7d5a
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

questd/files/sbin/imonitor

@@ -23,7 +23,7 @@ NPROC_COUNT=4	# number of time that the NPROC_LIMIT has to be hit to trigger a p
 NPROC_NFAIL=0	# current consecutive Number of FAILures. process restarts when NPROC_NFAIL == NPROC_COUNT
 
 # memmory limit
-MEM_LIMIT=15000
+MEM_LIMIT=20000
 MEM_COUNT=4
 MEM_NFAIL=0
 
@@ -129,6 +129,8 @@ check_ubus_network_call() {
 	json_load "$(ifstatus lan)" || return 0
 	json_get_var up up
 	[ $up -eq 1 ] || return 0
+	local ifname="$(uci -q get network.lan.ifname)"
+	[ -z "$ifname" -o "${ifname:0:3}" == "br-" ] && return 0
 	ubus -t 5 call router.network ports '{"network":"lan"}' | grep -q statistics || {
 		NNET_NFAIL=1
 		return 1