Move base-files to feed_inteno_openwrt

-------------------------------------------------------------------------------
* ac06bd5 Use physical interface for Wan
* b8834a9 Disable multiwan
-------------------------------------------------------------------------------
commit ac06bd552d2ba72fda1e20d3b52e96302381b3ef
Author: Jonas Höglund <jonas.hoglund@embeddednation.com>
Date: 2016-01-19 11:21:14 +0100

    Use physical interface for Wan

Base directory -> /
 files/etc/init.d/iopsys-network-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit b8834a96213d6303e475aa673362f290c86d04aa
Author: Jonas Höglund <jonas.hoglund@embeddednation.com>
Date: 2016-01-19 10:15:22 +0100

    Disable multiwan

Base directory -> /
 files/etc/config/network               | 1 -
 files/etc/init.d/iopsys-network-config | 2 --
 2 files changed, 3 deletions(-)
-------------------------------------------------------------------------------

alleato-base/Makefile

@@ -0,0 +1,188 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=alleato-base
+
+PKG_VERSION:=14.49.2
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=git@iopsys.inteno.se:alleato_base.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=8314aed451255410a2cd4fa43ac3235504e8f018
+
+PKG_MAINTAINER:=Martin Assarsson, ALLEATO
+
+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/alleato3
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=+python
+  TITLE:=Alleato python libraries
+endef
+
+define Package/zwaved
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=+jansson
+  TITLE:=Alleato zwave daemon
+endef
+
+define Package/zwave-mgr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=+alleato3
+  TITLE:=Alleato zwave manager
+endef
+
+define Package/zwave-profiler
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=+alleato3
+  TITLE:=Alleato zwave profiler
+endef
+
+define Package/alleato-scheduler
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=+alleato3
+  TITLE:=Alleato scheduler
+endef
+
+define Package/alleato-boxconfig
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=+alleato3
+  TITLE:=Alleato boxconfig
+endef
+
+define Package/all-omc
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=+alleato3 +screen
+  TITLE:=Alleato remote tunnel
+endef
+
+define Package/ubus-kicker
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=
+  TITLE:=Alleato ubus-kicker
+endef
+
+define Package/mqttnagios
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=
+  TITLE:=Alleato mqttnagios
+endef
+
+define Package/all4-alleato-tools
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Alleato
+  DEPENDS:=
+  TITLE:=Alleato tools
+endef
+
+######################################################
+
+define Package/alleato3/install
+	$(INSTALL_DIR) $(1)/usr/lib/python2.7/
+	$(CP) -r $(PKG_BUILD_DIR)/python-2.7/* $(1)/usr/lib/python2.7/
+endef
+
+define Package/zwaved/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/zwaved $(1)/etc/init.d/zwaved
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/zwaved $(1)/usr/sbin/zwaved
+endef
+
+define Package/zwave-mgr/install
+	$(INSTALL_DIR) $(1)/usr/mqttrules $(1)/etc/init.d $(1)/etc/alleato/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/zwave-mgr $(1)/etc/init.d/zwave-mgr
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/zwave_mgr $(1)/usr/mqttrules/zwave_mgr
+endef
+
+define Package/zwave-profiler/install
+	$(INSTALL_DIR) $(1)/usr/mqttrules $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/zwave-profiler $(1)/etc/init.d/zwave-profiler
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/zwave-profiler $(1)/usr/mqttrules/zwave-profiler
+endef
+
+define Package/alleato-scheduler/install
+	$(INSTALL_DIR) $(1)/usr/mqttrules $(1)/etc/init.d $(1)/etc/crontabs/sched
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/scheduler $(1)/etc/init.d/scheduler 
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/scheduler $(1)/usr/mqttrules/scheduler
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/data/schedule $(1)/etc/crontabs/sched/schedule
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/data/schedule $(1)/etc/crontabs/schedule
+endef
+
+define Package/alleato-boxconfig/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/bin $(1)/etc/init.d $(1)/etc/alleato $(1)/home/mosquitto
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/boxconfig $(1)/etc/init.d/boxconfig
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/boxconfig $(1)/usr/bin/boxconfig
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/genmosquittoconf $(1)/usr/bin/genmosquittoconf
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/check_client_id $(1)/usr/sbin/check_client_id
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/data/boxconfig.conf $(1)/etc/boxconfig.conf
+endef
+
+define Package/all-omc/install
+	$(INSTALL_DIR) $(1)/root $(1)/etc/init.d $(1)/etc/config $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/omc $(1)/etc/init.d/omc
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/root/ssh_key $(1)/root/ssh_key
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/data/alleato.config $(1)/etc/config/alleato
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/omc $(1)/usr/bin/omc
+endef
+
+define Package/ubus-kicker/install
+	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/ubus-kicker $(1)/etc/init.d/ubus-kicker
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/ubus-kicker $(1)/usr/sbin/ubus-kicker
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/akick $(1)/usr/sbin/akick
+endef
+
+define Package/mqttnagios/install
+	$(INSTALL_DIR) $(1)/etc/nagios.d $(1)/usr/bin $(1)/etc/crontabs $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/mqttnagios $(1)/etc/init.d/mqttnagios
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/send_mqtt_nag $(1)/usr/bin/send_mqtt_nag
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nagios.d/dropbear $(1)/etc/nagios.d/dropbear.nag
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nagios.d/mosquitto $(1)/etc/nagios.d/mosquitto.nag
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nagios.d/ssh $(1)/etc/nagios.d/ssh.nag
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nagios.d/zwaved $(1)/etc/nagios.d/zwaved.nag
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/data/mqttnagios $(1)/etc/crontabs/mqttnagios
+	echo '/5 * * * * /usr/sbin/check_client_id' >> $(1)/etc/crontabs/root
+endef
+
+define Package/all4-alleato-tools/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/opt/alleato
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/house $(1)/etc/init.d/house
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/rulesd $(1)/etc/init.d/rulesd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/binaries/alleato_tools $(1)/usr/bin/alleato_tools
+endef
+
+######################################################
+
+$(eval $(call BuildPackage,alleato3))
+$(eval $(call BuildPackage,zwaved))
+$(eval $(call BuildPackage,zwave-mgr))
+$(eval $(call BuildPackage,zwave-profiler))
+$(eval $(call BuildPackage,alleato-scheduler))
+$(eval $(call BuildPackage,alleato-boxconfig))
+$(eval $(call BuildPackage,all-omc))
+$(eval $(call BuildPackage,ubus-kicker))
+$(eval $(call BuildPackage,mqttnagios))
+$(eval $(call BuildPackage,all4-alleato-tools))

anyfi/Config.in

@@ -0,0 +1,7 @@
+config ANYFI_CONTROLLER
+	string "Controller IP or FQDN"
+	depends on PACKAGE_anyfi
+	help
+	  The default IP address or fully qualified domain name (FQDN)
+	  of the Controller that should manage the Anyfi.net software.
+

anyfi/Makefile

@@ -0,0 +1,61 @@
+include $(TOPDIR)/rules.mk
+
+ANYFI_TARGET := $(ARCH)-linux-$(subst C,c,$(LIBC))-$(LIBCV)
+
+PKG_NAME    := anyfi
+PKG_VERSION := 1.3.9
+PKG_RELEASE := 1
+
+PKG_SOURCE     := anyfimac-$(PKG_VERSION)-$(ANYFI_TARGET).tar.bz2
+PKG_SOURCE_URL := http://anyfi.net/download
+PKG_BUILD_DIR  := $(BUILD_DIR)/anyfimac-$(PKG_VERSION)-$(ANYFI_TARGET)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  SECTION    := net
+  CATEGORY   := Network
+  TITLE      := Anyfi.net - Free SDWN Data Plane for IEEE 802.11
+  URL        := http://anyfi.net
+  DEPENDS    := +kmod-tun +librt +wl-anyfi
+  MAINTAINER := Anyfi Networks <eng@anyfinetworks.com>
+endef
+
+define Package/$(PKG_NAME)/description
+	Anyfi.net is a free Software-Defined Wirless Networking (SDWN)
+	forwarding data plane implementation for IEEE 802.11.
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Build/Configure
+	echo "config anyfi controller" > $(PKG_BUILD_DIR)/anyfi.conf
+	echo "	option 'hostname'	$(CONFIG_ANYFI_CONTROLLER)" >> \
+	    $(PKG_BUILD_DIR)/anyfi.conf
+	echo "config anyfi optimizer" >> $(PKG_BUILD_DIR)/anyfi.conf
+endef
+
+define Build/Compile
+	@echo "Nothing to do - Anyfi.net software comes pre-built."
+endef
+
+define Package/$(PKG_NAME)/conffiles
+	/etc/config/anyfi
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/anyfi.conf $(1)/etc/config/anyfi
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/anyfimac $(1)/sbin
+	$(LN) anyfimac $(1)/sbin/anyfid
+	$(LN) anyfimac $(1)/sbin/myfid
+	$(INSTALL_DIR) $(1)/bin
+	$(LN) ../sbin/anyfimac $(1)/bin/anyfidctl
+	$(LN) ../sbin/anyfimac $(1)/bin/myfidctl
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

anyfi/files/lib/network/anyfi.sh

@@ -0,0 +1,558 @@
+#!/bin/sh
+#
+# Copyright (C) 2013-2014 Anyfi Networks AB.
+#
+# Overview of the Integration
+# ===========================
+#
+# Anyfi.net software consists of two user space daemons; the radio daemon
+# anyfid and the tunnel termination daemon myfid. They communicate with each
+# other and with a Controller [1] over UDP/IP.
+#
+# The radio daemon anyfid provides guests with access to remote Wi-Fi networks.
+# It needs a Wi-Fi monitor interface to detect when guest devices come within
+# range and a pool of virtual access points to serve them. The integration is
+# responsible for creating the monitor interface and the pool of virtual access
+# points; anyfid handles the rest.
+#
+# The tunnel termination daemon myfid provides remote access to the local Wi-Fi
+# network. It is up to the integration to configure myfid to authenticate remote
+# devices in the same way that devices are authenticated when connecting
+# locally.
+#
+# Myfid is also responsible for telling the controller the MAC address of
+# devices that connect locally, so that they can later be offered seamless
+# remote access whenever they come close to another access point running anyfid.
+# However, when the user changes the WPA passphrase all such associations
+# between previously connected devices and the local Wi-Fi network should be
+# removed. The integration does so by passing myfid the --reset flag.
+#
+# Below is the integration logic in pseudo code. If you need to integrate
+# Anyfi.net software in your own firmware build environment you can find step
+# by step instructions at http://anyfi.net/integration.
+#
+# 1. A Community Edition of the Controller is available for download at
+#    http://www.anyfinetworks.com/download. You can also use the public
+#    demonstration controller at "demo.anyfi.net".
+#
+#
+# Integration Logic in Pseudo Code
+# ================================
+#
+# After enabling a Wi-Fi device:
+#   IF a controller is configured AND Anyfi.net is not disabled
+#     ALLOCATE monitor interface and virtual access point pool for anyfid
+#     START anyfid
+#
+#   FOREACH Wi-Fi interface of this device
+#     IF a controller is configured AND Anyfi.net is not disabled
+#      GENERATE a config file for myfid
+#
+#      IF the WPA passphrase has changed
+#        ADD the --reset flag to myfid arguments
+#
+#      START myfid on the Wi-Fi interface
+#
+# After disabling a Wi-Fi device:
+#   STOP anyfid
+#
+#   FOREACH Wi-Fi interface of this device
+#     STOP myfid on the Wi-Fi interface
+#
+# NOTE 1: The integration provides remote access to all Wi-Fi interfaces on the
+#         system that have anyfi_disabled set to 0. Each interface will have
+#         its own myfid daemon. There should however only be one anyfid daemon
+#         per radio.
+#
+# NOTE 2: On concurrent dual band routers each radio should have its own anyfid
+#         daemon.
+#
+#
+# Anyfi.net UCI data model
+# ========================
+#
+# Anyfi.net global parameters:
+#
+#   Name            Type        Default         Description
+#   controller
+#      .hostname    IP or FQDN  demo.anyfi.net  Controller IP or FQDN
+#      .key         path        -               Controller public key PEM file
+#   optimizer
+#      .key         path        -               Optimizer public key PEM file
+#
+# Wi-Fi device parameters:
+#
+#   Name            Type     Default  Description
+#   anyfi_disabled  boolean  0        Enable/disable guest access on this radio
+#   anyfi_iface     port     -        Bind anyfid to a WAN interface IP address
+#   anyfi_port      number   -        Bind anyfid to a SDWN UDP port
+#   anyfi_floor     percent  5        Min backhaul and spectrum allocation
+#   anyfi_ceiling   percent  75       Max backhaul and spectrum allocation
+#   anyfi_uplink    integer  -        WAN uplink capacity in bits per second
+#   anyfi_downlink  integer  -        WAN downlink capacity in bits per second
+#   anyfi_bssids    integer  -        Max number of virtual interfaces to use
+#   anyfi_clients   integer  -        Max number of concurrent guest users
+#
+# Wi-Fi interface parameters:
+#
+#   Name               Type    Default  Description
+#   anyfi_disabled     boolean 0        Enable remote access on this network
+#   anyfi_iface        string  -        Bind myfid to a WAN interface IP
+#                                       address
+#   anyfi_port         port    -        Bind myfid to a SDWN UDP port
+#   anyfi_autz_server  IP      -        RADIUS authorization server IP
+#   anyfi_autz_port    port    1812     RADIUS authorization server UDP port
+#   anyfi_autz_secret  string  -        RADIUS authorization server shared
+#                                       secret
+#   anyfi_acct_server  IP      -        RADIUS extra accounting server IP
+#   anyfi_acct_port    port    1813     RADIUS extra accounting server UDP port
+#   anyfi_acct_secret  string  -        RADIUS extra accounting server shared
+#                                       secret
+
+append ENABLE_HOOKS anyfi_enable
+append DISABLE_HOOKS anyfi_disable
+
+# Daemon run dir for temporary files.
+RUNDIR=/var/run
+
+# Config file dir for persistent configuration files.
+CONFDIR=/etc
+
+##### Wi-Fi device handling ##################################################
+
+# Get the channel for Wi-Fi device.
+# anyfi_dev_get_channel <device>
+anyfi_dev_get_channel() {
+	local device="$1"
+	local hwmode channel
+
+	config_get hwmode  "$device" hwmode
+	config_get channel "$device" channel
+
+	if [ "$channel" = auto -o "$channel" = 0 ]; then
+		case "$hwmode" in
+		auto)
+			channel=auto
+			;;
+
+		*b*|*g*)
+			channel=auto2
+			;;
+
+		*a*)
+			channel=auto5
+			;;
+		esac
+	fi
+	echo "$channel"
+}
+
+# Get the WLAN interface list for a WLAN device.
+# anyfi_get_vifs <device>
+anyfi_get_vifs() {
+	local device=$1
+	local vifs=""
+	local cfg
+
+	for cfg in $CONFIG_SECTIONS; do
+		local type dev
+		config_get type "$cfg" TYPE
+		config_get dev "$cfg" device
+
+		if [ "$type" = wifi-iface ] && [ "$dev" = "$device" ]; then
+			append vifs "$cfg"
+		fi
+	done
+
+	echo "$vifs"
+}
+
+# Start the Anyfi.net radio head daemon anyfid on a device.
+# anyfi_dev_start <device> <type> <controller> <controller_key>
+anyfi_dev_start()
+{
+	local device="$1"
+	local type="$2"
+	local controller="$3"
+	local controller_key="$4"
+	local nvifs bssids monitor iflist
+
+	# Determine how many virtual interfaces we should use
+	config_get bssids "$device" anyfi_bssids
+	nvifs=$(anyfi_get_vifs "$device" | wc -w)
+
+	if [ -n "$bssids" ]; then
+		# Limit the number of virtual interfaces to 32
+		[ "$bssids" -lt 32 ] || bssids=32
+	elif [ $nvifs -lt 4 ]; then
+		# Don't use more that 8 interfaces in total if possible...
+		bssids=$((8 - $nvifs))
+	else
+		# ...but try to allocate at least 4 interfaces for anyfid.
+		bssids=4
+	fi
+
+	# ALLOCATE monitor and pool of virtual access points
+	if monitor=$(anyfi_${type}_alloc_monitor "$device") && \
+	   iflist=$(anyfi_${type}_alloc_iflist "$device" $bssids)
+	then
+		local args=""
+		local wanif port floor ceiling uplink downlink clients
+
+		config_get wanif    "$device" anyfi_iface
+		config_get port     "$device" anyfi_port
+		config_get floor    "$device" anyfi_floor
+		config_get ceiling  "$device" anyfi_ceiling
+		config_get uplink   "$device" anyfi_uplink
+		config_get downlink "$device" anyfi_downlink
+		config_get clients  "$device" anyfi_clients
+
+		# If there are no interfaces on this device then
+		# anyfid controls channel
+		if [ "$nvifs" -eq 0 ]; then
+			args="$args --channel=$(anyfi_dev_get_channel $device)"
+		fi
+
+		[ -n "$wanif"    ] && args="$args --bind-if=$wanif"
+		[ -n "$port"     ] && args="$args --bind-port=$port"
+		[ -n "$floor"    ] && args="$args --floor=$floor"
+		[ -n "$ceiling"  ] && args="$args --ceiling=$ceiling"
+		[ -n "$uplink"   ] && args="$args --uplink=$uplink"
+		[ -n "$downlink" ] && args="$args --downlink=$downlink"
+		[ -n "$clients"  ] && args="$args --max-clients=$clients"
+		[ -n "$controller_key" ] && \
+			args="$args --controller-key=$controller_key"
+
+		# START anyfid
+		echo "$device: starting anyfid"
+		/sbin/anyfid --accept-license -C "$controller" -B \
+		             -P $RUNDIR/anyfid_$device.pid $args \
+			     $monitor $iflist
+	else
+		echo "$device: failed to allocate anyfid interfaces" 1>&2
+	fi
+}
+
+##### Wi-Fi interface handling ###############################################
+
+# Get the printable name of an interface.
+anyfi_vif_get_name() {
+	local ifname
+	config_get ifname "$1" ifname
+	echo "${ifname:-$1}"
+}
+
+# Generate the config file for myfid from UCI variables.
+# anyfi_vif_gen_config <vif>
+anyfi_vif_gen_config() {
+	local vif="$1"
+	local name="$(anyfi_vif_get_name $1)"
+	local device net ssid enc key isolate ifname
+
+	config_get device  "$vif" device
+	config_get net     "$vif" network
+	config_get ssid    "$vif" ssid
+	config_get enc     "$vif" encryption
+	config_get key     "$vif" key
+	config_get isolate "$vif" isolate
+	config_get ifname  "$vif" ifname
+
+	# Check basic settings before proceeding
+	[ -n "$net" ] || [ -n "$ssid" ] || return 1
+
+	local auth_proto auth_mode auth_cache group_rekey
+	local ciphers wpa_ciphers rsn_ciphers passphrase
+	local auth_server auth_port auth_secret
+	local autz_server autz_port autz_secret
+	local acct_server acct_port acct_secret
+	local acct2_server acct2_port acct2_secret
+	local radius_nasid
+
+	# Resolve explicit cipher overrides (tkip, ccmp or tkip+ccmp)
+	case "$enc" in
+	*+tkip+ccmp|*+tkip+aes)
+		ciphers=tkip+ccmp
+		;;
+
+	*+ccmp|*+aes)
+		ciphers=ccmp
+		;;
+
+	*+tkip)
+		ciphers=tkip
+		;;
+	esac
+
+	# Resolve authentication protocol (WPA or WPA2)
+	case "$enc" in
+	psk-mixed*|wpa-mixed*|mixed-psk*|mixed-wpa*)
+		auth_proto=wpa+rsn
+		wpa_ciphers=$ciphers
+		rsn_ciphers=$ciphers
+		;;
+
+	psk2*|wpa2*)
+		auth_proto=rsn
+		rsn_ciphers=$ciphers
+		;;
+
+	psk*|wpa*)
+		auth_proto=wpa
+		wpa_ciphers=$ciphers
+		;;
+
+	none)
+		echo "$name: no remote access for security reasons (open network)" 1>&2
+		return 1
+		;;
+
+	wep*)
+		echo "$name: no remote access for security reasons (wep is insecure)" 1>&2
+		return 1
+		;;
+
+	*)
+		echo "$name: unrecognized encryption type $enc" 1>&2
+		return 1
+		;;
+	esac
+
+	# Resolve authenticator mode (PSK or 802.1X)
+	case "$enc" in
+	psk*)
+		auth_mode=psk
+		passphrase=$key
+		[ -n "$passphrase"  ] || return 1
+		;;
+
+	wpa*)
+		auth_mode=eap
+
+		config_get auth_server "$vif" radius_server
+		config_get auth_port   "$vif" radius_port
+		config_get auth_secret "$vif" radius_secret
+
+		config_get acct_server "$vif" acct_server
+		config_get acct_port   "$vif" acct_port
+		config_get acct_secret "$vif" acct_secret
+
+		config_get auth_cache   "$vif" auth_cache
+		config_get group_rekey  "$vif" wpa_group_rekey
+
+		[ -n "$auth_server" ] || return 1
+		[ -n "$auth_secret" ] || auth_secret="$key"
+		[ -n "$acct_server" -a -z "$acct_secret" ] && acct_secret="$key"
+		;;
+
+	none)
+		;;
+
+	*)
+		echo "$name: no remote access ('encryption' not configured)" 1>&2
+		return 1
+		;;
+	esac
+
+	# Optional RADIUS authorization and accounting for Anyfi.net
+	config_get autz_server "$vif" anyfi_autz_server
+	config_get autz_port   "$vif" anyfi_autz_port
+	config_get autz_secret "$vif" anyfi_autz_secret
+
+	config_get acct2_server "$vif" anyfi_acct_server
+	config_get acct2_port   "$vif" anyfi_acct_port
+	config_get acct2_secret "$vif" anyfi_acct_secret
+
+	config_get radius_nasid "$vif" radius_nasid
+
+	# Generate common config file options
+	cat <<EOF
+ssid = '$ssid'
+bridge = br-$net
+auth_proto = $auth_proto
+EOF
+
+	# Generate dependent config file options
+	[ "$isolate" = 1     ] && echo "isolation = 1"
+	[ -n "$ifname"       ] && echo "local_ap = $ifname"
+	[ -n "$auth_mode"    ] && echo "auth_mode = $auth_mode"
+	[ -n "$auth_cache"   ] && echo "auth_cache = $auth_cache"
+	[ -n "$rsn_ciphers"  ] && echo "rsn_ciphers = $rsn_ciphers"
+	[ -n "$wpa_ciphers"  ] && echo "wpa_ciphers = $wpa_ciphers"
+	[ -n "$group_rekey"  ] && echo "group_rekey = $group_rekey"
+	[ -n "$passphrase"   ] && echo "passphrase = '$passphrase'"
+	[ -n "$radius_nasid" ] && echo "radius_nas_id = $radius_nas_id"
+	if [ -n "$auth_server"  ] && [ -n "$auth_secret" ]; then
+		echo "radius_auth_server = $auth_server"
+		echo "radius_auth_port = ${auth_port:-1812}"
+		echo "radius_auth_secret = $auth_secret"
+	fi
+	if [ -n "$acct_server"  ] && [ -n "$acct_secret" ]; then
+		echo "radius_acct_server = $acct_server"
+		echo "radius_acct_port = ${acct_port:-1813}"
+		echo "radius_acct_secret = $acct_secret"
+	fi
+	if [ -n "$autz_server"  ] && [ -n "$autz_secret" ]; then
+		echo "radius_autz_server = $autz_server"
+		echo "radius_autz_port = ${autz_port:-1812}"
+		echo "radius_autz_secret = $autz_secret"
+	fi
+	if [ -n "$acct2_server"  ] && [ -n "$acct2_secret" ]; then
+		echo "radius_acct2_server = $acct2_server"
+		echo "radius_acct2_port = ${acct2_port:-1813}"
+		echo "radius_acct2_secret = $acct2_secret"
+	fi
+	return 0
+}
+
+# Get the current value from a myfid configuration file.
+# anyfi_vif_get_config <file> <config>
+anyfi_vif_get_config() {
+	local file="$1"
+	local key="$2"
+
+	[ -e "$file" ] || return 1
+
+	# Assume the format is exactly "key = value",
+	# where value may or may not be in ''
+	grep "$key = " $file | cut -d '=' -f2- | cut -b2- | \
+		               sed -e "/^'.*'$/s/^'\\(.*\\)'$/\\1/"
+}
+
+# Start the Anyfi.net tunnel-termination daemon myfid on an interface.
+# anyfi_vif_start <vif> <controller> <controller_key> <optimizer_key>
+anyfi_vif_start()
+{
+	local vif="$1"
+	local controller="$2"
+	local controller_key="$3"
+	local optimizer_key="$4"
+
+	local name="$(anyfi_vif_get_name $vif)"
+	local pid_file="$RUNDIR/myfid_$name.pid"
+	local conf_file="$CONFDIR/myfid_$name.conf"
+	local new_conf_file="$RUNDIR/myfid_$name.conf"
+
+	# GENERATE a config file for myfid
+	if (anyfi_vif_gen_config $vif) > $new_conf_file; then
+		local controller_key optimizer_key
+		local key old_key wanif port
+		local args=""
+
+		config_get key "$vif" key
+		config_get wanif "$vif" anyfi_iface
+		config_get port "$vif" anyfi_port
+
+		# ADD optional arguments
+		[ -n "$wanif" ] && args="$args --bind-if=$wanif"
+		[ -n "$port"  ] && args="$args --bind-port=$port"
+		[ -n "$controller_key" ] && \
+			args="$args --controller-key=$controller_key"
+		[ -n "$optimizer_key" ] && \
+			args="$args --optimizer-key=$optimizer_key"
+
+		# ADD the --reset flag to myfid arguments if the passphrase
+		# has changed or myfid is started for the first time
+		old_key="$(anyfi_vif_get_config $conf_file passphrase)"
+		[ "$key" == "$old_key" ] || args="$args --reset"
+
+		# Update the myfid config file in flash only if needed
+		if ! cmp -s $new_conf_file $conf_file; then
+			mv $new_conf_file $conf_file
+		else
+			rm -f $new_conf_file
+		fi
+
+		# START myfid
+		echo "$name: starting myfid"
+		/sbin/myfid --accept-license -C "$controller" -B -P $pid_file \
+		            $args $conf_file
+	fi
+}
+
+# Stop an Anyfi.net daemon gracefully
+# anyfi_stop_daemon <pidfile>
+anyfi_stop_daemon() {
+	local pidfile="$1"
+
+	kill -TERM $(cat $pidfile)
+	for t in $(seq 0 5); do
+		[ -e $pidfile ] || return 0
+		sleep 1
+	done
+
+	echo "Timeout waiting for daemon assocated with $pidfile to exit" 1>&2
+	kill -KILL $(cat $pidfile)
+	rm -f $pidfile
+	return 1
+}
+
+# Enable Anyfi.net for a Wi-Fi device.
+# Run from ENABLE_HOOKS
+anyfi_enable()
+{
+	local device="$1"
+	local controller
+	local type vif vifs
+
+	# A controller IP or FQDN is required
+	controller="$(uci get anyfi.controller.hostname 2>/dev/null)"
+	[ -n "$controller" ] || return 0
+
+	# Optional controller and optimizer public keys
+	controller_key="$(uci get anyfi.controller.key 2>/dev/null)"
+	optimizer_key="$(uci get anyfi.optimizer.key 2>/dev/null)"
+
+	# Reload the wireless config to get the assigned ifnames right
+	config_load wireless
+	config_get type "$device" type
+	vifs=$(anyfi_get_vifs "$device")
+
+	# START anyfid on this device
+	if [ "$(config_get $device anyfi_disabled)" != 1 ] && \
+	   /sbin/anyfi-probe "$type"
+	then
+		anyfi_dev_start $device $type "$controller" "$controller_key"
+	fi
+
+	# FOREACH Wi-Fi interface of this device
+	for vif in $vifs; do
+		if [ "$(config_get $vif disabled)" != 1 ] && \
+		   [ "$(config_get $vif anyfi_disabled)" != 1 ]
+		then
+			anyfi_vif_start $vif "$controller" \
+				        "$controller_key" "$optimizer_key"
+		fi
+	done
+}
+
+# Disable Anyfi.net for a Wi-Fi device.
+# Run from DISABLE_HOOKS
+anyfi_disable()
+{
+	local device="$1"
+	local type vif vifs
+
+	# Reload the wireless config to get the assigned ifnames right
+	config_load wireless
+	config_get type "$device" type
+	vifs=$(anyfi_get_vifs "$device")
+
+	# STOP anyfid on this device (if anyfid is running)
+	if [ -e $RUNDIR/anyfid_$device.pid ]; then
+		echo "$device: stopping anyfid"
+		anyfi_stop_daemon $RUNDIR/anyfid_$device.pid
+		anyfi_${type}_release_iflist $device
+		anyfi_${type}_release_monitor $device
+	fi
+
+	# FOREACH Wi-Fi interface of this device (with myfid running)
+	for vif in $vifs; do
+		local name="$(anyfi_vif_get_name $vif)"
+		local pidfile="$RUNDIR/myfid_$name.pid"
+
+		if [ -e $pidfile ]; then
+			echo "$name: stopping myfid"
+			anyfi_stop_daemon $pidfile
+		fi
+	done
+}

anyfi/files/lib/network/anyfi_broadcom.sh

@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# Copyright (C) 2013-2014 Anyfi Networks AB.
+# Anyfi.net setup functions for Broadcom wl driver.
+
+# Get monitor name interface based for a device.
+# anyfi_dev_monitor_name <device>
+anyfi_broadcom_name_monitor() {
+	local device="$1"
+
+	# Map wlX => radiotapX
+	echo "$device" | sed 's/^.*\([0-9]\)$/radiotap\1/'
+}
+
+# Get BSS index of the last wl interface that is used (=up)
+# wl0.2 => 2
+# wl0   => (empty)
+anyfi_broadcom_get_wlindex() {
+	ifconfig | grep -o "^$1\..." | cut -d'.' -f2 | sort -n | tail -n 1
+}
+
+# Allocate virtual Wi-Fi interfaces for anyfid.
+# anyfi_broadcom_alloc_iflist <device> <bssids>
+anyfi_broadcom_alloc_iflist() {
+	local device="$1"
+	local bssids="$2"
+	local count=0
+	local wlindex num
+
+	# Enable MBSS mode if not already enabled
+	if [ "$(wlctl -i $device mbss)" = 0 ]; then
+		wlctl -i $device down
+		wlctl -i $device mbss 1
+		wlctl -i $device up
+	fi
+
+	wlindex=$(anyfi_broadcom_get_wlindex $device)
+
+	# Create WLAN interfaces and let the driver assign the BSSIDs
+	for num in $(seq $bssids); do
+		local idx=$(($wlindex + $num))
+		local wlif=$device.$idx
+
+		# Do the 'wlctl' dance to make the driver assign proper BSSIDs
+		wlctl -i $device bss -C $idx up > /dev/null || break
+		wlctl -i $device ssid -C $idx "dummy" > /dev/null
+		wlctl -i $device bss -C $idx up > /dev/null
+		wlctl -i $device bss -C $idx down > /dev/null
+		wlctl -i $device ssid -C $idx "" > /dev/null
+
+		local bssid=$(wlctl -i $wlif cur_etheraddr | cut -d' ' -f2)
+		ifconfig $wlif hw ether $bssid > /dev/null
+		count=$(($count + 1))
+	done
+
+	[ "$count" -gt 0 ] && echo $device.$(($wlindex + 1))/$count
+}
+
+# Release virtual Wi-Fi interfaces allocated for anyfid.
+# anyfi_broadcom_release_iflist <device>
+anyfi_broadcom_release_iflist() {
+	true
+}
+
+# Allocate a monitor interface for anyfid.
+# anyfi_broadcom_alloc_monitor <device>
+anyfi_broadcom_alloc_monitor() {
+	local device="$1"
+	local monitor=$(anyfi_broadcom_name_monitor $device)
+
+	wlctl -i $device monitor 0 || return 1
+	wlctl -i $device monitor 3 || return 1
+	ifconfig $monitor down || return 1
+	ifconfig $monitor up || return 1
+	echo $monitor
+}
+
+# Release the monitor interface for anyfid.
+# anyfi_broadcom_release_monitor <device>
+anyfi_broadcom_release_monitor() {
+	local device="$1"
+	local monitor=$(anyfi_broadcom_name_monitor $device)
+
+	ifconfig $monitor down 2> /dev/null
+	wlctl -i $device monitor 0 2> /dev/null
+}

anyfi/files/sbin/anyfi-probe

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+if [ $# -lt 1 ]; then
+    echo "Check if a WLAN driver type is supported by Anyfi.net radio software."
+    echo "Usage: $0 {mac80211|...}"
+    exit 1
+fi
+
+number() {
+    echo $2 | sed -e 's/[^0-9]/ /g' | cut -d' ' -f $1
+}
+
+major() {
+    number 1 $1
+}
+
+minor() {
+    number 2 $1
+}
+
+case $1 in
+    mac80211)
+	COMPAT_VER=$(opkg list-installed kmod-mac80211 | cut -d'+' -f2)
+	KERNEL_VER=$(uname -r)
+
+        # Future kernels > 3.x are OK
+	[ "$(major $KERNEL_VER)" -gt 3  ] && return 0
+
+        # The required commit 86c228a7627f3f2776893da47592234140fbfba8
+        # for mac80211 support was introduced in kernel 3.12.
+	[ "$(major $KERNEL_VER)" -eq  3 ] && \
+	[ "$(minor $KERNEL_VER)" -ge 12 ] && return 0
+
+	[ "$(major $COMPAT_VER)" -gt 2013 ] && return 0
+	[ "$(major $COMPAT_VER)" -eq 2013 ] && \
+	[ "$(minor $COMPAT_VER)" -ge   11 ] && return 0
+
+      cat <<EOF
+Support for mac80211 requires Linux kernel >= 3.12 or
+compat-wireless >= 2013-11-05. Please update your system.
+EOF
+      ;;
+
+    broadcom)
+	return 0
+	;;
+
+   *)
+      cat<<EOF
+WLAN driver \"$1\" is not supported by the Anyfi.net radio software.
+Improved drivers with Anyfi.net support are available for Broadcom,
+Qualcomm Atheros, Ralink and Realtek chipsets. Please contact
+support@anyfi.net for updated drivers, reference integrations and
+commercial integration services.
+EOF
+      ;;
+esac
+exit 1

ated/Makefile

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

bashdb/Makefile

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

bootchart2/Makefile

@@ -1,43 +0,0 @@
-# 
-# Copyright (C) 2007-2011 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:=bootchart2
-PKG_VERSION:=0.14.7
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/mmeeks/bootchart.git
-PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bootchart2
- SECTION:=base
- CATEGORY:=Utilities
- TITLE:=Bootchart2
- URL:=https://github.com/mmeeks/bootchart
-endef
-
-define Package/bootchart2/description
- Bootchart is a tool for performance analysis and visualization of the GNU/Linux boot process. 
-endef
-
-define Package/bootchart2/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bootchart-collector $(1)/sbin
-	$(CP) ./files/* $(1)/
-endef
-
-
-
-
-$(eval $(call BuildPackage,bootchart2))

bootchart2/files/lib/preinit/11_bootchart

@@ -1,10 +0,0 @@
-
-do_bootchart()
-{
-	[ -f /dev/null ] || mknod /dev/null c 1 3
-	mkdir -p /lib/bootchart/tmpfs
-	echo "starting bootchart"
-	/sbin/bootchart_run_preinit boot &
-}
-
-boot_hook_add preinit_essential do_bootchart

bootchart2/files/lib/preinit/72_bootchart

@@ -1,7 +0,0 @@
-
-bootchart_rootfs_pivot()
-{
-	mount -o move /rom/lib/bootchart/tmpfs /lib/bootchart/tmpfs	
-}
-
-boot_hook_add preinit_mount_root bootchart_rootfs_pivot

bootchart2/files/sbin/bootchart_run_preinit

@@ -1,59 +0,0 @@
- #! /bin/sh
-# this is intended to be started in preinit.
-# 11_bootchart, starts it
-# 72_bootchart, fixup mount point after pivot 
-#
-# program can be killed early with
-# bootchart_run_preinit stop
-
-trap "stop; exit 0;" SIGINT SIGTERM 
-
-STOP_AFTER=250
-HZ=50
-
-if [ -z "$1" ]
-then
-	echo "you need to specify start or stop"
-	exit 1
-fi
-
-start()
-{
-	/sbin/bootchart-collector $HZ &
-}
-
-stop()
-{
-	echo "bootchart DUMP"
-	
-	mkdir /tmp/bootchart
-	/sbin/bootchart-collector --dump /tmp/bootchart
-	cd /tmp/bootchart
-	tar -zcf /tmp/bootchart.tgz header *.log
-	cd /
-	rm -rf /tmp/bootchart
-}
-
-case $1 in
-    boot) # secret option for preinit
-	start
-	sleep $STOP_AFTER
-	# test to see if someone has manually killed us
-	if [ -f /tmp/bootchart.tgz ]
-	then
-	    exit 0
-	fi
-	stop
-	;;
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    *)
-	echo "you need to specify start or stop, not $1"
-	exit 1
-	;;
-esac
-

bootchart2/patches/0001-add_spu_sys_time.patch

@@ -1,40 +0,0 @@
-diff --git a/pybootchartgui/draw.py b/pybootchartgui/draw.py
-index 7c3f60c..5c9f046 100644
---- a/pybootchartgui/draw.py
-+++ b/pybootchartgui/draw.py
-@@ -63,6 +63,7 @@ AXIS_FONT_SIZE = 11
- LEGEND_FONT_SIZE = 12
- 
- # CPU load chart color.
-+CPU_SYS_COLOR = (0.65, 0.13, 0.36, 1.0)
- CPU_COLOR = (0.40, 0.55, 0.70, 1.0)
- # IO wait chart color.
- IO_COLOR = (0.76, 0.48, 0.48, 0.5)
-@@ -300,21 +301,19 @@ def render_charts(ctx, options, clip, trace, curr_y, w, h, sec_w):
- 	# render bar legend
- 	ctx.set_font_size(LEGEND_FONT_SIZE)
- 
--	draw_legend_box(ctx, "CPU (user+sys)", CPU_COLOR, off_x, curr_y+20, leg_s)
--	draw_legend_box(ctx, "I/O (wait)", IO_COLOR, off_x + 120, curr_y+20, leg_s)
-+	draw_legend_box(ctx, "CPU (user)", CPU_COLOR, off_x, curr_y+20, leg_s)
-+	draw_legend_box(ctx, "CPU (sys)", CPU_SYS_COLOR, off_x + 120, curr_y+20, leg_s)
-+	draw_legend_box(ctx, "I/O (wait)", IO_COLOR, off_x + 120 + 120 , curr_y+20, leg_s)
- 
- 	# render I/O wait
- 	chart_rect = (off_x, curr_y+30, w, bar_h)
- 	if clip_visible (clip, chart_rect):
- 		draw_box_ticks (ctx, chart_rect, sec_w)
- 		draw_annotations (ctx, proc_tree, trace.times, chart_rect)
--		draw_chart (ctx, IO_COLOR, True, chart_rect, \
--			    [(sample.time, sample.user + sample.sys + sample.io) for sample in trace.cpu_stats], \
--			    proc_tree, None)
-+		draw_chart (ctx, IO_COLOR, True, chart_rect, [(sample.time, sample.user + sample.sys + sample.io) for sample in trace.cpu_stats], proc_tree, None)
- 		# render CPU load
--		draw_chart (ctx, CPU_COLOR, True, chart_rect, \
--			    [(sample.time, sample.user + sample.sys) for sample in trace.cpu_stats], \
--			    proc_tree, None)
-+		draw_chart (ctx, CPU_SYS_COLOR, True, chart_rect, [(sample.time, sample.user + sample.sys) for sample in trace.cpu_stats], proc_tree, None)
-+		draw_chart (ctx, CPU_COLOR, True, chart_rect, [(sample.time, sample.user ) for sample in trace.cpu_stats], proc_tree, None)
- 
- 	curr_y = curr_y + 30 + bar_h
- 

catv/files/etc/config/catv

@@ -1,4 +0,0 @@
-
-config service 'catv'
-        option enable 'no'
-        option filter '3'

catv/files/etc/init.d/catv

@@ -1,30 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2015 inteno.org
-#
-
-START=71
-USE_PROCD=1
-
-. /lib/functions.sh
-
-start_service() {
-	local enable=0
-	local filter=0
-
-	config_load catv
-	config_get_bool enable catv enable 0
-	config_get filter catv filter
-	if [ $enable -eq 0 ]; then
-		ubus call catv set-enable "{\"enable\":\"off\"}"
-	else
-		ubus call catv set-enable "{\"enable\":\"on\"}"
-	fi
-	ubus call catv set-filter "{\"filter\":\"$filter\"}"
-
-}
-
-service_triggers() {
-        procd_add_reload_trigger catv
-}
-

crashlog/Makefile

@@ -1,3 +1,4 @@
+#
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crashlog

dectmngr2/Makefile

@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2006-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_RELEASE:=1
-PKG_VERSION:=1.2.0
-PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=877fcbd58d0ead82dbbc4c65f0ad7f8c938fcf74
-PKG_NAME:=dectmngr2
-
-
-RSTRIP:=true
-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
-
-define Package/dectmngr2
-  CATEGORY:=Utilities
-  TITLE:=Dectmngr2
-  URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus
-endef
-
-define Package/dectmngr2/description
-	Dectmngr2
-endef
-
-
-define Package/dectmngr2/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/dect/
-	$(INSTALL_DIR) $(1)/etc/config/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/nvs_default $(1)/etc/dect/
-	$(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
-endef
-
-$(eval $(call BuildPackage,dectmngr2))

dectmngr2/files/dect.config

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

endptcfg-open/Makefile

@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2006-2008 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:=endptcfg-open
+PKG_VERSION:=15-06-24
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://ihgsp.inteno.se/ihgsp/consumer/
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/image.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+
+define Package/endptcfg-open
+  CATEGORY:=Utilities
+  TITLE:=Broadcom endpoint driver configuration application pre compiled for open SDK
+  URL:=
+endef
+
+define Package/endptcfg-open/description
+        Broadcom endpoint driver configuration application pre compiled for open SDK
+endef
+
+
+
+define Package/endptcfg-open/install
+mkdir -p $(1)/usr/bin/
+ifeq ($(CONFIG_BCM_CHIP_ID),"63138")
+         $(CP)  $(PKG_BUILD_DIR)/endptcfg_arm $(1)/usr/bin/endptcfg	
+	
+else
+	$(CP)  $(PKG_BUILD_DIR)/endptcfg_mips $(1)/usr/bin/endptcfg
+endif	 	
+
+endef
+
+$(eval $(call BuildPackage,endptcfg-open))

endptmngr/Config.in

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

endptmngr/Makefile

@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2006-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_RELEASE:=1
-PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=0cb8accbac3355b97a17064ec7da010a2c42db7b
-
-
-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@private.inteno.se:endptmngr
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_NAME:=endptmngr
-endif
-
-RSTRIP:=true
-export BUILD_DIR
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-
-
-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
-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/
-	cp $(PKG_BUILD_DIR)/files/etc/init.d/* $(1)/etc/init.d/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endptmngr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,endptmngr))

endptmngr/files/dect.config

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

eventlog/Makefile

@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=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))

fatrace/Makefile

@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=fatrace
-PKG_VERSION:=0.12
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=98af6019a4a1b478a6fa35f74528cb3cd404ae40
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://git.launchpad.net/fatrace
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-# support parallel build
-#PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-#PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS := CONFIG_KERNEL_FANOTIFY
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fatrace
-	CATEGORY:=Utilities
-	TITLE:=Report system wide file access events
-	URL:=
-	DEPENDS	:= +@KERNEL_FANOTIFY
-endef
-
-define Package/fatrace/description
-	Report system wide file access events.
-endef
-
-MAKE_INSTALL_FLAGS += PREFIX="/" 
-
-define Package/fatrace/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/fatrace $(1)/sbin/
-#	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,fatrace))
-
-

fatrace/patches/001-fix-O_LARGEFILE.patch

@@ -1,14 +0,0 @@
-diff --git a/fatrace.c b/fatrace.c
-index 1c0899a..b7d1560 100644
---- a/fatrace.c
-+++ b/fatrace.c
-@@ -44,7 +44,8 @@
-  * http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1e2ee49f7
-  * O_LARGEFILE is usually 0, so hardcode it here
-  */
--#define KERNEL_O_LARGEFILE 00100000
-+//#define KERNEL_O_LARGEFILE 00100000
-+#define KERNEL_O_LARGEFILE O_LARGEFILE
- 
- /* command line options */
- static char* option_output = NULL;

fatrace/patches/002-fflush.patch

@@ -1,12 +0,0 @@
-diff --git a/fatrace.c b/fatrace.c
-index b7d1560..6179272 100644
---- a/fatrace.c
-+++ b/fatrace.c
-@@ -149,6 +149,7 @@ print_event(const struct fanotify_event_metadata *data,
-         printf ("%li.%06li ", event_time->tv_sec, event_time->tv_usec);
-     }
-     printf ("%s(%i): %s %s\n", procname, data->pid, mask2str (data->mask), pathname);
-+    fflush(stdout);
- }
- 
- /**

fping/Makefile

@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2016 Nikil Mehta <nikil.mehta@gmail.com>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fping
-PKG_VERSION:=4.0
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://fping.org/dist/
-PKG_HASH:=67eb4152b98ad34f99d2eec4e1098a0bb52caf13c0c89cd147349d08190fe8ce
-
-PKG_MAINTAINER:=Nikil Mehta <nikil.mehta@gmail.com>
-PKG_LICENSE:=BSD-4-Clause
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fping
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=sends ICMP ECHO_REQUEST packets to network hosts
-  URL:=http://fping.org/
-endef
-
-
-define Package/fping/description
-	fping is a ping like program which uses the Internet Control Message Protocol
-	(ICMP) echo request to determine if a target host is responding.  fping
-	differs from ping in that you can specify any number of targets on the command
-	line, or specify a file containing the lists of targets to ping.  Instead of
-	sending to one target until it times out or replies, fping will send out a
-	ping packet and move on to the next target in a round-robin fashion.
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-ipv4 \
-	--enable-ipv6
-
-TARGET_CFLAGS += -std=gnu99
-
-define Package/fping/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fping $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,fping))

gigaset-elements/.gitignore

@@ -1,3 +0,0 @@
-
-git-src
-

gigaset-elements/Makefile

@@ -1,65 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gigaset-elements
-
-PKG_VERSION:=2.4.2
-# PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
-PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
-
-PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aa906b37062b6d7937a9c0f8e7b62b32afe4bdeb
-
-
-PKG_MAINTAINER:=Magier Marcin, Figlarek Piotr
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-
-######################################################
-
-define Package/gigaset-elements
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libjson-c +libcurl +libpthread
-  TITLE:=Gigaset elements
-endef
-
-######################################################
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-endef
-
-
-
-define Package/gigaset-elements/install
-	$(CP) -r $(PKG_BUILD_DIR)/sysroot_common/* $(1)/
-	$(CP) -r $(PKG_BUILD_DIR)/sysroot_$(CONFIG_ARCH)/* $(1)/
-endef
-
-
-
-define Package/gigaset-elements/preinst
-#!/bin/sh
-mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/cert
-mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/fw
-endef
-
-
-define Package/gigaset-elements/postrm
-#!/bin/sh
-rm -rf $${IPKG_INSTROOT}/usr/gigaset/data
-rm -rf /usr/share/gigaset
-endef
-
-
-######################################################
-
-$(eval $(call BuildPackage,gigaset-elements))
-

ice-client/Config.in

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

ice-client/Makefile

@@ -5,10 +5,6 @@ PKG_NAME:=ice-client
 
 CFMODULES:=$(filter CONFIG_PACKAGE_$(PKG_NAME)-%,$(.VARIABLES))
 CFMODULES:=$(subst CONFIG_PACKAGE_$(PKG_NAME)-,,$(CFMODULES))
-
-#CFMODULES:=$(CFMODULES) webaccess texec iperf
-#CFMODULES:=$(sort $(CFMODULES))
-
 $(info Building package: $(PKG_NAME))
 $(info Building with additional modules: $(CFMODULES))
 export CFMODULES
@@ -19,34 +15,23 @@ 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.1.1
-PKG_RELEASE:=
-PKG_VERSION:=$(BASE_PKG_VERSION)$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+BASE_PKG_VERSION:=3.4.0
+PKG_RELEASE:=RC6
+PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=e8bf50630e6ba12dc2d223112643077c4db49189
-ifeq ($(CONFIG_ICE_OPEN),y)
-TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
-PKG_SOURCE:=$(PKG_NAME)-$(TARGET_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-SKIPHASH=1
-export SKIPHASH
-else
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@private.inteno.se:ice-client.git
-PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=ssh://git@iopsys.inteno.se/ice-client.git
+PKG_SOURCE_VERSION:=e860a7697ac8d6029cd1f75e1df9885e1d4131f5
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
-endif
+PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE).tar.gz
+PKG_SOURCE_PROTO:=git
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
 
 
 ###########################--RELEASE--################################
 
-#include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ice-client/Default
@@ -59,11 +44,7 @@ define Package/ice-client
 $(call Package/ice-client/Default)
 	TITLE:=ice-client
 	MENU:=1
-	DEPENDS:=+libopenssl +libstdcpp +libubus +ubus +ubusd +jshn +libubox +libpthread
-endef
-
-define Package/ice-client/config
-	source "$(SOURCE)/Config.in"
+	DEPENDS:=+libopenssl +libstdcpp +libubus +ubus +ubusd +jshn +libubox +libpthread +libjson-c
 endef
 
 ###########################--DEVELOPMENT--################################
@@ -71,7 +52,7 @@ endef
 # Uncomment stuff  Build/Prepare
 #
 # Plus make sure to comment and provide the following lines above
-# #PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git
+# #PKG_SOURCE_URL:=ssh://git@iopsys.inteno.se/ice-client.git
 # #PKG_SOURCE_VERSION:=a11bf64e6b1054803b52750aabd71bf440ff6e16
 # #PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION)
 # #PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE).tar.gz
@@ -79,7 +60,7 @@ endef
 # PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
 # 
 #
-# These settings allow you to specify a source folder where your source code is located
+# These settings allow you to specify a soruce folder where your source code is located
 # This avoids having to tar-zip or fetch from git each time
 # Changes can be done in your sources while the build is performed somewhere else
 # If you forget some settings, your source folder will be deleted!!! So be carefull and 
@@ -88,6 +69,7 @@ endef
 #define Build/Prepare
 #	rm -rf $(PKG_BUILD_DIR)
 #	ln -s /home/erik/Desktop/ice-client $(PKG_BUILD_DIR)
+##	ln -s /home/erik/Desktop/checkCompilation/iopsys-client $(PKG_BUILD_DIR)
 #endef
 
 ###########################--DEVELOPMENT--################################
@@ -102,10 +84,6 @@ endef
 # command to copy the binary file from its current location (in our case the build
 # directory) to the install directory.
 
-ifeq ($(CONFIG_ICE_OPEN),y)
-define Build/Compile
-endef
-else
 define Build/Configure
 	echo $(BASE_PKG_VERSION)-$(PKG_RELEASE) > $(PKG_BUILD_DIR)/core/version.txt
 	echo $(DATE) > $(PKG_BUILD_DIR)/core/date.txt
@@ -116,37 +94,21 @@ endef
 define Build/Clean
 	$(MAKE) -C $(PKG_BUILD_DIR) clean
 endef
-endif
 
 define Package/ice-client/preinst
 #!/bin/sh
 echo "backup current config"
-if [ -f "/etc/iopsys/server.ini" ]; then
-	cp /etc/iopsys/server.ini /tmp/iopsysserver.ini
-fi
-if [ -f "/etc/config/ice" ]; then
-	cp /etc/config/ice /tmp/ice.back
-fi
+cp /etc/iopsys/server.ini /tmp/iopsysserver.ini
+cp /etc/config/ice /tmp/ice.back
 exit 0
 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/
-endef
-else
 define Package/ice-client/install
 	$(INSTALL_DIR) $(1)/bin
 	$(CP) $(PKG_BUILD_DIR)/core/ice $(1)/bin
 	$(CP) $(PKG_BUILD_DIR)/modules/system/ubusevent/obj/iopsys/ubusevent $(1)/bin
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/core/lib/{systemService.so.1.0.1,libconfStore.so.1,networkService.so.1.0.1,packageService.so.1.0.1,monitorService.so.1.0.1,iperfService.so.1.0.1,logService.so.1.0.1,texecService.so.1.0.1,webaccessService.so.1.0.1} $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/wsice/obj/iopsys/libwsice.so $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/{systemService.so.1.0.1,libconfStore.so.1,networkService.so.1.0.1,packageService.so.1.0.1,monitorService.so.1.0.1,iperfService.so.1.0.1,logService.so.1.0.1} $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/bin/ifs/iperf/execute
 	$(INSTALL_DIR) $(1)/bin/ifs/iperf/progress
 	$(INSTALL_DIR) $(1)/bin/ifs/iperf/result
@@ -155,17 +117,13 @@ define Package/ice-client/install
 	$(CP) $(PKG_BUILD_DIR)/scripts/etc/config/ice $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/iopsys
 	$(CP) $(PKG_BUILD_DIR)/scripts/server.ini $(1)/etc/iopsys	
-	$(CP) $(PKG_BUILD_DIR)/scripts/defaults.ini $(1)/etc/iopsys	
 	$(CP) $(PKG_BUILD_DIR)/scripts/modify.ini $(1)/etc/iopsys
 	$(INSTALL_DIR) $(1)/etc/iopsys/certificates
 	$(CP) $(PKG_BUILD_DIR)/scripts/cert_server_ca.pem $(1)/etc/iopsys/certificates
 	$(CP) $(PKG_BUILD_DIR)/scripts/inteno_root_ca.pem $(1)/etc/iopsys/certificates
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(CP) $(PKG_BUILD_DIR)/scripts/ice-client $(1)/etc/init.d/ice-client
-	$(INSTALL_DIR) $(1)/etc/uci-defaults/
-	$(CP) ./files/ice-client.uci_default $(1)/etc/uci-defaults/95-ice-client
 endef
-endif
 
 define Package/ice-client/postinst
 #!/bin/sh
@@ -174,14 +132,14 @@ cp /tmp/iopsysserver.ini /etc/iopsys/server.ini
 rm -f /tmp/iopsysserver.ini 
 cp /tmp/ice.back /etc/config/ice 
 rm -f /tmp/ice.back
-if [ -f "/etc/rc.d/S98ice-client" ]; then
-	/etc/init.d/ice-client restart
+if [ -f "/etc/rc.d/S99ice-client" ]; then
+	/etc/init.d/ice-client start
 fi
 exit 0
 endef
 
 # Additional modules
-ifneq ($(CONFIG_ICE_OPEN),y)
+
 # Camerawatch
 define Package/ice-client-camerawatch
 $(call Package/ice-client/Default)
@@ -494,7 +452,7 @@ endef
 define Package/ice-client-fileme
   $(call Package/ice-client/Default)
   TITLE:=FileMe
-  DEPENDS+= +lighttpd +lighttpd-mod-webdav +lighttpd-mod-setenv +lighttpd-mod-userdir +samba2-client +samba2-common +libpcre +libltdl +libxml2
+  DEPENDS+= +lighttpd +samba2-client
 endef
 
 define Package/ice-client-fileme/description
@@ -895,137 +853,11 @@ fi
 exit 0
 endef
 
-# texec
-define Package/ice-client-texec
-  $(call Package/ice-client/Default)
-  TITLE:=texec
-  DEPENDS+= 
-endef
-
-define Package/ice-client-texec/description
-remote script execution module for ice-client
-endef
-
-define Package/ice-client-texec/prerm
-#!/bin/sh
-if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
-PROC_ID=$$(cat /tmp/ice.pid)
-PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
-if [ -n "$$PROC_EXISTS" ]; then
-  read -t 1 <>/tmp/cfout
-  echo "system moduleRemove topic=tExecMgr" > /tmp/cfin
-fi
-exit 0
-endef
-
-define Package/ice-client-texec/preinst
-#!/bin/sh
-if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
-PROC_ID=$$(cat /tmp/ice.pid)
-PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
-if [ -n "$$PROC_EXISTS" ]; then
-  read -t 1 <>/tmp/cfout
-  echo "system moduleRemove topic=tExecMgr" > /tmp/cfin
-fi
-exit 0
-endef
-
-define Package/ice-client-texec/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/core/lib/texecService.so.1.0.1 $(1)/usr/lib
-endef
-
-define Package/ice-client-texec/postinst
-#!/bin/sh
-read -t 1 <>/tmp/cfout
-if [ -f /tmp/ice.pid  ]; then
-	echo "system moduleAdd file=texecService.so.1.0.1" package="ice-client-texec" > /tmp/cfin
-fi
-exit 0
-endef
-
-# webaccess
-define Package/ice-client-webaccess
-  $(call Package/ice-client/Default)
-  TITLE:=webaccess
-  DEPENDS+= 
-endef
-
-define Package/ice-client-webaccess/description
-remote script execution module for ice-client
-endef
-
-define Package/ice-client-webaccess/prerm
-#!/bin/sh
-if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
-PROC_ID=$$(cat /tmp/ice.pid)
-PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
-if [ -n "$$PROC_EXISTS" ]; then
-  read -t 1 <>/tmp/cfout
-  echo "system moduleRemove topic=webAccess" > /tmp/cfin
-fi
-exit 0
-endef
-
-define Package/ice-client-webaccess/preinst
-#!/bin/sh
-if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
-PROC_ID=$$(cat /tmp/ice.pid)
-PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
-if [ -n "$$PROC_EXISTS" ]; then
-  read -t 1 <>/tmp/cfout
-  echo "system moduleRemove topic=webAccess" > /tmp/cfin
-fi
-exit 0
-endef
-
-define Package/ice-client-webaccess/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/core/lib/webaccessService.so.1.0.1 $(1)/usr/lib
-endef
-
-define Package/ice-client-webaccess/postinst
-#!/bin/sh
-read -t 1 <>/tmp/cfout
-if [ -f /tmp/ice.pid  ]; then
-	echo "system moduleAdd file=webaccessService.so.1.0.1" package="ice-client-webaccess" > /tmp/cfin
-fi
-exit 0
-endef
-# bmspeedtest
-define Package/ice-client-bcmspeedmgr
-  $(call Package/ice-client/Default)
-  TITLE:=bcmspeedmgr
-  DEPENDS+= 
-endef
-
-define Package/ice-client-bcmspeedmgr/description
-bcmspeedmgr module for ice-client
-endef
-
-define Package/ice-client-bcmspeedmgr/install
-	$(INSTALL_DIR) $(1)/bin
-	$(CP) $(PKG_BUILD_DIR)/daemons/bcmspeedmgr/obj/iopsys/bcmspeedmgr $(1)/bin
-	$(CP) $(PKG_BUILD_DIR)/daemons/bcmspeedmgr/obj/iopsys/speedsvc $(1)/bin
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(CP) $(PKG_BUILD_DIR)/platforms/iopsys/bcmspeedtestservice $(1)/etc/init.d/bcmspeedtestservice
-endef
-
-define Package/ice-client-bcmspeedmgr/postinst
-#!/bin/sh
-/etc/init.d/bcmspeedtestservice stop
-/etc/init.d/bcmspeedtestservice start
-exit 0
-endef
-
-endif
-
 # This line executes the necessary commands to compile our program.
 # The above define directives specify all the information needed, but this
 # line calls BuildPackage which in turn actually uses this information to
 # build a package.
 $(eval $(call BuildPackage,ice-client))
-ifneq ($(CONFIG_ICE_OPEN),y)
 $(eval $(call BuildPackage,ice-client-guest))
 $(eval $(call BuildPackage,ice-client-camerawatch))
 $(eval $(call BuildPackage,ice-client-openvpn))
@@ -1040,7 +872,3 @@ $(eval $(call BuildPackage,ice-client-rework))
 $(eval $(call BuildPackage,ice-client-sip))
 $(eval $(call BuildPackage,ice-client-monitor))
 $(eval $(call BuildPackage,ice-client-gigaset))
-$(eval $(call BuildPackage,ice-client-texec))
-$(eval $(call BuildPackage,ice-client-bcmspeedmgr))
-$(eval $(call BuildPackage,ice-client-webaccess))
-endif

ice-client/files/ice-client.uci_default

@@ -1,67 +0,0 @@
-#!/bin/sh
-
-grep -rq "^ice:" /etc/passwd || {
-	adduser -D -H -s /bin/false ice
-}
-
-uci -q delete passwords.ice
-uci -q set passwords.ice=usertype
-uci -q set passwords.ice.password="\$WPAKEY"
-uci -q add_list passwords.ice._access_r=root
-uci -q commit passwords
-
-uci show rpcd | grep username=.*ice.* >/dev/null || {
-cat >> /etc/config/rpcd << EOF
-
-config login
-	option username 'ice'
-	option password '\$p\$ice'
-	list _access_r 'none'
-	list write 'user-user'
-	list write 'juci-broadcom-dsl'
-	list write 'juci-broadcom-dsl-admin'
-	list write 'juci-broadcom-ethernet'
-	list write 'juci-broadcom-iptv'
-	list write 'juci-broadcom-vlan'
-	list write 'juci-broadcom-vlan-admin'
-	list write 'juci-wireless'
-	list write 'juci-wireless-admin'
-	list write 'juci-catv'
-	list write 'juci-ddns'
-	list write 'juci-diagnostics'
-	list write 'juci-dnsmasq-dhcp'
-	list write 'juci-dropbear'
-	list write 'juci-ethernet'
-	list write 'juci-event'
-	list write 'juci-firewall-fw3'
-	list write 'juci-iconnect'
-	list write 'juci-igmpinfo'
-	list write 'juci-inteno-backup'
-	list write 'juci-inteno-multiwan'
-	list write 'juci-inteno-provisioning'
-	list write 'juci-inteno-qos'
-	list write 'juci-inteno-voice-client'
-	list write 'juci-minidlna'
-	list write 'juci-mod-status'
-	list write 'juci-mod-system'
-	list write 'juci-natalie-dect'
-	list write 'juci-netmode'
-	list write 'juci-network-netifd'
-	list write 'juci-owsd'
-	list write 'juci-printer'
-	list write 'juci-realtime-graphs'
-	list write 'juci-samba'
-	list write 'juci-sfp'
-	list write 'juci-snmpd'
-	list write 'juci-sysupgrade'
-	list write 'juci-uhttpd'
-	list write 'juci-upnp'
-	list write 'juci-usb'
-	list write 'core'
-	list write 'unauthenticated'
-
-EOF
-}
-
-exit 0
-

icgroupd/Makefile

@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2016 Inteno Broadband AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=icgroupd
-PKG_VERSION:=1.0
-PKG_RELEASE:=0
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
-PKG_MAINTAINER:=Inteno Broadband AB
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/icgroupd
-  SECTION:=base
-  CATEGORY:=Base system
-  TITLE:=Inteno cgroup daemon
-  DEPENDS:=+uci +busybox
-endef
-
-define Package/icgroupd/description
-	This package contains Intenos cgroup daemon and associated
-	configuration and startup scripts.
-endef
-
-define Build/Compile
-	true
-endef
-
-define Package/icgroupd/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d $(1)/etc/config
-
-	$(INSTALL_CONF) ./files/cgroups.config $(1)/etc/config/cgroups
-	$(INSTALL_BIN) ./files/cgroups.init $(1)/etc/init.d/cgroups
-	$(INSTALL_BIN) ./files/cgroupd $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,icgroupd))
-

icgroupd/files/cgroupd

@@ -1,76 +0,0 @@
-#!/bin/sh
-
-CGBASEDIR=$1
-CGCONFIG=$2
-[ -n "$CGBASEDIR" -a -n "$CGCONFIG" ] || exit 1
-
-[ -r /lib/functions.sh ] || exit 1
-. /lib/functions.sh
-
-CGPROCMAP=/tmp/cgprocmap
-CGPERIOD=3s
-
-DBGLOG=/tmp/cgroupd.log
-DEBUG=0
-
-
-add_to_procmap () {
-	local name_grp=$1
-	local name grp
-
-	name=$(echo $name_grp |awk -F= '{print $1}')
-	grp=$(echo $name_grp |awk -F= '{print $2}')
-
-	echo "($name) $grp" >> $CGPROCMAP
-}
-
-# Read configuration file and create process:group look-up table
-# in /tmp file
-read_config () {
-	local enab
-
-	config_load $CGCONFIG
-
-	config_get enab cgroups enabled "1"
-	[ $enab -eq 0 ] && exit 1
-
-	config_get CGDEFGROUP cgroups defgroup "_undef_"
-	[ "$CGDEFGROUP" == "_undef_" ] && exit 1
-	[ "$DEBUG" == "1" ] && echo "default $CGDEFGROUP" >> $DBGLOG
-
-	echo -n '' > $CGPROCMAP
-	config_list_foreach procmap procmap add_to_procmap
-	[ "$DEBUG" == "1" ] && cat $CGPROCMAP >> $DBGLOG
-}
-
-# Move all process except init from cgroup root to cgroups according
-# to /tmp look-up table
-move_wild_procs () {
-	local wild_procs=$(cat $CGBASEDIR/cgroup.procs)
-	local pid name grp
-
-	for pid in $wild_procs; do
-
-		[ $pid -eq 1 ] && continue
-		if [ -d /proc/$pid ]; then
-
-			name=$(awk '{print $2}' /proc/$pid/stat)
-			grp=$(awk "\$1==\"$name\" {print \$2}" $CGPROCMAP)
-
-			[ "$grp" == "." ] && continue
-			[ -n "$grp" ] || grp=$CGDEFGROUP
-
-			[ "$DEBUG" == "1" ] && \
-			    echo "Moving proc $pid $name to $grp" >> $DBGLOG
-			echo $pid > $CGBASEDIR/$grp/cgroup.procs
-		fi
-	done
-}
-
-
-[ "$DEBUG" == "1" ] && echo "$0 started $(date)" >> $DBGLOG
-read_config
-while true; do
-	move_wild_procs
-	sleep $CGPERIOD
-done

icgroupd/files/cgroups.config

@@ -1,48 +0,0 @@
-config cgroups cgroups
-	option enabled 1
-	option defgroup iopsys/normal
-
-config cgroup _root_
-#	list option cpu.rt_runtime_us=50000
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup iopsys
-	list option cpu.shares=4096
-#	list option cpu.rt_runtime_us=40000
-	list option memory.limit_in_bytes=-1
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup iopsys_normal
-	list option cpu.shares=1024
-#	list option cpu.rt_runtime_us=10000
-	list option memory.limit_in_bytes=-1
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup iopsys_high
-	list option cpu.shares=4096
-#	list option cpu.rt_runtime_us=30000
-	list option memory.limit_in_bytes=-1
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup 3prt
-	list option cpu.shares=1024
-#	list option cpu.rt_runtime_us=10000
-	list option memory.limit_in_bytes=75M
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup 3prt_normal
-	list option cpu.shares=1024
-#	list option cpu.rt_runtime_us=2500
-	list option memory.limit_in_bytes=75M
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup 3prt_high
-	list option cpu.shares=4096
-#	list option cpu.rt_runtime_us=7500
-	list option memory.limit_in_bytes=75M
-	list option memory.move_charge_at_immigrate=1
-
-config procmap procmap
-	list procmap kthreadd=.
-	list procmap minidlna=3prt/normal
-

icgroupd/files/cgroups.init

@@ -1,93 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=01
-USE_PROCD=1
-PROCD_DEBUG=1
-NAME=cgroupd
-
-CGBASEDIR=/sys/fs/cgroup
-CGCONFIG="cgroups"
-
-DBGLOG=/tmp/cginit.log
-DEBUG=0
-
-
-cgroupinit_set_knob_value () {
-	local knob_val=$1
-	local dir=$2
-	local knob val
-
-	knob=$(echo $knob_val |awk -F= '{print $1}')
-	val=$(echo $knob_val |awk -F= '{print $2}')
-	/bin/echo $val > $CGBASEDIR/$dir/$knob
-	[ "$DEBUG" == "1" ] && \
-	    echo "/bin/echo $val > $CGBASEDIR/$dir/$knob (ret=$?)" >> $DBGLOG
-}
-
-cgroupinit_create_group () {
-	local cgrp=$1
-	local dir
-
-	[ "$DEBUG" == "1" ] && echo "Create group $cgrp:" >> $DBGLOG
-	if [ "$cgrp" == "_root_" ]; then
-		dir=.
-	else
-		dir=$(echo $cgrp |tr '_' '/')
-
-		if [ ! -d $CGBASEDIR/$dir ]; then
-			mkdir $CGBASEDIR/$dir
-			[ "$DEBUG" == "1" ] && \
-			    echo "mkdir $CGBASEDIR/$dir (ret=$?)" >> $DBGLOG
-		fi
-	fi
-
-	config_list_foreach $cgrp option cgroupinit_set_knob_value $dir
-}
-
-cgroupinit_configure_cgroups () {
-	local enab defgrp
-
-	[ "$DEBUG" == "1" ] && echo "$0 started $(date)" >> $DBGLOG
-	config_load $CGCONFIG
-
-	config_get enab cgroups enabled "1"
-	[ $enab -eq 0 ] && return 1
-
-	config_get defgrp cgroups defgroup "_undef_"
-	[ "$defgrp" == "_undef_" ] && return 1
-
-	if ! grep -q " $CGBASEDIR cgroup " /proc/mounts; then
-		mount -t cgroup -o nodev,noexec,nosuid cgroup $CGBASEDIR
-		[ $? -eq 0 ] || return 1
-	fi
-
-	config_foreach cgroupinit_create_group cgroup
-	return 0
-}
-
-start_service () {
-	cgroupinit_configure_cgroups
-	[ $? -eq 0 ] || return
-
-	procd_open_instance
-	procd_set_param command /sbin/cgroupd $CGBASEDIR $CGCONFIG
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service () {
-	local cgdir procs prc
-
-	for cgdir in $(find $CGBASEDIR -type d -mindepth 1 -depth); do
-		procs=$(cat $cgdir/cgroup.procs)
-		for prc in $procs; do
-			echo $prc > $CGBASEDIR/cgroup.procs
-		done
-		rmdir $cgdir
-	done
-}
-
-service_triggers() {
-        procd_add_reload_trigger $CGCONFIG
-}
-

icwmp/Config.in

@@ -19,17 +19,8 @@ config CWMP_DEBUG
 	bool "Compile with debug options"
 	default y
 
-config XMPP_ENABLE
-	bool "enable xmpp feature"
-	default n
-
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
 
-config LIBDATAMODEL_VENDOR_PREFIX
-    string "Vendor Prefix"
-    default "X_Inteno_SE_"
-    
 endif
-

icwmp/Config_datamodel.in

@@ -1,7 +0,0 @@
-if PACKAGE_libdatamodel
-
-config UPNP_TR064
-	bool "Compile with tr064 features"
-	default n
-
-endif

icwmp/Makefile

@@ -8,11 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2018-09-03
+PKG_VERSION:=3.0-2015-11-10
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
+ifeq ($(CONFIG_BCM_OPEN),y)
+PKG_SOURCE_URL:=http://ihgsp.inteno.se/git/freecwmp.git
+else
+PKG_SOURCE_URL:=ssh://git@iopsys.inteno.se/freecwmp.git
+endif
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fe324dbae2c8dbcfb55555dee9b3700280151aa1
+PKG_SOURCE_VERSION:=8d34c241548a21b6462df5d16906824685fe916c
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -30,32 +34,11 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libdatamodel
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-endef
-
-define Package/icwmp_stun
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 stun Client
-	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
-endef
-
-define Package/icwmp_xmpp
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 xmpp feature
-	DEPENDS:=+libuci +libubox +libexpat +libstrophe
-endef
-
 define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl +libtrace +libdatamodel
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt
 endef
 
 define Package/icwmp/description
@@ -77,11 +60,7 @@ define Package/icwmp-zstream
 endef
 
 define Package/icwmp-zstream/config
-	source "$(SOURCE)/Config_cwmp.in"
-endef
-
-define Package/libdatamodel/config
-	source "$(SOURCE)/Config_datamodel.in"
+	source "$(SOURCE)/Config.in"
 endef
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -91,15 +70,9 @@ define Build/Prepare
 endef
 endif
 
-ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_CFLAGS += -DEX400
-endif
-
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
-
+	
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -116,17 +89,7 @@ CONFIGURE_ARGS += \
 	--with-uci-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
-	
-ifeq ($(CONFIG_UPNP_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-upnptr064
-endif
-	
-ifeq ($(CONFIG_XMPP_ENABLE),y)
-CONFIGURE_ARGS += \
-	--enable-xmpp
-endif
-	
+
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \
@@ -158,18 +121,13 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/libdatamodel/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
-endef
-
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/icwmpd $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
@@ -181,39 +139,11 @@ ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
 	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/icwmp
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/iwepkeygen $(1)/usr/sbin/iwepkeygen
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/watchicwmpd.sh $(1)/usr/sbin/watchicwmpd
 endif
-	$(CP) ./files/* $(1)/
 endef
 
-define Package/icwmp_stun/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_stund $(1)/etc/init.d/icwmp_stund
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_stun $(1)/etc/config
-endef
-
-define Package/icwmp_xmpp/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_xmppd $(1)/usr/sbin/icwmp_xmppd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
-	$(CP) $(PKG_BUILD_DIR)/dm/*.h $(1)/usr/include/libdatamodel
-	$(CP) $(PKG_BUILD_DIR)/dm/dmtree/common/root.h $(1)/usr/include/libdatamodel
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.a $(1)/lib
-endef
-
-
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -235,7 +165,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-zstream))

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

@@ -1,77 +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
-
-	[ \
-		"$prevdev" == "$curdev" -a \
-		"$previpaddr" = "$curipaddr" -a \
-		"$prevgateway" = "$curgateway" -a \
-		"$prevsubnets" = "$cursubnets" -a \
-		"$prevdnsservers" = "$curdnsservers" \
-	] && 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

ifbt/Makefile

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2013 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifbt
-PKG_VERSION:=0.1
-
-PKG_SOURCE_VERSION:=da97d6668d3c0e3f2be226c66b406e90179ada81
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@private.inteno.se:ifbt.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ifbt
-	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-	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:=http://public.inteno.se/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

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

inotify-tools/Makefile

@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=inotify-tools
-PKG_VERSION:=3.14
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=1df9af4d6cd0f4af4b1b19254bcf056aed4ae395
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/rvoicilas/inotify-tools.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-# support parallel build
-PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/inotify-tools
-	CATEGORY:=Utilities
-	TITLE:=Tools to trace filesystem events.
-	URL:=
-endef
-
-define Package/inotify-tools/description
-	Tools to trace filesystem events.
-endef
-
-define Package/inotify-tools/install
-	$(INSTALL_DIR) $(1)/usr
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) ./files/* $(1)/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so.0.4.1 $(1)/usr/lib/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so.0 $(1)/usr/lib/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so $(1)/usr/lib/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inotifywait $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inotifywatch $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,inotify-tools))

inotify-tools/files/usr/bin/iop_write_monitor

@@ -1,13 +0,0 @@
-#! /bin/sh
-
-# is the real root mounted ?
-if [ ! -f /tmp/inotify_real_root/etc/preinit ]
-then
-	ubivol=$( cat /proc/cmdline  | sed -e "s/.*root=\(ubi:rootfs_.\).*/\1/" )
-	mkdir /tmp/inotify_real_root
-	mount -t ubifs $ubivol /tmp/inotify_real_root
-fi
-
-inotifywait -r -m -e modify -e create -e attrib -e delete -e move /tmp/inotify_real_root
-
-

inteno-configs/Makefile

@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2012 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:=inteno-configs
+
+PKG_VERSION:=1.0
+PKG_SOURCE_URL:=git@iopsys.inteno.se:inteno-configs.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=e6836dbc3dde40eba661b3c37d5f5d0cc6f2e5d0
+
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+######################################
+
+define NewConfig 
+  define Package/$(1)/install
+	$(INSTALL_DIR) $$(1)/etc/config
+	$(INSTALL_DIR) $$(1)/etc/uci-defaults
+	$(CP) $(PKG_BUILD_DIR)/$(1)/etc/config/* $$(1)/etc/config/ | true
+	$(CP) $(PKG_BUILD_DIR)/$(1)/etc/uci-defaults/* $$(1)/etc/uci-defaults | true
+  endef
+
+  define Package/$(1)
+	SECTION:=configs
+	CATEGORY:=Configurations
+	TITLE:=$(1)
+  endef
+
+endef
+
+
+define AddConfig
+  $(eval $(call NewConfig,$(1)))
+  $(eval $(call BuildPackage,$(1)))
+endef
+
+######################################
+
+$(eval $(call AddConfig,conf-common-inteno))
+$(eval $(call AddConfig,conf-caiman-inteno))
+
+

inteno-netmodes/Makefile

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2016 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=inteno-netmodes
-PKG_VERSION:=0.2.0
-
-PKG_SOURCE_VERSION:=fbd7dcfab03df19b3c32675940e0aee708c7cf75
-PKG_SOURCE_PROTO:=git
-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)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/inteno-netmodes
-	CATEGORY:=Base system
-	DEPENDS:=+fping +ubus +libubox +libuci
-	TITLE:=Predefined Network Modes
-endef
-
-define Package/inteno-netmodes/description
-	Predefined Network Modes
-endef
-
-define Package/inteno-netmodes/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netmoded $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,inteno-netmodes))

inteno-netmodes/files/etc/config/netmode

@@ -1,5 +0,0 @@
-config mode 'setup'
-        option dir '/etc/netmodes'
-        option detail ''
-        option curmode 'routed'
-

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

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-[ "$INTERFACE" != "wan" ] && exit
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-. /lib/functions/netmode.sh
-
-network_flush_cache
-network_get_ipaddr ipaddr $INTERFACE
-[ -z "$ipaddr" ] && exit
-
-repeaterready="$(uci -q get netmode.setup.repeaterready)"
-curmode="$(uci -q get netmode.setup.curmode)"
-
-if [ "$(netmode_get_ip_type $ipaddr)" == "private" ]; then
-	if [ "$repeaterready" == "1" -o "${curmode:0:8}" == "repeater" ]; then
-		# flush the ip on br-lan; br-lan will anyhow be deleted.
-		# this is needed if the ip received on the wan is also from the same net
-		logger -s -p user.info -t $0: [netmode] ip addr flush dev br-lan >/dev/console
-		ip addr flush dev br-lan 2>/dev/null
-
-		# flush iptables in case the MASTER
-		# tries to configure us before
-		# firewall is disabled the proper way
-		logger -s -p user.info -t $0: [netmode] iptables -F >/dev/console
-		iptables -F
-
-		disable_firewall 1
-	fi
-else
-	disable_firewall 0
-fi
-
-case "$curmode" in
-		repeater*)
-		;;
-		*)
-			[ "$repeaterready" == "1" ] || return
-			if [ "$(netmode_get_ip_type $ipaddr)" == "private" ]; then
-				wificontrol_takes_over || switch_netmode repeater
-			else
-				switch_netmode routed
-			fi
-		;;
-esac
-

inteno-netmodes/files/etc/hotplug.d/iface/05-testnet

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 0
-
-interface_check() {
-	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 defroute="$(uci -q get network.$INTERFACE.defaultroute)"
-	[ "$defroute" == "0" ] && exit 0
-}
-
-interface_check
-if [ -n "$(pidof testnet)" ]; then
-	testnet once
-else
-	testnet &
-fi
-

inteno-netmodes/files/etc/hotplug.d/iface/70-shiftrange

@@ -1,249 +0,0 @@
-#!/bin/sh
-# this scripts shifts the lan network prefixes
-# if a wan interface has the same network prefix.
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-
-LOCKFILE="/tmp/70-shiftrange.lock"
-RESTRICTED_NETS=""
-ALL_NETS=""
-
-#####
-##### initial functions
-#####
-
-initial_check()
-{
-	# run only on ifup
-	[ "$ACTION" == "ifup" ] || exit 0
-
-	# run only for uplink (not is_lan) interfaces
-	local islan="$(uci -q get network.$INTERFACE.is_lan)"
-	[ "$islan" != "1" ] || exit 0
-
-	# run only if the uplink interface has a configured protocol
-	local proto="$(uci -q get network.$INTERFACE.proto)"
-	[ "$proto" != "none" ] || exit 0
-}
-
-finish()
-{
-    lock -u $LOCKFILE
-    rm -f $LOCKFILE
-}
-
-# just one instance of this script at a time
-just_one_instance()
-{
-	local counter=0
-	local limit=10
-
-	#wait for the lock to become free
-	while [ -e $LOCKFILE ] ; do
-		sleep 1
-		counter=$((counter + 1))
-		[ "$counter" -gt "$limit" ] && exit 1
-	done
-
-	lock $LOCKFILE
-	trap finish EXIT INT TERM
-}
-
-
-#####
-##### helper functions
-#####
-
-#given a an ip and a mask in the form of "192.168.1.1/24"
-#return the network address like "192.168.1.0/24"
-get_network_address()
-{
-	local ip="$1"
-	[ -z "$ip" ] && return
-
-	local prefix=${ip##*/}
-
-	local ip1=${ip%%.*} ; ip=${ip#*.*}
-	local ip2=${ip%%.*} ; ip=${ip#*.*}
-	local ip3=${ip%%.*} ; ip=${ip#*.*}
-	local ip4=${ip%%/*}
-
-	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
-	local mask=$((0xFFFFFFFF >> (32 - $prefix) << (32 - $prefix)))
-	local network=$(($ip & $mask))
-
-	local n1=$((($network & 0xFF000000) >> 24))
-	local n2=$((($network & 0x00FF0000) >> 16))
-	local n3=$((($network & 0x0000FF00) >> 8))
-	local n4=$(( $network & 0x000000FF))
-
-	echo "$n1.$n2.$n3.$n4/$prefix"
-}
-
-#given a network address (192.168.1.0/24)
-#find the next network address (192.168.2.0/24)
-next_network_address()
-{
-	local ip=$1
-	local prefix=${ip##*/}
-
-	local ip1=${ip%%.*} ; ip=${ip#*.*}
-	local ip2=${ip%%.*} ; ip=${ip#*.*}
-	local ip3=${ip%%.*} ; ip=${ip#*.*}
-	local ip4=${ip%%/*}
-
-	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
-	local one="$((1 << (32-$prefix)))"
-	local new=$(($ip + $one))
-
-	local n1=$((($new & 0xFF000000) >> 24))
-	local n2=$((($new & 0x00FF0000) >> 16))
-	local n3=$((($new & 0x0000FF00) >> 8))
-	local n4=$(( $new & 0x000000FF))
-
-	echo "$n1.$n2.$n3.$n4/$prefix"
-}
-
-# given a network address and a prefix (192.168.2.0/24)
-# return the first host ip available   (192.168.2.1)
-first_host_in_network ()
-{
-	local ip=$1
-	local prefix=${ip##*/}
-
-	local ip1=${ip%%.*} ; ip=${ip#*.*}
-	local ip2=${ip%%.*} ; ip=${ip#*.*}
-	local ip3=${ip%%.*} ; ip=${ip#*.*}
-	local ip4=${ip%%/*}
-
-	local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
-	local new=$(($ip + 1))
-
-	local n1=$((($new & 0xFF000000) >> 24))
-	local n2=$((($new & 0x00FF0000) >> 16))
-	local n3=$((($new & 0x0000FF00) >> 8))
-	local n4=$(( $new & 0x000000FF))
-
-	echo "$n1.$n2.$n3.$n4"
-}
-
-# given a network address,
-# find the next available network address.
-shift_range()
-{
-	local net="$1"
-	while true ; do
-		if [ "$RESTRICTED_NETS" == "${RESTRICTED_NETS//$net/}" ] && [ "$ALL_NETS" == "${ALL_NETS//$net/}" ]; then
-			# found a net that is not in restricted nets nor in all nets
-			break
-		fi
-		net=$(next_network_address $net)
-	done
-
-	echo "$net"
-}
-
-
-#####
-##### parse all interfaces section
-#####
-
-# RESTRICTED_NETS = all the IPs on wan interfaces
-# ALL_NETS = all the IPs on any interface
-parse_interface()
-{
-	local interface=$1
-	local nets=""		# "192.168.1.1/24"
-	local networks=""	# "192.168.1.0/24"
-
-	config_get is_lan $interface is_lan
-	network_get_subnets nets $interface
-
-	for n in $nets ; do
-		networks="$networks $(get_network_address $n)"
-	done
-
-	[ "$is_lan" != "1" ] && RESTRICTED_NETS="$RESTRICTED_NETS $networks"
-	ALL_NETS="$ALL_NETS $networks"
-}
-
-# parse all the interfaces
-# get all the IPs on wan interfaces and store them in restrict_nets
-# get all the IPs on all interfaces and store them in ALL_NETS
-parse_interfaces()
-{
-	config_foreach parse_interface "interface"
-}
-
-
-#####
-##### parse all lan interfaces section
-#####
-
-parse_lan()
-{
-	local interface=$1
-	local nets=""
-	local ips=""
-	local newips=""
-	local ips_changed=0
-
-	[ "$interface" == "loopback" ] && return
-	config_get is_lan $interface is_lan
-	[ "$is_lan" == "1" ] || return
-
-	network_get_subnets ips $interface
-
-	for ip in $ips ; do
-		net="$(get_network_address $ip)"
-
-		if [ "$RESTRICTED_NETS" == "${RESTRICTED_NETS//$net/}" ] ; then
-			# net is not in restricted nets
-			# append ip to newips
-			[ -z "$newips" ] && newips="${ip%/*}" ||  newips="$newips ${ip%/*}"
-			continue
-		fi
-
-		#net is in RESTRICTED_NETS
-		local newnet=$(shift_range $net)
-		local newip="$(first_host_in_network $newnet)"
-		# append newip to newips
-		[ -z "$newips" ] && newips="$newip" ||  newips="$newips $newip"
-
-		ips_changed=1
-		logger "$0: Changing the ip on interface $interface from $ip to $newip/${newnet##*/}"
-		echo "$0: Changing the ip on interface $interface from $ip to $newip/${newnet##*/}" >/dev/console
-	done
-
-	#assign the new ips
-	if [ "$ips_changed" == "1" ] ; then
-		uci -q set network.$interface.ipaddr="$newips"
-	fi
-}
-
-# parse all the interface with is_lan=1
-parse_lans()
-{
-	config_foreach parse_lan "interface"
-}
-
-#####
-##### main
-#####
-
-main()
-{
-	initial_check
-	just_one_instance
-
-	config_load network
-	parse_interfaces
-	parse_lans
-
-	if [ -n "$(uci changes network)" ] ; then
-		ubus call uci commit '{"config":"network"}'
-	fi
-}
-
-main $@

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

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/functions/netmode.sh
-
-ps | grep hotplug | grep button && exit
-
-[ -z "$INTERFACE" ] && exit
-
-defroute=$(ip route | grep default | awk '{print$3}')
-
-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
-			}
-			exit
-		;;
-esac
-
-case "$ACTION" in
-	add|register|remove|unregister) correct_uplink $INTERFACE;;
-esac
-

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

@@ -1,45 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=10
-USE_PROCD=1
-
-NETMODED="/sbin/netmoded"
-
-. /lib/functions.sh
-. /lib/functions/netmode.sh
-
-start_netmoded() {
-	procd_open_instance
-	procd_set_param command $NETMODED
-
-	procd_append_param command --verbose warning
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-
-	procd_set_param respawn
-	procd_close_instance
-}
-
-start_service() {
-	populate_netmodes
-
-	start_netmoded
-	start_netmode_tools
-}
-
-reload_service() {
-        switch_netmode
-
-	start_netmoded
-	start_netmode_tools
-}
-
-stop_service() {
-	stop_netmode_tools
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger netmode
-}
-

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

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

inteno-netmodes/files/etc/netmodes/bridged/dhcp

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

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

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

inteno-netmodes/files/etc/netmodes/bridged/mcpd

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

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

@@ -1,66 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'lan'
-	option is_lan '1'
-	option type 'bridge'
-	option proto 'static'
-	option ipaddr '192.168.1.1'
-	option netmask '255.255.255.0'
-	option ifname '$LAN1 $LAN2 $LAN3'
-	option ip6assign '60'
-	
-config interface 'wan'
-	option type 'anywan'
-	option proto 'dhcp'
-	option vendorid '$HARDWAREID-INTENO'
-	option hostname 'Inteno_$MAC4'
-	option ifname 'ptm0.1 atm0.1 $WAN.1'
-	option ipv6 '1'
-
-config interface 'iptv'
-	option type 'bridge'
-	option proto 'dhcp'
-	option gateway '0.0.0.0'
-	option reqopts 'staticroutes'
-	option ifname 'ptm0.100 $WAN.100 $LAN4'
-	option defaultroute '0'
-
-config interface '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/bridged/wireless

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

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

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

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/dhcp

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

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

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

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/mcpd

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

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/network

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/network

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

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

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

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/DETAILS

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

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

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

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

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

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

@@ -1,16 +0,0 @@
-{
-	"description": [
-		{ "en" : "Fully Routed (NAT)" },
-		{ "sv" : "Fullt Omdirigerad (NAT)" }
-	],
-	"explanation": [
-		{ "en" : "" },
-		{ "sv" : "" }
-	],
-	"excluded_boards" : [
-		"EX4*",
-		"SDX810-AP"
-	],
-	"credentials" : 0
-}
-

inteno-netmodes/files/etc/netmodes/routed_brcm/dhcp

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

inteno-netmodes/files/etc/netmodes/routed_brcm/firewall

@@ -1,153 +0,0 @@
-config settings 'settings'
-        option disabled '0'
-
-config defaults
-	option syn_flood	1
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		REJECT
-# Uncomment this line to disable ipv6 rules
-#	option disable_ipv6	1
-
-config zone
-	option name		lan
-	list   network		'lan'
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		ACCEPT
-
-config zone
-	option name		wan
-	list   network		'wan'
-	list   network		'wan6'
-	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
-
-# 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
-
-config rule
-	option name		Allow-IGMP
-	option src		wan
-	option proto		igmp
-	option family		ipv4
-	option target		ACCEPT
-
-# 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
-
-config rule
-	option name		Allow-MLD
-	option src		wan
-	option proto		icmp
-	option src_ip		fe80::/10
-	list icmp_type		'130/0'
-	list icmp_type		'131/0'
-	list icmp_type		'132/0'
-	list icmp_type		'143/0'
-	option family		ipv6
-	option target		ACCEPT
-
-# 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
-
-# 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
-
-# allow IPsec/ESP and ISAKMP passthrough
-config rule
-	option src		wan
-	option dest		lan
-	option proto		esp
-	option target		ACCEPT
-
-config rule
-	option src		wan
-	option dest		lan
-	option dest_port	500
-	option proto		udp
-	option target		ACCEPT
-
-config dmz dmz
-	option enabled '0'
-	option exclude_ports '5060 7547'
-
-# include a file with users custom iptables rules
-config include
-	option path /etc/firewall.user
-	option reload 1
-
-# include a file with rules for prioritizing some specific packets
-config include
-	option path /etc/firewall.qos
-	option reload 1
-
-# include a file with rules for DMZ Host
-config include dmzhost
-	option path /etc/firewall.dmz
-	option reload 1
-

inteno-netmodes/files/etc/netmodes/routed_brcm/mcpd

@@ -1,14 +0,0 @@
-config mcpd 'mcpd'
-	option igmp_proxy_interfaces 'wan'
-	option igmp_default_version '2'
-	option igmp_query_interval '125'
-	option igmp_query_response_interval '100'
-	option igmp_last_member_query_interval '10'
-	option igmp_robustness_value '2'
-	option igmp_max_groups '25'
-	option igmp_max_sources '10'
-	option igmp_max_members '25'
-	option igmp_fast_leave '1'
-	option igmp_proxy_enable '1'
-	option igmp_snooping_enable '2'
-	option igmp_snooping_interfaces 'br-lan'

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

@@ -1,44 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'lan'
-	option is_lan '1'
-	option type 'bridge'
-	option proto 'static'
-	option ipaddr '192.168.1.1'
-	option netmask '255.255.255.0'
-	option ifname '$LAN1 $LAN2 $LAN3 $LAN4'
-	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 '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

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

inteno-netmodes/files/etc/netmodes/routed_mtk/DETAILS

@@ -1,17 +0,0 @@
-{
-	"description": [
-		{ "en" : "Fully Routed (NAT)" },
-		{ "sv" : "Fullt Omdirigerad (NAT)" }
-	],
-	"explanation": [
-		{ "en" : "" },
-		{ "sv" : "" }
-	],
-	"excluded_boards" : [
-		"*G*",
-		"F*"
-	],
-	"reboot" : 0,
-	"credentials" : 0
-}
-

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

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

inteno-netmodes/files/etc/netmodes/routed_mtk/firewall

@@ -1,153 +0,0 @@
-config settings 'settings'
-        option disabled '0'
-
-config defaults
-	option syn_flood	1
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		REJECT
-# Uncomment this line to disable ipv6 rules
-#	option disable_ipv6	1
-
-config zone
-	option name		lan
-	list   network		'lan'
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		ACCEPT
-
-config zone
-	option name		wan
-	list   network		'wan'
-	list   network		'wan6'
-	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
-
-# 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
-
-config rule
-	option name		Allow-IGMP
-	option src		wan
-	option proto		igmp
-	option family		ipv4
-	option target		ACCEPT
-
-# 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
-
-config rule
-	option name		Allow-MLD
-	option src		wan
-	option proto		icmp
-	option src_ip		fe80::/10
-	list icmp_type		'130/0'
-	list icmp_type		'131/0'
-	list icmp_type		'132/0'
-	list icmp_type		'143/0'
-	option family		ipv6
-	option target		ACCEPT
-
-# 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
-
-# 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
-
-# allow IPsec/ESP and ISAKMP passthrough
-config rule
-	option src		wan
-	option dest		lan
-	option proto		esp
-	option target		ACCEPT
-
-config rule
-	option src		wan
-	option dest		lan
-	option dest_port	500
-	option proto		udp
-	option target		ACCEPT
-
-config dmz dmz
-	option enabled '0'
-	option exclude_ports '5060 7547'
-
-# include a file with users custom iptables rules
-config include
-	option path /etc/firewall.user
-	option reload 1
-
-# include a file with rules for prioritizing some specific packets
-config include
-	option path /etc/firewall.qos
-	option reload 1
-
-# include a file with rules for DMZ Host
-config include dmzhost
-	option path /etc/firewall.dmz
-	option reload 1
-

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

@@ -1,51 +0,0 @@
-config interface 'loopback'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'lan'
-	option type 'bridge'
-	option proto 'static'
-	option is_lan '1'
-	option ipaddr '192.168.1.1'
-	option netmask '255.255.255.0'
-	option ip6assign '60'
-	option ifname 'eth0.1'
-
-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 '$IOPHOSTNAME-$MAC'
-	option vendorid '$HARDWAREID-INTENO'
-	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'
-	option proto 'dhcpv6'
-
-config switch
-	option name 'switch0'
-	option reset '1'
-	option enable_vlan '1'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '1'
-	option ports '1 6t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '2'
-	option ports '0 5t'
-

inteno-netmodes/files/etc/netmodes/routed_mtk/omcproxy

@@ -1,10 +0,0 @@
-config proxy
-	option scope global
-	option uplink wan
-	list downlink lan
-
-config proxy
-	option scope global
-	option uplink wan6
-	list downlink lan
-

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

@@ -1,50 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device  ra0
-	option band b
-	option channel  auto
-	option bandwidth '20'
-	option hwmode   auto
-	option htmode   HT20
-	option country 'DE'
-
-config wifi-iface
-	option device   ra0
-	option network  lan
-	option mode     ap
-	option ssid     Inteno-$BSSID4
-	option encryption psk2
-	option key      $WPAKEY
-	option wps_pbc	1
-	option ifname	ra0
-
-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  lan
-	option mode     ap
-	option ssid     Inteno-$BSSID4
-	option encryption psk2
-	option key      $WPAKEY
-	option wps_pbc	1
-	option ifname	rai0
-

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

@@ -1,430 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-
-NMTMPDIR=/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"
-
-toggle_firewall() {
-	local section=$1
-	local disable=$2
-	config_get name "$1" name
-	if [ "$name" == "wan" ]; then
-		uci -q set firewall.settings.disabled=$disable
-		if [ "$disable" == "1" ]; then
-			uci -q set firewall.$section.input="ACCEPT"
-		else
-			uci -q set firewall.$section.input="REJECT"
-		fi
-		uci -q commit firewall
-	fi
-}
-
-disable_firewall() {
-	config_load firewall
-	config_foreach toggle_firewall zone $1
-	/etc/init.d/firewall reload
-}
-
-is_inteno_macaddr()
-{
-	macaddr=$1
-
-	echo $macaddr | grep -i -e "^00:22:07" \
-				-e "^02:22:07" \
-				-e "^44:D4:37" \
-				-e "^00:0C:07" \
-				-e "^02:0C:07" \
-				-e "^06:0C:07" \
-				-e "^00:0C:43" \
-				-e "^02:0C:43" \
-				-e "^06:0C:43" \
-	&& return
-	false
-}
-
-get_wifi_wet_interface() {
-	local ifname=""
-	handle_interface() {
-		[ -n "$ifname" ] && return
-		config_get mode "$1" mode
-		if [ "$mode" == "sta" -o "$mode" == "wet" ]; then
-			config_get ifname "$1" ifname
-		fi
-	}
-	config_load wireless
-	config_foreach handle_interface wifi-iface
-	echo "$ifname"
-}
-
-get_wifi_iface_cfgstr() {
-	get_cfgno() {
-		config_get ifname "$1" ifname
-		[ "$ifname" == "$2" ] && echo "wireless.$1"
-	}
-	config_load wireless
-	config_foreach get_cfgno wifi-iface $1
-}
-
-correct_uplink() {
-	local IFACE="$1"
-	local WANDEV="$(db -q get hw.board.ethernetWanPort)"
-	local WETIF="$(get_wifi_wet_interface)"
-	local link wetcfg wetnet wetmac
-
-	[ $MTK -eq 1 ] || WANDEV="$WANDEV.1"
-
-	[ -n "$IFACE" -a "$IFACE" != "$WANDEV" -a "$IFACE" != "$WETIF" ] && 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}')"
-		if [ -d /sys/class/net/br-$wetnet ]; then
-			ifconfig br-$wetnet hw ether $wetmac
-			#touch -f /tmp/netmodes/uplink-macaddr-corrected
-		fi
-	fi
-
-	if [ "$link" == "up" ]; then
-		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}"
-		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
-		ubus call led.internet  set '{"state" : "notice"}'
-	fi
-}
-
-switch_netmode() {
-	local newmode="$1"
-
-	[ -f /etc/config/netmode -a -d $MODEDIR ] || return
-
-	[ -n "$newmode" ] && uci -q set netmode.setup.curmode="$newmode"
-
-	local curmode conf 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
-
-	if [ "$curmode" == "repeater" ]; then
-		if [ $MTK -eq 1 ]; then
-			curmode="repeater_mtk_5g_up_dual_down"
-		else
-			curmode="repeater_brcm_2g_up_dual_down"
-		fi
-		uci set netmode.setup.curmode="$curmode"
-	fi
-	if [ "$curmode" == "routed" ]; then
-		if [ $MTK -eq 1 ]; then
-			curmode="routed_mtk"
-		else
-			curmode="routed_brcm"
-		fi
-		uci set netmode.setup.curmode="$curmode"
-	fi
-	uci commit netmode
-	# end of NETMODE CONFIG #
-
-	old_mode="$(cat $OLD_MODE_FILE 2>/dev/null)"
-
-        # if curmode has not changed do not copy configs
-        if [ "$curmode" == "$old_mode" ]; then
-                /etc/init.d/environment reload
-                return
-        fi
-
-        echo $curmode >$OLD_MODE_FILE
-
-	[ -d "/etc/netmodes/$curmode" ] || return
-	logger -s -p user.info -t $0 "[netmode] Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
-	cp /etc/netmodes/$curmode/* /etc/config/
-	rm -f /etc/config/DETAILS
-	sync
-
-	local reboot=$(uci -q get netmode.$curmode.reboot)
-
-	if [ "$reboot" != "0" ]; then
-		reboot &
-		exit
-	fi
-
-	/etc/init.d/environment reload
-	case "$curmode" in
-		repeater*)
-			touch $SWITCHMODELOCK
-			logger -s -p user.info -t $0 "Switching to $curmode mode" > /dev/console
-			ubus call leds set  '{"state" : "allflash"}'
-			[ -f /etc/init.d/omcproxy ] && /etc/init.d/omcproxy stop
-			[ -f /etc/init.d/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
-}
-
-wificontrol_takes_over() {
-	local ret
-	[ -f /sbin/wificontrol ] || return
-
-	ubus call leds set  '{"state" : "allflash"}'
-
-	if pidof wificontrol >/dev/null; then
-		ret=0
-		# let netmode-conf up to 20 seconds before switching mode
-		for tm in 2 4 6 8; do
-			if [ -f /tmp/wificontrol.txt ]; then
-				ret=1
-				break
-			fi
-			sleep $tm
-		done
-		# let netmode-conf take over
-		[ $ret -eq 1 ] && return 0
-	fi
-
-	return 1
-}
-
-wait_for_netmode_handler() {
-	for tm in 2 4 6 8; do
-		if [ ! -f $SWITCHMODELOCK ]; then
-			break
-		fi
-		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_device_of() {
-	local PORT_NAMES=$(db get hw.board.ethernetPortNames)
-	local PORT_ORDER=$(db get hw.board.ethernetPortOrder)
-        local cnt=1
-        local idx=0
-
-	local pnum=$(echo $PORT_NAMES | wc -w)
-
-	if [ $pnum -le 2 ]; then
-		PORT_NAMES=$(echo $PORT_NAMES | sed 's/LAN/LAN1/g')
-	fi
-
-	# get index of interface name
-	for i in $PORT_NAMES; do
-		if [ "$i" == "$1" ]; then
-			idx=$cnt
-		fi
-		cnt=$((cnt+1))
-	done
-
-        # get port name from index
-	cnt=1
-	for i in $PORT_ORDER; do
-		if [ "$cnt" == "$idx" ]; then
-			echo $i
-		fi
-		cnt=$((cnt+1))
-	done
-}
-
-populate_netmodes() {
-	[ -f /etc/config/netmode -a -d $MODEDIR ] || return
-	local curmode
-
-	config_load netmode
-
-	config_get curmode setup curmode
-
-	mkdir -p $NMTMPDIR
-
-	if [ "$curmode" == "routed" ]; then
-		if [ $MTK -eq 1 ]; then
-			curmode="routed_mtk"
-		else
-			curmode="routed_brcm"
-		fi
-	fi
-
-	echo $curmode > $OLD_MODE_FILE
-
-	delete_netmode() {
-		uci delete netmode.$1
-	}
-
-	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)
-
-	for file in $(find $MODEDIR -type f); do
-		conf="$(echo $file | cut -d'/' -f5)"
-		if [ "$conf" == "layer2_interface_ethernet" ]; then
-			grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
-		fi
-		if [ "$conf" == "network" ]; then
-			grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
-			grep -q "\$LAN1" $file && sed -i "s/\$LAN1/$lan1/g" $file
-			grep -q "\$LAN2" $file && sed -i "s/\$LAN2/$lan2/g" $file
-			grep -q "\$LAN3" $file && sed -i "s/\$LAN3/$lan3/g" $file
-			grep -q "\$LAN4" $file && sed -i "s/\$LAN4/$lan4/g" $file
-
-			ifname="$(uci -q get $file.wan.ifname | sed 's/[ \t]*$//')"
-			uci -q set $file.wan.ifname="$ifname"
-			uci -q commit $file
-		fi
-	done
-
-	local hardware=$(db get hw.board.hardware)
-	local keys lang desc exp exclude
-	for mode in $(ls $MODEDIR); do
-
-			case "$mode" in
-				repeater*)
-					wlctl -i wl1 ap >/dev/null 2>&1 || ifconfig rai0 2>/dev/null | grep -q rai0 || continue
-				;;
-			esac
-
-			lang=""
-			desc=""
-			exp=""
-			uci -q set netmode.$mode=netmode
-			json_load "$(cat $MODEDIR/$mode/DETAILS)"
-
-			if json_select excluded_boards; then
-				exclude=0
-				_i=1
-				while json_get_var board $_i; do
-					case "$hardware" in
-						$board)
-							uci -q delete netmode.$mode
-							exclude=1
-							break
-						;;
-					esac
-					_i=$((_i+1))
-				done
-				json_select ..
-				[ $exclude -eq 1 ] && continue
-			fi
-
-			if json_select acl; then
-				_i=1
-				while json_get_var user $_i; do
-					uci add_list netmode.$mode._access_r="$user"
-					_i=$((_i+1))
-				done
-				json_select ..
-			fi
-
-			json_select description
-			json_get_keys keys
-			for k in $keys; do
-				json_get_keys lang $k
-				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
-				json_select $k
-				json_get_var desc $lang
-				uci -q set netmode.$mode."desc_$lang"="$desc"
-				[ "$lang" == "en" ] && uci -q set netmode.$mode."desc"="$desc"
-				json_select ..
-			done
-			json_select ..
-
-			json_select explanation
-			json_get_keys keys
-			for k in $keys; do
-				json_get_keys lang $k
-				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
-				json_select $k
-				json_get_var exp $lang
-				uci -q set netmode.$mode."exp_$lang"="$exp"
-				[ "$lang" == "en" ] && uci -q set netmode.$mode."exp"="$exp"
-				json_select ..
-			done
-			json_select ..
-
-			json_get_var cred credentials
-			uci -q set netmode.$mode.askcred="$cred"
-			json_get_var ulb uplink_band
-			uci -q set netmode.$mode.uplink_band="$ulb"
-			json_get_var reboot reboot
-			uci -q set netmode.$mode.reboot="$reboot"
-	done
-
-	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"
-	}
-
-	uci commit netmode
-}
-
-start_netmode_tools() {
-	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
-
-	[ $repeaterready -eq 1 ] && {
-		/sbin/netmode-discover &
-		/sbin/wificontrol --repeater &
-		return
-	}
-
-	config_get curmode setup curmode
-
-	case "$curmode" in
-		repeater*)
-			/sbin/netmode-discover &
-			/sbin/wificontrol --repeater &
-		;;
-	esac
-}
-
-stop_netmode_tools() {
-	killall -9 netmode-discover >/dev/null 2>&1
-	killall -9 wificontrol >/dev/null 2>&1
-}
-

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

@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# receive new client events
-# and trigger wificontrol in --router mode for that client
-
-. /usr/share/libubox/jshn.sh
-
-action=
-ipaddr=
-macaddr=
-network=
-
-timed_check() {
-	while true; do
-		network=${network:-lan}
-		ubus call repeater get_creds '{"network":"'$network'","file":"/tmp/wificontrol.txt"}'
-		wificontrol --router
-		sleep $1
-	done
-}
-
-is_inteno_macaddr()
-{
-	macaddr=$1
-
-	echo $macaddr | grep -i -e "^00:22:07" \
-				-e "^02:22:07" \
-				-e "^44:D4:37" \
-				-e "^00:0C:07" \
-				-e "^02:0C:07" \
-				-e "^06:0C:07" \
-				-e "^00:0C:43" \
-				-e "^02:0C:43" \
-				-e "^06:0C:43" \
-	&& return
-	false
-}
-
-timed_check 60 &
-
-while true ; do
-	ubus listen client | \
-	while read event ; do
-		#echo "netmode-client-detect got event: $event" >/dev/console
-		json_load "$event"
-		json_select client
-		json_get_var action action
-		[ "$action" == "connect" ] || continue
-		json_get_var macaddr macaddr
-		json_get_var ipaddr ipaddr
-		json_get_var network network "lan"
-
-		if is_inteno_macaddr $macaddr; then
-			logger -s -p user.info -t $0 "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
-	done
-done

inteno-netmodes/files/sbin/netmode-conf

@@ -1,308 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-. /lib/functions/netmode.sh
-
-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"
-	local ssid="$2"
-	local key="$3"
-	local encryption="$4"
-	local device="$5"
-	local old_ssid old_key old_encryption
-	if ! uci -q get wireless.@wifi-iface[$iface_num] >/dev/null 2>&1; then
-		state="reload"
-		uci add wireless wifi-iface >/dev/null 2>&1
-		uci set wireless.@wifi-iface[$iface_num].device="$device"
-	fi
-	local network="$(uci -q get wireless.@wifi-iface[$iface_num].network)"
-	old_ssid="$(uci -q get wireless.@wifi-iface[$iface_num].ssid)"
-	old_key="$(uci -q get wireless.@wifi-iface[$iface_num].key)"
-	old_encryption="$(uci -q get wireless.@wifi-iface[$iface_num].encryption)"
-	if [ "$old_ssid" != "$ssid" -o "$old_encryption" != "$encryption" -o "$old_key" != "$key" -o -z "$network" ]; then
-		#TODO: get network dynamicaly
-		[ "$state" == "exit" ] && state="apply"
-		[ -z "$network" ] && network="wan"
-		uci set wireless.@wifi-iface[$iface_num].network="$network"
-		uci set wireless.@wifi-iface[$iface_num].ssid="$ssid"
-		uci set wireless.@wifi-iface[$iface_num].key="$key"
-		uci set wireless.@wifi-iface[$iface_num].encryption="$encryption"
-	fi
-}
-
-get_wifi_device_from_band(){
-	local section="$1"
-	local band="$2"
-	local __ret="$3"
-	local b
-	config_get b $section "band"
-	if [ "$band" == "$b" ]; then
-		eval "export -- \"$__ret=$section\""
-	fi
-}
-
-get_device(){
-	local band="$1"
-	config_foreach get_wifi_device_from_band "wifi-device" "$band" "$2"
-}
-
-get_iface_num() {
-	local device="$1"
-	local prev="$2"
-	local __save="$3"
-	local i=0
-	local dev
-	while true; do
-		[ $i -gt 100 ] && break ## just a safty messure
-		if ! uci -q get wireless.@wifi-iface[$i] >/dev/null; then
-			break
-		fi
-		mode="$(uci -q get wireless.@wifi-iface[$i].mode)"
-		if [ "$mode" == "wet" -o "$mode" == "sta" ]; then
-			i=$((i+1))
-			continue
-		fi
-		dev="$(uci -q get wireless.@wifi-iface[$i].device)"
-		if [ "$dev" != "$device" ]; then
-			[ -z "$dev" ] && break
-			i=$((i+1))
-		elif [ $prev -ne 0 ]; then
-			i=$((i+1))
-			prev=$((prev-1))
-		else
-			break
-		fi
-	done
-	eval "export -- \"$__save=$i\""
-}
-
-restore() {
-	if [ "$1" == "back" ]; then
-		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
-		wifi reload
-		ubus call router.network reload
-	fi
-	rm -r $TMPPATH
-	ubus call leds set '{"state":"normal"}'
-}
-
-backup() {
-	mkdir -p $TMPPATH
-	cp /etc/config/* $TMPPATH/
-	CURMODE="$(uci -q get netmode.setup.curmode)"
-	ubus call leds set '{"state":"allflash"}'
-}
-
-###### START HERE #######
-
-file="$1"
-from_gui="$2"
-
-[ -f "$file" ] || cleanup
-
-# let netmode-handler up to 20 seconds to finish switching mode
-wait_for_netmode_handler
-
-[ "$from_gui" == "true" ] && backup
-
-json_load "`cat $file`"
-json_select "wifi_ifaces"
-
-curmode=""
-repmode=""
-config_load netmode
-config_get curmode setup curmode
-
-case $curmode in
-	*repeater*)
-	;;
-	*)
-		uci set netmode.setup.curmode="repeater"
-		uci commit netmode
-		/etc/init.d/netmode reload
-		curmode="$(uci -q get netmode.setup.curmode)"
-	;;
-esac
-
-apcliband="a"
-case $curmode in
-	*_2g_*) apcliband="b";;
-esac
-
-i=1
-
-dummy=
-band=
-ssid=
-key=
-encryption=
-device=
-iface_num=
-
-while json_get_var dummy $i; do
-	json_select $i
-	json_get_var band band
-	[ "$band" == "" -o "$apcliband" == "$band" ] && break
-	json_select ..
-	i=$((i+1))
-done
-
-[ "$apcliband" == "$band" -o "$band" == "" ] || {
-	[ "$from_gui" == "true" ] && restore "back"
-	cleanup
-}
-
-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
-}
-
-json_get_var ssid ssid
-json_get_var key key
-json_get_var encryption encryption
-
-set_wireless_values "$repeater_iface_num" "$ssid" "$key" "$encryption"
-
-json_load "`cat $file`"
-json_select "wifi_ifaces"
-
-config_load wireless
-b_num=0
-a_num=0
-
-i=1
-while json_get_var dummy $i; do
-	json_select $i
-	json_get_var band band
-	json_get_var ssid ssid
-	json_get_var encryption encryption
-	json_get_var key key
-	if [ "$band" == "" ]; then
-		get_device "a" device
-		get_iface_num "$device" "$a_num" iface_num
-		a_num=$((a_num+1))
-		[ -z $iface_num ] && {
-			[ "$from_gui" == "true" ] && restore "back"
-			cleanup
-		}
-		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
-		get_device "b" device
-                get_iface_num "$device" "$b_num" iface_num
-                b_num=$((b_num+1))
-                [ -z $iface_num ] && {
-                        [ "$from_gui" == "true" ] && restore "back"
-                        cleanup
-                }
-		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
-	else
-		get_device "$band" device
-		case $band in
-			a)
-				get_iface_num "$device" "$a_num" iface_num
-				a_num=$((a_num+1))
-				;;
-			b)
-				get_iface_num "$device" "$b_num" iface_num
-				b_num=$((b_num+1))
-				;;
-		esac
-		[ -z $iface_num ] && {
-			[ "$from_gui" == "true" ] && restore "back"
-			cleanup
-		}
-		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
-	fi
-	i=$((i+1))
-	json_select ..
-done
-
-i=$((b_num + a_num + 1))
-
-if [ $repeater_iface_num -gt $i ]; then
-	i=$((i-1))
-fi
-
-while uci -q get wireless.@wifi-iface[$i] >/dev/null; do
-	# if repeater_iface_num is greater than the number of
-	# configured downlink we need to make sure its not deleted
-	local mode="$(uci -q get wireless.@wifi-iface[$i].mode)"
-	if [ "$mode" == "wet" -o "$mode" == "sta" ]; then
-		i=$((i+1))
-		continue
-	fi
-	state="reload"
-	uci -q delete wireless.@wifi-iface[$i] >/dev/null
-	# do not increment i. The next interface will now
-	# have the same index as the deleted interface
-done
-
-uci commit wireless
-
-if [ "$from_gui" == "true" ]; then
-	# check for connectivity
-	wifi reload
-	[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
-	correct_uplink
-	i=$SLEEPTIME
-
-	while [ $i -gt 0 ]; do
-		ip=`route -n | awk '/^0.0.0.0/{print $2}'`
-		if [ "$ip" == "" ]; then
-			i=$((i-10))
-			sleep 10
-			continue
-		fi
-		ping -w1 $ip
-		if [ $? -eq 0 ]; then
-			restore
-			cleanup
-		else
-			i=$((i-10))
-			sleep 9
-		fi
-	done
-	restore "back"
-else
-	if [ "$state" == "exit" ]; then
-		cleanup
-	fi
-	ubus call leds set '{"state":"allflash"}'
-	if [ "$state" == "apply" ]; then
-		# wifi apply
-		wifi reload
-	else
-		# wifi reload
-		wifi reload
-	fi
-	[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
-	correct_uplink
-	ubus call leds set '{"state":"normal"}'
-fi
-
-cleanup

inteno-netmodes/files/sbin/netmode-discover

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-mask_to_cidr() {
-    nbits=0
-    IFS=.
-    for dec in $1 ; do
-        case $dec in
-            255) let nbits+=8;;
-            254) let nbits+=7;;
-            252) let nbits+=6;;
-            248) let nbits+=5;;
-            240) let nbits+=4;;
-            224) let nbits+=3;;
-            192) let nbits+=2;;
-            128) let nbits+=1;;
-            0);;
-            *) echo "Error: $dec is not recognised"; exit 1
-        esac
-    done
-    echo "$nbits"
-}
-
-while true; do
-	[ -e /sys/class/net/br-wan ] || {
-		sleep 5
-		continue
-	}
-
-	unlisted=0
-
-	ps | grep 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
-
-		ipaddr=$(ifconfig br-wan | grep -v inet6 | grep inet | tr ':' ' ' | awk '{print$3}')
-		netmask=$(ifconfig br-wan | grep -v inet6 | grep inet | tr ':' ' ' | awk '{print$7}')
-		mask=$(mask_to_cidr $netmask)
-	}
-
-	if [ $unlisted -gt 0 -a -n "$ipaddr" -a -n "$netmask" -a $mask -ge 24 ]; then
-		fping -c 1 -t 1000 -g $ipaddr/$mask -q >/dev/null 2>&1
-	fi
-
-	sleep 30
-done
-

inteno-netmodes/files/sbin/start-netmode-conf

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-netmode-conf "$1" "$2" &

inteno-netmodes/files/sbin/testnet

@@ -1,257 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-NETCON=0
-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() {
-		config_get ifname "$1" ifname
-		[ "$ifname" == "$2" ] && echo "wireless.$1"
-	}
-	config_load wireless
-	config_foreach get_cfgno wifi-iface $1
-}
-
-ping_uplink()
-{
-	local hasip hasdev hasmode
-	local ipaddr=""
-	local device=""
-	local rready=""
-	local wetif=""
-	local assoclist=""
-	local rv=0
-
-	[ -f /tmp/wps_client_mode_active ] && {
-		ubus call led.internet  set '{"state" : "off"}'
-		return
-	}
-
-	ipaddr="$(ip r | grep default | awk '{print$3}')"
-	[ -n "$ipaddr" ] && hasip=1 || hasip=0
-
-	device="$(ip r | grep default | awk '{print$5}')"
-	[ -n "$device" ] && hasdev=1 || hasdev=0
-		
-	rready="$(uci -q get netmode.setup.repeaterready)"
-	[ "$rready" == "1" ] && hasmode=0 || hasmode=1
-	
-	if [ "$hasmode" == "1" ] && [ "$hasip" == "0" -o "$hasdev" == "0" ]; then
-		rv=0
-	elif [ "$hasmode" == "1" ]; then
-		arping -f -q -c1 -w3 -I $device $ipaddr
-		[ $? -eq 1 ] && rv=0 || rv=1
-	else
-		SLEEP_TIME=5
-		ubus call led.internet  set '{"state" : "off"}'
-		return
-	fi
-
-	if [ $rv -eq 0 ]; then
-		echo "{ \"online\" : false }" > /tmp/internet_connection_status
-
-		SLEEP_TIME=10
-
-		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
-
-			if [ -f /usr/sbin/wlctl ]; then
-				assoclist="$(wlctl -i $wetif assoclist | head -1 | awk '{print$2}')"
-				wlctl -i $wetif reassoc $assoclsit
-			elif [ -f /usr/sbin/iwpriv ]; then
-				wetcfg="$(get_wifi_iface_cfgstr $wetif)"
-				wetssid="$(uci -q get $wetcfg.ssid)"
-				wetkey="$(uci -q get $wetcfg.key)"
-				if [ -n "$wetkey" ]; then
-					wetauth="WPA2PSK"
-					wetenc="AES"
-				else
-					wetauth="OPEN"
-					wetenc="NONE"
-				fi
-				iwpriv $wetif set ApCliEnable=0
-				iwpriv $wetif set ApCliSsid="$wetssid"
-				iwpriv $wetif set ApCliAuthMode="$wetauth"
-				iwpriv $wetif set ApCliEncrypType="$wetenc"
-				iwpriv $wetif set ApCliWPAPSK="$wetkey"
-				iwpriv $wetif set ApCliEnable=1
-				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
-		fi
-
-		enableCounter=$((enableCounter+1))
-
-		if [ $AccessPolicy -eq 1 ]; then
-			return
-		fi
-
-		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
-			}
-		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
-		echo "{ \"online\" : true }" > /tmp/internet_connection_status
-		ubus call led.internet  set '{"state" : "eok"}'
-
-		SLEEP_TIME=5
-
-		enableCounter=0
-		if [ $AccessPolicy -eq 0 ]; then
-			return
-		fi
-		# Uplink working, allow clients to connect
-		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
-}
-
-test_connection() {
-	local addr="$1"
-	local defroute="$(ip r | grep default | awk '{print$3}' | head -1)"
-	local def6route="$(ip -f inet6 r | grep default | awk '{print$3}')"
-	local ping6dev="$(ip -f inet6 r | grep default | awk '{print$5}')"
-
-	if [ -n "$addr" ]; then
-		ping -q -w 5 -c 1 $addr >/dev/null 2>&1 && return 0
-	elif [ -n "$defroute" ]; then
-		ping -q -w 5 -c 1 $defroute >/dev/null 2>&1 && return 0
-		for nmsrv in $(grep nameserver /var/resolv.conf.auto | awk '{print$2}'); do
-			ping -q -w 5 -c 1 $nmsrv >/dev/null 2>&1 && return 0
-		done
-	elif [ -n "$def6route" ] && [ -n "$ping6dev" ]; then
-		ndisc6 -w 5 -1 $def6route $ping6dev >/dev/null 2>&1 && return 0
-	fi
-	return 1
-}
-
-wan_have_ip() {
-	[ -d /sys/class/net/$ETHWAN ] || return
-	ubus list led.wan >/dev/null 2>&1 || return
-
-	local addr=$(ip a show dev $ETHWAN | grep "inet "| awk '{print $2}')
-
-	if [ -n "$addr" ]; then
-		WANIP=1
-		ubus call led.wan  set '{"state" : "ok"}'
-	else
-		WANIP=0
-	fi
-	# don't set wan here status is set from hotplug, only set when ip is detected.
-}
-
-internet_test() {
-	local link dest
-
-	dest="$(uci -q get system.@system[0].netping_addr)"
-
-	test_connection $dest
-
-	if [ "$?" -eq 0 ]; then
-		NETCON=1
-		ubus call led.internet  set '{"state" : "ok"}'
-		echo "{ \"online\" : true }" > /tmp/internet_connection_status
-	else
-		NETCON=0
-		ubus call led.internet  set '{"state" : "error"}'
-		echo "{ \"online\" : false }" > /tmp/internet_connection_status
-	fi
-}
-
-iptvtest() {
-	ubus list led.ext >/dev/null 2>&1 && TVCON=1 || return
-
-	local dest="$(uci -q get system.@system[0].tvping_addr)"
-
-	test_connection $dest
-
-	if [ "$?" -eq 0 ]; then
-		TVCON=1
-		[ -n "$dest" ] && ubus call led.ext  set '{"state" : "ok"}'
-	else
-		TVCON=0
-		[ -n "$dest" ] && ubus call led.ext  set '{"state" : "off"}'
-	fi
-}
-
-netmode_check() {
-	local curmode="$(uci -q get netmode.setup.curmode)"
-	local uplinkband="$(uci -q get netmode.$curmode.uplink_band)"
-	local rready="$(uci -q get netmode.setup.repeaterready)"
-
-	[ "$rready" == "1" ] && uplinkband="a"
-
-	echo "$uplinkband"
-}
-
-connectivity_test() {
-	if [ "$(netmode_check)" != "" ]; then
-		ping_uplink
-		return
-	fi
-
-	SLEEP_TIME=30
-
-	internet_test
-
-	if [ $NETCON -eq 1 ]; then
-		CURSTATUS=1
-		[ "$CURSTATUS" == "$LASTSTATUS" ] || ubus send internet '{"status" : "online"}'
-		LASTSTATUS=1
-	else
-		CURSTATUS=0
-		[ "$CURSTATUS" == "$LASTSTATUS" ] || ubus send internet '{"status" : "offline"}'
-		LASTSTATUS=0
-	fi
-}
-
-if [ "$1" == "once" ]; then
-	connectivity_test
-	exit 0
-fi
-
-while true; do
-	connectivity_test
-	sleep $SLEEP_TIME
-done