made a new initial commit ontop of devel for uci-diff

-------------------------------------------------------------------------------
* ca6338b created get_port_status insted of get_ports_speed and get_port_type
* 93cae17 Fix reading keys on mediatek
* cb64fb0 mediatek.c: fixed parsing for wifi_scan_results
* 265b2c2 mediatek.c: added frequency to scanresults
* 44b9a8a wireless: added the radio to parse_scanresults function
* 2d1fea1 broadcom.c: scanresults changed rssi and noice to be ints and added snr
* ca74c0d mediatek: fix channel reading
* 95dca63 rename scanresult functions to scanresults
* 9a42c34 fix not severe bug in trim function
-------------------------------------------------------------------------------
commit ca6338b417026ebe5931f946aa4f40ca7771c7c5
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-01-25 15:34:20 +0100

    created get_port_status insted of get_ports_speed and get_port_type

Base directory -> /
 broadcom.c |  14 ++++++
 network.c  |   4 +-
 port.c     | 166 ++++++++++++++++++++++++++++++++-----------------------------
 port.h     |   2 +-
 4 files changed, 105 insertions(+), 81 deletions(-)
-------------------------------------------------------------------------------
commit 93cae172d7f1350f46209984a0f890d1f5d5d57e
Author: Jonas Höglund <jonas.hoglund@embeddednation.com>
Date: 2017-01-25 15:29:38 +0100

    Fix reading keys on mediatek

Base directory -> /
 dumper.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit cb64fb08a83bcf09e5f10322cf0726592572310d
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-01-23 17:49:41 +0100

    mediatek.c: fixed parsing for wifi_scan_results

Base directory -> /
 mediatek.c | 72 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 21 deletions(-)
-------------------------------------------------------------------------------
commit 265b2c29c918b6079d26b964427d94dbeb5c86d6
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-01-23 15:44:13 +0100

    mediatek.c: added frequency to scanresults

Base directory -> /
 mediatek.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
-------------------------------------------------------------------------------
commit 44b9a8a0e6a21557f8f825b1942448351b595a8a
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-01-23 15:26:22 +0100

    wireless: added the radio to parse_scanresults function

    for broadcom: used for getting local noise for mediatec: used for getting
    frequency

Base directory -> /
 broadcom.c | 23 ++++++++++++++---------
 broadcom.h |  2 +-
 mediatek.c |  2 +-
 mediatek.h |  2 +-
 wireless.c |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)
-------------------------------------------------------------------------------
commit 2d1fea19413d4351fc90b495ab92a4d044c849b9
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-01-23 13:47:34 +0100

    broadcom.c: scanresults changed rssi and noice to be ints and added snr

Base directory -> /
 broadcom.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
-------------------------------------------------------------------------------
commit ca74c0d4d93c7751cac728d2d04641a9ac8e3542
Author: Alex Oprea <alex.oprea@inteno.se>
Date: 2017-01-20 18:35:41 +0100

    mediatek: fix channel reading

Base directory -> /
 mediatek.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 95dca6369255e39f25fa012c3f887819d46828c9
Author: Alex Oprea <alex.oprea@inteno.se>
Date: 2017-01-20 18:09:59 +0100

    rename scanresult functions to scanresults

Base directory -> /
 broadcom.c | 4 ++--
 broadcom.h | 4 ++--
 mediatek.c | 4 ++--
 mediatek.h | 4 ++--
 wireless.c | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)
-------------------------------------------------------------------------------
commit 9a42c347959d4a4af5114301a8c39e08ca178e84
Author: Alex Oprea <alex.oprea@inteno.se>
Date: 2017-01-20 15:21:17 +0100

    fix not severe bug in trim function

Base directory -> /
 tools.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------

asterisk-1.8.x-mod/Makefile

@@ -455,6 +455,8 @@ define Package/asterisk18-mod/install
 	$(INSTALL_DATA)  ./files/asterisk.default $(1)/etc/default/asterisk
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN)  ./files/asterisk.init $(1)/etc/init.d/asterisk
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_BIN)  ./files/asterisk.hotplug $(1)/etc/hotplug.d/iface/80-asterisk
 endef
 
 define Package/asterisk18-mod-sounds/install

asterisk-1.8.x-mod/files/asterisk.hotplug

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+[ "$ACTION" = ifup ] || exit 0
+
+config_load voice_client
+config_get bindintf SIP bindintf
+
+[ "$INTERFACE" == "$bindintf" ] || exit 0
+
+. /lib/functions/network.sh
+
+if [ -n "$bindintf" ]; then
+	network_get_ipaddr bindaddr "$bindintf"
+	bindaddr="${bindaddr:-0.0.0.0}"
+	sed -i "s/bindaddr=.*/bindaddr=$bindaddr/g" /etc/asterisk/sip.conf
+	[ -e /var/run/asterisk/asterisk.ctl ] && /etc/init.d/asterisk reload
+fi
+

asterisk-1.8.x-mod/files/asterisk.init

@@ -9,26 +9,9 @@ USE_PROCD=1
 NAME=asterisk
 PROG=/usr/sbin/asterisk
 DEFAULT=/etc/default/asterisk
+CONFDIR=/etc/asterisk
 
 init_asterisk() {
-	# do not start asterisk until the
-	# router receives a default route
-	config_load voice_client
-	local bindintf
-	config_get bindintf SIP bindintf ""
-	if [ "$bindintf" == ""  ]; then
-		while ! ip r | grep -q default; do
-			sleep 1
-		done
-	else
-		network_get_ipaddr ip "$bindintf"
-		while [ "$ip" == "" ]; do
-			sleep 1
-			network_flush_cache
-			network_get_ipaddr ip "$bindintf"
-		done
-	fi
-
 	[ -f $DEFAULT ] && . $DEFAULT
 	[ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
 	[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
@@ -56,6 +39,7 @@ start_service() {
 }
 
 reload_service() {
+	asterisk -rx "config reload $CONFDIR/sip.conf"
 	asterisk -rx "core reload"
 	asterisk -rx "dialplan reload"
 	asterisk -rx "brcm reload"

ice-client/files/ice-client.uci_default

@@ -22,8 +22,8 @@ config login
 	list write 'juci-broadcom-iptv'
 	list write 'juci-broadcom-vlan'
 	list write 'juci-broadcom-vlan-admin'
-	list write 'juci-broadcom-wl'
-	list write 'juci-broadcom-wl-admin'
+	list write 'juci-wireless'
+	list write 'juci-wireless-admin'
 	list write 'juci-catv'
 	list write 'juci-ddns'
 	list write 'juci-diagnostics'

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2017-01-17
+PKG_VERSION:=3.0-2017-01-20
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cfe4253f37e127c9ef405802beeec05d3507cc6a
+PKG_SOURCE_VERSION:=5c39d8d99127010c8d553495cd318ced80531a04
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

iop/configs/config

@@ -47,7 +47,7 @@ CONFIG_PACKAGE_juci-broadcom-ethernet=y
 CONFIG_PACKAGE_juci-broadcom-iptv=y
 CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
 CONFIG_PACKAGE_juci-broadcom-vlan=y
-CONFIG_PACKAGE_juci-broadcom-wl=y
+CONFIG_PACKAGE_juci-wireless=y
 CONFIG_PACKAGE_juci-broadcom-xdsl=y
 CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y

iop/scripts/update_package.sh

@@ -399,9 +399,13 @@ check_packages()
     echo "Now checking if any changes has been done to the packages."
     echo -e "${Green}_______________________________________________________________________________${Color_Off}"
 
+    # only scan in the build directory that is currently in use.
+    CPU=$(grep  "CONFIG_CPU_TYPE=" .config| cut -f2 -d\")
+    LIBC=$(grep "CONFIG_LIBC=" .config| cut -f2 -d\")
+    
     # First scan all files in build dir for packages that have .git directories.
-    all_pkgs=$(find build_dir/ -name ".git")
-
+    all_pkgs=$(find build_dir/*${CPU}*${LIBC}* -name ".git")
+    
     for pkg in `echo "$all_pkgs"`
     do
 	pkg=$(dirname $pkg)

layer2interface/broadcom/lib/network/brcmwifi.sh

@@ -156,11 +156,22 @@ wlmngr_startServices() {
 
 enableBSD() {
 	local wdev wdev_to_steer
+	local enabled policy
+	local rssi_threshold bw_util
 
 	nvram set bsd_role=0
 	nvram unset bsd_ifnames
 
-	[ "$(uci -q get wireless.status.bandsteering)" == "1" ] || return 1
+	enabled="$(uci -q get wireless.bandsteering.enabled)"
+
+	[ "$enabled" == "1" ] || return 1
+
+	policy="$(uci -q get wireless.bandsteering.policy)"
+	policy=${policy:-0}
+	rssi_threshold="$(uci -q get wireless.bandsteering.rssi_threshold)"
+	rssi_threshold=${rssi_threshold:--75}
+	bw_util="$(uci -q get wireless.bandsteering.bw_util)"
+	bw_util=${bw_util:--60}
 
 	nvram set bsd_role=3
 	nvram set bsd_pport=9878
@@ -179,20 +190,40 @@ enableBSD() {
 			nvram set bsd_ifnames="$(nvram get bsd_ifnames) $wdev"
 			[ "$wdev" == "wl0" ] && wdev_to_steer="wl1" || wdev_to_steer="wl0"
 
-			if [ "$(nvram get ${wdev}_nband)" == "2" ]; then
-				# 2.4G
-				nvram set ${wdev}_bsd_if_quality_policy="0 0x0 -100"
-				nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
-				nvram set ${wdev}_bsd_sta_select_policy="10 0 0 0 1 1 0 0 0 0x400"
-				nvram set ${wdev}_bsd_steer_prefix=$wdev
-				nvram set ${wdev}_bsd_steering_policy="0 5 3 0 0 0x1"
+			if [ "$policy" == "0" ]; then
+				# RSSI Threshold based policy #
+				if [ "$(nvram get ${wdev}_nband)" == "2" ]; then
+					# 2.4G
+					nvram set ${wdev}_bsd_if_quality_policy="0 0x0 -100"
+					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
+					nvram set ${wdev}_bsd_sta_select_policy="10 0 0 0 1 1 0 0 0 0x400"
+					nvram set ${wdev}_bsd_steer_prefix=$wdev
+					nvram set ${wdev}_bsd_steering_policy="0 5 3 0 0 0x1"
+				else
+					# 5G
+					nvram set ${wdev}_bsd_if_quality_policy="20 0x0 $rssi_threshold"
+					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
+					nvram set ${wdev}_bsd_sta_select_policy="100 0 0 0 0 1 0 0 0 0x40"
+					nvram set ${wdev}_bsd_steer_prefix=$wdev
+					nvram set ${wdev}_bsd_steering_policy="80 5 3 $rssi_threshold 0 0x40"
+				fi
 			else
-				# 5G
-				nvram set ${wdev}_bsd_if_quality_policy="20 0x0 -75"
-				nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
-				nvram set ${wdev}_bsd_sta_select_policy="100 0 0 0 0 1 0 0 0 0x40"
-				nvram set ${wdev}_bsd_steer_prefix=$wdev
-				nvram set ${wdev}_bsd_steering_policy="80 5 3 -75 0 0x40"
+				# Bandwidth Usage based policy #
+				if [ "$(nvram get ${wdev}_nband)" == "2" ]; then
+					# 2.4G
+					nvram set ${wdev}_bsd_if_quality_policy="0 0x0 -75"
+					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
+					nvram set ${wdev}_bsd_sta_select_policy="0 0 0 0 0 1 0 0 0 0x600"
+					nvram set ${wdev}_bsd_steer_prefix=$wdev
+					nvram set ${wdev}_bsd_steering_policy="0 5 3 0 0 0x10"
+				else
+					# 5G
+					nvram set ${wdev}_bsd_if_quality_policy="40 0x0 -75"
+					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
+					nvram set ${wdev}_bsd_sta_select_policy="0 0 0 0 0 1 0 0 0 0x240"
+					nvram set ${wdev}_bsd_steer_prefix=$wdev
+					nvram set ${wdev}_bsd_steering_policy="$bw_util 5 3 0 0 0x40"
+				fi
 			fi
 		#fi
 	done

questd/Makefile

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

questd/files/etc/init.d/quest

@@ -11,6 +11,8 @@ start_service() {
 	procd_set_param command "/sbin/questd"
 	procd_set_param respawn
 	procd_close_instance
+
+	pidof questd-monitor > /dev/null 2>&1 || /sbin/questd-monitor &
 }
 
 stop() {

questd/files/sbin/questd-monitor

@@ -0,0 +1,159 @@
+#!/bin/sh
+
+# 1. sleep for $SLEEP_LONG seconds
+# 2. run the check_* functions
+# 3. sleep for $SLEEP_SHORT seconds
+# 4. go to step 2. $SAMPLES-1 times (step 2. will run $SAMPLES times)
+# 5. go to step 1.
+SAMPLES=4
+SLEEP_SHORT=2
+SLEEP_LONG=10
+
+# worst-case scenario:
+# quest will be restarted in:
+# SLEEP_LONG + (SAMPLES-1)*SLEEP_SHORT + UBUS_TIMEOUT + epsilon =
+# = 21 seconds
+
+# number of process
+NPROC_LIMIT=2	# the value that is considered to be wrong (and above)
+NPROC_COUNT=4	# number of time that the NPROC_LIMIT has to be hit to trigger a process restart
+NPROC_NFAIL=0	# current consecutive Number of FAILures. process restarts when NPROC_NFAIL == NPROC_COUNT
+
+# memmory limit
+MEM_LIMIT=50000
+MEM_COUNT=4
+MEM_NFAIL=0
+
+# procentage of CPU usage
+PCPU_LIMIT=38
+PCPU_COUNT=4
+PCPU_NFAIL=0
+
+UBUS_TIMEOUT=5
+
+
+restart_questd()
+{
+	logger -s -t $0[$$] "Restarting questd. $NPROC_NFAIL $MEM_NFAIL $PCPU_NFAIL"
+
+	/etc/init.d/quest stop
+	killall -q -KILL questd
+	/etc/init.d/quest start
+
+	NPROC_NFAIL=0
+	MEM_NFAIL=0
+	PCPU_NFAIL=0
+}
+
+
+check_nproc()
+{
+	local nproc="$@"
+
+	if [ "$nproc" -ge "$NPROC_LIMIT" ]; then
+		NPROC_NFAIL=$((NPROC_NFAIL + 1))
+	else
+		NPROC_NFAIL=0
+	fi
+
+	[ "$NPROC_NFAIL" -ge "$NPROC_COUNT" ] && return 1
+
+	return 0
+}
+
+check_mem()
+{
+	local mem="$@"
+	local ok=true
+
+	for m in $mem; do
+		if [ "$m" -ge "$MEM_LIMIT" ]; then
+			ok=false
+			break
+		fi
+	done
+
+	[ "$ok" = "true"  ] && MEM_NFAIL=0
+	[ "$ok" = "false" ] && MEM_NFAIL=$((MEM_NFAIL + 1))
+
+	[ "$MEM_NFAIL" -ge "$MEM_COUNT" ] && return 1
+
+	return 0
+}
+
+check_pcpu()
+{
+	local pcpu="$@"
+	local ok=true
+
+	for p in $pcpu; do
+		p=${p%%%*}
+		if [ "$p" -ge "$PCPU_LIMIT" ]; then
+			ok=false
+			break
+		fi
+	done
+
+	[ "$ok" = "true"  ] && PCPU_NFAIL=0
+	[ "$ok" = "false" ] && PCPU_NFAIL=$((PCPU_NFAIL + 1))
+
+	[ "$PCPU_NFAIL" -ge "$PCPU_COUNT" ] && return 1
+
+	return 0
+}
+
+check_ubuscall()
+{
+	local rv
+
+	ubus -t $UBUS_TIMEOUT call router.system info >/dev/null 2>&1
+	rv=$?
+
+	[ "$rv" = "0" ] && return 0
+	return 1
+}
+
+
+main()
+{
+	local topline nproc mem pcpu
+	local restart_nproc restart_mem restart_pcpu
+	local sample=1
+
+	while true ; do
+
+		# collect info
+		topline=$(top -bn1 | grep "/sbin/[q]uestd" | grep -v monitor)
+
+		nproc=$(echo "$topline" | wc -l)
+		check_nproc $nproc
+		restart_nproc=$?
+
+		mem=$(echo -en "$topline" | awk '{print $5}')
+		check_mem $mem
+		restart_mem=$?
+
+		pcpu=$(echo -en "$topline" | awk '{print $7}')
+		check_pcpu $pcpu
+		restart_pcpu=$?
+
+		# do the restart
+		if [ 	"$restart_nproc" = "1" -o \
+			"$restart_mem"   = "1" -o \
+			"$restart_pcpu"  = "1" ]
+		then
+			check_ubuscall || restart_questd
+		fi
+
+		# sleep
+		if [ "$sample" -lt "$SAMPLES" ]; then
+			sample=$((sample + 1))
+			sleep $SLEEP_SHORT
+		else
+			sample=1
+			sleep $SLEEP_LONG
+		fi
+	done
+}
+
+main $@

uci-diff/Makefile

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2016 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=uci-diff
+PKG_VERSION:=1.0
+
+PKG_SOURCE_VERSION:=bb5f9cfbf0f698c948e20ef6c4d3f9554ca99ecf
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@private.inteno.se:/uci-diff
+
+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/uci-diff
+	CATEGORY:=Utilities
+	DEPENDS:=+libc +libuci +libubox +ubus +libjson-c +libblobmsg-json
+	TITLE:=uci-diff
+endef
+
+define Package/uci-diff/description
+	uci-diff
+endef
+
+define Package/uci-diff/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-diff $(1)/bin/
+endef
+
+$(eval $(call BuildPackage,uci-diff))

uci-diff/files/etc/uci-diff/default/wireless

@@ -0,0 +1,43 @@
+{"wireless": {
+    "wifi-device": {
+        "type": "broadcom",
+        "country": "EU/13",
+        "band": "a",
+        "bandwidth": "80",
+        "hwmode": "11ac",
+        "channel": "auto",
+        "scantimer": "0",
+        "wmm": "1",
+        "wmm_noack": "0",
+        "wmm_apsd": "1",
+        "txpower": "100",
+        "rateset": "default",
+        "frag": "2346",
+        "rts": "2347",
+        "dtim_period": "1",
+        "beacon_int": "100",
+        "rxchainps": "0",
+        "rxchainps_qt": "10",
+        "rxchainps_pps": "10",
+        "rifs": "0",
+        "rifs_advert": "0",
+        "maxassoc": "32",
+        "doth": "1",
+        "dfsc": "1",
+        "disabled": "1"
+    },
+    "wifi-iface": {
+        "device": "wl0",
+        "network": "lan",
+        "mode": "ap",
+        "ssid": "Inteno-4BC8",
+        "encryption": "mixed-psk",
+        "cipher": "auto",
+        "key": "1234567890",
+        "gtk_rekey": "3600",
+        "macfilter": "0",
+        "wps_pbc": "1",
+        "wmf_bss_enable": "1",
+        "bss_max": "16"
+    }
+}}

uci-diff/files/etc/uci-diff/inteno/wireless

@@ -0,0 +1,22 @@
+{"wireless": {
+    "wl0": {
+        ".name": "wl0",
+        ".type": "wifi-device",
+        "channel": 100
+    },
+    "wl1": {
+        ".name": "wl1",
+        ".type": "wifi-device",
+        "wmm": 0
+    },
+    "wi0-0": {
+        ".type": "wifi-iface",
+        "device": "wi0-0",
+        "ssid": "Fredrik"
+    },
+    "wi1-0": {
+        ".type": "wifi-iface",
+        "device": "wi1-0",
+        "ssid": "blah"
+    }
+}}