ice-client: update to 5.1.9

by starting a script that starts netmode-conf in the background refs #14901

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.2
-PKG_RELEASE:=RC4
+BASE_PKG_VERSION:=5.1.9
+PKG_RELEASE:=RC5
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=d7102770d9a7bbd5e926a02391e221d947353544
+PKG_SOURCE_VERSION:=3002de0a3511f7da0fe20c3f183212a84aa964bf
 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:=4.0-2017-12-22
+PKG_VERSION:=4.0-2018-02-12
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=30f47f79ef7d21e89a856f444f6f86ab9175d1ed
+PKG_SOURCE_VERSION:=81a05e57b242a82781301d0bd132bd88a14c131e
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -160,6 +160,8 @@ define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(CP) ./files/icwmp.hotplug $(1)/etc/hotplug.d/iface/90-icwmp
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/90-cwmpfirewall
 ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)

icwmp/files/icwmp.hotplug

@@ -6,7 +6,16 @@
 
 [ -f /etc/config/cwmp ] || exit 0
 
-handle_icwmp_reload() {
+handle_icwmp_restart() {
+	[ -f /tmp/70-shiftrange.lock ] && exit 0
+	[ -f /tmp/switching_mode ] && exit 0
+	[ -f /tmp/wificontrol.txt -a ! -f /tmp/netmode_done ] && exit 0
+
+	[ "$INTERFACE" == "loopback" ] && exit 0
+
+	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+	[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
+
 	local islan="$(uci -q get network.$INTERFACE.is_lan)"
 	[ "$islan" == "1" ] && exit 0
 
@@ -18,6 +27,8 @@ handle_icwmp_reload() {
 
 	mkdir -p /tmp/ipv4
 
+	network_flush_cache
+
 	local previpaddr=""
 	local curipaddr=""
 	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
@@ -39,10 +50,16 @@ handle_icwmp_reload() {
 	network_get_subnets cursubnets $INTERFACE
 	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
 
-	[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" ] && exit 0
+	local prevdev=""
+	local curdev=""
+	local devfile=/tmp/ipv4/$INTERFACE-dev
+	prevdev=$(cat $devfile 2>/dev/null)
+	network_get_device curdev $INTERFACE
+	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
+
+	[ "$prevdev" == "$curdev" -a "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" ] && exit 0
 
 	/etc/init.d/icwmpd reload &
 }
 
-handle_icwmp_reload
-
+handle_icwmp_restart

inteno-netmodes/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=inteno-netmodes
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=f6ad4becd96f9856f900cb9cdbdad730198b24e9
+PKG_SOURCE_VERSION:=fbd7dcfab03df19b3c32675940e0aee708c7cf75
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/netmoded
 

inteno-netmodes/files/lib/functions/netmode.sh

@@ -100,9 +100,11 @@ correct_uplink() {
 
 	if [ "$link" == "up" ]; then
 		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":true}"
+		ifconfig $WETIF down
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":false}"
 	else
 		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":false}"
+		ifconfig $WETIF up
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
 		ubus call led.internet  set '{"state" : "notice"}'
 	fi
@@ -402,6 +404,7 @@ start_netmode_tools() {
 	config_get_bool repeaterready setup repeaterready 0
 
 	[ $repeaterready -eq 1 ] && {
+		/sbin/netmode-discover &
 		/sbin/wificontrol --repeater &
 		return
 	}
@@ -413,10 +416,14 @@ start_netmode_tools() {
 			/sbin/netmode-discover &
 			/sbin/wificontrol --repeater &
 		;;
+		*)
+			/sbin/netmode-client-detect &
+		;;
 	esac
 }
 
 stop_netmode_tools() {
+	/sbin/netmode-client-detect stop
 	killall -9 netmode-discover >/dev/null 2>&1
 	killall -9 wificontrol >/dev/null 2>&1
 }

inteno-netmodes/files/sbin/netmode-client-detect

@@ -3,6 +3,15 @@
 # receive new client events
 # and trigger wificontrol in --router mode for that client
 
+NCDPF="/tmp/netmode-client-detector.pid"
+
+if [ -f $NCDPF ]; then
+	kill -9 $(cat $NCDPF) 2>/dev/null
+	rm -f $NCDPF
+fi
+
+[ "$1" == "stop" ] && exit
+
 . /usr/share/libubox/jshn.sh
 
 action=
@@ -10,15 +19,6 @@ ipaddr=
 macaddr=
 network=
 
-timed_check() {
-	while true; do
-		network=${network:-lan}
-		ubus call repeater get_creds '{"network":"'$network'","file":"/tmp/wificontrol.txt"}'
-		wificontrol --router
-		sleep $1
-	done
-}
-
 is_inteno_macaddr()
 {
 	macaddr=$1
@@ -36,24 +36,23 @@ is_inteno_macaddr()
 	false
 }
 
-timed_check 60 &
+ubus listen client | \
+while read event ; do
+	#echo "netmode-client-detect got event: $event" >/dev/console
+	json_load "$event"
+	json_select client
+	json_get_var action action
+	[ "$action" == "connect" ] || continue
+	json_get_var macaddr macaddr
+	json_get_var ipaddr ipaddr
+	json_get_var network network "lan"
 
-while true ; do
-	ubus listen client | \
-	while read event ; do
-		#echo "netmode-client-detect got event: $event" >/dev/console
-		json_load "$event"
-		json_select client
-		json_get_var action action
-		[ "$action" == "connect" ] || continue
-		json_get_var macaddr macaddr
-		json_get_var ipaddr ipaddr
-		json_get_var network network "lan"
+	if is_inteno_macaddr $macaddr; then
+		echo "netmode-client-detect: a new Inteno device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
+		ubus call repeater get_creds '{"network":"'$network'","file":"/tmp/wificontrol.txt"}' >/dev/null
+		grep -q ssid /tmp/wificontrol.txt && /sbin/wificontrol --router --destination $ipaddr
+	fi
+done &
+
+echo $(($!-1)) $! > $NCDPF
 
-		if is_inteno_macaddr $macaddr; then
-			echo "netmode-client-detect: a new Inteno device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
-			ubus call repeater get_creds '{"network":"'$network'","file":"/tmp/wificontrol.txt"}'
-			/sbin/wificontrol --router --destination $ipaddr
-		fi
-	done
-done

inteno-netmodes/files/sbin/netmode-conf

@@ -109,8 +109,10 @@ backup() {
 
 file="$1"
 from_gui="$2"
+done_file="/tmp/netmode_done"
 
 [ -f "$file" ] || exit
+[ -f "$done_file" ] && rm $done_file
 
 # let netmode-handler up to 20 seconds to finish switching mode
 wait_for_netmode_handler
@@ -161,6 +163,7 @@ done
 
 [ "$apcliband" == "$band" -o "$band" == "" ] || {
 	[ "$from_gui" == "true" ] && restore "back"
+	touch $done_file
 	exit
 }
 
@@ -168,6 +171,7 @@ repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta
 
 [ -z "$repeater_iface_num" ] && {
 	[ "$from_gui" == "true" ] && restore "back"
+	touch $done_file
 	exit
 }
 
@@ -197,6 +201,7 @@ while json_get_var dummy $i; do
 		a_num=$((a_num+1))
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
+			touch $done_file
 			exit
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
@@ -205,6 +210,7 @@ while json_get_var dummy $i; do
                 b_num=$((b_num+1))
                 [ -z $iface_num ] && {
                         [ "$from_gui" == "true" ] && restore "back"
+			touch $done_file
                         exit
                 }
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
@@ -222,6 +228,7 @@ while json_get_var dummy $i; do
 		esac
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
+			touch $done_file
 			exit
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
@@ -269,6 +276,7 @@ if [ "$from_gui" == "true" ]; then
 		ping -w1 $ip
 		if [ $? -eq 0 ]; then
 			restore
+			touch $done_file
 			exit
 		else
 			i=$((i-10))
@@ -278,6 +286,7 @@ if [ "$from_gui" == "true" ]; then
 	restore "back"
 else
 	if [ "$state" == "exit" ]; then
+		touch $done_file
 		return
 	fi
 	ubus call leds set '{"state":"allflash"}'
@@ -291,4 +300,7 @@ else
 	[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
 	correct_uplink
 	ubus call leds set '{"state":"normal"}'
+	touch $done_file
+	# we need to trigger a reload of icwmp but ONLY if ip or device has changed
+	[ -f "/etc/hotplug.d/iface/90-icwmp" ] && INTERFACE=wan ACTION=ifup sh /etc/hotplug.d/iface/90-icwmp
 fi

inteno-netmodes/files/sbin/netmode-discover

@@ -21,9 +21,14 @@ mask_to_cidr() {
 }
 
 while true; do
+	[ -e /sys/class/net/br-wan ] || {
+		sleep 5
+		continue
+	}
+
 	unlisted=0
 
-	ps | grep -q wifi | grep -q reload || {
+	ps | grep wifi | grep -q reload || {
 		for mac in $(brctl showmacs br-wan 2>/dev/null | tail -n +2 | grep no | awk '{print$2}'); do
 			grep -q "$mac" /proc/net/arp || unlisted=$((unlisted+1))
 		done
@@ -33,10 +38,10 @@ while true; do
 		mask=$(mask_to_cidr $netmask)
 	}
 
-	if [ $unlisted -gt 0 -a -n "$ipaddr" -a -n "$netmask" ]; then
+	if [ $unlisted -gt 0 -a -n "$ipaddr" -a -n "$netmask" -a $mask -ge 24 ]; then
 		fping -c 1 -t 1000 -g $ipaddr/$mask -q >/dev/null 2>&1
 	fi
 
-	sleep 20
+	sleep 30
 done
 

inteno-netmodes/files/sbin/start-netmode-conf

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+netmode-conf "$1" "$2" &

inteno-netmodes/files/sbin/testnet

@@ -7,6 +7,7 @@ TVCON=0
 WANIP=0
 LASTSTATUS=""
 CURSTATUS=""
+ETHWAN="$(db -q get hw.board.ethernetWanPort)"
 
 SLEEP_TIME=30
 enableCounter=0
@@ -48,7 +49,7 @@ ping_uplink()
 	if [ "$hasmode" == "1" ] && [ "$hasip" == "0" -o "$hasdev" == "0" ]; then
 		rv=0
 	elif [ "$hasmode" == "1" ]; then
-		ping $ipaddr -I $device -W 1 -c 1 -q >/dev/null 2>&1
+		ping $ipaddr -I $device -W 3 -c 1 -q >/dev/null 2>&1
 		[ $? -eq 1 ] && rv=0 || rv=1
 	else
 		SLEEP_TIME=5
@@ -57,7 +58,6 @@ ping_uplink()
 	fi
 
 	if [ $rv -eq 0 ]; then
-
 		echo "{ \"online\" : false }" > /tmp/internet_connection_status
 
 		SLEEP_TIME=10
@@ -65,11 +65,14 @@ ping_uplink()
 		wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
 		# If there is an uplink IP address but no connection for 5 minutes, reboot
 		if [ $enableCounter -gt 32 ]; then
+			logger -t "testnet" "No uplink connection; reboot"
 			ubus call led.internet  set '{"state" : "error"}'
 			reboot &
-		elif [ $((enableCounter % 2)) -eq 0 -a $enableCounter -ge 2 -o $enableCounter -eq 0 ]; then
+		elif [ $((enableCounter % 8)) -eq 0 -a $enableCounter -ge 8 -o $enableCounter -eq 0 ]; then
 			ps | grep -v grep | grep -q 'wifi reload\|wifi import\|wifi.credentials\|iwpriv' && return
 
+			logger -t "testnet" "No uplink connection; try to re-connect"
+
 			if [ -f /usr/sbin/wlctl ]; then
 				assoclist="$(wlctl -i $wetif assoclist | head -1 | awk '{print$2}')"
 				wlctl -i $wetif reassoc $assoclsit
@@ -93,13 +96,13 @@ ping_uplink()
 				iwpriv $wetif set ApCliAutoConnect=1
 			fi
 			ubus call led.internet  set '{"state" : "notice"}'
-			touch /tmp/netmodes/repeater_trying_to_connect
-		else
-			if [ -f /tmp/netmodes/repeater_trying_to_connect ]; then
-				rm -f /tmp/netmodes/repeater_trying_to_connect
-			else
-				ubus call led.internet  set '{"state" : "error"}'
-			fi
+#			touch /tmp/netmodes/repeater_trying_to_connect
+#		else
+#			if [ -f /tmp/netmodes/repeater_trying_to_connect ]; then
+#				rm -f /tmp/netmodes/repeater_trying_to_connect
+#			else
+#				ubus call led.internet  set '{"state" : "error"}'
+#			fi
 		fi
 
 		enableCounter=$((enableCounter+1))
@@ -110,16 +113,20 @@ ping_uplink()
 
 		AccessPolicy=1
 		if [ -f /usr/sbin/iwpriv ]; then
-			# Do not allow clients to connect on 2.4GHz radio
-			iwpriv ra0 set AccessPolicy=$AccessPolicy
-			# Do not allow clients to connect on 5GHz radio
-			iwpriv rai0 set AccessPolicy=$AccessPolicy
-			# Disconnect clients on 2.4GHz radio
-			iwpriv ra0 set DisConnectAllSta=2
-			# Disconnect clients on 5GHz radio
-			iwpriv rai0 set DisConnectAllSta=2
+			grep -q up /sys/class/net/$ETHWAN/operstate 2>/dev/null || {
+				logger -t "testnet" "Disconnect all stations and disable WiFi access on downlink wireless interfaces"
+				# Do not allow clients to connect on 2.4GHz radio
+				iwpriv ra0 set AccessPolicy=$AccessPolicy
+				# Do not allow clients to connect on 5GHz radio
+				iwpriv rai0 set AccessPolicy=$AccessPolicy
+				# Disconnect clients on 2.4GHz radio
+				iwpriv ra0 set DisConnectAllSta=2
+				# Disconnect clients on 5GHz radio
+				iwpriv rai0 set DisConnectAllSta=2
+			}
 		fi
-	else 
+	else
+		grep -q "true" /tmp/internet_connection_status 2>/dev/null || logger -t "testnet" "Uplink connection is gained"
 		echo "{ \"online\" : true }" > /tmp/internet_connection_status
 		ubus call led.internet  set '{"state" : "eok"}'
 
@@ -133,10 +140,10 @@ ping_uplink()
 		AccessPolicy=0
 
 		if [ -f /usr/sbin/iwpriv ]; then
+			logger -t "testnet" "Enable WiFi access on downlink wireless interfaces"
 			iwpriv ra0 set AccessPolicy=$AccessPolicy
 			iwpriv rai0 set AccessPolicy=$AccessPolicy
 		fi
-
 	fi
 }
 
@@ -160,11 +167,10 @@ test_connection() {
 }
 
 wan_have_ip() {
-	[ -d /sys/class/net/$port ] || return
+	[ -d /sys/class/net/$ETHWAN ] || return
 	ubus list led.wan >/dev/null 2>&1 || return
 
-	local port="$(db -q get hw.board.ethernetWanPort)"
-	local addr=$(ip a show dev $port | grep "inet "| awk '{print $2}')
+	local addr=$(ip a show dev $ETHWAN | grep "inet "| awk '{print $2}')
 
 	if [ -n "$addr" ]; then
 		WANIP=1

inteno-netmodes/files/usr/libexec/rpcd/repeater

@@ -129,12 +129,12 @@ case "$1" in
 				json_load "`cat $file`" || write_error "invalid file content"
 				json_select "wifi_ifaces" || write_error "invalid file content"
 
+				start-netmode-conf "$file" "$from_gui" >/dev/null 2>/dev/null
 
 				json_init
 				json_add_string "status" success
 				json_dump
 
-				netmode-conf "$file" "$from_gui" >/dev/null 2>&1 &
 			;;
 		esac
 	;;

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=44852fcce18b5ceefa6b09bd5eb775d783ee6362
+PKG_SOURCE_VERSION:=4bb88410200d26780dae58e624da23d32f48b942
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 
@@ -43,7 +43,7 @@ export QUESTD_CFLAGS
 
 define Package/questd
 	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +ubus +libpthread +(TARGET_iopsys_ramips):swconfig +(TARGET_iopsys_ramips):libnl-tiny +libopenssl
+	DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl
 	TITLE:=router info daemon
 endef
 

uboot/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=2016.08
 PKG_RELEASE:=4
 PKG_SOURCE_URL:=http://public.inteno.se:/uboot
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=37d00bb3d953518890191bd62c21b0046ee0f18d
+PKG_SOURCE_VERSION:=b0a0b127f0848e191b80979ad7de5f10c3e01a1b
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)