refs #17038

filter out the bridge when mac checking
ice-client: update to version 5.3.8 ref #17171
2025-12-24 19:14:05 +08:00 · 2019-04-11 16:21:35 +02:00 · 2019-04-04 11:16:20 +02:00 · 2019-03-21 14:47:32 +01:00 · 2019-03-20 14:19:58 +01:00 · 2019-03-20 14:13:48 +01:00
59 changed files with 586 additions and 252 deletions
--- a/asterisk-1.8.x-mod/Makefile
+++ b/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:=ee99af0d91a2197529b13075d802ebc37e644e40
+PKG_SOURCE_VERSION:=d780c4c7a34019b6c673d36338dca9cfb34f3e46
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x

@@ -41,7 +41,7 @@ define Package/asterisk18-mod
 $(call Package/asterisk18-mod/Default)
  TITLE:=Complete open source PBX, v1.8x
  MENU:=1
-  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
+  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libstdcpp +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
 endef

 define Package/asterisk18-mod/description
@@ -451,6 +451,7 @@ define Package/asterisk18-mod/install
 	done
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/astcanary $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/default
 	$(INSTALL_DATA)  ./files/asterisk.default $(1)/etc/default/asterisk
 	$(INSTALL_DIR) $(1)/etc/init.d
--- a/asterisk-1.8.x-mod/files/asterisk.hotplug
+++ b/asterisk-1.8.x-mod/files/asterisk.hotplug
@@ -5,15 +5,15 @@
 config_load voice_client
 config_get bindintf SIP bindintf

-[ "$INTERFACE" == "$bindintf" ] || exit 0
+[ "$INTERFACE" == "$bindintf" -o -z "$bindintf" ] || exit 0

 . /lib/functions/network.sh

 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
 fi

+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
--- a/asterisk-1.8.x-mod/files/asterisk.init
+++ b/asterisk-1.8.x-mod/files/asterisk.init
@@ -32,7 +32,7 @@ start_service() {
 	init_asterisk

 	procd_open_instance
-	procd_set_param command "$PROG" -f
+	procd_set_param command /usr/bin/taskset 2 "$PROG" -f -p -q
 	procd_set_param respawn
 	procd_close_instance
 #	service_start /usr/sbin/asterisk
--- a/ated/Makefile
+++ b/ated/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1

 PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/ated
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/catv/files/etc/init.d/.catv.kate-swp
+++ b/catv/files/etc/init.d/.catv.kate-swp
--- a/dectmngr2/Makefile
+++ b/dectmngr2/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk

 PKG_RELEASE:=1
 PKG_VERSION:=1.1.0
-PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=13da1568d57b8e6732dadc16de828d64c81906b8
+PKG_SOURCE_VERSION:=930b8908a0159cfdef9d5c8861791db176dad7f5
 PKG_NAME:=dectmngr2


--- a/endptcfg/Makefile
+++ b/endptcfg/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=endptcfg
-PKG_VERSION:=0.2
+PKG_VERSION:=0.3

 PKG_SOURCE_VERSION:=1194b05278bd0945ca5c76436e56617b86871a65
 ifeq ($(CONFIG_ENDPT_OPEN),y)
--- a/gigaset-elements/Makefile
+++ b/gigaset-elements/Makefile
@@ -5,7 +5,7 @@ PKG_NAME:=gigaset-elements
 PKG_VERSION:=2.4.2
 # PKG_RELEASE=$(PKG_SOURCE_VERSION)

-PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
+PKG_GIGASET_ELEMENTS_SRC_URL ?= git@dev.iopsys.eu:3rdparty/gigaset-elements.git
 PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)

 PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)
--- a/ice-client/Makefile
+++ b/ice-client/Makefile
@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk

 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.0.0
-PKG_RELEASE:=RC8
-PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+BASE_PKG_VERSION:=5.3.8
+PKG_RELEASE:=
+PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)-$(DATE)_$(LOGIN)
 export PKG_VERSION

 ###########################--RELEASE--################################

-PKG_SOURCE_VERSION:=57b19721eb8906cb0c5e34a28eba080bc5b74a26
+PKG_SOURCE_VERSION:=5cc855907b9d6a13d36fd619b579fcf3c6f24b5c
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2017-11-24
+PKG_VERSION:=3.0-2018-03-01
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d74b88913f676ebf9a210c4674555d080e57ff52
+PKG_SOURCE_VERSION:=af5476c35d03c03f82c22a65cba932f6df096808
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/icwmp/files/icwmp.hotplug
+++ b/icwmp/files/icwmp.hotplug
@@ -1,44 +1,76 @@
 #!/bin/sh

-grep -q "Designated" /etc/banner || exit 0
-
 . /lib/functions/network.sh

 [ "$ACTION" == "ifup" ] || exit 0

-local islan="$(uci -q get network.$INTERFACE.is_lan)"
-[ "$islan" == "1" ] && exit 0
+[ -f /etc/config/cwmp ] || exit 0

-local proto="$(uci -q get network.$INTERFACE.proto)"
-[ "$proto" == "none" ] && exit 0
+handle_icwmp_restart() {
+	[ -f /tmp/switching_mode ] && exit 0

-local ifname="$(uci -q get network.$INTERFACE.ifname)"
-[ "${ifname:0:1}" == "@" ] && exit 0
+	[ "$INTERFACE" == "loopback" ] && exit 0

-mkdir -p /tmp/ipv4
+	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 previpaddr=""
-local curipaddr=""
-local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
-previpaddr=$(cat $ipaddrfile 2>/dev/null)
-network_get_ipaddr curipaddr $INTERFACE
-[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+	local islan="$(uci -q get network.$INTERFACE.is_lan)"
+	[ "$islan" == "1" ] && exit 0

-local prevgateway=""
-local curgateway=""
-local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
-prevgateway=$(cat $gatewayfile 2>/dev/null)
-network_get_gateway curgateway $INTERFACE
-[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
+	local proto="$(uci -q get network.$INTERFACE.proto)"
+	[ "$proto" == "none" ] && exit 0

-local prevsubnets=""
-local cursubnets=""
-local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
-prevsubnets=$(cat $subnetsfile 2>/dev/null)
-network_get_subnets cursubnets $INTERFACE
-[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
+	local ifname="$(uci -q get network.$INTERFACE.ifname)"
+	[ "${ifname:0:1}" == "@" ] && exit 0

-[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" ] && exit 0
+	mkdir -p /tmp/ipv4

-[ -f /etc/config/cwmp ] && /etc/init.d/icwmpd reload &
+	network_flush_cache

+	local previpaddr=""
+	local curipaddr=""
+	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
+	previpaddr=$(cat $ipaddrfile 2>/dev/null)
+	network_get_ipaddr curipaddr $INTERFACE
+	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+
+	local prevgateway=""
+	local curgateway=""
+	local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
+	prevgateway=$(cat $gatewayfile 2>/dev/null)
+	network_get_gateway curgateway $INTERFACE
+	[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
+
+	local prevsubnets=""
+	local cursubnets=""
+	local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
+	prevsubnets=$(cat $subnetsfile 2>/dev/null)
+	network_get_subnets cursubnets $INTERFACE
+	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
+
+	local prevdnsservers=""
+	local curdnsservers=""
+	local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
+	prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
+	network_get_dnsserver curdnsservers $INTERFACE
+	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
+
+	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" -a \
+		"$prevdnsservers" = "$curdnsservers" \
+	] && exit 0
+
+	/etc/init.d/icwmpd reload &
+}
+
+handle_icwmp_restart
--- a/inbd/Makefile
+++ b/inbd/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1

 PKG_SOURCE_VERSION:=92f918d26c0ffc22d1704f5ea6cbb0bd7fdbdab9
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se/inbd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/inteno-netmodes/files/etc/hotplug.d/iface/100-lan-follow-wan
+++ b/inteno-netmodes/files/etc/hotplug.d/iface/100-lan-follow-wan
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+
+follow_wan='0'
+config_load dhcp
+config_get follow_wan 'lan' dhcpv6_follow_wan 0
+
+test $follow_wan = '1' || exit 0
+
+PROTO=""
+
+get_dhcp_version_of_interface() {
+	config_get PROTO $INTERFACE proto
+
+	if [ -n "$PROTO" ]; then
+		return
+	fi
+}
+
+config_load network
+config_foreach get_dhcp_version_of_interface interface
+
+lan_v6_on() {
+	logger -t lan-follow-wan "turning ON IPv6 on LAN"
+	uci set dhcp.lan.dhcpv6='server'
+}
+
+lan_v6_off() {
+	logger -t lan-follow-wan "turning OFF IPv6 on LAN"
+	uci set dhcp.lan.dhcpv6='disabled'
+}
+
+case "$ACTION" in
+	ifup)
+		if [ "$PROTO" = "dhcpv6" ]; then
+			network_flush_cache
+			network_get_ipaddr6 current_ipv6_address $INTERFACE
+
+			if [ -n "$current_ipv6_address" ]; then
+				lan_v6_on
+			else
+				lan_v6_off
+			fi
+		elif [ "$PROTO" = "dhcp" ]; then
+			lan_v6_off
+		fi
+
+		uci commit
+		/etc/init.d/odhcpd restart
+
+		;;
+esac
--- a/inteno-netmodes/files/etc/hotplug.d/net/80-repeater
+++ b/inteno-netmodes/files/etc/hotplug.d/net/80-repeater
@@ -3,6 +3,9 @@
 . /lib/functions.sh
 include /lib/network

+# exit if no wet interface is available
+uci show wireless | grep mode | grep -q wet || exit
+
 ps | grep hotplug | grep button && exit

 MTK=0
@@ -67,6 +70,8 @@ case "$ACTION" in
 		uci set network.wan.ifname="$(echo $WANDEV $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$wetif //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
 		uci commit network
 		ubus call network reload
+		sleep 1
+		ubus call network.device set_state "{\"name\":\"$wetif\", \"defer\":true}"
 		[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss down 2>/dev/null
 		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
 		ubus call router.network reload
@@ -89,6 +94,8 @@ case "$ACTION" in
 		uci set network.wan.ifname="$(echo $wetif $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$WANDEV //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
 		uci commit network
 		ubus call network reload
+		sleep 1
+		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
 		[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss up 2>/dev/null
 		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || {
 			killall -9 wifi
--- a/inteno-netmodes/files/etc/netmodes/one_bridged_port/DETAILS
+++ b/inteno-netmodes/files/etc/netmodes/one_bridged_port/DETAILS
@@ -0,0 +1,16 @@
+{
+	"description": [
+		{ "en" : "Routed, LAN1 bridged" },
+		{ "sv" : "Routed, LAN1 bryggad" }
+
+	],
+	"explanation": [
+		{ "en" : "LAN4 port is bridged with internet" },
+                { "sv" : "LAN4 port överbryggas med internet" }
+	],
+	"excluded_boards" : [
+		"EX4*"
+	],
+	"credentials" : 0
+}
+
--- a/inteno-netmodes/files/etc/netmodes/one_bridged_port/network
+++ b/inteno-netmodes/files/etc/netmodes/one_bridged_port/network
@@ -0,0 +1,31 @@
+
+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 '$LAN2 $LAN3 $LAN4'
+	option ip6assign '64'
+	
+config interface 'wan'
+	option type 'bridge'
+	option proto 'dhcp'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
+	option ifname '$WAN.1 $LAN1'
+	option reqopts '43 66 67 128 132 224 225 226'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname '@wan'
+	option reqaddress 'try'
+	option reqprefix 'auto'
+
--- a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/DETAILS
+++ b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/DETAILS
@@ -16,5 +16,5 @@
 	],
 	"uplink_band" : "b",
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }
--- a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/wireless
+++ b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/wireless
@@ -77,17 +77,4 @@ config wifi-device 'wl1'
 	option rifs_advert '0'
 	option maxassoc '32'
 	option doth '0'
-	option apsta '1'
-
-config wifi-iface
-	option device 'wl1'
-	option ifname 'wl1'
-	option network 'wan'
-	option mode 'wet'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option wps_pbc '0'
-	option wmf_bss_enable '1'
-	option autoconf '1'

--- a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/DETAILS
+++ b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/DETAILS
@@ -16,5 +16,5 @@
 	],
 	"uplink_band" : "b",
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }
--- a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/wireless
+++ b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/wireless
@@ -77,19 +77,6 @@ config wifi-device 'wl1'
 	option rifs_advert '0'
 	option maxassoc '32'
 	option doth '0'
-	option apsta '1'
-
-config wifi-iface
-	option device 'wl1'
-	option ifname 'wl1'
-	option network 'wan'
-	option mode 'wet'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option wps_pbc '0'
-	option wmf_bss_enable '1'
-	option autoconf '1'

 config wifi-iface
 	option device 'wl1'
--- a/inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/DETAILS
+++ b/inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/DETAILS
@@ -13,5 +13,5 @@
 	],
 	"uplink_band" : 'b',
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }
--- a/inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/DETAILS
+++ b/inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/DETAILS
@@ -13,5 +13,5 @@
 	],
 	"uplink_band" : 'a',
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }
--- a/inteno-netmodes/files/sbin/netmode-client-detect
+++ b/inteno-netmodes/files/sbin/netmode-client-detect
@@ -29,6 +29,7 @@ is_inteno_macaddr()
 				-e "^00:0C:43" \
 				-e "^02:0C:43" \
 				-e "^06:0C:43" \
+				-e "^34:E3:80" \
 	&& return
 	false
 }
--- a/inteno-netmodes/files/sbin/netmode-conf
+++ b/inteno-netmodes/files/sbin/netmode-conf
@@ -162,17 +162,14 @@ done

 repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta'"  | sed 's/.*\[\([0-9]\)\].*/\1/')

-[ -z "$repeater_iface_num" ] && {
-	[ "$from_gui" == "true" ] && restore "back"
-	exit
+[ "$repeater_iface_num" ] && {
+	json_get_var ssid ssid
+	json_get_var key key
+	json_get_var encryption encryption
+
+	set_wireless_values "$repeater_iface_num" "$ssid" "$key" "$encryption"
 }

-json_get_var ssid ssid
-json_get_var key key
-json_get_var encryption encryption
-
-set_wireless_values "$repeater_iface_num" "$ssid" "$key" "$encryption"
-
 json_load "`cat $file`"
 json_select "wifi_ifaces"

@@ -226,7 +223,11 @@ while json_get_var dummy $i; do
 	json_select ..
 done

-i=$((b_num + a_num + 1))
+if [ -z $repeater_iface_num ] ; then
+	i=$((b_num + a_num))
+else
+	i=$((b_num + a_num + 1))
+fi

 if [ $repeater_iface_num -gt $i ]; then
 	i=$((i-1))
--- a/inteno-netmodes/files/sbin/netmode-discover
+++ b/inteno-netmodes/files/sbin/netmode-discover
@@ -39,6 +39,6 @@ while true; do
 		fping -c 1 -t 1000 -g $ipaddr/$mask -q >/dev/null 2>&1
 	fi

-	sleep 20
+	sleep 40
 done

--- a/iop/configs/config
+++ b/iop/configs/config
@@ -3,7 +3,7 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-CONFIG_LOCALMIRROR="http://mirror.inteno.se/mirror"
+# CONFIG_LOCALMIRROR is not set
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
@@ -72,6 +72,7 @@ CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-owsd=y
+CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-samba=y
@@ -111,7 +112,7 @@ CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_p910nd=y
+# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -173,6 +174,7 @@ CONFIG_BUSYBOX_CONFIG_LSMOD=y
 CONFIG_BUSYBOX_CONFIG_LSPCI=y
 CONFIG_BUSYBOX_CONFIG_LSUSB=y
 CONFIG_BUSYBOX_CONFIG_MICROCOM=y
+CONFIG_BUSYBOX_CONFIG_MPSTAT=y
 CONFIG_BUSYBOX_CONFIG_RMMOD=y
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y
--- a/iop/iop.completion
+++ b/iop/iop.completion
@@ -5,14 +5,14 @@

 _iop_get_profiles()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -name '*.diff' \
+    find feeds/targets/iopsys-*/ -name '*.diff' \
        |awk -F'/' '{print$NF}' \
        |awk -F. '{print$1}'
 }

 _iop_get_models()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
+    find feeds/targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
        |awk -F'/' '{print$NF}' \
        |egrep '^(cg|dg|eg|vg|vox)[0-9]'
 }
@@ -36,7 +36,7 @@ _iop()
             feeds_update genconfig generate_tarballs install_key \
             scp_changes setup_host ssh_install_key ssh_sysupgrade \
             ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
-             update_package"
+             update_package update_feed_branches"

    if [ $COMP_CWORD -eq 1 ] ; then

--- a/iop/scripts/feeds_update.sh
+++ b/iop/scripts/feeds_update.sh
@@ -28,14 +28,14 @@ function feeds_update {

    # replace core packages with iopsys versions
    if [ $override == 1 ]; then
-	./scripts/feeds install -f -p feed_inteno_openwrt -a
+	./scripts/feeds install -f -p openwrt_cc_core -a
    fi

    # targets need to be installed explicitly
    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
    ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
-    
+
    # install all packages
    ./scripts/feeds install -a 

@@ -54,6 +54,3 @@ function feeds_update {

 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"

-
-
-
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -7,15 +7,15 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/feed_inteno_packages/iop/configs"
+	export CONFIGPATH="package/feeds/iopsys/iop/configs"
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"

-	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02"
-	iopsys_brcm63xx_arm="dg400 eg400 f104w f104 dg400prime dg400primeb 963138REF_P502"
+	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
+	iopsys_brcm63xx_arm="dg400 eg400 sdx_500rg f104w f104 dg400prime dg400primeb 963138REF_P502"
 	iopsys_ramips="ex400"
 	ramips="mt7621"
 	target="bogus"
@@ -295,7 +295,7 @@ function genconfig {
 		fi

 		# Force regeneration of themes
-		touch package/feeds/feed_inteno_juci/juci/Makefile
+		touch package/feeds/juci/juci/Makefile

 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets
--- a/iop/scripts/generate_tarballs.sh
+++ b/iop/scripts/generate_tarballs.sh
@@ -4,7 +4,7 @@
 build_bcmkernel_consumer() {
 	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)
+	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/broadcom/bcmkernel/$sdkversion.mk | cut -d'=' -f2)
 	# do not build bcmopen sdk if it was already built before
 	ssh $SERVER "ls $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/bcmkernel-3.4-$sdkversion/bcm963xx/release
@@ -20,8 +20,8 @@ build_natalie_consumer() {
 	# create natalie-dect open version tar file
 	local natalieversion nataliecommith
 	grep -q "CONFIG_TARGET_NO_DECT=y" .config && return
-	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
-	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
+	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
+	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
 	ssh $SERVER "ls $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/natalie-dect-$natalieversion/
 	mkdir natalie-dect-open-$natalieversion
@@ -38,8 +38,8 @@ build_endptcfg_consumer() {
 	# create endptcfg open version tar file
 	local endptversion endptcommith
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
-	endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
-	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
+	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptcfg/Makefile | cut -d'=' -f2)
+	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptcfg/Makefile | cut -d'=' -f2)
 	ssh $SERVER "ls $FPATH/endptcfg-$profile-$endptversion-$endptcommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/endptcfg-$endptversion/
 	mkdir endptcfg-open-$endptversion
@@ -55,9 +55,9 @@ build_endptcfg_consumer() {
 build_ice_consumer() {
 	# create ice-client open version tar file
 	local iceversion icebasever icerelease icecommith
-	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | head -1 | cut -d'=' -f2)
-	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)
+	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/ice-client/Makefile | head -1 | cut -d'=' -f2)
+	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
+	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
 	iceversion=$icebasever$icerelease
 	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-*
--- a/iop/scripts/update_feed_branches.sh
+++ b/iop/scripts/update_feed_branches.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Exported interface
+function update_feed_branches {
+	local release="$1"
+	local ipath="$(pwd)"
+	local branch="$2"
+	local curbranch
+
+	[ -n "$release" ] || {
+		echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
+		echo ""
+		echo "If you do not give a branch as argument,"
+		echo "<RELEASE> branch will be updated to commit"
+		echo "hash given in feeds.conf for each feed repo"
+		exit 1
+	}
+
+	if [ -n "$branch" ]; then
+		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
+		if git diff-index --quiet HEAD; then
+			curbranch=`git symbolic-ref HEAD 2>/dev/null`
+			curbranch=${curbranch##refs/heads/}
+			if [ -z $curbranch ]; then
+				curbranch=`git log -1 --pretty=format:"%H"`
+			fi
+			git checkout $branch || {
+				echo "couldn't checkout branch $branch"
+				exit 99
+			}
+		else
+			echo "You have unsaved changes."
+			exit 99
+		fi
+	else
+		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
+	fi
+
+	ifeeds="$(grep -r feed_inteno feeds.conf  | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"
+
+	for f in $ifeeds; do
+		commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
+		cd $ipath/feeds/feed_inteno_$f
+		git branch -D $release 2>/dev/null
+		echo "feed_inteno_$f: updating release branch $release to commit $commith"
+		git checkout $commith
+		git push origin :$release
+		git checkout -b $release
+		git push origin $release
+		cd $ipath
+	done
+
+	if [ -n "$branch" ]; then
+		echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
+		git checkout $curbranch
+	else
+		echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
+	fi
+}
+
+register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"
--- a/iup/files/sbin/iup
+++ b/iup/files/sbin/iup
@@ -458,33 +458,46 @@ parse_dhcp_options()
 # return 1 if the default gateway is not reachable after $wait_time
 wait_for_default_gateway()
 {
-	local gateway
-	local device
+	local gateway device nameservers
 	local wait_time=120
 	local wait_interval=10
+	local interface="$1"

 	while [ true ] ; do

-		gateway=""
 		device=""
+
 		network_flush_cache
-		network_get_gateway gateway wan #true
-		network_get_device device wan
-		device="${device:+-I }$device"
-		if ping -q -w 1 -c 1 $device $gateway >/dev/null 2>&1 ; then
-			[ "$wait_time" -lt "60" ] && v "Default gateway $gateway is reachable"
-			sleep $wait_interval
-			return 0
+
+		if [ -z "$interface" ]; then
+			network_find_wan interface
 		fi

-		# try the nameservers too
-		for ns in $(grep nameserver /var/resolv.conf.auto | awk '{print $2}'); do
-			if ping -q -w 1 -c 1 $device $ns >/dev/null 2>&1 ; then
-				[ "$wait_time" -lt "60" ] && v "Name server $ns is reachable"
-				sleep $wait_interval
-				return 0
+		if [ -n "$interface" ]; then
+			network_get_device device $interface
+
+			if [ "$device" ]; then
+				device="${device:+-I }$device"
+				network_get_gateway gateway $interface true
+
+				# ping gateways to check uplink
+				if ping -q -w1 -c 1 $device $gateway >/dev/null 2>&1 ; then
+					[ "$wait_time" -lt "60" ] && v "Default gateway $gateway is reachable"
+					sleep $wait_interval
+					return 0
+				fi
+
+				# try the nameservers too
+				nameservers="$(grep nameserver /var/resolv.conf.auto | awk '{print $2}')"
+				for ns in $nameservers; do
+					if ping -q -w 1 -c 1 $device $ns >/dev/null 2>&1 ; then
+						[ "$wait_time" -lt "60" ] && v "Name server $ns is reachable"
+						sleep $wait_interval
+						return 0
+					fi
+				done
 			fi
-		done
+		fi

 		v "Waiting for default gateway or name server. Countdown $wait_time seconds"
 		sleep $wait_interval
@@ -517,10 +530,17 @@ main()
 		shift;
 	done

-	if ! wait_for_default_gateway ; then
+	local interface=""
+
+	config_load provisioning
+	config_get interface polling interface
+
+	if ! wait_for_default_gateway $interface; then
 		v "Neither default gateway nor name server are reachable. Aborting iup."
 		exit 1
 	fi
+	# reload config to get latest values
+	config_load provisioning

 	if [ ! -f $IUPMD5 ]; then
 		v "Creating file $IUPMD5"
@@ -533,7 +553,6 @@ main()
 	local software
 	local sofwareminuspath

-	config_load provisioning
 	#check if iup should be used or if its overridden by /etc/config
 	config_get configurl configserver	url
 	config_get reboot configserver reboot
--- a/layer2interface/broadcom/etc/init.d/layer2_interface
+++ b/layer2interface/broadcom/etc/init.d/layer2_interface
@@ -90,9 +90,7 @@ start_service() {

 	xtmctl start
 	xtmctl operate intf --state 1 enable
-	json_load "$(ubus call router.system info)"
-	json_select specs
-	json_get_var vdsl vdsl
+	vdsl=$(db get hw.board.hasVdsl)

 	if [ $vdsl -eq 1 ]; then
 		echo "xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM$VDSL2$GFast --profile \"$a8a $b8b $c8c $d8d $a12a $b12b $a17a $a30a $b35b $BrcmPriv1\" --sra $sra --bitswap $bitswap --us0 $US0"
--- a/layer2interface/broadcom/etc/init.d/layer2_interface_ethernet
+++ b/layer2interface/broadcom/etc/init.d/layer2_interface_ethernet
@@ -55,7 +55,6 @@ addethernet() {
 	ifname="${ifname:-$baseifname.1}"

 	brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge" "$mac2"
-
 }

 boot() {
@@ -96,12 +95,15 @@ start_service() {
 	echo "Setting up Ethernet WAN"
 	config_load layer2_interface_ethernet
 	config_foreach addethernet ethernet_interface
+	/etc/init.d/layer2_interface_vlan start
 }

 stop_service() {
 	local ifname
 	config_load layer2_interface_ethernet
 	config_foreach removeethernet ethernet_interface
+	/etc/init.d/layer2_interface_vlan stop
+	sleep 1
 }

 reload_service() {
@@ -113,4 +115,3 @@ service_triggers() {
 	procd_add_reload_trigger layer2_interface_ethernet
 }

-
--- a/layer2interface/broadcom/lib/network/brcmwifi.sh
+++ b/layer2interface/broadcom/lib/network/brcmwifi.sh
@@ -91,12 +91,13 @@ wlmngr_doWlConf() {
 wlmngr_setupMbssMacAddr() {
 	local idx=$1
 	local hwaddr
-
+	wlmngr_WlConfDown $idx
 	for vif in $(nvram get "wl$idx"_vifs); do
 		hwaddr=$(nvram get "$vif"_hwaddr)
 		ifconfig $vif hw ether $hwaddr 2>/dev/null
 		wlctl -i $vif cur_etheraddr $hwaddr 2>/dev/null
 	done
+	wlmngr_doWlConf $idx
 }

 #enableSSD() {
@@ -200,14 +201,14 @@ enableBSD() {
 					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
 					nvram set ${wdev}_bsd_sta_select_policy="20 -60 0 0 1 0 0 0 0 0x42"
 					nvram set ${wdev}_bsd_steer_prefix=$wdev
-					nvram set ${wdev}_bsd_steering_policy="0 0 0 -60 0 0x52"
+					nvram set ${wdev}_bsd_steering_policy="0 0 0 -60 0 0x0"
 				else
 					# 5G
 					nvram set ${wdev}_bsd_if_qualify_policy="30 0x0"
 					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
 					nvram set ${wdev}_bsd_sta_select_policy="20 $rssi_threshold 0 0 1 0 0 0 0 0x40"
 					nvram set ${wdev}_bsd_steer_prefix=$wdev
-					nvram set ${wdev}_bsd_steering_policy="80 5 3 $rssi_threshold 0 0x40"
+					nvram set ${wdev}_bsd_steering_policy="80 5 3 $rssi_threshold 0 0x0"
 				fi
 			else
 				# Bandwidth Usage based policy #
@@ -348,6 +349,9 @@ wlmngr_doQoS() {

 wlmngr_finalize() {
 	local idx=$1
+	local dconpoll="$(uci -q get wireless.wl$idx.dconpoll)"
+
+	dconpoll=${dconpoll:-0}

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

 wlmngr_issueServiceCmd() {
--- a/layer2interface/broadcom/lib/network/vlan.sh
+++ b/layer2interface/broadcom/lib/network/vlan.sh
@@ -58,17 +58,45 @@ ifbaseexists()
 	return 0
 }

+get_bridge_of() {
+
+        find_network() {
+                local config="$1"
+                local iface="$2"
+                local net=
+                local if_type
+                ifname="$(uci get network.$config.ifname)"
+                if_type="$(uci get network.$config.type)"
+                [ "$if_type" == "bridge" ] || return
+                for ifc in $ifname; do
+                        if [ "$ifc" == "$iface" ]; then
+                                net=$config
+                                break
+                        fi
+                done
+                [ -n "$net" ] && echo $net
+        }
+
+        config_load network
+        config_foreach find_network interface $1
+}
+
 check_mac_address()
 {
-	local baseifname="$1"
-	local vlan="$2"
-	local basemac
-	local mac=$(ifconfig -a | grep "^${baseifname}.${vlan} " | awk '{print $NF}')
-	local mac_in_use=$(ifconfig -a | grep "$mac" | grep -v "^${baseifname}.${vlan}[ ]")
-	if [ "$mac_in_use" ]; then
-		basemac=$(ifconfig -a | grep "^$baseifname " | awk '{print $NF}')
-		ifconfig ${baseifname}.${vlan} hw ether $basemac
-	fi
+        local baseifname="$1"
+        local vlan="$2"
+        local basemac
+        local mac=$(ifconfig -a | grep "^${baseifname}.${vlan} " | awk '{print $NF}')
+        local br_name=$(get_bridge_of ${baseifname}.${vlan})
+        if [ -n "$br_name" ];then
+                local mac_in_use=$(ifconfig -a | grep "$mac" | grep -v "^${baseifname}.${vlan}[ ]" | grep -v "$br_name")
+        else
+                local mac_in_use=$(ifconfig -a | grep "$mac" | grep -v "^${baseifname}.${vlan}[ ]")
+        fi
+        if [ "$mac_in_use" ]; then
+                basemac=$(ifconfig -a | grep "^$baseifname " | awk '{print $NF}')
+                ifconfig ${baseifname}.${vlan} hw ether $basemac
+        fi
 }

 addbrcmvlan()
--- a/loop-detector/Makefile
+++ b/loop-detector/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1.0

 PKG_SOURCE_VERSION:=d0fb770eacd6691b98df138b60f5116e02f71a9b
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/loop-detector
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/loop-detector

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/mtk-bndstrg/Makefile
+++ b/mtk-bndstrg/Makefile
@@ -1,41 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mtk-bndstrg
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=a67f5ccdf9bc6810f15f1ece9edaad5e89cad0f7
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/mtk-bndstrg
-
-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/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))
--- a/natalie-dect-h/Makefile
+++ b/natalie-dect-h/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=natalie-dect-h
 PKG_VERSION:=12.26

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://public.inteno.se:/natalie-dect-h
+PKG_SOURCE_URL:=https://dev.iopsys.eu/dialog/natalie-dect-h.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/natalie-dect/Makefile
+++ b/natalie-dect/Makefile
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-12.26
+PKG_SOURCE_URL:=git@dev.iopsys.eu:dialog/natalie-dect-12.26
 PKG_SOURCE_PROTO:=git
 endif

--- a/peripheral_manager/Makefile
+++ b/peripheral_manager/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1

 PKG_SOURCE_VERSION:=959eca8ab2b50eaccfff9c710cffe5b317bb6ad1
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/questd/Makefile
+++ b/questd/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=questd
-PKG_VERSION:=3.1.39
+PKG_VERSION:=3.1.40

-PKG_SOURCE_VERSION:=10cba850fb80668502ca5ce0bc57533089062741
+PKG_SOURCE_VERSION:=947315714433ac9a4faf8e39f9ab285964a553d1
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/questd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/questd/files/etc/init.d/quest
+++ b/questd/files/etc/init.d/quest
@@ -20,11 +20,6 @@ start_service() {
 	pidof imonitor > /dev/null 2>&1 || /sbin/imonitor &
 }

-stop() {
-	#stop_service() is called after procd killed the service
-	echo ;
-}
-
 service_triggers()
 {
 	procd_add_reload_trigger network wireless
@@ -34,3 +29,12 @@ reload_service() {
 	ubus -t 5 call router.network reload
 }

+print_out_data() {
+	logger -t "environment" "Software Version: $(grep 'IOP Version' /etc/banner | awk '{print$3}')"
+	[ -s /etc/boot_reason ] && logger -t "environment" "Boot Reason: $(cat /etc/boot_reason)"
+}
+
+boot() {
+	print_out_data
+	start_service
+}
--- a/questd/files/sbin/imonitor
+++ b/questd/files/sbin/imonitor
@@ -23,7 +23,7 @@ NPROC_COUNT=4	# number of time that the NPROC_LIMIT has to be hit to trigger a p
 NPROC_NFAIL=0	# current consecutive Number of FAILures. process restarts when NPROC_NFAIL == NPROC_COUNT

 # memmory limit
-MEM_LIMIT=15000
+MEM_LIMIT=20000
 MEM_COUNT=4
 MEM_NFAIL=0

@@ -41,22 +41,28 @@ UBUS_TIMEOUT=5
 BSDBIN=$(which bsd)
 ACSDBIN=$(which acsd)

+RESTART_ACSD=0
+RESTART_BSD=0
+
+DUALBAND=1
+
 restart_questd()
 {
 	logger -s -t $0[$$] "Restarting questd. $NPROC_NFAIL $MEM_NFAIL $PCPU_NFAIL $NNET_NFAIL"

-	killall -q -KILL questd
 	/etc/init.d/quest stop
 	killall -q -KILL questd
+	killall -q -KILL questd
 	/etc/init.d/quest start

+	sleep 5
+
 	NPROC_NFAIL=0
 	MEM_NFAIL=0
 	PCPU_NFAIL=0
 	NNET_NFAIL=0
 }

-
 check_nproc()
 {
 	local nproc="$@"
@@ -129,6 +135,8 @@ check_ubus_network_call() {
 	json_load "$(ifstatus lan)" || return 0
 	json_get_var up up
 	[ $up -eq 1 ] || return 0
+	local ifname="$(uci -q get network.lan.ifname)"
+	[ -z "$ifname" -o "${ifname:0:3}" == "br-" ] && return 0
 	ubus -t 5 call router.network ports '{"network":"lan"}' | grep -q statistics || {
 		NNET_NFAIL=1
 		return 1
@@ -138,9 +146,27 @@ check_ubus_network_call() {

 restart_bsd()
 {
-	logger -s -t $0[$$] "Restarting bsd."
-	killall -q -KILL bsd
-	bsd
+	killall -q -15 bsd 2>/dev/null
+
+	[ "$(nvram get wl0_radio)" == "1" -a "$(nvram get wl1_radio)" == "1" ] || {
+		[ $DUALBAND -eq 1 ] && logger -s -t $0[$$] "Band Steering is deactivated; will be re-activated when both 2.4GHz and 5GHz radios are enabled."
+		DUALBAND=0
+		return 0
+	} && DUALBAND=1
+
+	logger -s -t $0[$$] "Restarting Band Steering daemon due to bsd hangup."
+
+	if [ $RESTART_BSD -eq 3 ]; then
+		wlctl -i wl0 down 2>/dev/null
+		wlctl -i wl1 down 2>/dev/null
+		wlctl -i wl0 up 2>/dev/null
+		wlctl -i wl1 up 2>/dev/null
+		RESTART_ACSD=0
+		RESTART_BSD=0
+	else
+		RESTART_BSD=$((RESTART_BSD+1))
+	fi
+	bsd &
 }

 check_bsdcall()
@@ -157,9 +183,19 @@ check_bsdcall()

 restart_acsd()
 {
-	logger -s -t $0[$$] "Restarting acsd."
-	killall -q -KILL acsd
-	acsd &
+	logger -s -t $0[$$] "Restarting Auto Channel Selection daemon due to acsd high CPU usage."
+	killall -q -9 acsd 2>/dev/null
+	if [ $RESTART_ACSD -eq 3 ]; then
+		wlctl -i wl0 down 2>/dev/null
+		wlctl -i wl1 down 2>/dev/null
+		wlctl -i wl0 up 2>/dev/null
+		wlctl -i wl1 up 2>/dev/null
+		RESTART_ACSD=0
+		RESTART_BSD=0
+	else
+		RESTART_ACSD=$((RESTART_ACSD+1))
+	fi
+	acsd
 }

 check_acsd()
@@ -171,7 +207,7 @@ check_acsd()

 	for p in $pcpu; do
 		p=${p%%%*}
-		if [ "$p" -ge "20" ]; then
+		if [ "$p" -ge "40" ]; then
 			return 1
 		fi
 	done
@@ -210,23 +246,22 @@ main()
 			"$restart_pcpu"  = "1" ]
 		then
 			restart_questd
-		else
-			if [ "$sample" -ge "$SAMPLES" ]; then
-				check_ubus_network_call || restart_questd
-			fi
+#		else
+#			if [ "$sample" -ge "$SAMPLES" ]; then
+#				check_ubus_network_call || restart_questd
+#			fi
 		fi

-		if [ "$BSDBIN" ] ; then
-			config_load wireless
-			config_get_bool bsdenabled bandsteering enabled 0
-			if [ $bsdenabled == "1" -a "$(pidof wifi)" == "" ] ; then
-				check_bsdcall || restart_bsd
-			fi
-		fi
+#		if [ "$BSDBIN" ] ; then
+#			bsdenabled="$(uci -q get wireless.bandsteering.enabled)"
+#			if [ $bsdenabled == "1" -a "$(pidof wifi)" == "" ] ; then
+#				check_bsdcall || restart_bsd
+#			fi
+#		fi

-		if [ "$ACSDBIN" ] ; then
-			check_acsd || restart_acsd
-		fi
+#		if [ "$ACSDBIN" ] ; then
+#			check_acsd || restart_acsd
+#		fi

 		# sleep
 		if [ "$sample" -lt "$SAMPLES" ]; then
--- a/samba2/Makefile
+++ b/samba2/Makefile
@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=samba2
-PKG_VERSION:=2.2.12.inteno
+PKG_VERSION:=2.2.12
 PKG_RELEASE:=1

-PKG_SOURCE_URL:=http://public.inteno.se:/samba2
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/samba2.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=d687d07a137981f4fe78cc289b040e6426c61e29
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
--- a/samba3/files/samba.init
+++ b/samba3/files/samba.init
@@ -11,6 +11,11 @@ useradd()
 	local password
 	config_get user $1 user
 	config_get password $1 password
+
+	filter="0A;5C 6E"
+	[ "$(hex_filter "$user" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$password" "$filter" 1)" = "" ] || return
+
 	if ! $(grep -rq "^$user:" /etc/passwd) ; then
 		echo "adding user $user"
 		adduser $user -s /bin/false -D -H -h /mnt/$user -g "samba,pass=$password" && smbpasswd $user $password
@@ -51,6 +56,29 @@ purgepasswd()
 	done
 }

+hex_filter() {
+	local string=$1
+	local hex_chars=$2
+	local wc_max=$3
+	local wc_tot=0
+
+	if [ -z "$string" -o -z "$hex_chars" -o -z "$wc_max" ]
+		then
+		return;
+	fi
+
+	dump=$(echo "$string" | hexdump -v -e '32/1 "%02X ""\n"')
+
+	IFS=';'
+	for i in $hex_chars; do
+		local wc
+		wc=$(echo "$dump" | grep -o "$i" | wc -w)
+		wc_tot=$((wc_tot+wc))
+	done
+
+	[ $wc_tot -gt $wc_max ] && echo "corrupt"
+}
+
 smb_header() {
 	local interface
 	config_get interface $1 interface
@@ -80,6 +108,14 @@ smb_header() {
 	config_get description $1 description "Samba on ${hostname:-OpenWrt}"
 	config_get charset     $1 charset     "UTF-8"

+	filter="0A;5C 6E"
+	[ "$(hex_filter "$name" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$workgroup" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$description" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$interfaces" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$charset" "$filter" 1)" = "" ] || exit
+
+
 	mkdir -p /var/etc
 	sed -e "s#|NAME|#$name#g" \
 	    -e "s#|WORKGROUP|#$workgroup#g" \
@@ -138,6 +174,15 @@ smb_add_share() {
 	path=$(readlink -f $path)
 	[ "${path:0:4}" == "/mnt" ] || path="/mnt/"

+	filter="0A;5C 6E"
+	[ "$(hex_filter "$name" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$users" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$read_only" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$guest_ok" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$create_mask" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$dir_mask" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$browseable" "$filter" 1)" = "" ] || return
+
 	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/smb.conf
 	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/smb.conf
 	[ -n "$read_only" ] && echo -e "\tread only = $read_only" >> /var/etc/smb.conf
--- a/tptest/Makefile
+++ b/tptest/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=0

 PKG_SOURCE_VERSION:=57786908e7a0c790f303417b459c562887582384
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/tptest
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/tptest.git

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/tptest/files/etc/config/speedtest
+++ b/tptest/files/etc/config/speedtest
@@ -1,8 +1,5 @@
+
 config testserver '1'
-	option server 'tptest.bredband.net'
-	option port '1640'
-
-config testserver '2'
 	option server 'referens.sth.ip-performance.se'
-	option port '1642'
+	option port '1641'

--- a/tr064/Makefile
+++ b/tr064/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=tr064
 PKG_VERSION:=1.0
-PKG_SOURCE_URL:=git@public.inteno.se:tr064.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/suite/tr-064.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=e53d492a09c433718a520987c419cb6a4d4ae8dc
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
--- a/uboot/Makefile
+++ b/uboot/Makefile
@@ -10,10 +10,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=u-boot
 PKG_VERSION:=2016.08
 PKG_RELEASE:=4
-PKG_SOURCE_URL:=http://public.inteno.se:/uboot
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=f502d1b589f14142bf7d7719e8434014f180d03f
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
--- a/ubus-mqtt/Makefile
+++ b/ubus-mqtt/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=ubus-mqtt
 PKG_VERSION:=14.20.0
 PKG_RELEASE:=1

-PKG_SOURCE_URL:=http://public.inteno.se:/ubus-mqtt
+PKG_SOURCE_URL:=https://dev.iopsys.eu/3rdparty/ubus-mqtt.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
--- a/voice-client/Makefile
+++ b/voice-client/Makefile
@@ -16,7 +16,7 @@ define Package/voice-client
  SECTION:=net
  CATEGORY:=Network
  TITLE:=voice-client
-  DEPENDS:=+asterisk18-mod
+#  DEPENDS:=@(asterisk13||asterisk18-mod)
 endef

 define Package/voice-client/description
--- a/voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE
@@ -4,7 +4,7 @@ callerid=|CALLERID|
 autodial=|AUTODIAL|
 autodial_timeoutmsec=|AUTODIAL_TIMEOUT|
 dialtone_timeoutmsec=|DIALTONE_TIMEOUT|
-;jitter_fixed=|JITTERFIXED|
+jitter_fixed=|JITTERFIXED|
 ;jitter_min=|JITTERMIN|
 ;jitter_max=|JITTERMAX|
 ;jitter_target=|JITTERTARGET|
--- a/voice-client/files/etc/asterisk_templates/extensions_macro.conf.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/extensions_macro.conf.TEMPLATE
@@ -96,7 +96,7 @@ exten => s,n,			Hangup()

 ;handle busy (with CBBS support)
 exten => s-BUSY,1,		Read(DIGIT,Busy,1,in,30)
-exten => s-BUSY,n,		GotoIf($[${DIGIT} = ${ARG8}]?ccbs)
+exten => s-BUSY,n,		GotoIf($["${DIGIT}" = "${ARG8}"]?ccbs)
 exten => s-BUSY,n,		Hangup()
 exten => s-BUSY,n(ccbs),	Set(result=${SHELL(/usr/lib/asterisk/cbbs.sh ${ARG1} ${ARG2} ${ARG3} ${ARG4} ${ARG5} ${ARG6} ${ARG7})})
 exten => s-BUSY,n,		Playback(beep)
--- a/voice-client/files/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE
@@ -1,2 +1,2 @@
-#exec echo "register => |TRANSPORT|://|USER|@|DOMAIN|:$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|"
+#exec echo 'register => |TRANSPORT|://|USER|@|DOMAIN|:'$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)'|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|'

--- a/voice-client/files/etc/config/voice_client
+++ b/voice-client/files/etc/config/voice_client
@@ -8,6 +8,7 @@ config 'brcm_line' 'brcm0'
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
+	option 'jitter_fixed' '50'

 config 'brcm_line' 'brcm1'
 	option 'extension' '1111'
@@ -19,6 +20,7 @@ config 'brcm_line' 'brcm1'
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
+	option 'jitter_fixed' '50'

 config 'brcm_line' 'brcm2'
 	option 'extension' '2222'
@@ -30,6 +32,7 @@ config 'brcm_line' 'brcm2'
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
+	option 'jitter_fixed' '50'

 config 'brcm_line' 'brcm3'
 	option 'extension' '3333'
@@ -41,6 +44,7 @@ config 'brcm_line' 'brcm3'
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
+	option 'jitter_fixed' '50'

 config 'brcm_line' 'brcm4'
 	option 'extension' '4444'
@@ -52,6 +56,7 @@ config 'brcm_line' 'brcm4'
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
+	option 'jitter_fixed' '50'

 config 'brcm_line' 'brcm5'
 	option 'extension' '5555'
@@ -63,6 +68,7 @@ config 'brcm_line' 'brcm5'
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
+	option 'jitter_fixed' '50'

 config 'brcm_line' 'brcm6'
 	option 'extension' '6666'
@@ -74,6 +80,7 @@ config 'brcm_line' 'brcm6'
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
+	option 'jitter_fixed' '50'

 config 'brcm_line' 'brcm7'
 	option 'extension' '7777'
@@ -85,6 +92,7 @@ config 'brcm_line' 'brcm7'
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
+	option 'jitter_fixed' '50'

 config 'dialplan' 'custom_dialplan'
 	option 'custom_outgoing_enabled' '0'
@@ -162,8 +170,15 @@ config 'sip_service_provider' 'sip0'
 	option 'cfim_off' '#21#'
 	option 'cfbs_on' '*61*'
 	option 'cfbs_off' '#61#'
+	option cw_on '*43#' 
+	option cw_off '#43#' 
+	option cw_status '*#43#'
 	option 'call_return' '*69'
 	option 'redial' '*66'
+	option cbbs_key '5' 
+	option cbbs_maxretry '5'
+	option cbbs_retrytime '20'
+	option cbbs_waittime '30'
 	option 'is_fax' '0'
 	option 'transport' 'udp'

--- a/voice-client/files/etc/init.d/voice_client
+++ b/voice-client/files/etc/init.d/voice_client
@@ -721,6 +721,10 @@ configure_sip_provider()
 	config_get transport $1 transport
 	config_get encryption $1 encryption

+	# This is a hack to fix security issue #14962
+	user=${user//"'"/}
+	authuser=${authuser//"'"/}
+
 	if [ -z "$transport" ] ; then 
 		transport="udp" 
 	fi
@@ -1440,7 +1444,7 @@ configure_extensions()
 	
 	if [ -n "$record_message_extension" ] ; then
 		echo "exten => $record_message_extension,1,Playback(beep)"		>> $WORKDIR/extensions_local.tmp
-		echo "exten => $record_message_extension,n,Record(\"/usr/lib/asterisk/recordings/user-recording\${STRFTIME(\${EPOCH},,%C%y%m%d-%T)}.gsm)"	>> $WORKDIR/extensions_local.tmp
+		echo "exten => $record_message_extension,n,Record(\"/usr/lib/asterisk/recordings/user-recording\${STRFTIME(\${EPOCH},,%C%y%m%d-%T)}.gsm\")"	>> $WORKDIR/extensions_local.tmp
 		echo "exten => $record_message_extension,n,Playback(auth-thankyou)"	>> $WORKDIR/extensions_local.tmp
 		echo "exten => $record_message_extension,n,Hangup()"			>> $WORKDIR/extensions_local.tmp
 	fi
@@ -1653,11 +1657,15 @@ configure_extensions_provider()
 	config_get call_queue $1 call_queue
 	config_get call_ivr $1 call_ivr
 	if [ -n "$incoming_lines" ]; then
-		echo "exten => $user,n,Dial($incoming_lines,$(get_voicemail_timeout),tF(hangup,h,2))" >>		$tmp
-		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"ANSWER\"]?endcall)" >>		$tmp
-		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"BUSY\"]?noanswer)" >>		$tmp
-		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"NOANSWER\"]?noanswer:endcall)" >>	$tmp
-		echo "exten => $user,n(noanswer),Macro(callhandler-noanswer,\${CHANNEL(peername)})" >>	$tmp
+	        echo "exten => $user,n,GotoIf(\${DB_EXISTS(CFBS/$1)}?cfbs)"         >> $tmp
+		echo "exten => $user,n,Dial($incoming_lines,$(get_voicemail_timeout),tF(hangup,h,2))"  >> $tmp
+		echo "exten => $user,n,Goto($user,nocfbs)"                                             >> $tmp
+		echo "exten => $user,n(cfbs),Dial($incoming_lines,20,tF(hangup,h,2))"                  >> $tmp
+		echo "exten => $user,n(nocfbs),NoOp()"                                                 >> $tmp
+		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"ANSWER\"]?endcall)"               >> $tmp
+		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"BUSY\"]?noanswer)"                >> $tmp
+		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"NOANSWER\"]?noanswer:endcall)"    >> $tmp
+		echo "exten => $user,n(noanswer),Macro(callhandler-noanswer,\${CHANNEL(peername)})"    >> $tmp
 		
 		# check for mailbox
 		config_get mailbox $1 mailbox
--- a/voice-client/files/etc/uci-defaults/99-voice_client
+++ b/voice-client/files/etc/uci-defaults/99-voice_client
@@ -9,7 +9,6 @@ uci -q batch <<-EOT
 	set voice_client.call_filter0.block_special_rate=0
 	set voice_client.call_filter0.block_outgoing=0
 	set voice_client.call_filter0.block_incoming=0
-	commit voice_client
 EOT

 }
@@ -22,7 +21,6 @@ uci -q batch <<-EOT
 	set voice_client.RINGING_STATUS.status=0
 	set voice_client.RINGING_STATUS.enabled=0
 	set voice_client.RINGING_STATUS.shouldring=1
-	commit voice_client
 EOT

 }
@@ -35,5 +33,39 @@ uci -q batch <<-EOT
        commit firewall
 EOT

+
+# Workaround for devices with optional external Dect. For
+# boards where the Dect HW has been left out in factory,
+# we need to delete the brcm channels in UCI to prevent
+# them from showing up in the phone GUI.
+ulBoardStuffOption=$(tr -d "\x20\x0a" </proc/nvram/ulBoardStuffOption | tr -s "\x30")
+if test "$ulBoardStuffOption" = "0" -a -x "/usr/sbin/dectmngr2"; then
+	/etc/init.d/dect disable
+
+	db -q batch <<-EOT
+		set hw.board.hasDect=0
+		commit hw.board
+	EOT
+
+	uci -q batch <<-EOT
+		delete voice_client.brcm0
+		delete voice_client.brcm1
+		delete voice_client.brcm2
+		delete voice_client.brcm3
+	EOT
+fi
+
+
+# Add a small jitter buffer in Broadcom DSP for all voice
+# lines to compensate for chopping audio in some boards.
+for brcm in $(db get hw.board.VoicePortOrder); do
+	uci -q get voice_client.${brcm}.jitter_fixed >/dev/null ||
+		uci -q add_list voice_client.${brcm}.jitter_fixed=50
+done
+
+
+# Common UCI commit at the end to save CPU resources.
+uci -q commit voice_client
+
 exit 0

--- a/voicesec/Makefile
+++ b/voicesec/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=voicesec
 PKG_VERSION:=1.0

-PKG_SOURCE_URL:=git@private.inteno.se:voicesec
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/voicesec.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=661c0091e579e284712aeed892e921cc84a6f0bb
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)