Merge remote-tracking branch 'origin/release-4.2'

wifilife: update pkg hash to include arp flush and stale entry refactor
icwmp: Add Wifi Life parameters
2025-12-25 03:24:14 +08:00 · 2019-05-04 10:34:27 +02:00 · 2019-04-26 13:14:43 +02:00 · 2019-04-25 13:57:34 +01:00 · 2019-04-25 11:43:57 +02:00 · 2019-04-12 19:24:46 +02:00
41 changed files with 276 additions and 1097 deletions
--- a/catv/files/etc/config/catv
+++ b/catv/files/etc/config/catv
@@ -1,4 +1,4 @@

 config service 'catv'
-        option enable 'no'
+        option enable '0'
        option filter '3'
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dslmngr
-PKG_VERSION:=1.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=be5b0d0c0a1c2abd335aaf19f01f63284d8cc285
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-else
-  $(info Unexpected CONFIG_TARGET)
-endif
-
-export TARGET_PLATFORM
-
-define Package/dslmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +easy-soc-libs
-endef
-
-define Package/dslmngr/description
- This package can be used to configure and provide status about
- the XDSL subsystem through UBUS.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)"
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Build/Compile
-	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
-endef
-
-define Package/dslmngr/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,dslmngr))
--- a/easy-qos/Makefile
+++ b/easy-qos/Makefile
@@ -1,31 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-qos
-PKG_VERSION:=1.0
-PKG_RELEASE:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/easy-qos
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Easy QoS
-endef
-
-define Package/easy-qos/description
-	This package contains Easy QoS utitie
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-endef
-
-define Package/easy-qos/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,easy-qos))
--- a/easy-qos/files/etc/config/easy_qos
+++ b/easy-qos/files/etc/config/easy_qos
@@ -1,30 +0,0 @@
-config rule
-	option priority	"high"
-	option macaddr "12:34:56:78:9a:bc"
-	list port 22
-	list port 53
-	option comment	"SSH, DNS"
-	# -j MARK --set-xmark 0x7/0x7
-
-config rule
-	option priority	"medium"
-	option macaddr "08:00:27:db:2a:31"
-	option proto	"tcp"
-	list port 21
-	list port 25
-	list port 80
-	option comment      "FTP, SMTP, HTTP"
-	# -j MARK --set-xmark 0x5/0x5
-
-config rule
-	option priority	"normal"
-	option macaddr "1a:2b:3c:4d:5e:6f"
-	option comment      "All Traffic"
-	# -j MARK --set-xmark 0x3/0x3
-
-config rule
-	option priority	"low"
-	option macaddr "6a:4b:2c:5d:1e:70"
-	option proto "icmp"
-	option comment      "Ping"
-	# -j MARK --set-xmark 0x1/0x1
--- a/easy-qos/files/etc/init.d/easy_qos
+++ b/easy-qos/files/etc/init.d/easy_qos
@@ -1,196 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2015 inteno.org
-#
-
-. /usr/share/libubox/jshn.sh
-
-START=99
-USE_PROCD=1
-
-CLIENT_LIST="/tmp/easy_qos_client.list"
-
-log() {
-	echo "${@}"|logger -t easy_qos -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-clean_client_entries() {
-	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
-}
-
-map_client_entries() {
-	local clients ip mac host
-
-	json_load "$(ubus call router.network 'clients')"
-	json_get_keys keys
-
-	for key in ${keys};
-	do
-		json_select ${key}
-		json_get_vars ipaddr macaddr hostname
-		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
-		json_select ..
-	done
-
-	json_init
-	json_add_array "clients"
-	IFS=";"
-	for client in ${clients};
-	do
-		json_add_object "NULL"
-		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
-		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
-		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
-		json_close_object
-	done
-
-	IFS=' '
-	echo `json_dump` > ${CLIENT_LIST}
-	json_cleanup
-}
-
-# Find the IP of a corresponding mac from arp table
-get_ipaddress() {
-	local clients ip mac host
-
-	json_load "$(cat ${CLIENT_LIST})"
-	json_get_keys keys
-
-	json_select "clients"
-	local i="1"
-	while json_get_type type $i; do
-			json_get_var arrvar "$((i++))"
-			if [ "${1}" == "${macaddr}" ];
-			then
-				ip=${ipaddr}
-				break
-			fi
-	done
-	json_select ".."
-
-	json_cleanup
-
-	echo ${ip};
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	local rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
-	while [ -n "${rule}" ]; do
-		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
-	done
-}
-
-check_and_create() {
-	iptables -t mangle -C OUTPUT ${@} 2>/dev/null
-	# Create rule if not exists
-	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A OUTPUT ${@}
-	else
-		log "Rule exists for ${@}"
-	fi
-}
-
-create_rule() {
-	local proto=$1; shift
-	local src_ip=$1; shift
-	local mark="0x$1/0x$1"; shift
-	local ports=$1;
-	local cmd="";
-
-	cmd="-j MARK --set-xmark ${mark}";
-	if [ -n "${ports}" ]; then
-		cmd="--match multiport --dports ${ports} ${cmd}";
-	fi
-	
-	if [ "${proto}" == "icmp" ]; then
-		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
-	elif [ "${proto}" == "all" ]; then
-		cmd="-p all $cmd"
-	else
-		cmd="-p ${proto} -m ${proto} $cmd"
-	fi
-	cmd="-s ${src_ip} $cmd"
-	check_and_create ${cmd} 
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num ip port_list
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	ip=$(get_ipaddress ${macaddr})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-
-	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" ]; then
-			create_rule tcp ${ip} ${prio_num} ${port_list}
-			create_rule udp ${ip} ${prio_num} ${port_list}
-		else
-			create_rule ${proto} ${ip} ${prio_num} ${port_list}
-		fi
-	fi
-}
-
-reload_service() {
-	clear_existing_rules
-	map_client_entries
-	config_load easy_qos
-	config_foreach manage_rule rule
-	clean_client_entries
-}
-
-start_service() {
-	reload_service
-	echo "Easy QoS installed">/dev/console;
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-
--- a/easy-qos/files/etc/init.d/easy_qos.ebtables
+++ b/easy-qos/files/etc/init.d/easy_qos.ebtables
@@ -1,143 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2015 inteno.org
-#
-
-START=99
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t easy_qos.ebtable -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	local rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	while [ -n "${rule}" ]; do
-		exec_log ebtables -t broute -D BROUTING ${rule}
-		rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	done
-}
-
-create_rule() {
-	local protocol=$1; shift
-	local mac=$1; shift
-	local mark="0x$1"; shift
-	local forward_port=$1;
-	local cmd="";
-	local protocol_number
-
-	cmd="-j mark --mark-or ${mark}";
-	if [ -n "${forward_port}" ]; then
-		cmd="--ip-destination-port ${forward_port} ${cmd}";
-	fi
-	
-	case "${protocol}" in
-		"tcp")
-			protocol_number=6;;
-		"udp")
-			protocol_number=17;;
-		"dccp")
-			protocol_number=33;;
-		"sctp")
-			protocol_number=132;;
-		*)
-			log "Protocol ${protocol} not supported in ebtables"
-			return;;
-	esac
-			
-	cmd="--ip-proto ${protocol_number} $cmd"
-	cmd="-p ip $cmd"
-
-	cmd="-s ${mac} $cmd"
-	exec_log ebtables -t broute -A BROUTING ${cmd}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num protocol
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	protocol=$(echo ${proto}|tr [A-Z] [a-z])
-	prio_num=$(get_priority ${priority})
-	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
-		for p in ${port}; do
-			if [ "${protocol}" == "none" ]; then
-				create_rule tcp ${macaddr} ${prio_num} ${p}
-				create_rule udp ${macaddr} ${prio_num} ${p}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num} ${p}
-			fi
-		done
-		# Create rule for all ports if port is not mentioned in uci
-		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" ]; then
-				create_rule tcp ${macaddr} ${prio_num}
-				create_rule udp ${macaddr} ${prio_num}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num}
-			fi
-		fi
-	fi
-}
-
-reload_service() {
-	# Do not apply rules if ebtables is not present in system
-	[ -x /usr/sbin/ebtables ] || return;
-
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-}
-
-start_service() {
-	reload_service
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-
--- a/easy-soc-libs/Config.in
+++ b/easy-soc-libs/Config.in
@@ -15,9 +15,5 @@ config LIBDSL_DEBUG
 	bool "Enable xdsl debugging"
 	default n

-config LIBDSL_TEST
-	depends on PACKAGE_libdsl
-	bool "Libdsl test program"
-	default n
 endmenu
 endif
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -8,15 +8,12 @@ PKG_NAME:=easy-soc-libs
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=359524ddd8a17df39c70c5ba39e723e9641d5956
+PKG_SOURCE_VERSION:=6a311af7cd17fc410c27de3cfae33b658195fd0b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-endif

+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk
@@ -37,24 +34,26 @@ endef
 define Package/libwifi
  $(call Package/easy-soc-libs)
  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
+endef
+
+define Package/libdsl
+  $(call Package/easy-soc-libs)
+  TITLE:= XDSL library (libdsl)
 endef

 define Package/libethernet
  $(call Package/easy-soc-libs)
  TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+TARGET_iopsys_ramips:swconfig
+  DEPENDS:=+TARGET_iopsys_ramips:swconfig
 endef

 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
  TARGET_PLATFORM=MEDIATEK
  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
@@ -65,21 +64,13 @@ else ifeq ($(CONFIG_TARGET_intel_mips),y)
  TARGET_PLATFORM=INTEL
  TARGET_CFLAGS +=-DIOPSYS_INTEL
 else
-  $(info Unexpected CONFIG_TARGET)
+  $(info (UNEXPECTED CONFIG TARGET))
 endif

-export TARGET_PLATFORM
-
 ifdef CONFIG_IOP_LLA_LIBS_DEBUG
  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
 endif

-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
-endef
-
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
@@ -87,22 +78,15 @@ subdirs := \

 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
 	-I$(STAGING_DIR)/usr/include/libnl3

 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FPIC="$(FPIC)" \
 	PLATFORM="$(TARGET_PLATFORM)" \
 	subdirs="$(subdirs)"

-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/easy-soc-libs/ $(PKG_BUILD_DIR)/
-endef
-endif
-
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
@@ -124,12 +108,6 @@ define Build/InstallDev/libethernet
 	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
 endef

-define Build/Compile
-	$(call Build/Compile/Default)
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endif
-endef

 define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
@@ -147,11 +125,7 @@ endef

 define Package/libdsl/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
 endef

 $(eval $(call BuildPackage,libwifi))
--- a/endptmngr/Makefile
+++ b/endptmngr/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=44e2472e8c08bef01fab27e8e908d5672f7af136
+PKG_SOURCE_VERSION:=a78fe95d5c5a0a320f3b62b9d2faafd07b56e3a7


 ifeq ($(CONFIG_ENDPT_OPEN),y)
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-04-01
+PKG_VERSION:=4.0-2019-04-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=434174439789e7e78e30063d6cf472f381e5b5f1
+PKG_SOURCE_VERSION:=cd777bbd2dbe7477ec7665f12d3d20e6b2e9e052
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -51,13 +51,6 @@ define Package/icwmp_xmpp
 	DEPENDS:=+libuci +libubox +libexpat +libstrophe
 endef

-define Package/icwmp_udpechoserver
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 udpechoserver feature
-	DEPENDS:=+libuci
-endef
-
 define Package/icwmp/Default
  SECTION:=utils
  CATEGORY:=Utilities
@@ -210,15 +203,6 @@ define Package/icwmp_xmpp/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
 endef

-define Package/icwmp_udpechoserver/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
@@ -254,5 +238,4 @@ $(eval $(call BuildPackage,icwmp-curl))
 $(eval $(call BuildPackage,libdatamodel))
 $(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp_xmpp))
-$(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp-zstream))
--- a/inbd/Makefile
+++ b/inbd/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
+PKG_SOURCE_VERSION:=12755fccb8ef87965ac684d62d56e19e73a255bd
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd

--- a/iop/config
+++ b/iop/config
@@ -3,9 +3,11 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
+# CONFIG_LOCALMIRROR is not set
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
+CONFIG_PACKAGE_6tunnel=y
 CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
@@ -15,35 +17,56 @@ CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_gdb=m
+CONFIG_PACKAGE_gdbserver=m
 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-gigaset=m
+CONFIG_PACKAGE_ice-client-guest=m
+CONFIG_PACKAGE_ice-client-iperf=m
+CONFIG_PACKAGE_ice-client-logreader=m
+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_ifbt=y
 CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_iopupgrade=y
-CONFIG_PACKAGE_ip-full=y
-CONFIG_PACKAGE_iperf3=y
+CONFIG_PACKAGE_netmode=y
+CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
+CONFIG_PACKAGE_iup=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-config-backup=y
+CONFIG_PACKAGE_juci-broadcom-iptv=y
+CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
+CONFIG_PACKAGE_juci-wifilife=y
+CONFIG_PACKAGE_juci-wireless=y
 CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y
 CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
 CONFIG_PACKAGE_juci-dropbear=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
+CONFIG_PACKAGE_juci-ice-client=y
 CONFIG_PACKAGE_juci-icwmp=y
 CONFIG_PACKAGE_juci-igmpinfo=y
+CONFIG_PACKAGE_juci-config-backup=y
+CONFIG_PACKAGE_juci-mwan3=y
+CONFIG_PACKAGE_juci-iup=y
+# CONFIG_PACKAGE_juci-qos is not set
+CONFIG_PACKAGE_juci-voice-client=y
+CONFIG_PACKAGE_juci-macdb=y
 CONFIG_PACKAGE_juci-minidlna=y
 CONFIG_PACKAGE_juci-mod-status=y
 CONFIG_PACKAGE_juci-mod-system=y
-CONFIG_PACKAGE_juci-mwan3=y
 CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-device=y
@@ -52,20 +75,24 @@ CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-network-port=y
 CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-owsd=y
+CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-samba=y
+CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
+CONFIG_PACKAGE_juci-theme-iopsys=y
+CONFIG_PACKAGE_juci-ubus-core=y
 CONFIG_PACKAGE_juci-upnp=y
 CONFIG_PACKAGE_juci-usb=y
-CONFIG_PACKAGE_juci-voice-client=y
-CONFIG_PACKAGE_juci-wifilife=y
-CONFIG_PACKAGE_juci-wireless=y
-CONFIG_PACKAGE_juci-theme-iopsys=y
+CONFIG_PACKAGE_juci-utils=y
+# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
+CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-siit=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
 CONFIG_PACKAGE_libffmpeg-mini=y
 CONFIG_PACKAGE_libgmp=y
@@ -73,10 +100,14 @@ CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_minidlna=y
 CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_mtd-utils=y
+CONFIG_PACKAGE_mtd-utils-deubinize=y
+CONFIG_PACKAGE_mtd-utils-imagewrite=y
+CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y
+CONFIG_PACKAGE_mtd-utils-nanddump=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_ndisc6=y
-CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=y
 CONFIG_PACKAGE_odhcp6c=y
@@ -85,6 +116,7 @@ CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
+# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -155,6 +187,7 @@ CONFIG_BUSYBOX_CONFIG_MICROCOM=y
 # CONFIG_BUSYBOX_CONFIG_RMMOD is not set
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_2_4_MODULES is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -168,9 +201,11 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
@@ -180,6 +215,7 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_PAM is not set
 # CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
@@ -188,6 +224,7 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SIGNED_PACKAGES is not set
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
+CONFIG_PACKAGE_ip-full=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"
+CONFIG_PACKAGE_iopupgrade=y

--- a/iop/scripts/feeds_update.sh
+++ b/iop/scripts/feeds_update.sh
@@ -32,15 +32,13 @@ function feeds_update {
    fi

    # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-mips iopsys-brcm63xx-arm iopsys-ramips intel_mips"
-    for target in $targets
-    do
-	rm -f target/linux/$target
-	./scripts/feeds install -p targets $target
-    done
+    ./scripts/feeds install -p targets iopsys-brcm63xx-mips
+    ./scripts/feeds install -p targets iopsys-brcm63xx-arm
+    ./scripts/feeds install -p targets iopsys-ramips
+    ./scripts/feeds install -p intel_targets intel_mips

    # install all packages
-    ./scripts/feeds install -a
+    ./scripts/feeds install -a 

    # remove broken symlinks ( for packages that are no longer in the feed )
    find -L package/feeds -maxdepth 2 -type l -delete
@@ -49,7 +47,7 @@ function feeds_update {
    make defconfig

    # record when we last run this script
-    touch tmp/.iop_bootstrap
+    touch tmp/.iop_bootstrap 

    # always return true
    exit 0
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -12,99 +12,39 @@ function genconfig {
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
+	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
+
 	target="bogus"
 	config_path=""
-	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	intel_mips="target/linux/intel_mips"
-
-	Red='\033[0;31m'          # Red
-	Color_Off='\033[0m'       # Text Reset
-	Yellow='\033[0;33m'       # Yellow
-
-	function find_last {
-	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
-	}
-
-	function is_new {
-	    for opt in $conf_warned
-	    do
-		if [ "$opt" == "$1" ]
-		then
-		    return 1
-		fi
-	    done
-	    # option not found return true
-	    return 0
-	}
-
-	function verify_config {
-	    IFS=$'\n'
-	    org=$(<.genconfig.config)
-	    unset IFS
-	    local num
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    #echo "lines to check $tot_lines"
-	    num=0
-	    for line in $org
-	    do
-		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-		num=$((num+1))
-	    done
-	}

 	# Takes a board name and returns the target name in global var $target
 	set_target() {
 	    local profile=$1

+	    local iopsys_brcm63xx_mips=$(cd target/linux/iopsys-brcm63xx-mips; ./genconfig)
+	    local iopsys_brcm63xx_arm=$(cd target/linux/iopsys-brcm63xx-arm; ./genconfig)
+	    local iopsys_ramips=$(cd target/linux/iopsys-ramips; ./genconfig)
+	    local intel_mips=$(cd target/linux/intel_mips; ./genconfig)

-		[ -e $brcm63xx_mips/genconfig ] &&
-			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $intel_mips/genconfig ] &&
-			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips; do
-				echo "$list based boards:"
-				for b in ${!list}; do
-					echo -e "\t$b"
-				done
-			done
-			return
+	    if [ "$profile" == "LIST" ]
+	    then
+		for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips intel_mips
+		do
+		    echo "$list based boards:"
+		    for b in ${!list}
+		    do
+			echo -e "\t$b"
+		    done
+		done
+		return
 	    fi

+	    local targets
+
 	    for p in $iopsys_brcm63xx_mips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_mips"
-			config_path="$brcm63xx_mips/config"
+			config_path="target/linux/iopsys-brcm63xx-mips/config"
 		    return
 		fi
 	    done
@@ -112,7 +52,7 @@ function genconfig {
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			config_path="$brcm63xx_arm/config"
+			config_path="target/linux/iopsys-brcm63xx-arm/config"
 		    return
 		fi
 	    done
@@ -120,15 +60,15 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			config_path="$ramips/config"
+			config_path="target/linux/iopsys-ramips/config"
 		    return
 		fi
 	    done

-	    for p in $iopsys_intel_mips; do
+	    for p in $intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
-			config_path="$intel_mips/config"
+			config_path="target/linux/intel_mips/config"
 		    return
 		fi
 	    done
@@ -145,12 +85,17 @@ function genconfig {
 		mediatekAllowed=0
 		wifilifeAllowed=0

-		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
-		git ls-remote git@dev.iopsys.eu:mediatek/linux.git -q 2>/dev/null && mediatekAllowed=1
-		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/wifilife.git -q 2>/dev/null && wifilifeAllowed=1
-		git ls-remote git@private.inteno.se:ice-client.git -q -q 2>/dev/null && iceAllowed=1
+		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 ;;
+			linux) mediatekAllowed=1 ;;
+			wifilife) wifilifeAllowed=1 ;;
+			esac
+		done
 	}

 	v() {
@@ -161,15 +106,14 @@ function genconfig {
 		echo
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -v|--verbose\t\tVerbose"
+		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 "  -s|--override\t\tEnable 'Package source tree override'"
-		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
-		echo -e "  -h|--help\t\tShow this message"
+		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\t\tList all Customers and their board types"
-		echo -e "  -b|--boards\t\tList all board types"
+		echo -e "  -a|--list-all\tList all Customers and their board types"
+		echo -e "  -b|--boards\tList all board types"
 		echo
 		echo "Example ./iop genconfig vg50 TELIA"
 		echo "(if no customerconfig is chosen the Inteno Config will be used)"
@@ -232,7 +176,7 @@ function genconfig {

 	setup_dirs()
 	{
-		if git ls-remote $CUSTREPO -q 2>/dev/null; then
+		if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | grep -qw ${CUSTREPO:22}; then
 			if [ ! -d "$CUSTPATH" ]; then
 				git clone "$CUSTREPO" "$CUSTPATH"
 			elif [ $IMPORT -eq 1 ]; then
@@ -371,11 +315,6 @@ function genconfig {
 			echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		fi

-		if [ -n "$BRCM_MAX_JOBS" ]
-		then
-		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
-		fi
-
 		# Force regeneration of themes
 		touch package/feeds/juci/juci/Makefile

@@ -388,9 +327,6 @@ function genconfig {
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null

-		# Store generated config
-		cp .config .genconfig.config
-
 		# Set default values based on selected parameters
 		v "$(make defconfig 2>&1)"

@@ -398,8 +334,6 @@ function genconfig {

 		# Clean base-file package to force rebuild when changing profile
 		v "$(make package/base-files/clean 2>&1)"
-
-		verify_config
 	}

 	####### main #####
@@ -424,7 +358,6 @@ function genconfig {
 			-p|--profile) export PROFILE="$2"; shift;;
 			-r|--repo) export CUSTREPO="$2"; shift;;
 			-s|--override) export SRCTREEOVERR=1;;
-			-S|--brcmsingel) export BRCM_MAX_JOBS=1;;
 			-h|--help) usage;;
 			-l|--list) list_customers 0 $2;;
 			-a|--list-all)list_customers 1;;
--- a/iop/scripts/install_key.sh
+++ b/iop/scripts/install_key.sh
@@ -10,7 +10,7 @@ function install_key {
    echo "::sysinit:/etc/init.d/rcS S boot" >files/etc/inittab
    echo "::shutdown:/etc/init.d/rcS K shutdown" >>files/etc/inittab
    echo "tty/0::askfirst:/bin/ash --login" >>files/etc/inittab
-    echo "console::askfirst:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
+    echo "ttyS0::askfirst:/bin/ash --login" >>files/etc/inittab

    echo Done
 }
--- a/iop/scripts/update_feed_branches.sh
+++ b/iop/scripts/update_feed_branches.sh
@@ -46,7 +46,7 @@ function update_feed_branches {
 		git checkout $commith
 		git push origin :$release
 		git checkout -b $release
-		git push --set-upstream origin $release
+		git push origin $release
 		cd $ipath
 	done

--- a/iop/scripts/update_package.sh
+++ b/iop/scripts/update_package.sh
@@ -496,6 +496,7 @@ check_feeds()
    for feed in `echo $feeds`
    do
 		feed_hash=$(feeds_hash $feed)
+		[ -n "$feed_hash" ] || continue
 		if [ -d feeds/$feed ]; then
 			in_git=$(cd feeds/$feed; git rev-parse HEAD)

--- a/iopupgrade/Makefile
+++ b/iopupgrade/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=iopupgrade
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=01f2afd6c831d6f9eb2940c7e7af16f7e4d439c2
+PKG_SOURCE_VERSION:=9b5ed4bc9f7ac5064414cf5feb510ffd95df6ec4
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopupgrade

--- a/iopupgrade/files/sbin/iopu
+++ b/iopupgrade/files/sbin/iopu
@@ -7,7 +7,6 @@ cur_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
 upd_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
 		# eg: rootfs_0 or rootfs_1, the one we want to update
 cmdline=""	# command line settings.
-cmdline_match="" # Headers to match to the image

 ###############################################################################
 # file local variables. should not be used in imported functions. Can be used
@@ -205,7 +204,9 @@ log "Firmware upgrade started"
 if [ $upd_forceimage -eq 0 ]
 then
   board=$(db get hw.board.iopVerBoard)
-   cmdline_match="board=$board"
+   cmdline="$cmdline -b $board"
+else
+    cmdline="$cmdline -q"
 fi

 # find out what rootfs volume is active. 
@@ -216,19 +217,16 @@ upd_vol=$(get_flashbank_next)
 upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
 log "installing Root Fileystem into UBI volume rootfs_$upd_vol"

-# prepare to match dsl.
-function_call upd_conf_dsl
-
 # prepare to update CFE if it exists
 function_call upd_conf_cfe

 # prepare to update kernel if it is stored in MTD/JFFS2 
 function_call upd_conf_kernel

-log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
+log "now starting writing data to flash with [ iopupgrade $cmdline -u ubi0_$upd_ubi_id ]"
 run_cleanup=1	# When we start to actually write data there might be some
 		# things that need cleanup if we get an error/crash
-iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id
+iopupgrade $cmdline -u ubi0_$upd_ubi_id

 # in case of any error we abort
 if [ $? -ne 0 ]; then
--- a/ltq-nand/Makefile
+++ b/ltq-nand/Makefile
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2008-2016 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:=ltq-nand
-PKG_VERSION:=1.0
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/archive/
-#PKG_SOURCE_PROTO:=git
-#PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/releases/download/v$(PKG_VERSION)/
-#PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand.git
-#PKG_SOURCE_VERSION:=07b5b0331af6de4174dab2c02bf260ee9625452a
-
-include $(INCLUDE_DIR)/host-build.mk
-
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)
-endef
-
-define Host/Install
-	$(CP) \
-		$(HOST_BUILD_DIR)/ltq-nand \
-		$(STAGING_DIR_HOST)/bin/
-endef
-
-$(eval $(call HostBuild))
-
--- a/ndt/Makefile
+++ b/ndt/Makefile
@@ -1,33 +0,0 @@
-#
-# This is free software, See /COPYRIGHT for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ndt
-PKG_VERSION:=3.6.4
-PKG_RELEASE:=3
-
-PKG_BUILD_DIR:=${BUILD_DIR}/ndt-$(PKG_VERSION)
-PKG_SOURCE:=ndt-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://software.internet2.edu/sources/ndt
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ndt
-	CATEGORY:=Utilities
-	DEPENDS:=+libpthread +zlib
-	TITLE:=Network Testing Tool
-endef
-
-define Build/Compile/Default
-	$(MAKE) -C $(PKG_BUILD_DIR)
-endef
-
-define Package/ndt/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_BUILD_DIR)/src/web100clt $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ndt))
-
--- a/netmode/files/etc/config/netmode
+++ b/netmode/files/etc/config/netmode
@@ -4,6 +4,6 @@ config mode 'setup'
        option curmode 'routed'

 config tools 'tools'
-	option wificontrol 0
+	option wificontrol 1
 	option arp_discovery 1

--- a/netmode/files/etc/hotplug.d/iface/01-netmode-handler
+++ b/netmode/files/etc/hotplug.d/iface/01-netmode-handler
@@ -2,9 +2,6 @@

 [ "$INTERFACE" != "wan" ] && exit

-automode="$(uci -q get netmode.setup.automode)"
-[ "$automode" == "0" ] && exit
-
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/functions/netmode.sh
--- a/questd/Makefile
+++ b/questd/Makefile
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40

-PKG_SOURCE_VERSION:=dd8f4a956ce652d483b8f8878deaa6d5586c2860
+PKG_SOURCE_VERSION:=9edeefb6942c1a806a82274d124d8889bfb4f8e7
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd

--- a/rulengd/Makefile
+++ b/rulengd/Makefile
@@ -5,16 +5,17 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=rulengd
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=63569245b62d90d3106cc826f2d2b18f51c0b885
+PKG_SOURCE_VERSION:=99881f39232154530ac129dc2109d78963017ad1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
+PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

--- a/uboot/Makefile
+++ b/uboot/Makefile
@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git

 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=0ef53f269c27f8e736fd30fd1a874159f70c76bf
+PKG_SOURCE_VERSION:=a6292375108a6d5f200f234f5eef3fe17f427092
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85
@@ -59,10 +59,9 @@ define uboot/grx500
  TITLE:=U-Boot for the grx
  UBOOT_IMG:=u-boot-nand.bin
  DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=10
+  PKG_RELEASE:=8
 endef

-# obsolete: no longer supported
 define uboot/grx500_speedport_smart3
  TITLE:=U-Boot for the Speedport Smart3
  UBOOT_IMG:=u-boot-nand.bin
@@ -74,7 +73,7 @@ define uboot/grx500_norrland
  TITLE:=U-Boot for Norrland Board
  UBOOT_IMG:=u-boot-nand.bin
  DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=10
+  PKG_RELEASE:=8
 endef

 UBOOTS := \
@@ -124,13 +123,8 @@ define Build/Compile
 		CROSS_COMPILE=$(TARGET_CROSS) env
 endef

-# don't install /etc/init.d/uboot for intel-mips as it's not needed
 define Package/uboot/install/default
-	$(INSTALL_DIR) $$(1)/lib/upgrade
-	$(CP) ./files/uboot-upgrade $$(1)/lib/upgrade/
-	$(if $(CONFIG_TARGET_intel_mips), ,$(INSTALL_DIR) $$(1)/etc/init.d)
-	$(if $(CONFIG_TARGET_intel_mips), ,$(CP) ./files/uboot $$(1)/etc/init.d/)
-
+	$(CP) ./files/* $$(1)/
 	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
 	$(INSTALL_DIR) $$(1)/boot
 	$(CP) \
--- a/uboot/files/etc/init.d/uboot
+++ b/uboot/files/etc/init.d/uboot
@@ -1,6 +1,10 @@
+#!/bin/sh /etc/rc.common
+
+START=50

 . /usr/share/libubox/jshn.sh

+
 sanity_check_env(){

    # make sure iboot is used to start board, but only if verify_boot != 1
@@ -22,24 +26,18 @@ sanity_check_env(){
    fw_setenv baudrate 115200
 }

-do_uboot_upgrade(){
+uboot_upgrade(){
    local u_ver
    echo "doing upgrade of u-boot old version $cur_Major.$cur_Minor new version $Major.$Minor"
    mtd erase /dev/mtd0
-    mtd write $1 /dev/mtd0
+    mtd write /boot/uboot.img /dev/mtd0
    u_ver=$(strings  /dev/mtd0 | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb)
    [ -n "$u_ver" ] && fw_setenv uboot_inteno_version "$u_ver"
    sanity_check_env
 }


-# Return:
-# 0: update is successfull
-# 1: update is not needed
-# 2: error occured
-uboot_upgrade() {
-    [ ! -f $1 ] && return 2
-
+start() {
    iver=$(fw_printenv -n uboot_inteno_version 2>/dev/null)

    # Fixup improper json string for major and minor key.
@@ -49,8 +47,8 @@ uboot_upgrade() {
    if [ -z "$iver" ]
    then
 	# if this variable is not set by u-boot the u-boot version is too old.
-	do_uboot_upgrade $1
-	return 0
+	uboot_upgrade
+	return
    fi

    # read in current version into Major Minor variables
@@ -65,7 +63,7 @@ uboot_upgrade() {
    cur_Minor=$Minor

    # read in new uboot version into Major Minor variables
-    json_load $(strings $1 | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb |sed -e 's/938f0820-2ffb-11e7-bbc9-2f21351ee6fb: //')
+    json_load $(strings /boot/uboot.img | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb |sed -e 's/938f0820-2ffb-11e7-bbc9-2f21351ee6fb: //')
    json_get_vars Major Minor

 #    echo "Major $Major"
@@ -73,15 +71,14 @@ uboot_upgrade() {
    
    if [ $Major -gt $cur_Major ]
    then
-	do_uboot_upgrade $1
-	return 0
+	uboot_upgrade
+	return
    fi

    if [ $Major -eq $cur_Major -a $Minor -gt $cur_Minor ]
    then
-	do_uboot_upgrade $1
-	return 0
+	uboot_upgrade
+	return
    fi
-
-    return 1
 }
+
--- a/uboot/files/uboot
+++ b/uboot/files/uboot
@@ -1,8 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=50
-
-start() {
-	. /lib/upgrade/uboot-upgrade
-	uboot_upgrade /boot/uboot.img
-}
--- a/voice-client/Makefile
+++ b/voice-client/Makefile
@@ -11,19 +11,6 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

 include $(INCLUDE_DIR)/package.mk

-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-VOICE_LIB:=broadcom.sh
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-VOICE_LIB:=broadcom.sh
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-VOICE_LIB:=intel.sh
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-VOICE_LIB:=broadcom.sh
-else
-$(info (UNEXPECTED CONFIG TARGET))
-VOICE_LIB:=broadcom.sh
-endif
-
 define Package/voice-client
  SUBMENU:=Telephony
  SECTION:=net
@@ -45,26 +32,7 @@ define Build/Compile
 endef

 define Package/voice-client/install
-	$(CP) ./files/etc $(1)/
-	$(CP) ./files/sbin $(1)/
-	$(CP) ./files/usr $(1)/
-	mkdir -p $(1)/lib/voice
-	$(CP) ./files/lib/cw.sh $(1)/lib/.
-	$(CP) ./files/lib/voice/$(VOICE_LIB) $(1)/lib/voice/voicelib.sh
-
-ifeq ($(CONFIG_TARGET_intel_mips),y)
-	sed -i \
-	-e 's/brcm/tapi/g' \
-	-e 's/BRCM/TAPI/g' \
-	-e 's/broadcom/intel/g' \
-	$(1)/etc/config/voice_client \
-	$(1)/etc/asterisk_templates/*
-	sed -i \
-	-e '/echo_cancel/d' \
-	-e "/config.*tel_advanced.*TEL/a \        option 'echo_cancel' '1'" \
-	$(1)/etc/config/voice_client
-
-endif
+	$(CP) ./files/* $(1)/
 endef

 $(eval $(call BuildPackage,voice-client))
--- a/voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE
@@ -6,7 +6,7 @@ autodial_timeoutmsec=|AUTODIAL_TIMEOUT|
 dialtone_timeoutmsec=|DIALTONE_TIMEOUT|
 context=|CONTEXT|
 context_direct=|CONTEXT|-direct
-dialtone_extension_hint_context=|LINE_NAME|_dialtone
+dialtone_extension_hint_context=brcm_dialtone
 dialtone_extension_hint=|DIALTONE_EXTENSION_HINT|
 callwaiting=|CALLWAITING|
 clir=|CLIR|
--- a/voice-client/files/etc/config/voice_client
+++ b/voice-client/files/etc/config/voice_client
@@ -1,4 +1,4 @@
-config 'tel_line' 'brcm0'
+config 'brcm_line' 'brcm0'
 	option 'extension' '0000'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -9,7 +9,7 @@ config 'tel_line' 'brcm0'
 	option 'callwaiting' '0'
 	option 'clir' '0'

-config 'tel_line' 'brcm1'
+config 'brcm_line' 'brcm1'
 	option 'extension' '1111'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -20,7 +20,7 @@ config 'tel_line' 'brcm1'
 	option 'callwaiting' '0'
 	option 'clir' '0'

-config 'tel_line' 'brcm2'
+config 'brcm_line' 'brcm2'
 	option 'extension' '2222'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -31,7 +31,7 @@ config 'tel_line' 'brcm2'
 	option 'callwaiting' '0'
 	option 'clir' '0'

-config 'tel_line' 'brcm3'
+config 'brcm_line' 'brcm3'
 	option 'extension' '3333'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -42,7 +42,7 @@ config 'tel_line' 'brcm3'
 	option 'callwaiting' '0'
 	option 'clir' '0'

-config 'tel_line' 'brcm4'
+config 'brcm_line' 'brcm4'
 	option 'extension' '4444'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -53,7 +53,7 @@ config 'tel_line' 'brcm4'
 	option 'callwaiting' '0'
 	option 'clir' '0'

-config 'tel_line' 'brcm5'
+config 'brcm_line' 'brcm5'
 	option 'extension' '5555'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -64,7 +64,7 @@ config 'tel_line' 'brcm5'
 	option 'callwaiting' '0'
 	option 'clir' '0'

-config 'tel_line' 'brcm6'
+config 'brcm_line' 'brcm6'
 	option 'extension' '6666'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -75,7 +75,7 @@ config 'tel_line' 'brcm6'
 	option 'callwaiting' '0'
 	option 'clir' '0'

-config 'tel_line' 'brcm7'
+config 'brcm_line' 'brcm7'
 	option 'extension' '7777'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -116,7 +116,7 @@ config 'sip_advanced' 'SIP'
 	option 'dnsmgr_refresh_interval' '300'
 	option 'srvlookup' 'yes'

-config 'tel_advanced' 'TEL'
+config 'brcm_advanced' 'BRCM'
 	option 'country' 'SWE'
 	option 'jbenable' 'yes'
 	option 'jbforce' 'no'
--- a/voice-client/files/etc/init.d/voice_client
+++ b/voice-client/files/etc/init.d/voice_client
@@ -6,8 +6,6 @@
 #
 . /lib/functions.sh
 . /lib/functions/network.sh
-. /lib/voice/voicelib.sh
-
 HOOKS=/usr/lib/inithooks/voice_client
 if [ -f "$HOOKS" ] ; then
 	. $HOOKS
@@ -17,8 +15,8 @@ START=60
 USE_PROCD=1

 # Some global variables
-SERIAL=$(getSerial)
-BASEMAC=$(getBaseMAC)
+SERIAL=$(cat /proc/nvram/SerialNumber)
+BASEMAC=$(cat /proc/nvram/BaseMacAddr | sed 's/ //g')
 MODULENAME=voice
 USERAGENT="Inteno_${SERIAL}_${BASEMAC}"

@@ -32,8 +30,8 @@ ASTERISKDIR=/etc/asterisk
 WORKDIR=/tmp/$MODULENAME.$$
 MD5SUMSFILE=/tmp/$MODULENAME-sums.$$

-# Whitespace separated list of $(getChannelName) feature access codes
-CHANNEL_FAC=
+# Whitespace separated list of BRCM feature access codes
+BRCM_FAC=

 #TODO: go through templates, check usage

@@ -82,8 +80,8 @@ TMPL_ACL=$TEMPLATEDIR/acl.conf.TEMPLATE
 TMPL_CONFBRIDGE=$TEMPLATEDIR/confbridge.conf.TEMPLATE
 TMPL_UDPTL=$TEMPLATEDIR/udptl.conf.TEMPLATE

-TMPL_CHANNEL=$TEMPLATEDIR/$(getLineName).conf.TEMPLATE
-TMPL_CHANNEL_LINE=$TEMPLATEDIR/tel_line.TEMPLATE
+TMPL_BRCM=$TEMPLATEDIR/brcm.conf.TEMPLATE
+TMPL_BRCM_LINE=$TEMPLATEDIR/brcm_line.TEMPLATE

 TMPL_MEETME=$TEMPLATEDIR/meetme.conf.TEMPLATE

@@ -182,7 +180,7 @@ assemble_and_copy_config()
 	mv $WORKDIR/sip_registrations.tmp	$WORKDIR/sip_registrations.conf
 	mv $WORKDIR/sip_providers.tmp		$WORKDIR/sip_providers.conf
 	mv $WORKDIR/sip_users.tmp		$WORKDIR/sip_users.conf
-	mv $WORKDIR/$(getLineName).tmp		$WORKDIR/$(getLineName).conf
+	mv $WORKDIR/brcm.tmp			$WORKDIR/brcm.conf
 	mv $WORKDIR/extensions.tmp		$WORKDIR/extensions.conf
 	mv $WORKDIR/codecs.tmp			$WORKDIR/codecs.conf
 	mv $WORKDIR/rtp.tmp			$WORKDIR/rtp.conf
@@ -253,13 +251,13 @@ read_codecs_ptime()
 # in a Dial() command
 #
 # For backwards compatibility, if i is only a number (not prefixed by
-#	"SIP/" or "CHANNEL/") then add "CHANNEL/"
+#	"SIP/" or "BRCM/") then add "BRCM/"
 #
 read_lines()
 {
 	local lines=""
 	local call_lines
-	local fxsIdx fxsEpt dectIdx dectEpt
+	local fsxIdx fsxEpt dectIdx dectEpt

 	# Are lines already set by user conf?
 	config_get call_lines $1 call_lines
@@ -278,19 +276,19 @@ read_lines()
 		if test $(db get hw.board.hasVoice) = "1"; then
 			# Get the first FSX voice endpoint index by
 			# searching for the name usually used.
-			fxsIdx=$(echo $voiceNames | \
+			fsxIdx=$(echo $voiceNames | \
 				awk -e '{
 					i = 1;
 					while(i <= NF && tolower($i) !~ /^tel.*$/) {
 						i++;
 					}
 					print i;
-				}'
-			)
+				}
+			')
 	
 			# Convert index to endpoint ID
-			if test $fxsIdx -gt 0; then
-				fxsEpt=$(echo $voicePorts | awk '{ print $'$fxsIdx' }')
+			if test $fsxIdx -gt 0; then
+				fsxEpt=$(echo $voicePorts | awk '{ print $'$fsxIdx' }')
 			fi

 			hasVoice=1
@@ -317,9 +315,7 @@ read_lines()
 		fi

 		if test $hasVoice -eq 1; then
-		        call_lines="$dectEpt $fxsEpt"
-		        # Remove leading/trailing spaces
-			call_lines=$(echo $call_lines | xargs echo -n)
+			call_lines="$dectEpt $fsxEpt"

 			# If we didn't find any endpoint ID we
 			# fallback to activate them all.
@@ -337,7 +333,7 @@ read_lines()
 	for i in $call_lines ; do
 		case $i in
 			''|*[!0-9]*)	lines=$lines"$i&" ;;
-			*) 				lines=$lines"$(getChannelName)/$i&" ;;
+			*) 				lines=$lines"BRCM/$i&" ;;
 		esac
 		
 	done
@@ -1032,9 +1028,9 @@ configure_queue()
 	do
 		local out=""
 		re='^[0-9]+$'
-		num=${member#$(getLineName)}
+		num=${member#brcm}
 		if [ -z "${num##[0-9]*}" ] ; then
-			out="$(getChannelName)/$num"
+			out="BRCM/$num"
 		else
 			local sip_user
 			config_get sip_user $member user
@@ -1161,7 +1157,7 @@ configure_cdr()
 configure_call_filters()
 {
 	local country
-	config_get country TEL country
+	config_get country BRCM country
 	# Read the International Dialing Code and the Country Code from config

 	echo "Looking up IDC and CC for country $country"
@@ -1439,7 +1435,7 @@ configure_extensions()
 	fi

 	if [ -n "$extension_all_ports" ] ; then
-		local all_lines=$(getAllLines)
+		local all_lines="BRCM/0&BRCM/1&BRCM/2&BRCM/3&BRCM/4&BRCM/5&BRCM/6"
 		echo "exten => $extension_all_ports,1,Dial($all_lines,,t)"	>> $WORKDIR/extensions_local.tmp
 		echo "exten => $extension_all_ports,n,Hangup()"			>> $WORKDIR/extensions_local.tmp
 	fi
@@ -1453,6 +1449,7 @@ configure_extensions()
 		echo "exten => $test_echo_extension,1,Echo()"			>> $WORKDIR/extensions_local.tmp
 		echo "exten => $test_echo_extension,n,Hangup()"			>> $WORKDIR/extensions_local.tmp
 	fi
+
 	
 	if [ -n "$record_message_extension" ] ; then
 		echo "exten => $record_message_extension,1,Playback(beep)"		>> $WORKDIR/extensions_local.tmp
@@ -1466,7 +1463,7 @@ configure_extensions()
 		sed -i "s/|CLIR_FAC_SET|//"		$WORKDIR/extensions.tmp
 		sed -i "s/|CLIR|/$clir/"		$WORKDIR/extensions.tmp
 		sed -i "s/|CLIR_FAC_LEN|/${#clir}/"     $WORKDIR/extensions.tmp
-		CHANNEL_FAC="$CHANNEL_FAC $clir."
+		BRCM_FAC="$BRCM_FAC $clir."
 	else
 		sed -i "s/|CLIR_FAC_SET|/;/"		$WORKDIR/extensions.tmp
 	fi
@@ -1725,9 +1722,9 @@ configure_extensions_provider()
 }

 #
-# Create a local extension for a CHANNEL Line
+# Create a local extension for a BRCM Line
 #
-configure_tel_line_extension()
+configure_brcm_line_extension()
 {
 	local line
 	local extension
@@ -1737,9 +1734,8 @@ configure_tel_line_extension()
 	local cbbs_retrytime
 	local cbbs_waittime
 	local mailbox
-	local line_name=$(getLineName)
 	
-	line=${1:${#line_name}}
+	line=${1:4}
 	config_get extension $1 extension

 	if [ -z "$line" ] ; then
@@ -1764,7 +1760,7 @@ configure_tel_line_extension()
 	
 		cp $TMPL_EXTENSIONS_LOCAL_LINE			$WORKDIR/extensions_local_line.tmp
 		sed -i "s/|EXTEN|/$extension/g"			$WORKDIR/extensions_local_line.tmp
-		sed -i "s/|LINE|/$(getLineIdx $line)/g"		$WORKDIR/extensions_local_line.tmp
+		sed -i "s/|LINE|/$line/g"			$WORKDIR/extensions_local_line.tmp
 		sed -i "s/|TIMEOUT|/$(get_voicemail_timeout)/g"	$WORKDIR/extensions_local_line.tmp

 		#cbbs settings
@@ -1837,16 +1833,16 @@ configure_codecs()
 {
 	echo "Configuring codecs"
 	local genericplc
-	config_get genericplc TEL genericplc
+	config_get genericplc BRCM genericplc
 	sed -i "s/|PLC|/$genericplc/"			$WORKDIR/codecs.tmp
 }

 #
-# Configure default settings for $(getLineName).conf
+# Configure default settings for brcm.conf
 #
-configure_tel()
+configure_brcm()
 {
-	echo "Configuring $(getChannelName)"
+	echo "Configuring BRCM"
 	local jbenable
 	local jbforce
 	local jbmaxsize
@@ -1854,48 +1850,44 @@ configure_tel()
 	local dtmfcompatibility
 	local dialoutmsec
 	local fac
-	local echocancel

-	config_get jbenable TEL jbenable
-	config_get jbforce TEL jbforce
-	config_get jbmaxsize TEL jbmaxsize
-	config_get jbimpl TEL jbimpl
+	config_get jbenable BRCM jbenable
+	config_get jbforce BRCM jbforce
+	config_get jbmaxsize BRCM jbmaxsize
+	config_get jbimpl BRCM jbimpl
 	config_get dtmfmode SIP dtmfmode
-	config_get dialoutmsec TEL dialoutmsec
-	config_get fac TEL fac
-	config_get echocancel TEL echo_cancel
+	config_get dialoutmsec BRCM dialoutmsec
+	config_get fac BRCM fac

-	CHANNEL_FAC="$CHANNEL_FAC $fac"
+	BRCM_FAC="$BRCM_FAC $fac"
 	# Convert whitespace to commas
-	CHANNEL_FAC=$(echo $CHANNEL_FAC | sed -e 's/^ *//' -e 's/ *$//' | tr -s ' ' | tr ' ' ',')
+	BRCM_FAC=$(echo $BRCM_FAC | sed -e 's/^ *//' -e 's/ *$//' | tr -s ' ' | tr ' ' ',')

 	if [ -z "$dialoutmsec" ] ; then
 		dialoutmsec=4000
 	fi

-	sed -i "s/|JBENABLE|/$jbenable/"			$WORKDIR/$(getLineName).tmp
-	sed -i "s/|JBFORCE|/$jbforce/"				$WORKDIR/$(getLineName).tmp
-	sed -i "s/|JBMAXSIZE|/$jbmaxsize/"			$WORKDIR/$(getLineName).tmp
-	sed -i "s/|JBIMPL|/$jbimpl/"				$WORKDIR/$(getLineName).tmp
-	sed -i "s/|DIALOUTMSEC|/$dialoutmsec/"			$WORKDIR/$(getLineName).tmp
-	sed -i "s/|FAC|/$CHANNEL_FAC/"				$WORKDIR/$(getLineName).tmp
-	sed -i "s/|CHANNELS|/$(db get hw.board.VoicePorts)/"	$WORKDIR/$(getLineName).tmp
-	sed -i "s/|ECHOCANCEL|/$(getEchoCancellingValue $echocancel)/"	$WORKDIR/$(getLineName).tmp
+	sed -i "s/|JBENABLE|/$jbenable/"			$WORKDIR/brcm.tmp
+	sed -i "s/|JBFORCE|/$jbforce/"				$WORKDIR/brcm.tmp
+	sed -i "s/|JBMAXSIZE|/$jbmaxsize/"			$WORKDIR/brcm.tmp
+	sed -i "s/|JBIMPL|/$jbimpl/"				$WORKDIR/brcm.tmp
+	sed -i "s/|DIALOUTMSEC|/$dialoutmsec/"			$WORKDIR/brcm.tmp
+	sed -i "s/|FAC|/$BRCM_FAC/"				$WORKDIR/brcm.tmp

 	if [ "$dtmfmode" == "compatibility" ] ; then
 		dtmfcompatibility="1"
 	else
 		dtmfcompatibility="0"
 	fi
-	sed -i "s/|DTMFCOMPATIBILITY|/$dtmfcompatibility/"      $WORKDIR/$(getLineName).tmp
+	sed -i "s/|DTMFCOMPATIBILITY|/$dtmfcompatibility/"      $WORKDIR/brcm.tmp
 }

 #
-# Configure settings for individual line in $(getLineName).conf
+# Configure settings for individual line in brcm.conf
 #
-configure_tel_line()
+configure_brcm_line()
 {
-	echo "Configuring $(getChannelName) line $1"
+	echo "Configuring BRCM line $1"
 	local extension
 	local sip_provider
 	local codecs
@@ -1941,30 +1933,30 @@ configure_tel_line()
 		clir=0
 	fi

-	cp $TMPL_CHANNEL_LINE $WORKDIR/tel_line.tmp
-	sed -i "s/|SECTION|/$1/"				$WORKDIR/tel_line.tmp
-	sed -i "s/|CALLERID|/$extension/g"			$WORKDIR/tel_line.tmp
-	sed -i "s/|CONTEXT|/$sip_provider/g"			$WORKDIR/tel_line.tmp
-	sed -i "s/|DIALTONE_EXTENSION_HINT|/$1/"		$WORKDIR/tel_line.tmp
-	sed -i "s/|AUTODIAL|/$autodial/"			$WORKDIR/tel_line.tmp
-	sed -i "s/|AUTODIAL_TIMEOUT|/$autodial_timeout/"	$WORKDIR/tel_line.tmp
-	sed -i "s/|DIALTONE_TIMEOUT|/$dialtone_timeout/"	$WORKDIR/tel_line.tmp
-	sed -i "s/|DTMFRELAY|/$dtmfmode/"			$WORKDIR/tel_line.tmp
-	sed -i "s/|CALLWAITING|/$callwaiting/"			$WORKDIR/tel_line.tmp
-	sed -i "s/|CLIR|/$clir/"				$WORKDIR/tel_line.tmp
-	sed -i "s/|LINE_NAME|/$(getLineName)/"			$WORKDIR/tel_line.tmp
+	cp $TMPL_BRCM_LINE $WORKDIR/brcm_line.tmp
+	sed -i "s/|SECTION|/$1/"				$WORKDIR/brcm_line.tmp
+	sed -i "s/|CALLERID|/$extension/g"			$WORKDIR/brcm_line.tmp
+	sed -i "s/|CONTEXT|/$sip_provider/g"			$WORKDIR/brcm_line.tmp
+	sed -i "s/|DIALTONE_EXTENSION_HINT|/$1/"		$WORKDIR/brcm_line.tmp
+	sed -i "s/|AUTODIAL|/$autodial/"			$WORKDIR/brcm_line.tmp
+	sed -i "s/|AUTODIAL_TIMEOUT|/$autodial_timeout/"	$WORKDIR/brcm_line.tmp
+	sed -i "s/|DIALTONE_TIMEOUT|/$dialtone_timeout/"	$WORKDIR/brcm_line.tmp
+	sed -i "s/|DTMFRELAY|/$dtmfmode/"			$WORKDIR/brcm_line.tmp
+	sed -i "s/|CALLWAITING|/$callwaiting/"			$WORKDIR/brcm_line.tmp
+	sed -i "s/|CLIR|/$clir/"				$WORKDIR/brcm_line.tmp

-	#Configure CHANNEL line with codecs according to the SIP line settings
+
+	#Configure BRCM line with codecs according to the SIP line settings
 #	local is_fax
 #	config_get is_fax $sip_provider is_fax
 # 	if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
-# 		sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/"	$WORKDIR/tel_line.tmp
+# 		sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/"	$WORKDIR/brcm_line.tmp
 # 	else
-# 		sed -i "s/|ALLOW|/$(read_codecs $sip_provider)/"	$WORKDIR/tel_line.tmp
+# 		sed -i "s/|ALLOW|/$(read_codecs $sip_provider)/"	$WORKDIR/brcm_line.tmp
 # 	fi

-	cat $WORKDIR/tel_line.tmp >>				$WORKDIR/$(getLineName).tmp
-	rm -f							$WORKDIR/tel_line.tmp
+	cat $WORKDIR/brcm_line.tmp >>				$WORKDIR/brcm.tmp
+	rm -f							$WORKDIR/brcm_line.tmp
 }

 #
@@ -2063,35 +2055,30 @@ pbx_fix_ownership()
 }

 #
-# Calculate a name for each $(getLineName) line, depending on port type
+# Calculate a name for each brcm line, depending on port type
 # and number. The name is used to make UI look better.
 #
 set_line_name()
 {
 	local maxlinenum=$2
 	local curname name_ix ix item lnum
-	local line_name=$(getLineName)
-	local line_name_len=${#line_name}
-	local tel_line=$1
-	
-	line=${tel_line:${line_name_len}}

 	# delete non-existing lines from config #
-	case $tel_line in
-		${line_name}[0-9])
-			lnum=${tel_line:${line_name_len}:1}
-			[ $((lnum+1)) -gt $maxlinenum ] && uci -q delete voice_client.$tel_line
+	case $1 in
+		brcm[0-9])
+			lnum=${1:4:1}
+			[ $((lnum+1)) -gt $maxlinenum ] && uci -q delete voice_client.$1
 		;;
 	esac
 	#########################################

-	config_get curname $tel_line name
+	config_get curname $1 name
 	[ -n "$curname" ] && return

 	name_ix=""
 	ix=0
 	for item in $(db get hw.board.VoicePortOrder); do
-		if [ "$item" == "$tel_line" ]; then
+		if [ "$item" == "$1" ]; then
 			name_ix=$ix
 			break
 		fi
@@ -2102,14 +2089,15 @@ set_line_name()
 	if [ -n "$name_ix" ]; then
 		for item in $(db get hw.board.VoicePortNames); do
 			if [ $ix -eq $name_ix ]; then
-				uci_set voice_client $tel_line name "$(echo $item | tr '[_]' '[ ]')"
+				uci_set voice_client $1 name \
+					"$(echo "$item" |tr "[_]" "[ ]")"
 				return
 			fi
 			ix=$((ix+1))
 		done
 	fi

-	uci_set voice_client $tel_line name $tel_line
+	uci_set voice_client $1 name $1
 }

 #
@@ -2159,11 +2147,11 @@ start_service() {
 	config_load voice_client

 	########################################################
-	# Set line names according to board parameters
+	# Set line names according to whats reported by brcminfo
 	# and delete non-existing lines from voice_client config
 	########################################################
 	local maxlinenum=$(db get hw.board.VoicePorts)
-	config_foreach set_line_name tel_line $maxlinenum
+	config_foreach set_line_name brcm_line $maxlinenum
 	uci_commit voice_client

 	#######################################
@@ -2176,7 +2164,7 @@ start_service() {
 	cp $TMPL_SIP			$WORKDIR/sip.tmp
 	cp $TMPL_RTP			$WORKDIR/rtp.tmp
 	cp $TMPL_STUN			$WORKDIR/res_stun_monitor.tmp
-	cp $TMPL_CHANNEL		$WORKDIR/$(getLineName).tmp
+	cp $TMPL_BRCM			$WORKDIR/brcm.tmp
 	cp $TMPL_CODECS			$WORKDIR/codecs.tmp
 	cp $TMPL_VOICEMAIL		$WORKDIR/voicemail.tmp
 	cp $TMPL_DNSMGR			$WORKDIR/dnsmgr.tmp
@@ -2220,12 +2208,12 @@ start_service() {
 	config_foreach configure_sip_user_extension sip_user

 	#####################
-	# CHANNEL configuration
+	# BRCM configuration
 	#####################
-	configure_tel
-	config_foreach configure_tel_line tel_line
-	config_foreach configure_tel_line_extension tel_line
-	config_foreach create_extensions_dialtone tel_line
+	configure_brcm
+	config_foreach configure_brcm_line brcm_line
+	config_foreach configure_brcm_line_extension brcm_line
+	config_foreach create_extensions_dialtone brcm_line
 	configure_codecs

 	###########################
@@ -2290,19 +2278,14 @@ stop_service() {
 }

 reload_service() {
-	start
 	#stop
-	# turn off voice led; asterisk will turn it on
-	# if there is a registered account
-	ubus call led.voice1 set '{"state":"off"}'
+	start

-	[ -f /var/run/asterisk/asterisk.pid ] && /etc/init.d/asterisk restart
-
-#	asterisk -rx "config reload $ASTERISKDIR/sip.conf"
-#	sleep 1
-#	asterisk -rx "core reload"
-#	asterisk -rx "dialplan reload"
-#	asterisk -rx "$(getChipVendor) reload"
+	asterisk -rx "config reload $ASTERISKDIR/sip.conf"
+	sleep 1
+	asterisk -rx "core reload"
+	asterisk -rx "dialplan reload"
+	asterisk -rx "brcm reload"
 }

 service_triggers() {
--- a/voice-client/files/etc/uci-defaults/99-voice_client
+++ b/voice-client/files/etc/uci-defaults/99-voice_client
@@ -1,12 +1,5 @@
 #!/bin/sh

-. /lib/voice/voicelib.sh
-
-# Adapt to config section name changes
-grep -q brcm_line /etc/config/voice_client && sed -i 's/brcm_line/tel_line/g' /etc/config/voice_client
-grep -q brcm_advanced /etc/config/voice_client && sed -i 's/brcm_advanced/tel_advanced/g' /etc/config/voice_client
-
-# Add call filter section
 uci -q get voice_client.call_filter0 >/dev/null || {

 uci -q batch <<-EOT
@@ -21,7 +14,6 @@ EOT

 }

-# Add ringing schedule section
 uci -q get voice_client.RINGING_STATUS >/dev/null || {

 uci -q batch <<-EOT
@@ -35,28 +27,27 @@ EOT

 }

-# Default phone volume for iopsysWrt 4.X.
+# Default Broadcom phone volume for Iopsys 4.
 uci -q batch <<-EOT
-	set voice_client.$(getLineName)0.txgain=4
-	set voice_client.$(getLineName)0.rxgain=4
-	set voice_client.$(getLineName)1.txgain=4
-	set voice_client.$(getLineName)1.rxgain=4
-	set voice_client.$(getLineName)2.txgain=4
-	set voice_client.$(getLineName)2.rxgain=4
-	set voice_client.$(getLineName)3.txgain=4
-	set voice_client.$(getLineName)3.rxgain=4
-	set voice_client.$(getLineName)4.txgain=4
-	set voice_client.$(getLineName)4.rxgain=4
-	set voice_client.$(getLineName)5.txgain=4
-	set voice_client.$(getLineName)5.rxgain=4
-	set voice_client.$(getLineName)6.txgain=4
-	set voice_client.$(getLineName)6.rxgain=4
-	set voice_client.$(getLineName)7.txgain=4
-	set voice_client.$(getLineName)7.rxgain=4
+	set voice_client.brcm0.txgain=4
+	set voice_client.brcm0.rxgain=4
+	set voice_client.brcm1.txgain=4
+	set voice_client.brcm1.rxgain=4
+	set voice_client.brcm2.txgain=4
+	set voice_client.brcm2.rxgain=4
+	set voice_client.brcm3.txgain=4
+	set voice_client.brcm3.rxgain=4
+	set voice_client.brcm4.txgain=4
+	set voice_client.brcm4.rxgain=4
+	set voice_client.brcm5.txgain=4
+	set voice_client.brcm5.rxgain=4
+	set voice_client.brcm6.txgain=4
+	set voice_client.brcm6.rxgain=4
+	set voice_client.brcm7.txgain=4
+	set voice_client.brcm7.rxgain=4
 	commit voice_client
 EOT

-# Add firewall include
 uci -q batch <<-EOT
        delete firewall.sip
        set firewall.sip=include
--- a/voice-client/files/lib/cw.sh
+++ b/voice-client/files/lib/cw.sh
@@ -1,14 +1,12 @@
 #! /bin/sh

-. /lib/voice/voicelib.sh
-
 if [ $2 != '?' ]; then
-    for tel_line in `uci show voice_client | grep $(getLineName) | grep $1 | cut -d . -f 2`; do
-	sed -i "/\[$tel_line\]/,/^\[/ s/\(callwaiting=\)[0-9]/\1$2/" /etc/asterisk/$(getLineName).conf
+    for brcm in `uci show voice_client | grep brcm | grep $1 | cut -d . -f 2`; do
+	sed -i "/\[$brcm\]/,/^\[/ s/\(callwaiting=\)[0-9]/\1$2/" /etc/asterisk/brcm.conf
    done
 else
-    for tel_line in `uci show voice_client | grep $(getLineName) | grep $1 | cut -d . -f 2`; do
-	status=`sed -n "/\[$tel_line\]/,/^\[/ s/callwaiting=\([0-9]\)/\1/p" /etc/asterisk/$(getLineName).conf`
+    for brcm in `uci show voice_client | grep brcm | grep $1 | cut -d . -f 2`; do
+	status=`sed -n "/\[$brcm\]/,/^\[/ s/callwaiting=\([0-9]\)/\1/p" /etc/asterisk/brcm.conf`
 	echo $status
 	exit 0
    done
--- a/voice-client/files/lib/voice/broadcom.sh
+++ b/voice-client/files/lib/voice/broadcom.sh
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Voice library for Broadcom boards
-
-getChipVendor() {
-    echo brcm
-}
-
-getChannelName() {
-    echo BRCM
-}
-
-getLineName() {
-    echo brcm
-}
-
-getSerial() {
-    echo $(cat /proc/nvram/SerialNumber)
-}
-
-getBaseMAC() {
-    echo $(cat /proc/nvram/BaseMacAddr | sed 's/ //g')
-}
-
-getAllLines() {
-    echo "BRCM/0&BRCM/1&BRCM/2&BRCM/3&BRCM/4&BRCM/5&BRCM/6"
-}
-
-getLineIdx() {
-    echo $1
-}
-
-getEchoCancellingValue() {
-    case $1 in
-	0)
-	    echo '0'
-	    ;;
-	1)
-	    echo '1'
-	    ;;
-	*)
-	    # Unknown value
-	    echo ''
-	    ;;
-    esac
-}
--- a/voice-client/files/lib/voice/intel.sh
+++ b/voice-client/files/lib/voice/intel.sh
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Voice library for Intel boards
-
-getChipVendor() {
-    echo intel
-}
-
-getChannelName() {
-    echo TAPI
-}
-
-getLineName() {
-    echo tapi
-}
-
-getSerial() {
-    sernum=$(fw_printenv -n serial_number) 2> /dev/null
-
-    if [ $? ]; then
-	echo 0
-    else
-	echo $sernum
-    fi
-}
-
-getBaseMAC() {
-    echo $(fw_printenv -n ethaddr)
-}
-
-getAllLines() {
-    echo "TAPI/1&TAPI/2&TAPI/3&TAPI/4&TAPI/5&TAPI/6"
-}
-
-getLineIdx() {
-    i=$1
-    echo $((i+1))
-}
-
-getEchoCancellingValue() {
-    case $1 in
-	0)
-	    echo 'off'
-	    ;;
-	1)
-	    echo 'nlec'
-	    ;;
-	*)
-	    # Unknown value
-	    echo ''
-	    ;;
-    esac
-}
--- a/voice-client/files/usr/lib/asterisk/cbbs.sh
+++ b/voice-client/files/usr/lib/asterisk/cbbs.sh
@@ -23,8 +23,6 @@
 # ./cbbs.sh BRCM 0 4444 BRCM/4 5 300 45
 #####################################################

-. /lib/voice/voicelib.sh
-
 #Create temporary file
 tempfile=$(mktemp)

@@ -33,7 +31,7 @@ echo "Channel: $1/$2/$3" >> $tempfile
 echo "MaxRetries: $5" >> $tempfile
 echo "RetryTime: $6" >> $tempfile
 echo "WaitTime: $7" >> $tempfile
-echo "Set: $(getChannelName)LINE=$4" >> $tempfile
+echo "Set: BRCMLINE=$4" >> $tempfile

 #On answer
 echo "Context: cbbs" >> $tempfile
--- a/voice-client/files/usr/libexec/rpcd/voice.asterisk
+++ b/voice-client/files/usr/libexec/rpcd/voice.asterisk
@@ -1,11 +1,10 @@
 #!/bin/sh

 . /usr/share/libubox/jshn.sh
-. /lib/voice/voicelib.sh

 case "$1" in
 	list)
-		echo '{ "status" : {}, "lines" : {}, "codecs" : {}, "call_log" : {}, "platform" : {} }'
+		echo '{ "status" : {}, "lines" : {}, "codecs" : {}, "call_log" : {} }'

 	;;
 	call)
@@ -49,8 +48,8 @@ case "$1" in
                                done
 				json_select ..

-				json_add_object "tel"
-				for line in $(uci show voice_client | grep tel_line | awk -F[.,=] '{print$2}'); do
+				json_add_object "brcm"
+				for line in $(uci show voice_client | grep brcm_line | awk -F[.,=] '{print$2}'); do
 					json_add_object "$line"
 					linestate="ONHOOK"
 					linenum=${line:4}
@@ -67,7 +66,7 @@ case "$1" in

 			;;
 			lines)
-				subchannels=$(asterisk -x "$(getChipVendor) show status" 2>/dev/null | grep Subchannel | sort -u | wc -l)
+				subchannels=$(asterisk -x 'brcm show status' 2>/dev/null | grep Subchannel | sort -u | wc -l)
 				[ $subchannels -eq 0 ] && subchannels=2
                                json_init
                                json_add_int num_subchannels $subchannels
@@ -126,26 +125,6 @@ case "$1" in
                                done < /var/log/asterisk/cdr-csv/Master.csv
 				json_dump
 			;;
-			platform)
-                                json_init
-                                json_add_string platform "$(getLineName)"
-
-				case $(getLineName) in
-				    "brcm")
-					    json_add_int lineoffset 0
-					    json_add_int chanoffset 0
-				    ;;
-				    "tapi")
-					    json_add_int lineoffset 1
-					    json_add_int chanoffset -1
-				    ;;
-			        *)
-				    # Error, unknown platform
-				    ;;
-				esac
-				
-				json_dump
-			;;
 		esac
 	;;
 esac
--- a/wifilife/Makefile
+++ b/wifilife/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=wifilife
 PKG_VERSION:=1.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=de6183cda406fbd1a98779bda2ea1b2ffb8f2e04
+PKG_SOURCE_VERSION:=6971890314a06200f60d4c949d9b9654029b9fc3
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 ifeq ($(CONFIG_WIFILIFE_OPEN),y)
--- a/wifilife/files/wifilife.init
+++ b/wifilife/files/wifilife.init
@@ -9,6 +9,8 @@ EXTRA_COMMANDS="enable_check"


 start_service() {
+	[ "$(uci -q get wifilife.@wifilife[0].enabled)" == "0" ] && return
+
 	procd_open_instance
 	procd_set_param command ${PROG} -d -l -f -o /tmp/wifiagent.log
 	procd_set_param respawn
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=wifimngr
 PKG_VERSION:=1.0.2

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1de666d20954b818c075c9166a005d1ae13526d6
+PKG_SOURCE_VERSION:=c7228ea031f407580ff8e4801e0ba544aeadd050
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
Author	SHA1	Message	Date
Sukru Senli	1b9f020d20	Merge remote-tracking branch 'origin/release-4.2'	2019-05-04 10:34:27 +02:00
Jakob Olsson	7a5da766a2	wifilife: update pkg hash to include arp flush and stale entry refactor	2019-04-26 13:14:43 +02:00
Amin Ben Ramdhane	ff98b7dc3a	icwmp: Add Wifi Life parameters	2019-04-25 13:57:34 +01:00
Sukru Senli	b52f24d6df	wifilife: do not start wifiagent if wifilife is disabled	2019-04-25 11:43:57 +02:00
Sukru Senli	582ec662bb	iop: default customer iopsys	2019-04-12 19:24:46 +02:00
Sukru Senli	525d55177a	icwmp: fix tr-181 Device.Routing issues	2019-04-10 15:13:01 +02:00
Sukru Senli	5b69874139	iop: update_package: ignore the feed if not hash is used	2019-04-08 15:59:36 +02:00
Anjan Chanda	92c7c24a43	Update feed [ iopsys ] package [ wifimngr ] ------------------------------------------------------------------------------- * c7228ea fix array size bounds for max interfaces ------------------------------------------------------------------------------- commit c7228ea031f407580ff8e4801e0ba544aeadd050 Author: Anjan Chanda <anjan.chanda@iopsys.eu> Date: 2019-04-08 13:40:40 +0200 fix array size bounds for max interfaces Base directory -> / wifimngr.c \| 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -------------------------------------------------------------------------------	2019-04-08 13:50:19 +02:00
Sachin Singla	906f7881c7	ifbt: add syslog debugging feature	2019-04-08 12:06:22 +02:00
Sukru Senli	ec37110043	Merge remote-tracking branch 'origin/release-4.2'	2019-04-03 09:04:25 +02:00
Sukru Senli	1cec925bbb	netmode: fix acl for netmodes	2019-04-02 13:04:27 +02:00
Sachin Singla	bd6aa7ed3d	ifbt: change event name to wifi.fbt	2019-03-29 17:56:08 +01:00
Sukru Senli	4e3fbdb5b3	icwmp-4.0-2019-03-29	2019-03-29 17:30:56 +01:00
Anjan Chanda	02363930c1	Update feed [ iopsys ] package [ wifimngr ] ------------------------------------------------------------------------------- * 1de666d match iftype in uci_wifi_get_interfaces function ------------------------------------------------------------------------------- commit 1de666d20954b818c075c9166a005d1ae13526d6 Author: Anjan Chanda <anjan.chanda@iopsys.eu> Date: 2019-03-29 14:49:03 +0100 match iftype in uci_wifi_get_interfaces function Base directory -> / wifimngr.c \| 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) -------------------------------------------------------------------------------	2019-03-29 14:54:10 +01:00
Sukru Senli	c35f3b1ca1	Revert "netmode: disable wificontrol by default" This reverts commit `bcba464917`.	2019-03-28 18:52:57 +01:00
Jakob Olsson	da88558c98	questd: update pkg to adapt to mobility domain id	2019-03-28 18:51:50 +01:00
Sachin Singla	3fa918aacc	ifbt: fix issues in ifbt	2019-03-28 16:45:07 +01:00
Sachin Singla	406002c5b0	ifbt: fix ifbt issues	2019-03-28 12:13:06 +01:00
Anjan Chanda	e4df6d3814	Update feed [ iopsys ] package [ wifimngr ] ------------------------------------------------------------------------------- * 4b4087d account for vifs in wildcard dumps ------------------------------------------------------------------------------- commit 4b4087d3970258c2fd7e90e65df923e3f699189e Author: Anjan Chanda <anjan.chanda@iopsys.eu> Date: 2019-03-28 11:50:50 +0100 account for vifs in wildcard dumps Base directory -> / wifimngr.c \| 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 7 deletions(-) -------------------------------------------------------------------------------	2019-03-28 11:56:37 +01:00
Anjan Chanda	52a8c3b217	Update feed [ iopsys ] package [ wifilife ] ------------------------------------------------------------------------------- * 9a75b71 disable legacy_steer by default * 47c680d don't btm steer if retry reached ------------------------------------------------------------------------------- commit 9a75b717d3cd95d88e394f5bcd8b4006dfa450ba Author: Anjan Chanda <anjan.chanda@iopsys.eu> Date: 2019-03-28 10:35:00 +0100 disable legacy_steer by default Base directory -> / src/config.c \| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 47c680d59d1db7e2a4b801d3d7cef1829e29c4d6 Author: Anjan Chanda <anjan.chanda@iopsys.eu> Date: 2019-03-28 09:21:37 +0100 don't btm steer if retry reached Base directory -> / src/agent.c \| 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -------------------------------------------------------------------------------	2019-03-28 11:56:00 +01:00
Sachin Singla	9c4252e918	add PMK_R0 for 11r	2019-03-28 10:41:35 +01:00
Sachin Singla	39d7ee1f1a	increase inbd buffer	2019-03-28 10:29:55 +01:00
Sukru Senli	e446abffd3	ice-client: restrict access to ice user password	2019-03-27 18:05:51 +00:00
Jakob Olsson	a35497685b	questd: update pkg to include wificontrol compilation fixes	2019-03-27 16:24:36 +01:00
Jakob Olsson	c364bb7f82	Revert "Revert "netmode: disable wificontrol by default"" This reverts commit `8c272d3613`.	2019-03-27 16:12:54 +01:00
Jakob Olsson	0440496d16	Revert "questd: remove wificontrol" This reverts commit `7513d32e91`.	2019-03-27 16:12:51 +01:00
Jakob Olsson	981d4b0b7d	questd: update pkg to include wificontrol re-addition to makefile	2019-03-27 16:12:39 +01:00
Jakob Olsson	7513d32e91	questd: remove wificontrol	2019-03-27 15:49:12 +01:00
Jakob Olsson	45c4d8dc39	questd: update pkg to include router.network refactor #17078 #17081 Primarily a router.network overhaul, but also minor router.system info fix.	2019-03-27 15:47:46 +01:00
Jakob Olsson	1fa45afa52	wifilife: update pkg to include legacy steer options #17100	2019-03-27 12:35:50 +01:00
Sukru Senli	8c272d3613	Revert "netmode: disable wificontrol by default" This reverts commit `bcba464917`.	2019-03-23 11:48:58 +01:00
Sukru Senli	8de301e38b	wifilife: set dnsmasq lease hwmask according to mobility domain id	2019-03-23 11:47:34 +01:00
Jakob Olsson	f91e7063ca	wifimngr: update pkg to include data model change to assoclist #17078	2019-03-21 13:10:19 +01:00
Sukru Senli	bcba464917	netmode: disable wificontrol by default	2019-03-21 11:29:57 +01:00
Jakob Olsson	b1d03ebb60	samba: use hex_filter when creating user and password #17065	2019-03-20 13:56:00 +01:00
Jakob Olsson	833e1b90c5	Revert "quest: update pkg to fix router.network for repeated clients" This reverts commit `f8857b208d`.	2019-03-19 16:21:59 +01:00
Jakob Olsson	206370c994	netmode: update pkg removal of perror on fopen	2019-03-19 10:35:41 +01:00
Sukru Senli	ad4d329dc1	voice-client: reload asterisk upon ifup even if not bound to a specific interface	2019-03-19 08:44:14 +01:00
Jakob Olsson	f8857b208d	quest: update pkg to fix router.network for repeated clients	2019-03-15 09:55:50 +01:00
Sachin Singla	f072c81d04	add EX400 master support	2019-03-14 14:17:27 +01:00
Jakob Olsson	7799804f1d	wifilife: update pkg to include fix that exits on wifix radios timeout #16739	2019-03-13 10:14:07 +01:00
Jakob Olsson	6d5130e982	wifilife: update pkg hash to fix agent crash on cleaned timeouts #17005	2019-03-12 13:33:28 +01:00
Jakob Olsson	b08f86d209	netmode: run save/apply _wet_cfg through pre and post scripts #16601	2019-03-12 09:59:17 +01:00
Jakob Olsson	a9976f626b	netmode: update pkg to include flashing led change #16963	2019-03-04 16:47:01 +01:00
Jakob Olsson	223f025b72	wifilife: update pkg to include minor memory leak fix	2019-03-04 12:25:21 +01:00
Jakob Olsson	c8ba536d59	netmode: update pkg ot include flashing leds during zero-touch #16963	2019-03-04 12:16:50 +01:00
Jakob Olsson	6781aad52e	netmode: do ubus call commit owsd after writing to owsd config #16739 Daemons such as wifilife are dependent on owsd configuration. Wifilife was started with the controller running and it was never being stopped, despite owsd config being changed.	2019-02-25 12:38:27 +01:00
Jakob Olsson	133ab71018	samba: add hex filter to discard newline section or config #16885	2019-02-21 16:37:43 +01:00
Jakob Olsson	e3c43d892f	Revert "samba: prevent mulitple lines from being written to an option in smb.conf" This reverts commit `88291c196a`.	2019-02-21 15:37:56 +01:00
Jakob Olsson	d9380968a1	Revert "samba: prevent multiple lines from being written from uci to smb.conf #16885 " This reverts commit `8784439985`.	2019-02-21 15:37:52 +01:00
Jakob Olsson	8784439985	samba: prevent multiple lines from being written from uci to smb.conf #16885	2019-02-20 14:42:41 +01:00
Amin Ben Ramdhane	d1ad9dc34f	icwmp-4.0-2019-02-19	2019-02-19 13:53:10 +01:00
Reidar Cederqvist	c430a0f15e	ice-client: update to version 5.3.6 refs #16174	2019-02-14 08:34:45 +01:00
Jakob Olsson	800728c7aa	owsd: wifilife: prevent procd crash loop error	2019-02-12 14:18:47 +01:00
Jakob Olsson	38668ee8d9	wifilife: add reload trigger on owsd.ubusproxy.enable change	2019-02-12 14:18:47 +01:00
Jakob Olsson	e9d00040a7	netmode: update pkg to include status method	2019-02-12 08:52:49 +01:00
Jakob Olsson	bc5fad2c76	wifilife: update pkg to include workaround for stale clients when roaming	2019-02-11 13:13:09 +01:00
Jakob Olsson	52ea555ffb	wifimngr: update hash to include disconnect_sta function	2019-02-11 13:13:09 +01:00
Amin Ben Ramdhane	eeecaa27de	icwmp-4.0-2019-02-07	2019-02-07 16:17:16 +01:00
Sukru Senli	e8cf33b544	Merge remote-tracking branch 'origin/devel'	2017-12-27 12:07:48 +01:00
Sukru Senli	fb983f5dbc	questd: imonitor: bring down and up the wireless radios when bsd or acsd crashes	2017-12-22 15:21:30 +01:00
Sukru Senli	676e40a0cc	voice-client depend on asterisk13 or asterisk18-mod	2017-12-22 14:28:38 +01:00
Sukru Senli	215274ef98	tptest: remove tptest.bredband.net from list	2017-12-20 19:20:49 +01:00
Erik Horemans	02ca863b23	new ice-client 5.0.1-RC1	2017-12-20 13:53:51 +01:00
Reidar Cederqvist	6f86f000b1	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * b279429 fix empty client list on wl1 when wl0 is disabled ref #13485 * 1c47a44 change strndup to strdup to avoid warnings ------------------------------------------------------------------------------- commit b2794295fdf9469b6cd8ba1544f291d4b83a7d5a Author: Reidar Cederqvist <reidar.cederqvist@gmail.com> Date: 2017-12-15 11:33:13 +0100 fix empty client list on wl1 when wl0 is disabled ref #13485 Base directory -> / network.c \| 5 +++-- port.c \| 17 +++++++++++++++++ port.h \| 1 + 3 files changed, 21 insertions(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 1c47a44bfcb863319282900446bf20965c9eccbc Author: Reidar Cederqvist <reidar.cederqvist@gmail.com> Date: 2017-12-15 11:24:01 +0100 change strndup to strdup to avoid warnings Base directory -> / port.c \| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -------------------------------------------------------------------------------	2017-12-15 11:34:14 +01:00
Sukru Senli	8506eed1e4	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 4bbcb4d network: handle rssi for repeated arp clients ------------------------------------------------------------------------------- commit 4bbcb4d2f8c901c18cdf4456e65497975e03fada Author: Sukru Senli <sukru.senli@inteno.se> Date: 2017-12-13 17:39:02 +0100 network: handle rssi for repeated arp clients Base directory -> / network.c \| 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -------------------------------------------------------------------------------	2017-12-13 17:40:02 +01:00
Sukru Senli	53b3f486bd	questd: imonitor: do not restart quest if lan ifname is missing or is bridge	2017-12-13 13:38:22 +01:00
Sukru Senli	e31e5f32da	questd-3.1.40	2017-12-13 13:11:50 +01:00
Reidar Cederqvist	26c2dae0c9	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * b4b9988 questd: improve parsing * 9e98e21 questd: get nvram Hardware Version value * 875d5fe fix c99 warning * 2711c6b questd: print rssi value from extender * f62075b questd: get rssi value from extender * cd39df6 add missing close for ioctl socket ------------------------------------------------------------------------------- commit b4b99885bea425f552e8a844ff2f15e2d4672c65 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 17:12:37 +0100 questd: improve parsing Base directory -> / dumper.c \| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 9e98e21a84347b3d77a5ae44fb2fc783c7bb77dd Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 16:27:27 +0100 questd: get nvram Hardware Version value Base directory -> / dumper.c \| 20 ++++++++++++++++++++ system.c \| 5 +++++ system.h \| 1 + 3 files changed, 26 insertions(+) ------------------------------------------------------------------------------- commit 875d5fe069d178ecb1b4b9bca78aba90691afc12 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-30 16:13:31 +0100 fix c99 warning Base directory -> / wificontrol.c \| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 2711c6b34357ea25abe08d43612347f6e0c4b5b2 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:37:56 +0100 questd: print rssi value from extender Base directory -> / network.c \| 30 +++++++++++++++++++----------- network.h \| 7 ++++++- 2 files changed, 25 insertions(+), 12 deletions(-) ------------------------------------------------------------------------------- commit f62075bd509755052e6006db9e901476145500db Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:35:06 +0100 questd: get rssi value from extender Base directory -> / Makefile \| 2 +- wificontrol.c \| 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) ------------------------------------------------------------------------------- commit cd39df609dcb7f824f50d4d544ac5247bcd85b3f Author: Reidar Cederqvist <reidar.cederqvist@gmail.com> Date: 2017-12-04 12:47:24 +0100 add missing close for ioctl socket Base directory -> / network.c \| 1 + 1 file changed, 1 insertion(+) -------------------------------------------------------------------------------	2017-12-07 15:48:04 +01:00
Erik Horemans	2f2d88f770	new ice-client ice-client 5.0.1-RC0	2017-12-05 16:34:25 +01:00
Ionut-Alex Oprea	540b09e26b	imonitor: increase questd memory limit to 20MB refs #13511	2017-12-05 14:24:40 +01:00
Robin Stjerndorff	001c25ee12	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 16cb4dd questd: improve parsing * 312ca10 questd: get nvram Hardware Version value * 824c247 fix c99 warning * 83a7011 questd: print rssi value from extender * b554abd questd: get rssi value from extender ------------------------------------------------------------------------------- commit 16cb4dda3909efef54b84d44fa11dc28f9763c8c Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 17:12:37 +0100 questd: improve parsing Base directory -> / dumper.c \| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 312ca10075347ea1ca4d4a051d079ff5643a934e Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 16:27:27 +0100 questd: get nvram Hardware Version value Base directory -> / dumper.c \| 20 ++++++++++++++++++++ system.c \| 5 +++++ system.h \| 1 + 3 files changed, 26 insertions(+) ------------------------------------------------------------------------------- commit 824c24781123b0cc83216486732e5a03823ec5ed Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-30 16:13:31 +0100 fix c99 warning Base directory -> / wificontrol.c \| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 83a7011877b6a7b1dcbcfd925037ffd77de5165f Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:37:56 +0100 questd: print rssi value from extender Base directory -> / network.c \| 30 +++++++++++++++++++----------- network.h \| 7 ++++++- 2 files changed, 25 insertions(+), 12 deletions(-) ------------------------------------------------------------------------------- commit b554abd3fa7e0898095bfb575803081f716d3723 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:35:06 +0100 questd: get rssi value from extender Base directory -> / Makefile \| 2 +- wificontrol.c \| 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) -------------------------------------------------------------------------------	2017-12-04 17:27:22 +01:00
Reidar Cederqvist	1193886cef	changed the default value for enable in catv from 'no' to '0' both the new and old value work with the current inti.d script	2016-08-31 14:20:38 +02:00
Reidar Cederqvist	cebc3f53e5	updated the init.d script for catv so it gets a bool for enable from config and sends "on/off" to ubus call catv set-enable	2016-08-31 14:16:36 +02:00