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(+)
-------------------------------------------------------------------------------

ated/Makefile

@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/ated
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

dectmngr2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.0
-PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
+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)
@@ -18,7 +18,7 @@ PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=endptmngr-open
 else
-PKG_SOURCE_URL:=git@private.inteno.se:endptmngr
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_NAME:=endptmngr

endptmngr/files/dect.config

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

gigaset-elements/Makefile

@@ -5,7 +5,7 @@ PKG_NAME:=gigaset-elements
 PKG_VERSION:=2.4.2
 # PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
+PKG_GIGASET_ELEMENTS_SRC_URL ?= git@dev.iopsys.eu:3rdparty/gigaset-elements.git
 PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
 
 PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.0.3
-PKG_RELEASE:=RC5
+BASE_PKG_VERSION:=5.2.3
+PKG_RELEASE:=
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=a7f40bfd47d0ce3f3c002460e3c83ffc821ac1e4
+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-04-09
+PKG_VERSION:=4.0-2018-12-04
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cfbec44903f66dc53e2d560d1a4cde42dca923f4
+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)
@@ -37,6 +37,19 @@ define Package/libdatamodel
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
+define Package/icwmp_stun
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 stun Client
+	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+endef
+
+define Package/icwmp_xmpp
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 xmpp feature
+	DEPENDS:=+libuci +libubox +libexpat +libstrophe
+endef
 
 define Package/icwmp/Default
   SECTION:=utils
@@ -82,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
 
@@ -170,6 +185,24 @@ endif
 	$(CP) ./files/* $(1)/
 endef
 
+define Package/icwmp_stun/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_stund $(1)/etc/init.d/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_stun $(1)/etc/config
+endef
+
+define Package/icwmp_xmpp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_xmppd $(1)/usr/sbin/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
@@ -203,4 +236,6 @@ endef
 
 $(eval $(call BuildPackage,icwmp-curl))
 $(eval $(call BuildPackage,libdatamodel))
+$(eval $(call BuildPackage,icwmp_stun))
+$(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp-zstream))

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

@@ -6,7 +6,15 @@
 
 [ -f /etc/config/cwmp ] || exit 0
 
-handle_icwmp_reload() {
+handle_icwmp_restart() {
+	[ -f /tmp/switching_mode ] && exit 0
+	[ -f /tmp/wificontrol.txt -a -f /tmp/netmode-conf.pid ] && exit 0
+
+	[ "$INTERFACE" == "loopback" ] && exit 0
+
+	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+	[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
+
 	local islan="$(uci -q get network.$INTERFACE.is_lan)"
 	[ "$islan" == "1" ] && exit 0
 
@@ -48,10 +56,30 @@ handle_icwmp_reload() {
 	network_get_dnsserver curdnsservers $INTERFACE
 	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
 
-	[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" -a "$prevdnsservers" = "$curdnsservers" ] && exit 0
+	local prevdev=""
+	local curdev=""
+	local devfile=/tmp/ipv4/$INTERFACE-dev
+	prevdev=$(cat $devfile 2>/dev/null)
+	network_get_device curdev $INTERFACE
+	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
+
+	local prevopt43url=""
+	local curopt43url=""
+	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
+	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
+	curopt43url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
+	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
+
+	[ \
+		"$prevdev" == "$curdev" -a \
+		"$previpaddr" = "$curipaddr" -a \
+		"$prevgateway" = "$curgateway" -a \
+		"$prevsubnets" = "$cursubnets" -a \
+		"$prevdnsservers" = "$curdnsservers" -a \
+		"$prevopt43url" = "$curopt43url" \
+	] && exit 0
 
 	/etc/init.d/icwmpd reload &
 }
 
-handle_icwmp_reload
-
+handle_icwmp_restart

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

@@ -11,8 +11,8 @@ PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
-PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git
-PKG_SOURCE_VERSION:=defec6849fb987619fc7fd9295895f4f0b9db5a9
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
+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,9 +12,9 @@ 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:=http://public.inteno.se/inbd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

inteno-netmodes/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"
-	]
-}
-

inteno-netmodes/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
-

inteno-netmodes/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'
-

inteno-netmodes/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'
-

inteno-netmodes/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" : 0
-}

inteno-netmodes/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'
-

inteno-netmodes/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'
-

inteno-netmodes/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" : 0
-}

inteno-netmodes/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'
-

inteno-netmodes/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'
-

inteno-netmodes/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" : 0
-}

inteno-netmodes/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
-

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_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'
-	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'
-

inteno-netmodes/files/etc/netmodes/routed_brcm/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'
-

inteno-netmodes/files/etc/netmodes/routed_mtk/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
-

iop/configs/config

@@ -3,7 +3,7 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-CONFIG_LOCALMIRROR="http://mirror.inteno.se/mirror"
+# CONFIG_LOCALMIRROR is not set
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
@@ -32,8 +32,10 @@ CONFIG_PACKAGE_ice-client-netrounds=m
 CONFIG_PACKAGE_ice-client-rshell=m
 CONFIG_PACKAGE_ice-client-texec=m
 CONFIG_PACKAGE_icwmp-curl=y
+CONFIG_PACKAGE_ifbt=y
+CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_inteno-netmodes=y
+CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables=y
@@ -45,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
@@ -78,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
@@ -113,7 +116,7 @@ CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_p910nd=y
+# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -130,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
@@ -145,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
@@ -155,6 +161,7 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
+CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
@@ -210,8 +217,12 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_LIBCURL_CRYPTO_AUTH=y
+# CONFIG_LIBCURL_MBEDTLS is not set
+CONFIG_LIBCURL_OPENSSL=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
 # 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/eg200/config

@@ -0,0 +1,5 @@
+CONFIG_BCM_I2C=y
+CONFIG_TARGET_NO_DECT=y
+CONFIG_TARGET_NO_DSL=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/configs/target/iopsys_ramips/config

@@ -8,7 +8,7 @@
 # CONFIG_PACKAGE_mtd-utils-nanddump is not set
 CONFIG_PACKAGE_mtd-utils-nandwrite=y
 CONFIG_PACKAGE_mtk-bndstrg=y
-CONFIG_PACKAGE_omcproxy=y
+CONFIG_PACKAGE_igmpproxy=y
 CONFIG_PACKAGE_kmod-nf-nathelper=y
 CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
 # CONFIG_PACKAGE_endptmngr is not set

iop/iop.completion

@@ -5,14 +5,14 @@
 
 _iop_get_profiles()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -name '*.diff' \
+    find feeds/targets/iopsys-*/ -name '*.diff' \
         |awk -F'/' '{print$NF}' \
         |awk -F. '{print$1}'
 }
 
 _iop_get_models()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
+    find feeds/targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
         |awk -F'/' '{print$NF}' \
         |egrep '^(cg|dg|eg|vg|vox)[0-9]'
 }

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

@@ -28,15 +28,15 @@ function feeds_update {
 
     # replace core packages with iopsys versions
     if [ $override == 1 ]; then
-		./scripts/feeds install -f -p feed_inteno_openwrt -a
-		./scripts/feeds install -f -p feed_inteno_lede -a
+		./scripts/feeds install -f -p lede_core -a
     fi
 
     # targets need to be installed explicitly
-    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
-    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
-    ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
-    
+    ./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

@@ -7,52 +7,77 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/feed_inteno_packages/iop/configs"
+	export CONFIGPATH="package/feeds/iopsys/iop/configs"
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
-	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02"
-	iopsys_brcm63xx_arm="dg400 eg400 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,10 +337,11 @@ 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
-		touch package/feeds/feed_inteno_juci/juci/Makefile
+		touch package/feeds/juci/juci/Makefile
 
 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets
@@ -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

@@ -41,7 +41,7 @@ update_this_pkg()
 	echo "	to get an up to date version in ${PKG_BUILD_DIR}/.git_update"
 	echo ""
 
-	echo -n "	Shold we continue with the update anyway? [y/N]:"
+	echo -n "	Should we continue with the update anyway? [y/N]:"
 	read answer
 	echo ""
 
@@ -184,7 +184,7 @@ branch_uptodate()
      else
 	 echo "Diverged. not sure what you did but there is no tracking branch. "
 	 echo "repo at [ $1 ]. fix it so that there is a tracking branch remote."
-	 echo "Often this is related to sombody having commited to the same branch"
+	 echo "Often this is related to somebody having commited to the same branch"
 	 echo "on the server so a simple push wont work, try a 'git rebase'."
 	 exit 99
      fi
@@ -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/lib/functions/dhcp_option_relay.sh

@@ -0,0 +1,219 @@
+#!/bin/sh
+
+# functions that take dhcp options received on the wan interface
+# and relay/repeat them for specific clients
+
+#config dhcp_option_relay
+#	option enable 1
+#	list dhcp_option 43
+#	list from_interface wan
+#	option vendorclass '*SDX*'
+
+# where:
+# dhcp_option_relay is the name of the section parsed by this script
+# enable/enabled - option, enable the uci section [default on]
+# dhcp_option/dhcp_options - list of dhcp options (0-255) to be relayed/repeated
+# overwrite - if same dhcp_option already exists in /etc/config/dhcp, overwrite it with this option [default off]
+# from_interface - list of interfaces (e.g. wan) to get the dhcp options from
+
+
+. /lib/functions.sh
+
+interface=""
+opt224=""
+opt225=""
+opt226=""
+opt43=""
+opt128=""
+opt66=""
+opt67=""
+opt132=""
+opt133=""
+newsectionid="0"
+
+function parse_the_json()
+{
+	local the_json="$@"
+
+	json_load "$the_json"
+	json_get_var interface interface
+	json_get_var opt224 privopt224
+	json_get_var opt225 privopt225
+	json_get_var opt226 privopt226
+	json_get_var opt43 vendorspecinf # option 43
+	json_get_var opt128 httpurl128
+	json_get_var opt66 tftp # option 66
+	json_get_var opt67 bootfile #option 67
+	json_get_var opt132 vlanid # option 132
+	json_get_var opt133 vlanpriority # option 133
+}
+
+function add_section_dhcp_vendorclass()
+{
+	local dhcp_option=$1
+	local dhcp_option_value=$2
+	local vendorclass=$3
+	local new=
+	newsectionid=$((newsectionid+1))
+
+	#echo "add_section_dchp_vendorclass $dhcp_option ${dhcp_option_value} $vendorclass"
+	new=$(uci add dhcp vendorclass)
+	uci set dhcp.$new.vendorclass="$vendorclass"
+	uci set dhcp.$new.networkid="dhcp_option_relay_$newsectionid"
+	uci add_list dhcp.$new.dhcp_option=$dhcp_option,\"${dhcp_option_value}\"
+
+	uci commit dhcp
+}
+
+function dhcp_option_relay()
+{
+	local section="$1"
+	local enable="" enabled=""
+	local dhcp_option="" dhcp_option_value=""
+	local vendorclass=""
+	#local overwrite=""
+	local from_interface
+
+	#echo "section: $section"
+
+	# parse only enabled sections
+	config_get_bool enabled $section enabled 1
+	config_get_bool enable  $section enable  1
+	#echo "enabled: $enabled"
+	#echo "enable : $enable"
+	if [ "$enable" == "0" -o "$enabled" == "0" ] ; then
+		#echo "section $section is not enabled"
+		return
+	fi
+	# todo: for disabled sections: run only the removal of the dhcp options
+
+	# option overwrite 1
+	#config_get_bool overwrite $section overwrite 0
+	config_get vendorclass $section vendorclass
+	if [ ${#vendorclass} -le 1 ]; then
+		#echo "vendorclass must not be empty"
+		return
+	fi
+
+	# list to_interface lan
+	# to_interface - list of interfaces (e.g. lan, guest) to advertise the dhcp options to
+	#foreach_to_interface() {
+	#	local to_interface=$1
+	#	echo ""
+	#	echo "  from_interface $from_interface"
+	#	echo "  dhcp_option $dhcp_option"
+	#	echo "  dhcp_option_value $dhcp_option_value"
+	#	echo "  overwrite $overwrite"
+	#	echo "  to_interface $to_interface"
+	#
+	#	if [ ! $(uci -q get dhcp.$to_interface) ] ; then
+	#		echo "to_interface $to_interface does not exist in dhcp uci config"
+	#		return
+	#	fi
+	#
+	#}
+
+
+	foreach_dhcp_option() {
+		dhcp_option=$1
+
+		echo "dhcp_option: $dhcp_option"
+		case $dhcp_option in
+		43) dhcp_option_value=$opt43 ;;
+		66) dhcp_option_value=$opt66 ;;
+		67) dhcp_option_value=$opt67 ;;
+		128) dhcp_option_value=$opt128 ;;
+		132) dhcp_option_value=$opt132 ;;
+		133) dhcp_option_value=$opt133 ;;
+		224) dhcp_option_value=$opt224 ;;
+		225) dhcp_option_value=$opt225 ;;
+		226) dhcp_option_value=$opt226 ;;
+		*) dhcp_option_value="unsupported" ;;
+		esac
+
+		if [ "${dhcp_option_value}" == "unsupported" ] ; then
+			echo "dhcp_option $dhcp_option is unsupported"
+			return
+		fi
+		if [ "${dhcp_option_value}" == "" ] ; then
+			echo "dhcp_option $dhcp_option is empty"
+			return
+		fi
+
+		#echo "dhcp_option: $dhcp_option dhcp_option_value: ${dhcp_option_value}"
+
+		#config_list_foreach $section to_interface foreach_to_interface
+
+		add_section_dhcp_vendorclass $dhcp_option ${dhcp_option_value} $vendorclass
+	}
+
+	foreach_from_interface() {
+		from_interface="$1"
+		#echo "from_interface: $from_interface"
+		if [ "$from_interface" != "$interface" ]; then
+			return
+		fi
+
+		dhcp_option=""
+		config_list_foreach $section dhcp_option foreach_dhcp_option
+		#config_list_foreach $section dhcp_options foreach_dhcp_option
+	}
+
+	from_interface=""
+	config_list_foreach $section from_interface foreach_from_interface
+}
+
+
+# in uci dhcp config:
+# remove all the vendorclass sections
+# that have previosly been configured by this script.
+# all are identified by "option networkid dhcp_option_relay_*"
+function dhcp_option_relay_clear_prev()
+{
+	local to_remove=""
+
+	foreach_vendorclass() {
+		local section="$1"
+		local networkid
+		config_get networkid $section networkid
+
+		case "$networkid"
+		in dhcp_option_relay*)
+			to_remove="$to_remove $section"
+			;;
+		esac
+	}
+
+	config_load dhcp
+	config_foreach foreach_vendorclass vendorclass
+
+	local sect
+	for sect in $to_remove ; do
+		uci_remove dhcp $sect
+	done
+	uci_commit dhcp
+}
+
+
+# the main function
+function dhcp_option_relay_parse()
+{
+	local the_json="$@"
+	parse_the_json "$the_json"
+
+	dhcp_option_relay_clear_prev
+
+	newsectionid="0"
+
+	config_load provisioning
+	config_foreach dhcp_option_relay dhcp_option_relay
+	#config_foreach dhcp_option_relay dhcp_options_relay
+	#config_foreach dhcp_option_relay dhcpoption_relay
+	#config_foreach dhcp_option_relay dhcpoptions_relay
+	#config_foreach dhcp_option_relay dhcp_optionrelay
+	#config_foreach dhcp_option_relay dhcp_optionsrelay
+	#config_foreach dhcp_option_relay dhcpoptionrelay
+	#config_foreach dhcp_option_relay dhcpoptionsrelay
+}
+
+#dhcp_option_relay_parse

iup/files/sbin/iup

@@ -5,6 +5,7 @@ echo $$ > /var/run/iup.pid
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/functions/savecfg.sh
+. /lib/functions/dhcp_option_relay.sh
 . /usr/share/libubox/jshn.sh
 
 include /lib/upgrade
@@ -268,19 +269,20 @@ change_to_vlan() {
 	base_dev=$(echo ${base_dev} | cut -d. -f1)
 
 	# add "VLAN interface" to the "end of the file".
-	uci add layer2_interface_vlan vlan_interface
-	uci set layer2_interface_vlan.@vlan_interface[-1].name=${name}
-	uci set layer2_interface_vlan.@vlan_interface[-1].vlan8021q=${1}
-	uci set layer2_interface_vlan.@vlan_interface[-1].vlan8021p=${2}
-	uci set layer2_interface_vlan.@vlan_interface[-1].ifname="${base_dev}.${1}"
-	uci set layer2_interface_vlan.@vlan_interface[-1].baseifname=${base_dev}
+	uci add network device
+	uci rename network.@device[-1]=${name}
+	uci set network.@device[-1].type=8021q
+	uci set network.@device[-1].ifname=${base_dev}
+	uci set network.@device[-1].name="${base_dev}.${1}"
+	uci set network.@device[-1].vid=${1}
+	uci set network.@device[-1].priority=${2}
 	# and commit the change.
-	uci commit layer2_interface_vlan
-	v "option 132: committed update to file layer2_interface_vlan"
+	uci commit network
+	v "option 132: committed update to file network"
 
 	# reload configuration files.
-	/etc/init.d/layer2_interface_vlan reload
-	v "option 132: reload layer2_interface_vlan config"
+	ubus call network reload
+	v "option 132: reload network config"
 
 	# replace old interface (like eth0.1 with new eth0.101).
 	wan_if=$(uci get network.$3.ifname)
@@ -383,6 +385,10 @@ handle_option224()
 parse_dhcp_options()
 {
 	local the_json="$@"
+
+	# process the dhcp_option_relay sections
+	dhcp_option_relay_parse "$the_json"
+
 	# Process IUP related DHCP options #
 	local privopt224 privopt225 privopt226 vendorspecinf httpurl128
 	local tftp bootfile vlanid vlanpriority interface
@@ -409,6 +415,7 @@ parse_dhcp_options()
 		v "dhcp option 43 tr69 url $vendorspecinf"
 		url=${vendorspecinf%%,*}; rest=${vendorspecinf#*,}
 		provisioningcode=${rest%%,*};
+		[ -f /etc/config/cwmp ] && uci_set_state cwmp acs dhcp_url "$url"
 		uci_set_state provisioning iup urlcwmp "$url"
 		uci_set_state provisioning iup url "$url"
 		uci_set_state provisioning iup provisioningcode "$provisioningcode"
@@ -562,7 +569,7 @@ main()
 	        if [ "$filesystem" == "JFFS2" ] ; then
 	                firmware=$firmware.w
 		else
-			firmware=$firmware.y
+			firmware=$firmware.y3
 		fi
 		if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
 			v "Software \"$software\""

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_SOURCE_URL:=http://public.inteno.se/libpicoevent
+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)

loop-detector/Makefile

@@ -5,7 +5,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_VERSION:=d0fb770eacd6691b98df138b60f5116e02f71a9b
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/loop-detector
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/loop-detector
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

mosquitto/Config.in

@@ -1,13 +0,0 @@
-config MOSQUITTO_LWS
-    bool "libwebsockets support"
-    depends on PACKAGE_mosquitto-ssl
-    default y
-    help
-        Includes websockets support in the broker, via libwebsockets
-
-config MOSQUITTO_PASSWD
-    bool "Include mosquitto_passwd utility"
-    depends on PACKAGE_mosquitto-ssl
-    default y
-    help
-mosquitto_passwd is a tool for managing password files for mosquitto.

mosquitto/Makefile

@@ -1,231 +0,0 @@
-#
-# Copyright (C) 2011-2013 OpenWrt.org
-# Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mosquitto
-PKG_VERSION:=1.4.15
-PKG_RELEASE:=3
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE.txt
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mosquitto.org/files/source/
-PKG_HASH:=7d3b3e245a3b4ec94b05678c8199c806359737949f4cfe0bf936184f6ca89a83
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mosquitto/default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=mosquitto - an MQTT message broker
-  URL:=http://www.mosquitto.org/
-  MAINTAINER:=Karl Palsson <karlp@etactica.com>
-  DEPENDS:= +librt +libuuid
-  USERID:=mosquitto=200:mosquitto=200
-endef
-
-define Package/mosquitto-ssl
-    $(call Package/mosquitto/default)
-    TITLE+= (with SSL support)
-    DEPENDS+= +libopenssl +MOSQUITTO_LWS:libwebsockets-openssl
-    VARIANT:=ssl
-    PROVIDES:=mosquitto
-endef
-
-define Package/mosquitto-nossl
-    $(call Package/mosquitto/default)
-    TITLE+= (without SSL support)
-    VARIANT:=nossl
-    PROVIDES:=mosquitto
-endef
-
-define Package/mosquitto-ssl/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/mosquitto/default/description
-Mosquitto is an open source (BSD licensed) message broker that implements
-the MQTT protocol version 3.1 and 3.1.1. MQTT provides a lightweight
-method of carrying out messaging using a publish/subscribe model.
-
-This package also includes some basic support for configuring via UCI
-endef
-
-define Package/mosquitto-ssl/description
-	$(call Package/mosquitto/default/description)
-This package is built with SSL support.  TLS-PSK will be included (in both
-the client and broker) if OpenSSL is built with TLS-PSK support.
-endef
-
-define Package/mosquitto-nossl/description
-        $(call Package/mosquitto/default/description)
-        This package is built WITHOUT SSL support.
-endef
-
-
-define Package/mosquitto-client/default
-    $(Package/mosquitto/default)
-    TITLE:= mosquitto - client tools
-    DEPENDS+=+libcares
-    PROVIDES:=mosquitto-client
-endef
-define Package/mosquitto-client-ssl
-    $(call Package/mosquitto-client/default)
-    TITLE+= (With SSL support)
-    DEPENDS+=+libmosquitto-ssl
-    VARIANT:=ssl
-endef
-define Package/mosquitto-client-nossl
-    $(call Package/mosquitto-client/default)
-    TITLE+= (Without SSL support)
-    DEPENDS+=+libmosquitto-nossl
-    VARIANT:=nossl
-endef
-
-define Package/mosquitto-client/default/description
- Command line client tools for publishing messages to MQTT servers
-and subscribing to topics.
-endef
-
-define Package/mosquitto-client-ssl/description
-$(call Package/mosquitto-client/default/description)
-        This package is built with SSL support
-endef
-define Package/mosquitto-client-nossl/description
-$(call Package/mosquitto-client/default/description)
-        This package is built without SSL support
-endef
-
-define Package/libmosquitto/default
-    $(Package/mosquitto/default)
-    SECTION:=libs
-    CATEGORY:=Libraries
-    DEPENDS:=+libpthread +librt +libcares
-    TITLE:= mosquitto - client library
-    PROVIDES:=libmosquitto
-endef
-
-define Package/libmosquitto-ssl
-    $(call Package/libmosquitto/default)
-    TITLE+= (With SSL Support)
-    DEPENDS+= +libopenssl
-    VARIANT=ssl
-endef
-define Package/libmosquitto-nossl
-    $(call Package/libmosquitto/default)
-    TITLE+= (Without SSL Support)
-    VARIANT=nossl
-endef
-
-define Package/libmosquitto/default/description
- Library required for mosquitto's command line client tools, also for
-use by any third party software that wants to communicate with a
-mosquitto server.
-
-Should be useable for communicating with any MQTT v3.1/3.1.1 compatible
-server, such as IBM's RSMB, in addition to Mosquitto
-endef
-
-define Package/libmosquitto-ssl/description
-    $(call Package/libmosquitto/default/description)
-    This package is built with SSL support
-endef
-define Package/libmosquitto-nossl/description
-    $(call Package/libmosquitto/default/description)
-    This package is built without SSL support
-endef
-
-define Package/libmosquittopp
-    SECTION:=libs
-    CATEGORY:=Libraries
-    DEPENDS:=libmosquitto +libstdcpp
-    TITLE:= mosquitto - client c++ library
-endef
-
-define Package/libmosquittopp/description
- C++ Library wrapper for libmosquitto.
-endef
-
-define Package/mosquitto-ssl/conffiles
-/etc/mosquitto/mosquitto.conf
-/etc/config/mosquitto
-endef
-
-Package/mosquitto-nossl/conffiles = $(Package/mosquitto-ssl/conffiles)
-
-define Package/mosquitto/install/default
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto $(1)/usr/sbin/mosquitto
-	$(INSTALL_DIR) $(1)/etc/mosquitto
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/mosquitto.conf $(1)/etc/mosquitto/mosquitto.conf
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/mosquitto-nossl/install
-	$(call Package/mosquitto/install/default,$(1))
-endef
-
-define Package/mosquitto-ssl/install
-	$(call Package/mosquitto/install/default,$(1))
-ifeq ($(CONFIG_MOSQUITTO_PASSWD),y)
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto_passwd $(1)/usr/bin
-endif
-endef
-
-define Package/mosquitto-client-ssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/mosquitto_pub $(1)/usr/bin/mosquitto_pub
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/mosquitto_sub $(1)/usr/bin/mosquitto_sub
-endef
-Package/mosquitto-client-nossl/install = $(Package/mosquitto-client-ssl/install)
-
-# This installs files into ./staging_dir/. so that you can cross compile from the host
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/lib/mosquitto.h $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/lib/cpp/mosquittopp.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/lib/cpp/libmosquittopp.so.1 $(1)/usr/lib/
-	$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
-	$(LN) libmosquittopp.so.1 $(1)/usr/lib/libmosquittopp.so
-endef
-
-# This installs files on the target.  Compare with Build/InstallDev
-define Package/libmosquitto-ssl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
-	$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
-endef
-Package/libmosquitto-nossl/install = $(Package/libmosquitto-ssl/install)
-
-define Package/libmosquittopp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/cpp/libmosquittopp.so.1 $(1)/usr/lib/
-	$(LN) libmosquittopp.so.1 $(1)/usr/lib/libmosquittopp.so
-endef
-
-# Applies to all...
-MAKE_FLAGS += WITH_DOCS=no UNAME=Linux
-ifeq ($(BUILD_VARIANT),nossl)
-	MAKE_FLAGS += WITH_TLS=no WITH_WEBSOCKETS=no
-else
-	MAKE_FLAGS += WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
-	MAKE_FLAGS += WITH_TLS_PSK=$(if $(CONFIG_OPENSSL_WITH_PSK),"yes","no")
-endif
-
-$(eval $(call BuildPackage,mosquitto-ssl))
-$(eval $(call BuildPackage,mosquitto-nossl))
-$(eval $(call BuildPackage,libmosquitto-ssl))
-$(eval $(call BuildPackage,libmosquitto-nossl))
-$(eval $(call BuildPackage,libmosquittopp))
-$(eval $(call BuildPackage,mosquitto-client-ssl))
-$(eval $(call BuildPackage,mosquitto-client-nossl))

mosquitto/files/etc/config/mosquitto

@@ -1,4 +0,0 @@
-config owrt owrt
-    option use_uci 0
-
-config mosquitto mosquitto

mosquitto/files/etc/init.d/mosquitto

@@ -1,211 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Basic init script for mosquitto
-# April 2012, OpenWrt.org
-# Provides support for the luci-app-mosquitto package, if installed
-
-START=80
-USE_PROCD=1
-TCONF=/tmp/mosquitto.generated.conf
-
-# Usage: append_if cfg uci_name output_name
-# add a config line of the form "output_name <value>"
-# if the "uci_name" was found.
-# output_name defaults to uci_name if not specified.
-append_if() {
-    local cfg="$1"
-    local uci_name="$2"
-    local out_name="$3"
-    if [ -z "$out_name" ]; then
-        out_name=$uci_name
-    fi
-    config_get val $cfg $uci_name
-    if [ -n "$val" ]; then
-        echo "$out_name $val" >> $TCONF
-    fi
-}
-
-# mosquitto uses true/false, uci uses 1/0
-# note that this is not shell truthy, but equality with 1!
-append_bool() {
-    if [ $2 -eq 1 ]; then
-        echo "$1 true" >> $TCONF
-    else
-        echo "$1 false" >> $TCONF
-    fi
-}
-
-# as per append_if, but gets the value as a uci bool, not raw
-append_optional_bool() {
-    local cfg="$1"
-    local uci_name="$2"
-    local out_name="$3"
-    config_get val $cfg $uci_name
-    if [ -n "$val" ]; then
-        config_get_bool real $cfg $uci_name
-        append_bool $out_name $real
-    fi
-}
-
-
-convert_mosq_general() {
-	local cfg="$1"
-	config_get destinations "$1" log_dest
-	for dest in $destinations; do
-		echo "log_dest $dest" >> $TCONF
-	done
-
-	config_get_bool no_remote "$1" no_remote_access 0
-	if [ "$no_remote" -eq 1 ]; then
-		echo "bind_address localhost" >> $TCONF
-	fi
-
-	config_get port "$1" port 1883
-	echo "port $port" >> $TCONF
-	append_if "$1" protocol
-	append_if "$1" max_inflight_messages
-	append_if "$1" max_queued_messages
-	append_if "$1" sys_interval
-}
-
-convert_persistence() {
-	local cfg="$1"
-
-	append_if "$cfg" client_expiration persistent_client_expiration
-	append_if "$cfg" autosave_interval
-	append_optional_bool "$cfg" autosave_on_changes autosave_on_changes
-	append_optional_bool "$cfg" persistence persistence
-	append_if "$cfg" file persistence_file
-	config_get loc "$cfg" location
-	if [ -n "$loc" ]; then
-		[ -d "$loc" ] || {
-			mkdir -p "$loc";
-			chown mosquitto "$loc";
-		}
-		echo "persistence_location $loc" >> $TCONF
-	fi
-}
-
-add_listener() {
-    echo "" >> $TCONF
-    config_get port "$1" port
-    if [ -z "$port" ]; then
-        echo "Ignoring listener section without port"
-        return
-    fi
-    config_get_bool no_remote "$1" no_remote_access 0
-    if [ "$no_remote" -eq 1 ]; then
-        echo "listener $port 127.0.0.1" >> $TCONF
-    else
-        echo "listener $port" >> $TCONF
-    fi
-
-    append_if "$1" protocol
-    append_if "$1" http_dir
-    append_optional_bool "$1" use_username_as_clientid use_username_as_clientid
-    append_if "$1" cafile
-    append_if "$1" capath
-    append_if "$1" certfile
-    append_if "$1" keyfile
-    append_if "$1" tls_version
-    append_optional_bool "$1" require_certificate require_certificate
-    append_optional_bool "$1" use_identity_as_username use_identity_as_username
-    append_if "$1" crlfile
-    append_if "$1" ciphers
-    append_if "$1" psk_hint
-}
-
-add_topic() {
-    echo "topic $1" >> $TCONF
-}
-
-add_bridge() {
-    config_get conn "$1" connection
-    config_get addr "$1" address
-    if [ -z "$conn" -o -z "$addr" ]; then
-        echo "Ignoring bridge section, misisng connection/address"
-        return
-    fi
-    echo "" >> $TCONF
-    echo "# Bridge connection from UCI section" >> $TCONF
-    append_if "$1" connection
-    append_if "$1" address
-
-    config_list_foreach "$1" topic add_topic
-    append_optional_bool "$1" cleansession cleansession
-    append_optional_bool "$1" try_private try_private
-    append_optional_bool "$1" notifications notifications
-    append_optional_bool "$1" round_robin round_robin
-
-    # Note, deprecated upstream, preserve old uci configs
-    append_if "$1" clientid remote_clientid
-    append_if "$1" remote_clientid
-    append_if "$1" local_clientid
-    append_if "$1" notification_topic
-    append_if "$1" keepalive_interval
-    append_if "$1" start_type
-    append_if "$1" restart_timeout
-    append_if "$1" idle_timeout
-    append_if "$1" threshold
-    append_if "$1" protocol_version bridge_protocol_version
-    append_optional_bool "$1" attempt_unsubscribe bridge_attempt_unsubscribe
-    append_if "$1" identity bridge_identity
-    append_if "$1" psk bridge_psk
-    append_if "$1" tls_version bridge_tls_version
-
-    append_if "$1" restart_timeout
-    append_if "$1" capath bridge_capath
-    append_if "$1" cafile bridge_cafile
-    append_if "$1" certfile bridge_certfile
-    append_if "$1" keyfile bridge_keyfile
-    # Note, deprecated upstream, preserve old uci configs
-    append_if "$1" username remote_username
-    # Note, deprecated upstream, preserve old uci configs
-    append_if "$1" password remote_password
-    append_if "$1" remote_username
-    append_if "$1" remote_password
-}
-
-
-convert_uci() {
-	rm -rf $TCONF
-	echo "Generating mosquitto config file in $TCONF"
-	echo "# mosquitto.conf file generated from UCI config." >>$TCONF
-	# Don't include a timestamp, it makes md5sum compares fail
-
-	config_load mosquitto
-	config_foreach convert_mosq_general "mosquitto"
-	config_foreach convert_persistence "persistence"
-	config_foreach add_listener "listener"
-	config_foreach add_bridge "bridge"
-}
-
-start_service_real() {
-	local cfg="$1"
-	local use_uci write_pid
-	config_get use_uci "$cfg" use_uci
-	if [ "$use_uci" -eq 1 ]; then
-		CONF=$TCONF
-		convert_uci
-	else
-		CONF=/etc/mosquitto/mosquitto.conf
-        fi
-	config_get write_pid "$cfg" write_pid 0
-
-	procd_open_instance
-	procd_set_param command mosquitto
-	procd_append_param command -c $CONF
-	# Makes /etc/init.d/mosquitto reload work if you edit the final file.
-	procd_set_param file $CONF
-	[ "$write_pid" -eq 1 ] && procd_set_param pidfile /var/run/mosquitto.pid
-	procd_close_instance
-}
-
-start_service() {
-	config_load mosquitto
-	config_foreach start_service_real owrt
-}
-
-service_triggers() {
-	# Makes "reload_config" work
-	procd_add_reload_trigger "mosquitto"
-}

mtk-bndstrg/Makefile

@@ -1,41 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mtk-bndstrg
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=a67f5ccdf9bc6810f15f1ece9edaad5e89cad0f7
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/mtk-bndstrg
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mtk-bndstrg
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libpthread +librt
-  TITLE:=Band steering daemon for Mediatek
-endef
-
-define Package/mtk-bndstrg/description
- Band steering for Mediatek
-endef
-
-#define Build/Compile
-#endef
-
-define Build/Configure
-  #$(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR))
-endef
-
-define Package/mtk-bndstrg/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bndstrg $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,mtk-bndstrg))

natalie-dect-h/Makefile

@@ -11,7 +11,7 @@ PKG_NAME:=natalie-dect-h
 PKG_VERSION:=12.26
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://public.inteno.se:/natalie-dect-h
+PKG_SOURCE_URL:=https://dev.iopsys.eu/dialog/natalie-dect-h.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

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
@@ -18,12 +18,12 @@ PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-12.26
+PKG_SOURCE_URL:=git@dev.iopsys.eu:dialog/natalie-dect-12.26
 PKG_SOURCE_PROTO:=git
 endif
 
 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

@@ -1,15 +1,11 @@
-#
-# Copyright (C) 2016 Inteno
-#
-
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=inteno-netmodes
+PKG_NAME:=netmode
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=b898924491c378ca09ab124991b27f54a336e4e9
+PKG_SOURCE_VERSION:=82fd6c196a3b990e105cef867a69ce52979b27fa
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/netmoded
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -17,20 +13,20 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/inteno-netmodes
+define Package/netmode
 	CATEGORY:=Base system
 	DEPENDS:=+fping +ubus +libubox +libuci
 	TITLE:=Predefined Network Modes
 endef
 
-define Package/inteno-netmodes/description
+define Package/netmode/description
 	Predefined Network Modes
 endef
 
-define Package/inteno-netmodes/install
+define Package/netmode/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netmoded $(1)/sbin/
 endef
 
-$(eval $(call BuildPackage,inteno-netmodes))
+$(eval $(call BuildPackage,netmode))

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

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/init.d/netmode

@@ -12,7 +12,7 @@ start_netmoded() {
 	procd_open_instance
 	procd_set_param command $NETMODED
 
-	procd_append_param command --verbose debug
+	procd_append_param command --verbose warning
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 

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

@@ -21,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'
@@ -47,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