stash wip: move uproxyd to owsd package

ated/Makefile

@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
+PKG_SOURCE_URL:=http://public.inteno.se:/ated
 
 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.2.0
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
+PKG_VERSION:=1.1.0
+PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0c029ed2486342e7e7687631b702d5c743f3c41a
+PKG_SOURCE_VERSION:=49d9ba5e7d98016cd83a4c16e44d63f31043fff3
 PKG_NAME:=dectmngr2
 
 
@@ -21,7 +21,6 @@ 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
 
@@ -29,7 +28,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus
 endef
 
 define Package/dectmngr2/description
@@ -42,7 +41,6 @@ define Package/dectmngr2/install
 	$(INSTALL_DIR) $(1)/etc/dect/
 	$(INSTALL_DIR) $(1)/etc/config/
 	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_DIR) $(1)/etc/uci-defaults/
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
@@ -50,7 +48,6 @@ define Package/dectmngr2/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dectmngr-wrapper.sh $(1)/usr/sbin/
 	$(CP) ./files/dect.config $(1)/etc/config/dect
-	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,dectmngr2))

dectmngr2/files/etc/uci-defaults/22-dect-defaults

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-
-# Workaround for product DG400 which has an
-# incorrect value in nvram from factory.
-
-if [ -e "/proc/nvram/BoardId" ]; then
-	boardid=$(cat /proc/nvram/BoardId)
-	ulBoardStuffOption=$(cat /proc/nvram/ulBoardStuffOption)
-
-	if [ "$boardid" = "DG400R0" -a "$ulBoardStuffOption" = "0xffffffff" ]; then
-		echo "0xfffffff2" >/proc/nvram/ulBoardStuffOption
-
-		db -q batch <<-EOT
-			set hw.board.hasDect=1
-			commit hw.board
-		EOT
-	fi
-fi
-
-
-exit 0
-

dslmngr/Makefile

@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dslmngr
-PKG_VERSION:=1.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=be5b0d0c0a1c2abd335aaf19f01f63284d8cc285
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-else
-  $(info Unexpected CONFIG_TARGET)
-endif
-
-export TARGET_PLATFORM
-
-define Package/dslmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +easy-soc-libs
-endef
-
-define Package/dslmngr/description
- This package can be used to configure and provide status about
- the XDSL subsystem through UBUS.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)"
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Build/Compile
-	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
-endef
-
-define Package/dslmngr/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,dslmngr))

easy-soc-libs/Config.in

@@ -1,23 +0,0 @@
-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
-
-config LIBDSL_TEST
-	depends on PACKAGE_libdsl
-	bool "Libdsl test program"
-	default n
-endmenu
-endif

easy-soc-libs/Makefile

@@ -1,159 +0,0 @@
-#
-# Copyright (C) 2018 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-soc-libs
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=359524ddd8a17df39c70c5ba39e723e9641d5956
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-endif
-
-PKG_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)
-  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
-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 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-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_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-  TARGET_CFLAGS +=-DIOPSYS_INTEL
-else
-  $(info Unexpected CONFIG_TARGET)
-endif
-
-export TARGET_PLATFORM
-
-ifdef CONFIG_IOP_LLA_LIBS_DEBUG
-  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
-endif
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
-endef
-
-subdirs := \
-	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
-	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
-	-I$(STAGING_DIR)/usr/include/libnl3
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)" \
-	PLATFORM="$(TARGET_PLATFORM)" \
-	subdirs="$(subdirs)"
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/easy-soc-libs/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Build/InstallDev/libwifi
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(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/Compile
-	$(call Build/Compile/Default)
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endif
-endef
-
-define Build/InstallDev
-	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
-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
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
-endef
-
-$(eval $(call BuildPackage,libwifi))
-$(eval $(call BuildPackage,libdsl))
-$(eval $(call BuildPackage,libethernet))

endptmngr/Config.in

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

endptmngr/Makefile

@@ -8,54 +8,32 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=44e2472e8c08bef01fab27e8e908d5672f7af136
-
-
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
-PKG_NAME:=endptmngr-open
-else
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
+PKG_VERSION:=0.1
+PKG_SOURCE_URL:=git@private.inteno.se:endptmngr
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_VERSION:=9b5b12a3b84eea84dd0d412fb7668bca22945d80
 PKG_NAME:=endptmngr
-endif
 
 RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/endptmngr/config
-	source "$(SOURCE)/Config.in"
-endef
-
 define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
+  DEPENDS:= +libubox +ubus +libpicoevent
 endef
 
 define Package/endptmngr/description
 	endptmngr
 endef
 
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-
-define Build/Compile
-endef
-
-endif
-
-
 define Package/endptmngr/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d/

endptmngr/files/dect.config

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

eventlog/Makefile

@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2009-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=eventlog
+PKG_VERSION:=0.2.9
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/eventlog/0.2/
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=76e3d7a0b8f335c12099e9b91191fbf1
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libeventlog
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A new API to format and send structured log messages.
+endef
+
+define Package/eventlog/description
+  A new API to format and send structured log messages. It supports multiple message
+  representations (plain, XML attributes and XML tags) and multiple output methods
+  (local syslogd).
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/eventlog $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/eventlog.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libeventlog/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libeventlog))

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@dev.iopsys.eu:3rdparty/gigaset-elements.git
+PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
 PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
 
 PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)

gryphon-led-module/Makefile

@@ -1,62 +0,0 @@
-# Copyright (c) 2017 Genexis B.V.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=gryphon-led-kernel-module
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/$(PKG_NAME)
-  SUBMENU:=LED modules
-  TITLE:=LED driver for Gryphon
-  FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
-  AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  PKG_LICENSE:=Genexis
-  PKG_LICENSE_URL:=
-endef
-
-define KernelPackage/$(PKG_NAME)/description
-  This package contains the LED driver for Gryphon devices.
-endef
-
-EXTRA_KCONFIG:= CONFIG_RGB_LED=m
-
-MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
-	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
-	$(CP) src/* $(PKG_BUILD_DIR)
-endef
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		SUBDIRS="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="-DKERNEL_MODULE $(BUILDFLAGS) -I$(LINUX_DIR)/include -include generated/autoconf.h $(MODULE_INCLUDE)" \
-		modules
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-endef
-
-$(eval $(call KernelPackage,$(PKG_NAME)))

gryphon-led-module/src/Makefile

@@ -1,26 +0,0 @@
-# Copyright (c) 2017 Genexis B.V.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-MODULE_NAME  = gryphon-led-kernel-module
-
-obj-m  := $(MODULE_NAME).o
-
-GENEXIS_FILES= \
-	main.o \
-	sk9822.o \
-	sk9822_bitbang.o
-
-$(MODULE_NAME)-objs := $(GENEXIS_FILES)

gryphon-led-module/src/main.c

@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#define DEBUG 1
-
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/printk.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/gpio/consumer.h>
-#include <linux/of.h>
-#include <linux/version.h>
-
-#include "sk9822.h"
-
-#define DRIVER_NAME			"canyon_led"
-#define DRIVER_AUTHOR		"Genexis B.V."
-#define DRIVER_DESC			"Canyon LED driver for SK9822"
-#define DRIVER_VERSION	"1"
-
-/**
- * sysfs interfaces
- */
-
-static ssize_t get_led_color(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	/* [ln] todo: dummy implementation */
-	int len;
-
-	len = sprintf(buf, "%d\n", 123);
-	if (len <= 0) {
-		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-	}
-
-	return len;
-}
-
-/**
- * @brief Set complete LED strip to a specific color
- * @retval count number of bytes written
- * @retval -EMSGSIZE if the message is too big
- * @retval -EIO for all other errors (e.g. leds cannot be configured)
- */
-static ssize_t set_led_color(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
-{
-	int ret = 0;
-	size_t buflen = count;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	/* strip newline */
-	if ((count > 0) && (buf[count-1] == '\n')) {
-		buflen--;
-	}
-
-	if (buflen != 6) { // RRGGBB\0
-		return -EMSGSIZE;
-	}
-
-	// Update the LED array here
-	printk(KERN_DEBUG "Set LED color\n");
-	ret = sk9822_set_color_str(sk9822, buf);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to set led color\n");
-		return -EIO;
-	}
-
-	// Now push to the HW
-	ret = sk9822_update(sk9822);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to update led\n");
-		return -EIO;
-	}
-
-	return count;
-}
-static DEVICE_ATTR(led_color, S_IRUGO | S_IWUSR, get_led_color, set_led_color);
-
-static struct attribute *sk9822_dev_attrs[] = {
-	 &dev_attr_led_color.attr,
-	 NULL
-};
-
-static struct attribute_group sk9822_dev_attr_group = {
-	.name = "sk9822",
-	.attrs = sk9822_dev_attrs,
-};
-
-/**
- * device prope and removal
- */
-
-static int canyon_led_probe(struct platform_device *pdev)
-{
-	int ret;
-	struct sk9822_leds *leds;
-
-	printk(KERN_NOTICE "Begin probing...\n");
-
-	leds = devm_kzalloc(&pdev->dev, sizeof(*leds), GFP_KERNEL);
-	if (!leds) {
-		return -ENOMEM;
-	}
-	leds->dev = &pdev->dev;
-	leds->led_brightness = SK9822_DEFAULT_BRIGHTNESS;
-
-	ret = of_property_read_u16(pdev->dev.of_node, "led-count", &leds->led_count);
-	if (ret < 0) {
-		dev_warn(&pdev->dev, "Could not read led-count property\n");
-		leds->led_count = SK9822_DEFAULT_NUM_LEDS;
-	}
-
-	leds->led_colors = devm_kzalloc(&pdev->dev,
-			(sizeof(cRGB) * leds->led_count), GFP_KERNEL);
-	if (!leds->led_colors) {
-		return -ENOMEM;
-	}
-
-
-	platform_set_drvdata(pdev, leds);
-
-	printk(KERN_INFO "Allocated memory\n");
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
-	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
-	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
-#else
-	dev_warn(&pdev->dev, "Kernel version Not supported\n");
-	exit(1);
-#endif
-
-	gpiod_direction_output(leds->clock_gpio, 1);
-	if (IS_ERR(leds->clock_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
-				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
-		return PTR_ERR(leds->clock_gpio);
-	} else {
-		printk(KERN_INFO "Got clock gpio\n");
-		gpiod_set_value(leds->clock_gpio, 0);
-	}
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
-	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
-	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
-#else
-	dev_warn(&pdev->dev, "Kernel version Not supported\n");
-	exit(1);
-#endif
-
-	gpiod_direction_output(leds->data_gpio, 1);
-	if (IS_ERR(leds->data_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
-				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
-		return PTR_ERR(leds->data_gpio);
-	} else {
-		printk(KERN_INFO "Got data gpio\n");
-		gpiod_set_value(leds->data_gpio, 0);
-	}
-
-	printk(KERN_INFO "Attempt to set filefs stuff\n");
-	ret = sysfs_create_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
-	if (ret) {
-		dev_err(&pdev->dev, "sysfs creation failed\n");
-		return ret;
-	}
-
-	printk(KERN_INFO "Flash LEDs to verify they work\n");
-	sk9822_set_color_str(leds, "00FF00");
-	sk9822_update(leds);
-	msleep(200);
-	sk9822_set_color_str(leds, "000000");
-	sk9822_update(leds);
-
-	printk(KERN_NOTICE "We made it, carry on...\n");
-
-	return 0;
-}
-
-static int canyon_led_remove(struct platform_device *pdev)
-{
-	struct sk9822_leds *leds;
-
-	sysfs_remove_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
-
-	leds = platform_get_drvdata(pdev);
-	if (IS_ERR(leds)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -1;
-	}
-
-	if (leds->clock_gpio) {
-		gpiod_put(leds->clock_gpio);
-	}
-
-	if (leds->data_gpio) {
-		gpiod_put(leds->data_gpio);
-	}
-
-	printk(KERN_NOTICE "Bye, bye\n");
-
-	return 0;
-}
-
-/**
- * platform driver metadata
- */
-
-static const struct of_device_id canyon_led_of_ids[] = {
-	{ .compatible = "canyon,led" },
-	{ }
-};
-
-static struct platform_driver canyon_led = {
-	.probe = &canyon_led_probe,
-	.remove = &canyon_led_remove,
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-		.of_match_table = canyon_led_of_ids,
-	},
-};
-
-MODULE_DEVICE_TABLE(of, canyon_led_of_ids);
-module_platform_driver(canyon_led);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");

gryphon-led-module/src/sk9822.c

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-#include "sk9822.h"
-#include "sk9822_bitbang.h"
-
-cRGB __hexs_to_rgb(const char *hex)
-{
-	cRGB rgb;
-	int r, g, b;
-
-	sscanf(hex, "%02x%02x%02x", &r, &g, &b);
-	// This needs sanity checking
-	rgb.r = r;
-	rgb.g = g;
-	rgb.b = b;
-	return rgb;
-}
-
-/**
- * @brief update the color over the given device struct to the provided HEX color
- */
-int sk9822_set_color_str(struct sk9822_leds *sk9822, const char *hex)
-{
-	int i;
-	cRGB color = __hexs_to_rgb(hex);
-
-	for (i = 0; i < sk9822->led_count; i++) {
-		sk9822->led_colors[i] = color;
-	}
-
-	return 0;
-}
-
-/**
- * @brief write device struct to the device
- */
-int sk9822_update(struct sk9822_leds *sk9822)
-{
-	uint16_t i;
-	uint8_t *rawarray = (uint8_t *)sk9822->led_colors;
-	uint16_t led_count = sk9822->led_count;
-
-	sk9822_bb_write(sk9822, 0x00);  // Start Frame
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-
-	for (i = 0; i < (led_count*3); i += 3) {
-		sk9822_bb_write(sk9822, 0xe0+sk9822->led_brightness);  // Maximum global brightness
-		sk9822_bb_write(sk9822, rawarray[i+0]);
-		sk9822_bb_write(sk9822, rawarray[i+1]);
-		sk9822_bb_write(sk9822, rawarray[i+2]);
-	}
-
-	// Reset frame - Only needed for SK9822, has no effect on APA102
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-
-	// End frame: 8+8*(leds >> 4) clock cycles
-	for (i = 0; i < led_count; i += 16) {
-		sk9822_bb_write(sk9822, 0xff);  // 8 more clock cycles
-	}
-
-	return 0;
-}

gryphon-led-module/src/sk9822.h

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef SK9822_H_
-#define SK9822_H_
-
-#include <linux/types.h>
-
-#define SK9822_DEFAULT_NUM_LEDS 32 // U16, used if DT param fails
-#define SK9822_DEFAULT_BRIGHTNESS 31  // 5-bit brightness, 0-31
-
-typedef struct {
-	uint8_t b;
-	uint8_t g;
-	uint8_t r;
-} cRGB;   // BGR (SK9822 Standard)
-
-struct sk9822_leds {
-	struct device *dev;
-	struct gpio_desc *clock_gpio;
-	struct gpio_desc *data_gpio;
-
-	cRGB *led_colors;
-	uint8_t led_brightness;
-	uint16_t led_count;
-};
-
-int sk9822_set_color_str(struct sk9822_leds *sk9822, const char *hex);
-int sk9822_update(struct sk9822_leds *sk9822);
-
-#endif /* SK9822_H_ */

gryphon-led-module/src/sk9822_bitbang.c

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <linux/gpio/consumer.h>
-#include <linux/delay.h>
-#include <linux/types.h>
-
-#include "sk9822.h"
-
-/**
- * @brief Bitbang write operation CLOCK+DATA
- *
- * Assumed state before call: CLOCK- Low, DATA- High
- */
-void sk9822_bb_write(struct sk9822_leds *sk9822, uint8_t c)
-{
-	uint8_t i;
-
-	for (i = 0; i < 8 ; i++) {
-		if (!(c&0x80)) {
-			gpiod_set_value(sk9822->data_gpio, 0); // set data low
-		} else {
-			gpiod_set_value(sk9822->data_gpio, 1); // set data high
-		}
-
-		gpiod_set_value(sk9822->clock_gpio, 1); // set clock high, data sampled here
-		c <<= 1;
-		udelay(1); // stretch clock
-		gpiod_set_value(sk9822->clock_gpio, 0); // set clock low
-	}
-
-	// State after call: SCK Low, Data high
-}

gryphon-led-module/src/sk9822_bitbang.h

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef _SK9822_BB_H_
-#define _SK9822_BB_H_
-
-#include <linux/types.h>
-
-#include "sk9822.h"
-
-void sk9822_bb_write(struct sk9822_leds *sk9822, uint8_t c);
-
-#endif /* _SK9822_BB_H_ */

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.3.6
-PKG_RELEASE:=
+BASE_PKG_VERSION:=5.0.2
+PKG_RELEASE:=RC1
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=94aab1532fef2caf2d65579614fc413252a517eb
+PKG_SOURCE_VERSION:=c3c5b290f57ab40367a31c130766849c9c41ebf8
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
@@ -132,12 +132,12 @@ endef
 
 ifeq ($(CONFIG_ICE_OPEN),y)
 define Package/ice-client/install
-	#$(INSTALL_DIR) $(1)/bin
-	#$(INSTALL_DIR) $(1)/etc
-	#$(INSTALL_DIR) $(1)/usr
-	#$(CP) $(PKG_BUILD_DIR)/bin/* $(1)/bin/
-	#$(CP) $(PKG_BUILD_DIR)/etc/* $(1)/etc/
-	#$(CP) $(PKG_BUILD_DIR)/usr/* $(1)/usr/
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/usr
+	$(CP) $(PKG_BUILD_DIR)/bin/* $(1)/bin/
+	$(CP) $(PKG_BUILD_DIR)/etc/* $(1)/etc/
+	$(CP) $(PKG_BUILD_DIR)/usr/* $(1)/usr/
 endef
 else
 define Package/ice-client/install

ice-client/files/ice-client.uci_default

@@ -7,9 +7,6 @@ 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 del_list passwords.ice._access_w=root
-uci -q add_list passwords.ice._access_w=root
-uci -q del_list passwords.ice._access_r=root
 uci -q add_list passwords.ice._access_r=root
 uci -q commit passwords
 
@@ -19,7 +16,7 @@ cat >> /etc/config/rpcd << EOF
 config login
 	option username 'ice'
 	option password '\$p\$ice'
-	list _access_w 'none'
+	list _access_r 'none'
 	list write 'user-user'
 	list write 'juci-broadcom-dsl'
 	list write 'juci-broadcom-dsl-admin'
@@ -66,9 +63,5 @@ 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,9 +27,5 @@ 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/Config_datamodel.in

@@ -1,4 +1,14 @@
 if PACKAGE_libdatamodel
+choice
+	prompt "Select Data Model"
+	default tr098
+
+config DATAMODEL_TR098
+	bool "TR-098"
+
+config DATAMODEL_TR181
+	bool "TR-181"
+endchoice
 
 config UPNP_TR064
 	bool "Compile with tr064 features"

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-04-01
+PKG_VERSION:=4.0-2017-12-22
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=434174439789e7e78e30063d6cf472f381e5b5f1
+PKG_SOURCE_VERSION:=30f47f79ef7d21e89a856f444f6f86ab9175d1ed
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -37,26 +37,6 @@ 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_udpechoserver
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 udpechoserver feature
-	DEPENDS:=+libuci
-endef
 
 define Package/icwmp/Default
   SECTION:=utils
@@ -98,12 +78,10 @@ define Build/Prepare
 endef
 endif
 
-ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+ifeq ($(CONFIG_TARGET_IBOARDID),"EX400")
 TARGET_CFLAGS += -DEX400
 endif
 
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
@@ -133,7 +111,9 @@ ifeq ($(CONFIG_XMPP_ENABLE),y)
 CONFIGURE_ARGS += \
 	--enable-xmpp
 endif
-	
+
+CONFIGURE_ARGS += $(if $(CONFIG_DATAMODEL_TR181),--enable-datamodel=tr181,--enable-datamodel=tr098)
+
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \
@@ -189,34 +169,6 @@ ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
 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 Package/icwmp_udpechoserver/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
 endef
 
 define Build/InstallDev
@@ -252,7 +204,4 @@ endef
 
 $(eval $(call BuildPackage,icwmp-curl))
 $(eval $(call BuildPackage,libdatamodel))
-$(eval $(call BuildPackage,icwmp_stun))
-$(eval $(call BuildPackage,icwmp_xmpp))
-$(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp-zstream))

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

@@ -1,87 +0,0 @@
-#!/bin/sh
-
-. /lib/functions/network.sh
-
-[ "$ACTION" == "ifup" ] || exit 0
-
-[ -f /etc/config/cwmp ] || exit 0
-
-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
-
-	local proto="$(uci -q get network.$INTERFACE.proto)"
-	[ "$proto" == "none" ] && exit 0
-
-	local ifname="$(uci -q get network.$INTERFACE.ifname)"
-	[ "${ifname:0:1}" == "@" ] && exit 0
-
-	mkdir -p /tmp/ipv4
-
-	network_flush_cache
-
-	local previpaddr=""
-	local curipaddr=""
-	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
-	previpaddr=$(cat $ipaddrfile 2>/dev/null)
-	network_get_ipaddr curipaddr $INTERFACE
-	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
-
-	local prevgateway=""
-	local curgateway=""
-	local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
-	prevgateway=$(cat $gatewayfile 2>/dev/null)
-	network_get_gateway curgateway $INTERFACE
-	[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
-
-	local prevsubnets=""
-	local cursubnets=""
-	local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
-	prevsubnets=$(cat $subnetsfile 2>/dev/null)
-	network_get_subnets cursubnets $INTERFACE
-	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
-
-	local prevdnsservers=""
-	local curdnsservers=""
-	local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
-	prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
-	network_get_dnsserver curdnsservers $INTERFACE
-	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
-
-	local prevdev=""
-	local curdev=""
-	local devfile=/tmp/ipv4/$INTERFACE-dev
-	prevdev=$(cat $devfile 2>/dev/null)
-	network_get_device curdev $INTERFACE
-	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
-
-	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" \
-	] && {
-		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
-		[ -z "$prevopt43url" ] && exit 0
-	}
-
-	/etc/init.d/icwmpd reload &
-}
-
-handle_icwmp_restart

icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_cwmp_reqopts() {
-	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local wan=$(uci -q get cwmp.cpe.default_wan_interface)
-	local dhcp_discovery=$(uci -q get cwmp.acs.dhcp_discovery)
-	local discovery=0
-	case $dhcp_discovery in
-		enable|1) discovery=1 ;;
-	esac
-
-	local newreqopts=
-	local baseopts=
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local tropts="43"
-	local oldreqopts="$reqopts"
-	local ropt iopt
-	for ropt in $reqopts; do
-		case $ropt in
-			43) ;;
-			*) baseopts="$baseopts $ropt" ;;
-		esac
-	done
-	ropt=""
-	reqopts="$baseopts $tropts"
-	for ropt in $reqopts; do
-		case $ropt in
-			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
-			*) newreqopts="$newreqopts $ropt" ;;
-		esac
-	done
-	if [ "$proto" == "dhcp" ]; then
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		[ "$newreqopts" == "$oldreqopts" ] && return
-		uci -q set network.$wan.reqopts="$newreqopts"
-		uci commit network
-	fi
-}
-
-set_cwmp_reqopts

icwmp/files/icwmp.hotplug

@@ -0,0 +1,48 @@
+#!/bin/sh
+
+. /lib/functions/network.sh
+
+[ "$ACTION" == "ifup" ] || exit 0
+
+[ -f /etc/config/cwmp ] || exit 0
+
+handle_icwmp_reload() {
+	local islan="$(uci -q get network.$INTERFACE.is_lan)"
+	[ "$islan" == "1" ] && exit 0
+
+	local proto="$(uci -q get network.$INTERFACE.proto)"
+	[ "$proto" == "none" ] && exit 0
+
+	local ifname="$(uci -q get network.$INTERFACE.ifname)"
+	[ "${ifname:0:1}" == "@" ] && exit 0
+
+	mkdir -p /tmp/ipv4
+
+	local previpaddr=""
+	local curipaddr=""
+	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
+	previpaddr=$(cat $ipaddrfile 2>/dev/null)
+	network_get_ipaddr curipaddr $INTERFACE
+	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+
+	local prevgateway=""
+	local curgateway=""
+	local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
+	prevgateway=$(cat $gatewayfile 2>/dev/null)
+	network_get_gateway curgateway $INTERFACE
+	[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
+
+	local prevsubnets=""
+	local cursubnets=""
+	local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
+	prevsubnets=$(cat $subnetsfile 2>/dev/null)
+	network_get_subnets cursubnets $INTERFACE
+	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
+
+	[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" ] && exit 0
+
+	/etc/init.d/icwmpd reload &
+}
+
+handle_icwmp_reload
+

ifbt/Makefile

@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifbt
-PKG_VERSION:=0.1
-
-PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
-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
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-TARGET_PLATFORM:=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_INTEL
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_PLATFORM:=-DIOPSYS_MEDIATEK
-else
-$(info (UNEXPECTED CONFIG TARGET))
-endif
-
-export TARGET_PLATFORM
-
-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

@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2018 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=imonitor
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_SOURCE_PROTO=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/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>
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/imonitor
-	CATEGORY:=Utilities
-	TITLE:=Inteno process supervisor
-	DEPENDS:=+ubox +uci +ubus +rpcd +rpcd-mod-file
-endef
-
-define Package/imonitor/description
-	imonitor is a process supervisor or a process control system similar to the Supervisor (http://supervisord.org/)
-endef
-
-define Package/imonitor/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/imonitor $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-endef
-
-$(eval $(call BuildPackage,imonitor))

imonitor/files/etc/config/imonitor

@@ -1,9 +0,0 @@
-config monitor
-	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'
-

imonitor/files/etc/init.d/imonitor

@@ -1,29 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Start the imonitor
-#
-
-START=99
-STOP=01
-
-USE_PROCD=1
-NAME=imonitor
-
-start_service() {
-	procd_open_instance
-	procd_set_param command "imonitor"
-	procd_set_param stdout 1
-        procd_set_param stderr 1
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop() {
-	service_stop imonitor
-}
-
-reload_service() {
-	stop
-	start
-}
-

inbd/Makefile

@@ -12,9 +12,9 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
+PKG_SOURCE_VERSION:=f81c146f0b07540877545e5ab644ec8e29905a4d
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
+PKG_SOURCE_URL:=http://public.inteno.se/inbd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

inteno-netmodes/Makefile

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

inteno-netmodes/files/etc/config/netmode

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

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

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+[ "$INTERFACE" != "wan" ] && exit
+
+. /lib/functions.sh
+include /lib/network
+
+network_get_ipaddr ipaddr $INTERFACE
+[ -z "$ipaddr" ] && exit
+
+repeaterready="$(uci -q get netmode.setup.repeaterready)"
+curmode="$(uci -q get netmode.setup.curmode)"
+
+if [ "$(get_ip_type $ipaddr)" == "private" ]; 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
+	ip addr flush dev br-lan
+
+	# flush iptables in case the MASTER
+	# tries to configure us before
+	# firewall is disabled the proper way
+	iptables -F
+
+	disable_firewall 1
+else
+	disable_firewall 0
+fi
+
+case "$curmode" in
+		repeater*)
+		;;
+		*)
+			[ "$repeaterready" == "1" ] || return
+			if [ "$(get_ip_type $ipaddr)" == "private" ]; then
+				wificontrol_takes_over || switch_netmode repeater
+			else
+				switch_netmode router
+			fi
+		;;
+esac
+

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

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 . /lib/functions.sh
-. /lib/functions/netmode.sh
+include /lib/network
 
 ps | grep hotplug | grep button && exit
 
@@ -13,10 +13,7 @@ case "$(uci get netmode.setup.curmode)" in
 		repeater*)
 		;;
 		*)
-			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
-			}
+			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
 			exit
 		;;
 esac

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

@@ -6,13 +6,13 @@ USE_PROCD=1
 NETMODED="/sbin/netmoded"
 
 . /lib/functions.sh
-. /lib/functions/netmode.sh
+include /lib/network
 
 start_netmoded() {
 	procd_open_instance
 	procd_set_param command $NETMODED
 
-	procd_append_param command --verbose warning
+	procd_append_param command --verbose debug
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 

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

@@ -11,8 +11,7 @@
 	"excluded_boards" : [
 		"CG300",
 		"CG301",
-		"EX400",
-		"SDX810-AP"
+		"EX400"
 	],
 	"acl" : [
 		"admin",

inteno-netmodes/files/etc/netmodes/bridged/network

@@ -0,0 +1,37 @@
+
+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 atm1.1 $WAN.100 $LAN4'
+	option defaultroute '0'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname '@wan'
+

inteno-netmodes/files/etc/netmodes/bridged/wireless

@@ -18,7 +18,7 @@ config wifi-device 'wl0'
 	option bandwidth '80'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '60'
+	option scantimer '15'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -42,7 +42,7 @@ config wifi-iface
 	option device 'wl0'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'iopsys-$BSSID4'
+	option ssid 'Inteno-$BSSID4'
 	option encryption 'psk2'
 	option cipher 'auto'
 	option key '$WPAKEY'
@@ -51,7 +51,6 @@ config wifi-iface
 	option wps_pbc '1'
 	option wmf_bss_enable '1'
 	option bss_max '32'
-	option ifname 'wl0'
 
 config wifi-device 'wl1'
 	option type 'broadcom'
@@ -60,7 +59,7 @@ config wifi-device 'wl1'
 	option bandwidth '20'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '60'
+	option scantimer '15'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -82,7 +81,7 @@ config wifi-iface
 	option device 'wl1'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'iopsys-$BSSID4'
+	option ssid 'Inteno-$BSSID4'
 	option encryption 'mixed-psk'
 	option cipher 'auto'
 	option key '$WPAKEY'
@@ -91,5 +90,4 @@ config wifi-iface
 	option wps_pbc '1'
 	option wmf_bss_enable '1'
 	option bss_max '32'
-	option ifname 'wl1'
 

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

@@ -0,0 +1,22 @@
+{
+	"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*"
+	],
+	"acl" : [
+		"admin",
+		"support"
+	]
+}
+

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

@@ -0,0 +1,117 @@
+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

@@ -0,0 +1,18 @@
+
+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

@@ -18,8 +18,8 @@ config interface 'lan'
 config interface 'wan'
 	option type 'anywan'
 	option proto 'dhcp'
-	option hostname 'iopsys-$MAC'
-	option vendorid '$HARDWAREID'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
 	option ifname 'ptm0.1 atm0.1 $WAN.1'
 	option ipv6 '1'
 
@@ -28,39 +28,18 @@ config interface 'iptv'
 	option proto 'dhcp'
 	option gateway '0.0.0.0'
 	option reqopts 'staticroutes'
-	option ifname 'ptm0.100 $WAN.100 $LAN4'
+	option ifname 'ptm0.100 atm1.1 $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 atm2.1 $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'
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/wireless

@@ -18,7 +18,7 @@ config wifi-device 'wl0'
 	option bandwidth '80'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '60'
+	option scantimer '15'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -42,7 +42,7 @@ config wifi-iface
 	option device 'wl0'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'iopsys-$BSSID4'
+	option ssid 'Inteno-$BSSID4'
 	option encryption 'psk2'
 	option cipher 'auto'
 	option key '$WPAKEY'
@@ -51,7 +51,6 @@ config wifi-iface
 	option wps_pbc '1'
 	option wmf_bss_enable '1'
 	option bss_max '32'
-	option ifname 'wl0'
 
 config wifi-device 'wl1'
 	option type 'broadcom'
@@ -60,7 +59,7 @@ config wifi-device 'wl1'
 	option bandwidth '20'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '60'
+	option scantimer '15'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -82,7 +81,7 @@ config wifi-iface
 	option device 'wl1'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'iopsys-$BSSID4'
+	option ssid 'Inteno-$BSSID4'
 	option encryption 'mixed-psk'
 	option cipher 'auto'
 	option key '$WPAKEY'
@@ -91,5 +90,4 @@ config wifi-iface
 	option wps_pbc '1'
 	option wmf_bss_enable '1'
 	option bss_max '32'
-	option ifname 'wl1'
 

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/DETAILS

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

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_ethernet

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

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network

@@ -0,0 +1,15 @@
+
+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'
+

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

@@ -0,0 +1,93 @@
+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 autoconf '1'
+
+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'
+

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/DETAILS

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

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_ethernet

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

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network

@@ -0,0 +1,15 @@
+
+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'
+

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

@@ -0,0 +1,108 @@
+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 autoconf '1'
+
+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 autoconf '1'
+

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/DETAILS

@@ -0,0 +1,17 @@
+{
+	"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/network

@@ -7,21 +7,18 @@ config interface 'loopback'
 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 'iopsys-$MAC'
+	option hostname 'Inteno-$BSSID4'
 	option reqopts '66 67 128 224'
 	option igmp_snooping '0'
-	option macaddr '$MACWAN'
 
 config device 'wan_dev'
 	option name 'eth0.2'
 	option macaddr '$MACWAN'
-	option vid 2
 
 config interface 'wan6'
 	option ifname '@wan'
@@ -40,5 +37,5 @@ config switch_vlan
 config switch_vlan
 	option device 'switch0'
 	option vlan '2'
-	option ports '0 6t'
+	option ports '0 5t'
 

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/wireless

@@ -0,0 +1,59 @@
+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/DETAILS

@@ -12,7 +12,6 @@
 		"F*"
 	],
 	"uplink_band" : 'a',
-	"downlink_band" : 'a b',
 	"credentials" : 1,
 	"reboot" : 0
 }

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/network

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

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/wireless

@@ -23,7 +23,7 @@ config wifi-iface
 	option device   ra0
 	option network  wan
 	option mode     ap
-	option ssid     iopsys-$BSSID4
+	option ssid     Inteno-$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     iopsys-$BSSID4
+	option ssid     Inteno-$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     iopsys-$BSSID4
+	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	apclii0

inteno-netmodes/files/etc/netmodes/routed_brcm/DETAILS

@@ -8,8 +8,7 @@
 		{ "sv" : "" }
 	],
 	"excluded_boards" : [
-		"EX4*",
-		"SDX810-AP"
+		"EX4*"
 	],
 	"credentials" : 0
 }

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_adsl

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

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_ethernet

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

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vdsl

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

inteno-netmodes/files/etc/netmodes/routed_brcm/network

@@ -18,8 +18,8 @@ config interface 'lan'
 config interface 'wan'
 	option type 'anywan'
 	option proto 'dhcp'
-	option hostname 'iopsys-$MAC'
-	option vendorid '$HARDWAREID'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
 	option ifname 'ptm0.1 atm0.1 $WAN.1'
 	option ipv6 '1'
 
@@ -27,18 +27,3 @@ 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'
-

inteno-netmodes/files/etc/netmodes/routed_brcm/wireless

@@ -0,0 +1,93 @@
+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'
+
+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'
+

inteno-netmodes/files/etc/netmodes/routed_mtk/dhcp

@@ -0,0 +1,22 @@
+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
+

inteno-netmodes/files/etc/netmodes/routed_mtk/network

@@ -11,24 +11,20 @@ config interface 'lan'
 	option ipaddr '192.168.1.1'
 	option netmask '255.255.255.0'
 	option ip6assign '60'
-	option ifname 'eth0.1'
+	option ifname 'eth0.1 ra0 rai0'
 
 config device 'lan_dev'
 	option name 'eth0.1'
 	option macaddr '$MACLAN'
-	option vid 1
 
 config interface 'wan'
 	option ifname 'eth0.2'
 	option proto 'dhcp'
-	option hostname 'iopsys-$MAC'
-	option vendorid '$HARDWAREID'
 	option reqopts '66 67 128 224'
 
 config device 'wan_dev'
 	option name 'eth0.2'
 	option macaddr '$MACWAN'
-	option vid 2
 
 config interface 'wan6'
 	option ifname '@wan'
@@ -47,5 +43,5 @@ config switch_vlan
 config switch_vlan
 	option device 'switch0'
 	option vlan '2'
-	option ports '0 6t'
+	option ports '0 5t'
 

inteno-netmodes/files/etc/netmodes/routed_mtk/wireless

@@ -18,17 +18,15 @@ config wifi-device  ra0
 	option hwmode   auto
 	option htmode   HT20
 	option country 'DE'
-	option scantimer '60'
 
 config wifi-iface
 	option device   ra0
 	option network  lan
 	option mode     ap
-	option ssid     iopsys-$BSSID4
+	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option wps_pbc	1
-	option ifname	ra0
 
 config wifi-device  rai0
 	option band a
@@ -38,15 +36,13 @@ config wifi-device  rai0
 	option htmode   VHT80
 	option country 'DE'
 	option beamforming 1
-	option scantimer '60'
 
 config wifi-iface
 	option device   rai0
 	option network  lan
 	option mode     ap
-	option ssid     iopsys-$BSSID4
+	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option wps_pbc	1
-	option ifname	rai0
 

inteno-netmodes/files/lib/network/netmode.sh

@@ -1,18 +1,18 @@
 #!/bin/sh
 
 . /lib/functions.sh
+. /lib/functions/network.sh
 . /usr/share/libubox/jshn.sh
 
-NMTMPDIR=/var/netmodes
+TMPDIR=/var/netmodes
 OLD_MODE_FILE=/var/netmodes/old_mode
 SWITCHMODELOCK="/tmp/switching_mode"
 MODEDIR=$(uci -q get netmode.setup.dir)
-MTK=0
-
-opkg list-installed | grep -q kmod-mt.*mtk && MTK=1
-
 [ -n "$MODEDIR" ] || MODEDIR="/etc/netmodes"
 
+network_get_ipaddr ip $INTERFACE
+repeaterready="$(uci -q get netmode.setup.repeaterready)"
+
 toggle_firewall() {
 	local section=$1
 	local disable=$2
@@ -34,7 +34,7 @@ disable_firewall() {
 	/etc/init.d/firewall reload
 }
 
-is_known_macaddr()
+is_inteno_macaddr()
 {
 	macaddr=$1
 
@@ -52,17 +52,15 @@ is_known_macaddr()
 }
 
 get_wifi_wet_interface() {
-	local ifname=""
 	handle_interface() {
-		[ -n "$ifname" ] && return
 		config_get mode "$1" mode
-		if [ "$mode" == "sta" -o "$mode" == "wet" ]; then
+		if [ "$mode" == "sta" -o "$mode" == "wet" ] ; then
 			config_get ifname "$1" ifname
+			echo "$ifname"
 		fi
 	}
 	config_load wireless
 	config_foreach handle_interface wifi-iface
-	echo "$ifname"
 }
 
 get_wifi_iface_cfgstr() {
@@ -76,58 +74,30 @@ get_wifi_iface_cfgstr() {
 
 correct_uplink() {
 	local IFACE="$1"
-	local WANDEV="$(db -q get hw.board.ethernetWanPort)"
-	local WETIF="$(get_wifi_wet_interface)"
-	local link wetcfg wetnet wetmac
+	local MTK=0
+	local WANDEV="$(db -q get hw.board.ethernetWanPort).1"
+	local link wetif
 
-	[ $MTK -eq 1 ] || WANDEV="$WANDEV.1"
+	[ "$(db -q get hw.board.hardware)" == "EX400" ] && MTK=1
+	[ $MTK -eq 1 ] && WANDEV="eth0.2"
 
-	[ -n "$IFACE" -a "$IFACE" != "$WANDEV" -a "$IFACE" != "$WETIF" ] && return
+	[ -n "$IFACE" -a "$IFACE" != "$WANDEV" ] && return
 
 	link=$(cat /sys/class/net/${WANDEV:0:4}/operstate)
 	[ $MTK -eq 1 ] && link=$(swconfig dev switch0 port 0 get link | awk '{print$2}' | cut -d':' -f2)
 
-	if [ ! -f /tmp/netmodes/uplink-macaddr-corrected ]; then
-		wetcfg="$(get_wifi_iface_cfgstr $WETIF)"
-		wetnet="$(uci -q get $wetcfg.network)"
-		wetmac="$(ifconfig $WETIF | grep HWaddr | awk '{print$NF}')"
-		ethwanmac="$(ifconfig $WANDEV | grep HWaddr | awk '{print$NF}')"
-		if [ -d /sys/class/net/br-$wetnet ]; then
-			if [ "$link" == "up" ]; then
-				ifconfig br-$wetnet hw ether $ethwanmac
-			else
-				ifconfig br-$wetnet hw ether $wetmac
-			fi
-			#touch -f /tmp/netmodes/uplink-macaddr-corrected
-		fi
-	fi
+	wetif="$(get_wifi_wet_interface)"
 
 	if [ "$link" == "up" ]; then
-		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":true}"
-		ifconfig $WETIF down
-		echo ethernet > /tmp/netmodes/uplink_type
+		ubus call network.device set_state "{\"name\":\"$wetif\", \"defer\":true}"
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":false}"
 	else
-		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":false}"
-		ifconfig $WETIF up
-		echo wireless > /tmp/netmodes/uplink_type
+		ubus call network.device set_state "{\"name\":\"$wetif\", \"defer\":false}"
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
 		ubus call led.internet  set '{"state" : "notice"}'
 	fi
 }
 
-run_netmode_scripts() {
-	local mode=$1
-	local when=$2
-	local script
-	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
-		logger -s -p user.info -t $0 "[netmode] Executing $when netmode scripts" >/dev/console
-		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do
-			sh /etc/netmodes/$mode/scripts/$when/$script
-		done
-	fi
-}
-
 switch_netmode() {
 	local newmode="$1"
 
@@ -135,19 +105,16 @@ switch_netmode() {
 
 	[ -n "$newmode" ] && uci -q set netmode.setup.curmode="$newmode"
 
-	local curmode conf old_mode
+	local curmode conf repeaterready old_mode
 
 	# NETMODE CONFIG #
 	config_load netmode
 	config_get curmode setup curmode
 	uci -q set netmode.setup.repeaterready="0"
-
-	# set default JUCI page to overview
-	uci -q set juci.juci.homepage="overview"
-	uci commit juci
-
+	uci -q set netmode.setup.curmode='repeater'
 	if [ "$curmode" == "repeater" ]; then
-		if [ $MTK -eq 1 ]; then
+		local hw="$(db -q get hw.board.hardware)"
+		if [ "$hw" == "EX400" ]; then
 			curmode="repeater_mtk_5g_up_dual_down"
 		else
 			curmode="repeater_brcm_2g_up_dual_down"
@@ -155,7 +122,8 @@ switch_netmode() {
 		uci set netmode.setup.curmode="$curmode"
 	fi
 	if [ "$curmode" == "routed" ]; then
-		if [ $MTK -eq 1 ]; then
+		local hw="$(db -q get hw.board.hardware)"
+		if [ "$hw" == "EX400" ]; then
 			curmode="routed_mtk"
 		else
 			curmode="routed_brcm"
@@ -163,7 +131,7 @@ switch_netmode() {
 		uci set netmode.setup.curmode="$curmode"
 	fi
 	uci commit netmode
-	# end of NETMODE CONFIG #
+	# NETMODE CONFIG #
 
 	old_mode="$(cat $OLD_MODE_FILE 2>/dev/null)"
 
@@ -176,54 +144,41 @@ switch_netmode() {
         echo $curmode >$OLD_MODE_FILE
 
 	[ -d "/etc/netmodes/$curmode" ] || return
-
-	run_netmode_scripts $curmode "pre"
-
-	logger -s -p user.info -t $0 "[netmode] Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
-
-	for file in $(ls /etc/netmodes/$curmode/); do
-		case "$file" in
-			DETAILS|scripts) continue ;;
-		esac
-		cp /etc/netmodes/$curmode/$file /etc/config/
-	done
+	cp /etc/netmodes/$curmode/* /etc/config/
+	rm -f /etc/config/DETAILS
 	sync
 
-	#commit owsd to reload all init.d scripts dependent on its config
-	ubus call uci commit '{"config":"owsd"}'
-
 	local reboot=$(uci -q get netmode.$curmode.reboot)
 
-	if [ "$reboot" != "0" ]; then
-		run_netmode_scripts $curmode "post"
+	if [ "$reboot" == "1" ]; then
 		reboot &
 		exit
 	fi
 
 	/etc/init.d/environment reload
 	case "$curmode" in
+		routed*)
+			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
+			ubus call uci commit '{"config":"network"}'
+		;;
 		repeater*)
 			touch $SWITCHMODELOCK
-			logger -s -p user.info -t $0 "Switching to $curmode mode" > /dev/console
+			echo "Switching to $curmode mode" > /dev/console
 			ubus call leds set  '{"state" : "allflash"}'
 			[ -f /etc/init.d/omcproxy ] && /etc/init.d/omcproxy stop
-			[ -f /etc/init.d/igmpproxy ] && /etc/init.d/igmpproxy stop
 			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
 			ubus call network reload
 			wifi reload nodat
 			ubus call router.network reload
-			rm -f /tmp/netmodes/uplink-macaddr-corrected
 			correct_uplink
 			ubus call leds set  '{"state" : "normal"}'
 			rm -f $SWITCHMODELOCK
 		;;
-		*)
-			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
-			ubus call uci commit '{"config":"network"}'
-		;;
 	esac
 
-	run_netmode_scripts $curmode "post"
+	# set default JUCI page to overview
+	uci -q set juci.juci.homepage="overview"
+	uci commit juci
 }
 
 wificontrol_takes_over() {
@@ -257,18 +212,11 @@ wait_for_netmode_handler() {
 		sleep $tm
 	done
 }
-
-netmode_get_ip_type() {
-	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && {
-		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is private"
-		echo "private"
-	} || {
-		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is public"
-		echo "public"
-	}
+get_ip_type() {
+	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && echo "private" || echo "public"
 }
 
-get_device_of() {
+get_device() {
 	local PORT_NAMES=$(db get hw.board.ethernetPortNames)
 	local PORT_ORDER=$(db get hw.board.ethernetPortOrder)
         local cnt=1
@@ -306,10 +254,11 @@ populate_netmodes() {
 
 	config_get curmode setup curmode
 
-	mkdir -p $NMTMPDIR
+	mkdir -p $TMPDIR
 
 	if [ "$curmode" == "routed" ]; then
-		if [ $MTK -eq 1 ]; then
+		local hw="$(db -q get hw.board.hardware)"
+		if [ "$hw" == "EX400" ]; then
 			curmode="routed_mtk"
 		else
 			curmode="routed_brcm"
@@ -325,12 +274,12 @@ populate_netmodes() {
 	config_foreach delete_netmode netmode
 	uci commit netmode
 
-	wan=$(get_device_of WAN)
-	lan1=$(get_device_of LAN1)
-	lan2=$(get_device_of LAN2)
-	lan3=$(get_device_of LAN3)
-	lan4=$(get_device_of LAN4)
-	lan5=$(get_device_of LAN5)
+	wan=$(get_device WAN)
+	lan1=$(get_device LAN1)
+	lan2=$(get_device LAN2)
+	lan3=$(get_device LAN3)
+	lan4=$(get_device LAN4)
+	lan5=$(get_device LAN5)
 
 	for file in $(find $MODEDIR -type f); do
 		conf="$(echo $file | cut -d'/' -f5)"
@@ -386,10 +335,7 @@ populate_netmodes() {
 			if json_select acl; then
 				_i=1
 				while json_get_var user $_i; do
-					uci del_list netmode.$mode._access_r="$user"
-					uci del_list netmode.$mode._access_w="$user"
 					uci add_list netmode.$mode._access_r="$user"
-					uci add_list netmode.$mode._access_w="$user"
 					_i=$((_i+1))
 				done
 				json_select ..
@@ -431,26 +377,23 @@ populate_netmodes() {
 
 	config_get curmode setup curmode
 	[ -d /etc/netmodes/$curmode ] || {
-		[ $MTK -eq 1 ] && uci -q set netmode.setup.curmode="routed_mtk" || uci -q set netmode.setup.curmode="routed_brcm"
+		[ "$(db -q get hw.board.hardware)" == "EX400" ] && uci -q set netmode.setup.curmode="routed_mtk" || uci -q set netmode.setup.curmode="routed_brcm"
 	}
 
 	uci commit netmode
 }
 
 start_netmode_tools() {
-	local curmode repeaterready wificontrol discover
+	local curmode repeaterready
 
 	killall -9 wificontrol >/dev/null 2>&1
 	killall -9 netmode-discover >/dev/null 2>&1
 
 	config_load netmode
 	config_get_bool repeaterready setup repeaterready 0
-	config_get_bool wificontrol tools wificontrol 1
-	config_get_bool arp_discovery tools arp_discovery 1
 
 	[ $repeaterready -eq 1 ] && {
-		[ $arp_discovery -eq 1 ] && /sbin/netmode-discover &
-		[ $wificontrol -eq 1 ] && /sbin/wificontrol --repeater &
+		/sbin/wificontrol --repeater &
 		return
 	}
 
@@ -458,8 +401,8 @@ start_netmode_tools() {
 
 	case "$curmode" in
 		repeater*)
-			[ $arp_discovery -eq 1 ] && /sbin/netmode-discover &
-			[ $wificontrol -eq 1 ] && /sbin/wificontrol --repeater &
+			/sbin/netmode-discover &
+			/sbin/wificontrol --repeater &
 		;;
 	esac
 }

inteno-netmodes/files/sbin/netmode-client-detect

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

inteno-netmodes/files/sbin/netmode-conf

@@ -2,24 +2,12 @@
 
 . /usr/share/libubox/jshn.sh
 . /lib/functions.sh
-. /lib/functions/netmode.sh
+include /lib/network
 
 state="exit"
 TMPPATH="/tmp/netmode_config_backup"
 CURMODE=""
 SLEEPTIME=300
-pid_file=/tmp/netmode-conf.pid
-
-echo "$$" >$pid_file
-
-cleanup(){
-	rm -rf $pid_file
-	# we need to trigger a reload of icwmp but ONLY if ip or device has changed
-	[ -f "/etc/hotplug.d/iface/90-icwmp" ] && INTERFACE=wan ACTION=ifup sh /etc/hotplug.d/iface/90-icwmp
-	exit
-}
-
-trap cleanup SIGHUP SIGINT SIGTERM SIGSTOP
 
 set_wireless_values() {
 	local iface_num="$1"
@@ -99,7 +87,6 @@ restore() {
 		uci set juci.juci.homepage='netmode-wizard'
 		uci commit juci
 		cp $TMPPATH/* /etc/config/
-		sync
 		uci set netmode.setup.curmode=$CURMODE
 		uci commit netmode
 		ubus call network reload
@@ -122,7 +109,7 @@ backup() {
 file="$1"
 from_gui="$2"
 
-[ -f "$file" ] || cleanup
+[ -f "$file" ] || exit
 
 # let netmode-handler up to 20 seconds to finish switching mode
 wait_for_netmode_handler
@@ -173,14 +160,14 @@ done
 
 [ "$apcliband" == "$band" -o "$band" == "" ] || {
 	[ "$from_gui" == "true" ] && restore "back"
-	cleanup
+	exit
 }
 
 repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta'"  | sed 's/.*\[\([0-9]\)\].*/\1/')
 
 [ -z "$repeater_iface_num" ] && {
 	[ "$from_gui" == "true" ] && restore "back"
-	cleanup
+	exit
 }
 
 json_get_var ssid ssid
@@ -209,7 +196,7 @@ while json_get_var dummy $i; do
 		a_num=$((a_num+1))
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
-			cleanup
+			exit
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 		get_device "b" device
@@ -217,7 +204,7 @@ while json_get_var dummy $i; do
                 b_num=$((b_num+1))
                 [ -z $iface_num ] && {
                         [ "$from_gui" == "true" ] && restore "back"
-                        cleanup
+                        exit
                 }
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 	else
@@ -234,7 +221,7 @@ while json_get_var dummy $i; do
 		esac
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
-			cleanup
+			exit
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 	fi
@@ -281,7 +268,7 @@ if [ "$from_gui" == "true" ]; then
 		ping -w1 $ip
 		if [ $? -eq 0 ]; then
 			restore
-			cleanup
+			exit
 		else
 			i=$((i-10))
 			sleep 9
@@ -290,7 +277,7 @@ if [ "$from_gui" == "true" ]; then
 	restore "back"
 else
 	if [ "$state" == "exit" ]; then
-		cleanup
+		return
 	fi
 	ubus call leds set '{"state":"allflash"}'
 	if [ "$state" == "apply" ]; then
@@ -304,5 +291,3 @@ else
 	correct_uplink
 	ubus call leds set '{"state":"normal"}'
 fi
-
-cleanup

inteno-netmodes/files/sbin/netmode-discover

@@ -21,14 +21,9 @@ mask_to_cidr() {
 }
 
 while true; do
-	[ -e /sys/class/net/br-wan ] || {
-		sleep 5
-		continue
-	}
-
 	unlisted=0
 
-	ps | grep wifi | grep -q reload || {
+	ps | grep -q wifi | grep -q reload || {
 		for mac in $(brctl showmacs br-wan 2>/dev/null | tail -n +2 | grep no | awk '{print$2}'); do
 			grep -q "$mac" /proc/net/arp || unlisted=$((unlisted+1))
 		done
@@ -38,10 +33,10 @@ while true; do
 		mask=$(mask_to_cidr $netmask)
 	}
 
-	if [ $unlisted -gt 0 -a -n "$ipaddr" -a -n "$netmask" -a $mask -ge 24 ]; then
+	if [ $unlisted -gt 0 -a -n "$ipaddr" -a -n "$netmask" ]; then
 		fping -c 1 -t 1000 -g $ipaddr/$mask -q >/dev/null 2>&1
 	fi
 
-	sleep 30
+	sleep 20
 done
 

inteno-netmodes/files/sbin/netmode-repeater-correction

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+MTK=0
+[ "$(db -q get hw.board.hardware)" == "EX400" ] && MTK=1
+
+if [ $MTK -eq 1 ]; then
+	WANDEV="eth0.2"
+	link=$(swconfig dev switch0 port 0 get link | awk '{print$2}' | cut -d':' -f2)
+else
+	WANDEV="$(db -q get hw.board.ethernetWanPort).1"
+	link=$(cat /sys/class/net/${WANDEV:0:4}/operstate)
+fi
+
+[ "$link" == "up" ] && action=add
+[ "$link" == "down" ] && action=remove
+[ -z "$action" ] && exit
+
+wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
+
+if uci -q get network.wan.ifname | grep -wq "$wetif"; then
+	[ "$link" == "down" ] && return
+else
+	[ "$link" == "up" ] && return
+fi
+
+# trigger a fake hotplug net event
+INTERFACE=$WANDEV ACTION=$action /sbin/hotplug-call net

inteno-netmodes/files/sbin/testnet

@@ -7,11 +7,9 @@ TVCON=0
 WANIP=0
 LASTSTATUS=""
 CURSTATUS=""
-ETHWAN="$(db -q get hw.board.ethernetWanPort)"
 
 SLEEP_TIME=30
 enableCounter=0
-AccessPolicy=0
 
 get_wifi_iface_cfgstr() {
 	get_cfgno() {
@@ -30,6 +28,7 @@ ping_uplink()
 	local rready=""
 	local wetif=""
 	local assoclist=""
+	local AccessPolicy=0
 	local rv=0
 
 	[ -f /tmp/wps_client_mode_active ] && {
@@ -49,13 +48,8 @@ ping_uplink()
 	if [ "$hasmode" == "1" ] && [ "$hasip" == "0" -o "$hasdev" == "0" ]; then
 		rv=0
 	elif [ "$hasmode" == "1" ]; then
-		arping -f -q -c1 -w3 -I $device $ipaddr
+		ping $ipaddr -I $device -W 1 -c 1 -q >/dev/null 2>&1
 		[ $? -eq 1 ] && rv=0 || rv=1
-
-		if [ "$rv" == "0" ]; then
-			ping -c2 -w5 $ipaddr >/dev/null
-			[ $? -eq 1 ] && rv=0 || rv=1
-		fi
 	else
 		SLEEP_TIME=5
 		ubus call led.internet  set '{"state" : "off"}'
@@ -63,6 +57,7 @@ ping_uplink()
 	fi
 
 	if [ $rv -eq 0 ]; then
+
 		echo "{ \"online\" : false }" > /tmp/internet_connection_status
 
 		SLEEP_TIME=10
@@ -70,13 +65,10 @@ ping_uplink()
 		wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
 		# If there is an uplink IP address but no connection for 5 minutes, reboot
 		if [ $enableCounter -gt 32 ]; then
-			logger -s -p user.info -t "testnet" "No uplink connection; reboot" >/dev/console
 			ubus call led.internet  set '{"state" : "error"}'
 			reboot &
-		elif [ $((enableCounter % 8)) -eq 0 -a $enableCounter -ge 8 -o $enableCounter -eq 0 ]; then
-			ps | grep -v grep | grep -q 'wifi reload\|wifi import\|wifi.credentials\|iwpriv' && return
-
-			logger -s -p user.info -t "testnet" "No uplink connection; try to re-connect" >/dev/console
+		elif [ $((enableCounter % 2)) -eq 0 -a $enableCounter -ge 2 -o $enableCounter -eq 0 ]; then
+			ps | grep -v grep | grep -q 'wifi reload\|wifi.credentials\|iwpriv' && return
 
 			if [ -f /usr/sbin/wlctl ]; then
 				assoclist="$(wlctl -i $wetif assoclist | head -1 | awk '{print$2}')"
@@ -101,13 +93,13 @@ ping_uplink()
 				iwpriv $wetif set ApCliAutoConnect=1
 			fi
 			ubus call led.internet  set '{"state" : "notice"}'
-#			touch /tmp/netmodes/repeater_trying_to_connect
-#		else
-#			if [ -f /tmp/netmodes/repeater_trying_to_connect ]; then
-#				rm -f /tmp/netmodes/repeater_trying_to_connect
-#			else
-#				ubus call led.internet  set '{"state" : "error"}'
-#			fi
+			touch /tmp/netmodes/repeater_trying_to_connect
+		else
+			if [ -f /tmp/netmodes/repeater_trying_to_connect ]; then
+				rm -f /tmp/netmodes/repeater_trying_to_connect
+			else
+				ubus call led.internet  set '{"state" : "error"}'
+			fi
 		fi
 
 		enableCounter=$((enableCounter+1))
@@ -118,23 +110,18 @@ ping_uplink()
 
 		AccessPolicy=1
 		if [ -f /usr/sbin/iwpriv ]; then
-			grep -q up /sys/class/net/$ETHWAN/operstate 2>/dev/null || {
-				logger -s -p user.info -t "testnet" "Disconnect all stations and disable WiFi access on downlink wireless interfaces" >/dev/console
-				# Do not allow clients to connect on 2.4GHz radio
-				iwpriv ra0 set AccessPolicy=$AccessPolicy
-				# Do not allow clients to connect on 5GHz radio
-				iwpriv rai0 set AccessPolicy=$AccessPolicy
-				# Disconnect clients on 2.4GHz radio
-				iwpriv ra0 set DisConnectAllSta=2
-				# Disconnect clients on 5GHz radio
-				iwpriv rai0 set DisConnectAllSta=2
-			}
+			# Do not allow clients to connect on 2.4GHz radio
+			iwpriv ra0 set AccessPolicy=$AccessPolicy
+			# Do not allow clients to connect on 5GHz radio
+			iwpriv rai0 set AccessPolicy=$AccessPolicy
+			# Disconnect clients on 2.4GHz radio
+			iwpriv ra0 set DisConnectAllSta=2
+			# Disconnect clients on 5GHz radio
+			iwpriv rai0 set DisConnectAllSta=2
 		fi
-	else
-		grep -q "true" /tmp/internet_connection_status 2>/dev/null || logger -s -p user.info -t "testnet" "Uplink connection is gained" >/dev/console
+	else 
 		echo "{ \"online\" : true }" > /tmp/internet_connection_status
-		leden="$(uci -q get leds.internet.enable)"
-		[ "$leden" == "1" ] && ubus call led.internet  set '{"state" : "eok"}'
+		ubus call led.internet  set '{"state" : "eok"}'
 
 		SLEEP_TIME=5
 
@@ -146,10 +133,10 @@ ping_uplink()
 		AccessPolicy=0
 
 		if [ -f /usr/sbin/iwpriv ]; then
-			logger -s -p user.info -t "testnet" "Enable WiFi access on downlink wireless interfaces" >/dev/console
 			iwpriv ra0 set AccessPolicy=$AccessPolicy
 			iwpriv rai0 set AccessPolicy=$AccessPolicy
 		fi
+
 	fi
 }
 
@@ -173,10 +160,11 @@ test_connection() {
 }
 
 wan_have_ip() {
-	[ -d /sys/class/net/$ETHWAN ] || return
+	[ -d /sys/class/net/$port ] || return
 	ubus list led.wan >/dev/null 2>&1 || return
 
-	local addr=$(ip a show dev $ETHWAN | grep "inet "| awk '{print $2}')
+	local port="$(db -q get hw.board.ethernetWanPort)"
+	local addr=$(ip a show dev $port | grep "inet "| awk '{print $2}')
 
 	if [ -n "$addr" ]; then
 		WANIP=1
@@ -205,21 +193,19 @@ internet_test() {
 	fi
 }
 
-iptv_test() {
+iptvtest() {
+	ubus list led.ext >/dev/null 2>&1 && TVCON=1 || return
+
 	local dest="$(uci -q get system.@system[0].tvping_addr)"
 
-	[ -n "$dest" ] || return
-
-	ubus list led.ext >/dev/null 2>&1 || return
-
 	test_connection $dest
 
 	if [ "$?" -eq 0 ]; then
 		TVCON=1
-		ubus call led.ext set '{"state" : "ok"}'
+		[ -n "$dest" ] && ubus call led.ext  set '{"state" : "ok"}'
 	else
 		TVCON=0
-		ubus call led.ext set '{"state" : "off"}'
+		[ -n "$dest" ] && ubus call led.ext  set '{"state" : "off"}'
 	fi
 }
 
@@ -252,8 +238,6 @@ connectivity_test() {
 		[ "$CURSTATUS" == "$LASTSTATUS" ] || ubus send internet '{"status" : "offline"}'
 		LASTSTATUS=0
 	fi
-
-	iptv_test
 }
 
 if [ "$1" == "once" ]; then
@@ -261,6 +245,8 @@ if [ "$1" == "once" ]; then
 	exit 0
 fi
 
+ubus call led.internet  set '{"enable" : 1}'
+
 while true; do
 	connectivity_test
 	sleep $SLEEP_TIME

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

@@ -129,12 +129,12 @@ case "$1" in
 				json_load "`cat $file`" || write_error "invalid file content"
 				json_select "wifi_ifaces" || write_error "invalid file content"
 
-				start-netmode-conf "$file" "$from_gui" >/dev/null 2>/dev/null
 
 				json_init
 				json_add_string "status" success
 				json_dump
 
+				netmode-conf "$file" "$from_gui" >/dev/null 2>&1 &
 			;;
 		esac
 	;;

iop/configs/config

@@ -3,9 +3,11 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
+CONFIG_LOCALMIRROR="http://mirror.inteno.se/mirror"
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
+CONFIG_PACKAGE_6tunnel=y
 CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
@@ -15,57 +17,81 @@ CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_gdb=m
+CONFIG_PACKAGE_gdbserver=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
+CONFIG_PACKAGE_ice-client=y
+CONFIG_PACKAGE_ice-client-camerawatch=m
+CONFIG_PACKAGE_ice-client-fileme=m
+CONFIG_PACKAGE_ice-client-gigaset=m
+CONFIG_PACKAGE_ice-client-guest=m
+CONFIG_PACKAGE_ice-client-iperf=m
+CONFIG_PACKAGE_ice-client-logreader=m
+CONFIG_PACKAGE_ice-client-monitor=m
+CONFIG_PACKAGE_ice-client-netrounds=m
+CONFIG_PACKAGE_ice-client-rshell=m
+CONFIG_PACKAGE_ice-client-texec=m
 CONFIG_PACKAGE_icwmp-curl=y
-CONFIG_PACKAGE_ifbt=y
-CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_iopupgrade=y
-CONFIG_PACKAGE_ip-full=y
-CONFIG_PACKAGE_iperf3=y
+CONFIG_PACKAGE_inteno-netmodes=y
+CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
-# CONFIG_PACKAGE_iwatchdog is not set
+CONFIG_PACKAGE_iup=y
+CONFIG_PACKAGE_iwatchdog=y
 CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-config-backup=y
+CONFIG_PACKAGE_juci-broadcom-dsl=y
+CONFIG_PACKAGE_juci-broadcom-ethernet=y
+CONFIG_PACKAGE_juci-broadcom-iptv=y
+CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
+CONFIG_PACKAGE_juci-broadcom-vlan=y
+CONFIG_PACKAGE_juci-wireless=y
+CONFIG_PACKAGE_juci-broadcom-xdsl=y
 CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y
 CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
 CONFIG_PACKAGE_juci-dropbear=y
+CONFIG_PACKAGE_juci-ethernet=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
+CONFIG_PACKAGE_juci-ice-client=y
 CONFIG_PACKAGE_juci-icwmp=y
 CONFIG_PACKAGE_juci-igmpinfo=y
+CONFIG_PACKAGE_juci-inteno-backup=y
+CONFIG_PACKAGE_juci-mwan3=y
+CONFIG_PACKAGE_juci-inteno-provisioning=y
+# CONFIG_PACKAGE_juci-inteno-qos is not set
+CONFIG_PACKAGE_juci-inteno-voice-client=y
+CONFIG_PACKAGE_juci-macdb=y
 CONFIG_PACKAGE_juci-minidlna=y
 CONFIG_PACKAGE_juci-mod-status=y
 CONFIG_PACKAGE_juci-mod-system=y
-CONFIG_PACKAGE_juci-mwan3=y
 CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
-CONFIG_PACKAGE_juci-network-device=y
-CONFIG_PACKAGE_juci-network-dsl=y
 CONFIG_PACKAGE_juci-network-netifd=y
-CONFIG_PACKAGE_juci-network-port=y
-CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-owsd=y
+CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-samba=y
+CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
+CONFIG_PACKAGE_juci-theme-inteno=y
+CONFIG_PACKAGE_juci-ubus-core=y
 CONFIG_PACKAGE_juci-upnp=y
 CONFIG_PACKAGE_juci-usb=y
-CONFIG_PACKAGE_juci-voice-client=y
-CONFIG_PACKAGE_juci-wifilife=y
-CONFIG_PACKAGE_juci-wireless=y
-CONFIG_PACKAGE_juci-theme-iopsys=y
+CONFIG_PACKAGE_juci-utils=y
+# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
+CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-siit=y
+CONFIG_PACKAGE_layer2interface=y
 CONFIG_PACKAGE_libcgroup-daemon=y
 CONFIG_PACKAGE_libcgroup=y
 # CONFIG_PACKAGE_libcgroup-utils is not set
+CONFIG_PACKAGE_ldd=y
 CONFIG_PACKAGE_libdaemon=y
 CONFIG_PACKAGE_libffmpeg-mini=y
 CONFIG_PACKAGE_libgmp=y
@@ -73,10 +99,14 @@ CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_minidlna=y
 CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_mtd-utils=y
+CONFIG_PACKAGE_mtd-utils-deubinize=y
+CONFIG_PACKAGE_mtd-utils-imagewrite=y
+CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y
+CONFIG_PACKAGE_mtd-utils-nanddump=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_ndisc6=y
-CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=y
 CONFIG_PACKAGE_odhcp6c=y
@@ -85,14 +115,14 @@ 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_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
-CONFIG_PACKAGE_ppp-mod-pppoa=y
-CONFIG_PACKAGE_ppp-mod-pppoe=y
-CONFIG_PACKAGE_ppp-mod-pppol2tp=y
-CONFIG_PACKAGE_ppp-mod-pptp=y
-CONFIG_PACKAGE_ppp-multilink=y
+# CONFIG_PACKAGE_ppp-mod-pppoa is not set
+# CONFIG_PACKAGE_ppp-mod-pppol2tp is not set
+# CONFIG_PACKAGE_ppp-mod-pptp is not set
+# CONFIG_PACKAGE_ppp-multilink is not set
 # CONFIG_PACKAGE_ppp is not set
 # CONFIG_PACKAGE_qos-scripts is not set
 CONFIG_PACKAGE_questd=y
@@ -101,7 +131,6 @@ 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
@@ -117,19 +146,16 @@ CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_wifilife=y
-CONFIG_PACKAGE_wifimngr=y
+CONFIG_PACKAGE_wlng=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="IOPSYS"
+CONFIG_TARGET_CUSTOMER="INT"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 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
@@ -155,6 +181,7 @@ CONFIG_BUSYBOX_CONFIG_MICROCOM=y
 # CONFIG_BUSYBOX_CONFIG_RMMOD is not set
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_2_4_MODULES is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -168,9 +195,11 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
@@ -180,14 +209,10 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_PAM is not set
 # CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_LIBCURL_CRYPTO_AUTH=y
-# CONFIG_LIBCURL_MBEDTLS is not set
-CONFIG_LIBCURL_OPENSSL=y
 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_BUSYBOX_CONFIG_IP is not set
-LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"
-

iop/configs/luci.diff

@@ -0,0 +1,38 @@
+CONFIG_PACKAGE_luci=y
+CONFIG_PACKAGE_luci-mod-admin-core=y
+CONFIG_PACKAGE_luci-mod-admin-full=y
+CONFIG_PACKAGE_luci-app-ddns=y
+CONFIG_PACKAGE_luci-app-dslstats=y
+CONFIG_PACKAGE_luci-app-firewall=y
+CONFIG_PACKAGE_luci-app-iup=y
+CONFIG_PACKAGE_luci-app-mcpd=y
+CONFIG_PACKAGE_luci-app-minidlna=y
+CONFIG_PACKAGE_luci-app-multiwan=y
+CONFIG_PACKAGE_luci-app-p910nd=y
+CONFIG_PACKAGE_luci-app-parental-control=y
+CONFIG_PACKAGE_luci-app-port-management=y
+CONFIG_PACKAGE_luci-app-power-mgmt=y
+CONFIG_PACKAGE_luci-app-samba=y
+CONFIG_PACKAGE_luci-app-sfp=y
+CONFIG_PACKAGE_luci-app-snmp=y
+CONFIG_PACKAGE_luci-app-speedtest=y
+CONFIG_PACKAGE_luci-app-upnp=y
+CONFIG_PACKAGE_luci-app-voice=y
+CONFIG_PACKAGE_luci-theme-base=y
+CONFIG_PACKAGE_luci-theme-bootstrap=y
+CONFIG_PACKAGE_luci-i18n-english=y
+CONFIG_PACKAGE_luci-proto-3g=y
+CONFIG_PACKAGE_luci-proto-4g=y
+CONFIG_PACKAGE_luci-proto-core=y
+CONFIG_PACKAGE_luci-proto-ipv6=y
+CONFIG_PACKAGE_luci-proto-ppp=y
+CONFIG_PACKAGE_luci-sgi-cgi=y
+CONFIG_PACKAGE_luci-lib-core=y
+CONFIG_PACKAGE_luci-lib-core_source=y
+CONFIG_PACKAGE_luci-lib-ipkg=y
+CONFIG_PACKAGE_luci-lib-json=y
+CONFIG_PACKAGE_luci-lib-nixio=y
+CONFIG_PACKAGE_luci-lib-nixio_notls=y
+CONFIG_PACKAGE_luci-lib-sys=y
+CONFIG_PACKAGE_luci-lib-web=y
+

iop/iop.completion

@@ -5,14 +5,14 @@
 
 _iop_get_profiles()
 {
-    find feeds/targets/iopsys-*/ -name '*.diff' \
+    find feeds/feed_inteno_targets/iopsys-*/ -name '*.diff' \
         |awk -F'/' '{print$NF}' \
         |awk -F. '{print$1}'
 }
 
 _iop_get_models()
 {
-    find feeds/targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
+    find feeds/feed_inteno_targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
         |awk -F'/' '{print$NF}' \
         |egrep '^(cg|dg|eg|vg|vox)[0-9]'
 }
@@ -34,8 +34,9 @@ _iop()
 
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
              feeds_update genconfig generate_tarballs install_key \
-             scp_changes setup_host ssh_install_key status \
-             update_package update_feed_branches ssh_upgrade"
+             scp_changes setup_host ssh_install_key ssh_sysupgrade \
+             ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
+             update_package"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 
@@ -75,13 +76,7 @@ _iop()
                 fi
                 return 0
                 ;;
-            ssh_upgrade)
-	        if [ "$prev" == "-f" ] ; then
-		    _filedir
-		else
-		    COMPREPLY=( $(compgen -W "-f -t -i -n -x -b" -- ${cur}) )
-		fi
-	         ;;
+
             *)
                 # No arguments or arguments not supported yet
                 ;;

iop/scripts/annexconfig.sh

@@ -1,72 +0,0 @@
-#!/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"