Fixed a typo. A double quotes was missing.

That will make the call be forwarded after 20 seconds.
When CFBS is not enabled will the incoming call continue to to ring.

Ref: #15812

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:=13da1568d57b8e6732dadc16de828d64c81906b8
+PKG_SOURCE_VERSION:=930b8908a0159cfdef9d5c8861791db176dad7f5
 PKG_NAME:=dectmngr2
 
 

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)

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:=RC7
-PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+BASE_PKG_VERSION:=5.1.8
+PKG_RELEASE:=
+PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)-$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=11a77f1e9ccc0d591ca69aeab9663e9ec4727b08
+PKG_SOURCE_VERSION:=e5e10ba87b5caa6f2f8e48ce5dde6b038b5f8a82
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

ice-client/files/ice-client.uci_default

@@ -2,13 +2,14 @@
 
 grep -rq "^ice:" /etc/passwd || {
 	adduser -D -H -s /bin/false ice
-	uci -q delete passwords.ice
-	uci -q set passwords.ice=usertype
-	uci -q set passwords.ice.password="\$WPAKEY"
-	uci -q add_list passwords.ice._access_r=root
-	uci -q commit passwords
 }
 
+uci -q delete passwords.ice
+uci -q set passwords.ice=usertype
+uci -q set passwords.ice.password="\$WPAKEY"
+uci -q add_list passwords.ice._access_r=root
+uci -q commit passwords
+
 uci show rpcd | grep username=.*ice.* >/dev/null || {
 cat >> /etc/config/rpcd << EOF
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2017-09-28
+PKG_VERSION:=3.0-2018-03-01
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fd932429d3a656fccabcda934932d008dae6e526
+PKG_SOURCE_VERSION:=b6dd7391f245a311663d2a34a44dbd37dbce89e4
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -66,6 +66,10 @@ define Build/Prepare
 endef
 endif
 
+ifeq ($(CONFIG_TARGET_IBOARDID),"EX400")
+TARGET_CFLAGS += -DEX400
+endif
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 

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

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

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

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

@@ -181,6 +181,8 @@ populate_netmodes() {
 
 switch_netmode() {
 	[ -f /etc/config/netmode -a -d $modedir ] || return
+
+	local netreload="$1"
 	local curmode conf repeaterready old_mode
 
 	config_load netmode
@@ -237,7 +239,12 @@ switch_netmode() {
 				ubus call uci commit '{"config":"network"}'
 			;;
 			repeater*)
-				[ -f /etc/init.d/omcproxy ] && /etc/init.d/omcproxy stop
+				if [ -f /etc/init.d/omcproxy ]; then
+					/etc/init.d/omcproxy stop
+				fi
+				if [ "$netreload" != "0" ]; then
+					ubus call uci commit '{"config":"network"}'
+				fi
 			;;
 		esac
 	else
@@ -298,7 +305,7 @@ start_service() {
 }
 
 reload_service() {
-        switch_netmode
+        switch_netmode "$1"
 
 	# set default JUCI page to overview
 	uci -q set juci.juci.homepage="overview"

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

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

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

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

inteno-netmodes/files/etc/netmodes/routed_mtk/omcproxy

@@ -0,0 +1,10 @@
+config proxy
+	option scope global
+	option uplink wan
+	list downlink lan
+
+config proxy
+	option scope global
+	option uplink wan6
+	list downlink lan
+

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"
 

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

@@ -15,7 +15,6 @@ get_if_creds() {
 		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

iop/configs/config

@@ -72,6 +72,7 @@ CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-owsd=y
+CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-samba=y
@@ -95,6 +96,7 @@ CONFIG_PACKAGE_libdaemon=y
 CONFIG_PACKAGE_libffmpeg-mini=y
 CONFIG_PACKAGE_libgmp=y
 CONFIG_PACKAGE_libreadline=y
+CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_minidlna=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mtd-utils=y
@@ -110,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
@@ -172,6 +174,7 @@ CONFIG_BUSYBOX_CONFIG_LSMOD=y
 CONFIG_BUSYBOX_CONFIG_LSPCI=y
 CONFIG_BUSYBOX_CONFIG_LSUSB=y
 CONFIG_BUSYBOX_CONFIG_MICROCOM=y
+CONFIG_BUSYBOX_CONFIG_MPSTAT=y
 CONFIG_BUSYBOX_CONFIG_RMMOD=y
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y

iop/iop.completion

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

iop/scripts/extract_core.sh

@@ -6,15 +6,12 @@ function extract_core {
 	topdir=$(pwd)
 
 	# Paths to packages that should be exported.
-	paths+='package/network/services/samba36 '
+	paths+='package/network/services/base-files '
 	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/system/procd '
 	paths+='package/utils/busybox '
 
 	function print_usage {

iop/scripts/genconfig.sh

@@ -14,8 +14,8 @@ function genconfig {
 	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"
-	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"
@@ -193,9 +193,18 @@ function genconfig {
 		if [ $target == "bogus" ]; then
 			echo "Hardware profile does not exist"
 			exit 1
-		elif [ -n "$CUSTOMER" -a ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
-			echo "Customer profile does not exist"
-			exit 1
+		elif [ -n "$CUSTOMER" ]; then
+			if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
+				echo "Customer profile for '$CUSTOMER' does not exist"
+				exit 1
+			elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
+				echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
+				if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+					echo "Common profile configuration will be used"
+				else
+					exit 1
+				fi
+			fi
 		fi
 
 		# Generate base config

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"

iup/files/sbin/iup

@@ -458,33 +458,44 @@ 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"
+					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"
+						return 0
+					fi
+				done
 			fi
-		done
+		fi
 
 		v "Waiting for default gateway or name server. Countdown $wait_time seconds"
 		sleep $wait_interval
@@ -517,7 +528,12 @@ 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
@@ -533,7 +549,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

layer2interface/broadcom/etc/hotplug.d/switch/10-switch

@@ -1,5 +1,11 @@
 . /lib/network/config.sh
 
+# FIX: for EG300 WAN port for release 3.13.1 - 4.x
+if [ "$INTERFACE" == "eth2" ]; then
+	touch /var/update.eth2
+fi
+# end FIX
+
 addif() {
 	# check if wan had a event and start all related services
 	wan=`uci -q get layer2_interface_ethernet.Wan.baseifname`

layer2interface/broadcom/etc/init.d/layer2_interface

@@ -102,6 +102,10 @@ start_service() {
 		xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM --sra $sra --bitswap $bitswap
 	fi
 
+	if [ "$GFast" == "f" ]; then
+		# enable V43 tone set for GFAST
+		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x400000 0x400000
+	fi
 }
 
 

layer2interface/broadcom/etc/init.d/layer2_interface_ethernet

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

layer2interface/broadcom/lib/network/brcmwifi.sh

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

loop-detector/Makefile

@@ -0,0 +1,48 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=loop-detector
+PKG_VERSION:=1.0
+
+PKG_SOURCE_VERSION:=d0fb770eacd6691b98df138b60f5116e02f71a9b
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://public.inteno.se:/loop-detector
+
+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/loop-detector
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=L2 Loop detector
+  DEPENDS:= +libpcap +libuci +libpthread
+endef
+
+define Package/loop-detector/description
+	L2 Loop detection package
+endef
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE
+
+TARGET_LDFLAGS += \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+CONFIGURE_ARGS += \
+	--with-uci-include-path=$(STAGING_DIR)/usr/include \
+	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
+	--with-libubus-include-path=$(STAGING_DIR)/usr/include
+
+define Package/loop-detector/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/loop-detector $(1)/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) ./files/loop_detection.init $(1)/etc/init.d/loop_detection
+	$(INSTALL_DIR) $(1)/etc/config
+	$(CP) ./files/loop_detection.config $(1)/etc/config/loop_detection
+endef
+
+$(eval $(call BuildPackage,loop-detector))

loop-detector/files/loop_detection.config

@@ -0,0 +1,5 @@
+config loop-detect loop
+	option enabled '1'
+	option discovery_interval '10'
+	option recovery_check_tries '5'
+

loop-detector/files/loop_detection.init

@@ -0,0 +1,36 @@
+#!/bin/sh /etc/rc.common
+
+START=21
+STOP=89
+
+USE_PROCD=1
+NAME=loop-detector
+
+start_service() {
+	local enabled
+
+	config_load loop_detection
+	config_get_bool enabled loop enabled 1
+
+	if [ $enabled -eq 1 ]; then
+		procd_open_instance
+		procd_set_param command "/sbin/loop-detector"
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}
+
+stop() {
+	service_stop /sbin/loop-detector
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger loop_detection
+}
+
+reload_service() {
+	stop
+	start
+}
+

mtk-bndstrg/Makefile

@@ -5,7 +5,7 @@ PKG_NAME:=mtk-bndstrg
 PKG_VERSION:=1.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=e5264d8da2a6de30c2e4e100dfee4dc5db0b59d0
+PKG_SOURCE_VERSION:=a67f5ccdf9bc6810f15f1ece9edaad5e89cad0f7
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/mtk-bndstrg
 

peripheral_manager/Makefile

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

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.1.38
+PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=7964428754135891ce3a88c0ad6f8c44033dfb0e
+PKG_SOURCE_VERSION:=c144da9301d4110140ddd1e054852543dca67dcd
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

questd/files/etc/init.d/quest

@@ -20,11 +20,6 @@ start_service() {
 	pidof imonitor > /dev/null 2>&1 || /sbin/imonitor &
 }
 
-stop() {
-	service_stop /sbin/questd
-	service_stop /sbin/graphd
-}
-
 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
+}

questd/files/sbin/imonitor

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 . /lib/functions.sh
+. /usr/share/libubox/jshn.sh
 
 # 1. sleep for $SLEEP_LONG seconds
 # 2. run the check_* functions
@@ -22,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
 
@@ -31,27 +32,36 @@ PCPU_LIMIT=38
 PCPU_COUNT=4
 PCPU_NFAIL=0
 
+# network call check
+NNET_NFAIL=0
+
 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"
+	logger -s -t $0[$$] "Restarting questd. $NPROC_NFAIL $MEM_NFAIL $PCPU_NFAIL $NNET_NFAIL"
 
-	killall -q -KILL questd
 	/etc/init.d/quest stop
 	killall -q -KILL questd
 	/etc/init.d/quest start
 
+	sleep 5
+
 	NPROC_NFAIL=0
 	MEM_NFAIL=0
 	PCPU_NFAIL=0
+	NNET_NFAIL=0
 }
 
-
 check_nproc()
 {
 	local nproc="$@"
@@ -110,21 +120,52 @@ check_pcpu()
 
 check_ubuscall()
 {
-	local rv
+		local rv
 
-	ubus -t $UBUS_TIMEOUT call router.system info >/dev/null 2>&1
-	rv=$?
+		ubus -t $UBUS_TIMEOUT call router.system info >/dev/null 2>&1
+		rv=$?
 
-	[ "$rv" = "0" ] && return 0
-	return 1
+		[ "$rv" = "0" ] && return 0
+		return 1
 }
 
+check_ubus_network_call() {
+	[ "$(uci -q get network.lan)" == "interface" ] || return 0
+	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
+	}
+	return 0
+}
 
 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()
@@ -141,9 +182,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()
@@ -155,7 +206,7 @@ check_acsd()
 
 	for p in $pcpu; do
 		p=${p%%%*}
-		if [ "$p" -ge "20" ]; then
+		if [ "$p" -ge "40" ]; then
 			return 1
 		fi
 	done
@@ -193,21 +244,23 @@ main()
 			"$restart_mem"   = "1" -o \
 			"$restart_pcpu"  = "1" ]
 		then
-			# check_ubuscall || restart_questd
 			restart_questd
-		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
+		else
+			if [ "$sample" -ge "$SAMPLES" ]; then
+				check_ubus_network_call || restart_questd
 			fi
 		fi
 
-		if [ "$ACSDBIN" ] ; then
-			check_acsd || restart_acsd
-		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
 
 		# sleep
 		if [ "$sample" -lt "$SAMPLES" ]; then

samba2/Makefile

@@ -55,11 +55,14 @@ define Package/samba2-client
 endef
 
 TARGET_CFLAGS += $(FPIC)
+WERR := -Werror=format-security
+TARGET_CFLAGS_WITHOUT_WERR := $(filter-out $(WERR),$(TARGET_CFLAGS))
 
 define Build/Compile	
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	(cd $(PKG_BUILD_DIR)/source ; rm -rf config.{cache,status} ; \
+		CFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE" \
 		./configure \
 			$(HOST_CONFIGURE_VARS) \
 			$(HOST_CONFIGURE_ARGS) \
@@ -93,7 +96,7 @@ define Build/Compile
 		clean
 	(cd $(PKG_BUILD_DIR)/source; rm -rf config.{cache,status}; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64" \
+		CFLAGS="$(TARGET_CFLAGS_WITHOUT_WERR) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288" \
 		CPPFLAGS="$(TARGET_CPPFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(LIBGCC_S)" \
 		ac_cv_lib_cups_httpConnect=no \

samba3/patches/520-fix_samba3_compilation_error

@@ -0,0 +1,40 @@
+--- a/source/utils/owrt_smbpasswd.c	2017-10-03 15:57:24.190827000 +0100
++++ a/source/utils/owrt_smbpasswd.c	2017-10-03 16:07:54.862857000 +0100
+@@ -108,7 +108,7 @@
+ 		}
+ 	}
+ 
+-	fprintf(fp, line);
++	fprintf(fp, "%s", line);
+ 
+ out:
+ 	if(fp)
+@@ -134,20 +134,20 @@
+ 			p = strchr(t, ':');
+ 			if(p && (p - t == strlen(user)) && (strncmp(t, user, strlen(user))) == 0)
+ 			{
+-				fpos_t r_pos, w_pos;
++				long int r_pos, w_pos;
+ 				char t2[256];
+-				fgetpos(fp, &r_pos);
++				r_pos = ftell(fp);
+ 				w_pos = r_pos;
+-				w_pos.__pos -= strlen(t);
++				w_pos -= strlen(t);
+ 				while(fgets(t2, 256, fp))
+ 				{
+-					fsetpos(fp, &w_pos);
++					fseek(fp, w_pos, SEEK_SET);
+ 					fputs(t2, fp);
+-					r_pos.__pos += strlen(t2);
+-					w_pos.__pos += strlen(t2);
+-					fsetpos(fp, &r_pos);
++					r_pos += strlen(t2);
++					w_pos += strlen(t2);
++					fseek(fp, r_pos, SEEK_SET);
+ 				}
+-				ftruncate(fileno(fp), w_pos.__pos);
++				ftruncate(fileno(fp), w_pos);
+ 				break;
+ 			}
+ 		}

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'
 

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

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)

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|'
 

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

@@ -68,6 +68,7 @@ TMPL_ASTERISK=$TEMPLATEDIR/asterisk.conf.TEMPLATE
 TMPL_CDR=$TEMPLATEDIR/cdr.conf.TEMPLATE
 TMPL_CDR_SYSLOG=$TEMPLATEDIR/cdr_syslog.conf.TEMPLATE
 TMPL_INDICATIONS=$TEMPLATEDIR/indications.conf.TEMPLATE
+TMPL_CEL=$TEMPLATEDIR/cel.conf.TEMPLATE
 TMPL_LOGGER=$TEMPLATEDIR/logger.conf.TEMPLATE
 TMPL_MANAGER=$TEMPLATEDIR/manager.conf.TEMPLATE
 TMPL_MODULES=$TEMPLATEDIR/modules.conf.TEMPLATE
@@ -80,7 +81,7 @@ TMPL_BRCM_LINE=$TEMPLATEDIR/brcm_line.TEMPLATE
 
 TMPL_MEETME=$TEMPLATEDIR/meetme.conf.TEMPLATE
 
-SPECRATEDIR=$ASTERISKDIR/special_rate_nr.cfg
+SPECRATECFG=$ASTERISKDIR/special_rate_nr.cfg
 
 run_hook()
 {
@@ -97,13 +98,13 @@ escape_sed_substitution()
 # Gets rid of any config files from $ASTERISKDIR not found in $WORKDIR.
 clean_up_asterisk_config_dir()
 {
-        for f in $ASTERISKDIR/* ; do
-                basef="`basename $f`"
-                if [ ! -e "$WORKDIR/$basef" ] ; then
-                        rm -rf "$f"
+	for f in $ASTERISKDIR/* ; do
+		basef="`basename $f`"
+		if [ ! -e "$WORKDIR/$basef" ] ; then
+			rm -rf "$f"
 			echo "$f" >> /tmp/voice.log
-                fi
-        done
+		fi
+	done
 }
 
 # Compares md5sums of the config files in $WORKDIR to those
@@ -113,7 +114,7 @@ compare_configs_and_copy_changed()
 {
 	# First, compute md5sums of the config files in $WORKDIR.
 	cd $WORKDIR/
-	md5sum * > $MD5SUMSFILE
+	md5sum * > $MD5SUMSFILE 2>/dev/null
 
 	# Now, check the files in $ASTERISKDIR against the md5sums.
 	cd $ASTERISKDIR/
@@ -141,15 +142,15 @@ assemble_and_copy_config()
 	# start if a config item is missing and an included config file isn't created.
 
 	# Copy the template files which we don't edit.
-	cp $TMPL_ASTERISK		$WORKDIR/asterisk.conf
-	cp $TMPL_CDR			$WORKDIR/cdr.conf
-	cp $TMPL_CEL			$WORKDIR/cel.conf
-	cp $TMPL_INDICATIONS		$WORKDIR/indications.conf
-	cp $TMPL_MANAGER		$WORKDIR/manager.conf
-	cp $TMPL_MODULES		$WORKDIR/modules.conf
-	cp $TMPL_EXTENSIONS_MACRO	$WORKDIR/extensions_macro.conf
-	cp $TMPL_MUSICONHOLD		$WORKDIR/musiconhold.conf
-	cp $SPECRATEDIR                 $WORKDIR/special_rate_nr.cfg
+	[ -f $TMPL_ASTERISK ]		&& cp $TMPL_ASTERISK		$WORKDIR/asterisk.conf
+	[ -f $TMPL_CDR ]		&& cp $TMPL_CDR			$WORKDIR/cdr.conf
+	[ -f $TMPL_CEL ]		&& cp $TMPL_CEL			$WORKDIR/cel.conf
+	[ -f $TMPL_INDICATIONS ]	&& cp $TMPL_INDICATIONS		$WORKDIR/indications.conf
+	[ -f $TMPL_MANAGER ]		&& cp $TMPL_MANAGER		$WORKDIR/manager.conf
+	[ -f $TMPL_MODULES ]		&& cp $TMPL_MODULES		$WORKDIR/modules.conf
+	[ -f $TMPL_EXTENSIONS_MACRO ]	&& cp $TMPL_EXTENSIONS_MACRO	$WORKDIR/extensions_macro.conf
+	[ -f $TMPL_MUSICONHOLD ]	&& cp $TMPL_MUSICONHOLD		$WORKDIR/musiconhold.conf
+	[ -f $SPECRATECFG ]		&& cp $SPECRATECFG		$WORKDIR/special_rate_nr.cfg
 	
 	test -e $TMPL_MEETME && cp $TMPL_MEETME $WORKDIR/meetme.conf
 	
@@ -178,7 +179,7 @@ assemble_and_copy_config()
 	mv $WORKDIR/features.tmp		$WORKDIR/features.conf
 	mv $WORKDIR/voicemail.tmp		$WORKDIR/voicemail.conf
 	mv $WORKDIR/meetme.tmp			$WORKDIR/meetme.conf
-        mv $WORKDIR/logger.tmp			$WORKDIR/logger.conf
+	mv $WORKDIR/logger.tmp			$WORKDIR/logger.conf
 	mv $WORKDIR/queues.tmp			$WORKDIR/queues.conf
 	mv $WORKDIR/dnsmgr.tmp			$WORKDIR/dnsmgr.conf
 
@@ -467,13 +468,13 @@ configure_sip()
 	if [ -z "$registertimeoutbackoff" ] ; then
 		sed -i "s/registertimeoutbackoff=|REGISTERTIMEOUTBACKOFF|/;registertimeoutbackoff=/g"    $WORKDIR/sip.tmp
 	else
-		sed -i "s/|REGISTERTIMEOUTBACKOFF|/$registertimeoutbackoff/g"                             $WORKDIR/sip.tmp
+		sed -i "s/|REGISTERTIMEOUTBACKOFF|/$registertimeoutbackoff/g"			     $WORKDIR/sip.tmp
 	fi
 
 	if [ -z "$registerattemptsbackoff" ] ; then
 		sed -i "s/registerattemptsbackoff=|REGISTERATTEMPTSBACKOFF|/;registerattemptsbackoff=/g"  $WORKDIR/sip.tmp
 	else
-		sed -i "s/|REGISTERATTEMPTSBACKOFF|/$registerattemptsbackoff/g"                           $WORKDIR/sip.tmp
+		sed -i "s/|REGISTERATTEMPTSBACKOFF|/$registerattemptsbackoff/g"			   $WORKDIR/sip.tmp
 	fi
 
 	if [ -z "$register403timeout" ] ; then
@@ -542,7 +543,7 @@ configure_sip()
 	for section in ${CONFIG_SECTIONS}; do
 		local transport
 		config_get cfgtype "$section" TYPE
-	        [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
+		[ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
 		config_get transport $section transport
 		if [ "$transport" == "tls" ] ; then
 			tlsenable="yes"
@@ -720,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
@@ -804,7 +809,7 @@ configure_sip_provider()
 	fi
 	sed -i "s/|AUTOFRAMING|/$autoframing/"			$WORKDIR/sip_provider.tmp
 
-	# Set registered extension so that incoming calls match the correct peer                     
+	# Set registered extension so that incoming calls match the correct peer
 	sed -i "s/|CONTACT_USER|/$user/g"      $WORKDIR/sip_provider.tmp
 
 	# Add SIP Provider configuration to the temp file containing all SIP Provider configs.
@@ -1035,7 +1040,7 @@ configure_queue()
 	echo "[macro-$1]" >>					$WORKDIR/macros.tmp
 	echo "exten => s,1,Answer()" >>				$WORKDIR/macros.tmp
 
-        # Workaround to fix no ringback issue for incoming SIP calls
+	# Workaround to fix no ringback issue for incoming SIP calls
 	echo "exten => s,n,Playback(silence/1)" >>		$WORKDIR/macros.tmp
 
 	echo "exten => s,n,Queue($1,R)" >>			$WORKDIR/macros.tmp
@@ -1127,13 +1132,13 @@ configure_cdr()
 
 	echo "cdr_syslog: $cdr_syslog"
 
-        if [ -z "$cdr_syslog" ] ; then
+	if [ -z "$cdr_syslog" ] ; then
 	    cdr_syslog='0'
 	fi
 
 	# Enable/disable CDR logging in syslog
 	if [ "$cdr_syslog" == "1" ] ; then
-            cp $TMPL_CDR_SYSLOG		        $WORKDIR/cdr_syslog.conf
+	    cp $TMPL_CDR_SYSLOG			$WORKDIR/cdr_syslog.conf
 	fi
 }
 
@@ -1188,27 +1193,28 @@ configure_call_filters()
 	echo "exten => s,n(not-foreign),Set(FOREIGN=0)" >>	$WORKDIR/macros.tmp
 	echo "" >>						$WORKDIR/macros.tmp
 
-
 	# Get special rate numbers from /etc/asterisk/special_rate_nr.cfg
-	while read line
-	do
-	    i=0
-	    for v in $(echo $line | tr ";" "\n")
+	if [ -f $SPECRATECFG ]; then
+		while read line
 		do
-			if [ "$i" -eq "0" -a "$v" != "$country" ] ; then
-				continue 2
-			fi
-			if [ "$i" -eq "1" ] ; then
-				srn=$v
-			fi
-			i=$((i+1))
-		done
+		    i=0
+		    for v in $(echo $line | tr ";" "\n")
+			do
+				if [ "$i" -eq "0" -a "$v" != "$country" ] ; then
+					continue 2
+				fi
+				if [ "$i" -eq "1" ] ; then
+					srn=$v
+				fi
+				i=$((i+1))
+			done
 
-		if [ -n "$srn"  ] ; then
-			# Special rate numbers found
-			break
-		fi
-	done < "/etc/asterisk/special_rate_nr.cfg"
+			if [ -n "$srn"  ] ; then
+				# Special rate numbers found
+				break
+			fi
+		done < $SPECRATECFG
+	fi
 
 	echo "Found special rate numbers: $srn"
 
@@ -1327,8 +1333,8 @@ get_call_filter()
 	macro="NoOp()"
 	
 	if ! [ "x$direction" != "xincoming" -o "x$direction" != "xoutgoing" ] ; then
-                echo $macro
-        fi
+		echo $macro
+	fi
 
 	local call_filter enabled
 	config_get call_filter $provider call_filter "call_filter0"
@@ -1353,20 +1359,20 @@ configure_opening_hours_profile()
 	local section cfgtype
 	[ -z "$CONFIG_SECTIONS" ] && return 0
 	for section in ${CONFIG_SECTIONS}; do
-	        config_get cfgtype "$section" TYPE
-	        [ -n "timespan" -a "x$cfgtype" != "xtimespan" ] && continue
-	        local owner
+		config_get cfgtype "$section" TYPE
+		[ -n "timespan" -a "x$cfgtype" != "xtimespan" ] && continue
+		local owner
 	
-	        config_get owner $section owner
-	        if [ "$owner" == "$1" ] ; then
-	                local tr dow dom months
-	                config_get tr $section time_range
-	                config_get dow $section days_of_week
-	                config_get dom $section days_of_month
-	                config_get months $section months
+		config_get owner $section owner
+		if [ "$owner" == "$1" ] ; then
+			local tr dow dom months
+			config_get tr $section time_range
+			config_get dow $section days_of_week
+			config_get dom $section days_of_month
+			config_get months $section months
 	
-	                echo "exten => s,n,GotoIfTime($tr,$dow,$dom,$months,?$label)" >> $WORKDIR/macros.tmp
-	        fi
+			echo "exten => s,n,GotoIfTime($tr,$dow,$dom,$months,?$label)" >> $WORKDIR/macros.tmp
+		fi
 	done
 	if [ "$invert" == "0" ] ; then
 		echo "exten => s,n,Goto(closed)" >>		$WORKDIR/macros.tmp
@@ -1438,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
@@ -1641,7 +1647,7 @@ configure_extensions_provider()
 	local call_ivr call_queue extension
 	echo "exten => $user,n,Set(__TRANSFER_CONTEXT=\${CHANNEL(peername)}-transfer)" >>	$tmp
 
-        # replace prefix '+' with '00'
+	# replace prefix '+' with '00'
 	echo "exten => $user,n,GotoIf($[\"\${CALLERID(NUM):0:1}\" = \"+\"]?rewrite:norewrite)" >>	$tmp
 	echo "exten => $user,n(rewrite),Set(CALLERID(num)=\"00\${CALLERID(num):1}\"))" >>		$tmp
 	echo "exten => $user,n(norewrite),NoOp()">>							$tmp
@@ -1651,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
@@ -1704,7 +1714,7 @@ configure_brcm_line_extension()
 		echo "Configuring local extension $extension"
 
 		config_get cbbs_enabled "features" cbbs_enabled
-		# load cbbs settings if enabled                                                                                                                                             
+		# load cbbs settings if enabled
 		cbbs_key=""
 		cbbs_maxretry="0"
 		cbbs_retrytime="0"
@@ -1721,7 +1731,7 @@ configure_brcm_line_extension()
 		sed -i "s/|LINE|/$line/g"			$WORKDIR/extensions_local_line.tmp
 		sed -i "s/|TIMEOUT|/$(get_voicemail_timeout)/g"	$WORKDIR/extensions_local_line.tmp
 
-		#cbbs settings                                                                                                                                                              
+		#cbbs settings
 		sed -i "s/|CBBS_KEY|/$(escape_sed_substitution $cbbs_key)/"	$WORKDIR/extensions_local_line.tmp
 		sed -i "s/|MAX_RETRIES|/$cbbs_maxretry/"      			$WORKDIR/extensions_local_line.tmp
 		sed -i "s/|RETRYTIME|/$cbbs_retrytime/"				$WORKDIR/extensions_local_line.tmp
@@ -1998,8 +2008,8 @@ configure_conference()
 	echo "exten => $extension,n(enterno),Read(confno,,5)"			>> $WORKDIR/extensions_local.tmp
 	
 	for section in ${CONFIG_SECTIONS}; do
-                config_get cfgtype "$section" TYPE
-                [ "x$cfgtype" != "xconference_room" ] && continue
+		config_get cfgtype "$section" TYPE
+		[ "x$cfgtype" != "xconference_room" ] && continue
 
 		local name id enabled
 		config_get name $section name
@@ -2011,7 +2021,7 @@ configure_conference()
 		echo "Enabling conference room $id"
 		echo "exten => $extension,n,GotoIf($[\"\${confno}\"=\"$id\"]?enterconf)"	>> $WORKDIR/extensions_local.tmp
 		echo "conf => $id"								>> $WORKDIR/meetme.tmp
-        done
+	done
 
 	echo "exten => $extension,n,Playback(conf-invalid)"			>> $WORKDIR/extensions_local.tmp
 	echo "exten => $extension,n,Goto(enterno)"				>> $WORKDIR/extensions_local.tmp
@@ -2281,11 +2291,13 @@ reload_service() {
 	# if there is a registered account
 	ubus call led.voice1 set '{"state":"off"}'
 
+	asterisk -rx "config reload $ASTERISKDIR/sip.conf"
+	sleep 1
 	asterisk -rx "core reload"
 	asterisk -rx "dialplan reload"
 	asterisk -rx "brcm reload"
 }
 
 service_triggers() {
-        procd_add_reload_trigger voice_client
+	procd_add_reload_trigger voice_client
 }