questd: use same Makefile for both Broadcom and Mediatek targets

-------------------------------------------------------------------------------
* 08fb2b8 If image can not be booted from uboot reboot.
-------------------------------------------------------------------------------
commit 08fb2b839326c3bc2a2a0472b5dae6ee0288e483
Author: Kenneth Johansson <kenneth@southpole.se>
Date: 2017-03-21 17:30:56 +0100

    If image can not be booted from uboot reboot.

    Only allow 10 reboots to prevent infinite reboot and write to flash.

Base directory -> /
 board/inteno/ex400/iboot.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------

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:=015d279241d0ac5d8c1321aa6f78b9ae551575d1
+PKG_SOURCE_VERSION:=fd55c5dc4865142b7955ead96fe93b1ce888c37c
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x
 
@@ -455,6 +455,8 @@ define Package/asterisk18-mod/install
 	$(INSTALL_DATA)  ./files/asterisk.default $(1)/etc/default/asterisk
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN)  ./files/asterisk.init $(1)/etc/init.d/asterisk
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_BIN)  ./files/asterisk.hotplug $(1)/etc/hotplug.d/iface/80-asterisk
 endef
 
 define Package/asterisk18-mod-sounds/install

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

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

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

@@ -4,55 +4,14 @@ START=98
 STOP=10
 
 . /usr/share/libubox/jshn.sh
+. /lib/functions/network.sh
 USE_PROCD=1
 NAME=asterisk
 PROG=/usr/sbin/asterisk
 DEFAULT=/etc/default/asterisk
-
-get_ip(){
-	local ifname="$1"
-	local ifstatus="$(ifstatus "$ifname")"
-	local address
-	json_load "$ifstatus" || return
-	if json_select "ipv4-address"; then
-		if json_select 1; then
-			json_get_var address "address"
-			if [ "$address" != "" ]; then
-				echo "$address"
-				json_cleanup
-				return
-			fi
-			json_select ..
-		fi
-		json_select ..
-	fi
-	if json_select "ipv6-address"; then
-		if json_select 1; then
-			json_get_var address "address"
-			json_select ..
-		fi
-		json_select ..
-	fi
-	echo "$address"
-	json_cleanup
-}
+CONFDIR=/etc/asterisk
 
 init_asterisk() {
-	# do not start asterisk until the
-	# router receives a default route
-	config_load asterisk
-	local bindintf
-	config_get bindintf SIP bindintf
-	if [ "$bindintf" == ""  ]; then
-		while ! ip r | grep -q default; do
-			sleep 1
-		done
-	else
-		while [ "$(get_ip "$bindintf")" == "" ]; do
-			sleep 1
-		done
-	fi
-
 	[ -f $DEFAULT ] && . $DEFAULT
 	[ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
 	[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
@@ -80,6 +39,8 @@ start_service() {
 }
 
 reload_service() {
+	asterisk -rx "config reload $CONFDIR/sip.conf"
+	sleep 1
 	asterisk -rx "core reload"
 	asterisk -rx "dialplan reload"
 	asterisk -rx "brcm reload"

ated/Makefile

@@ -0,0 +1,67 @@
+#
+# Copyright (C) 2016 inteno
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ated
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@private.inteno.se:ated
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+# support parallel build
+#PKG_BUILD_PARALLEL:=1
+
+#re create configure scripts if not present.
+#PKG_FIXUP:=autoreconf
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ated
+	CATEGORY:=Utilities
+	TITLE:=Daemon for handling wifi calibration
+	URL:=
+	DEPENDS:= libc
+endef
+
+define Package/ated/description
+	Daemon for handling wifi calibration
+endef
+
+#TARGET_CFLAGS += -I$(LINUX_DIR)/include -I$(LINUX_DIR)/arch/mips/include
+
+MAKE_FLAGS += \
+	v=2 \
+	m=3
+
+
+#TARGET_CPPFLAGS := \
+#	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
+#	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
+#	$(TARGET_CPPFLAGS)
+
+# we donot wwant to have any install.
+define Build/Install/Default
+endef
+
+define Package/ated/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ated $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ated))

bashdb/Makefile

@@ -0,0 +1,62 @@
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bashdb
+PKG_VERSION:=4.4-0.92
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+#PKG_SOURCE_URL:=http://sourceforge.net/projects/bashdb/files/bashdb/$(PKG_VERSION)
+PKG_SOURCE_URL:=@SF/bashdb/
+PKG_MD5SUM:=b72c17870bfab2fd791b1f6de4d79f9e
+#PKG_CAT:=zcat
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Bash script debugging utility.
+  URL:=http://sourceforge.net/projects/bashdb/
+endef
+
+define Package/$(PKG_NAME)/description
+  Bash script debugging utility.
+endef
+
+define Build/Compile
+        $(MAKE) -C $(PKG_BUILD_DIR) \
+                $(TARGET_CONFIGURE_OPTS) \
+                CFLAGS="$(TARGET_CFLAGS) -DLINUX $(TARGET_CPPFLAGS) \
+                        -I./src" \
+                LIBS="$(TARGET_LDFLAGS)" \
+                DESTDIR="$(PKG_INSTALL_DIR)"
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bashdb $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/share
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.sh  $(1)/usr/share/$(PKG_NAME)/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.inc  $(1)/usr/share/$(PKG_NAME)/
+
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/init
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/init/*.sh  $(1)/usr/share/$(PKG_NAME)/init/
+
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/command
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/command/show_sub
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/command/set_sub
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/command/info_sub
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/command/*.sh $(1)/usr/share/$(PKG_NAME)/command/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/command/show_sub/*.sh $(1)/usr/share/$(PKG_NAME)/command/show_sub/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/command/set_sub/*.sh $(1)/usr/share/$(PKG_NAME)/command/set_sub/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/command/info_sub/*.sh $(1)/usr/share/$(PKG_NAME)/command/info_sub/
+
+	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/*.sh $(1)/usr/share/$(PKG_NAME)/lib/
+endef
+
+$(eval $(call BuildPackage,bashdb))

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:=e996241b776ad2aacfe4eb39d545c279c11f10a0
+PKG_SOURCE_VERSION:=17aa3b1d8d372ebcf4d37379f7cc4fb59c461d4b
 PKG_NAME:=dectmngr2
 
 

gigaset-elements/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gigaset-elements
 
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.4.2
 # PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
@@ -10,7 +10,7 @@ PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
 
 PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ec56d8652c75b1e014b27532345ce8b9e2650b4f
+PKG_SOURCE_VERSION:=aa906b37062b6d7937a9c0f8e7b62b32afe4bdeb
 
 
 PKG_MAINTAINER:=Magier Marcin, Figlarek Piotr
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gigaset-elements
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libjson-c +libcurl
+  DEPENDS:=+libjson-c +libcurl +libpthread
   TITLE:=Gigaset elements
 endef
 
@@ -39,7 +39,8 @@ endef
 
 
 define Package/gigaset-elements/install
-	$(CP) -r $(PKG_BUILD_DIR)/sysroot/* $(1)/
+	$(CP) -r $(PKG_BUILD_DIR)/sysroot_common/* $(1)/
+	$(CP) -r $(PKG_BUILD_DIR)/sysroot_$(CONFIG_ARCH)/* $(1)/
 endef
 
 

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:=4.0.1
-PKG_RELEASE:=RC17
+BASE_PKG_VERSION:=4.3.0
+PKG_RELEASE:=RC7
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=97a3da5fae8b5374a598c78346cb11477c85e293
+PKG_SOURCE_VERSION:=042e769eb37e0a2a7000b88e7f73e74f50ce52b7
 ifeq ($(CONFIG_ICE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
@@ -59,7 +59,6 @@ $(call Package/ice-client/Default)
 	TITLE:=ice-client
 	MENU:=1
 	DEPENDS:=+libopenssl +libstdcpp +libubus +ubus +ubusd +jshn +libubox +libpthread
-#	DEPENDS:=+libopenssl +uclibcxx +libubus +ubus +ubusd +jshn +libubox +libpthread
 endef
 
 define Package/ice-client/config
@@ -79,7 +78,7 @@ endef
 # PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
 # 
 #
-# These settings allow you to specify a soruce folder where your source code is located
+# These settings allow you to specify a source folder where your source code is located
 # This avoids having to tar-zip or fetch from git each time
 # Changes can be done in your sources while the build is performed somewhere else
 # If you forget some settings, your source folder will be deleted!!! So be carefull and 

ice-client/files/ice-client.uci_default

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

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2016-10-17
+PKG_VERSION:=3.0-2017-03-17
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=17ebb4478735b579cdf8e7405756093691605408
+PKG_SOURCE_VERSION:=ff91f29aef6aa366db9bfaad20783fef853509e4
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -34,7 +34,7 @@ define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl +libtrace
 endef
 
 define Package/icwmp/description

inbd/Makefile

@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2016 Inteno
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=inbd
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=2d474e9ff37b9cfcffd4b9ac8eba8db03eb38a21
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://public.inteno.se/inbd
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+# support parallel build
+PKG_BUILD_PARALLEL:=1
+
+#re create configure scripts if not present.
+PKG_FIXUP:=autoreconf
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/inbd
+	CATEGORY:=Utilities
+	TITLE:=Inteno Netlink Bridge Daemon
+	URL:=
+	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
+endef
+
+define Package/inbd/description
+	Application handling netlink messages from kernel and sending them out on ubus.
+endef
+
+define Package/inbd/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inbd $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/files/etc/init.d/inbd $(1)/etc/init.d/
+endef
+
+$(eval $(call BuildPackage,inbd))

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

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

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

@@ -0,0 +1,86 @@
+#!/bin/sh
+
+. /lib/functions.sh
+include /lib/network
+
+ps | grep hotplug | grep button && exit
+
+WANDEV="eth0.2"
+
+[ "$INTERFACE" != "$WANDEV" ] && exit
+
+defroute=$(ip route | grep default | awk '{print$3}')
+
+case "$(uci get netmode.setup.curmode)" in
+		repeater|repeater_dualdown)
+			echo "Preparing to switch mode"
+		;;
+		*)
+			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
+			exit
+		;;
+esac
+
+echo "0" > /sys/devices/virtual/net/br-wan/bridge/multicast_snooping
+
+get_wifi_wet_interface() {
+	handle_interface() {
+		config_get mode "$1" mode
+		if [ "$mode" == "sta" -o "$mode" == "wet" ] ; then
+			config_get ifname "$1" ifname
+			echo "$ifname"
+		fi
+	}
+	config_load wireless
+	config_foreach handle_interface wifi-iface "$device"
+}
+
+get_wifi_iface_cfgstr() {
+	get_cfgno() {
+		config_get ifname "$1" ifname
+		[ "$ifname" == "$2" ] && echo "wireless.$1"
+	}
+	config_load wireless
+	config_foreach get_cfgno wifi-iface $1 $2
+}
+
+link=$(swconfig dev switch0 port 0 get link | awk '{print$2}' | cut -d':' -f2)
+
+case "$ACTION" in
+	add|register)
+		[ "$link" == "down" ] && return
+		echo "Autoswitch to Extender mode" > /dev/console
+		sleep 2
+		wetif="$(get_wifi_wet_interface)"
+		# remove wifi client interface
+		case "$(uci get netmode.setup.curmode)" in
+			repeater*)
+				uci -q set $(get_wifi_iface_cfgstr $wetif).disabled=1
+			;;
+		esac
+		uci commit wireless
+		#add wan ethernet port
+		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
+		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
+	;;
+	remove|unregister)
+		[ "$link" == "up" ] && return
+		echo "Autoswitch to Repeater mode" > /dev/console
+		sleep 2
+		wetif="$(get_wifi_wet_interface)"
+		# add wifi client interface
+		case "$(uci get netmode.setup.curmode)" in
+			repeater*)
+				uci -q set $(get_wifi_iface_cfgstr $wetif).disabled=0
+			;;
+		esac
+		uci commit wireless
+		#remove wan ethernet port
+		uci set network.wan.ifname="$(echo $wetif $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$WANDEV //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
+		uci commit network
+		ubus call network reload
+		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
+	;;
+esac

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

@@ -69,6 +69,13 @@ populate_netmodes() {
 	local hardware=$(db get hw.board.hardware)
 	local keys lang desc exp exclude
 	for mode in $(ls $modedir); do
+
+			case "$mode" in
+				repeater*)
+					wlctl -i wl1 ap >/dev/null 2>&1 || ifconfig rai0 2>/dev/null | grep -q rai0 || continue
+				;;
+			esac
+
 			lang=""
 			desc=""
 			exp=""
@@ -80,11 +87,13 @@ populate_netmodes() {
 				exclude=0
 				_i=1
 				while json_get_var board $_i; do
-					if [ "$board" == "$hardware" ]; then
-						uci -q delete netmode.$mode
-						exclude=1
-						break
-					fi
+					case "$hardware" in
+						$board)
+							uci -q delete netmode.$mode
+							exclude=1
+							break
+						;;
+					esac
 					_i=$((_i+1))
 				done
 				json_select ..
@@ -128,12 +137,32 @@ populate_netmodes() {
 
 			json_get_var cred credentials
 			uci -q set netmode.$mode.askcred="$cred"
+			json_get_var ulb uplink_band
+			uci -q set netmode.$mode.uplink_band="$ulb"
 			json_get_var reboot reboot
 			uci -q set netmode.$mode.reboot="$reboot"
 	done
 	uci commit netmode
 }
 
+convert_macros() {
+	local BMAC=$(db -q get hw.board.BaseMacAddr | tr -d ':')
+	local MACLAN=$(printf "%0.12x\n" $((0x$BMAC)))
+	local MACWAN=$(printf "%0.12x\n" $((0x$BMAC + 1)))
+	local BSSID=$(printf "%0.12x\n" $((0x$BMAC + 2)))
+	local BSSID4=$(echo -n $BSSID | tail -c 4 | tr 'a-z' 'A-Z')
+
+	MACLAN=$(echo $MACLAN | sed -e "s/.\{2\}/&:/g")
+	MACWAN=$(echo $MACWAN | sed -e "s/.\{2\}/&:/g")
+
+	MACLAN=${MACLAN:0:17}
+	MACWAN=${MACWAN:0:17}
+
+	grep -q "\$MACLAN" /etc/config/network && sed -i "s/\$MACLAN/$MACLAN/g" /etc/config/network
+	grep -q "\$MACWAN" /etc/config/network && sed -i "s/\$MACWAN/$MACWAN/g" /etc/config/network
+	grep -q "\$BSSID4" /etc/config/network && sed -i "s/\$BSSID4/$BSSID4/g" /etc/config/network
+}
+
 switch_netmode() {
 	[ -f /etc/config/netmode -a -d $modedir ] || return
 
@@ -143,10 +172,27 @@ switch_netmode() {
 	config_get conf $curmode conf
 	cp /etc/netmodes/$conf/* /etc/config/
 	rm -f /etc/config/DETAILS
+	convert_macros
 	sync
+
+	case "$curmode" in
+		repeater|repeater_dualdown)
+			echo "0" > /sys/devices/virtual/net/br-wan/bridge/multicast_snooping
+		;;
+	esac
+
 	local reboot=$(uci -q get netmode.$curmode.reboot)
+	local askcred=$(uci -q get netmode.$curmode.askcred)
 	if [ "$reboot" == "0" ]; then
-		/etc/init.d/enviroment reload
+		#/etc/init.d/enviroment reload
+		if [ "$askcred" == "1" -a -f /tmp/wifi_imported_credentials ]; then
+			wifi import "$(cat /tmp/wifi_imported_credentials)"
+			rm -f /tmp/wifi_imported_credentials
+			ubus call network reload
+			wifi reload nodat
+			sleep 5
+			ubus call router.network reload
+		fi
 	else
 		reboot &
 	fi
@@ -158,6 +204,10 @@ start_service() {
 
 reload_service() {
         switch_netmode
+
+	# set default JUCI page to overview
+	uci -q set juci.juci.homepage="overview"
+	uci commit juci
 }
 
 service_triggers()

inteno-netmodes/files/etc/netmodes/bridged/DETAILS

@@ -10,7 +10,8 @@
 	"credentials" : 0,
 	"excluded_boards" : [
 		"CG300",
-		"CG301"
+		"CG301",
+		"EX400"
 	],
 	"acl" : [
 		"admin",

inteno-netmodes/files/etc/netmodes/bridged/firewall

@@ -1,3 +1,6 @@
+config settings 'settings'
+        option disabled '0'
+
 config defaults
 	option syn_flood	1
 	option input		ACCEPT

inteno-netmodes/files/etc/netmodes/bridged/layer2_interface_adsl

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

inteno-netmodes/files/etc/netmodes/bridged/layer2_interface_ethernet

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

inteno-netmodes/files/etc/netmodes/bridged/layer2_interface_vdsl

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

inteno-netmodes/files/etc/netmodes/bridged/layer2_interface_vlan

@@ -1,18 +0,0 @@
-
-
-config 'vlan_interface'
-	option name 'eth_tv'
-	option ifname '$WAN.100'
-	option baseifname '$WAN'
-	option vlan8021q '100'
-	option vlan8021p '0'
-	option bridge '1'
-
-config 'vlan_interface'
-	option name 'vdsl_tv'
-	option ifname 'ptm0.100'
-	option baseifname 'ptm0'
-	option vlan8021q '100'
-	option vlan8021p '0'
-	option bridge '1'
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/DETAILS

@@ -10,7 +10,8 @@
 	"credentials" : 0,
 	"excluded_boards" : [
 		"CG300",
-		"CG301"
+		"CG301",
+		"EX400"
 	],
 	"acl" : [
 		"admin",

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/firewall

@@ -1,3 +1,6 @@
+config settings 'settings'
+        option disabled '0'
+
 config defaults
 	option syn_flood	1
 	option input		ACCEPT

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/layer2_interface_adsl

@@ -1,34 +0,0 @@
-
-config atm_bridge
-        option link_type 'EoA'
-        option encapseoa 'llcsnap_eth'
-        option unit '0'
-        option ifname 'atm0.1'
-        option baseifname 'atm0'
-        option atmtype 'ubr'
-        option name 'atm_inet'
-        option vpi '8'
-        option vci '35'
-
-config atm_bridge
-        option link_type 'EoA'
-        option encapseoa 'llcsnap_eth'
-        option unit '1'
-        option ifname 'atm1.1'
-        option baseifname 'atm1'
-        option atmtype 'ubr'
-        option name 'atm_tv'
-        option vpi '8'
-        option vci '45'
-
-config atm_bridge
-        option link_type 'EoA'
-        option encapseoa 'llcsnap_eth'
-        option unit '1'
-        option ifname 'atm2.1'
-        option baseifname 'atm2'
-        option atmtype 'ubr'
-        option name 'atm_voip'
-        option vpi '8'
-        option vci '55'
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/layer2_interface_ethernet

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

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/layer2_interface_vdsl

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

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/layer2_interface_vlan

@@ -1,32 +0,0 @@
-
-
-config 'vlan_interface'
-	option name 'eth_tv'
-	option ifname '$WAN.100'
-	option baseifname '$WAN'
-	option vlan8021q '100'
-	option vlan8021p '0'
-	option bridge '1'
-
-config 'vlan_interface'
-	option name 'eth_voip'
-	option ifname '$WAN.200'
-	option baseifname '$WAN'
-	option vlan8021q '200'
-	option vlan8021p '0'
-
-config 'vlan_interface'
-	option name 'vdsl_tv'
-	option ifname 'ptm0.100'
-	option baseifname 'ptm0'
-	option vlan8021q '100'
-	option vlan8021p '0'
-	option bridge '1'
-
-config 'vlan_interface'
-	option name 'vdsl_voip'
-	option ifname 'ptm0.200'
-	option baseifname 'ptm0'
-	option vlan8021q '200'
-	option vlan8021p '0'
-

inteno-netmodes/files/etc/netmodes/repeater/DETAILS

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

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

@@ -1,3 +1,6 @@
+config settings 'settings'
+        option disabled '0'
+
 config defaults
 	option syn_flood	1
 	option input		ACCEPT
@@ -6,13 +9,6 @@ config defaults
 # Uncomment this line to disable ipv6 rules
 #	option disable_ipv6	1
 
-config zone
-	option name		lan
-	list   network		'lan'
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		ACCEPT
-
 config zone
 	option name		wan
 	list   network		'wan'
@@ -22,10 +18,6 @@ config zone
 	option masq		1
 	option mtu_fix		1
 
-config forwarding
-	option src		lan
-	option dest		wan
-
 # We need to accept udp packets on port 68,
 # see https://dev.openwrt.org/ticket/4108
 config rule

inteno-netmodes/files/etc/netmodes/repeater/layer2_interface_ethernet

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

inteno-netmodes/files/etc/netmodes/repeater/network

@@ -1,24 +1,41 @@
-
 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 device 'lan_dev'
+	option name 'eth0.1'
+	option macaddr '$MACLAN'
+
 config interface 'wan'
 	option type 'bridge'
+	option ifname 'eth0.2 eth0.1'
 	option proto 'dhcp'
-	option vendorid 'Inteno_Repeater_$MAC4'
-	option hostname 'Inteno_Repeater_$MAC4'
-	option ifname '$WAN.1'
-	option reqopts '43'
+	option hostname 'Inteno-$BSSID4'
+	option reqopts '66 67 128 224'
+	option igmp_snooping '0'
 
-config interface 'lan'
-	option is_lan '1'
-	option type 'bridge'
-	option proto 'static'
-	option ifname '$LAN1 $LAN2 $LAN3 $LAN4'
-	option ipaddr '192.168.11.1'
-	option netmask '255.255.255.0'
+config device 'wan_dev'
+	option name 'eth0.2'
+	option macaddr '$MACWAN'
+
+config interface 'wan6'
+	option ifname '@wan'
+	option proto 'dhcpv6'
+
+config switch
+	option name 'switch0'
+	option reset '1'
+	option enable_vlan '1'
+
+config switch_vlan
+	option device 'switch0'
+	option vlan '1'
+	option ports '1 6t'
+
+config switch_vlan
+	option device 'switch0'
+	option vlan '2'
+	option ports '0 5t'
 

inteno-netmodes/files/etc/netmodes/repeater/uhttpd

@@ -1,33 +0,0 @@
-config uhttpd 'main'
-	list listen_http '0.0.0.0:80'
-	list listen_http '[::]:80'
-	list listen_http '0.0.0.0:8080'
-	list listen_http '[::]:8080'
-	list listen_http '0.0.0.0:8181'
-	list listen_http '[::]:8181'
-	list listen_https '0.0.0.0:443'
-	list listen_https '[::]:443'
-	option redirect_https '1'
-	option home '/www'
-	option rfc1918_filter '1'
-	option max_requests '3'
-	option max_connections '100'
-	option cert '/etc/uhttpd.crt'
-	option key '/etc/uhttpd.key'
-	option cgi_prefix '/cgi-bin'
-	option script_timeout '60'
-	option network_timeout '30'
-	option http_keepalive '20'
-	option tcp_keepalive '1'
-	option ubus_prefix '/ubus'
-
-config cert 'px5g'
-	option days '730'
-	option bits '1024'
-	option country 'ZZ'
-	option state 'Somewhere'
-	option location 'Uknown'
-	option commonname 'OpenWrt'
-
-config logopts 'logopts'
-

inteno-netmodes/files/etc/netmodes/repeater/wireless

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

inteno-netmodes/files/etc/netmodes/repeater_dualdown/DETAILS

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

inteno-netmodes/files/etc/netmodes/repeater_dualdown/firewall

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

inteno-netmodes/files/etc/netmodes/repeater_dualdown/network

@@ -0,0 +1,41 @@
+config interface 'loopback'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config device 'lan_dev'
+	option name 'eth0.1'
+	option macaddr '$MACLAN'
+
+config interface 'wan'
+	option type 'bridge'
+	option ifname 'eth0.2 eth0.1'
+	option proto 'dhcp'
+	option hostname 'Inteno-$BSSID4'
+	option reqopts '66 67 128 224'
+	option igmp_snooping '0'
+
+config device 'wan_dev'
+	option name 'eth0.2'
+	option macaddr '$MACWAN'
+
+config interface 'wan6'
+	option ifname '@wan'
+	option proto 'dhcpv6'
+
+config switch
+	option name 'switch0'
+	option reset '1'
+	option enable_vlan '1'
+
+config switch_vlan
+	option device 'switch0'
+	option vlan '1'
+	option ports '1 6t'
+
+config switch_vlan
+	option device 'switch0'
+	option vlan '2'
+	option ports '0 5t'
+

inteno-netmodes/files/etc/netmodes/repeater_dualdown/owsd

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

inteno-netmodes/files/etc/netmodes/repeater_dualdown/wireless

@@ -0,0 +1,51 @@
+config wifi-status 'status'
+	option wlan '1'
+	option wps '1'
+	option sched_status '0'
+	option schedule '0'
+
+config wifi-device  ra0
+	option band b
+	option channel  1
+	option bandwidth '20'
+	option hwmode   11n
+	option htmode   HT20
+	option country 'DE'
+	option beamforming 0
+
+config wifi-iface
+	option device   ra0
+	option network  wan
+	option mode     ap
+	option ssid     Inteno-$BSSID4
+	option encryption psk2
+	option key      $WPAKEY
+	option ifname	ra0
+
+config wifi-device  rai0
+	option band a
+	option channel  36
+	option bandwidth '80'
+	option hwmode   11ac
+	option htmode   VHT80
+	option country 'DE'
+	option beamforming 0
+
+config wifi-iface
+	option device   rai0
+	option network  wan
+	option mode     ap
+	option ssid     Inteno-$BSSID4
+	option encryption psk2
+	option key      $WPAKEY
+	option ifname	rai0
+
+config wifi-iface
+	option device   ra0
+	option network  wan
+	option mode     wet
+	option ssid     Inteno-$BSSID4
+	option encryption psk2
+	option key      $WPAKEY
+	option ifname	apcli0
+

inteno-netmodes/files/etc/netmodes/routed/firewall

@@ -1,5 +1,5 @@
-config settings settings
-        option disabled 0
+config settings 'settings'
+        option disabled '0'
 
 config defaults
 	option syn_flood	1

inteno-netmodes/files/etc/netmodes/routed/layer2_interface_adsl

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

inteno-netmodes/files/etc/netmodes/routed/layer2_interface_ethernet

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

inteno-netmodes/files/etc/netmodes/routed/layer2_interface_vdsl

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

inteno-netmodes/files/etc/netmodes/routed/network

@@ -1,29 +1,47 @@
-
 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 is_lan '1'
 	option ipaddr '192.168.1.1'
 	option netmask '255.255.255.0'
-	option ifname '$LAN1 $LAN2 $LAN3 $LAN4'
 	option ip6assign '60'
-	
+	option ifname 'eth0.1 ra0 rai0'
+
+config device 'lan_dev'
+	option name 'eth0.1'
+	option macaddr '$MACLAN'
+
 config interface 'wan'
-	option type 'anywan'
+	option ifname 'eth0.2'
 	option proto 'dhcp'
-	option vendorid '$HARDWAREID-INTENO'
-	option hostname 'Inteno_$MAC4'
-	option ifname 'ptm0.1 atm0.1 $WAN.1'
-	option ipv6 '1'
+	option reqopts '66 67 128 224'
+
+config device 'wan_dev'
+	option name 'eth0.2'
+	option macaddr '$MACWAN'
 
 config interface 'wan6'
-	option proto 'dhcpv6'
 	option ifname '@wan'
+	option proto 'dhcpv6'
+
+config switch
+	option name 'switch0'
+	option reset '1'
+	option enable_vlan '1'
+
+config switch_vlan
+	option device 'switch0'
+	option vlan '1'
+	option ports '1 6t'
+
+config switch_vlan
+	option device 'switch0'
+	option vlan '2'
+	option ports '0 5t'
 

inteno-netmodes/files/etc/netmodes/routed/wireless

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

iop/configs/config

@@ -9,7 +9,6 @@ CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
 CONFIG_PACKAGE_6tunnel=y
 CONFIG_PACKAGE_alsa-lib=y
-CONFIG_PACKAGE_bind-host=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
@@ -23,7 +22,7 @@ CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_ice-client=y
 CONFIG_PACKAGE_ice-client-camerawatch=m
-CONFIG_PACKAGE_ice-client-fileme=m
+# CONFIG_PACKAGE_ice-client-fileme is not set
 CONFIG_PACKAGE_ice-client-gigaset=m
 CONFIG_PACKAGE_ice-client-guest=m
 CONFIG_PACKAGE_ice-client-iperf=m
@@ -32,7 +31,6 @@ CONFIG_PACKAGE_ice-client-monitor=m
 CONFIG_PACKAGE_ice-client-netrounds=m
 CONFIG_PACKAGE_ice-client-rshell=m
 CONFIG_PACKAGE_ice-client-texec=m
-CONFIG_PACKAGE_icwmp-curl=y
 CONFIG_PACKAGE_inteno-netmodes=y
 CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
@@ -48,7 +46,7 @@ CONFIG_PACKAGE_juci-broadcom-ethernet=y
 CONFIG_PACKAGE_juci-broadcom-iptv=y
 CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
 CONFIG_PACKAGE_juci-broadcom-vlan=y
-CONFIG_PACKAGE_juci-broadcom-wl=y
+CONFIG_PACKAGE_juci-wireless=y
 CONFIG_PACKAGE_juci-broadcom-xdsl=y
 CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y
@@ -57,7 +55,6 @@ CONFIG_PACKAGE_juci-dropbear=y
 CONFIG_PACKAGE_juci-ethernet=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
-CONFIG_PACKAGE_juci-icwmp=y
 CONFIG_PACKAGE_juci-igmpinfo=y
 CONFIG_PACKAGE_juci-inteno-backup=y
 CONFIG_PACKAGE_juci-inteno-multiwan=y
@@ -73,7 +70,7 @@ CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-owsd=y
 CONFIG_PACKAGE_juci-printer=y
-CONFIG_PACKAGE_juci-samba=y
+CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
@@ -86,8 +83,6 @@ CONFIG_PACKAGE_juci-utils=y
 CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-siit=y
 CONFIG_PACKAGE_layer2interface=y
-CONFIG_PACKAGE_libcgroup-daemon=y
-CONFIG_PACKAGE_libcgroup=y
 # CONFIG_PACKAGE_libcgroup-utils is not set
 CONFIG_PACKAGE_ldd=y
 CONFIG_PACKAGE_libdaemon=y
@@ -124,8 +119,6 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_samba3=y
-CONFIG_PACKAGE_samba3-nmbd=y
 CONFIG_PACKAGE_snmpd=y
 CONFIG_PACKAGE_strace=y
 CONFIG_PACKAGE_tc=y
@@ -137,6 +130,7 @@ CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
+CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
@@ -186,6 +180,7 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_BUSYBOX_CONFIG_WGET is not set
 # CONFIG_BUSYBOX_CONFIG_LOGIN_SCRIPTS is not set
 # CONFIG_BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD is not set
 # CONFIG_BUSYBOX_CONFIG_PAM is not set

iop/scripts/feeds_update.sh

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

iop/scripts/genconfig.sh

@@ -1,297 +1,352 @@
 #!/bin/bash
 
 function genconfig {
-    export CLEAN=0
-    export IMPORT=0
-    export SRCTREEOVERR=0
-    export FILEDIR="files/"
-    export CONFIGPATH="package/feeds/feed_inteno_packages/iop/configs"  
-    export CUSTCONF="customerconfigs"
-    export VERBOSE=0
-    export DEVELOPER=0
-    LOCAL_MIRROR="http://mirror.inteno.se/mirror"
+	export CLEAN=0
+	export IMPORT=1
+	export SRCTREEOVERR=0
+	export FILEDIR="files/"
+	export THEMEDIR="themes"
+	CURRENT_CONFIG_FILE=".current_config_file"
+	export CONFIGPATH="package/feeds/feed_inteno_packages/iop/configs"
+	CUSTPATH="customerconfigs"
+	CUSTREPO="git@private.inteno.se: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"
-    iopsys_brcm63xx_arm="dg400 eg400"
-    iopsys_ramips="ex400"
-    ramips="mt7621"
-    target="bogus"
-    masterconfig=1
-
-    set_target() {
+	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25"
+	iopsys_brcm63xx_arm="dg400 eg400"
+	iopsys_ramips="ex400"
+	ramips="mt7621"
+	target="bogus"
+	masterconfig=1
 
+	set_target()
+	{
 	local profile=$1
 
 	for p in $iopsys_brcm63xx_mips; do
-            if [ $p == $profile ]; then
-		target="iopsys_brcm63xx_mips"
-		return
-            fi
+		if [ $p == $profile ]; then
+			target="iopsys_brcm63xx_mips"
+			return
+		fi
 	done
 
 	for p in $iopsys_brcm63xx_arm; do
-            if [ $p == $profile ]; then
-		target="iopsys_brcm63xx_arm"
-		return
-            fi
+		if [ $p == $profile ]; then
+			target="iopsys_brcm63xx_arm"
+			return
+		fi
 	done
 
 	for p in $iopsys_ramips; do
-            if [ $p == $profile ]; then
-		target="iopsys_ramips"
-		return
-            fi
+		if [ $p == $profile ]; then
+			target="iopsys_ramips"
+			return
+		fi
 	done
 
 	for p in $ramips; do
-            if [ $p == $profile ]; then
-		target="ramips"
-		masterconfig=0
-		return
-            fi
+		if [ $p == $profile ]; then
+			target="ramips"
+			masterconfig=0
+			return
+		fi
 	done
 
-    }
+	}
+
+	git remote -v | grep -q http || {
+		DEVELOPER=1
+
+		bcmAllowed=0
+		iceAllowed=0
+		endptAllowed=0
+		natalieAllowed=0
+
+		allowedRepos="$(ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null | grep -w 'R\|W' | awk '{print$NF}')"
+		for repo in $allowedRepos; do
+			case $repo in
+			bcmkernel) bcmAllowed=1 ;;
+			ice-client) iceAllowed=1 ;;
+			endptcfg) endptAllowed=1 ;;
+			natalie-dect*) natalieAllowed=1 ;;
+			esac
+		done
+	}
+
+	v() {
+		[ "$VERBOSE" -ge 1 ] && echo "$@"
+	}
+
+	usage() {
+		echo
+		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer ]"
+		echo
+		echo -e "  -c|--clean\tRemove all files under ./files and import from config "
+		echo -e "  -v|--verbose\tVerbose"
+		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
+		echo -e "  -p|--profile\tSet profile (if exists) default juci"
+		echo -e "  -s|--override\tEnable 'Package source tree override'"
+		echo -e "  -h|--help\tShow this message"
+		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
+		echo -e "  -a|--list-all\tList all Customers and their board types"
+		echo
+		echo "Example ./iop genconfig vg50 TELIA"
+		echo "(if no customerconfig is chosen the Inteno Config will be used)"
+		echo
+		exit 0
+	}
+
+	list_customers()
+	{
+		local ALL="$1"
+		local CUSTOMER="$2"
+		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
+			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common)"
+			if [ "$boards" ]; then
+				echo "$CUSTOMER has following boards:"
+				for board in $boards; do
+					echo -e "\t$board"
+				done
+			else
+				echo "No boards found for $CUSTOMER"
+			fi
+		elif [ "$CUSTOMER" ]; then
+			echo "No customer called $CUSTOMER"
+			exit 1
+		elif [ -d $CUSTCONF ]; then
+			local customers="$(ls -1 $CUSTCONF)"
+			if [ "$customers" -a "$1" == 1 ]; then
+				for customer in $customers; do
+					echo $customer
+					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common)"
+					if [ "$boards" ]; then
+						for board in $boards; do
+							echo -e "\t$board"
+						done
+					else
+						echo "has no boards"
+					fi
+				done
+			elif [ "$customers" ]; then
+				echo -e "$customers"
+			else
+				echo "no customers found"
+			fi
+		else
+			echo "No $CUSTCONF folder found"
+		fi
+		exit 0
+	}
 
 
-    git remote -v | grep -q http || {
-	DEVELOPER=1
+	use_local_mirror()
+	{
+		if wget -T 3 -t 2 -O /dev/null $LOCAL_MIRROR >/dev/null 2>/dev/null; then
+			echo "mirror [$LOCAL_MIRROR] exists. Using local mirror"
+			sed -i "s;CONFIG_LOCALMIRROR=.*;CONFIG_LOCALMIRROR=\"$LOCAL_MIRROR\";" .config
+		else
+			echo "mirror [$LOCAL_MIRROR] does not exist. Not using local mirror"
+		fi
+	}
 
-	bcmAllowed=0
-	iceAllowed=0
-	endptAllowed=0
-	natalieAllowed=0
-
-	allowedRepos="$(ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | grep -w 'R\|W' | awk '{print$NF}')"
-	for repo in $allowedRepos; do
-	    case $repo in
-		bcmkernel) bcmAllowed=1 ;;
-		ice-client) iceAllowed=1 ;;
-		endptcfg) endptAllowed=1 ;;
-		natalie-dect*) natalieAllowed=1 ;;
-	    esac
-	done
-    }
-
-    v() {
-	[ "$VERBOSE" -ge 1 ] && echo "$@"
-    }
-
-    usage() {
-        echo
-        echo 1>&2 "Usage: $0 [OPTIONS] BoardConfig Customerconfig"
-        echo
-	echo "  -c,  remove all files under ./files and import from config "
-	echo "  -v,  verbose"
-	echo "  -u, Update customer config before applying"  
-	echo "	-p, set profile (if exists)"
-	echo "	-t, use latest git tag and number of commits since as version for the build"
-	echo "  -s, enable 'Package source tree override'"
-	echo 
-        echo "BoardConfig ex "
-	ls -1 configs
-	if [ -d "$CUSTCONF/$1" ]; then
-            echo "Customerconfig ex"
-	    ls  $CUSTCONF/*
-	fi  
-	echo
-	echo "Example ./genconfig vg50 TELIA" 
-        echo "(if no customerconfig is chosen the Inteno Config will be used)"
-	echo 	
-        exit 127
-    }
-
-    use_local_mirror()
-    {
-	if wget -T 3 -t 2 -O /dev/null $LOCAL_MIRROR >/dev/null 2>/dev/null
-	then
-	    echo "mirror [$LOCAL_MIRROR] exists. Using local mirror"
-	    sed -i "s;CONFIG_LOCALMIRROR=.*;CONFIG_LOCALMIRROR=\"$LOCAL_MIRROR\";" .config
-	else
-	    echo "mirror [$LOCAL_MIRROR] does not exist. Not using local mirror"
-	fi
-    }
-
-    generate_config()
-    {
+	generate_config()
+	{
 	DIFFFILE="$1"
 	MASTERFILE="$2"
 	while read p; do
-	    v  "$p"
-	    sed -r -i "$p" $MASTERFILE
+		v "$p"
+		sed -r -i "$p" $MASTERFILE
 	done < $DIFFFILE
-    }
+	}
 
-    setup_dirs()
-    {
-	if [ $DEVELOPER -eq 1 ]; then
-	    if [ ! -d "$CUSTCONF" ]; then
-		git  clone  git@private.inteno.se:customerconfigs
-	    elif [ $IMPORT -eq 1 ]; then
-		cd customerconfigs
-		v "git pull"
-		git pull
-		cd ..
-	    fi
+	setup_dirs()
+	{
+		if [ $DEVELOPER -eq 1 ]; then
+			if [ ! -d "$CUSTPATH" ]; then
+			git clone "$CUSTREPO" "$CUSTPATH"
+			elif [ $IMPORT -eq 1 ]; then
+			cd $CUSTPATH
+			v "git pull"
+			git pull
+			cd - >/dev/null #go back
+			fi
+		fi
+
+		if [ ! -d "$FILEDIR" ]; then
+			mkdir -p $FILEDIR
+		elif [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
+			v "rm -rf $FILEDIR*"
+			rm -rf $FILEDIR*
+		fi
+
+		if [ ! -d "$THEMEDIR" ]; then
+			mkdir -p $THEMEDIR
+		elif [ -d "$THEMEDIR" -a $CLEAN -eq 1 ]; then
+			v "rm -rf $THEMEDIR/*"
+			rm -rf $THEMEDIR/*
+		fi
+	}
+
+	create_and_copy_files()
+	{
+		local BOARDTYPE=$1
+		local CUSTOMER=$2
+
+		# Validate seleced board and customer
+		set_target $BOARDTYPE
+		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
+		fi
+
+		# Generate base config
+		# Used only for iopsys targets, not openwrt targets
+		rm -f .config
+		if [ $masterconfig -eq 1 ]; then
+			v "Config $BOARDTYPE selected"
+			v "cp $CONFIGPATH/config .config"
+			cp $CONFIGPATH/config .config
+		fi
+
+		# Apply profile diff to master config if selected
+		if [ -n "$PROFILE" ]; then
+			if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then
+				cat $CONFIGPATH/$PROFILE.diff >> .config
+			elif [ "$PROFILE" == "juci" ]; then
+				v "Default profile (juci) is selected."
+			else
+				echo "ERROR: profile $PROFILE does not exist!"
+				exit 1
+			fi
+		else
+			v "No profile selected! Using default."
+		fi
+
+		# Set target and profile
+		echo "CONFIG_TARGET_${target}=y" >> .config
+		echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
+
+		echo "$CUSTOMER $BOARDTYPE" > $CURRENT_CONFIG_FILE
+
+		# Add customerconfig diff if a customer is selected
+		if [ -n "$CUSTOMER" ]; then
+			if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
+				v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
+				cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
+			fi
+			if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
+				v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
+				cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
+			fi
+			if [ -d "$CUSTCONF/$CUSTOMER/juci-theme" ]; then
+				customer="$(echo $CUSTOMER | tr 'A-Z' 'a-z')"
+				v "cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer"
+				cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer
+			fi
+			if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+				v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
+				cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
+			fi
+			if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
+				v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
+				cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
+			fi
+		fi
+
+		# Set target version
+		local GIT_TAG=$(git describe --abbrev=0 --tags)
+		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
+
+		# Enable Pckage source tree override if selected
+		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
+
+		# developer mode selected ?
+		if [ $DEVELOPER -eq 1 ]; then
+			# rewrite url to clone with ssh instead of http
+			echo "CONFIG_DEVEL=y" >>.config
+			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
+			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
+			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
+			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
+			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
+		else
+			echo "CONFIG_BCM_OPEN=y" >> .config
+			echo "CONFIG_ICE_OPEN=y" >> .config
+			echo "CONFIG_ENDPT_OPEN=y" >> .config
+			echo "CONFIG_NATALIE_OPEN=y" >> .config
+		fi
+
+		# Force regeneration of themes
+		touch package/feeds/feed_inteno_juci/juci/Makefile
+
+		# Force regeneration of kernel Makefile
+		# Needed to disable kmods for iopsys-brcm targets
+		touch package/kernel/linux/Makefile
+
+		# Set default values based on selected parameters
+		v "$(make defconfig 2>&1)"
+
+		# Temporary fixup for juci/luci profile
+		if [ "$PROFILE" == "luci" ]; then
+			sed -i '/CONFIG_DEFAULT_juci/d' .config
+			sed -i '/CONFIG_PACKAGE_juci/d' .config
+			sed -i '/CONFIG_PACKAGE_uhttpd/d' .config
+		fi
+
+		if [ $masterconfig -eq 1 ]; then
+			echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+		fi
+
+		# Clean base-file package to force rebuild when changing profile
+		v "$(make package/base-files/clean 2>&1)"
+	}
+
+	####### main #####
+	if [ ! -e tmp/.iop_bootstrap ]; then
+		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
+		echo "Run: iop feeds_update"
+		exit 0
 	fi
 
-
-	if [ ! -d "$FILEDIR" ]; then
-	    mkdir $FILEDIR
-	elif  [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
-	    v "rm -rf $FILEDIR*"	
-	    rm -rf $FILEDIR*
-	fi
-    }
-
-
-    create_and_copy_files()
-    {
-	local BOARDTYPE=$1
-	local CUSTOMER=$2
-
-	# Validate seleced board and customer
-	set_target $BOARDTYPE
-	if [ $target == "bogus" ]; then
-	    echo "Hardware profile does not exist"
-	    exit 1
-	elif [ -n "$CUSTOMER" -a ! -d "$CUSTCONF/$BOARDTYPE/$CUSTOMER/" ]; then
-	    echo "Customer profile does not exist"
-	    exit 1
-	fi
-
-	# Generate base config 
-	# Used only for iopsys targets, not openwrt targets
-	rm -f .config
-	if [ $masterconfig -eq 1 ]; then
-	    v  "Config $BOARDTYPE selected"
-	    v "cp  $CONFIGPATH/config  .config"
-	    cp  $CONFIGPATH/config  .config
-	fi
-
-	# Apply profile diff to master config if selected
-	if [ -n "$PROFILE" ]; then 
-	    if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then
-		cat $CONFIGPATH/$PROFILE.diff >> .config
-	    elif [ "$PROFILE" == "juci" ]; then
-		v "Default profile (juci) is selected."
-	    else
-		echo "ERROR: profile $PROFILE does not exist!"
-		exit 1
-	    fi
-	else 
-	    v "No profile selected! Using default."
-	fi
-	
-	# Set target and profile
-	echo "CONFIG_TARGET_${target}=y" >> .config
-	echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-
-	echo "$BOARDTYPE $CUSTOMER" > .current_config_file
-
-	# Add customerconfig diff if a customer is selected
-	if [ -n "$CUSTOMER" ]; then
-	    if [ -d "$CUSTCONF/$BOARDTYPE/$CUSTOMER/fs" ]; then
-		v "cp -rLp $CUSTCONF/$BOARDTYPE/$CUSTOMER/fs/* $FILEDIR"
-		cp -rLp $CUSTCONF/$BOARDTYPE/$CUSTOMER/fs/* $FILEDIR
-	    fi
-	    if [ -e "$CUSTCONF/$BOARDTYPE/$CUSTOMER/$BOARDTYPE.diff" ]; then
-		v "Apply $CUSTCONF/$BOARDTYPE/$CUSTOMER/$BOARDTYPE.diff"
-		cat $CUSTCONF/$BOARDTYPE/$CUSTOMER/$BOARDTYPE.diff >> .config
-	    fi
-	fi
-
-	# Set target version
-	local GIT_TAG=$(git describe --abbrev=0 --tags)
-	echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
-
-
-	# Enable Pckage source tree override if selected
-	[ $SRCTREEOVERR -eq 1 ] && \
-            echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
-
-
-	# developer mode selected ?
-	if [ $DEVELOPER -eq 1 ]; then
-	    # rewrite url to clone with ssh instead of http
-	    echo "CONFIG_DEVEL=y" >>.config
-	    echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
-	    [ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
-	    [ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
-	    [ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
-	    [ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
+	if [ $# -eq 0 ]; then
+		echo Current profile:
+		cat $CURRENT_CONFIG_FILE
+		echo "Try ./iop genconfig -h' to get instructions if you want to change current config"
+		exit 0
 	else
-	    echo "CONFIG_BCM_OPEN=y" >> .config
-	    echo "CONFIG_ICE_OPEN=y" >> .config
-	    echo "CONFIG_ENDPT_OPEN=y" >> .config
-	    echo "CONFIG_NATALIE_OPEN=y" >> .config
+		while [ -n "$1" ]; do
+			case "$1" in
+
+			-c|--clean) export CLEAN=1;;
+			-n|--no-update) export IMPORT=0;;
+			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
+			-p|--profile) export PROFILE="$2"; shift;;
+			-s|--override) export SRCTREEOVERR=1;;
+			-h|--help) usage;;
+			-l|--list) list_customers 0 $2;;
+			-a|--list-all)list_customers 1;;
+			-*)
+				echo "Invalid option: $1 "
+				echo "Try -h or --help for more information."
+				exit 1
+				;;
+			*) break;;
+			esac
+			shift;
+		done
+		setup_dirs
+		create_and_copy_files "$1" "$2"
+
+		if [ $masterconfig -eq 1 ]; then
+			use_local_mirror
+		fi
 	fi
-	
-	# Force regeneration of kernel Makefile
-	# Needed to disable kmods for iopsys-brcm targets
-	touch package/kernel/linux/Makefile
-	
-	# Set default values based on selected parameters
-	make defconfig
-
-	# Temporary fixup for juci/luci profile
-	if [ "$PROFILE" == "luci" ]; then
-	    sed -i '/CONFIG_DEFAULT_juci/d' .config
-	    sed -i '/CONFIG_PACKAGE_juci/d' .config
-	    sed -i '/CONFIG_PACKAGE_uhttpd/d' .config
-	fi
-
-	if [ $masterconfig -eq 1 ]; then
-	    echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
-	fi
-
-	# Clean base-file package to force rebuild when changing profile
-	make package/base-files/clean
-
-
-    }
-
-    ####### main #####
-    if [ ! -e tmp/.iop_bootstrap ]; then
-	echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
-	echo "Run: iop feeds_update"
-	exit 0
-    fi
-
-    if [ $# -eq 0 ]; then
-	echo Current profile:
-	cat .current_config_file
-	echo "Try ./iop_get_config.sh -h' to get instructions if you want to change current config"
-	exit 0
-    else
-	
-	while [ -n "$1" ]; do 
-	    case "$1" in
-
-		-c) export CLEAN=1;;
-		-u) export IMPORT=1;;
-		-v) export VERBOSE="$(($VERBOSE + 1))";;
-		-p) export PROFILE="$2"; shift;; 
-		-t) export USE_TAG=1;; 
-		-s) export SRCTREEOVERR=1;;
-		-h) usage;;
-		-*)
-		    echo "Invalid option: $1 "
-		    echo "Try  -h' for more information."
-		    exit 1
-		    ;;
-		*) break;;
-	    esac
-	    shift;
-	done
-	setup_dirs
-	create_and_copy_files "$1" "$2"
-
-	if [ $masterconfig -eq 1 ]; then
-	    use_local_mirror
-	fi
-    fi
 }
 
-
 register_command "genconfig" "Generate configuration for board and customer"

iop/scripts/update_package.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 
+
 print_git_update()
 {
     echo "pkg -> ${PKG_NAME}"
@@ -99,6 +100,28 @@ insert_hash_in_feed_makefile()
     (cd ${PKG_DIR}; git add ${name})
 }
 
+insert_version_in_feed_makefile()
+{
+    if [ -n "$PKG_SOURCE_VERSION_FILE" ]
+    then
+	name="$PKG_SOURCE_VERSION_FILE"
+    else
+	name=Makefile
+    fi
+
+    last_version=$(awk -F '=' '/PKG_VERSION:=/ {print $2}' ${PKG_DIR}/${name})
+
+	echo -n "please enter version: "
+	read -ei "$last_version" answer
+
+	if [ -z ${answer} ]; then
+		return
+	fi
+
+    sed -i -e "s/\(^PKG_VERSION:=\).*/\1${answer}/" ${PKG_DIR}/${name}
+    (cd ${PKG_DIR}; git add ${name})
+}
+
 
 # BUG: fix if only local branche name!
 branch_uptodate()
@@ -376,9 +399,13 @@ check_packages()
     echo "Now checking if any changes has been done to the packages."
     echo -e "${Green}_______________________________________________________________________________${Color_Off}"
 
+    # only scan in the build directory that is currently in use.
+    CPU=$(grep  "CONFIG_CPU_TYPE=" .config| cut -f2 -d\")
+    LIBC=$(grep "CONFIG_LIBC=" .config| cut -f2 -d\")
+    
     # First scan all files in build dir for packages that have .git directories.
-    all_pkgs=$(find build_dir/ -name ".git")
-
+    all_pkgs=$(find build_dir/*${CPU}*${LIBC}* -name ".git")
+    
     for pkg in `echo "$all_pkgs"`
     do
 	pkg=$(dirname $pkg)
@@ -400,6 +427,7 @@ check_packages()
 		    #  print_git_update
 		    git_repos_uptodate
 		    insert_hash_in_feed_makefile
+		    [ ${UPDATE} -eq 1 ] && insert_version_in_feed_makefile
 		    create_message >tmp/msg
 		    commit_feed tmp/msg
 		    insert_hash_in_feeds_config
@@ -463,7 +491,7 @@ Date: %ai%n\
 check_feeds()
 {
     echo -e "${Green}_______________________________________________________________________________${Color_Off}"
-    echo "Now checking if any changes has been done to the feeds."
+    echo "Now checking if any changes have been done to the feeds."
     echo -e "${Green}_______________________________________________________________________________${Color_Off}"
 
     feeds=$(grep -v "^#" feeds.conf| awk '{print $2}')
@@ -547,10 +575,18 @@ feeds_at_top()
     exit 0
 }
 
+usage(){
+	echo -e "$0 [flags]"
+	echo -e "flags:"
+	echo -e "  -v\tVerbose mode"
+	echo -e "  -h\tShow this help"
+	echo -e "  -u\tUpdate package version\n"
+}
 
 # Exported interface
 function update_package {
 
+    UPDATE=0
     Color_Off='\033[0m'       # Text Reset
 
     # Regular Colors
@@ -563,15 +599,18 @@ function update_package {
     Cyan='\033[0;36m'         # Cyan
     White='\033[0;37m'        # White
 
-    while getopts "v:h" opt; do
+    while getopts "v:hu" opt; do
 	case $opt in
 	    v)
 		verbose=$OPTARG
 		;;
 	    h)
-		echo "some help! No options yet"
-		exit 1
-		;;
+			usage
+			exit 1
+			;;
+		u)
+			UPDATE=1
+			;;
 	    \?)
 		echo "Invalid option: -$OPTARG" >&2
 		exit 1

iup/files/etc/init.d/iup

@@ -31,19 +31,16 @@ management_interfaces() {
 }
 
 init_iup() {
+	local polling_enabled
 	local interval
 	local starttime
 	local nummber
 	number=$RANDOM
 
-	if [ -f $CRONPATH ]; then
-		echo "File $CRONPATH exists"
-	else
-		echo  "File $CRONPATH did not exists"
-		touch $CRONPATH
-	fi
+	[ -f $CRONPATH ] || touch $CRONPATH
 
 	config_load provisioning
+	config_get polling_enabled polling enabled on
 	config_get interval  polling  interval
 	config_get starttime  polling  starttime
 
@@ -54,12 +51,12 @@ init_iup() {
 		local newreqopts=
 		local baseopts=
 		local reqopts="$(uci -q get network.$net.reqopts)"
-		local iupopts="66 67 128 224"
+		local iupopts="66 67 128 224 225 226"
 		local ropt iopt
 		config_get enabled iup enabled "on"
 		for ropt in $reqopts; do
 			case $ropt in
-				66|67|128|224) ;;
+				66|67|128|224|225|226) ;;
 				*) baseopts="$baseopts $ropt" ;;
 			esac
 		done
@@ -67,7 +64,7 @@ init_iup() {
 		reqopts="$baseopts $iupopts"
 		for ropt in $reqopts; do
 			case $ropt in
-				66|67|128|224) [ $enabled == "on" ] && newreqopts="$newreqopts $ropt" ;;
+				66|67|128|224|225|226) [ $enabled == "on" ] && newreqopts="$newreqopts $ropt" ;;
 				*) newreqopts="$newreqopts $ropt" ;;
 			esac
 		done
@@ -82,8 +79,18 @@ init_iup() {
 	ubus call network reload
 	#################################################################
 
+	if [ $polling_enabled == "off" ]; then
+		sed -i "/\/sbin\/iup/d" $CRONPATH
+		logger -s -t /etc/init.d/iup[$$] "Provisioning polling unscheduled" 2>/dev/console
+		return
+	fi
+
+	local log_hour=$starttime
+	local log_minute
+	local log_interval=$interval
 	if [ $interval == "weekly" ]; then
 		interval="0"
+		log_interval="$log_interval/sunday"
 	elif [ $interval == "hourly" ]; then
 		interval='*'
 		starttime='*'
@@ -91,9 +98,7 @@ init_iup() {
 		interval='*'
 	fi
         let "number %= $RANGE"
-	if grep -q "$starttime  \* \* \\$interval     /sbin/iup" "$CRONPATH" ; then
-		echo "IUP is scheduled $starttime  \* \* \\$interval "
-	else 
+	if ! grep -q "$starttime  \* \* \\$interval     /sbin/iup" "$CRONPATH" ; then
 		if grep -q "iup" "$CRONPATH" ; then
 			sed -i "/iup/d" $CRONPATH
 		fi
@@ -101,19 +106,14 @@ init_iup() {
 		fsync $CRONPATH
 		/etc/init.d/cron restart
 	fi
-}
-
-boot() {
-	init_iup
+	log_minute=$(awk '/\/sbin\/iup/ {print $1}' /etc/crontabs/root)
+	logger -s -t /etc/init.d/iup[$$] "Provisioning is scheduled at $log_hour:$log_minute $log_interval" 2>/dev/console
 }
 
 start_service() {
 	init_iup
 
-	test_default_route
-	if [ "$?" -eq 0 ]; then
-		/sbin/iup -v &
-	fi
+	/sbin/iup -v &
 }
 
 stop_service() {

iup/files/sbin/iup

@@ -13,6 +13,8 @@ export IUPCONFFILES=/tmp/iup/sysupgrade.conffiles.tar.gz
 export IUPMD5=/etc/configchecksums
 export CONFILESLURP='/tmp/iup/*.conf'
 export IUPTEMP="/tmp/iup"
+export IUPUSERCFG="/tmp/iupusercfg"
+export IUPUSERCFG_WIFI="/tmp/iupusercfg_wifi"
 export INTERACTIVE=0
 export VERBOSE=0
 export CONF=1
@@ -26,28 +28,22 @@ MAC=${MAC// /}
 #lower to upper Conversion
 MAC=$(echo $MAC | tr '[a-z]' '[A-Z]')
 
+# no verbose:	no output
+# -v		log to system log
+# -v -v		log to system log and console
+# -v -v -v	log to system log, console and stderr
 v() {
-	[ "$VERBOSE" -ge 1 ] && logger -t iup "$@"
+	[ "$VERBOSE" -eq 0 ] && return
+	[ "$VERBOSE" -eq 1 ] && logger -t $0[$$] "$@" && return
+	[ "$VERBOSE" -eq 2 ] && logger -s -t $0[$$] "$@" >/dev/console 2>&1 && return
+	[ "$VERBOSE" -eq 3 ] && logger -s -t $0[$$] "$@" 2>&1 | tee /dev/console && return
 }
 
-if [ -f $IUPMD5 ]; then
-	v "File $IUPMD5 exists"
-else
-	v "File $IUPMD5 did not exists"
-	touch $IUPMD5
-fi
+vv() {
+	VERBOSE="$(($VERBOSE + 1))"
+	v "$@"
+	VERBOSE="$(($VERBOSE - 1))"
 
-handle_ucitrack()
-{
-	local config="$1"
-	config_get init "$config" init
-	echo $init
-	config_get affects "$config" affects
-
-	for aff in $affects
-	do
-		config_foreach handle_ucitrack $aff
-	done
 }
 
 get_packages()
@@ -61,35 +57,121 @@ get_packages()
 
 reload ()
 {
-	local reload
-	local initlist
-	local reload
 	local pack
 	pack=$(get_packages $1)
-	config_load ucitrack
+	v "Calling ubus call uci commit for $pack"
 	for packname in $pack
 	do
-		initlist=$(config_foreach handle_ucitrack $packname)
-		for reltest in $initlist
-		do
-			case $reload in
-				*" $reltest "*) v "already added to reload $reltest" ;;
-				*) reload="$reload"" ""$reltest" ;;
-			esac
-		done
+		ubus call uci commit '{"config":"'$packname'"}'
+		sleep 1
 	done
-	v "Init scripts to be run $reload"
-	for inittoreload in $reload
-	do
-		if [ "$inittoreload" != "iup" ]; then
-			/etc/init.d/$inittoreload restart
-		fi
+}
+
+save_usercfg()
+{
+	rm -f $IUPUSERCFG $IUPUSERCFG_WIFI
+	touch $IUPUSERCFG $IUPUSERCFG_WIFI
+
+	# save the firewall redirects/port forwarding
+	uci show firewall | grep redirect >> $IUPUSERCFG
+
+	# save the parental rules
+	local parentalrules=$(uci show firewall | grep -i "Parental Rule" | grep -o "rule\[.*\]")
+	for rule in $parentalrules ; do
+		rule=${rule//\[/\\[} # escape [
+		rule=${rule//]/\]} # escape ]
+		uci show firewall | grep "$rule" >>$IUPUSERCFG
 	done
-	#Ugly hack need to figure out something here
-	test_default_route
-	if [ "$?" -eq 1 ]; then
-		sleep 5
+
+	# tranfsorm the output of uci show into a uci script
+
+	# prepend "set" to each line NOT containing "]="
+	# firewall.@redirect[0].enabled='1' becomes
+	# set firewall.@redirect[0].enabled='1'
+	sed -i '/.*]=.*/! s/.*/set \0/' $IUPUSERCFG
+
+	# prepend "add" to each line containing "]="
+	# AND keep only the package name (before the first dot) and section type (after equal)
+	# firewall.@redirect[0]=redirect becomes
+	# add firewall redirect
+	sed -i 's/\(.*\)\..*]=\(.*\)/add \1 \2/' $IUPUSERCFG
+
+	# change all the array indexes to [-1]
+	sed -i 's/\[.\?.\?.\?.\?\]/[-1]/' $IUPUSERCFG
+
+	# commit at the end of the script
+	[ -s $IUPUSERCFG ] && echo "commit" >> $IUPUSERCFG
+
+	# save wireless interfaces
+	uci show wireless | grep "wifi-iface" > $IUPUSERCFG_WIFI
+}
+
+apply_usercfg()
+{
+	# decide to save the user changes based on keepuserconfig received through provisioning
+	local keep
+	config_load provisioning
+	config_get_bool keep configserver keepuserconfig "0"
+	v "apply_usercfg(): keepuserconfig = $keep"
+	if [ "$keep" != "1" ] ; then
+		rm -f $IUPUSERCFG $IUPUSERCFG_WIFI
+		return
 	fi
+
+	local index ifname network
+	local newindex newifname newnetwork
+
+	# loop through all the user wifi-ifaces
+	for index in $(seq 0 99) ; do
+		ifname=$(sed -n 's/.*wifi-iface\['$index'\]\.ifname='\''\(.*\)'\''/\1/p' $IUPUSERCFG_WIFI )
+		[ "$ifname" ] || break
+		network=$(sed -n 's/.*wifi-iface\['$index'\]\.network='\''\(.*\)'\''/\1/p' $IUPUSERCFG_WIFI )
+
+		newindex=""
+		newifname=""
+		newnetwork=""
+
+		# loop through all the newly configured wifi-ifaces
+		for newindex in $(seq 0 99) ; do
+			newifname=$( uci show wireless | grep wifi-iface | sed -n 's/.*wifi-iface\['$newindex'\]\.ifname='\''\(.*\)'\''/\1/p' )
+			if [ -z "$newifname" ] ; then
+				# no newifname means that all the wifi-ifaces have already been parsed
+				newindex="-1"
+				break
+			fi
+			newnetwork=$(uci show wireless | grep wifi-iface | sed -n 's/.*wifi-iface\['$newindex'\]\.network='\''\(.*\)'\''/\1/p' )
+
+			# two wifi interfaces are the same if "ifname" and "network" are the same
+			if [ "$newifname" == "$ifname" ] && [ "$newnetwork" == "$network" ] ; then
+				break
+			fi
+		done
+
+		# prepend "set" to each line NOT containing "]="
+		# wireless.@wifi-iface[$index].<option>='<value>' becomes
+		# set wireless.@wifi-iface[$index].<option>='<value>'
+		sed -i '/.*]=.*/! s/\(.*\[\)'$index'\(\].*\)/set \1'$newindex'\2/' $IUPUSERCFG_WIFI
+
+		if [ "$newindex" == "-1" ] ; then
+			# prepend "add" to each line containing "]="
+			# AND keep only the package name (before the first dot) and section type (after equal)
+			# wireless.@wifi-iface[0]=wifi-iface becomes
+			# add wireless wifi-iface
+			sed -i 's/\(.*\)\..*\['$index'\]=\(.*\)/add \1 \2/' $IUPUSERCFG_WIFI
+		else
+			# no need to create a new uci section, just delete the line defining a new section
+			sed -i '/\(.*\)\..*\['$index'\]=\(.*\)/d' $IUPUSERCFG_WIFI
+		fi
+
+	done
+	# commit at the end of the script
+	[ -s $IUPUSERCFG_WIFI ] && echo "commit" >> $IUPUSERCFG_WIFI
+
+	# run the uci batch scripts
+	cat $IUPUSERCFG | uci batch >/dev/null 2>&1
+	cat $IUPUSERCFG_WIFI | uci batch >/dev/null 2>&1
+
+	rm -f $IUPUSERCFG $IUPUSERCFG_WIFI
 }
 
 handle_provisioning() {
@@ -117,15 +199,15 @@ handle_provisioning() {
 	config_get deckey "$config" deckey
 	if [ "$enabled" -eq 1	]; then
 		if [ "$config" == "iup" ]; then
-			v "using url from dhcp options"
+			v "Using url received in dhcp options"
 			config_get url "$config" urliup
-		else 
+		else
 			config_get url "$config" url
 		fi
 		url=${url//\$MAC/$MAC}
-		v "Download from $url"
-		  
-		while [ $retry -le $RETRYSTOP ]  
+		v "Downloading from url \"$url\""
+
+		while [ $retry -le $RETRYSTOP ]
 		do
 		  if [ ${url%%:*} == "tftp" ]; then
 			tftpfile=${url#*\/\/}
@@ -137,10 +219,10 @@ handle_provisioning() {
 			get_image "$url" "cat" > $IUPCONFFILES
 		  fi
 		  if [ -s $IUPCONFFILES ]; then
-			v "File Downloaded"
+			v "Download finished"
 			retry=$((RETRYSTOP + 1))
-		  else		  
-		  v "Download failed will try again in $incsleep sec"
+		  else
+		  v "Download failed, retrying in $incsleep seconds"
 		  sleep $incsleep
 		  incsleep=$((incsleep * retry + number))
 		  retry=$((retry+1))
@@ -163,41 +245,44 @@ handle_Downloaded_file()
 	[ -n "$1" ] && DECKEY=$(echo $1 | tr -d '\n' | hexdump -e '16/1 "%02x"')
 	KEY=${DECKEY:-$DESKEY}
 	local img_type
-	case "$(get_image_type "$IUPCONFFILES")" in                                  
-                "INTENO") img_type=2 ;;                                      
-                "CFE+FS") img_type=1 ;;                                         
-                "FS")     img_type=0 ;;                                      
-                *)      img_type="UNKNOWN";;                                
-        esac                                                                                     
-                                                                                                 
+	case "$(get_image_type "$IUPCONFFILES")" in
+                "INTENO") img_type=2 ;;
+                "CFE+FS") img_type=1 ;;
+                "FS")     img_type=0 ;;
+                *)      img_type="UNKNOWN";;
+        esac
+
         if [ "$img_type" == "UNKNOWN" ] ; then
 		case "$(hexdump -v -n 2 -e '1/1 "%02x"' $IUPCONFFILES)" in
 			1f8b)
-				v "Found Config"
+				v "Downloaded file is an unencrypted config"
 				md5=$(md5sum $IUPCONFFILES)
 				md5="${md5%% *}" # remove the first space and everything after it
 				md5sum "$IUPCONFFILES" >> "$IUPMD5.temp"
 				if grep -q "$md5" "$IUPMD5"; then
-					v "Config Already Up to Date"
-					#becuse config is up to date we need to disable last step reboot if set
+					v "Config is already up to date, nothing to do"
+					#because config is up to date we need to disable last step reboot if set
 					reboot="off"
 					rm -rf $IUPTEMP
 				else
-					cd /tmp/iup/
+					save_usercfg
+					cd $IUPTEMP
 					tar xvzf $IUPCONFFILES
 					for f in $CONFILESLURP
 					do
-						v "file to be applied $f and config $(cat $f)"
+						v "File to be applied $f and config $(cat $f)"
 						uci import -f $f
 					done
 					pack=$(get_packages $CONFILESLURP)
-					v "$pack packages to be commited"
+					v "Packages to be commited: $pack"
 					for packname in $pack
 					do
 						uci commit $packname
 					done
+					apply_usercfg
 					reboot=`uci -q  get provisioning.configserver.reboot`
 					if [ "$reboot" != "on" ]; then
+						sync
 						reload $CONFILESLURP
 					fi
 					rm -rf $IUPTEMP
@@ -207,11 +292,11 @@ handle_Downloaded_file()
 				fi
 			;;
 			*)
-				v "encrypted"
+				v "Downloaded file is an encrypted config"
 				if [ $KEY ]; then
 					openssl enc -d -des-ede -nosalt -K $KEY -iv "0000000000000000" -in $IUPCONFFILES -out $IUPCONFFILES.tmp
 					if [ $? -eq 0 ]; then
-						v "Decrypted Content"
+						v "Decryption successful"
 						mv $IUPCONFFILES.tmp $IUPCONFFILES
 						handle_Downloaded_file
 					else
@@ -227,11 +312,12 @@ handle_Downloaded_file()
 			;;
 		esac
 	else
-		v "Image found will start flashing"
+		v "Downloaded file is a firmware, will start reflashing"
 		if [ "$defaultreset" -eq 1 ]; then
-			v "nuke config"
+			v "Not saving configuration over reflash"
 			 /sbin/sysupgrade -v -n $IUPCONFFILES
 		else
+			v "Saving configuration over reflash"
 			/sbin/sysupgrade -v $IUPCONFFILES
 		fi
 	fi
@@ -253,7 +339,7 @@ change_to_vlan() {
 
 	# bring down old interface/device.
 	ifdown "${base_dev}"
-	logger -t dhcp_opt132 "bringing down old if: ${base_dev}"
+	v "option 132: bringing down old if: ${base_dev}"
 
 	# extract base name of device.
 	base_dev=$(echo ${base_dev} | cut -d. -f1)
@@ -267,15 +353,15 @@ change_to_vlan() {
 	uci set layer2_interface_vlan.@vlan_interface[-1].baseifname=${base_dev}
 	# and commit the change.
 	uci commit layer2_interface_vlan
-	logger -t dhcp_opt132 "committed update to file layer2_interface_vlan"
+	v "option 132: committed update to file layer2_interface_vlan"
 
 	# reload configuration files.
 	/etc/init.d/layer2_interface_vlan reload
-	logger -t dhcp_opt132 "reload layer2_interface_vlan config"
+	v "option 132: reload layer2_interface_vlan config"
 
 	# replace old interface (like eth0.1 with new eth0.101).
 	wan_if=$(uci get network.$3.ifname)
-	logger -t dhcp_opt132 "old network.${3}.ifname: $wan_if"
+	v "option 132: old network.${3}.ifname: $wan_if"
 
 	# loop through the string, remove any word close to "base_dev".
 	for word in ${wan_if}; do
@@ -293,10 +379,12 @@ change_to_vlan() {
 	uci set network.wan.ifname="${new_wan_if}"
 	# and commit the change.
 	uci commit network
-	logger -t dhcp_opt132 "committed update to file network: ifname=${new_wan_if}"
+	v "option 132: committed update to file network: ifname=${new_wan_if}"
 
 	# reboot into new if configuration.
-	reboot
+	vv "Rebooting"
+	export REBOOT_REASON=iup
+	/sbin/reboot
 }
 
 handle_option224()
@@ -315,11 +403,6 @@ handle_option224()
 		c=$(echo $1|cut -d',' -f4)
 	fi
 
-	echo "url" $url
-	echo "a" $a
-	echo "b" $b
-	echo "c" $c
-
 	currdate=$(date +"%Y-%m-%d")
 
 	active=0
@@ -352,67 +435,67 @@ handle_option224()
 	softwareminuspath=${url##*/}
 
 	if [ $url ] && [ $active -eq 1 ]; then
-		echo "Software version to download $softwareminuspath"
+		v "Software version to download \"$softwareminuspath\""
 		local sysinfo=$(ubus call router.system info)
 		json_load "$sysinfo"
 		json_select system
 		json_get_var firmware firmware
 		local firmware_new=${softwareminuspath%.*}	# remove extension (.w, .y or .y2) from filename
 		if [ "$firmware_new" != "$firmware" ] ; then
-			echo "Image found $url will start flashing"
+			v "Firmware found $url will start flashing"
+			v "Currently running firmware: \"$firmware\""
+			v "Newly received firmware:    \"$firmware_new\""
 			wait_for_dns $url
+			v "Start flashing"
 			/sbin/sysupgrade -v $url &
 			return 1
 		else
-			echo "Will not update software, already up to date"
+			v "Firmware is up to date, nothing to do"
 			return 0
 		fi
 	fi
 }
 
-### MAIN ###
-while [ -n "$1" ]; do
-	case "$1" in
-		-v) export VERBOSE="$(($VERBOSE + 1))";;
-		-q) export VERBOSE="$(($VERBOSE - 1))";;
-		-*)
-			echo "Invalid option: $1"
-			exit 1
-		;;
-		*) break;;
-	esac
-	shift;
-done
 
-# Process IUP related DHCP options #
-if [ -n "$1" ]; then
-	local privopt224 vendorspecinf httpurl128
+parse_dhcp_options()
+{
+	local the_json="$@"
+	# Process IUP related DHCP options #
+	local privopt224 privopt225 privopt226 vendorspecinf httpurl128
 	local tftp bootfile vlanid vlanpriority interface
 
-	json_load "$1"
+	json_load "$the_json"
 	json_get_var interface interface
 	json_get_var privopt224 privopt224
-	json_get_var vendorspecinf vendorspecinf
+	json_get_var privopt225 privopt225
+	json_get_var privopt226 privopt226
+	json_get_var vendorspecinf vendorspecinf # option 43
 	json_get_var httpurl128 httpurl128
-	json_get_var tftp tftp
-	json_get_var bootfile bootfile
-	json_get_var vlanid vlanid
-	json_get_var vlanpriority vlanpriority
+	json_get_var tftp tftp # option 66
+	json_get_var bootfile bootfile #option 67
+	json_get_var vlanid vlanid # option 132
+	json_get_var vlanpriority vlanpriority # option 133
+
+	v "Processing dhcp options"
 
 	if [ $privopt224 ]; then
-		echo "Option224 recived " $privopt224 > /dev/console
+		v "dhcp option 224 firmware url $privopt224"
 		handle_option224 $privopt224
 		[ $? -eq 1 ] && exit
 	fi
 
 	if [ $vendorspecinf ]; then
+		v "dhcp option 43 tr69 url $vendorspecinf"
 		url=${vendorspecinf%%,*}; rest=${vendorspecinf#*,}
 		provisioningcode=${rest%%,*};
+		uci_set_state provisioning iup urlcwmp "$url"
 		uci_set_state provisioning iup url "$url"
 		uci_set_state provisioning iup provisioningcode "$provisioningcode"
 	elif [ $httpurl128 ]; then
+		v "dhcp option 128 http config url $httpurl128"
 		uci_set_state provisioning iup urliup "$httpurl128"
 	elif [ $tftp ]; then
+		v "dhcp option 66 tftp config url $tftp"
 		if [ ${bootfile:0:1} == '/' ]; then
 			uci_set_state provisioning iup urliup "tftp://$tftp$bootfile"
 		else
@@ -420,70 +503,156 @@ if [ -n "$1" ]; then
 		fi
 	fi
 
-	# if we get vlanid and maybe vlanpriority, configure for that.
+	# vlanid (and vlanpriority)
 	if [ -n "$vlanid" -a -n "$vlanpriority" ]; then
-		logger -t dhcp_opt132 "vlanid: ${vlanid}, vlanpriority: ${vlanpriority}"
+		v "dhcp option 132 vlanid: ${vlanid} vlanpriority: ${vlanpriority}"
 		change_to_vlan ${vlanid} ${vlanpriority} ${interface}
 	elif [ -n "$vlanid" ]; then
-		logger -t dhcp_opt132 "vlanid: ${vlanid}"
+		v "dhcp option 132 vlanid: ${vlanid}"
 		change_to_vlan ${vlanid} 0 ${interface}
+	elif [ -n "$privopt225" ] || [ -n "$privopt226" ]; then
+		# opt225 and opt226 can be used together or separatly
+		if [ -n "$privopt225" ]; then
+			v "dhcp option 225: $privopt225"
+			# option225 is allowd to change only once per CPE
+			if [ "$(uci get -q ice.cloud.frozen)" != "1" ] ; then
+				uci set ice.cloud.frozen="1"
+				uci set ice.cloud.enabled="1"
+				uci set ice.cloud.server="$privopt225"
+			fi
+		fi
+		if [ -n "$privopt226" ]; then
+			v "dhcp option 226: $privopt226"
+			[ -z "$(uci get -q ice.dhcp)" ] && uci set ice.dhcp="dhcp"
+			uci set ice.dhcp.opt226connectionid="$privopt226"
+			ubus send dhcp.opt226connectionid '{"opt226connectionid":"","value":"'$privopt226'"}'
+		fi
+		uci commit
+	fi
+}
+
+# wait_for_default_gateway to become reachable
+# return 0 if the default gateway is reachable
+# return 1 if the default gateway is not reachable after $wait_time
+wait_for_default_gateway()
+{
+	local gateway
+	local device
+	local wait_time=120
+	local wait_interval=10
+
+	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
+		fi
+
+		v "Waiting for default gateway. Countdown $wait_time seconds"
+		sleep $wait_interval
+		wait_time=$((wait_time - wait_interval))
+		[ "$wait_time" -le "0" ] && break # timer expired
+	done
+
+	return 1 # default gateway not reachable
+}
+
+
+main()
+{
+
+	while [ -n "$1" ]; do
+		case "$1" in
+			-v) export VERBOSE="$(($VERBOSE + 1))";;
+			-q) export VERBOSE="$(($VERBOSE - 1))";;
+			--dhcp-options)
+				shift
+				parse_dhcp_options "$@"
+				exit 0
+				;;
+			-*)
+				echo "Invalid option: $1"
+				exit 1
+			;;
+			*) break;;
+		esac
+		shift;
+	done
+
+	if ! wait_for_default_gateway ; then
+		v "Default gateway is not reachable. Aborting iup."
+		exit 1
 	fi
 
-	exit 0
-fi
+	if [ ! -f $IUPMD5 ]; then
+		v "Creating file $IUPMD5"
+		touch $IUPMD5
+	fi
 
-local iupurl
-local configurl
-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
-config_get iupurl iup	urliup
+	local iupurl
+	local configurl
+	local software
+	local sofwareminuspath
 
-if [ $configurl ]; then
-	handle_provisioning configserver "0"
-elif [ $iupurl ]; then
-	handle_provisioning iup "1"
-else
-	v "No Provisioning Server Found"
-	exit
-fi
+	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
+	config_get iupurl iup	urliup
 
-config_load provisioning
-config_foreach handle_provisioning subconfig "0"
-config_get software uppgradeserver url
-sofwareminuspath=${software##*/}
-v "Software version to download $sofwareminuspath"
-
-if [ $software ]; then
-	local sysinfo=$(ubus call router.system info)
-	json_load "$sysinfo"
-	json_select system
-	json_get_var firmware firmware
-	json_get_var filesystem filesystem                                  
-        if [ "$filesystem" == "JFFS2" ] ; then                               
-                firmware=$firmware.w                                                                                                           
-        else                                                                 
-                firmware=$firmware.y                                         
-        fi     
-	if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
-		echo $software
-		handle_provisioning uppgradeserver "0"
+	if [ $configurl ]; then
+		handle_provisioning configserver "0"
+	elif [ $iupurl ]; then
+		handle_provisioning iup "1"
 	else
-		v "Will not update software, already up to date"
+		v "No provisioning server configured"
+		exit
 	fi
-fi
 
-if [ $CONF -eq 1 ]; then
-	mv "$IUPMD5.temp" $IUPMD5
-fi
+	config_load provisioning
+	config_foreach handle_provisioning subconfig "0"
+	config_get software uppgradeserver url
+	sofwareminuspath=${software##*/}
 
-if [ "$reboot" == "on" ]; then
-	v "Reboot Signaled"
-	/sbin/reboot
-fi
+	if [ $software ]; then
+		v "Software version to download \"$sofwareminuspath\""
+		local sysinfo=$(ubus call router.system info)
+		json_load "$sysinfo"
+		json_select system
+		json_get_var firmware firmware
+		json_get_var filesystem filesystem
+	        if [ "$filesystem" == "JFFS2" ] ; then
+	                firmware=$firmware.w
+		else
+			firmware=$firmware.y
+		fi
+		if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
+			v "Software \"$software\""
+			handle_provisioning uppgradeserver "0"
+		else
+			v "Will not update software, already up to date"
+		fi
+	fi
 
-rm -rf /var/run/iup.pid
+	if [ $CONF -eq 1 ]; then
+		mv "$IUPMD5.temp" $IUPMD5
+	fi
+
+	if [ "$reboot" == "on" ]; then
+		vv "Rebooting"
+		export REBOOT_REASON=iup
+		/sbin/reboot
+	fi
+
+	rm -rf /var/run/iup.pid
+}
+
+main $@

layer2interface/Makefile

@@ -29,8 +29,14 @@ endef
 define Build/Compile
 endef
 
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
 define Package/layer2interface/install
 	$(CP) ./broadcom/* $(1)/
 endef
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+define Package/layer2interface/install
+	$(CP) ./broadcom/* $(1)/
+endef
+endif
 
 $(eval $(call BuildPackage,layer2interface))

layer2interface/broadcom/lib/network/brcmwifi.sh

@@ -85,6 +85,7 @@ wlmngr_doWlConf() {
 
 	#wlctl -i wl$idx nreqd $nreqd
 	wlconf wl$idx up
+	wlctl -i wl$idx obss_coex 1
 }
 
 wlmngr_setupMbssMacAddr() {
@@ -98,22 +99,6 @@ wlmngr_setupMbssMacAddr() {
 	done
 }
 
-#enableBSD() {
-#	nvram_set bsd_role=0
-#	[ act_wl_cnt == 0 ] && return FALSE
-#	for i in wl0 wl1; do
-#		if [ m_instance_wl[i].m_wlVar.wlEnbl == TRUE && m_instance_wl[i].m_wlVar.bsdRole > 0 ]; then
-#			nvram set bsd_role=m_instance_wl[i].m_wlVar.bsdRole
-#			nvram set bsd_pport=m_instance_wl[i].m_wlVar.bsdPport
-#			nvram set bsd_hpport=m_instance_wl[i].m_wlVar.bsdHport
-#			nvram set bsd_helper=m_instance_wl[i].m_wlVar.bsdHelper
-#			nvram set bsd_primary=m_instance_wl[i].m_wlVar.bsdPrimary
-#			return TRUE
-#		fi
-#	done
-#	return FALSE
-#}
-
 #enableSSD() {
 #	nvram set ssd_enable=0
 #	[ act_wl_cnt == 0 ] && return FALSE
@@ -169,6 +154,91 @@ wlmngr_startServices() {
 #	}
 }
 
+enableBSD() {
+	local wdev wdev_to_steer
+	local enabled policy
+	local rssi_threshold bw_util
+
+	nvram set bsd_role=0
+	nvram unset bsd_ifnames
+
+	enabled="$(uci -q get wireless.bandsteering.enabled)"
+
+	[ "$enabled" == "1" ] || return 1
+
+	policy="$(uci -q get wireless.bandsteering.policy)"
+	policy=${policy:-0}
+	rssi_threshold="$(uci -q get wireless.bandsteering.rssi_threshold)"
+	rssi_threshold=${rssi_threshold:--75}
+	bw_util="$(uci -q get wireless.bandsteering.bw_util)"
+	bw_util=${bw_util:--60}
+
+	nvram set bsd_role=3
+	nvram set bsd_pport=9878
+	nvram set bsd_hpport=9877
+	nvram set bsd_helper=192.168.1.2
+	nvram set bsd_primary=192.168.1.1
+	nvram set bsd_scheme=2
+	nvram set bsd_poll_interval=1
+	nvram set bsd_bounce_detect="180 2 3600"
+	nvram set bsd_msglevel=0
+	nvram set bsd_status_poll=5
+	nvram set bsd_status=3
+	nvram set bsd_actframe=1
+	nvram set bsd_steer_no_deauth=1
+
+	for wdev in wl0 wl1; do
+		#if [ "$(uci -q get wireless.$wdev.band_steering)" == "1" ]; then
+			nvram set bsd_ifnames="$(nvram get bsd_ifnames) $wdev"
+			[ "$wdev" == "wl0" ] && wdev_to_steer="wl1" || wdev_to_steer="wl0"
+
+			if [ "$policy" == "0" ]; then
+				# RSSI Threshold based policy #
+				if [ "$(nvram get ${wdev}_nband)" == "2" ]; then
+					# 2.4G
+					nvram set ${wdev}_bsd_if_qualify_policy="0 0x0"
+					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"
+				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"
+				fi
+			else
+				# Bandwidth Usage based policy #
+				if [ "$(nvram get ${wdev}_nband)" == "2" ]; then
+					# 2.4G
+					nvram set ${wdev}_bsd_if_qualify_policy="0 0x0 -75"
+					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
+					nvram set ${wdev}_bsd_sta_select_policy="0 0 0 0 0 1 0 0 0 0x600"
+					nvram set ${wdev}_bsd_steer_prefix=$wdev
+					nvram set ${wdev}_bsd_steering_policy="0 5 3 0 0 0x10"
+				else
+					# 5G
+					nvram set ${wdev}_bsd_if_qualify_policy="40 0x0 -75"
+					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
+					nvram set ${wdev}_bsd_sta_select_policy="0 0 0 0 0 1 0 0 0 0x240"
+					nvram set ${wdev}_bsd_steer_prefix=$wdev
+					nvram set ${wdev}_bsd_steering_policy="$bw_util 5 3 0 0 0x40"
+				fi
+			fi
+		#fi
+	done
+	return 0
+}
+
+wlmngr_BSDCtrl() {
+	killall -q -15 bsd 2>/dev/null
+	if $(enableBSD); then
+		bsd&
+	fi
+}
+
 wlmngr_startWsc()
 {
 	local idx=$1
@@ -240,6 +310,20 @@ wlmngr_wlIfcUp() {
 			ifconfig $vif down
 		fi
 	done
+
+	case "$(uci -q get wireless.wl$idx.monitor)" in
+		1)
+			wlctl -i wl$idx monitor 1
+			ifconfig prism$idx up
+		;;
+		2)
+			wlctl -i wl$idx monitor 2
+			ifconfig radiotap$idx up
+		;;
+		*)
+			wlctl -i wl$idx monitor 0
+		;;
+	esac
 }
 
 wlmngr_doWds() {
@@ -269,10 +353,11 @@ wlmngr_finalize() {
 
 	# RADAR THRESHOLD VALUES #
 	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 $device msglevel +radar +dfs
-#	fi
+	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
+	fi
 	local rdrthrs="$(db get hw.$pcid.radarthrs)"
 	if [ -n "$rdrthrs" ]; then
 		wlctl -i wl$idx radarthrs $rdrthrs

layer2interface/broadcom/lib/network/vlan.sh

@@ -58,6 +58,19 @@ ifbaseexists()
 	return 0
 }
 
+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
+}
+
 addbrcmvlan()
 {
 	local baseifname=$1
@@ -102,9 +115,11 @@ addbrcmvlan()
 					vlanctl --if-create $baseifname $vlan8021q
 				else
 					vlanctl --dhcp-bridged --if-create $baseifname $vlan8021q
+					check_mac_address $baseifname $vlan8021q
 				fi
 			else
 				vlanctl --routed --if-create $baseifname $vlan8021q
+				check_mac_address $baseifname $vlan8021q
 			fi
 
 			if [ "$bridge" -eq 1 ]; then

libtrace/Makefile

@@ -0,0 +1,84 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libtrace
+PKG_VERSION:=3.0.22
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/apietila/libtrace.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_VERSION:=HEAD
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/uclibc++.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libtrace/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Libtrace library for packet trace processing
+  URL:=http://research.wand.net.nz/software/libtrace.php
+endef
+
+define Package/libtrace
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Libtrace library for packet trace processing
+  URL:=http://research.wand.net.nz/software/libtrace.php
+  DEPENDS:=+libpcap +libpthread +zlib +libbz2 +liblzo +librt $(CXX_DEPENDS)
+endef
+
+define Package/libtrace/description
+	Network trace processing library for trace processing. Supports multiple 
+	input methods, including device capture, raw and gz-compressed 
+	trace, and sockets.
+endef
+
+define Package/libtrace-tools
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Libtrace tools for packet trace processing
+  URL:=http://research.wand.net.nz/software/libtrace.php
+  DEPENDS:=+libncurses +libtrace
+endef
+
+define Package/libtrace-tools/description
+	Network trace processing tools for trace processing.
+endef
+
+CONFIGURE_ARGS += \
+        --with-bzip2 \
+        --with-zlib \
+	--with-lzo \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtrace.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwandio.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libtrace/install    
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libtrace.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libwandio.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump.so.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/libpacketdump
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump/*.so* $(1)/usr/lib/libpacketdump/
+endef
+
+define Package/libtrace-tools/install    
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{traceanon,tracediff,traceends,tracepktdump,tracereplay,tracereport,tracertstats,tracesplit,tracestats} $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libtrace))
+$(eval $(call BuildPackage,libtrace-tools))
+

logrotate/Makefile

@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=logrotate
+PKG_VERSION:=3.7.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/l/logrotate
+PKG_MD5SUM:=552639142e163745f6bcd4f1f3816d8a
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/logrotate
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libpopt
+  TITLE:=rotates, compresses, and mails system logs
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default, \
+		RPM_OPT_FLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \
+		LDFLAGS="$(EXTRA_LDFLAGS)" \
+		logrotate \
+	)
+endef
+
+define Package/logrotate/install	
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) ${PKG_BUILD_DIR}/logrotate $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc
+	$(CP) ./files/logrotate.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/logrotate.d
+endef
+
+$(eval $(call BuildPackage,logrotate))

logrotate/files/logrotate.conf

@@ -0,0 +1,30 @@
+# rotate log files weekly
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs
+rotate 4
+
+# create new (empty) log files after rotating old ones
+create
+
+notifempty
+nomail
+#olddir /var/log/backup/
+missingok
+#dateext
+
+# uncomment this if you want your log files compressed
+#compress
+
+# packages can drop log rotation information into this directory
+include /etc/logrotate.d
+
+# no packages own lastlog or wtmp -- we'll rotate them here
+#/var/log/wtmp {
+#    monthly
+#    create 0664 root utmp
+#    rotate 1
+#}
+
+# system-specific logs may be also be configured here.

logrotate/patches/01-dateext_maxage.patch

@@ -0,0 +1,433 @@
+diff -u -ruN logrotate-3.7.1.orig/config.c logrotate-3.7.1/config.c
+--- logrotate-3.7.1.orig/config.c	2003-08-07 07:13:14.000000000 -0400
++++ logrotate-3.7.1/config.c	2005-05-24 12:21:09.000000000 -0400
+@@ -511,6 +511,14 @@
+ 		newlog->flags &= ~LOG_FLAG_IFEMPTY;
+ 
+ 		*endtag = oldchar, start = endtag;
++	    } else if (!strcmp(start, "dateext")) {
++		newlog->flags |= LOG_FLAG_DATEEXT;
++
++		*endtag = oldchar, start = endtag;
++	    } else if (!strcmp(start, "nodateext")) {
++		newlog->flags &= ~LOG_FLAG_DATEEXT;
++
++		*endtag = oldchar, start = endtag;
+ 	    } else if (!strcmp(start, "noolddir")) {
+ 		newlog->oldDir = NULL;
+ 
+@@ -670,6 +678,21 @@
+ 		    }
+ 		    *endtag = oldchar, start = endtag;
+ 		}
++	    } else if (!strcmp(start, "maxage")) {
++		*endtag = oldchar, start = endtag;
++
++		if (!isolateValue(configFile, lineNum, "maxage count", &start,
++				  &endtag)) {
++		    oldchar = *endtag, *endtag = '\0';
++
++		    newlog->rotateAge = strtoul(start, &chptr, 0);
++		    if (*chptr || newlog->rotateAge < 0) {
++			message(MESS_ERROR, "%s:%d bad maximum age '%s'\n",
++				configFile, lineNum, start);
++			return 1;
++		    }
++		    *endtag = oldchar, start = endtag;
++		}
+ 	    } else if (!strcmp(start, "errors")) {
+ 		message(MESS_DEBUG, "%s: %d: the errors directive is deprecated and no longer used.\n",
+ 			configFile, lineNum);
+diff -u -ruN logrotate-3.7.1.orig/logrotate.8 logrotate-3.7.1/logrotate.8
+--- logrotate-3.7.1.orig/logrotate.8	2003-08-07 07:13:14.000000000 -0400
++++ logrotate-3.7.1/logrotate.8	2005-05-24 12:21:09.000000000 -0400
+@@ -200,6 +200,11 @@
+ Log files are rotated every day.
+ 
+ .TP
++\fBdateext\fR
++Archive old versions of log files adding a daily extension like YYYYMMDD
++instead of simply adding a number.
++
++.TP
+ \fBdelaycompress\fR
+ Postpone compression of the previous log file to the next rotation cycle.
+ This has only effect when used in combination with \fBcompress\fR.
+@@ -246,6 +251,12 @@
+ instead of the just-rotated file (this is the default).
+ 
+ .TP
++\fBmaxage\fR \fIcount\fR
++Remove rotated logs older than <count> days. The age is only checked
++if the logfile is to be rotated. The files are mailed to the
++configured address if \fBmaillast\fR and \fBmail\fR are configured.
++
++.TP
+ \fBmissingok\fR
+ If the log file is missing, go on to the next one without issuing an error
+ message. See also \fBnomissingok\fR.
+diff -u -ruN logrotate-3.7.1.orig/logrotate.c logrotate-3.7.1/logrotate.c
+--- logrotate-3.7.1.orig/logrotate.c	2004-10-19 17:41:24.000000000 -0400
++++ logrotate-3.7.1/logrotate.c	2005-05-24 12:21:09.000000000 -0400
+@@ -11,6 +11,7 @@
+ #include <sys/wait.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <glob.h>
+ 
+ #ifdef WITH_SELINUX
+ #include <selinux/selinux.h>
+@@ -22,6 +23,10 @@
+ #include "log.h"
+ #include "logrotate.h"
+ 
++#if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
++#define GLOB_ABORTED GLOB_ABEND
++#endif
++
+ typedef struct {
+     char * fn;
+     struct tm lastRotated;	/* only tm.mon, tm_mday, tm_year are good! */
+@@ -42,6 +47,14 @@
+ char * mailCommand = DEFAULT_MAIL_COMMAND;
+ time_t nowSecs = 0;
+ 
++static int globerr(const char * pathname, int theerr) {
++    message(MESS_ERROR, "error accessing %s: %s\n", pathname,
++	strerror(theerr));
++
++    /* We want the glob operation to continue, so return 0 */
++    return 1;
++}
++
+ static logState * findState(const char * fn, struct stateSet * sip) {
+     int i;
+     logState * states = sip->states;
+@@ -49,9 +62,11 @@
+     struct tm now = *localtime(&nowSecs);
+     time_t lr_time;
+ 
++    /* find the filename fn in the statesPtr list */
+     for (i = 0; i < numStates; i++) 
+ 	if (!strcmp(fn, states[i].fn)) break;
+ 
++    /* not in statesPtr list, so add new entry */
+     if (i == numStates) {
+ 	i = numStates++;
+ 	states = realloc(states, sizeof(*states) * numStates);
+@@ -121,6 +136,17 @@
+     return rc;
+ }
+ 
++static int removeLogFile(char * name) {
++    message(MESS_DEBUG, "removing old log %s\n", name);
++
++    if (!debug && unlink(name)) {
++	message(MESS_ERROR, "Failed to remove old log %s: %s\n",
++		name, strerror(errno));
++	return 1;
++    }
++    return 0;
++}
++
+ static int compressLogFile(char * name, logInfo * log, struct stat *sb) {
+     char * compressedName;
+     const char ** fullCommand;
+@@ -265,6 +291,25 @@
+     return rc;
+ }
+ 
++static int mailLogWrapper (char * mailFilename, char * mailCommand, int logNum, logInfo * log) {
++    /* if the log is compressed (and we're not mailing a
++     * file whose compression has been delayed), we need
++     * to uncompress it */
++    if ((log->flags & LOG_FLAG_COMPRESS) &&
++	!((log->flags & LOG_FLAG_DELAYCOMPRESS) &&
++	    (log->flags & LOG_FLAG_MAILFIRST))) {
++	if (mailLog(mailFilename, mailCommand,
++		    log->uncompress_prog, log->logAddress,
++		    log->files[logNum]))
++	    return 1;
++    } else {
++	if (mailLog(mailFilename, mailCommand, NULL,
++		    log->logAddress, mailFilename))
++	    return 1;
++    }
++    return 0;
++}
++
+ static int copyTruncate(char * currLog, char * saveLog, struct stat * sb, int flags) {
+     char buf[BUFSIZ];
+     int fdcurr = -1, fdsave = -1;
+@@ -479,6 +524,9 @@
+     char * baseName;
+     char * dirName;
+     char * firstRotated;
++    char * glob_pattern;
++    glob_t globResult;
++    int rc;
+     size_t alloc_size;
+     int rotateCount = log->rotateCount ? log->rotateCount : 1;
+     int logStart = (log->logStart == -1) ? 1 : log->logStart;
+@@ -509,7 +557,7 @@
+ 
+     alloc_size = strlen(dirName) + strlen(baseName) + 
+                  strlen(log->files[logNum]) + strlen(fileext) +
+-                 strlen(compext) + 10;
++                 strlen(compext) + 18;
+     
+     oldName = alloca(alloc_size);
+     newName = alloca(alloc_size);
+@@ -531,16 +579,116 @@
+     /* First compress the previous log when necessary */
+     if (log->flags & LOG_FLAG_COMPRESS &&
+         log->flags & LOG_FLAG_DELAYCOMPRESS) {
+-        struct stat sbprev;
+-	
+-        sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
+-        if (stat(oldName, &sbprev)) {
+-            message(MESS_DEBUG, "previous log %s does not exist\n",
+-		    oldName);
+-        } else {
+-	    hasErrors = compressLogFile(oldName, log, &sbprev);
++	if (log->flags & LOG_FLAG_DATEEXT) {
++	               /* glob for uncompressed files with our pattern */
++	    glob_pattern = malloc(strlen(dirName) + strlen(baseName)
++				  + strlen(fileext) + 44 );
++	    sprintf(glob_pattern,
++		    "%s/%s-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]%s",
++		    dirName, baseName, fileext);
++	    rc = glob(glob_pattern, 0, globerr, &globResult);
++	    if (!rc && globResult.gl_pathc > 0) {
++		for (i = 0; i < globResult.gl_pathc && !hasErrors; i++) {
++		    struct stat sbprev;
++		    sprintf(oldName,"%s",(globResult.gl_pathv)[i]);
++		    if (stat(oldName, &sbprev)) {
++			message(MESS_DEBUG, "previous log %s does not exist\n", oldName);
++		    } else {
++			hasErrors = compressLogFile(oldName, log, &sbprev);
++		    }
++		}
++	    } else {
++		message (MESS_DEBUG, "glob finding logs to compress failed\n");
++		/* fallback to old behaviour */
++		sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
++	    }
++	    globfree(&globResult);
++	    free(glob_pattern);
++	} else {
++	    struct stat sbprev;
++
++	    sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
++	    if (stat(oldName, &sbprev)) {
++		message(MESS_DEBUG, "previous log %s does not exist\n",
++			oldName);
++	    } else {
++		hasErrors = compressLogFile(oldName, log, &sbprev);
++	    }
+ 	}
+     }
++
++    firstRotated = alloca(strlen(dirName) + strlen(baseName) +
++			  strlen(fileext) + strlen(compext) + 30);
++
++    if(log->flags & LOG_FLAG_DATEEXT) {
++	/* glob for compressed files with our pattern
++	 * and compress ext */
++	glob_pattern = malloc(strlen(dirName)+strlen(baseName)
++			      +strlen(fileext)+strlen(compext)+44);
++	sprintf(glob_pattern,
++		"%s/%s-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]%s%s",
++		dirName, baseName, fileext, compext);
++	rc = glob(glob_pattern, 0, globerr, &globResult);
++	if (!rc) {
++	    /* search for files to drop, if we find one remember it,
++	     * if we find another one mail and remove the first and
++	     * remember the second and so on */
++	    struct stat fst_buf;
++	    int mail_out = -1;
++	    /* remove the first (n - rotateCount) matches
++	     * no real rotation needed, since the files have
++	     * the date in their name */
++	    for (i = 0; i < globResult.gl_pathc; i++) {
++		if( !stat((globResult.gl_pathv)[i],&fst_buf) ) {
++		    if ((i <= ((int)globResult.gl_pathc - rotateCount)) 
++			|| ((log->rotateAge > 0)
++			    && (((nowSecs - fst_buf.st_mtime)/60/60/24)
++				> log->rotateAge))) {
++			if ( mail_out != -1 ) {
++			    if (!hasErrors && log->logAddress) {
++				char * mailFilename = (globResult.gl_pathv)[mail_out];
++				hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
++				if (!hasErrors)
++				    hasErrors = removeLogFile(mailFilename);
++			    }
++			}
++			mail_out = i;
++		    }
++		}
++	    }
++	    if ( mail_out != -1 ) {
++		/* oldName is oldest Backup found (for unlink later) */
++		sprintf(oldName, "%s", (globResult.gl_pathv)[mail_out]);
++		strcpy(disposeName, oldName);
++	    } else
++		disposeName = NULL;
++	} else {
++	    message (MESS_DEBUG, "glob finding old rotated logs failed\n");
++	    disposeName = NULL;
++	}
++	/* firstRotated is most recently created/compressed rotated log */
++	sprintf(firstRotated, "%s/%s-%04d%02d%02d%s%s",
++		dirName, baseName, now.tm_year+1900,
++		now.tm_mon+1, now.tm_mday, fileext, compext);
++	globfree(&globResult);
++	free(glob_pattern);
++    } else {
++	if ( log->rotateAge ) {
++	    struct stat fst_buf;
++	    for (i=1; i <= rotateCount; i++) {
++		sprintf(oldName, "%s/%s.%d%s%s", dirName, baseName,
++			rotateCount + 1, fileext, compext);
++		if(!stat(oldName,&fst_buf)
++		    && (((nowSecs - fst_buf.st_mtime)/60/60/24)
++			> log->rotateAge)) {
++		    char * mailFilename = (globResult.gl_pathv)[i];
++		    if (!hasErrors && log->logAddress)
++			hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
++		    if (!hasErrors)
++			hasErrors = removeLogFile(mailFilename);
++		}
++	    }
++	}
+     
+     sprintf(oldName, "%s/%s.%d%s%s", dirName, baseName,
+             logStart + rotateCount, fileext, compext);
+@@ -548,8 +696,6 @@
+     
+     strcpy(disposeName, oldName);
+     
+-    firstRotated = alloca(strlen(dirName) + strlen(baseName) +
+-                          strlen(fileext) + strlen(compext) + 30);
+     sprintf(firstRotated, "%s/%s.%d%s%s", dirName, baseName,
+             logStart, fileext, 
+ 	    (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext);
+@@ -600,12 +746,27 @@
+ 	    }
+ 	}
+     }
+-    
++    } /* !LOG_FLAG_DATEEXT */
++ 
+     finalName = oldName;
+-    
+-    /* note: the gzip extension is *not* used here! */
+-    sprintf(finalName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
+-    
++
++    if(log->flags & LOG_FLAG_DATEEXT) {
++	char * destFile = alloca(strlen(dirName) + strlen(baseName) +
++				 strlen(fileext) + strlen(compext) + 30);
++	struct stat fst_buf;
++	sprintf(finalName, "%s/%s-%04d%02d%02d%s",
++		dirName, baseName, now.tm_year+1900,
++		now.tm_mon+1, now.tm_mday, fileext);
++	sprintf(destFile, "%s%s", finalName, compext);
++	if(!stat(destFile,&fst_buf)) {
++	    message (MESS_DEBUG, "destination %s already exists, skipping rotation\n", firstRotated);
++	    hasErrors = 1;
++	}
++    } else {
++	/* note: the gzip extension is *not* used here! */
++	sprintf(finalName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
++    }
++ 
+     /* if the last rotation doesn't exist, that's okay */
+     if (!debug && access(disposeName, F_OK)) {
+         message(MESS_DEBUG, "log %s doesn't exist -- won't try to "
+@@ -613,9 +774,6 @@
+         disposeName = NULL;
+     } 
+     
+-    free(dirName);
+-    free(baseName);
+-    
+     if (!hasErrors) {
+         if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
+             message(MESS_DEBUG, "running prerotate script\n");
+@@ -722,33 +880,12 @@
+             else
+                 mailFilename = disposeName;
+ 
+-            if (mailFilename) {
+-		/* if the log is compressed (and we're not mailing a
+-		   file whose compression has been delayed), we need
+-		   to uncompress it */
+-                if ((log->flags & LOG_FLAG_COMPRESS) &&
+-		    !((log->flags & LOG_FLAG_DELAYCOMPRESS) &&
+-		      (log->flags & LOG_FLAG_MAILFIRST))) {
+-		    if (mailLog(mailFilename, mailCommand, 
+-				log->uncompress_prog, log->logAddress, 
+-				log->files[logNum])) 
+-			hasErrors = 1;
+-		} else {
+-		    if (mailLog(mailFilename, mailCommand, NULL, 
+-			        log->logAddress, mailFilename))
+-			hasErrors = 1;
+-		}
+-	    }
++            if (mailFilename)
++		hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
+         }
+ 	
+         if (!hasErrors && disposeName) {
+-            message(MESS_DEBUG, "removing old log %s\n", disposeName);
+-	    
+-            if (!debug && unlink(disposeName)) {
+-                message(MESS_ERROR, "Failed to remove old log %s: %s\n",
+-			disposeName, strerror(errno));
+-                hasErrors = 1;
+-	    }
++	    hasErrors = removeLogFile(disposeName);
+ 	}
+     }
+     
+@@ -761,6 +898,8 @@
+ 	  }
+ 	}
+ #endif
++    free(dirName);
++    free(baseName);
+     return hasErrors;
+ }
+ 
+@@ -1047,7 +1186,9 @@
+ 
+ int main(int argc, const char ** argv) {
+     logInfo defConfig = { NULL, NULL, 0, NULL, ROT_SIZE, 
+-			  /* threshHold */ 1024 * 1024, 0,
++			  /* threshHold */ 1024 * 1024,
++			  /* rotateCount */ 0,
++			  /* rotateAge */ 0,
+ 			  /* log start */ -1,
+ 			  /* pre, post */ NULL, NULL,
+ 			  /* first, last */ NULL, NULL,
+diff -u -ruN logrotate-3.7.1.orig/logrotate.h logrotate-3.7.1/logrotate.h
+--- logrotate-3.7.1.orig/logrotate.h	2003-08-07 07:13:14.000000000 -0400
++++ logrotate-3.7.1/logrotate.h	2005-05-24 12:21:09.000000000 -0400
+@@ -15,6 +15,7 @@
+ #define LOG_FLAG_MAILFIRST	(1 << 6)
+ #define LOG_FLAG_SHAREDSCRIPTS	(1 << 7)
+ #define LOG_FLAG_COPY		(1 << 8)
++#define LOG_FLAG_DATEEXT	(1 << 9)
+ 
+ #define NO_FORCE_ROTATE 0
+ #define FORCE_ROTATE    1
+@@ -34,6 +35,7 @@
+     enum { ROT_DAYS, ROT_WEEKLY, ROT_MONTHLY, ROT_SIZE, ROT_FORCE } criterium;
+     unsigned int threshhold;
+     int rotateCount;
++    int rotateAge;
+     int logStart;
+     char * pre, * post, * first, * last;
+     char * logAddress;

logrotate/patches/02-datehack.patch

@@ -0,0 +1,12 @@
+diff -u -ruN logrotate-3.7.1.orig/logrotate.c logrotate-3.7.1/logrotate.c
+--- logrotate-3.7.1.orig/logrotate.c	2004-10-19 17:41:24.000000000 -0400
++++ logrotate-3.7.1/logrotate.c	2005-05-24 12:12:26.000000000 -0400
+@@ -1002,7 +1002,7 @@
+ 	}
+ 	
+ 	/* Hack to hide earlier bug */
+-	if ((year != 1900) && (year < 1996 || year > 2100)) {
++	if ((year != 1900) && (year < 1970 || year > 2100)) {
+ 	    message(MESS_ERROR, "bad year %d for file %s in state file %s\n",
+ 		    year, argv[0], stateFilename);
+ 	    fclose(f);

logrotate/patches/03-ignore_hidden.patch

@@ -0,0 +1,14 @@
+--- logrotate-3.7/config.c.orig	2005-04-26 22:57:53.000000000 -0400
++++ logrotate-3.7/config.c	2005-04-26 22:59:36.000000000 -0400
+@@ -142,6 +142,11 @@
+ 	(!fname[1] || (fname[1] == '.' && !fname[2])))
+ 	return 0;
+ 
++    /* Don't include 'hidden' files either; this breaks Gentoo 
++       portage config file management http://bugs.gentoo.org/87683 */
++    if (fname[0] == '.')
++	return 0;
++
+     /* Check if fname is ending in a taboo-extension; if so, return
+        false */
+     for (i = 0; i < tabooCount; i++) {

logrotate/patches/04-no_tmpdir.patch

@@ -0,0 +1,54 @@
+diff -u -ruN logrotate-3.7.1-cur/logrotate.c logrotate-3.7.1/logrotate.c
+--- logrotate-3.7.1-cur/logrotate.c	2005-05-25 18:20:41.000000000 -0400
++++ logrotate-3.7.1/logrotate.c	2005-05-25 18:21:10.000000000 -0400
+@@ -90,10 +90,7 @@
+ }
+ 
+ static int runScript(char * logfn, char * script) {
+-    int fd;
+-    char *filespec;
+     int rc;
+-    char buf[256];
+ 
+     if (debug) {
+ 	message(MESS_DEBUG, "running script with arg %s: \"%s\"\n", 
+@@ -101,38 +98,12 @@
+ 	return 0;
+     }
+ 
+-    filespec = buf;
+-    snprintf(buf, sizeof(buf), "%s/logrotate.XXXXXX", getenv("TMPDIR") ?: "/tmp");
+-    fd = -1;
+-    if (!filespec || (fd = mkstemp(filespec)) < 0 || fchmod(fd, 0700)) {
+-	message(MESS_DEBUG, "error creating %s: %s\n", filespec,
+-		strerror(errno));
+-	if (fd >= 0) {
+-	    close(fd);
+-	    unlink(filespec);
+-	}
+-	return -1;
+-    }
+-
+-    if (write(fd, "#!/bin/sh\n\n", 11) != 11 ||
+-	write(fd, script, strlen(script)) != strlen(script)) {
+-	message(MESS_DEBUG, "error writing %s\n", filespec);
+-	close(fd);
+-	unlink(filespec);
+-	return -1;
+-    }
+-
+-    close(fd);
+-
+     if (!fork()) {
+-	execlp(filespec, filespec, logfn, NULL);
++	execl("/bin/sh", "sh", "-c", script, NULL);
+ 	exit(1);
+     }
+ 
+     wait(&rc);
+-
+-    unlink(filespec);
+-
+     return rc;
+ }
+ 

logrotate/patches/05-taboo_to_debug.patch

@@ -0,0 +1,12 @@
+diff -u -ruN logrotate-3.7.1.orig/config.c logrotate-3.7.1/config.c
+--- logrotate-3.7.1.orig/config.c	2003-08-07 07:13:14.000000000 -0400
++++ logrotate-3.7.1/config.c	2005-05-24 12:13:41.000000000 -0400
+@@ -147,7 +147,7 @@
+     for (i = 0; i < tabooCount; i++) {
+ 	if (!strcmp(fname + strlen(fname) - strlen(tabooExts[i]),
+ 	    tabooExts[i])) {
+-	    message(MESS_ERROR, "Ignoring %s, because of %s "
++	    message(MESS_DEBUG, "Ignoring %s, because of %s "
+ 		    "ending\n", fname, tabooExts[i]);
+ 
+ 	    return 0;

logrotate/patches/06-weekly.patch

@@ -0,0 +1,22 @@
+--- logrotate-3.7.1-old/logrotate.c	2004-10-19 23:41:24.000000000 +0200
++++ logrotate-3.7.1-new/logrotate.c	2005-10-02 17:29:22.380767321 +0200
+@@ -424,12 +424,15 @@ int findNeedRotating(logInfo * log, int 
+         switch (log->criterium) {
+           case ROT_WEEKLY:
+             /* rotate if:
+-                  1) the current weekday is before the weekday of the
+-                     last rotation
++                  1) the day of the week is the same as the day of the week of
++                     the previous rotation but not the same day of the year
++                     this will rotate it on the same day every week, but not
++                     twice a day.
+                   2) more then a week has passed since the last
+                      rotation */
+-            state->doRotate = ((now.tm_wday < state->lastRotated.tm_wday) ||
+-			       ((mktime(&now) - mktime(&state->lastRotated)) >
++            state->doRotate = ((now.tm_wday == state->lastRotated.tm_wday &&
++				now.tm_yday != state->lastRotated.tm_yday) ||
++				((mktime(&now) - mktime(&state->lastRotated)) >
+ 				(7 * 24 * 3600)));
+             break;
+           case ROT_MONTHLY:

mtd-utils/Makefile

@@ -1,123 +0,0 @@
-# 
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mtd-utils
-PKG_VERSION:=1.5.1
-PKG_RELEASE:=3
-PKG_INSTALL:=1
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dd9f464eced6af7d5e6a4a920b727421229310f4
-PKG_SOURCE_URL:=http://public.inteno.se:/mtd-utils
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-FILES:= \
-	docfdisk \
-	doc_loadbios \
-	flashcp \
-	flash_erase \
-	flash_lock \
-	flash_otp_dump \
-	flash_otp_info \
-	flash_otp_lock \
-	flash_otp_write \
-	flash_unlock \
-	ftl_check \
-	ftl_format \
-	imagewrite \
-	jffs2dump \
-	jffs2reader \
-	mkfs.jffs2 \
-	mtd_debug \
-	nanddump \
-	nandtest \
-	nandwrite \
-	nftldump \
-	nftl_format \
-	recv_image \
-	rfddump \
-	rfdformat \
-	serve_image \
-	sumtool
-
-ifneq ($(CONFIG_LINUX_2_4),y)
-FILES += \
-	mkfs.ubifs \
-	mtdinfo \
-	ubiattach \
-	ubiblock \
-	ubicrc32 \
-	ubidetach \
-	ubiformat \
-	ubimkvol \
-	ubinfo \
-	ubinize \
-	deubinize \
-	ubirename \
-	ubirmvol \
-	ubirsvol \
-	ubiupdatevol
-endif
-
-define PartGen
-define Package/mtd-utils-$(subst _,-,$(1))
-  TITLE:=MTD $(1)
-  URL:=http://www.linux-mtd.infradead.org/
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=mtd-utils +zlib +liblzo +libuuid
-endef
-endef
-
-define Package/mtd-utils
-  TITLE:=Utilities for flash info/debug
-  SECTION:=utils
-  CATEGORY:=Utilities
-  MENU:=1
-endef
-
-define Package/mtd-utils/description
-  Utilities for manipulating memory technology devices.
-endef
-
-define Package/mtd-utils/install
-	true
-endef
-
-$(foreach file,$(FILES),$(eval $(call PartGen,$(file))))
-
-MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	BUILDDIR="$(PKG_BUILD_DIR)" \
-	LDLIBS+="$(LIBGCC_S)" \
-	WITHOUT_XATTR=1
-
-ifeq ($(CONFIG_LINUX_2_4),y)
-MAKE_FLAGS += \
-	SUBDIRS=""
-endif
-
-define PartInstall
-define Package/mtd-utils-$(subst _,-,$(1))/install
-	$(INSTALL_DIR) \
-		$$(1)/usr/sbin
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/$(1) \
-		$$(1)/usr/sbin/
-endef
-endef
-
-$(foreach file,$(FILES),$(eval $(call PartInstall,$(file))))
-
-$(eval $(call BuildPackage,mtd-utils))
-$(foreach file,$(FILES),$(eval $(call BuildPackage,mtd-utils-$(subst _,-,$(file)))))

multiwan/files/usr/bin/multiwan

@@ -27,9 +27,9 @@ failover() {
 
     add() {
 
-	wan_fail_map=$(echo $wan_fail_map | sed -e "s/${1}\[${failchk}\]//g")
+	wan_fail_map=$(echo $wan_fail_map | sed -e "s/\(^\|.*\]\)${1}\[${failchk}\]/\1/g")
 	wan_fail_map="$wan_fail_map${1}[x]"
-	wan_recovery_map=$(echo $wan_recovery_map | sed -e "s/${1}\[${recvrychk}\]//g")
+	wan_recovery_map=$(echo $wan_recovery_map | sed -e "s/\(^\|.*\]\)${1}\[${recvrychk}\]/\1/g")
 	update_cache
 
 	if [ "$existing_failover" == "2" ]; then
@@ -46,8 +46,8 @@ failover() {
 
     del() {
 
-	wan_recovery_map=$(echo $wan_recovery_map | sed -e "s/${1}\[${recvrychk}\]//g")
-	wan_fail_map=$(echo $wan_fail_map | sed -e "s/${1}\[${failchk}\]//g")
+	wan_recovery_map=$(echo $wan_recovery_map | sed -e "s/\(^\|.*\]\)${1}\[${recvrychk}\]/\1/g")
+	wan_fail_map=$(echo $wan_fail_map | sed -e "s/\(^\|.*\]\)${1}\[${failchk}\]/\1/g")
 	update_cache
 
 	if [ "$existing_failover" == "3" ]; then
@@ -70,7 +70,7 @@ fail_wan() {
 
     local failchk=$(query_config failchk $1)
     local recvrychk=$(query_config recvrychk $1)
-    wan_recovery_map=$(echo $wan_recovery_map | sed -e "s/${1}\[${recvrychk}\]//g")
+    wan_recovery_map=$(echo $wan_recovery_map | sed -e "s/\(^\|.*\]\)${1}\[${recvrychk}\]/\1/g")
 
     if [ -z "$failchk" ]; then
 	failchk=1
@@ -80,7 +80,7 @@ fail_wan() {
     if [ "$failchk" != "x" ]; then
 	new_fail_count=$(($failchk + 1))
 	if [ "$new_fail_count" -lt "$health_fail_retries" ]; then
-	    wan_fail_map=$(echo $wan_fail_map | sed -e "s/${1}\[${failchk}\]/$1\[${new_fail_count}\]/g")
+	    wan_fail_map=$(echo $wan_fail_map | sed -e "s/\(^\|.*\]\)${1}\[${failchk}\]/\1${1}\[${new_fail_count}\]/g")
 	else
 	    failover add $1
 	    refresh_dns
@@ -103,7 +103,7 @@ recover_wan() {
     local wanid=$(query_config wanid $1)
 
     if [ ! -z "$failchk" -a "$failchk" != "x" ]; then
-	wan_fail_map=$(echo $wan_fail_map | sed -e "s/${1}\[${failchk}\]//g")
+	wan_fail_map=$(echo $wan_fail_map | sed -e "s/\(^\|.*\]\)${1}\[${failchk}\]/\1/g")
 	update_cache
     fi
 
@@ -117,7 +117,7 @@ recover_wan() {
 	else
 	    new_recovery_count=$(($recvrychk + 1))
 	    if [ "$new_recovery_count" -lt "$health_recovery_retries" ]; then
-		wan_recovery_map=$(echo $wan_recovery_map | sed -e "s/${1}\[${recvrychk}\]/$1\[${new_recovery_count}\]/g")
+		wan_recovery_map=$(echo $wan_recovery_map | sed -e "s/\(^\|.*\]\)${1}\[${recvrychk}\]/\1${1}\[${new_recovery_count}\]/g")
 		update_cache
 	    else
 		failover del $1
@@ -138,11 +138,12 @@ acquire_wan_data() {
     local old_gateway
 
     local ifname ipaddr gateway
+	network_flush_cache
     network_get_device  ifname  ${1} || ifname=x
     network_get_ipaddr  ipaddr  ${1} || ipaddr=x
     network_get_gateway gateway ${1} || gateway=x
 
-    check_old_map=$(echo $wan_id_map 2>&1 | grep -o "$1\[")
+    check_old_map=$(echo $wan_id_map 2>&1 | grep -o -e "^$1\[" -e "\]$1\[")
 
     if [ -z $check_old_map ]; then
 	wancount=$(($wancount + 1))
@@ -160,9 +161,9 @@ acquire_wan_data() {
 	old_ifname=$(query_config ifname $1)
 	get_wanid=$(query_config wanid $1)
 
-	wan_if_map=$(echo $wan_if_map | sed -e "s/${1}\[${old_ifname}\]/$1\[${ifname}\]/g")
-	wan_ip_map=$(echo $wan_ip_map | sed -e "s/${1}\[${old_ipaddr}\]/$1\[${ipaddr}\]/g")
-	wan_gw_map=$(echo $wan_gw_map | sed -e "s/${1}\[${old_gateway}\]/$1\[${gateway}\]/g")
+	wan_if_map=$(echo $wan_if_map | sed -e "s/\(^\|.*\]\)${1}\[${old_ifname}\]/\1${1}\[${ifname}\]/g")
+	wan_ip_map=$(echo $wan_ip_map | sed -e "s/\(^\|.*\]\)${1}\[${old_ipaddr}\]/\1${1}\[${ipaddr}\]/g")
+	wan_gw_map=$(echo $wan_gw_map | sed -e "s/\(^\|.*\]\)${1}\[${old_gateway}\]/\1${1}\[${gateway}\]/g")
 
 	if [ "$old_ifname" != "$ifname" ]; then
 	    iptables -D MultiWanPreHandler -t mangle -i $old_$ifname -m state --state NEW -j FW${get_wanid}MARK
@@ -205,14 +206,14 @@ update_cache() {
 
 query_config() {
     case $1 in
-	ifname) echo $wan_if_map | grep -o "$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';; 
-	ipaddr) echo $wan_ip_map | grep -o "$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
-	gateway) echo $wan_gw_map | grep -o "$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
-	wanid) echo $wan_id_map | grep -o "$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
-	failchk) echo $wan_fail_map | grep -o "$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
-	recvrychk) echo $wan_recovery_map | grep -o "$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
-	monitor) echo $wan_monitor_map | grep -o "$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
-	group) echo $wan_id_map | grep -o "\w*\[$2\]" | awk -F "[" '{print $1}';;
+	ifname)		echo $wan_if_map	| grep -o -e "^$2\[\w*.*\]" -e "\]$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
+	ipaddr)		echo $wan_ip_map	| grep -o -e "^$2\[\w*.*\]" -e "\]$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
+	gateway)	echo $wan_gw_map	| grep -o -e "^$2\[\w*.*\]" -e "\]$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
+	wanid)		echo $wan_id_map	| grep -o -e "^$2\[\w*.*\]" -e "\]$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
+	failchk)	echo $wan_fail_map	| grep -o -e "^$2\[\w*.*\]" -e "\]$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
+	recvrychk)	echo $wan_recovery_map	| grep -o -e "^$2\[\w*.*\]" -e "\]$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
+	monitor)	echo $wan_monitor_map	| grep -o -e "^$2\[\w*.*\]" -e "\]$2\[\w*.*\]" | awk -F "[" '{print $2}' | awk -F "]" '{print $1}';;
+	group)		echo $wan_id_map	| grep -o "\w*\[$2\]" | awk -F "[" '{print $1}';;
     esac
 }
 
@@ -435,6 +436,34 @@ mwanrule() {
     add_rule
 }
 
+
+get_dns_servers() {
+	local group=$1
+	local groups=$1
+	local dns=""
+	local dnss=""
+	local aliases=""
+	local g
+
+	aliases="$(uci show network| grep =\'@$group\')"
+
+	for g in $aliases ; do
+		g=${g#*.}; g=${g%%.*}
+		[ "$(uci -q get network.$g)" == "interface" ] || continue
+		groups="$groups $g"
+	done
+
+	groups="$(echo $groups | tr ' ' '\n' | sort -u | tr '\n' ' ')"
+
+	for group in $groups ; do
+		network_get_dnsserver dns ${group}
+		dnss="$dnss $dns"
+	done
+
+	echo $dnss
+}
+
+
 refresh_dns() {
     local dns
     local group
@@ -445,6 +474,8 @@ refresh_dns() {
     local compile_dns
     local dns_server
 
+	network_flush_cache
+
     iptables -F MultiWanDNS -t mangle
 
     rm /tmp/resolv.conf.auto
@@ -461,8 +492,8 @@ refresh_dns() {
 	failchk=$(query_config failchk $group)
 
 	dns=$(uci_get_state multiwan ${group} dns 'auto')
-	[ "$dns" == "auto" ] && network_get_dnsserver dns ${group}
-	dns=$(echo $dns | sed -e "s/ /\n/g")
+	[ "$dns" == "auto" ] && dns=$(get_dns_servers $group)
+	dns=$(echo $dns | sed -e "s/\,/ /g" | sed -e "s/ /\n/g")
 
 	if [ ! -z "$dns" -a "$failchk" != "x" -a "$ipaddr" != "x" -a "$gateway" != "x" -a "$ifname" != "x" ]; then
 	    echo "$dns" | while read dns_server; do
@@ -822,6 +853,7 @@ monitor_wan() {
     while :; do
 	[ "${health_monitor%.*}" = 'parallel' ] && sleep $health_interval
 
+	network_flush_cache
 	network_get_device  ifname  ${1} || ifname=x
 	network_get_ipaddr  ipaddr  ${1} || ipaddr=x
 	network_get_gateway gateway ${1} || gateway=x
@@ -892,7 +924,7 @@ monitor_wan() {
 	fi
 
 	[ "$health_monitor" = 'serial' ] && {
-	    wan_monitor_map=$(echo $wan_monitor_map | sed -e "s/$1\[\w*\]/$1\[$(date +%s)\]/g")
+	    wan_monitor_map=$(echo $wan_monitor_map | sed -e "s/\(^\|.*\]\)${1}\[\w*\]/\1${1}\[$(date +%s)\]/g")
 	    update_cache
 	    break
 	}

natalie-dect/Makefile

@@ -42,6 +42,10 @@ define Package/natalie-dect
   DEPENDS:=bcmkernel
 endef
 
+define Package/natalie-dect/config
+	source "$(SOURCE)/Config.in"
+endef
+
 define Package/natalie-dect/description
 	Kernel dect driver
 endef
@@ -51,13 +55,16 @@ define Build/Compile
 endef
 endif
 
-define Package/natalie-dect/install
-	mkdir -p $(1)/lib/modules/$(BCM_KERNEL_VERSION)/extra/
 ifeq ($(CONFIG_NATALIE_OPEN),y)
+define Package/natalie-dect/install
+	$(INSTALL_DIR) $(1)/lib/modules/$(BCM_KERNEL_VERSION)/extra
 	$(CP) $(PKG_BUILD_DIR)/dect.ko $(1)/lib/modules/$(BCM_KERNEL_VERSION)/extra/dect.ko
-else
-	$(CP) $(PKG_BUILD_DIR)/NatalieFpCvm6362/Src/Projects/NatalieV3/FpCvm/Linux6362/dects.ko $(1)/lib/modules/$(BCM_KERNEL_VERSION)/extra/dect.ko
-endif
 endef
+else
+define Package/natalie-dect/install
+	$(INSTALL_DIR) $(1)/lib/modules/$(BCM_KERNEL_VERSION)/extra
+	$(CP) $(PKG_BUILD_DIR)/NatalieFpCvm6362/Src/Projects/NatalieV3/FpCvm/Linux6362/dects.ko $(1)/lib/modules/$(BCM_KERNEL_VERSION)/extra/dect.ko
+endef
+endif
 
 $(eval $(call BuildPackage,natalie-dect))

peripheral_manager/Makefile

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

peripheral_manager/files/etc/init.d/peripheral_led_normal

@@ -0,0 +1,15 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+
+
+USE_PROCD=0
+NAME=peripheral_led_normal
+
+start_service() {
+	ubus -t 2 wait_for led.status
+	ubus call led.status set '{"state":"ok"}'
+	ubus -t 2 wait_for button
+}
+
+

peripheral_manager/files/etc/init.d/peripheral_manager

@@ -16,11 +16,12 @@ start_service() {
 
 service_running() {
 	ubus -t 2 wait_for led.status
-	ubus call led.status set '{"state":"ok"}'
+	ubus call led.status set '{"state":"notice"}'
 	ubus -t 2 wait_for button
 }
 
-stop() {
-	service_stop /sbin/peripheral_manager
+stop_service() {
+    ubus call leds set '{"state":"alloff"}'
+    service_stop /sbin/peripheral_manager
 }
 

port-management/files/etc/init.d/port_management

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=21
+START=15
 USE_PROCD=1
 
 . /lib/functions.sh
@@ -93,14 +93,14 @@ set_port_status() {
 						esac
 					;;
 					10*AUTO)
-						ethctl $port media-type advertise $status $flag
+						ethctl $port media-type $flag advertise $status
 					;;
 					10*)
-						ethctl $port media-type $status $flag
+						ethctl $port media-type $flag $status
 					;;
 					*)
-						ethctl $port media-type advertise 1000FDAUTO $flag
-						ethctl $port media-type auto $flag
+						ethctl $port media-type $flag advertise 1000FDAUTO
+						ethctl $port media-type $flag auto
 					;;
 				esac
 			else
@@ -110,34 +110,6 @@ set_port_status() {
 	esac
 }
 
-set_fiber_status() {
-	local port="$1"
-	local status="$2"
-	local flag=$(sfp_flag $port "fiber")
-	local curstatus=$(get_current_status $port $flag)
-
-	case "$status" in
-		disabled)
-			ethctl $port phy-power down
-		;;
-		*)
-			if [ "$status" != "$curstatus" ]; then
-				case "$status" in
-					100*FD|auto)
-						ethctl $port media-type $status $flag
-						ethctl $port phy-power up
-					;;
-					*)
-						ethctl $port media-type advertise 1000FDAUTO $flag
-						ethctl $port media-type auto $flag
-					;;
-				esac
-			fi
-			ethctl $port phy-power up
-		;;
-	esac
-}
-
 configure_ethports(){
 	local port ifname pause speed
 	name=$1
@@ -148,16 +120,6 @@ configure_ethports(){
 	set_port_pause $ifname $pause
 }
 
-configure_sfpports(){
-	local port ifname pause speed
-	name=$1
-	config_get speed $name speed
-	config_get ifname $name ifname
-	config_get pause $name pause
-	set_fiber_status $ifname $speed
-	set_port_pause $ifname $pause
-}
-
 #arg1: ethX
 #arg2: 0 or 1
 set_port_pause() {
@@ -168,10 +130,12 @@ set_port_pause() {
 }
 
 start_service() {
-	check_for_config
+	[ -f /sbin/db ] && check_for_config
+
+	[ -f /usr/sbin/ethswctl -a -f /usr/sbin/ethctl ] || return
+
 	config_load ports
 	config_foreach configure_ethports ethport
-	config_foreach configure_sfpports sfpport
 }
 
 service_triggers() {

port-management/files/etc/init.d/sfp_management

@@ -0,0 +1,88 @@
+#!/bin/sh /etc/rc.common
+
+START=97
+USE_PROCD=1
+
+. /lib/functions.sh
+. /lib/network/config.sh
+
+get_current_status() {
+	local port="$1"
+	local flag="$2"
+	local media="$(ethctl $port media-type $flag 2>&1)"
+	if echo $media | grep "Auto-negotiation enabled" >/dev/null; then
+		echo "auto"
+	elif echo $media | grep "100 mbps, full-duplex" >/dev/null; then
+		echo "100FD"
+	elif echo $media | grep "100 mbps, half-duplex" >/dev/null; then
+		echo "100HD"
+	elif echo $media | grep "10 mbps, full-duplex" >/dev/null; then
+		echo "10FD"
+	elif echo $media | grep "10 mbps, half-duplex" >/dev/null; then
+		echo "10HD"
+	fi
+}
+
+sfp_flag(){
+	local port=$1
+	local sfptype=$2
+	local media="$(ethctl $port media-type 2>&1 | grep 'This is probably wrong')"
+	[ -z "$media" ] && echo "" || echo "sfp $sfptype"
+}
+
+set_fiber_status() {
+	local port="$1"
+	local status="$2"
+	local flag=$(sfp_flag $port "fiber")
+	local curstatus=$(get_current_status $port $flag)
+
+	case "$status" in
+		disabled)
+			ethctl $port phy-power down
+		;;
+		*)
+			if [ "$status" != "$curstatus" ]; then
+				case "$status" in
+					100*FD|auto)
+						ethctl $port media-type $status $flag
+						ethctl $port phy-power up
+					;;
+					*)
+						ethctl $port media-type advertise 1000FDAUTO $flag
+						ethctl $port media-type auto $flag
+					;;
+				esac
+			fi
+			ethctl $port phy-power up
+		;;
+	esac
+}
+
+configure_sfpports(){
+	local port ifname pause speed
+	name=$1
+	config_get speed $name speed
+	config_get ifname $name ifname
+	config_get pause $name pause
+	set_fiber_status $ifname $speed
+	set_port_pause $ifname $pause
+}
+
+#arg1: ethX
+#arg2: 0 or 1
+set_port_pause() {
+	local pause="$2"
+	unit=$(echo $(get_port_number $1) | cut -d ' ' -f 1)
+	port=$(echo $(get_port_number $1) | cut -d ' ' -f 2)
+	ethswctl -c pause -n $unit -p $port -v $pause
+}
+
+start_service() {
+	config_load ports
+	config_foreach configure_sfpports sfpport
+}
+
+service_triggers() {
+	procd_add_reload_trigger ports
+}
+

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.1.20
+PKG_VERSION:=3.1.38
 
-PKG_SOURCE_VERSION:=0a8dbd0c6598f22760b04605a4dbe07f772fb1a7
+PKG_SOURCE_VERSION:=8a89a36d534492f198305fb97da68adefccf5f5d
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 
@@ -19,24 +19,31 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-QUESTD_CLFAGS:=-DIOPSYS_BROADCOM
+QUESTD_TARGET:=-DIOPSYS_BROADCOM
 KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-QUESTD_CLFAGS:=-DIOPSYS_BROADCOM
+QUESTD_TARGET:=-DIOPSYS_BROADCOM
 else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-QUESTD_CLFAGS:=-DIOPSYS_MARVELL
+QUESTD_TARGET:=-DIOPSYS_MARVELL
 else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y)
-QUESTD_CLFAGS:=-DIOPSYS_LANTIQ
+QUESTD_TARGET:=-DIOPSYS_LANTIQ
+else ifeq ($(CONFIG_TARGET_iopsys_ramips_ex400),y)
+QUESTD_TARGET:=-DIOPSYS_MEDIATEK
+QUESTD_CFLAGS:=\
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny
 else
 $(info (UNEXPECTED CONFIG TARGET))
 endif
+QUESTD_CFLAGS:=$(QUESTD_CFLAGS) $(QUESTD_TARGET)
 
+export QUESTD_TARGET
 export KERNEL_DIR
-export QUESTD_CLFAGS
+export QUESTD_CFLAGS
 
 define Package/questd
 	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +ubus +libpthread
+	DEPENDS:=+libuci +libubox +ubus +libpthread +(TARGET_iopsys_ramips_ex400):swconfig +(TARGET_iopsys_ramips_ex400):libnl-tiny
 	TITLE:=router info daemon
 endef
 
@@ -50,11 +57,9 @@ define Package/questd/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wificontrol $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/graphd $(1)/sbin/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netcheck $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/router.sh $(1)/usr/libexec/rpcd/router
-	#$(INSTALL_BIN) $(PKG_BUILD_DIR)/wps.sh $(1)/usr/libexec/rpcd/wps
 endef
 
 $(eval $(call BuildPackage,questd))

questd/files/etc/init.d/quest

@@ -11,10 +11,18 @@ start_service() {
 	procd_set_param command "/sbin/questd"
 	procd_set_param respawn
 	procd_close_instance
+
+	procd_open_instance
+	procd_set_param command "/sbin/graphd"
+	procd_set_param respawn
+	procd_close_instance
+
+	pidof imonitor > /dev/null 2>&1 || /sbin/imonitor &
 }
 
 stop() {
 	service_stop /sbin/questd
+	service_stop /sbin/graphd
 }
 
 service_triggers()

questd/files/sbin/imonitor

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

samba3/files/samba.config

@@ -3,5 +3,4 @@ config samba
         option 'workgroup'	'IntenoSMB'
         option 'description'	'IntenoSMB'
         option 'homes'		'0'
-	option 'interface'	'lan'
 

tptest/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=tptest
 PKG_VERSION:=1.3
 PKG_RELEASE:=0
 
-PKG_SOURCE_VERSION:=4dfab45a92328226c8182347df50e86a5d72ca5f
+PKG_SOURCE_VERSION:=57786908e7a0c790f303417b459c562887582384
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/tptest
 

tptest/files/etc/config/speedtest

@@ -3,14 +3,6 @@ config testserver '1'
 	option port '1640'
 
 config testserver '2'
-	option server 'tptest.dataphone.se'
-	option port '1640'
-
-config testserver '3'
 	option server 'referens.sth.ip-performance.se'
 	option port '1642'
 
-config testserver '4'
-	option server 'tptest.songnetworks.se'
-	option port '1640'
-

uboot/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=2016.08
 PKG_RELEASE:=1
 PKG_SOURCE_URL:=git@private.inteno.se:uboot
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e925b36e4e29416aac7f2a64ef40d44ef034d4c4
+PKG_SOURCE_VERSION:=08fb2b839326c3bc2a2a0472b5dae6ee0288e483
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -72,9 +72,13 @@ endef
 
 define Package/uboot/install/default
 	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
+	$(INSTALL_DIR) $$(1)/boot
 	$(CP) \
 		$(PKG_BUILD_DIR)/uboot.img \
 		$(BIN_DIR)/$(TARGET)/
+	$(CP) \
+		$(PKG_BUILD_DIR)/uboot.img \
+		$$(1)/boot
 	$(INSTALL_DIR) $$(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $$(1)/usr/sbin/
 	ln -s /usr/sbin/fw_printenv $$(1)/usr/sbin/fw_setenv

voice-client/files/etc/asterisk/special_rate_nr.cfg

@@ -0,0 +1,25 @@
+AUS;19x+
+BEL;09xx+
+BRA;05xx+
+CHL;
+CHN;
+CZE;9xx+
+DNK;90xx+
+ETS;
+FIN;0(7[0,5]|[1-3,6]0)x+
+FRA;0[8,9]xx+
+DEU;0(9xx|137)x+
+HUN;06-[8,9]x+
+IND;
+ITA;8
+JPN;0990x+
+NLD;09xx+
+NZL;0900x+
+USA;1-900x+
+ESP;([8,9]0x|118)x+
+SWE;90510,09(00|39|44)x+,099x+
+CHE;09xx+
+NOR;82x+
+TWN;020[3,4,9]x+
+GBR;0[8,9]xx+
+ARE;[2,6]00x+

voice-client/files/etc/asterisk_templates/cdr_syslog.conf.TEMPLATE

@@ -0,0 +1,5 @@
+[syslog]
+
+facility = local0
+priority = cdr
+template = "callId:${CDR(clid)}, src:${CDR(src)}, dst:${CDR(dst)}, dstContext:${CDR(dcontext)}, chan:${CDR(channel)}, dstChan:${CDR(dstchannel)},$ app:${CDR(lastapp)}, arg:${CDR(lastdata)}, start:${CDR(start)}, answ:${CDR(answer)}, end:${CDR(end)}, duration:${CDR(duration)}, billsec:${CDR(billsec)}, dispos:${CDR(disposition)}, amaflag:${CDR(amaflags)}, accCode:${CDR(accountcode)}, uniqId:${CDR(uniqueid)}, userfield:${CDR(userfield)}"

voice-client/files/etc/config/voice_client

@@ -167,3 +167,6 @@ config 'sip_service_provider' 'sip0'
 	option 'is_fax' '0'
 	option 'transport' 'udp'
 
+config cdr_log 'CDR_LOG'
+        option cdr_syslog '0'
+

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

@@ -66,6 +66,7 @@ TMPL_QUEUE=$TEMPLATEDIR/queue.TEMPLATE
 
 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_LOGGER=$TEMPLATEDIR/logger.conf.TEMPLATE
 TMPL_MANAGER=$TEMPLATEDIR/manager.conf.TEMPLATE
@@ -79,6 +80,8 @@ TMPL_BRCM_LINE=$TEMPLATEDIR/brcm_line.TEMPLATE
 
 TMPL_MEETME=$TEMPLATEDIR/meetme.conf.TEMPLATE
 
+SPECRATEDIR=$ASTERISKDIR/special_rate_nr.cfg
+
 run_hook()
 {
 	h="$1_hook"
@@ -140,11 +143,13 @@ assemble_and_copy_config()
 	# 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
 	
 	test -e $TMPL_MEETME && cp $TMPL_MEETME $WORKDIR/meetme.conf
 	
@@ -840,6 +845,7 @@ encrypt_password()
 		if [ -e /usr/bin/voicesec ] ; then
 			echo "Encrypting password for $1"
 			/usr/bin/voicesec -e $secret > /usr/lib/asterisk/voicesec_$1
+			fsync /usr/lib/asterisk/voicesec_$1
 		fi
 		uci_remove voice_client $1 secret
 		uci_commit voice_client
@@ -1113,6 +1119,21 @@ configure_cdr()
 {
 	mkdir -p /var/log/asterisk/cdr-csv
 	touch /var/log/asterisk/cdr-csv/Master.csv
+
+
+	local cdr_syslog
+	config_get cdr_syslog CDR_LOG cdr_syslog
+
+	echo "cdr_syslog: $cdr_syslog"
+
+        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
+	fi
 }
 
 #
@@ -1147,7 +1168,7 @@ configure_call_filters()
 			break
 		fi
 	done < "/etc/idc_cc.cfg"
-	
+ 
 	echo "Found IDCs: $idc"
 	echo "Found CCs: $cc"
 
@@ -1165,6 +1186,43 @@ configure_call_filters()
 	echo "exten => s,n,MacroExit()" >>			$WORKDIR/macros.tmp
 	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")
+		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"
+
+	echo "Found special rate numbers: $srn"
+
+	echo "[macro-check-special-rate]" >>			$WORKDIR/macros.tmp
+	echo "exten => s,1,NoOp(${srn})" >>			$WORKDIR/macros.tmp
+
+	# Create regex patterns
+	# All x characters are replaced with [0-9] to match a single digit
+	srn="($(echo $srn | tr -s "" | tr "," "|" | sed 's/x/[0-9]/g'))"
+
+	echo "exten => s,n,GotoIf($[\"\${ARG1}\":\"(^$srn$)\">0]?special-rate:normal-rate)" >> $WORKDIR/macros.tmp
+	echo "exten => s,n(special-rate),Set(SPECRATE=1)" >>	$WORKDIR/macros.tmp
+	echo "exten => s,n,MacroExit()" >>			$WORKDIR/macros.tmp
+	echo "exten => s,n(normal-rate),Set(SPECRATE=0)" >>	$WORKDIR/macros.tmp
+	echo "" >>						$WORKDIR/macros.tmp
 }
 
 #
@@ -1194,7 +1252,7 @@ configure_call_filter_helper()
 	config_get block_special_rate $1 block_special_rate
 
 	[ "$#" -ge 2 ] || return 0
-	
+
 	direction=$2
 	if ! [ "x$direction" != "xincoming" -o "x$direction" != "xoutgoing" ] ; then
 		return
@@ -1220,6 +1278,11 @@ configure_call_filter_helper()
 		echo "exten => s,n,GotoIf($[\${FOREIGN}==1]?block)" >>		$WORKDIR/macros.tmp
 	fi
 
+	if [ "x$direction" == "xoutgoing" -a "x$block_special_rate" == "x1" ] ; then
+		echo "exten => s,n,Macro(check-special-rate,\${DIAL_EXTEN})" >>	$WORKDIR/macros.tmp
+		echo "exten => s,n,GotoIf($[\${SPECRATE}==1]?block)" >>		$WORKDIR/macros.tmp
+	fi
+
 	local section cfgtype owner
 	for section in ${CONFIG_SECTIONS}; do
 		config_get cfgtype "$section" TYPE
@@ -1229,7 +1292,6 @@ configure_call_filter_helper()
 			local rule_extension rule_enabled
 			config_get rule_extension $section extension
 			config_get rule_enabled $section enabled
-
 			[ -z "$rule_enabled" -o "$rule_enabled" = "0" ] && continue
 
 			# Regular expression for matching calling or called number