questd pkg source version updated

-------------------------------------------------------------------------------
* 0f8cae3 DHCPLeaseTime = -1 now map to infinite in dhcp config ref #14491
-------------------------------------------------------------------------------
commit 0f8cae3d342b5bd0b7d394ccd763531c84f6c77c
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2018-03-26 13:12:44 +0200

    DHCPLeaseTime = -1 now map to infinite in dhcp config ref #14491

Base directory -> /
 dm/dmtree/tr098/landevice.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------

catv/files/etc/config/catv

@@ -1,4 +1,4 @@
 
 config service 'catv'
-        option enable '0'
+        option enable 'no'
         option filter '3'

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.1
-PKG_RELEASE:=RC1
+BASE_PKG_VERSION:=5.0.2
+PKG_RELEASE:=RC15
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=a2635dd11c477d70728ab6cbe5c2dee3965dbe14
+PKG_SOURCE_VERSION:=9976efee33243e044b89e74b3c05429aeb777038
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | 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-11-24
+PKG_VERSION:=3.0-2018-03-01
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d74b88913f676ebf9a210c4674555d080e57ff52
+PKG_SOURCE_VERSION:=0f8cae3d342b5bd0b7d394ccd763531c84f6c77c
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

ifbt/Makefile

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2013 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifbt
-PKG_VERSION:=0.1
-
-PKG_SOURCE_VERSION:=da97d6668d3c0e3f2be226c66b406e90179ada81
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@private.inteno.se:ifbt.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ifbt
-	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-	TITLE:=Fast BSS Transition
-endef
-
-define Package/ifbt/description
-	ifbt is Iopsys application for fast BSS transition
-endef
-
-define Package/ifbt/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifbt $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ifbt))

inteno-netmodes/files/etc/hotplug.d/net/80-repeater

@@ -3,6 +3,9 @@
 . /lib/functions.sh
 include /lib/network
 
+# exit if no wet interface is available
+uci show wireless | grep mode | grep -q wet || exit
+
 ps | grep hotplug | grep button && exit
 
 MTK=0
@@ -67,6 +70,8 @@ case "$ACTION" in
 		uci set network.wan.ifname="$(echo $WANDEV $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$wetif //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
 		uci commit network
 		ubus call network reload
+		sleep 1
+		ubus call network.device set_state "{\"name\":\"$wetif\", \"defer\":true}"
 		[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss down 2>/dev/null
 		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
 		ubus call router.network reload
@@ -89,6 +94,8 @@ case "$ACTION" in
 		uci set network.wan.ifname="$(echo $wetif $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$WANDEV //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
 		uci commit network
 		ubus call network reload
+		sleep 1
+		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
 		[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss up 2>/dev/null
 		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || {
 			killall -9 wifi

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/wireless

@@ -77,17 +77,4 @@ config wifi-device 'wl1'
 	option rifs_advert '0'
 	option maxassoc '32'
 	option doth '0'
-	option apsta '1'
-
-config wifi-iface
-	option device 'wl1'
-	option ifname 'wl1'
-	option network 'wan'
-	option mode 'wet'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option wps_pbc '0'
-	option wmf_bss_enable '1'
-	option autoconf '1'
 

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/wireless

@@ -77,19 +77,6 @@ config wifi-device 'wl1'
 	option rifs_advert '0'
 	option maxassoc '32'
 	option doth '0'
-	option apsta '1'
-
-config wifi-iface
-	option device 'wl1'
-	option ifname 'wl1'
-	option network 'wan'
-	option mode 'wet'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option wps_pbc '0'
-	option wmf_bss_enable '1'
-	option autoconf '1'
 
 config wifi-iface
 	option device 'wl1'

inteno-netmodes/files/sbin/netmode-conf

@@ -162,17 +162,14 @@ done
 
 repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta'"  | sed 's/.*\[\([0-9]\)\].*/\1/')
 
-[ -z "$repeater_iface_num" ] && {
-	[ "$from_gui" == "true" ] && restore "back"
-	exit
+[ "$repeater_iface_num" ] && {
+	json_get_var ssid ssid
+	json_get_var key key
+	json_get_var encryption encryption
+
+	set_wireless_values "$repeater_iface_num" "$ssid" "$key" "$encryption"
 }
 
-json_get_var ssid ssid
-json_get_var key key
-json_get_var encryption encryption
-
-set_wireless_values "$repeater_iface_num" "$ssid" "$key" "$encryption"
-
 json_load "`cat $file`"
 json_select "wifi_ifaces"
 

iop/configs/config

@@ -72,6 +72,7 @@ CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-owsd=y
+CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-samba=y
@@ -173,6 +174,7 @@ CONFIG_BUSYBOX_CONFIG_LSMOD=y
 CONFIG_BUSYBOX_CONFIG_LSPCI=y
 CONFIG_BUSYBOX_CONFIG_LSUSB=y
 CONFIG_BUSYBOX_CONFIG_MICROCOM=y
+CONFIG_BUSYBOX_CONFIG_MPSTAT=y
 CONFIG_BUSYBOX_CONFIG_RMMOD=y
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y

iop/iop.completion

@@ -36,7 +36,7 @@ _iop()
              feeds_update genconfig generate_tarballs install_key \
              scp_changes setup_host ssh_install_key ssh_sysupgrade \
              ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
-             update_package"
+             update_package update_feed_branches"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/feeds_update.sh

@@ -35,7 +35,8 @@ function feeds_update {
     ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
     ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
     ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
-    
+	./scripts/feeds install -p feed_inteno_targets iopsys-realtek
+
     # install all packages
     ./scripts/feeds install -a 
 

iop/scripts/genconfig.sh

@@ -15,8 +15,9 @@ function genconfig {
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
 	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02"
-	iopsys_brcm63xx_arm="dg400 eg400 f104w f104 dg400prime dg400primeb 963138REF_P502"
+	iopsys_brcm63xx_arm="dg400 eg400 sdx_500rg f104w f104 dg400prime dg400primeb 963138REF_P502"
 	iopsys_ramips="ex400"
+	iopsys_realtek="rtl8685g"
 	ramips="mt7621"
 	target="bogus"
 	masterconfig=1
@@ -46,6 +47,13 @@ function genconfig {
 		fi
 	done
 
+	for p in $iopsys_realtek; do
+		if [ $p == $profile ]; then
+			target="iopsys_realtek"
+			return
+		fi
+	done
+
 	for p in $ramips; do
 		if [ $p == $profile ]; then
 			target="ramips"

iop/scripts/update_feed_branches.sh

@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Exported interface
+function update_feed_branches {
+	local release="$1"
+	local ipath="$(pwd)"
+	local branch="$2"
+	local curbranch
+
+	[ -n "$release" ] || {
+		echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
+		echo ""
+		echo "If you do not give a branch as argument,"
+		echo "<RELEASE> branch will be updated to commit"
+		echo "hash given in feeds.conf for each feed repo"
+		exit 1
+	}
+
+	if [ -n "$branch" ]; then
+		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
+		if git diff-index --quiet HEAD; then
+			curbranch=`git symbolic-ref HEAD 2>/dev/null`
+			curbranch=${curbranch##refs/heads/}
+			if [ -z $curbranch ]; then
+				curbranch=`git log -1 --pretty=format:"%H"`
+			fi
+			git checkout $branch || {
+				echo "couldn't checkout branch $branch"
+				exit 99
+			}
+		else
+			echo "You have unsaved changes."
+			exit 99
+		fi
+	else
+		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
+	fi
+
+	ifeeds="$(grep -r feed_inteno feeds.conf  | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"
+
+	for f in $ifeeds; do
+		commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
+		cd $ipath/feeds/feed_inteno_$f
+		git branch -D $release 2>/dev/null
+		echo "feed_inteno_$f: updating release branch $release to commit $commith"
+		git checkout $commith
+		git push origin :$release
+		git checkout -b $release
+		git push origin $release
+		cd $ipath
+	done
+
+	if [ -n "$branch" ]; then
+		echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
+		git checkout $curbranch
+	else
+		echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
+	fi
+}
+
+register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"

layer2interface/broadcom/etc/init.d/layer2_interface_ethernet

@@ -55,7 +55,6 @@ addethernet() {
 	ifname="${ifname:-$baseifname.1}"
 
 	brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge" "$mac2"
-
 }
 
 boot() {
@@ -96,12 +95,15 @@ start_service() {
 	echo "Setting up Ethernet WAN"
 	config_load layer2_interface_ethernet
 	config_foreach addethernet ethernet_interface
+	/etc/init.d/layer2_interface_vlan start
 }
 
 stop_service() {
 	local ifname
 	config_load layer2_interface_ethernet
 	config_foreach removeethernet ethernet_interface
+	/etc/init.d/layer2_interface_vlan stop
+	sleep 1
 }
 
 reload_service() {
@@ -113,4 +115,3 @@ service_triggers() {
 	procd_add_reload_trigger layer2_interface_ethernet
 }
 
-

layer2interface/broadcom/lib/network/brcmwifi.sh

@@ -356,7 +356,7 @@ wlmngr_finalize() {
 	local pcid="$(wlctl -i wl$idx revinfo | awk 'FNR == 2 {print}' | cut -d'x' -f2)"
 	local isac="$(db get hw.$pcid.is_ac)"
 	if [ "$isac" == "1" ]; then
-		wlctl -i wl$idx msglevel +radar +dfs 2>/dev/null
+		#wlctl -i wl$idx msglevel +dfs 2>/dev/null
 		dhdctl -i wl$idx dconpoll 200 2>/dev/null
 	fi
 	local rdrthrs="$(db get hw.$pcid.radarthrs)"
@@ -368,6 +368,19 @@ wlmngr_finalize() {
 	# this piece of code is -required- to make br-lan's mac work properly
 	# in all cases
 	sendarp -s br-lan -d br-lan
+
+	# set power percent
+	local pwrpercent="$(uci -q get wireless.wl$idx.txpower)"
+	pwrpercent=${pwrpercent:-100}
+	wlctl -i wl$idx pwr_percent $pwrpercent
+
+	# set message level
+	wlctl -i wl$idx msglevel 0x0 2>/dev/null
+	dhdctl -i wl$idx msglevel 0x0 2>/dev/null
+	for msg in $(uci -q get wireless.wl$idx.msglevel); do
+		wlctl -i wl$idx msglevel +$msg 2>/dev/null
+		dhdctl -i wl$idx msglevel +$msg 2>/dev/null
+	done
 }
 
 wlmngr_issueServiceCmd() {

questd/Makefile

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

questd/files/sbin/imonitor

@@ -41,22 +41,27 @@ UBUS_TIMEOUT=5
 BSDBIN=$(which bsd)
 ACSDBIN=$(which acsd)
 
+RESTART_ACSD=0
+RESTART_BSD=0
+
+DUALBAND=1
+
 restart_questd()
 {
 	logger -s -t $0[$$] "Restarting questd. $NPROC_NFAIL $MEM_NFAIL $PCPU_NFAIL $NNET_NFAIL"
 
-	killall -q -KILL questd
 	/etc/init.d/quest stop
 	killall -q -KILL questd
 	/etc/init.d/quest start
 
+	sleep 5
+
 	NPROC_NFAIL=0
 	MEM_NFAIL=0
 	PCPU_NFAIL=0
 	NNET_NFAIL=0
 }
 
-
 check_nproc()
 {
 	local nproc="$@"
@@ -140,12 +145,26 @@ check_ubus_network_call() {
 
 restart_bsd()
 {
-	logger -s -t $0[$$] "Restarting WiFi and Band Steering daemon due to bsd hangup."
 	killall -q -15 bsd 2>/dev/null
-	wlctl -i wl0 down 2>/dev/null
-	wlctl -i wl1 down 2>/dev/null
-	wlctl -i wl0 up 2>/dev/null
-	wlctl -i wl1 up 2>/dev/null
+
+	[ "$(nvram get wl0_radio)" == "1" -a "$(nvram get wl1_radio)" == "1" ] || {
+		[ $DUALBAND -eq 1 ] && logger -s -t $0[$$] "Band Steering is deactivated; will be re-activated when both 2.4GHz and 5GHz radios are enabled."
+		DUALBAND=0
+		return 0
+	} && DUALBAND=1
+
+	logger -s -t $0[$$] "Restarting Band Steering daemon due to bsd hangup."
+
+	if [ $RESTART_BSD -eq 3 ]; then
+		wlctl -i wl0 down 2>/dev/null
+		wlctl -i wl1 down 2>/dev/null
+		wlctl -i wl0 up 2>/dev/null
+		wlctl -i wl1 up 2>/dev/null
+		RESTART_ACSD=0
+		RESTART_BSD=0
+	else
+		RESTART_BSD=$((RESTART_BSD+1))
+	fi
 	bsd &
 }
 
@@ -163,12 +182,18 @@ check_bsdcall()
 
 restart_acsd()
 {
-	logger -s -t $0[$$] "Restarting WiFi and Auto Channel Selection daemon due to acsd high CPU usage."
+	logger -s -t $0[$$] "Restarting Auto Channel Selection daemon due to acsd high CPU usage."
 	killall -q -9 acsd 2>/dev/null
-	wlctl -i wl0 down 2>/dev/null
-	wlctl -i wl1 down 2>/dev/null
-	wlctl -i wl0 up 2>/dev/null
-	wlctl -i wl1 up 2>/dev/null
+	if [ $RESTART_ACSD -eq 3 ]; then
+		wlctl -i wl0 down 2>/dev/null
+		wlctl -i wl1 down 2>/dev/null
+		wlctl -i wl0 up 2>/dev/null
+		wlctl -i wl1 up 2>/dev/null
+		RESTART_ACSD=0
+		RESTART_BSD=0
+	else
+		RESTART_ACSD=$((RESTART_ACSD+1))
+	fi
 	acsd
 }
 
@@ -226,17 +251,16 @@ main()
 			fi
 		fi
 
-		if [ "$BSDBIN" ] ; then
-			config_load wireless
-			config_get_bool bsdenabled bandsteering enabled 0
-			if [ $bsdenabled == "1" -a "$(pidof wifi)" == "" ] ; then
-				check_bsdcall || restart_bsd
-			fi
-		fi
+#		if [ "$BSDBIN" ] ; then
+#			bsdenabled="$(uci -q get wireless.bandsteering.enabled)"
+#			if [ $bsdenabled == "1" -a "$(pidof wifi)" == "" ] ; then
+#				check_bsdcall || restart_bsd
+#			fi
+#		fi
 
-		if [ "$ACSDBIN" ] ; then
-			check_acsd || restart_acsd
-		fi
+#		if [ "$ACSDBIN" ] ; then
+#			check_acsd || restart_acsd
+#		fi
 
 		# sleep
 		if [ "$sample" -lt "$SAMPLES" ]; then

voice-client/Makefile

@@ -16,7 +16,7 @@ define Package/voice-client
   SECTION:=net
   CATEGORY:=Network
   TITLE:=voice-client
-  DEPENDS:=asterisk13||asterisk18-mod
+#  DEPENDS:=@(asterisk13||asterisk18-mod)
 endef
 
 define Package/voice-client/description