layer2interface: adsl and vdsl init scripts are xtmctl version aware

Update feed [ feed_inteno_packages ] package [ questd ]
------------------------------------------------------------------------------- * 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(-) -------------------------------------------------------------------------------
2025-12-21 09:33:50 +08:00 · 2017-12-17 12:59:00 +01:00 · 2017-12-15 11:34:14 +01:00 · 2017-12-13 17:40:02 +01:00 · 2017-12-13 13:38:22 +01:00 · 2017-12-13 13:11:50 +01:00
5 changed files with 37 additions and 14 deletions
--- a/ice-client/Makefile
+++ b/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
-PKG_RELEASE:=RC8
+BASE_PKG_VERSION:=5.0.1
+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/
--- a/layer2interface/broadcom/etc/init.d/layer2_interface_adsl
+++ b/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
-		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
+		if [ "$XTMCTLVER" == "2.5" ]; then
+			xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low  priority queue
+			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

--- a/layer2interface/broadcom/etc/init.d/layer2_interface_vdsl
+++ b/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
-		xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000 # low  priority queue
-		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
+		if [ "$XTMCTLVER" == "2.5" ]; then
+			xtmctl operate conn --add $dslat.$ptmprio 0 1
+			xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000 # low  priority queue
+			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
--- a/questd/Makefile
+++ b/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

--- a/questd/files/sbin/imonitor
+++ b/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
Author	SHA1	Message	Date
Sukru Senli	9179025579	layer2interface: adsl and vdsl init scripts are xtmctl version aware	2017-12-17 12:59:00 +01:00
Reidar Cederqvist	6f86f000b1	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 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(-) -------------------------------------------------------------------------------	2017-12-15 11:34:14 +01:00
Sukru Senli	8506eed1e4	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 4bbcb4d network: handle rssi for repeated arp clients ------------------------------------------------------------------------------- commit 4bbcb4d2f8c901c18cdf4456e65497975e03fada Author: Sukru Senli <sukru.senli@inteno.se> Date: 2017-12-13 17:39:02 +0100 network: handle rssi for repeated arp clients Base directory -> / network.c \| 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -------------------------------------------------------------------------------	2017-12-13 17:40:02 +01:00
Sukru Senli	53b3f486bd	questd: imonitor: do not restart quest if lan ifname is missing or is bridge	2017-12-13 13:38:22 +01:00
Sukru Senli	e31e5f32da	questd-3.1.40	2017-12-13 13:11:50 +01:00
Reidar Cederqvist	26c2dae0c9	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * b4b9988 questd: improve parsing * 9e98e21 questd: get nvram Hardware Version value * 875d5fe fix c99 warning * 2711c6b questd: print rssi value from extender * f62075b questd: get rssi value from extender * cd39df6 add missing close for ioctl socket ------------------------------------------------------------------------------- commit b4b99885bea425f552e8a844ff2f15e2d4672c65 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 17:12:37 +0100 questd: improve parsing Base directory -> / dumper.c \| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 9e98e21a84347b3d77a5ae44fb2fc783c7bb77dd Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 16:27:27 +0100 questd: get nvram Hardware Version value Base directory -> / dumper.c \| 20 ++++++++++++++++++++ system.c \| 5 +++++ system.h \| 1 + 3 files changed, 26 insertions(+) ------------------------------------------------------------------------------- commit 875d5fe069d178ecb1b4b9bca78aba90691afc12 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-30 16:13:31 +0100 fix c99 warning Base directory -> / wificontrol.c \| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 2711c6b34357ea25abe08d43612347f6e0c4b5b2 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:37:56 +0100 questd: print rssi value from extender Base directory -> / network.c \| 30 +++++++++++++++++++----------- network.h \| 7 ++++++- 2 files changed, 25 insertions(+), 12 deletions(-) ------------------------------------------------------------------------------- commit f62075bd509755052e6006db9e901476145500db Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:35:06 +0100 questd: get rssi value from extender Base directory -> / Makefile \| 2 +- wificontrol.c \| 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) ------------------------------------------------------------------------------- commit cd39df609dcb7f824f50d4d544ac5247bcd85b3f Author: Reidar Cederqvist <reidar.cederqvist@gmail.com> Date: 2017-12-04 12:47:24 +0100 add missing close for ioctl socket Base directory -> / network.c \| 1 + 1 file changed, 1 insertion(+) -------------------------------------------------------------------------------	2017-12-07 15:48:04 +01:00
Erik Horemans	2f2d88f770	new ice-client ice-client 5.0.1-RC0	2017-12-05 16:34:25 +01:00
Ionut-Alex Oprea	540b09e26b	imonitor: increase questd memory limit to 20MB refs #13511	2017-12-05 14:24:40 +01:00
Robin Stjerndorff	001c25ee12	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 16cb4dd questd: improve parsing * 312ca10 questd: get nvram Hardware Version value * 824c247 fix c99 warning * 83a7011 questd: print rssi value from extender * b554abd questd: get rssi value from extender ------------------------------------------------------------------------------- commit 16cb4dda3909efef54b84d44fa11dc28f9763c8c Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 17:12:37 +0100 questd: improve parsing Base directory -> / dumper.c \| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 312ca10075347ea1ca4d4a051d079ff5643a934e Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 16:27:27 +0100 questd: get nvram Hardware Version value Base directory -> / dumper.c \| 20 ++++++++++++++++++++ system.c \| 5 +++++ system.h \| 1 + 3 files changed, 26 insertions(+) ------------------------------------------------------------------------------- commit 824c24781123b0cc83216486732e5a03823ec5ed Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-30 16:13:31 +0100 fix c99 warning Base directory -> / wificontrol.c \| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 83a7011877b6a7b1dcbcfd925037ffd77de5165f Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:37:56 +0100 questd: print rssi value from extender Base directory -> / network.c \| 30 +++++++++++++++++++----------- network.h \| 7 ++++++- 2 files changed, 25 insertions(+), 12 deletions(-) ------------------------------------------------------------------------------- commit b554abd3fa7e0898095bfb575803081f716d3723 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:35:06 +0100 questd: get rssi value from extender Base directory -> / Makefile \| 2 +- wificontrol.c \| 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) -------------------------------------------------------------------------------	2017-12-04 17:27:22 +01:00