Voice client depends on asterisk13

-------------------------------------------------------------------------------
* 85785b9 network: ports: fix logic for skipping clients that are behind a repeater or extender
* 4424ad4 network: client: add number of assoclist
* 0899f2b wireless: iface: add apmode flag
-------------------------------------------------------------------------------
commit 85785b97a1526114ae521beacb1b302c3cb914ab
Author: Alex Oprea <alex.oprea@inteno.se>
Date: 2017-05-15 19:52:16 +0200

    network: ports: fix logic for skipping clients that are behind a repeater or
    extender

Base directory -> /
 network.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 4424ad493e47cc83e6de99a01e1178bb9324c54e
Author: Alex Oprea <alex.oprea@inteno.se>
Date: 2017-05-15 19:29:57 +0200

    network: client: add number of assoclist

Base directory -> /
 network.c | 25 +++++++++++++++----------
 network.h |  1 +
 2 files changed, 16 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit 0899f2beb9fd1d2c8cb0fddc3f926b84e7ad3ba0
Author: Alex Oprea <alex.oprea@inteno.se>
Date: 2017-05-15 17:33:04 +0200

    wireless: iface: add apmode flag

Base directory -> /
 wireless.c | 9 ++++++++-
 wireless.h | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------

asterisk-1.8.x-mod/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=asterisk18-mod
 PKG_VERSION:=1.8.10.1
 
-PKG_SOURCE_VERSION:=fd55c5dc4865142b7955ead96fe93b1ce888c37c
+PKG_SOURCE_VERSION:=ee99af0d91a2197529b13075d802ebc37e644e40
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x
 

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

@@ -11,6 +11,7 @@ config_get bindintf SIP bindintf
 
 if [ -n "$bindintf" ]; then
 	network_get_ipaddr bindaddr "$bindintf"
+	[ -z "$bindaddr" ] && network_get_ipaddr6 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

ated/Makefile

@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@private.inteno.se:ated
+PKG_SOURCE_URL:=http://public.inteno.se:/ated
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

dectmngr2/Makefile

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=1.1.0
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=17aa3b1d8d372ebcf4d37379f7cc4fb59c461d4b
+PKG_SOURCE_VERSION:=13da1568d57b8e6732dadc16de828d64c81906b8
 PKG_NAME:=dectmngr2
 
 

ice-client/Makefile

@@ -19,18 +19,18 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=4.3.0
-PKG_RELEASE:=RC7
+BASE_PKG_VERSION:=4.4.0
+PKG_RELEASE:=RC4
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=042e769eb37e0a2a7000b88e7f73e74f50ce52b7
+PKG_SOURCE_VERSION:=e855fdb65ec312e9ec044ce9319d6ac17fde57cd
 ifeq ($(CONFIG_ICE_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
+TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
-PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(TARGET_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 else

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2017-03-17
+PKG_VERSION:=3.0-2017-05-01
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ff91f29aef6aa366db9bfaad20783fef853509e4
+PKG_SOURCE_VERSION:=5a1b5c439524c56dca7a1921d4cf2fcd2d4c1ff0
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -122,11 +122,11 @@ endif
 
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults

inteno-netmodes/files/etc/hotplug.d/iface/01-close-ports-repeater

@@ -1,39 +0,0 @@
-[ "$INTERFACE" != "wan" ] && exit
-ip="$(ip a show $DEVICE | awk '/inet / {print $2; exit}')"
-ip="${ip%%/*}"
-
-[ -z "$ip" ] && exit
-
-handle_rule() {
-	local name enabled
-	enabled=$2
-	config_get name $1 name
-	if [ "$name" == "Repeater-Management" ]; then
-		uci set firewall.$1.enabled="$enabled"
-		uci commit firewall
-	fi
-}
-
-set_enabled() {
-	local enabled=$1
-	config_load firewall
-	config_foreach handle_rule rule $enabled
-}
-
-test_ip() {
-	if [ -n "$(echo $ip | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ]; then
-		set_enabled 1
-	else
-		set_enabled 0
-	fi
-}
-	
-
-case "$(uci -q get netmode.setup.curmode)" in
-                repeater|repeater_dualdown)
-			test_ip
-                ;;
-                *)
-			exit
-                ;;
-esac

inteno-netmodes/files/etc/hotplug.d/iface/01-netmode-firewall-handler

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+[ "$INTERFACE" != "wan" ] && exit
+
+. /lib/functions/network.sh
+
+network_get_ipaddr ip $INTERFACE
+
+[ -z "$ip" ] && exit
+
+toggle_firewall() {
+	local section=$1
+	local disable=$2
+	config_get name "$1" name
+	if [ "$name" == "wan" ]; then
+		uci -q set firewall.settings.disabled=$disable
+		if [ "$disable" == "1" ]; then
+			uci -q set firewall.$section.input="ACCEPT"
+		else
+			uci -q set firewall.$section.input="REJECT"
+		fi
+		uci -q commit firewall
+	fi
+}
+
+set_disabled() {
+	config_load firewall
+	config_foreach toggle_firewall zone $1
+}
+
+test_ip() {
+	if [ -n "$(echo $ip | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ]; then
+		# private IP
+		set_disabled 1
+	else
+		# public IP
+		set_disabled 0
+		[ "$1" -eq "1" ] && {
+			uci set netmode.setup.repeaterready=0
+			uci commit netmode
+			local pid="$(ps | grep wificontro[l] | awk '/repeater/ {print $1}')"
+			[ "$pid" != "" ] && kill $pid
+			pid="$(pidof netmode-client-detect)"
+			[ "$pid" == "" ] && /sbin/netmode-client-detect &
+		}
+	fi
+}
+
+case "$(uci -q get netmode.setup.curmode)" in
+                repeater*) test_ip ;;
+		*) [ "$(uci -q get netmode.setup.repeaterready)" == "1" ] && test_ip 1;;
+esac
+

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

@@ -5,14 +5,18 @@ include /lib/network
 
 ps | grep hotplug | grep button && exit
 
-WANDEV="eth0.2"
+MTK=0
+[ "$(db -q get hw.board.hardware)" == "EX400" ] && MTK=1
+
+WANDEV="$(uci get layer2_interface_ethernet.Wan.ifname)"
+[ $MTK -eq 1 ] && WANDEV="eth0.2"
 
 [ "$INTERFACE" != "$WANDEV" ] && exit
 
 defroute=$(ip route | grep default | awk '{print$3}')
 
 case "$(uci get netmode.setup.curmode)" in
-		repeater|repeater_dualdown)
+		repeater*)
 			echo "Preparing to switch mode"
 		;;
 		*)
@@ -21,8 +25,6 @@ case "$(uci get netmode.setup.curmode)" in
 		;;
 esac
 
-echo "0" > /sys/devices/virtual/net/br-wan/bridge/multicast_snooping
-
 get_wifi_wet_interface() {
 	handle_interface() {
 		config_get mode "$1" mode
@@ -32,7 +34,7 @@ get_wifi_wet_interface() {
 		fi
 	}
 	config_load wireless
-	config_foreach handle_interface wifi-iface "$device"
+	config_foreach handle_interface wifi-iface
 }
 
 get_wifi_iface_cfgstr() {
@@ -41,10 +43,11 @@ get_wifi_iface_cfgstr() {
 		[ "$ifname" == "$2" ] && echo "wireless.$1"
 	}
 	config_load wireless
-	config_foreach get_cfgno wifi-iface $1 $2
+	config_foreach get_cfgno wifi-iface $1
 }
 
-link=$(swconfig dev switch0 port 0 get link | awk '{print$2}' | cut -d':' -f2)
+link=$(cat /sys/class/net/${WANDEV:0:4}/operstate)
+[ $MTK -eq 1 ] && link=$(swconfig dev switch0 port 0 get link | awk '{print$2}' | cut -d':' -f2)
 
 case "$ACTION" in
 	add|register)
@@ -81,6 +84,9 @@ 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
-		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
+		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || {
+			wifi reload nodat
+			killall -USR1 udhcpc
+		}
 	;;
 esac

inteno-netmodes/files/etc/init.d/netmode

@@ -59,11 +59,21 @@ populate_netmodes() {
 	lan5=$(get_device LAN5)
 
 	for file in $(find $modedir -type f); do
-		grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
-		grep -q "\$LAN1" $file && sed -i "s/\$LAN1/$lan1/g" $file
-		grep -q "\$LAN2" $file && sed -i "s/\$LAN2/$lan2/g" $file
-		grep -q "\$LAN3" $file && sed -i "s/\$LAN3/$lan3/g" $file
-		grep -q "\$LAN4" $file && sed -i "s/\$LAN4/$lan4/g" $file
+		conf="$(echo $file | cut -d'/' -f5)"
+		if [ "$conf" == "layer2_interface_ethernet" ]; then
+			grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
+		fi
+		if [ "$conf" == "network" ]; then
+			grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
+			grep -q "\$LAN1" $file && sed -i "s/\$LAN1/$lan1/g" $file
+			grep -q "\$LAN2" $file && sed -i "s/\$LAN2/$lan2/g" $file
+			grep -q "\$LAN3" $file && sed -i "s/\$LAN3/$lan3/g" $file
+			grep -q "\$LAN4" $file && sed -i "s/\$LAN4/$lan4/g" $file
+
+			ifname="$(uci -q get $file.wan.ifname | sed 's/[ \t]*$//')"
+			uci -q set $file.wan.ifname="$ifname"
+			uci -q commit $file
+		fi
 	done
 
 	local hardware=$(db get hw.board.hardware)
@@ -80,7 +90,6 @@ populate_netmodes() {
 			desc=""
 			exp=""
 			uci -q set netmode.$mode=netmode
-			uci -q set netmode.$mode.conf=$mode
 			json_load "$(cat $modedir/$mode/DETAILS)"
 
 			if json_select excluded_boards; then
@@ -142,64 +151,87 @@ populate_netmodes() {
 			json_get_var reboot reboot
 			uci -q set netmode.$mode.reboot="$reboot"
 	done
+
+	config_get curmode setup curmode
+	[ -d /etc/netmodes/$curmode ] || {
+		[ "$(db -q get hw.board.hardware)" == "EX400" ] && uci -q set netmode.setup.curmode="routed_mtk" || uci -q set netmode.setup.curmode="routed_brcm"
+	}
+
 	uci commit netmode
 }
 
-convert_macros() {
-	local BMAC=$(db -q get hw.board.BaseMacAddr | tr -d ':')
-	local MACLAN=$(printf "%0.12x\n" $((0x$BMAC)))
-	local MACWAN=$(printf "%0.12x\n" $((0x$BMAC + 1)))
-	local BSSID=$(printf "%0.12x\n" $((0x$BMAC + 2)))
-	local BSSID4=$(echo -n $BSSID | tail -c 4 | tr 'a-z' 'A-Z')
-
-	MACLAN=$(echo $MACLAN | sed -e "s/.\{2\}/&:/g")
-	MACWAN=$(echo $MACWAN | sed -e "s/.\{2\}/&:/g")
-
-	MACLAN=${MACLAN:0:17}
-	MACWAN=${MACWAN:0:17}
-
-	grep -q "\$MACLAN" /etc/config/network && sed -i "s/\$MACLAN/$MACLAN/g" /etc/config/network
-	grep -q "\$MACWAN" /etc/config/network && sed -i "s/\$MACWAN/$MACWAN/g" /etc/config/network
-	grep -q "\$BSSID4" /etc/config/network && sed -i "s/\$BSSID4/$BSSID4/g" /etc/config/network
-}
-
 switch_netmode() {
 	[ -f /etc/config/netmode -a -d $modedir ] || return
+	local curmode conf repeaterready
 
 	config_load netmode
 
+	config_get repeaterready setup repeaterready "0"
+	if [ "$repeaterready" == "1" ] ; then
+		uci -q set netmode.setup.repeaterready="0"
+		uci commit netmode
+	fi
+
 	config_get curmode setup curmode
-	config_get conf $curmode conf
-	cp /etc/netmodes/$conf/* /etc/config/
+	if [ "$curmode" == "repeater" ]; then
+		local hw="$(db -q get hw.board.hardware)"
+		if [ "$hw" == "EX400" ]; then
+			curmode="repeater_mtk_5g_up_dual_down"
+		else
+			curmode="repeater_brcm_2g_up_dual_down"
+		fi
+		uci set netmode.setup.curmode="$curmode"
+		uci commit netmode
+	fi
+	if [ "$curmode" == "routed" ]; then
+		local hw="$(db -q get hw.board.hardware)"
+		if [ "$hw" == "EX400" ]; then
+			curmode="routed_mtk"
+		else
+			curmode="routed_brcm"
+		fi
+		uci set netmode.setup.curmode="$curmode"
+		uci commit netmode
+	fi
+	[ -d "/etc/netmodes/$curmode" ] || return
+	cp /etc/netmodes/$curmode/* /etc/config/
 	rm -f /etc/config/DETAILS
-	convert_macros
 	sync
-
-	case "$curmode" in
-		repeater|repeater_dualdown)
-			echo "0" > /sys/devices/virtual/net/br-wan/bridge/multicast_snooping
-		;;
-	esac
-
 	local reboot=$(uci -q get netmode.$curmode.reboot)
 	local askcred=$(uci -q get netmode.$curmode.askcred)
 	if [ "$reboot" == "0" ]; then
-		#/etc/init.d/enviroment reload
-		if [ "$askcred" == "1" -a -f /tmp/wifi_imported_credentials ]; then
-			wifi import "$(cat /tmp/wifi_imported_credentials)"
-			rm -f /tmp/wifi_imported_credentials
-			ubus call network reload
-			wifi reload nodat
-			sleep 5
-			ubus call router.network reload
-		fi
+		/etc/init.d/enviroment reload
 	else
 		reboot &
 	fi
 }
 
+start_client_listener() {
+	local curmode repeaterready
+	config_load netmode
+
+	config_get repeaterready setup repeaterready 0
+
+	[ $repeaterready -eq 1 ] && {
+		killall -SIGKILL netmode-client-detect >/dev/null 2>&1
+		return
+	}
+
+	config_get curmode setup curmode
+
+	case "$curmode" in
+		repeater*)
+			killall -SIGKILL netmode-client-detect >/dev/null 2>&1
+		;;
+		*)
+			pidof netmode-client-detect || /sbin/netmode-client-detect &
+		;;
+	esac
+}
+
 start_service() {
 	populate_netmodes
+	start_client_listener
 }
 
 reload_service() {
@@ -208,6 +240,12 @@ reload_service() {
 	# set default JUCI page to overview
 	uci -q set juci.juci.homepage="overview"
 	uci commit juci
+
+	start_client_listener
+}
+
+stop_service() {
+	killall -SIGKILL netmode-client-detect >/dev/null 2>&1
 }
 
 service_triggers()

inteno-netmodes/files/etc/netmodes/repeater/firewall

@@ -1,113 +0,0 @@
-config settings 'settings'
-        option disabled '0'
-
-config defaults
-	option syn_flood	1
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		REJECT
-# Uncomment this line to disable ipv6 rules
-#	option disable_ipv6	1
-
-config zone
-	option name		wan
-	list   network		'wan'
-	option input		REJECT
-	option output		ACCEPT
-	option forward		REJECT
-	option masq		1
-	option mtu_fix		1
-
-# We need to accept udp packets on port 68,
-# see https://dev.openwrt.org/ticket/4108
-config rule
-	option name		Allow-DHCP-Renew
-	option src		wan
-	option proto		udp
-	option dest_port	68
-	option target		ACCEPT
-	option family		ipv4
-	option hidden		1
-
-config rule
-	option name		Repeater-Management
-	option src		wan
-	option proto		tcp
-	option dest_port	'22 80 8080 8181 9876'
-	option target		ACCEPT
-	option family		ipv4
-	option hidden		1
-
-# Allow IPv4 ping
-config rule
-	option name		Allow-Ping
-	option src		wan
-	option proto		icmp
-	option icmp_type	echo-request
-	option family		ipv4
-	option target		ACCEPT
-	option hidden		1
-
-# Allow DHCPv6 replies
-# see https://dev.openwrt.org/ticket/10381
-config rule
-	option name		Allow-DHCPv6
-	option src		wan
-	option proto		udp
-	option src_ip		fe80::/10
-	option src_port		547
-	option dest_ip		fe80::/10
-	option dest_port	546
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# Allow essential incoming IPv6 ICMP traffic
-config rule
-	option name		Allow-ICMPv6-Input
-	option src		wan
-	option proto		icmp
-	list icmp_type		echo-request
-	list icmp_type		echo-reply
-	list icmp_type		destination-unreachable
-	list icmp_type		packet-too-big
-	list icmp_type		time-exceeded
-	list icmp_type		bad-header
-	list icmp_type		unknown-header-type
-	list icmp_type		router-solicitation
-	list icmp_type		neighbour-solicitation
-	list icmp_type		router-advertisement
-	list icmp_type		neighbour-advertisement
-	option limit		1000/sec
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# Allow essential forwarded IPv6 ICMP traffic
-config rule
-	option name		Allow-ICMPv6-Forward
-	option src		wan
-	option dest		*
-	option proto		icmp
-	list icmp_type		echo-request
-	list icmp_type		echo-reply
-	list icmp_type		destination-unreachable
-	list icmp_type		packet-too-big
-	list icmp_type		time-exceeded
-	list icmp_type		bad-header
-	list icmp_type		unknown-header-type
-	option limit		1000/sec
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# include a file with users custom iptables rules
-config include
-	option path /etc/firewall.user
-	option reload 1
-
-# include a file with rules for SIP and RTP traffic
-config include
-	option path /etc/firewall.sip
-	option reload 1
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/DETAILS

@@ -0,0 +1,22 @@
+{
+	"description": [
+		{ "en" : "Repeater 2.4▴▾5" },
+		{ "sv" : "Repeater 2.4▴▾5" }
+	],
+	"explanation": [
+		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point. Uplink 2.4G & Downlink 5G" },
+		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 5G" }
+	],
+	"excluded_boards" : [
+		"DG15*",
+		"DG40*",
+		"EG40*",
+		"EX40*"
+	],
+	"acl" : [
+		"admin"
+	],
+	"uplink_band" : "b",
+	"credentials" : 1,
+	"reboot" : 0
+}

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_ethernet

@@ -0,0 +1,6 @@
+config ethernet_interface 'Wan'
+        option baseifname '$WAN'
+        option ifname '$WAN.1'
+        option name 'WAN'
+	option bridge '1'
+

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network

@@ -0,0 +1,15 @@
+
+config interface 'loopback'
+	option is_lan '1'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'wan'
+	option type 'bridge'
+	option proto 'dhcp'
+	option hostname 'Inteno-$BSSID4'
+	option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
+	option reqopts '43'
+

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

@@ -0,0 +1,86 @@
+config wifi-status 'status'
+	option wlan '1'
+	option wps '1'
+	option sched_status '0'
+	option schedule '0'
+
+config wifi-device 'wl0'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'a'
+	option bandwidth '80'
+	option hwmode '11ac'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '0'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option beamforming '0'
+	option doth '1'
+	option dfsc '1'
+
+config wifi-iface
+	option device 'wl0'
+	option network 'wan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+	option autoconf '1'
+
+config wifi-device 'wl1'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'b'
+	option bandwidth '20'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '0'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	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/DETAILS

@@ -0,0 +1,22 @@
+{
+	"description": [
+		{ "en" : "Repeater 2.4▴▾2.4&5" },
+		{ "sv" : "Repeater 2.4▴▾2.4&5" }
+	],
+	"explanation": [
+		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point. Uplink 2.4G & Downlink 2.4G + 5G" },
+		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 2.4G + 5G" }
+	],
+	"excluded_boards" : [
+		"DG15*",
+		"DG40*",
+		"EG40*",
+		"EX40*"
+	],
+	"acl" : [
+		"admin"
+	],
+	"uplink_band" : "b",
+	"credentials" : 1,
+	"reboot" : 0
+}

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_ethernet

@@ -0,0 +1,6 @@
+config ethernet_interface 'Wan'
+        option baseifname '$WAN'
+        option ifname '$WAN.1'
+        option name 'WAN'
+	option bridge '1'
+

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network

@@ -0,0 +1,15 @@
+
+config interface 'loopback'
+	option is_lan '1'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'wan'
+	option type 'bridge'
+	option proto 'dhcp'
+	option hostname 'Inteno-$BSSID4'
+	option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
+	option reqopts '43'
+

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

@@ -0,0 +1,101 @@
+config wifi-status 'status'
+	option wlan '1'
+	option wps '1'
+	option sched_status '0'
+	option schedule '0'
+
+config wifi-device 'wl0'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'a'
+	option bandwidth '80'
+	option hwmode '11ac'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '0'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option beamforming '0'
+	option doth '1'
+	option dfsc '1'
+
+config wifi-iface
+	option device 'wl0'
+	option network 'wan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+	option autoconf '1'
+
+config wifi-device 'wl1'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'b'
+	option bandwidth '20'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '0'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	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'
+	option network 'wan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+	option autoconf '1'
+

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/DETAILS

@@ -8,11 +8,9 @@
 		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 2.4G + 5G" }
 	],
 	"excluded_boards" : [
-		"DG15*",
-		"DG40*",
-		"EG40*"
+		"*G*"
 	],
-	"uplink_band": 'b',
+	"uplink_band" : 'b',
 	"credentials" : 1,
 	"reboot" : 0
 }

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/owsd

@@ -0,0 +1,39 @@
+config owsd 'global'
+	option sock '/var/run/ubus.sock'
+	option www '/www'
+	option redirect '/cgi-bin/luci:/cacheflush.html'
+
+config owsd-listen 'loopback'
+	option port '80'
+	option interface 'loopback'
+	option ipv6 'on'
+	list origin '*'
+
+config owsd-listen 'lan'
+	option port '80'
+	option interface 'lan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	option whitelist_dhcp_domains '1'
+
+config owsd-listen 'wan'
+	option port '80'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8080'
+	option port '8080'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8181'
+	option port '8181'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/DETAILS

@@ -8,11 +8,9 @@
 		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 5G & Downlink 2.4G + 5G" }
 	],
 	"excluded_boards" : [
-		"DG15*",
-		"DG40*",
-		"EG40*"
+		"*G*"
 	],
-	"uplink_band": 'a',
+	"uplink_band" : 'a',
 	"credentials" : 1,
 	"reboot" : 0
 }

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/owsd

@@ -0,0 +1,39 @@
+config owsd 'global'
+	option sock '/var/run/ubus.sock'
+	option www '/www'
+	option redirect '/cgi-bin/luci:/cacheflush.html'
+
+config owsd-listen 'loopback'
+	option port '80'
+	option interface 'loopback'
+	option ipv6 'on'
+	list origin '*'
+
+config owsd-listen 'lan'
+	option port '80'
+	option interface 'lan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	option whitelist_dhcp_domains '1'
+
+config owsd-listen 'wan'
+	option port '80'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8080'
+	option port '8080'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8181'
+	option port '8181'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+

inteno-netmodes/files/etc/netmodes/routed_brcm/DETAILS

@@ -0,0 +1,15 @@
+{
+	"description": [
+		{ "en" : "Fully Routed (NAT)" },
+		{ "sv" : "Fullt Omdirigerad (NAT)" }
+	],
+	"explanation": [
+		{ "en" : "" },
+		{ "sv" : "" }
+	],
+	"excluded_boards" : [
+		"EX4*"
+	],
+	"credentials" : 0
+}
+

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_adsl

@@ -0,0 +1,13 @@
+
+config atm_bridge
+        option link_type 'EoA'
+        option encapseoa 'llcsnap_eth'
+        option unit '0'
+        option ifname 'atm0.1'
+        option baseifname 'atm0'
+        option atmtype 'ubr'
+        option name 'atm_inet'
+        option vpi '8'
+        option vci '35'
+
+

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_ethernet

@@ -0,0 +1,5 @@
+config ethernet_interface 'Wan'
+        option baseifname '$WAN'
+        option ifname '$WAN.1'
+        option name 'WAN'
+

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vdsl

@@ -0,0 +1,9 @@
+config vdsl_interface
+	option unit '0'
+	option ifname 'ptm0.1'
+	option baseifname 'ptm0'
+	option name 'VDSL2'
+	option dslat '1'
+	option ptmprio '1'
+	option ipqos '1'
+

inteno-netmodes/files/etc/netmodes/routed_brcm/network

@@ -0,0 +1,29 @@
+
+config interface 'loopback'
+	option is_lan '1'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'lan'
+	option is_lan '1'
+	option type 'bridge'
+	option proto 'static'
+	option ipaddr '192.168.1.1'
+	option netmask '255.255.255.0'
+	option ifname '$LAN1 $LAN2 $LAN3 $LAN4'
+	option ip6assign '60'
+	
+config interface 'wan'
+	option type 'anywan'
+	option proto 'dhcp'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
+	option ifname 'ptm0.1 atm0.1 $WAN.1'
+	option ipv6 '1'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname '@wan'
+

inteno-netmodes/files/etc/netmodes/routed_brcm/wireless

@@ -0,0 +1,86 @@
+config wifi-status 'status'
+	option wlan '1'
+	option wps '1'
+	option sched_status '0'
+	option schedule '0'
+
+config wifi-device 'wl0'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'a'
+	option bandwidth '80'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '1'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option beamforming '1'
+	option doth '1'
+	option dfsc '1'
+
+config wifi-iface
+	option device 'wl0'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+
+config wifi-device 'wl1'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'b'
+	option bandwidth '20'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '1'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option doth '0'
+
+config wifi-iface
+	option device 'wl1'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'mixed-psk'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+

inteno-netmodes/files/etc/netmodes/routed_mtk/DETAILS

@@ -7,6 +7,9 @@
 		{ "en" : "" },
 		{ "sv" : "" }
 	],
+	"excluded_boards" : [
+		"*G*"
+	],
 	"credentials" : 0
 }
 

inteno-netmodes/files/etc/netmodes/routed_mtk/dhcp

@@ -0,0 +1,22 @@
+config dnsmasq
+	option domainneeded	1
+	option boguspriv	1
+	option filterwin2k	0
+	option localise_queries	1
+	option rebind_protection 0
+	option rebind_localhost 1
+	option local	'/lan/'
+	option domain	'lan'
+	option expandhosts	1
+	option nonegcache	0
+	option authoritative	1
+	option readethers	1
+	option leasefile	'/tmp/dhcp.leases'
+	option resolvfile	'/tmp/resolv.conf.auto'
+
+config dhcp lan
+	option interface	lan
+	option start 	100
+	option limit	150
+	option leasetime	12h
+

inteno-netmodes/files/etc/netmodes/routed_mtk/firewall

@@ -9,15 +9,27 @@ config defaults
 # Uncomment this line to disable ipv6 rules
 #	option disable_ipv6	1
 
+config zone
+	option name		lan
+	list   network		'lan'
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		ACCEPT
+
 config zone
 	option name		wan
 	list   network		'wan'
+	list   network		'wan6'
 	option input		REJECT
 	option output		ACCEPT
 	option forward		REJECT
 	option masq		1
 	option mtu_fix		1
 
+config forwarding
+	option src		lan
+	option dest		wan
+
 # We need to accept udp packets on port 68,
 # see https://dev.openwrt.org/ticket/4108
 config rule
@@ -27,16 +39,6 @@ config rule
 	option dest_port	68
 	option target		ACCEPT
 	option family		ipv4
-	option hidden		1
-
-config rule
-	option name		Repeater-Management
-	option src		wan
-	option proto		tcp
-	option dest_port	'22 80 8080 8181 9876'
-	option target		ACCEPT
-	option family		ipv4
-	option hidden		1
 
 # Allow IPv4 ping
 config rule
@@ -46,7 +48,13 @@ config rule
 	option icmp_type	echo-request
 	option family		ipv4
 	option target		ACCEPT
-	option hidden		1
+
+config rule
+	option name		Allow-IGMP
+	option src		wan
+	option proto		igmp
+	option family		ipv4
+	option target		ACCEPT
 
 # Allow DHCPv6 replies
 # see https://dev.openwrt.org/ticket/10381
@@ -60,13 +68,24 @@ config rule
 	option dest_port	546
 	option family		ipv6
 	option target		ACCEPT
-	option hidden		1
+
+config rule
+	option name		Allow-MLD
+	option src		wan
+	option proto		icmp
+	option src_ip		fe80::/10
+	list icmp_type		'130/0'
+	list icmp_type		'131/0'
+	list icmp_type		'132/0'
+	list icmp_type		'143/0'
+	option family		ipv6
+	option target		ACCEPT
 
 # Allow essential incoming IPv6 ICMP traffic
 config rule
 	option name		Allow-ICMPv6-Input
 	option src		wan
-	option proto		icmp
+	option proto	icmp
 	list icmp_type		echo-request
 	list icmp_type		echo-reply
 	list icmp_type		destination-unreachable
@@ -81,7 +100,6 @@ config rule
 	option limit		1000/sec
 	option family		ipv6
 	option target		ACCEPT
-	option hidden		1
 
 # Allow essential forwarded IPv6 ICMP traffic
 config rule
@@ -99,15 +117,37 @@ config rule
 	option limit		1000/sec
 	option family		ipv6
 	option target		ACCEPT
-	option hidden		1
+
+# allow IPsec/ESP and ISAKMP passthrough
+config rule
+	option src		wan
+	option dest		lan
+	option proto		esp
+	option target		ACCEPT
+
+config rule
+	option src		wan
+	option dest		lan
+	option dest_port	500
+	option proto		udp
+	option target		ACCEPT
+
+config dmz dmz
+	option enabled '0'
+	option exclude_ports '5060 7547'
 
 # include a file with users custom iptables rules
 config include
 	option path /etc/firewall.user
 	option reload 1
 
-# include a file with rules for SIP and RTP traffic
+# include a file with rules for prioritizing some specific packets
 config include
-	option path /etc/firewall.sip
+	option path /etc/firewall.qos
+	option reload 1
+
+# include a file with rules for DMZ Host
+config include dmzhost
+	option path /etc/firewall.dmz
 	option reload 1
 

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

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# receive new client events
+# and trigger wificontrol in --router mode for that client
+
+. /usr/share/libubox/jshn.sh
+
+local action ipaddr macaddr network
+
+timed_check() {
+	while true; do
+		wificontrol --router
+		sleep $1
+	done
+}
+
+
+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 netwrork "lan"
+
+	if echo $macaddr | grep -i -e "^00:22:07" -e "^44:D4:37" -e "^02:0C:07" -e "^06:0C:07"; 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

inteno-netmodes/files/sbin/netmode-conf

@@ -0,0 +1,180 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+local state="exit"
+
+set_wireless_values() {
+	local iface_num="$1"
+	local ssid="$2"
+	local key="$3"
+	local encryption="$4"
+	local old_ssid old_key old_encryption
+	if ! uci -q get wireless.@wifi-iface[$iface_num] >/dev/null 2>&1; then
+		state="reload"
+		uci add wireless wifi-iface >/dev/null 2>&1
+	fi
+	local network="$(uci -q get wireless.@wifi-iface[$iface_num].network)"
+	old_ssid="$(uci -q get wireless.@wifi-iface[$iface_num].ssid)"
+	old_key="$(uci -q get wireless.@wifi-iface[$iface_num].key)"
+	old_encryption="$(uci -q get wireless.@wifi-iface[$iface_num].encryption)"
+	if [ "$old_ssid" != "$ssid" -o "$old_encryption" != "$encryption" -o "$old_key" != "$key" -o -z "$network" ]; then
+		#TODO: get network dynamicaly
+		[ "$state" == "exit" ] && state="apply"
+		[ -z "$network" ] && network="wan"
+		uci set wireless.@wifi-iface[$iface_num].network="$network"
+		uci set wireless.@wifi-iface[$iface_num].ssid="$ssid"
+		uci set wireless.@wifi-iface[$iface_num].key="$key"
+		uci set wireless.@wifi-iface[$iface_num].encryption="$encryption"
+	fi
+}
+
+get_wifi_device_from_band(){
+	local section="$1"
+	local band="$2"
+	local __ret="$3"
+	local b
+	config_get b $section "band"
+	if [ "$band" == "$b" ]; then
+		eval "export -- \"$__ret=$section\""
+	fi
+}
+
+get_device(){
+	local band="$1"
+	config_foreach get_wifi_device_from_band "wifi-device" "$band" "$2"
+}
+
+get_iface_num() {
+	local device="$1"
+	local prev="$2"
+	local __save="$3"
+	local i=0
+	local dev
+	while true; do
+		[ $i -gt 100 ] && break ## just a safty messure
+		mode="$(uci -q get wireless.@wifi-iface[$i].mode)"
+		if [ "$mode" != "ap" ]; then
+			i=$((i+1))
+			break
+		fi
+		dev="$(uci -q get wireless.@wifi-iface[$i].device)"
+		if [ "$dev" != "$device" ]; then
+			[ -z "$dev" ] && break
+			i=$((i+1))
+		elif [ $prev -ne 0 ]; then
+			i=$((i+1))
+			prev=$((prev-1))
+		else
+			break
+		fi
+	done
+	eval "export -- \"$__save=$i\""
+}
+
+###### START HERE #######
+
+local file="$1"
+[ -f "$file" ] || exit
+
+json_load "`cat $file`"
+json_select "wifi_ifaces"
+
+local curmode repmode
+config_load netmode
+config_get curmode setup curmode
+
+case $curmode in
+	*repeater*)
+	;;
+	*)
+		uci set netmode.setup.curmode="repeater"
+		uci commit netmode
+		/etc/init.d/netmode reload
+		curmode="$(uci -q get netmode.setup.curmode)"
+	;;
+esac
+
+local apcliband="a"
+case $curmode in
+	*_2g_*) apcliband="b";;
+esac
+
+i=1
+
+local dummy band ssid key encryption device iface_num
+
+while json_get_var dummy $i; do
+	json_select $i
+	json_get_var band band
+	[ "$apcliband" == "$band" ] && break
+	json_select ..
+	i=$((i+1))
+done
+
+[ "$apcliband" == "$band" ] || exit
+
+repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta'"  | sed 's/.*\[\([0-9]\)\].*/\1/')
+[ -z "$repeater_iface_num" ] && exit
+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"
+
+config_load wireless
+local b_num=0
+local a_num=0
+
+i=1
+while json_get_var dummy $i; do
+	json_select $i
+	json_get_var band band
+	get_device "$band" device
+	case $band in
+		a)
+			get_iface_num "$device" "$a_num" iface_num
+			a_num=$((a_num+1))
+			;;
+		b)
+			get_iface_num "$device" "$b_num" iface_num
+			b_num=$((b_num+1))
+			;;
+	esac
+	[ -z $iface_num ] && return
+	json_get_var ssid ssid
+	json_get_var encryption encryption
+	json_get_var key key
+	set_wireless_values "$iface_num" "$ssid" "$key" "$encryption"
+	json_select ..
+	i=$((i+1))
+done
+
+while uci -q get wireless.@wifi-iface[$i] >/dev/null; do
+	local mode="$(uci -q get wireless.@wifi-iface[$i].mode)"
+	if [ "$mode" == "wet" -o "$mode" == "sta" ]; then
+		i=$((i+1))
+		continue
+	fi
+	state="reload"
+	uci -q delete wireless.@wifi-iface[$i] >/dev/null
+	i=$((i+1))
+done
+
+uci commit wireless
+
+if [ "$state" == "exit" ]; then
+	return
+elif [ "$state" == "apply" ]; then
+	# wifi apply
+	wifi reload
+else
+	# wifi reload
+	wifi reload
+fi
+
+[ -f /etc/init.d/layer2_interface_ethernet -a -f /etc/config/layer2_interface_ethernet ] && /etc/init.d/layer2_interface_ethernet reload

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

@@ -0,0 +1,141 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+get_if_creds() {
+	local section=$1
+	local network=$2
+	local net dev ssid key encryption band
+	config_get net $section "network"
+	if [ "$net" == "$network" ]; then
+		config_get dev $section "device"
+		band="$(uci -q get wireless.$dev.band)"
+		config_get ssid $section ssid
+		config_get key $section key
+		config_get encryption $section encryption
+		config_get disabled $section disabled 0
+		echo "disabled for $band = $disabled" >>/tmp/dbg
+		[ $disabled -eq 1 ] && return
+		[ "$ssid" == "" -o "$band" == "" ] && return
+		json_add_object
+		json_add_string "ssid" "$ssid"
+		json_add_string "band" "$band"
+		json_add_string "key" "$key"
+		json_add_string "encryption" "$encryption"
+		json_close_object
+	fi
+}
+
+validate_file() {
+	local file="$1"
+	local real="$(readlink -f `dirname $file`)"
+	real="${real}/`basename $file`"
+	case "$real" in
+		/tmp/*)
+			touch $real && return 0 || return 1
+		;;
+		*)
+			return 1
+		;;
+	esac
+}
+
+write_error(){
+	json_init
+	json_add_string "status" "error: $1"
+	json_dump
+	exit 1
+}
+
+duplicate_if_single_radio() {
+	json_select "wifi-ifaces"
+	local i=1
+	local dummy band dup_band num_radios
+
+	num_radios="$(uci -q show wireless | grep wifi-device | wc -l)"
+
+	[ "$num_radios" == "2" ] && return
+
+	band="$(uci -q get wireless.@wifi-device[0].band)"
+
+	[ "$band" == "a" ] && dup_band="b"
+	[ "$band" == "b" ] && dup_band="a"
+	[ -z "$dup_band" ] && return
+
+
+	while json_get_var dummy $i; do
+		i=$((i+1))
+	done
+	i=$((i-1))
+	local ssid key encryption
+	while [ $i -gt 0 ]; do
+		json_select $i
+		json_get_var ssid ssid
+		json_get_var key key
+		json_get_var encryption encryption
+		json_select ..
+		json_add_object
+		json_add_string "ssid" "$ssid"
+		json_add_string "band" "$dup_band"
+		json_add_string "key" "$key"
+		json_add_string "encryption" "$encryption"
+		json_close_object
+		i=$((i-1))
+	done
+}
+
+case "$1" in
+	list)
+		echo '{ "get_creds": { "network": "str", "file": "str" }, "set_creds": { "file": "str" } }'
+	;;
+	call)
+		case "$2" in
+			get_creds)
+				#TODO: if not routed exit
+				local curmode="$(uci -q get netmode.setup.curmode)"
+				case $curmode in
+					*repeater*) write_error "not in repeater mode";;
+				esac
+				local network file input
+				read input
+				json_load $input
+				json_get_var network network
+				json_get_var file file
+
+				json_init
+				json_add_array "wifi-ifaces"
+				config_load wireless
+				config_foreach get_if_creds "wifi-iface" "$network"
+				json_close_array
+
+				duplicate_if_single_radio
+
+				if [ "$file" == "" ]; then
+					json_dump
+				else
+					validate_file $file && json_dump -i >$file || write_error "invalid filename (\"$file\"), file must be in /tmp/ and in an existing directory"
+				fi
+				json_init
+				json_add_string "status" success
+				json_dump
+			;;
+			set_creds)
+				local file
+				read input
+				json_load "$input"
+				json_get_var file file
+				validate_file "$file" || write_error "invalid filename (\"$file\"), file must be in /tmp and exist"
+				json_load "`cat $file`" || write_error "invalid file content"
+				json_select "wifi_ifaces" || write_error "invalid file content"
+
+
+				json_init
+				json_add_string "status" success
+				json_dump
+
+				netmode-conf $file >/dev/null 2>&1 &
+			;;
+		esac
+	;;
+esac

iop/configs/config

@@ -22,7 +22,7 @@ CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_ice-client=y
 CONFIG_PACKAGE_ice-client-camerawatch=m
-# CONFIG_PACKAGE_ice-client-fileme is not set
+CONFIG_PACKAGE_ice-client-fileme=m
 CONFIG_PACKAGE_ice-client-gigaset=m
 CONFIG_PACKAGE_ice-client-guest=m
 CONFIG_PACKAGE_ice-client-iperf=m
@@ -31,6 +31,7 @@ CONFIG_PACKAGE_ice-client-monitor=m
 CONFIG_PACKAGE_ice-client-netrounds=m
 CONFIG_PACKAGE_ice-client-rshell=m
 CONFIG_PACKAGE_ice-client-texec=m
+CONFIG_PACKAGE_icwmp-curl=y
 CONFIG_PACKAGE_inteno-netmodes=y
 CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
@@ -55,9 +56,10 @@ CONFIG_PACKAGE_juci-dropbear=y
 CONFIG_PACKAGE_juci-ethernet=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
+CONFIG_PACKAGE_juci-icwmp=y
 CONFIG_PACKAGE_juci-igmpinfo=y
 CONFIG_PACKAGE_juci-inteno-backup=y
-CONFIG_PACKAGE_juci-inteno-multiwan=y
+CONFIG_PACKAGE_juci-mwan3=y
 CONFIG_PACKAGE_juci-inteno-provisioning=y
 CONFIG_PACKAGE_juci-inteno-qos=y
 CONFIG_PACKAGE_juci-inteno-voice-client=y
@@ -71,6 +73,7 @@ CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-owsd=y
 CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
+CONFIG_PACKAGE_juci-samba=y
 CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
@@ -83,6 +86,8 @@ CONFIG_PACKAGE_juci-utils=y
 CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-siit=y
 CONFIG_PACKAGE_layer2interface=y
+CONFIG_PACKAGE_libcgroup-daemon=y
+CONFIG_PACKAGE_libcgroup=y
 # CONFIG_PACKAGE_libcgroup-utils is not set
 CONFIG_PACKAGE_ldd=y
 CONFIG_PACKAGE_libdaemon=y
@@ -96,7 +101,7 @@ CONFIG_PACKAGE_mtd-utils-deubinize=y
 CONFIG_PACKAGE_mtd-utils-imagewrite=y
 CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y
 CONFIG_PACKAGE_mtd-utils-nanddump=y
-CONFIG_PACKAGE_multiwan=y
+CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_odhcp6c=y
@@ -119,6 +124,8 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_samba3=y
+CONFIG_PACKAGE_samba3-nmbd=y
 CONFIG_PACKAGE_snmpd=y
 CONFIG_PACKAGE_strace=y
 CONFIG_PACKAGE_tc=y
@@ -189,3 +196,5 @@ CONFIG_LIBCURL_CRYPTO_AUTH=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
 # CONFIG_SIGNED_PACKAGES is not set
+CONFIG_KERNEL_DEVTMPFS=y
+CONFIG_KERNEL_DEVTMPFS_MOUNT=y

iop/scripts/extract_core.sh

@@ -1,88 +1,135 @@
 #!/bin/bash
 
-# Intermediate repo for core packages
-core_repo=git@public.inteno.se:iopsys-cc-core.git
-
-# Repo to which core packages should be imported
-import_repo=git@public.inteno.se:feed-inteno-openwrt.git
-import_branch=openwrt-cc-core
-
-
-function export_core {
-
-    local path=$1
-
-    # export paths to their own branches in an intermediate repo
-    repo=$(basename $path)
-    git subtree push -q --prefix=$path $core_repo $repo
-}
-
-
-function update_core {
-    
-    local path=$1
-    
-    if [ ! -d $topdir/feeds/feed_inteno_openwrt ]; then
-	echo "You need to run ./iop feeds_update"
-	exit -1
-    fi
-
-    # ensure that we are synced with the remote
-    cd $topdir/feeds/feed_inteno_openwrt
-    git checkout $import_branch
-    git pull
-
-    # first install subtrees if they don't already exist
-    repo=$(basename $path)
-    git subtree add --prefix=$repo $core_repo $repo
-    
-    # install subtrees in feed from intermediate repo
-    repo=$(basename $path)
-    echo "Exporting $repo"
-    git subtree pull -q -m "Exporting $repo" --prefix=$repo $core_repo $repo
-
-    # update import repo sync branch
-    git push origin $import_branch
-}
-
-function display_help {
-    
-    echo "Usage: ./iop export_core -e path/to/package"
-}
-
 function extract_core {
+	initial_commit=1427738ac4b77f474999ae21af1a8b916468df36
+	patch_dir=extract_core_patches
+	topdir=$(pwd)
 
-# Dir of script location
-topdir=$(pwd)
+	# Paths to packages that should be exported.
+	paths+='package/network/services/samba36 '
+	paths+='package/network/services/dnsmasq '
+	paths+='package/network/services/dropbear '
+	paths+='package/network/services/odhcpd '
+	paths+='package/network/config/firewall '
+	paths+='package/network/config/netifd '
+	paths+='package/network/config/qos-scripts '
+	paths+='package/network/utils/iproute2 '
+	paths+='package/network/utils/curl '
+	paths+='package/utils/busybox '
 
+	function print_usage {
+		echo "Usage: $0 extract_core"
+		echo "  -p <path-to-package> | default"
+		echo "  -r <import-repo>"
+		echo "  -b <import-branch>"
+		echo ""
+		echo "Example: $0 extract_core"
+		echo "  -p package/utils/busybox"
+		echo "  -r feeds/feed_inteno_openwrt"
+		echo "  -b devel"
+	}
 
-if [ $# -eq 0 ]; then
-    display_help
-    exit -1
-fi
+	function orphan_branch {
+		local branch=$1
 
-# Execute user command
-while getopts "he:" opt; do
-    case $opt in
-	e)
-	    path=${OPTARG}
-	    echo "Extracting ${path} from core to ${import_repo}:${import_branch}"
-	    export_core $path
-	    update_core $path
-	    ;;
-	h)
-	    display_help
-	    exit 0
-	    ;;
-	\?)
-	    display_help
-	    exit -1
-	    ;;
-	esac
-done
+		git checkout --orphan $branch
+		git rm -rf --cached *
+		git rm -rf --cached .empty
+		rm -rf *
+		rm -rf .empty
+	}
 
+	function export_core {
+		local path=$1
+
+		echo "Extracting ${path} from core to ${import_repo}:${import_branch}"
+
+		# Generate patches from start of openwrt repo.
+		mkdir -p $patch_dir
+		repo=$(basename $path)
+		dir=$(dirname $path)
+		git format-patch $initial_commit $path -o $patch_dir
+
+		# Remove dirname from patches to commit the packages to the
+		# top directory in the destination repo.
+		ls $patch_dir | while read line; do
+			sdir=$(echo "$dir/" | sed 's/\//\\\//g')
+			sed -i "s/$sdir//g" $patch_dir/$line
+		done
+		
+		cd $import_repo
+		
+		if [ -n "$(git rev-parse -q --verify remotes/origin/$repo)" ]; then
+			# Create temporary branch to apply patches on.
+			# We need to do this as git am does not like it
+			# when patches have already been applied.
+			orphan_branch tmp
+			git am $topdir/$patch_dir/*
+			
+			# Rebase and merge.
+			git rebase origin/$repo
+			git checkout --track -b $repo origin/$repo
+			git merge tmp
+			git br -d tmp
+		else
+			# Remote branch does not exist for packet so create it.
+			orphan_branch $repo
+			git am $topdir/$patch_dir/*
+		fi
+
+		git push origin $repo
+		
+		# Merge the package branch into the main branch.
+		git checkout $import_branch
+		git merge $repo -m "Syncing $repo"
+		git push origin $import_branch
+		git br -d $repo
+		
+		rm -rf $topdir/$patch_dir
+		cd $topdir
+	}
+
+	# Execute user command
+	while getopts "p:r:b:h" opt; do
+		case $opt in
+			p)
+				export_path=${OPTARG}
+				;;
+			r)
+				import_repo=${OPTARG}
+				;;
+			b)
+				import_branch=${OPTARG}
+				;;
+			h)
+				print_usage
+				exit 1
+				;;
+			\?)
+				print_usage
+				exit 1
+				;;
+		esac
+	done
+
+	if [ ! -n "$export_path" ] || [ ! -n "$import_repo" ] || [ ! -n "$import_branch" ]; then
+   		print_usage
+		exit 1
+	fi
+
+	if [ "$export_path" == "default" ]; then
+		echo "Extracting default packages:"
+		for p in $paths; do
+			export_core $p
+
+		done
+	else
+		export_core $export_path
+	fi
+
+	exit 0
 }
 
-register_command "extract_core" "Extract core package to feeds_inteno_openwrt"
+register_command "extract_core" "Extract core package to separate feed"
 
 

iop/scripts/feeds_update.sh

@@ -24,6 +24,12 @@ function feeds_update {
     else
 	./scripts/feeds update
     fi
+	./scripts/feeds update -ai
+
+    # replace core packages with iopsys versions
+    if [ $override == 1 ]; then
+	./scripts/feeds install -f -p feed_inteno_openwrt -a
+    fi
 
     # targets need to be installed explicitly
     ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips

iop/scripts/genconfig.sh

@@ -64,6 +64,7 @@ function genconfig {
 		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
+		mediatekAllowed=0
 
 		allowedRepos="$(ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null | grep -w 'R\|W' | awk '{print$NF}')"
 		for repo in $allowedRepos; do
@@ -72,6 +73,7 @@ function genconfig {
 			ice-client) iceAllowed=1 ;;
 			endptcfg) endptAllowed=1 ;;
 			natalie-dect*) natalieAllowed=1 ;;
+			linux) mediatekAllowed=1 ;;
 			esac
 		done
 	}
@@ -142,16 +144,6 @@ function genconfig {
 	}
 
 
-	use_local_mirror()
-	{
-		if wget -T 3 -t 2 -O /dev/null $LOCAL_MIRROR >/dev/null 2>/dev/null; then
-			echo "mirror [$LOCAL_MIRROR] exists. Using local mirror"
-			sed -i "s;CONFIG_LOCALMIRROR=.*;CONFIG_LOCALMIRROR=\"$LOCAL_MIRROR\";" .config
-		else
-			echo "mirror [$LOCAL_MIRROR] does not exist. Not using local mirror"
-		fi
-	}
-
 	generate_config()
 	{
 	DIFFFILE="$1"
@@ -214,6 +206,13 @@ function genconfig {
 			cp $CONFIGPATH/config .config
 		fi
 
+		# Add target diff
+		local target_name=$(echo $target | sed 's/_/-/g')
+		local target_conf=target/linux/${target_name}/config
+		if [ -f $target_conf ]; then
+			cat $target_conf >> .config
+		fi
+
 		# Apply profile diff to master config if selected
 		if [ -n "$PROFILE" ]; then
 			if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then
@@ -275,11 +274,15 @@ function genconfig {
 			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
+			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
 		else
+			echo "CONFIG_DEVEL=n" >>.config
+			echo "CONFIG_GITMIRROR_REWRITE=n" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
 			echo "CONFIG_ICE_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
+			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
 		fi
 
 		# Force regeneration of themes
@@ -342,10 +345,6 @@ function genconfig {
 		done
 		setup_dirs
 		create_and_copy_files "$1" "$2"
-
-		if [ $masterconfig -eq 1 ]; then
-			use_local_mirror
-		fi
 	fi
 }
 

iop/scripts/generate_tarballs.sh

@@ -2,7 +2,8 @@
 
 
 build_bcmkernel_consumer() {
-	local tarfile bcmkernelcommith
+	local tarfile bcmkernelcommith sdkversion
+    sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
 	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/$sdkversion.mk | cut -d'=' -f2)
 	# do not build bcmopen sdk if it was already built before
 	ssh $SERVER "ls $FPATH/bcmopen-$profile-$bcmkernelcommith.tar.gz" && return
@@ -58,15 +59,48 @@ build_ice_consumer() {
 	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
 	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
 	iceversion=$icebasever$icerelease
-	ssh $SERVER "ls $FPATH/ice-client-$profile-$iceversion-$icecommith.tar.gz" && return
-	cd ./build_dir/target-*_uClibc-0.9.33.*/ice-client-$icebasever/ipkg-*
-	tar -czv  ice-client -f ice-client-$profile-$iceversion-$icecommith.tar.gz
-	scp ice-client-$profile-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
-	cp ice-client-$profile-$iceversion-$icecommith.tar.gz $curdir/
-	rm -f ice-client-$profile-$iceversion-$icecommith.tar.gz
+	ssh $SERVER "ls $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
+	cd ./build_dir/target-*_uClibc-0.9.33.*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
+	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
+	scp ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
+	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
+	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
 	cd $curdir
 }
 
+build_mediatek_kernel() {
+	local mediatek_commit kernel_version kernel
+
+	mediatek_commit=$(grep CONFIG_KERNEL_GIT_COMMIT .config | cut -d '=' -f2 | tr -d '"')
+	kernel_version=$(grep KERNEL_PATCHVER target/linux/iopsys-ramips/Makefile  | cut -d '=' -f2)
+	kernel=linux-${kernel_version}.*
+	ssh $SERVER "ls $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
+	echo "Building mediatek kernel tarball from kernel commit:"	
+	echo $mediatek_commit
+	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips_*/$kernel
+
+	# Save Kconfig files to recreate the same kernel config,
+	# delete everyting else.
+	find drivers/net/wireless/mt_wifi -type f ! -name Kconfig | xargs rm
+	find drivers/net/wireless/rlt_wifi -type f ! -name Kconfig | xargs rm
+
+	# remove git repo
+	rm -rf .git
+
+	# patch kernel for openstk
+	ls consumer_release | while read line; do patch -p1 < consumer_release/$line; done
+	cd ..
+
+	tar -czv $kernel -f mediatek-kernel-open-$mediatek_commit.tar.gz
+	scp mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
+	cd $curdir
+}
+
+function print_usage {
+	echo "Usage: $0 generate_tarballs"
+	echo "  -t <target>"
+}
+
 function generate_tarballs {
 
     SERVER="god@software.inteno.se"
@@ -74,14 +108,46 @@ function generate_tarballs {
 
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
+    target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
-    sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
     curdir=$(pwd)
 
-    build_bcmkernel_consumer
-    build_natalie_consumer
-    build_endptcfg_consumer
-    build_ice_consumer
+
+	# Execute user command
+	while getopts "t:h" opt; do
+		case $opt in
+			t)
+				stk_target=${OPTARG}
+				;;
+			h)
+				print_usage
+				exit 1
+				;;
+			\?)
+				print_usage
+				exit 1
+				;;
+		esac
+	done
+
+	if [ ! -n "$stk_target" ]; then
+		print_usage
+		exit 1
+	fi
+
+	if [ "$stk_target" == "broadcom" ]; then
+		build_bcmkernel_consumer
+		build_natalie_consumer
+		build_endptcfg_consumer
+		build_ice_consumer
+	elif [ "$stk_target" == "mediatek" ]; then
+		build_mediatek_kernel
+		build_ice_consumer		
+	else
+		echo "Invalid target: $stk_target"
+		print_usage
+		exit 1
+	fi
 
 }
 

iop/scripts/update_package.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-
-
 print_git_update()
 {
     echo "pkg -> ${PKG_NAME}"
@@ -586,7 +584,8 @@ usage(){
 # Exported interface
 function update_package {
 
-    UPDATE=0
+	UPDATE=0
+
     Color_Off='\033[0m'       # Text Reset
 
     # Regular Colors

iup/files/sbin/iup

@@ -229,7 +229,7 @@ handle_provisioning() {
 		  fi
 		done
 	fi
-	if [ ! -s "$IUPCONFFILES" ]; then
+	if [ ! -s "$IUPCONFFILES" ] && [ "$enabled" -eq 1 ]; then
 		echo "File not Found"
 		reboot="off"
 		CONF=0

libtrace/Makefile

@@ -7,7 +7,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/apietila/libtrace.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_VERSION:=HEAD
+PKG_SOURCE_VERSION:=e4b4c5cce35a52da152776a00532aa0b80879c5b
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

mtk-bndstrg/Makefile

@@ -0,0 +1,41 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=mtk-bndstrg
+PKG_VERSION:=1.0
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=8a804320c53dead1c9b9f3650cbbc58908c76832
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://public.inteno.se:/mtk-bndstrg
+
+PKG_SOURCE:=$(PKG_NAME).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mtk-bndstrg
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libpthread +librt
+  TITLE:=Band steering daemon for Mediatek
+endef
+
+define Package/mtk-bndstrg/description
+ Band steering for Mediatek
+endef
+
+#define Build/Compile
+#endef
+
+define Build/Configure
+  #$(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR))
+endef
+
+define Package/mtk-bndstrg/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bndstrg $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,mtk-bndstrg))

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=2217e777ce56b53878ca467a06025db935c235eb
+PKG_SOURCE_VERSION:=ff2cf8bfbd3a04731088e9f4540796696e961382
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager
 

questd/Makefile

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

questd/files/sbin/imonitor

@@ -35,7 +35,7 @@ UBUS_TIMEOUT=5
 
 
 BSDBIN=$(which bsd)
-
+ACSDBIN=$(which acsd)
 
 restart_questd()
 {
@@ -139,6 +139,31 @@ check_bsdcall()
 }
 
 
+restart_acsd()
+{
+	logger -s -t $0[$$] "Restarting acsd."
+	killall -q -KILL acsd
+	acsd &
+}
+
+check_acsd()
+{
+	local topline pcpu p
+
+	topline=$(top -bn1 | grep "[a]csd")
+	pcpu=$(echo -en "$topline" | awk '{print $7}')
+
+	for p in $pcpu; do
+		p=${p%%%*}
+		if [ "$p" -ge "20" ]; then
+			return 1
+		fi
+	done
+
+	return 0
+}
+
+
 main()
 {
 	local topline nproc mem pcpu
@@ -168,7 +193,8 @@ main()
 			"$restart_mem"   = "1" -o \
 			"$restart_pcpu"  = "1" ]
 		then
-			check_ubuscall || restart_questd
+			# check_ubuscall || restart_questd
+			restart_questd
 		fi
 
 		if [ "$BSDBIN" ] ; then
@@ -179,6 +205,10 @@ main()
 			fi
 		fi
 
+		if [ "$ACSDBIN" ] ; then
+			check_acsd || restart_acsd
+		fi
+
 		# sleep
 		if [ "$sample" -lt "$SAMPLES" ]; then
 			sample=$((sample + 1))

uboot/Makefile

@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=u-boot
 PKG_VERSION:=2016.08
-PKG_RELEASE:=1
-PKG_SOURCE_URL:=git@private.inteno.se:uboot
+PKG_RELEASE:=2
+PKG_SOURCE_URL:=http://public.inteno.se:/uboot
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=08fb2b839326c3bc2a2a0472b5dae6ee0288e483
+PKG_SOURCE_VERSION:=fccb9d5ee720a9f60cba917ded83e5cebe221eef
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -61,6 +61,11 @@ endif
 define Build/Configure
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(UBOOT_CONFIG)_config
+
+	$(SED) "s,CONFIG_INTENO_MAJOR=\"0\",CONFIG_INTENO_MAJOR=\"$(PKG_RELEASE)\"," $(PKG_BUILD_DIR)/.config
+
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		oldconfig
 endef
 
 define Build/Compile
@@ -71,6 +76,7 @@ define Build/Compile
 endef
 
 define Package/uboot/install/default
+	$(CP) ./files/* $$(1)/
 	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
 	$(INSTALL_DIR) $$(1)/boot
 	$(CP) \

uboot/files/etc/init.d/uboot

@@ -0,0 +1,78 @@
+#!/bin/sh /etc/rc.common
+
+START=50
+
+. /usr/share/libubox/jshn.sh
+
+
+sanity_check_env(){
+
+    # make sure iboot is used to start board, but only if verify_boot != 1
+    # that allows a person to change the bootcmd and not have it overwritten automatically
+    # but still force it to iboot for old boards.
+    vb=$(fw_printenv -n verify_boot 2>/dev/null)
+
+    if [ "1" != "$verify_boot" ]
+    then
+	if ! fw_printenv -n bootcmd 2>/dev/null| grep iboot >/dev/null
+	then
+	    echo "update uboot boot command"
+	    fw_setenv bootcmd "rescue;iboot"
+	    fw_setenv verify_boot 1
+	fi
+    fi
+
+    # just set 115200 baudrate as it is really hardcoded in the binary blob
+    fw_setenv baudrate 115200
+}
+
+uboot_upgrade(){
+    echo "doing upgrade of u-boot old version $cur_Major.$cur_Minor new version $Major.$Minor"
+    mtd erase /dev/mtd0
+    mtd write /boot/uboot.img /dev/mtd0
+
+    sanity_check_env
+}
+
+
+start() {
+    iver=$(fw_printenv -n uboot_inteno_version 2>/dev/null)
+
+    if [ -z "$iver" ]
+    then
+	# if this variable is not set by u-boot the u-boot version is too old.
+	uboot_upgrade
+	return
+    fi
+
+    # read in current version into Major Minor variables
+    json_init
+    json_load $(echo $iver |sed -e 's/938f0820-2ffb-11e7-bbc9-2f21351ee6fb: //')
+    json_get_vars Major Minor
+
+#    echo "Major $Major"
+#    echo "Minor $Minor"
+    
+    cur_Major=$Major
+    cur_Minor=$Minor
+
+    # read in new uboot version into Major Minor variables
+    json_load $(strings /boot/uboot.img | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb |sed -e 's/938f0820-2ffb-11e7-bbc9-2f21351ee6fb: //')
+    json_get_vars Major Minor
+
+#    echo "Major $Major"
+#    echo "Minor $Minor"
+    
+    if [ $Major -gt $cur_Major ]
+    then
+	uboot_upgrade
+	return
+    fi
+
+    if [ $Major -eq $cur_Major -a $Minor -gt $cur_Minor ]
+    then
+	uboot_upgrade
+	return
+    fi
+}
+

voice-client/Makefile

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

voice-client/files/etc/init.d/voice_client

@@ -336,6 +336,7 @@ get_bindaddr() {
 	local bindaddr=""
 
 	[ -n "$intf" ] && network_get_ipaddr bindaddr "$intf"
+	[ -z "$bindaddr" ] && network_get_ipaddr6 bindaddr "$intf"
 	echo "${bindaddr:-0.0.0.0}"
 }