update hash

-------------------------------------------------------------------------------
* 7a0a742 might be fixed for refs #16316
* 34f8e0c fix compile bug
* a698c39 give len to sscanf
* a1a73af do not malloc memory
* e070e8b Revert "refs #15754"
* 76ea435 refs #15754
-------------------------------------------------------------------------------
commit 7a0a7427d339736e3ee555e816d40c985651632c
Author: ke hu <ke.hu@inteno.se>
Date: 2018-11-30 14:10:27 +0100

    might be fixed for refs #16316

    instead stack with memory pool

Base directory -> /
 mediatek.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 questd.c   |  3 +++
 wireless.c | 12 ++++++++++-
 3 files changed, 76 insertions(+), 9 deletions(-)
-------------------------------------------------------------------------------
commit 34f8e0cb4f6b046b35926d59270f75457442922f
Author: ke hu <ke.hu@inteno.se>
Date: 2018-11-30 09:49:56 +0100

    fix compile bug

Base directory -> /
 mediatek.c | 1 -
 1 file changed, 1 deletion(-)
-------------------------------------------------------------------------------
commit a698c39778c18c3f606c21e81ccba8ed9601d675
Author: ke.hu <ke.hu@iopsys.eu>
Date: 2018-11-29 16:45:41 +0100

    give len to sscanf

    fixed some sscanf protential bugs

Base directory -> /
 dsl.c      |  4 ++--
 dumper.c   |  2 +-
 graphd.c   | 11 +++++++----
 mediatek.c | 13 ++++++-------
 net.c      | 16 ++++++++--------
 network.c  |  8 ++++----
 port.c     | 14 +++++++-------
 system.c   |  8 ++++----
 usb.c      |  2 +-
 9 files changed, 40 insertions(+), 38 deletions(-)
-------------------------------------------------------------------------------
commit a1a73af6a433d1bd20fb7ec7929ec00c3d7de06b
Author: ke hu <ke.hu@inteno.se>
Date: 2018-11-23 10:15:20 +0100

    do not malloc memory

    use stack instead of malloc
Base directory -> /
 mediatek.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit e070e8b76989cee0e5522187d9ea50db082105d9
Author: ke hu <ke.hu@inteno.se>
Date: 2018-10-11 16:08:30 +0200

    Revert "refs #15754"

    This reverts commit 76ea43590245e6ffb2ee7db76f9e33778eee9210.

Base directory -> /
 port.c | 11 -----------
 1 file changed, 11 deletions(-)
-------------------------------------------------------------------------------
commit 76ea43590245e6ffb2ee7db76f9e33778eee9210
Author: ke hu <ke.hu@inteno.se>
Date: 2018-10-11 16:08:30 +0200

    refs #15754

    wireless port fixed

Base directory -> /
 port.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
-------------------------------------------------------------------------------

dectmngr2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.2.0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ace6a3dcb6aa463cf5a34ad39ac37a5bc7d4ce5e
+PKG_SOURCE_VERSION:=0c029ed2486342e7e7687631b702d5c743f3c41a
 PKG_NAME:=dectmngr2
 
 
@@ -21,6 +21,7 @@ export BUILD_DIR
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,7 +29,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
 endef
 
 define Package/dectmngr2/description

easy-soc-libs/Config.in

@@ -0,0 +1,19 @@
+if (PACKAGE_libwifi || PACKAGE_libdsl || PACKAGE_libethernet)
+menu "configurations"
+
+config IOP_LLA_LIBS_DEBUG
+	bool "Enable debugging support"
+	default n
+
+config LIBWIFI_DEBUG
+	depends on PACKAGE_libwifi
+	bool "Enable wifi debugging"
+	default n
+
+config LIBDSL_DEBUG
+	depends on PACKAGE_libdsl
+	bool "Enable xdsl debugging"
+	default n
+
+endmenu
+endif

easy-soc-libs/Makefile

@@ -0,0 +1,133 @@
+#
+# Copyright (C) 2018 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=easy-soc-libs
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=8989476ac5df494064ed94a52634be5c61fff037
+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
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/easy-soc-libs
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=IOPSYS easy SoC libraries
+  SUBMENU:=IOPSYS easy SoC libraries
+  DEPENDS:=+libopenssl
+  MENU:=1
+endef
+
+define Package/libwifi/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/libwifi
+  $(call Package/easy-soc-libs)
+  TITLE:= WiFi library (libwifi)
+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
+endef
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+  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
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+  TARGET_CFLAGS +=-DIOPSYS_MARVELL
+else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y)
+  TARGET_PLATFORM=LANTIQ
+  TARGET_CFLAGS +=-DIOPSYS_LANTIQ
+else
+  $(info (UNEXPECTED CONFIG TARGET))
+endif
+
+ifdef CONFIG_IOP_LLA_LIBS_DEBUG
+  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
+endif
+
+subdirs := \
+	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
+	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
+define Build/InstallDev/libwifi
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
+endef
+
+define Build/InstallDev/libdsl
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+endef
+
+define Build/InstallDev/libethernet
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
+endef
+
+
+define Build/InstallDev
+	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
+endef
+
+define Package/libwifi/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
+endef
+
+define Package/libethernet/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
+endef
+
+define Package/libdsl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwifi))
+$(eval $(call BuildPackage,libdsl))
+$(eval $(call BuildPackage,libethernet))

endptmngr/Makefile

@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.1
-PKG_SOURCE_VERSION:=fa9ba5d7c942571ae6e44eb7bb5dae2c9b9e8ca4
+PKG_VERSION:=0.2
+PKG_SOURCE_VERSION:=a78fe95d5c5a0a320f3b62b9d2faafd07b56e3a7
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)

endptmngr/files/dect.config

@@ -1,4 +0,0 @@
-
-config dect 'dect'
-	option radio 'auto'
-

eventlog/Makefile

@@ -0,0 +1,49 @@
+#
+# 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:=eventlog
+PKG_VERSION:=0.2.9
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/eventlog/0.2/
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=76e3d7a0b8f335c12099e9b91191fbf1
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libeventlog
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A new API to format and send structured log messages.
+endef
+
+define Package/eventlog/description
+  A new API to format and send structured log messages. It supports multiple message
+  representations (plain, XML attributes and XML tags) and multiple output methods
+  (local syslogd).
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/eventlog $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/eventlog.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libeventlog/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libeventlog))

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.3.6
+BASE_PKG_VERSION:=5.2.3
 PKG_RELEASE:=
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=94aab1532fef2caf2d65579614fc413252a517eb
+PKG_SOURCE_VERSION:=795cf8ce3cc19ff8bbb014c8ac456784c187dcc5
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

ice-client/files/ice-client.uci_default

@@ -7,7 +7,8 @@ grep -rq "^ice:" /etc/passwd || {
 uci -q delete passwords.ice
 uci -q set passwords.ice=usertype
 uci -q set passwords.ice.password="\$WPAKEY"
-uci -q add_list passwords.ice._access_r=root
+uci -q del_list passwords.ice._access_w=root
+uci -q add_list passwords.ice._access_w=root
 uci -q commit passwords
 
 uci show rpcd | grep username=.*ice.* >/dev/null || {
@@ -16,7 +17,7 @@ cat >> /etc/config/rpcd << EOF
 config login
 	option username 'ice'
 	option password '\$p\$ice'
-	list _access_r 'none'
+	list _access_w 'none'
 	list write 'user-user'
 	list write 'juci-broadcom-dsl'
 	list write 'juci-broadcom-dsl-admin'
@@ -63,5 +64,9 @@ config login
 EOF
 }
 
+uci -q del_list dhcp.@domain[0].name="inteno.lan"
+uci -q add_list dhcp.@domain[0].name="inteno.lan"
+uci -q commit dhcp
+
 exit 0
 

icwmp/Config_cwmp.in

@@ -27,5 +27,9 @@ config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
 
+config LIBDATAMODEL_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
+    
 endif
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2018-12-28
+PKG_VERSION:=4.0-2018-12-04
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=942ff9d7fc177bcd19f5aeee612f814e8d6632d4
+PKG_SOURCE_VERSION:=f9bbd7fb4a122dd523c2f2eaedec932c8483154f
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -95,6 +95,8 @@ ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 TARGET_CFLAGS += -DEX400
 endif
 
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 

icwmp/files/etc/hotplug.d/iface/90-icwmp

@@ -75,11 +75,9 @@ handle_icwmp_restart() {
 		"$previpaddr" = "$curipaddr" -a \
 		"$prevgateway" = "$curgateway" -a \
 		"$prevsubnets" = "$cursubnets" -a \
-		"$prevdnsservers" = "$curdnsservers" \
-	] && {
-		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
-		[ -z "$prevopt43url" ] && exit 0
-	}
+		"$prevdnsservers" = "$curdnsservers" -a \
+		"$prevopt43url" = "$curopt43url" \
+	] && exit 0
 
 	/etc/init.d/icwmpd reload &
 }

ifbt/Makefile

@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2013 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ifbt
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=a0572079265293ed99dc4d69fd38528760d29be9
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ifbt
+	CATEGORY:=Utilities
+	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c  +libwifi +libjson-c
+	TITLE:=Fast BSS Transition
+endef
+
+define Package/ifbt/description
+	ifbt is Iopsys application for fast BSS transition
+endef
+
+define Package/ifbt/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifbt $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ifbt))

imonitor/Makefile

@@ -12,7 +12,7 @@ PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
-PKG_SOURCE_VERSION:=defec6849fb987619fc7fd9295895f4f0b9db5a9
+PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 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>

imonitor/files/etc/config/imonitor

@@ -1,8 +1,9 @@
 config monitor
-   option app 'test'
-   option test 'echo test'
-   option stream 'stdout'
-   option string_match 'test'
-   option execute 'echo executing'
-   option interval '10'
-   option nr_tests '2'
+	option app 'test'
+	option test 'echo test'
+	option stream 'stdout'
+	option string_match 'TEST'
+	option execute 'echo executing test'
+	option interval '10'
+	option nr_tests '2'
+

inbd/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=f81c146f0b07540877545e5ab644ec8e29905a4d
+PKG_SOURCE_VERSION:=b846ae0ff55284392de2c4d874851b33edd7a6c5
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 

iop/configs/config

@@ -32,7 +32,8 @@ 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_icwmp_stun=y
+CONFIG_PACKAGE_ifbt=y
+CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_iperf-mt=y
@@ -46,6 +47,7 @@ CONFIG_PACKAGE_iwatchdog=y
 CONFIG_PACKAGE_juci=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
@@ -79,7 +81,7 @@ 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-inteno=y
+CONFIG_PACKAGE_juci-theme-iopsys=y
 CONFIG_PACKAGE_juci-ubus-core=y
 CONFIG_PACKAGE_juci-upnp=y
 CONFIG_PACKAGE_juci-usb=y
@@ -131,6 +133,7 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_samba3=y
 CONFIG_PACKAGE_samba3-nmbd=y
 CONFIG_PACKAGE_snmpd=y
@@ -146,7 +149,9 @@ CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_wlng=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_wifilife=y
+CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
@@ -219,3 +224,5 @@ 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

iop/configs/target/intel_mips/config

@@ -0,0 +1,67 @@
+# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
+CONFIG_GCC_VERSION="6.3.0"
+CONFIG_TOOLCHAINOPTS=y
+# CONFIG_BINUTILS_USE_VERSION_2_27 is not set
+CONFIG_BINUTILS_USE_VERSION_2_28=y
+# CONFIG_BINUTILS_USE_VERSION_2_29_1 is not set
+# CONFIG_GCC_USE_GRAPHITE is not set
+# CONFIG_GCC_USE_VERSION_5 is not set
+CONFIG_GCC_USE_VERSION_6=y
+# CONFIG_GCC_USE_VERSION_7 is not set
+# CONFIG_LIBC_USE_GLIBC is not set
+CONFIG_LIBC_USE_MUSL=y
+
+
+# CONFIG_PACKAGE_ppp-mod-pppoa is not set
+
+#################### switch related
+CONFIG_PACKAGE_switch_cli_ugw8=y
+
+#################### ppa related
+CONFIG_PACKAGE_ppacmd=y
+# CONFIG_PACKAGE_kmod-ppa-drv-gre is not set
+# CONFIG_PACKAGE_kmod-ppa-drv-grx500-eth-bond is not set
+# CONFIG_PACKAGE_kmod-ppa-drv-grx500-mpe is not set
+# CONFIG_PACKAGE_kmod-ppa-drv-mpe-ip97 is not set
+CONFIG_PACKAGE_mcast-pa=y
+
+#################### DSL related
+CONFIG_PACKAGE_dsl-cpe-control-vrx=y
+CONFIG_dsl-cpe-mei-vrx_DEVICE_VR11=y
+CONFIG_dsl-cpe-mei-vrx_IRQ_POLLING_ACTIVE=y
+CONFIG_PACKAGE_kmod-dsl-cpe-mei-vrx=y
+CONFIG_PACKAGE_ifxos=y
+CONFIG_PACKAGE_kmod-directconnect-dp=y
+CONFIG_PACKAGE_kmod-vrx518_tc_drv=y
+CONFIG_PACKAGE_vrx518_aca_fw=y
+CONFIG_PACKAGE_vrx518_ppe_fw=y
+CONFIG_dsl-cpe-api-vrx_MODEL_DEBUG=y
+CONFIG_dsl-cpe-control-vrx_DTI=y
+CONFIG_dsl-cpe-control-vrx_MODEL_DEBUG=y
+# yes intel dsl script need this.
+CONFIG_BUSYBOX_CONFIG_USLEEP=y
+#################### DSL related end
+
+#################### WIFI related
+CONFIG_PACKAGE_kmod-lantiq-wlan-wave-support_5_x=y
+CONFIG_PACKAGE_ltq-wlan-wave_5_x=y
+CONFIG_FEATURE_LTQ_WAVE_500_PCIE=y
+# CONFIG_FEATURE_LTQ_WAVE_500 is not set
+CONFIG_FEATURE_LTQ_WAVE_AR10_SUPPORT=y
+# CONFIG_FEATURE_LTQ_WAVE_STA is not set
+# CONFIG_FEATURE_LTQ_WAVE_DEBUG_TFTP_BINS is not set
+# CONFIG_FEATURE_LTQ_WAVE_FGPA_DUMMY_PHY is not set
+CONFIG_FEATURE_LTQ_WAVE_500B=y
+####################
+
+# the options below this point is wrong but packages wont compile
+
+# CONFIG_PACKAGE_icwmp-curl is not set
+# CONFIG_PACKAGE_juci-icwmp is not set
+# CONFIG_PACKAGE_libcgroup is not set
+# CONFIG_PACKAGE_libcgroup-daemon is not set
+# CONFIG_PACKAGE_libdatamodel is not set
+
+# CONFIG_TARGET_ROOTFS_INITRAMFS is not set
+# CONFIG_TARGET_ROOTFS_SQUASHFS is not set
+

iop/configs/target/intel_mips/speedport_smart3/config

@@ -0,0 +1,3 @@
+# temporary solution for kernel
+CONFIG_KERNEL_GIT_BRANCH="easy550_anywan_smart3board"
+CONFIG_KERNEL_GIT_COMMIT="58796d57c6da6bba984c781c05222349f7c2b655"

iop/configs/target/iopsys_brcm63xx_arm/dg400/config

@@ -1,3 +1,4 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
 

iop/configs/target/iopsys_brcm63xx_arm/dg400prime/config

@@ -1,3 +1,4 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
 

iop/configs/target/iopsys_brcm63xx_arm/eg400/config

@@ -1,5 +1,7 @@
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
+
 CONFIG_TARGET_NO_DSL=y
 

iop/configs/target/iopsys_brcm63xx_arm/f104/config

@@ -1,4 +1,6 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
+
 CONFIG_USE_DSL=y
 CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/f104w/config

@@ -1,4 +1,6 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
+
 CONFIG_USE_DSL=y
 CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config

@@ -1,3 +1,5 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
+
 CONFIG_TARGET_NO_DSL=y

iop/configs/target/iopsys_brcm63xx_mips/cg300/config

@@ -1,4 +1,3 @@
 CONFIG_TARGET_NO_DSL=y
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/config

@@ -1,7 +1,6 @@
 # CONFIG_PACKAGE_libcgroup-daemon is not set
 # CONFIG_PACKAGE_libcgroup is not set
 
-# CONFIG_PACKAGE_natalie-dect is not set
 # CONFIG_PACKAGE_juci-broadcom-wl is not set
 # CONFIG_PACKAGE_juci-minisnmpd is not set
 # CONFIG_PACKAGE_juci-router-openwrt is not set

iop/configs/target/iopsys_brcm63xx_mips/dg200/config

@@ -1,4 +1,3 @@
 CONFIG_BCM_I2C=y
 CONFIG_TARGET_NO_DECT=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/dg301/config

@@ -1,3 +1,2 @@
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/eg300/config

@@ -1,4 +1,3 @@
 CONFIG_TARGET_NO_DSL=y
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/vg50/config

@@ -1,5 +1,4 @@
 CONFIG_TARGET_NO_DHD=y
 CONFIG_TARGET_NO_VOICE=y
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/scripts/annexconfig.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+function disable_add_config () {
+	local COPTION="$1"
+
+	HAVE_OPTION=`grep $COPTION .config | wc -l`
+	HAVE_OPTION_DISABLED=`grep "# $COPTION" .config | wc -l`
+	if [ "$HAVE_OPTION" = "1" ]
+	then
+		if [ "$HAVE_OPTION_DISABLED" = "0" ]
+		then
+			sed -i -e "s,$COPTION=y,# $COPTION is not set,g" .config
+		fi
+	else
+		echo "# $COPTION is not set" >> .config
+	fi
+}
+
+function enable_option () {
+	local COPTION="$1"
+#	cat .config| grep DSL
+	sed -i -e "s,# $COPTION is not set,$COPTION=y,g" .config
+#	cat .config| grep DSL
+}
+
+function annexconfig {
+
+	v() {
+		[ "$VERBOSE" -ge 1 ] && echo "$@"
+	}
+
+	local ANNEX="$1"
+
+	disable_add_config CONFIG_TARGET_NO_DSL
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_A
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_B
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_C
+	disable_add_config CONFIG_TARGET_DSL_SADSL
+	disable_add_config CONFIG_TARGET_DSL_GFAST
+
+
+	if [ "$ANNEX" = "no" ]
+	then
+		echo "No DSL"
+		enable_option CONFIG_TARGET_NO_DSL
+	elif [ "$ANNEX" = "a" ]
+	then
+		echo "Annex A"
+		enable_option CONFIG_TARGET_DSL_ANNEX_A
+	elif [ "$ANNEX" = "b" ]
+	then
+		echo "Annex B"
+		enable_option CONFIG_TARGET_DSL_ANNEX_B
+	elif [ "$ANNEX" = "c" ]
+	then
+		echo "Annex C"
+		enable_option CONFIG_TARGET_DSL_ANNEX_C
+	elif [ "$ANNEX" = "sadsl" ]
+	then
+		echo "sadsl"
+		enable_option CONFIG_TARGET_DSL_SADSL
+	elif [ "$ANNEX" = "gfast" ]
+	then
+		echo "G.fast"
+		enable_option CONFIG_TARGET_DSL_GFAST
+	else
+		echo "Only option no,a,b,c,sadsl,gfast supported"
+	fi
+
+}
+
+register_command "annexconfig" "Select configuration annex"

iop/scripts/build_branch.sh

@@ -6,6 +6,7 @@ function build_branch_usage {
 	echo "usage: $0 build_branch <branch> <board> [<customer>]"
 	echo "example: $0 build_branch devel-new ex400 DEV"
 	echo "example: $0 build_branch_sysupgrade devel-new ex400 DEV 192.168.1.1 -n"
+	set +x
 	exit 1
 }
 
@@ -17,6 +18,7 @@ function branch_exists {
 }
 
 function build_branch {
+	set -x
 	local branch=$1
 	local board=$2
 	local customer=$3
@@ -35,6 +37,7 @@ time {
 	./iop feeds_update || build_branch_usage
 	./iop genconfig -c $board $customer || build_branch_usage
 	make -j 8 || build_branch_usage
+	set +x
 }
 }
 

iop/scripts/extract_core.sh

@@ -24,7 +24,7 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		echo "  -r feeds/feed_inteno_openwrt"
+		echo "  -r feeds/lede_core"
 		echo "  -b devel"
 	}
 

iop/scripts/feeds_update.sh

@@ -32,9 +32,10 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
-    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
-    ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
+    ./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 

iop/scripts/genconfig.sh

@@ -14,45 +14,70 @@ function genconfig {
 	export DEVELOPER=0
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
-	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
-	iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
-	iopsys_ramips="ex400 sdx810_ap"
-	ramips="mt7621"
 	target="bogus"
 	masterconfig=1
 
-	set_target()
-	{
-	local profile=$1
+	# Takes a board name and returns the target name in global var $target
+	set_target() {
+	    local profile=$1
 
-	for p in $iopsys_brcm63xx_mips; do
-		if [ $p == $profile ]; then
-			target="iopsys_brcm63xx_mips"
-			return
-		fi
-	done
+	    local iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
+	    local iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
+	    local iopsys_ramips="ex400 sdx810_ap"
+	    local intel_mips="easy550 easy350 speedport_smart3"
+	    local ramips="mt7621"
 
-	for p in $iopsys_brcm63xx_arm; do
-		if [ $p == $profile ]; then
-			target="iopsys_brcm63xx_arm"
-			return
-		fi
-	done
+	    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_ramips; do
+	    for p in $iopsys_brcm63xx_mips; do
 		if [ $p == $profile ]; then
-			target="iopsys_ramips"
-			return
+		    target="iopsys_brcm63xx_mips"
+		    return
 		fi
-	done
+	    done
 
-	for p in $ramips; do
+	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
-			target="ramips"
-			masterconfig=0
-			return
+		    target="iopsys_brcm63xx_arm"
+		    return
 		fi
-	done
+	    done
+
+	    for p in $iopsys_ramips; do
+		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
+	    done
+
+	    for p in $intel_mips; do
+		if [ $p == $profile ]; then
+		    target="intel_mips"
+		    return
+		fi
+	    done
 
 	}
 
@@ -64,6 +89,7 @@ function genconfig {
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
+		wifilifeAllowed=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
@@ -73,6 +99,7 @@ function genconfig {
 			endptcfg) endptAllowed=1 ;;
 			natalie-dect*) natalieAllowed=1 ;;
 			linux) mediatekAllowed=1 ;;
+			wifilife) wifilifeAllowed=1 ;;
 			esac
 		done
 	}
@@ -93,6 +120,7 @@ function genconfig {
 		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 -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)"
@@ -242,8 +270,20 @@ function genconfig {
 		fi
 
 		# Set target and profile
-		echo "CONFIG_TARGET_${target}=y" >> .config
-		echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
+
+		#special handling for intel_mips which use TARGET_DEVICES
+		if [ "$target" = "intel_mips" ]; then
+			subtarget="xrx500"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+			device=$(echo $BOARDTYPE | tr a-z A-Z)
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		else
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
+		fi
 
 		echo "$CUSTOMER $BOARDTYPE" > $CURRENT_CONFIG_FILE
 
@@ -289,6 +329,7 @@ function genconfig {
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
 			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
+			[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		else
 			echo "CONFIG_GITMIRROR_REWRITE=n" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
@@ -296,6 +337,7 @@ function genconfig {
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
 			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
+			echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		fi
 
 		# Force regeneration of themes
@@ -353,6 +395,7 @@ function genconfig {
 			-h|--help) usage;;
 			-l|--list) list_customers 0 $2;;
 			-a|--list-all)list_customers 1;;
+			-b|--boards)set_target LIST;exit 0;;
 			-*)
 				echo "Invalid option: $1 "
 				echo "Try -h or --help for more information."

iop/scripts/generate_tarballs.sh

@@ -1,78 +1,96 @@
-#!/bin/sh
+#!/bin/bash
 
 
 build_bcmkernel_consumer() {
 	local tarfile bcmkernelcommith sdkversion
 	sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
 	sdkversion=${sdkversion:0:4}${sdkversion:(-1)}
-	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
+	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
 	# do not build bcmopen sdk if it was already built before
 	[ -n "$board" -a -n "$bcmkernelcommith" ] || return
-	ssh $SERVER "ls $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
 	cd ./build_dir/target-*/bcmkernel-*-${sdkversion:0:4}*/bcm963xx/release
-	sh do_consumer_release -p $profile -y -F
+	bash do_consumer_release -p $profile -y -F
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
-	scp $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
+	scp -pv $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
+	ssh $SERVER "[ -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz ] && ln -sf $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver.tar.gz"
 	rm -f $tarfile
-	cd $curdir
+	cd "$curdir"
 }
 
 build_natalie_consumer() {
 	# create natalie-dect open version tar file
 	local natalieversion nataliecommith
 	grep -q "CONFIG_TARGET_NO_DECT=y" .config && return
-	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
-	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
+	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
+	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
 	[ -n "$profile" -a -n "$natalieversion" -a -n "$nataliecommith" ] || return
-	ssh $SERVER "ls $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
 	cd ./build_dir/target-*/natalie-dect-$natalieversion/
 	mkdir natalie-dect-open-$natalieversion
-	cp NatalieFpCvm6362/Src/Projects/NatalieV3/FpCvm/Linux6362/dects.ko natalie-dect-open-$natalieversion/dect.ko
+	cp -f ipkg-*/natalie-dect/lib/modules/*/extra/dect.ko natalie-dect-open-$natalieversion/dect.ko
 	tar -czv  natalie-dect-open-$natalieversion/ -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
-	scp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
+	scp -pv natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
 	cp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $curdir/
 	rm -rf natalie-dect-open-$natalieversion
 	rm -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
-	cd $curdir
+	cd "$curdir"
 }
 
 build_endptmngr_consumer() {
 	# create endptmngr open version tar file
 	local endptversion endptcommith
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
-	endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
-	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
+	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
+	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
 	[ -n "$profile" -a -n "$endptversion" -a -n "$endptcommith" ] || return
-	ssh $SERVER "ls $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
 	cd ./build_dir/target-*/endptmngr-$endptversion/
 	mkdir endptmngr-open-$endptversion
 	mkdir endptmngr-open-$endptversion/src
 	cp ./src/endptmngr endptmngr-open-$endptversion/src
 	cp -r ./files/ endptmngr-open-$endptversion/
 	tar -czv  endptmngr-open-$endptversion/ -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	scp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
+	scp -pv endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
 	cp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $curdir/
 	rm -rf endptmngr-open-$endptversion
 	rm -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	cd $curdir
+	cd "$curdir"
 }
 
 build_ice_consumer() {
 	# create ice-client open version tar file
 	local iceversion icebasever icerelease icecommith
-	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | head -1 | cut -d'=' -f2)
-	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
-	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
+	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/ice-client/Makefile | head -1 | cut -d'=' -f2)
+	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
+	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
 	iceversion=$icebasever$icerelease
 	[ -n "$target" -a -n "$iceversion" -a -n "$icecommith" ] || return
-	ssh $SERVER "ls $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
 	cd ./build_dir/target-*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
 	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	scp ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
+	scp -pv ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
 	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
 	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	cd $curdir
+	cd "$curdir"
+}
+
+build_wifilife_consumer() {
+	local ver commit
+	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
+	commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
+	[ -n "$ver" -a -n "$commit" ] || return
+	ssh $SERVER "test -f $FPATH/wifilife-$target-${ver}_${commit}.tar.xz" && return
+	cd ./build_dir/target-*/wifilife-$ver/ipkg-* || cd ./build_dir/target-mips*musl-*/wifilife-$ver/ipkg-*
+	mkdir -p wifilife-$ver/src
+	cp -rf wifilife/usr/sbin/* wifilife-$ver/src/
+	tar Jcf wifilife-${target}-${ver}_${commit}.tar.xz wifilife-$ver
+	scp -pv wifilife-$target-${ver}_${commit}.tar.xz $SERVER:$FPATH/
+	cp wifilife-${target}-${ver}_${commit}.tar.xz $curdir/
+	rm -rf wifilife-$ver
+	rm -f wifilife-${target}-${ver}_${commit}.tar.xz
+	cd "$curdir"
 }
 
 build_mediatek_kernel() {
@@ -82,7 +100,7 @@ build_mediatek_kernel() {
 	kernel_version=$(grep KERNEL_PATCHVER target/linux/iopsys-ramips/Makefile  | cut -d '=' -f2)
 	kernel=linux-${kernel_version}.*
 	[ -n "$mediatek_commit" ] || return
-	ssh $SERVER "ls $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
 	echo "Building mediatek kernel tarball from kernel commit:"	
 	echo $mediatek_commit
 	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/$kernel
@@ -100,8 +118,8 @@ build_mediatek_kernel() {
 	cd ..
 
 	tar -czv $kernel -f mediatek-kernel-open-$mediatek_commit.tar.gz
-	scp mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
-	cd $curdir
+	scp -pv mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
+	cd "$curdir"
 }
 
 function print_usage {
@@ -114,12 +132,15 @@ function generate_tarballs {
     SERVER="god@software.inteno.se"
     FPATH="/var/www/html/iopsys/consumer"
 
+    set -e
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
     target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
     board=$(grep CONFIG_TARGET_IBOARDID .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
-    curdir=$(pwd)
+    majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
+    minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
+    curdir="$PWD"
 
 
 	# Execute user command
@@ -149,9 +170,11 @@ function generate_tarballs {
 		build_natalie_consumer
 		build_endptmngr_consumer
 		build_ice_consumer
+		build_wifilife_consumer
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel
 		build_ice_consumer		
+		build_wifilife_consumer
 	else
 		echo "Invalid target: $stk_target"
 		print_usage

iop/scripts/update_package.sh

@@ -387,7 +387,7 @@ insert_hash_in_feeds_config()
     local feed=$(get_feed_name ${PKG_DIR})
     local TO=$(cd ${PKG_DIR}; git rev-parse HEAD)
 
-    sed -i feeds.conf -e "/${feed}/ s/\(.*\)[;^].*/\1^${TO}/"
+    sed -i feeds.conf -e "/ ${feed} / s/\(.*\)[;^].*/\1^${TO}/"
     git add feeds.conf
 }
 
@@ -441,7 +441,7 @@ check_packages()
 
 feeds_hash()
 {
-    grep -v "^#" feeds.conf | grep " $1" | sed -e "s/.*[;^]\(.*\)/\1/"
+    grep -v "^#" feeds.conf | grep " $1 " | grep "\^" | sed -e "s/.*[;^]\(.*\)/\1/"
 }
 
 insert_feed_hash_in_feeds_config()
@@ -495,55 +495,59 @@ check_feeds()
     feeds=$(grep -v "^#" feeds.conf| awk '{print $2}')
     for feed in `echo $feeds`
     do
-	feed_hash=$(feeds_hash $feed)
-	in_git=$(cd feeds/$feed; git rev-parse HEAD)
+		feed_hash=$(feeds_hash $feed)
+		if [ -d feeds/$feed ]; then
+			in_git=$(cd feeds/$feed; git rev-parse HEAD)
 
-	if [ "$feed_hash" != "$in_git" ]
-	then
+			if [ "$feed_hash" != "$in_git" ]
+			then
 
-	    name=$(cd feeds/$feed;git symbolic-ref -q HEAD)
-	    if [ -z "$name" ]
-	    then
-		echo "Feed feeds/${feed} is at a git commit which is different from feeds.conf"
-		on_a_branch feeds/${feed} feed
+				name=$(cd feeds/$feed;git symbolic-ref -q HEAD)
+				if [ -z "$name" ]
+				then
+					echo "Feed feeds/${feed} is at a git commit which is different from feeds.conf"
+					#echo "git id from feeds.conf [$feed_hash] git id from feeds/${feed} [$in_git]"
+					on_a_branch feeds/${feed} feed
 
-		#redo the test here and see if the feeds.conf and git is still different.
-		in_git=$(cd feeds/$feed; git rev-parse HEAD)
-		if [ "$feed_hash" = "$in_git" ]
-		then
-		    continue
+					#redo the test here and see if the feeds.conf and git is still different.
+					in_git=$(cd feeds/$feed; git rev-parse HEAD)
+					if [ "$feed_hash" = "$in_git" ]
+					then
+						continue
+					fi
+				fi
+
+				LOCAL=$(cd feeds/$feed;git rev-parse @)
+				REMOTE=$(cd feeds/$feed;git rev-parse @{u})
+				BASE=$(cd feeds/$feed;git merge-base @ @{u})
+
+				# if we are behind the remote automatically do a pull
+				if [ $LOCAL = $BASE ]; then
+					(cd feeds/$feed ; git pull 1>/dev/null)
+
+					#redo the test here and see if the feeds.conf and git is still different.
+					in_git=$(cd feeds/$feed; git rev-parse HEAD)
+					if [ "$feed_hash" = "$in_git" ]
+					then
+						continue
+					fi
+				fi
+
+				echo "Feed feeds/${feed} is at different commit than what is in feeds.conf"
+				#echo "git id from feeds.conf [$feed_hash] git id from feeds/${feed} [$in_git]"
+				echo -n "Should we update feeds.conf to reflect the new version ? [y/N]:"
+				read answer
+
+				case $answer in
+					n|N|'')
+						continue;;
+				esac
+				branch_uptodate feeds/${feed}
+				create_feed_message ${feed} $feed_hash $in_git  >tmp/msg
+				insert_feed_hash_in_feeds_config ${feed}
+				commit_feeds_config tmp/msg
+			fi
 		fi
-	    fi
-
-	    LOCAL=$(cd feeds/$feed;git rev-parse @)
-	    REMOTE=$(cd feeds/$feed;git rev-parse @{u})
-	    BASE=$(cd feeds/$feed;git merge-base @ @{u})
-
-	    # if we are behind the remote automatically do a pull
-	    if [ $LOCAL = $BASE ]; then
-		(cd feeds/$feed ; git pull 1>/dev/null)
-
-		#redo the test here and see if the feeds.conf and git is still different.
-		in_git=$(cd feeds/$feed; git rev-parse HEAD)
-		if [ "$feed_hash" = "$in_git" ]
-		then
-		    continue
-		fi
-	    fi
-
-	    echo "Feed feeds/${feed} is at different commit than what is in feeds.conf"
-	    echo -n "Should we update feeds.conf to reflect the new version ? [y/N]:"
-	    read answer
-
-	    case $answer in
-		n|N|'')
-		    continue;;
-	    esac
-	    branch_uptodate feeds/${feed}
-	    create_feed_message ${feed} $feed_hash $in_git  >tmp/msg
-	    insert_feed_hash_in_feeds_config ${feed}
-	    commit_feeds_config tmp/msg
-	fi
     done
 }
 

iup/files/sbin/iup

@@ -281,7 +281,7 @@ change_to_vlan() {
 	v "option 132: committed update to file network"
 
 	# reload configuration files.
-	/etc/init.d/layer2_interface_vlan reload
+	ubus call network reload
 	v "option 132: reload network config"
 
 	# replace old interface (like eth0.1 with new eth0.101).

iwatchdog/src/src/watchdog.c

@@ -5,15 +5,22 @@
 #include <unistd.h>
 
 const char *watchdog_file = "/proc/watchdog";
+const char *watchdog_file_nvram = "/proc/nvram/watchdog";
 const char *init_string   = "1 5000000 1 4";
 const char *kicker        = "OK";
 
 int main(int argc, char **argv)
 {
-        int fd = open(watchdog_file, O_WRONLY);
+	int ret = 0;
+	char *wdt_string_prt = watchdog_file;
+        int fd = open(wdt_string_prt, O_WRONLY);
         if (fd < 0) {
-                perror("Open watchdog file");
-                exit(1);
+		wdt_string_prt = watchdog_file_nvram;
+		fd = open(wdt_string_prt, O_WRONLY);
+		if (fd < 0) {
+			perror("Open watchdog file");
+			exit(1);
+		}
         }
 
         /* init */
@@ -23,14 +30,17 @@ int main(int argc, char **argv)
                 perror("Error init watchdog");
                 exit(1);
         }
+	close(fd);
 
         while (1) {
+		fd = open(wdt_string_prt, O_WRONLY);
                 sleep(1);
                 res = write (fd, kicker, strlen(init_string) + 1);
 
                 if (res < 0 ){
                         perror("Error kicking watchdog");
                 }
+		close(fd);
         }
         return 0;
 }

libpicoevent/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.1
+PKG_VERSION:=0.2
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libpicoevent.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c96770b32f66c6e799f8430d8e85d94780358135
+PKG_SOURCE_VERSION:=7875222706cb6999af0361ef0aebdc85cd75c127
 PKG_NAME:=libpicoevent
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

natalie-dect/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=natalie-dect
 PKG_VERSION:=12.26
 
-PKG_SOURCE_VERSION:=35fed3a10124bd660b74704011256039ba9cf54d
+PKG_SOURCE_VERSION:=378c404fba3efc8f1bcde54370a5370670fa1853
 ifeq ($(CONFIG_NATALIE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -23,7 +23,7 @@ PKG_SOURCE_PROTO:=git
 endif
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=0
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/image.mk
@@ -34,6 +34,16 @@ BCM_KERNEL_VERSION=`cat $(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-*/include/c
 
 export BUILD_DIR
 export BCM_KERNEL_VERSION
+export CONFIG_BCM_CHIP_ID := $(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+export CONFIG_BCM_KERNEL_PROFILE := $(patsubst "%",%,$(CONFIG_BCM_KERNEL_PROFILE))
+export CONFIG_ARCH := $(patsubst "%",%,$(CONFIG_ARCH))
+export TOOLS := $(CONFIG_BCM_TOOLCHAIN)/usr/bin/
+export TOOLPREFIX := $(CONFIG_BCM_TOOLTUPLE)
+export BRCM_MAX_JOBS := $(patsubst "%",%,$(CONFIG_BRCM_MAX_JOBS))
+export MAKE_J
+export BRCM_VERBOSE := $(if $(findstring c,$(OPENWRT_VERBOSE)),1,)
+export PKG_BUILD_DIR
+export BCM_SDK_PATH := $(BUILD_DIR)/bcmkernel/bcm963xx
 
 define Package/natalie-dect
   SECTION:=net
@@ -56,16 +66,9 @@ define Build/Compile
 endef
 endif
 
-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
 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))

netmode/Makefile

@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=netmode
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=fbd7dcfab03df19b3c32675940e0aee708c7cf75
+PKG_SOURCE_VERSION:=82fd6c196a3b990e105cef867a69ce52979b27fa
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
 

netmode/files/etc/config/netmode

@@ -3,3 +3,7 @@ config mode 'setup'
         option detail ''
         option curmode 'routed'
 
+config tools 'tools'
+	option wificontrol 1
+	option arp_discovery 1
+

netmode/files/etc/hotplug.d/iface/01-netmode-handler

@@ -17,11 +17,13 @@ if [ "$(netmode_get_ip_type $ipaddr)" == "private" ]; then
 	if [ "$repeaterready" == "1" -o "${curmode:0:8}" == "repeater" ]; then
 		# flush the ip on br-lan; br-lan will anyhow be deleted.
 		# this is needed if the ip received on the wan is also from the same net
+		logger -s -p user.info -t $0: [netmode] ip addr flush dev br-lan >/dev/console
 		ip addr flush dev br-lan 2>/dev/null
 
 		# flush iptables in case the MASTER
 		# tries to configure us before
 		# firewall is disabled the proper way
+		logger -s -p user.info -t $0: [netmode] iptables -F >/dev/console
 		iptables -F
 
 		disable_firewall 1
@@ -38,7 +40,7 @@ case "$curmode" in
 			if [ "$(netmode_get_ip_type $ipaddr)" == "private" ]; then
 				wificontrol_takes_over || switch_netmode repeater
 			else
-				/etc/init.d/netmode reload
+				switch_netmode routed
 			fi
 		;;
 esac

netmode/files/etc/hotplug.d/net/80-repeater

@@ -13,7 +13,10 @@ case "$(uci get netmode.setup.curmode)" in
 		repeater*)
 		;;
 		*)
-			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
+			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || {
+				logger -s -t "80-repeater" "ping to $defroute failed, sending USR1 to udhcpc" >/dev/console
+				killall -USR1 udhcpc
+			}
 			exit
 		;;
 esac

netmode/files/etc/netmodes/bridged/network

@@ -18,8 +18,8 @@ config interface 'lan'
 config interface 'wan'
 	option type 'anywan'
 	option proto 'dhcp'
-	option vendorid '$HARDWAREID-INTENO'
-	option hostname 'Inteno_$MAC4'
+	option hostname 'iopsys-$MAC'
+	option vendorid '$HARDWAREID'
 	option ifname 'ptm0.1 atm0.1 $WAN.1'
 	option ipv6 '1'
 

netmode/files/etc/netmodes/bridged/wireless

@@ -42,7 +42,7 @@ config wifi-iface
 	option device 'wl0'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
+	option ssid 'iopsys-$BSSID4'
 	option encryption 'psk2'
 	option cipher 'auto'
 	option key '$WPAKEY'
@@ -82,7 +82,7 @@ config wifi-iface
 	option device 'wl1'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
+	option ssid 'iopsys-$BSSID4'
 	option encryption 'mixed-psk'
 	option cipher 'auto'
 	option key '$WPAKEY'

netmode/files/etc/netmodes/internet_iptv_voip/DETAILS

@@ -1,23 +0,0 @@
-{
-	"description": [
-		{ "en" : "VoIP + Bridged IPTV" },
-		{ "sv" : "VoIP + Brygg IPTV" }
-	],
-	"explanation": [
-		{ "en" : "VoIP on dedicated VLAN + LAN4 port is bridged with IPTV VLAN" },
-		{ "sv" : "VoIP on dedicated VLAN + LAN4 port överbryggas med IPTV VLAN" }
-	],
-	"credentials" : 0,
-	"excluded_boards" : [
-		"CG300",
-		"CG301",
-		"EX400",
-		"F*",
-		"SDX810-AP"
-	],
-	"acl" : [
-		"admin",
-		"support"
-	]
-}
-

netmode/files/etc/netmodes/internet_iptv_voip/dhcp

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

netmode/files/etc/netmodes/internet_iptv_voip/firewall

@@ -1,117 +0,0 @@
-config settings 'settings'
-        option disabled '0'
-
-config defaults
-	option syn_flood	1
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		REJECT
-# Uncomment this line to disable ipv6 rules
-#	option disable_ipv6	1
-
-config zone
-	option name		lan
-	list   network		'lan'
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		ACCEPT
-
-config zone
-	option name		wan
-	list   network		'wan'
-	list   network		'wan6'
-	list   network		'iptv'
-	option input		REJECT
-	option output		ACCEPT
-	option forward		REJECT
-	option masq		1
-	option mtu_fix		1
-
-config forwarding
-	option src		lan
-	option dest		wan
-
-# We need to accept udp packets on port 68,
-# see https://dev.openwrt.org/ticket/4108
-config rule
-	option name		Allow-DHCP-Renew
-	option src		wan
-	option proto		udp
-	option dest_port	68
-	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
-

netmode/files/etc/netmodes/internet_iptv_voip/mcpd

@@ -1,18 +0,0 @@
-
-config mcpd 'mcpd'
-	option igmp_query_response_interval '10'
-	option igmp_last_member_query_interval '10'
-	option igmp_robustness_value '2'
-	option igmp_lan_to_lan_multicast '0'
-	option igmp_max_groups '25'
-	option igmp_max_sources '10'
-	option igmp_max_members '25'
-	option igmp_fast_leave '1'
-	option igmp_join_immediate '0'
-	option igmp_proxy_enable '0'
-	option igmp_snooping_enable '2'
-	option igmp_snooping_interfaces 'br-iptv'
-	option igmp_default_version '2'
-	option igmp_query_interval '120'
-	option igmp_proxy_interfaces 'iptv'
-

netmode/files/etc/netmodes/internet_iptv_voip/network

@@ -1,88 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'lan'
-	option is_lan '1'
-	option type 'bridge'
-	option proto 'static'
-	option ipaddr '192.168.1.1'
-	option netmask '255.255.255.0'
-	option ifname '$LAN1 $LAN2 $LAN3'
-	option ip6assign '60'
-	
-config interface 'wan'
-	option type 'anywan'
-	option proto 'dhcp'
-	option vendorid '$HARDWAREID-INTENO'
-	option hostname 'Inteno_$MAC4'
-	option ifname 'ptm0.1 atm0.1 $WAN.1'
-	option ipv6 '1'
-
-config interface 'iptv'
-	option type 'bridge'
-	option proto 'dhcp'
-	option gateway '0.0.0.0'
-	option reqopts 'staticroutes'
-	option ifname 'ptm0.100 $WAN.100 $LAN4'
-	option defaultroute '0'
-
-config interface 'voip'
-	option type 'anywan'
-	option proto 'dhcp'
-	option gateway '0.0.0.0'
-	option reqopts 'staticroutes'
-	option ifname 'ptm0.200 $WAN.200'
-	option defaultroute '0'
-
-config interface 'wan6'
-	option proto 'dhcpv6'
-	option ifname '@wan'
-
-config device 'atmwan'
-	option type 'untagged'
-	option ifname 'atm0'
-	option name 'atm0.1'
-
-config device 'ptmwan'
-	option type 'untagged'
-	option ifname 'ptm0'
-	option name 'ptm0.1'
-
-config device 'ethwan'
-	option type 'untagged'
-	option ifname '$WAN'
-	option name '$WAN.1'
-
-config device 'ethtv'
-	option type '8021q'
-	option name '$WAN.100'
-	option ifname '$WAN'
-	option vid '100'
-	option priority '0'
-
-config device 'ptmtv'
-	option type '8021q'
-	option name 'ptm0.100'
-	option ifname 'ptm0'
-	option vid '100'
-	option priority '0'
-
-config device 'ethvoip'
-	option type '8021q'
-	option name '$WAN.200'
-	option ifname '$WAN'
-	option vid '200'
-	option priority '0'
-
-config device 'ptmvoip'
-	option type '8021q'
-	option name 'ptm0.200'
-	option ifname 'ptm0'
-	option vid '200'
-	option priority '0'
-

netmode/files/etc/netmodes/internet_iptv_voip/wireless

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

netmode/files/etc/netmodes/repeater_brcm_2g_up_5g_down/DETAILS

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

netmode/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network

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

netmode/files/etc/netmodes/repeater_brcm_2g_up_5g_down/wireless

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

netmode/files/etc/netmodes/repeater_brcm_2g_up_dual_down/DETAILS

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

netmode/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network

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

netmode/files/etc/netmodes/repeater_brcm_2g_up_dual_down/wireless

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

netmode/files/etc/netmodes/repeater_mtk_2g_up_dual_down/DETAILS

@@ -1,17 +0,0 @@
-{
-	"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" : [
-		"*G*",
-		"F*"
-	],
-	"uplink_band" : 'b',
-	"credentials" : 1,
-	"reboot" : 1
-}

netmode/files/etc/netmodes/repeater_mtk_2g_up_dual_down/network

@@ -1,43 +0,0 @@
-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'
-	option vid 1
-
-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 225'
-	option igmp_snooping '0'
-
-config device 'wan_dev'
-	option name 'eth0.2'
-	option macaddr '$MACWAN'
-	option vid 2
-
-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'
-

netmode/files/etc/netmodes/repeater_mtk_2g_up_dual_down/wireless

@@ -1,59 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device  ra0
-	option band b
-	option channel  auto
-	option bandwidth '20'
-	option hwmode   auto
-	option htmode   HT20
-	option country 'DE'
-
-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
-	option wps_pbc	1
-
-config wifi-device  rai0
-	option band a
-	option channel  auto
-	option bandwidth '80'
-	option hwmode   11ac
-	option htmode   VHT80
-	option country 'DE'
-	option beamforming 1
-
-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
-	option wps_pbc	1
-
-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
-

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/DETAILS

@@ -14,5 +14,5 @@
 	"uplink_band" : 'a',
 	"downlink_band" : 'a b',
 	"credentials" : 1,
-	"reboot" : 1
+	"reboot" : 0
 }

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/network

@@ -13,9 +13,10 @@ 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 225'
+	option hostname 'iopsys-$MAC'
+	option reqopts '66 67 128 224'
 	option igmp_snooping '0'
+	option macaddr '$MACWAN'
 
 config device 'wan_dev'
 	option name 'eth0.2'
@@ -39,5 +40,5 @@ config switch_vlan
 config switch_vlan
 	option device 'switch0'
 	option vlan '2'
-	option ports '0 5t'
+	option ports '0 6t'
 

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/wireless

@@ -23,7 +23,7 @@ config wifi-iface
 	option device   ra0
 	option network  wan
 	option mode     ap
-	option ssid     Inteno-$BSSID4
+	option ssid     iopsys-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	ra0
@@ -42,7 +42,7 @@ config wifi-iface
 	option device   rai0
 	option network  wan
 	option mode     ap
-	option ssid     Inteno-$BSSID4
+	option ssid     iopsys-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	rai0
@@ -52,7 +52,7 @@ config wifi-iface
 	option device   rai0
 	option network  wan
 	option mode     wet
-	option ssid     Inteno-$BSSID4
+	option ssid     iopsys-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	apclii0

netmode/files/etc/netmodes/routed_brcm/network

@@ -18,8 +18,8 @@ config interface 'lan'
 config interface 'wan'
 	option type 'anywan'
 	option proto 'dhcp'
-	option vendorid '$HARDWAREID-INTENO'
-	option hostname 'Inteno_$MAC4'
+	option hostname 'iopsys-$MAC'
+	option vendorid '$HARDWAREID'
 	option ifname 'ptm0.1 atm0.1 $WAN.1'
 	option ipv6 '1'
 

netmode/files/etc/netmodes/routed_brcm/wireless

@@ -42,7 +42,7 @@ config wifi-iface
 	option device 'wl0'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
+	option ssid 'iopsys-$BSSID4'
 	option encryption 'psk2'
 	option cipher 'auto'
 	option key '$WPAKEY'
@@ -82,7 +82,7 @@ config wifi-iface
 	option device 'wl1'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
+	option ssid 'iopsys-$BSSID4'
 	option encryption 'mixed-psk'
 	option cipher 'auto'
 	option key '$WPAKEY'

netmode/files/etc/netmodes/routed_mtk/network

@@ -12,7 +12,6 @@ config interface 'lan'
 	option netmask '255.255.255.0'
 	option ip6assign '60'
 	option ifname 'eth0.1'
-	option igmp_snooping '1'
 
 config device 'lan_dev'
 	option name 'eth0.1'
@@ -22,8 +21,8 @@ config device 'lan_dev'
 config interface 'wan'
 	option ifname 'eth0.2'
 	option proto 'dhcp'
-	option hostname '$IOPHOSTNAME-$MAC'
-	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'iopsys-$MAC'
+	option vendorid '$HARDWAREID'
 	option reqopts '66 67 128 224'
 
 config device 'wan_dev'
@@ -48,5 +47,5 @@ config switch_vlan
 config switch_vlan
 	option device 'switch0'
 	option vlan '2'
-	option ports '0 5t'
+	option ports '0 6t'
 

netmode/files/etc/netmodes/routed_mtk/wireless

@@ -23,7 +23,7 @@ config wifi-iface
 	option device   ra0
 	option network  lan
 	option mode     ap
-	option ssid     Inteno-$BSSID4
+	option ssid     iopsys-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option wps_pbc	1
@@ -42,7 +42,7 @@ config wifi-iface
 	option device   rai0
 	option network  lan
 	option mode     ap
-	option ssid     Inteno-$BSSID4
+	option ssid     iopsys-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option wps_pbc	1

netmode/files/etc/uci-defaults/997-owsd-with-ubusx-netmode

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+add_owsd_ubusproxy_object_netmode() {
+	local netmd=$(uci -q get owsd.ubusproxy.object | grep netmode)
+	if [ -z "$netmd" ]; then
+		uci -q add_list owsd.ubusproxy.object="netmode"
+		uci commit owsd
+	fi
+}
+
+add_owsd_ubusproxy_object_netmode

netmode/files/lib/functions/netmode.sh

@@ -34,7 +34,7 @@ disable_firewall() {
 	/etc/init.d/firewall reload
 }
 
-is_inteno_macaddr()
+is_known_macaddr()
 {
 	macaddr=$1
 
@@ -105,15 +105,29 @@ correct_uplink() {
 	if [ "$link" == "up" ]; then
 		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":true}"
 		ifconfig $WETIF down
+		echo ethernet > /tmp/netmodes/uplink_type
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":false}"
 	else
 		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":false}"
 		ifconfig $WETIF up
+		echo wireless > /tmp/netmodes/uplink_type
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
 		ubus call led.internet  set '{"state" : "notice"}'
 	fi
 }
 
+run_netmode_scripts() {
+	local mode=$1
+	local when=$2
+	local script
+	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
+		logger -s -p user.info -t $0 "[netmode] Executing $when netmode scripts" >/dev/console
+		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do
+			sh /etc/netmodes/$mode/scripts/$when/$script
+		done
+	fi
+}
+
 switch_netmode() {
 	local newmode="$1"
 
@@ -162,15 +176,31 @@ switch_netmode() {
         echo $curmode >$OLD_MODE_FILE
 
 	[ -d "/etc/netmodes/$curmode" ] || return
-	cp /etc/netmodes/$curmode/* /etc/config/
-	rm -f /etc/config/DETAILS
+
+	run_netmode_scripts $curmode "pre"
+
+	logger -s -p user.info -t $0 "[netmode] Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
+	for file in $(ls /etc/netmodes/$curmode/); do
+		case "$file" in
+			DETAILS|scripts) continue ;;
+		esac
+		cp /etc/netmodes/$curmode/$file /etc/config/
+	done
 	sync
 
+	local reboot=$(uci -q get netmode.$curmode.reboot)
+
+	if [ "$reboot" != "0" ]; then
+		run_netmode_scripts $curmode "post"
+		reboot &
+		exit
+	fi
+
 	/etc/init.d/environment reload
 	case "$curmode" in
 		repeater*)
 			touch $SWITCHMODELOCK
-			echo "Switching to $curmode mode" > /dev/console
+			logger -s -p user.info -t $0 "Switching to $curmode mode" > /dev/console
 			ubus call leds set  '{"state" : "allflash"}'
 			[ -f /etc/init.d/omcproxy ] && /etc/init.d/omcproxy stop
 			[ -f /etc/init.d/igmpproxy ] && /etc/init.d/igmpproxy stop
@@ -188,6 +218,8 @@ switch_netmode() {
 			ubus call uci commit '{"config":"network"}'
 		;;
 	esac
+
+	run_netmode_scripts $curmode "post"
 }
 
 wificontrol_takes_over() {
@@ -223,7 +255,13 @@ wait_for_netmode_handler() {
 }
 
 netmode_get_ip_type() {
-	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && echo "private" || echo "public"
+	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && {
+		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is private"
+		echo "private"
+	} || {
+		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is public"
+		echo "public"
+	}
 }
 
 get_device_of() {
@@ -344,7 +382,8 @@ populate_netmodes() {
 			if json_select acl; then
 				_i=1
 				while json_get_var user $_i; do
-					uci add_list netmode.$mode._access_r="$user"
+					uci del_list netmode.$mode._access_w="$user"
+					uci add_list netmode.$mode._access_w="$user"
 					_i=$((_i+1))
 				done
 				json_select ..
@@ -393,21 +432,19 @@ populate_netmodes() {
 }
 
 start_netmode_tools() {
-	local curmode repeaterready ulcpid
+	local curmode repeaterready wificontrol discover
 
 	killall -9 wificontrol >/dev/null 2>&1
 	killall -9 netmode-discover >/dev/null 2>&1
 
 	config_load netmode
 	config_get_bool repeaterready setup repeaterready 0
-
-	ulcpid=$(ps | grep "ubus listen client" | grep -v grep | awk '{print$1}')
+	config_get_bool wificontrol tools wificontrol 1
+	config_get_bool arp_discovery tools arp_discovery 1
 
 	[ $repeaterready -eq 1 ] && {
-		killall -SIGKILL netmode-client-detect >/dev/null 2>&1
-		kill -SIGKILL $ulcpid >/dev/null 2>&1
-		/sbin/netmode-discover &
-		/sbin/wificontrol --repeater &
+		[ $arp_discovery -eq 1 ] && /sbin/netmode-discover &
+		[ $wificontrol -eq 1 ] && /sbin/wificontrol --repeater &
 		return
 	}
 
@@ -415,13 +452,8 @@ start_netmode_tools() {
 
 	case "$curmode" in
 		repeater*)
-			killall -SIGKILL netmode-client-detect >/dev/null 2>&1
-			kill -SIGKILL $ulcpid >/dev/null 2>&1
-			/sbin/netmode-discover &
-			/sbin/wificontrol --repeater &
-		;;
-		*)
-			pidof netmode-client-detect || /sbin/netmode-client-detect &
+			[ $arp_discovery -eq 1 ] && /sbin/netmode-discover &
+			[ $wificontrol -eq 1 ] && /sbin/wificontrol --repeater &
 		;;
 	esac
 }
@@ -429,7 +461,5 @@ start_netmode_tools() {
 stop_netmode_tools() {
 	killall -9 netmode-discover >/dev/null 2>&1
 	killall -9 wificontrol >/dev/null 2>&1
-	killall -SIGKILL netmode-client-detect >/dev/null 2>&1
-	ulcpid=$(ps | grep "ubus listen client" | grep -v grep | awk '{print$1}')
-	kill -SIGKILL $ulcpid >/dev/null 2>&1
 }
+

netmode/files/sbin/netmode-client-detect

@@ -19,7 +19,7 @@ timed_check() {
 	done
 }
 
-is_inteno_macaddr()
+is_known_macaddr()
 {
 	macaddr=$1
 
@@ -50,8 +50,8 @@ while true ; do
 		json_get_var ipaddr ipaddr
 		json_get_var network network "lan"
 
-		if is_inteno_macaddr $macaddr; then
-			echo "netmode-client-detect: a new Inteno device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
+		if is_known_macaddr $macaddr; then
+			logger -s -p user.info -t $0 "netmode-client-detect: a new known device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
 			ubus call repeater get_creds '{"network":"'$network'","file":"/tmp/wificontrol.txt"}'
 			/sbin/wificontrol --router --destination $ipaddr
 		fi

netmode/files/sbin/testnet

@@ -49,7 +49,7 @@ ping_uplink()
 	if [ "$hasmode" == "1" ] && [ "$hasip" == "0" -o "$hasdev" == "0" ]; then
 		rv=0
 	elif [ "$hasmode" == "1" ]; then
-		arping -f -q -c2 -w5 -I $device $ipaddr
+		arping -f -q -c1 -w3 -I $device $ipaddr
 		[ $? -eq 1 ] && rv=0 || rv=1
 
 		if [ "$rv" == "0" ]; then
@@ -70,13 +70,13 @@ ping_uplink()
 		wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
 		# If there is an uplink IP address but no connection for 5 minutes, reboot
 		if [ $enableCounter -gt 32 ]; then
-			logger -t "testnet" "No uplink connection; reboot"
+			logger -s -p user.info -t "testnet" "No uplink connection; reboot" >/dev/console
 			ubus call led.internet  set '{"state" : "error"}'
 			reboot &
 		elif [ $((enableCounter % 8)) -eq 0 -a $enableCounter -ge 8 -o $enableCounter -eq 0 ]; then
 			ps | grep -v grep | grep -q 'wifi reload\|wifi import\|wifi.credentials\|iwpriv' && return
 
-			logger -t "testnet" "No uplink connection; try to re-connect"
+			logger -s -p user.info -t "testnet" "No uplink connection; try to re-connect" >/dev/console
 
 			if [ -f /usr/sbin/wlctl ]; then
 				assoclist="$(wlctl -i $wetif assoclist | head -1 | awk '{print$2}')"
@@ -119,7 +119,7 @@ ping_uplink()
 		AccessPolicy=1
 		if [ -f /usr/sbin/iwpriv ]; then
 			grep -q up /sys/class/net/$ETHWAN/operstate 2>/dev/null || {
-				logger -t "testnet" "Disconnect all stations and disable WiFi access on downlink wireless interfaces"
+				logger -s -p user.info -t "testnet" "Disconnect all stations and disable WiFi access on downlink wireless interfaces" >/dev/console
 				# Do not allow clients to connect on 2.4GHz radio
 				iwpriv ra0 set AccessPolicy=$AccessPolicy
 				# Do not allow clients to connect on 5GHz radio
@@ -131,7 +131,7 @@ ping_uplink()
 			}
 		fi
 	else
-		grep -q "true" /tmp/internet_connection_status 2>/dev/null || logger -t "testnet" "Uplink connection is gained"
+		grep -q "true" /tmp/internet_connection_status 2>/dev/null || logger -s -p user.info -t "testnet" "Uplink connection is gained" >/dev/console
 		echo "{ \"online\" : true }" > /tmp/internet_connection_status
 		leden="$(uci -q get leds.internet.enable)"
 		[ "$leden" == "1" ] && ubus call led.internet  set '{"state" : "eok"}'
@@ -146,7 +146,7 @@ ping_uplink()
 		AccessPolicy=0
 
 		if [ -f /usr/sbin/iwpriv ]; then
-			logger -t "testnet" "Enable WiFi access on downlink wireless interfaces"
+			logger -s -p user.info -t "testnet" "Enable WiFi access on downlink wireless interfaces" >/dev/console
 			iwpriv ra0 set AccessPolicy=$AccessPolicy
 			iwpriv rai0 set AccessPolicy=$AccessPolicy
 		fi
@@ -205,19 +205,21 @@ internet_test() {
 	fi
 }
 
-iptvtest() {
-	ubus list led.ext >/dev/null 2>&1 && TVCON=1 || return
-
+iptv_test() {
 	local dest="$(uci -q get system.@system[0].tvping_addr)"
 
+	[ -n "$dest" ] || return
+
+	ubus list led.ext >/dev/null 2>&1 || return
+
 	test_connection $dest
 
 	if [ "$?" -eq 0 ]; then
 		TVCON=1
-		[ -n "$dest" ] && ubus call led.ext  set '{"state" : "ok"}'
+		ubus call led.ext set '{"state" : "ok"}'
 	else
 		TVCON=0
-		[ -n "$dest" ] && ubus call led.ext  set '{"state" : "off"}'
+		ubus call led.ext set '{"state" : "off"}'
 	fi
 }
 
@@ -250,6 +252,8 @@ connectivity_test() {
 		[ "$CURSTATUS" == "$LASTSTATUS" ] || ubus send internet '{"status" : "offline"}'
 		LASTSTATUS=0
 	fi
+
+	iptv_test
 }
 
 if [ "$1" == "once" ]; then

owsd/Makefile

@@ -1,8 +1,5 @@
 #
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2018 Inteno
 #
 
 include $(TOPDIR)/rules.mk
@@ -13,7 +10,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=01a3dfce002514d18b7d3d0cb6b77e9edddc819a
+PKG_SOURCE_VERSION:=b3f52463a50d56af80bfd8b3f63960885379f150
 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>

owsd/files/owsd.config

@@ -11,6 +11,7 @@ config ubusproxy 'ubusproxy'
 #	list peer 'wss://192.168.1.101/'
 #	list object 'router.*'
 #	list object 'system'
+#	option prefix 'ip' # 'ip' or 'mac'
 #	option peer_cert '/etc/ssl/certs/owsd-repeater-control-cert.pem'
 #	option peer_key '/etc/ssl/private/owsd-repeater-control-key.pem'
 #	option peer_ca '/etc/ssl/certs/owsd-server-ca.pem'

owsd/files/owsd.init

@@ -110,6 +110,7 @@ validate_owsd_ubusproxy() {
 		'enable:bool:1' \
 		'peer:list(string)' \
 		'object:list(string)' \
+		'prefix:string' \
 		'peer_key:file' \
 		'peer_cert:file' \
 		'peer_ca:file' \
@@ -156,6 +157,7 @@ validate_owsd_iface() {
 		'key:file' \
 		'ca:file' \
 		'restrict_to_user:list(string)' \
+		'ubusx_acl:list(string)' \
 		&&
 	[ -n "${port}" ]
 }
@@ -164,6 +166,7 @@ parse_owsd_iface() {
 	local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
 	local cert key ca
 	local restrict_to_user
+	local ubusx_acl
 
 	validate_owsd_iface "$1" || {
 		echo "Validation failed"
@@ -183,6 +186,9 @@ parse_owsd_iface() {
 		[ -n "${restrict_to_user}" ] && procd_append_param command -u"${restrict_to_user}"
 
 		[ -n "$2" ] && procd_append_param command -i"$2"
+
+		[ -n "${ubusx_acl}" ] && procd_append_param command -X"${ubusx_acl}"
+
 	}
 
 	append_whitelists () {
@@ -285,6 +291,8 @@ start_service() {
 
 		config_list_foreach "ubusproxy" "peer" append_peer
 		config_list_foreach "ubusproxy" "object" append_object
+
+		[ "${prefix}" == "mac" ] && procd_append_param command -F"mac"
 	fi
 
 	config_foreach parse_owsd_iface "owsd-listen"

peripheral_manager/files/sbin/ledctl

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+usage () {
+	echo "Usage: ledctl [normal|test|allon|alloff|production]"
+	exit 1
+}
+
+[ $# -ne 1 ] && usage
+ledstate=$(echo $1 | tr '[A-Z]' '[a-z]')
+
+case $ledstate in
+	normal|test|allon|alloff|production)
+		ubus call leds set  "{\"state\" : \"$ledstate\"}"
+	;;
+	*)
+		usage
+	;;
+esac
+

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=6159b68cc2d3fac70e5eec5555764c81b3b1675a
+PKG_SOURCE_VERSION:=7a0a7427d339736e3ee555e816d40c985651632c
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
@@ -25,8 +25,9 @@ else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 QUESTD_TARGET:=-DIOPSYS_BROADCOM
 else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
 QUESTD_TARGET:=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y)
-QUESTD_TARGET:=-DIOPSYS_LANTIQ
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+# BUG FIXME the Intel mips target is not handled in questd this is just to get it to compile
+QUESTD_TARGET:=-DIOPSYS_BROADCOM
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 QUESTD_TARGET:=-DIOPSYS_MEDIATEK
 QUESTD_CFLAGS:=\

samba3/files/samba.config

@@ -1,6 +1,6 @@
 config samba
-        option 'name'		'IntenoSMB'
-        option 'workgroup'	'IntenoSMB'
-        option 'description'	'IntenoSMB'
+        option 'name'		'iopsysSMB'
+        option 'workgroup'	'iopsysSMB'
+        option 'description'	'iopsysSMB'
         option 'homes'		'0'
 

samba3/files/samba.init

@@ -11,11 +11,6 @@ useradd()
 	local password
 	config_get user $1 user
 	config_get password $1 password
-
-	filter="0A;5C 6E"
-	[ "$(hex_filter "$user" "$filter" 1)" = "" ] || return
-	[ "$(hex_filter "$password" "$filter" 1)" = "" ] || return
-
 	if ! $(grep -rq "^$user:" /etc/passwd) ; then
 		echo "adding user $user"
 		adduser $user -s /bin/false -D -H -h /mnt/$user -g "samba,pass=$password" && smbpasswd $user $password
@@ -56,29 +51,6 @@ purgepasswd()
 	done
 }
 
-hex_filter() {
-	local string=$1
-	local hex_chars=$2
-	local wc_max=$3
-	local wc_tot=0
-
-	if [ -z "$string" -o -z "$hex_chars" -o -z "$wc_max" ]
-		then
-		return;
-	fi
-
-	dump=$(echo "$string" | hexdump -v -e '32/1 "%02X ""\n"')
-
-	IFS=';'
-	for i in $hex_chars; do
-		local wc
-		wc=$(echo "$dump" | grep -o "$i" | wc -w)
-		wc_tot=$((wc_tot+wc))
-	done
-
-	[ $wc_tot -gt $wc_max ] && echo "corrupt"
-}
-
 smb_header() {
 	local interface
 	config_get interface $1 interface
@@ -108,12 +80,11 @@ smb_header() {
 	config_get description $1 description "Samba on ${hostname:-OpenWrt}"
 	config_get charset     $1 charset     "UTF-8"
 
-	filter="0A;5C 6E"
-	[ "$(hex_filter "$name" "$filter" 1)" = "" ] || exit
-	[ "$(hex_filter "$workgroup" "$filter" 1)" = "" ] || exit
-	[ "$(hex_filter "$description" "$filter" 1)" = "" ] || exit
-	[ "$(hex_filter "$interfaces" "$filter" 1)" = "" ] || exit
-	[ "$(hex_filter "$charset" "$filter" 1)" = "" ] || exit
+	name=`echo -e "$name" | head -1`
+	workgroup=`echo -e "$workgroup" | head -1`
+	description=`echo -e "$description" | head -1`
+	interfaces=`echo -e "$interfaces" | head -1`
+	charset=`echo -e "$charset" | head -1`
 
 	mkdir -p /var/etc
 	sed -e "s#|NAME|#$name#g" \
@@ -173,22 +144,13 @@ smb_add_share() {
 	path=$(readlink -f $path)
 	[ "${path:0:4}" == "/mnt" ] || path="/mnt/"
 
-	filter="0A;5C 6E"
-	[ "$(hex_filter "$name" "$filter" 1)" = "" ] || return
-	[ "$(hex_filter "$users" "$filter" 1)" = "" ] || return
-	[ "$(hex_filter "$read_only" "$filter" 1)" = "" ] || return
-	[ "$(hex_filter "$guest_ok" "$filter" 1)" = "" ] || return
-	[ "$(hex_filter "$create_mask" "$filter" 1)" = "" ] || return
-	[ "$(hex_filter "$dir_mask" "$filter" 1)" = "" ] || return
-	[ "$(hex_filter "$browseable" "$filter" 1)" = "" ] || return
-
-	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/smb.conf
-	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/smb.conf
-	[ -n "$read_only" ] && echo -e "\tread only = $read_only" >> /var/etc/smb.conf
-	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /var/etc/smb.conf
-	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/smb.conf
-	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/smb.conf
-	[ -n "$browseable" ] && echo -e "\tbrowseable = $browseable" >> /var/etc/smb.conf
+	echo -e "\n[$name]\n\tpath = ${path%%\\n*}" >> /var/etc/smb.conf
+	[ -n "$users" ] && echo -e "\tvalid users = $users" | head -1 >> /var/etc/smb.conf
+	[ -n "$read_only" ] && echo -e "\tread only = $read_only" | head -1 >> /var/etc/smb.conf
+	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" | head -1 >> /var/etc/smb.conf
+	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" | head -1 >> /var/etc/smb.conf
+	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" | head -1 >> /var/etc/smb.conf
+	[ -n "$browseable" ] && echo -e "\tbrowseable = $browseable" | head -1 >> /var/etc/smb.conf
 }
 
 start_service() {

topologyd/Makefile

@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2013 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=topologyd
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=b520fe65d2469ff52cc70328fce753f67cf998e5
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/topologyd.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/topologyd
+	CATEGORY:=Utilities
+	DEPENDS:=+libubox +ubus +libpthread +libopenssl +libnl-genl +libnl +libuci +libwifi
+	TITLE:=topology daemon
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include
+
+define Package/topologyd/description
+	gathers topology information and presents it as json structure
+endef
+
+define Package/topologyd/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/topologyd $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,topologyd))

topologyd/files/etc/config/topologyd

@@ -0,0 +1,2 @@
+config topologyd topologyd
+	option debug 1

topologyd/files/etc/init.d/topologyd

@@ -0,0 +1,33 @@
+#!/bin/sh /etc/rc.common
+
+START=14
+STOP=96
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+	config_load owsd
+	config_get enable ubusproxy enable
+        procd_set_param command "/sbin/topologyd"
+
+	if [ "$enable" == "1" ]
+	then
+		procd_append_param command --root
+	fi
+
+	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger topologyd
+}
+
+reload_service() {
+	stop
+	start
+}

uboot/Makefile

@@ -9,15 +9,23 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=u-boot
 PKG_VERSION:=2016.08
-PKG_RELEASE:=6
-PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
+
 PKG_SOURCE_PROTO:=git
+
+ifdef CONFIG_TARGET_intel_mips
+PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
+PKG_SOURCE_VERSION:=b3bc3af5831f14d9cd4d983522bc45a1fd9fa26c
+else
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85
+endif
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
-PKG_BUILD_PARALLEL:=1
+# u-boot for mips_intel do not build in parallel. 
+#PKG_BUILD_PARALLEL:=1
 
 # we currently do not use OpenWRT u_boot make files
 #include $(INCLUDE_DIR)/u-boot.mk
@@ -33,23 +41,44 @@ define uboot/Default
   IMAGE:=
 endef
 
+UBOOT_IMG:=uboot.img
+
 define uboot/ex400
   TITLE:=U-Boot for the ex400
+  DEPENDS:=@TARGET_iopsys_ramips
+  PKG_RELEASE:=6
 endef
 
 define uboot/sdx810_ap
   TITLE:=U-Boot for the sdx810_ap
+  DEPENDS:=@TARGET_iopsys_ramips
+  PKG_RELEASE:=6
+endef
+
+define uboot/grx500
+  TITLE:=U-Boot for the grx
+  UBOOT_IMG:=u-boot-nand.bin
+  DEPENDS:=@TARGET_intel_mips
+  PKG_RELEASE:=5
+endef
+
+define uboot/grx500_speedport_smart3
+  TITLE:=U-Boot for the Speedport Smart3
+  UBOOT_IMG:=u-boot-nand.bin
+  DEPENDS:=@TARGET_intel_mips
+  PKG_RELEASE:=5
 endef
 
 UBOOTS := \
 	ex400 \
-	sdx810_ap
+	sdx810_ap \
+	grx500 \
+	grx500_speedport_smart3
 
 define Package/uboot/template
 define Package/uboot-$(1)
   SECTION:=boot
   CATEGORY:=Boot Loaders
-  DEPENDS:=@TARGET_iopsys_ramips
   TITLE:=$(2)
   URL:=http://www.denx.de/wiki/U-Boot
   VARIANT:=$(1)
@@ -90,11 +119,12 @@ define Package/uboot/install/default
 	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
 	$(INSTALL_DIR) $$(1)/boot
 	$(CP) \
-		$(PKG_BUILD_DIR)/uboot.img \
-		$(BIN_DIR)/$(TARGET)/
+		$(PKG_BUILD_DIR)/$(UBOOT_IMG) \
+		$(BIN_DIR)/$(TARGET)/uboot.img
 	$(CP) \
-		$(PKG_BUILD_DIR)/uboot.img \
-		$$(1)/boot
+		$(PKG_BUILD_DIR)/$(UBOOT_IMG) \
+		$$(1)/boot/uboot.img
+
 	$(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_templates/asterisk.conf.TEMPLATE

@@ -71,7 +71,7 @@ astsbindir => /usr/sbin
 documentation_language = en_US	; Set the language you want documentation
 				; displayed in. Value is in the same format as
 				; locale names.
-;hideconnect = yes		; Hide messages displayed when a remote console
+hideconnect = yes		; Hide messages displayed when a remote console
 				; connects and disconnects.
 ;lockconfdir = no		; Protect the directory containing the
 				; configuration files (/etc/asterisk) with a

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

@@ -11,12 +11,6 @@
 ; With one call active, press R, dial a new number and wait for ringback. Then hangup to do a remote connect.
 hangup_xfer=yes
 
-; Country, determines dialtone and other country-specific parameters.
-; This is a global setting.
-; Available values are:
-; AUS, BEL, BRA, CHL, CHN, CZE, DNK, ETS, FIN, FRA, DEU, HUN, IND, ITA, JPN, NLD, NZL, USA, ESP, SWE, CHE, NOR, TWN, GBR, ARE
-;country=|COUNTRY|
-
 ; Enables the use of a jitterbuffer on the receiving side of a SIP channel. [yes/no] (Added in Version 1.4)
 ; This is a global setting.
 jbenable = |JBENABLE|
@@ -44,37 +38,12 @@ context=default
 ; When an exact match is found in this context, interdigit timeout is ignored and call is immediately initiated
 context_direct=default-direct
 
-; Echo Cancellation [off, on]
-;echocancel=on
-
-; Voice Activity Detection
-; 0 = VAD off
-; 1 = Transparent VAD
-; 2 = Conservative VAD
-; 3 = Aggressive VAD
-;silence=0
-
-; TX Gain value between -96 and 32 dB
-;txgain=0
-
-; RX Gain value between -96 and 32 dB
-;rxgain=0
-
-; Codec settings, can be specified multiple times to allow more codecs
-; Available values are: alaw, ulaw, g723, g726, g729
-;allow = ulaw
-;allow = alaw
-
 ; Enable/Disable ring signal [off, on]
 ringsignal=on
 
 ; Inter-digit timeout, milliseconds
 dialoutmsec=|DIALOUTMSEC|
 
-; Specify packetization rate
-; Available values are: 5, 10, 20, 30, 40
-;period=20
-
 ; Comfort Noise Generation
 ; 0 = CNG off
 ; 1 = White noise
@@ -94,8 +63,4 @@ featureaccesscodes = |FAC|
 ; Unused/undocumented settings, do not uncomment/change these
 ;
 ;language=
-;jitter_fixed=0
-;jitter_min=0
-;jitter_max=0
-;jitter_target=0
 

voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE

@@ -4,20 +4,10 @@ callerid=|CALLERID|
 autodial=|AUTODIAL|
 autodial_timeoutmsec=|AUTODIAL_TIMEOUT|
 dialtone_timeoutmsec=|DIALTONE_TIMEOUT|
-;jitter_fixed=|JITTERFIXED|
-;jitter_min=|JITTERMIN|
-;jitter_max=|JITTERMAX|
-;jitter_target=|JITTERTARGET|
-;txgain=|TXGAIN|
-;rxgain=|RXGAIN|
-;comfortnoise=|COMFORTNOISE|
-;echocancel=|ECHOCANCEL|
-;silence=|SILENCE|
 context=|CONTEXT|
 context_direct=|CONTEXT|-direct
 dialtone_extension_hint_context=brcm_dialtone
 dialtone_extension_hint=|DIALTONE_EXTENSION_HINT|
-;period=20
 callwaiting=|CALLWAITING|
 clir=|CLIR|
 dtmfrelay=|DTMFRELAY|

voice-client/files/etc/asterisk_templates/extensions_local_line.TEMPLATE

@@ -1,4 +1,4 @@
-exten => |EXTEN|,1,Dial(BRCM/|LINE|,|TIMEOUT|,g)
+exten => |EXTEN|,1,Dial(BRCM/|LINE|,|TIMEOUT|,gF(hangup,h,2))
 exten => |EXTEN|,n,GotoIf($["${DIALSTATUS}"="ANSWER"]?endcall)
 exten => |EXTEN|,n,|VOICEMAIL|
 exten => |EXTEN|,n(endcall),Macro(endcall,BRCM,|LINE|,|EXTEN|,${CHANNEL(name)},|MAX_RETRIES|,|RETRYTIME|,|WAITTIME|,|CBBS_KEY|,|CONGESTIONTONE|)

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

@@ -131,7 +131,7 @@ exten => s,n,			Hangup()
 
 ;handle busy (with CBBS support)
 exten => s-BUSY,1,		Read(DIGIT,Busy,1,in,30)
-exten => s-BUSY,n,		GotoIf($[${DIGIT} = ${ARG8}]?ccbs)
+exten => s-BUSY,n,		GotoIf($["${DIGIT}" = "${ARG8}"]?ccbs)
 exten => s-BUSY,n,		Hangup()
 exten => s-BUSY,n(ccbs),	Set(result=${SHELL(/usr/lib/asterisk/cbbs.sh ${ARG1} ${ARG2} ${ARG3} ${ARG4} ${ARG5} ${ARG6} ${ARG7})})
 exten => s-BUSY,n,		Playback(beep)

voice-client/files/etc/asterisk_templates/extensions_provider.TEMPLATE

@@ -7,8 +7,8 @@ include => clir
 include => local_extensions
 include => |PROVIDER|-callforwarding
 include => |PROVIDER|-callwaiting
-include => |PROVIDER|-outgoing
 include => |PROVIDER|-direct
+include => |PROVIDER|-outgoing
 
 [|PROVIDER|-transfer]
 ; Context used for call transfer for this Provider

voice-client/files/etc/config/voice_client

@@ -3,8 +3,8 @@ config 'brcm_line' 'brcm0'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
 	option 'vad' '0'
-	option 'txgain' 0
-	option 'rxgain' 0
+	option 'txgain' 4
+	option 'rxgain' 4
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
@@ -14,8 +14,8 @@ config 'brcm_line' 'brcm1'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
 	option 'vad' '0'
-	option 'txgain' 0
-	option 'rxgain' 0
+	option 'txgain' 4
+	option 'rxgain' 4
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
@@ -25,8 +25,8 @@ config 'brcm_line' 'brcm2'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
 	option 'vad' '0'
-	option 'txgain' 0
-	option 'rxgain' 0
+	option 'txgain' 4
+	option 'rxgain' 4
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
@@ -36,8 +36,8 @@ config 'brcm_line' 'brcm3'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
 	option 'vad' '0'
-	option 'txgain' 0
-	option 'rxgain' 0
+	option 'txgain' 4
+	option 'rxgain' 4
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
@@ -47,8 +47,8 @@ config 'brcm_line' 'brcm4'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
 	option 'vad' '0'
-	option 'txgain' 0
-	option 'rxgain' 0
+	option 'txgain' 4
+	option 'rxgain' 4
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
@@ -58,8 +58,8 @@ config 'brcm_line' 'brcm5'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
 	option 'vad' '0'
-	option 'txgain' 0
-	option 'rxgain' 0
+	option 'txgain' 4
+	option 'rxgain' 4
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
@@ -69,8 +69,8 @@ config 'brcm_line' 'brcm6'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
 	option 'vad' '0'
-	option 'txgain' 0
-	option 'rxgain' 0
+	option 'txgain' 4
+	option 'rxgain' 4
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
@@ -80,8 +80,8 @@ config 'brcm_line' 'brcm7'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
 	option 'vad' '0'
-	option 'txgain' 0
-	option 'rxgain' 0
+	option 'txgain' 4
+	option 'rxgain' 4
 	option 'echo_cancel' 1
 	option 'callwaiting' '0'
 	option 'clir' '0'
@@ -155,6 +155,10 @@ config 'sip_service_provider' 'sip0'
 	option 'name' 'Account 1'
 	option 'enabled' '0'
 	option 'codec0' 'alaw'
+	option cbbs_key '5'
+	option cbbs_maxretry '5'
+	option cbbs_retrytime '300'
+	option cbbs_waittime '30'
 	option 'autoframing' '1'
 	option 'cfim_on' '*21*'
 	option 'cfim_off' '#21#'

voice-client/files/etc/firewall.sip

@@ -0,0 +1 @@
+iptables -I zone_wan_input 4 -m udp -p udp --dport 10000:20000 -m comment --comment "!fw3: Allow-RTP" -j ACCEPT

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

@@ -1444,7 +1444,7 @@ configure_extensions()
 	
 	if [ -n "$record_message_extension" ] ; then
 		echo "exten => $record_message_extension,1,Playback(beep)"		>> $WORKDIR/extensions_local.tmp
-		echo "exten => $record_message_extension,n,Record(\"/usr/lib/asterisk/recordings/user-recording\${STRFTIME(\${EPOCH},,%C%y%m%d-%T)}.gsm)"	>> $WORKDIR/extensions_local.tmp
+		echo "exten => $record_message_extension,n,Record(\"/usr/lib/asterisk/recordings/user-recording\${STRFTIME(\${EPOCH},,%C%y%m%d-%T)}.gsm\")"	>> $WORKDIR/extensions_local.tmp
 		echo "exten => $record_message_extension,n,Playback(auth-thankyou)"	>> $WORKDIR/extensions_local.tmp
 		echo "exten => $record_message_extension,n,Hangup()"			>> $WORKDIR/extensions_local.tmp
 	fi
@@ -1680,11 +1680,15 @@ configure_extensions_provider()
 	config_get call_queue $1 call_queue
 	config_get call_ivr $1 call_ivr
 	if [ -n "$incoming_lines" ]; then
-		echo "exten => $user,n,Dial($incoming_lines,$(get_voicemail_timeout),tF(hangup,h,2))" >>		$tmp
-		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"ANSWER\"]?endcall)" >>		$tmp
-		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"BUSY\"]?noanswer)" >>		$tmp
-		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"NOANSWER\"]?noanswer:endcall)" >>	$tmp
-		echo "exten => $user,n(noanswer),Macro(callhandler-noanswer,\${CHANNEL(peername)})" >>	$tmp
+	        echo "exten => $user,n,GotoIf(\${DB_EXISTS(CFBS/$1)}?cfbs)"         >> $tmp
+		echo "exten => $user,n,Dial($incoming_lines,$(get_voicemail_timeout),tF(hangup,h,2))"  >> $tmp
+		echo "exten => $user,n,Goto($user,nocfbs)"                                             >> $tmp
+		echo "exten => $user,n(cfbs),Dial($incoming_lines,20,tF(hangup,h,2))"                  >> $tmp
+		echo "exten => $user,n(nocfbs),NoOp()"                                                 >> $tmp
+		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"ANSWER\"]?endcall)"               >> $tmp
+		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"BUSY\"]?noanswer)"                >> $tmp
+		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"NOANSWER\"]?noanswer:endcall)"    >> $tmp
+		echo "exten => $user,n(noanswer),Macro(callhandler-noanswer,\${CHANNEL(peername)})"    >> $tmp
 		
 		# check for mailbox
 		config_get mailbox $1 mailbox
@@ -1830,7 +1834,6 @@ configure_codecs()
 configure_brcm()
 {
 	echo "Configuring BRCM"
-	local country
 	local jbenable
 	local jbforce
 	local jbmaxsize
@@ -1839,8 +1842,6 @@ configure_brcm()
 	local dialoutmsec
 	local fac
 
-#	config_get country BRCM country
-country=""
 	config_get jbenable BRCM jbenable
 	config_get jbforce BRCM jbforce
 	config_get jbmaxsize BRCM jbmaxsize
@@ -1857,7 +1858,6 @@ country=""
 		dialoutmsec=4000
 	fi
 
-	sed -i "s/|COUNTRY|/$country/"				$WORKDIR/brcm.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
@@ -1881,16 +1881,6 @@ configure_brcm_line()
 	echo "Configuring BRCM line $1"
 	local extension
 	local sip_provider
-	local ptime
-	local silence
-	local ecan
-	local noise
-	local jitter_fixed
-	local jitter_min
-	local jitter_max
-	local jitter_target
-	local txgain
-	local rxgain
 	local codecs
 	local is_fax
 	local autodial
@@ -1903,26 +1893,6 @@ configure_brcm_line()
 
 	config_get extension $1 extension
 	config_get sip_provider $1 sip_account
-#	config_get ptime $1 ptime
-ptime=0
-#	config_get silence $1 vad
-vad=0
-#	config_get ecan $1 echo_cancel
-echo_cancel=0
-#	config_get noise $1 noise
-noise=0
-#	config_get jitter_fixed $1 jitter_fixed
-jitter_fixed=0
-#	config_get jitter_min $1 jitter_min
-jitter_min=0
-#	config_get jitter_max $1 jitter_max
-jitter_max=0
-#	config_get jitter_target $1 jitter_target
-jitter_target=0
-#	config_get txgain $1 txgain
-txgain=0
-#	config_get rxgain $1 rxgain
-rxgain=0
 	config_get autodial $1 autodial
 	config_get autodial_timeout $1 autodial_timeout
 	config_get dialtone_timeout $1 dialtone_timeout
@@ -1958,16 +1928,6 @@ rxgain=0
 	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/|PERIOD|/$ptime/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|SILENCE|/$silence/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|ECHOCANCEL|/$ecan/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|COMFORTNOISE|/$noise/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|JITTERFIXED|/$jitter_fixed/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|JITTERMIN|/$jitter_min/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|JITTERMAX|/$jitter_max/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|JITTERTARGET|/$jitter_target/"		$WORKDIR/brcm_line.tmp
-	sed -i "s/|TXGAIN|/$txgain/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|RXGAIN|/$rxgain/"				$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

voice-client/files/etc/uci-defaults/99-voice_client

@@ -27,13 +27,43 @@ EOT
 
 }
 
+# Default Broadcom phone volume for Iopsys 4.
+uci -q batch <<-EOT
+	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
+
 uci -q batch <<-EOT
         delete firewall.sip
         set firewall.sip=include
         set firewall.sip.path=/etc/firewall.sip
         set firewall.sip.reload=1
+	uci del_list firewall.sip._access_w="root"
+	uci add_list firewall.sip._access_w="root"
         commit firewall
 EOT
 
-exit 0
+# If dtmfmode is set to the obsolete compatability change to auto
+sed -i 's/dtmfmode\s*=\s*compatibility/dtmfmode=auto/' /etc/asterisk/sip.conf
 
+if [ $(uci get voice_client.SIP.dtmfmode) == 'compatibility' ]; then
+    uci set voice_client.SIP.dtmfmode='auto'
+    uci commit
+fi
+
+exit 0

voice-client/files/sbin/voice-monitor

@@ -48,17 +48,24 @@ while read event ; do
 		fi
 	elif json_select asterisk.endpoint >/dev/null; then
 		json_get_var event event
-		if [ "$event" == "OFFHOOK" ]; then
+
+		case $event in
+		    OFFHOOK)
 			OFFHOOK=1
 			ubus call led.voice1 set '{"state":"notice"}'
-		else
+			;;
+		    ONHOOK)
 			OFFHOOK=0
 			if [ $REGISTERED -eq 1 ]; then
 				ubus call led.voice1 set '{"state":"ok"}'
 			else
-				ubus call led.voice1 set '{"state":"error"}'
+			        ubus call led.voice1 set '{"state":"error"}'
 			fi
-		fi
+			;;
+		    *)
+			# Do nothing for other events.
+			;;
+		esac			    
 	fi
 done &
 

wifilife/Config.in

@@ -0,0 +1,4 @@
+
+config WIFILIFE_OPEN
+       bool "Use pre-compiled version for Open SDK"
+       default n

wifilife/Makefile

@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2018 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wifilife
+PKG_VERSION:=1.0.2
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=25af2498b09575990031b1c5754a0893f1d44b80
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+
+ifeq ($(CONFIG_WIFILIFE_OPEN),y)
+TARGET_PROD=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
+PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_SOURCE:=$(PKG_NAME)-$(TARGET_PROD)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+else
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/wifilife.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+endif
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wifilife
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WiFi multi-AP Controller/Agent
+  DEPENDS:=+libwifi +libuci +libubox +ubus
+endef
+
+define Package/wifilife/description
+ This package manages wifi in multi-AP deployment.
+ Supports smart steering of WiFi clients based on
+ 802.11k,v and r.
+endef
+
+define Package/wifilife/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_WIFILIFE_OPEN),y)
+define Build/Compile
+endef
+endif
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+MAKE_PATH:=src
+
+define Package/wifilife/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/wifilife.init $(1)/etc/init.d/wifilife
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/etc/uci-defaults/997-wifilife-add-owsd-wifi \
+				$(1)/etc/uci-defaults/997-wifilife-add-owsd-wifi
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wifiagent $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,wifilife))

wifilife/files/etc/uci-defaults/997-wifilife-add-owsd-wifi

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+add_owsd_object_wifi() {
+	local wifi=$(uci -q get owsd.ubusproxy.object | grep wifi*)
+	if [ -z "$wifi" ]; then
+		uci -q add_list owsd.ubusproxy.object="wifi*"
+		uci commit owsd
+	fi
+}
+
+add_owsd_object_wifi