refs #17038

filter out the bridge when mac checking

asterisk-1.8.x-mod/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=asterisk18-mod
 PKG_VERSION:=1.8.10.1
 
-PKG_SOURCE_VERSION:=fd55c5dc4865142b7955ead96fe93b1ce888c37c
+PKG_SOURCE_VERSION:=d780c4c7a34019b6c673d36338dca9cfb34f3e46
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x
 
@@ -41,7 +41,7 @@ define Package/asterisk18-mod
 $(call Package/asterisk18-mod/Default)
   TITLE:=Complete open source PBX, v1.8x
   MENU:=1
-  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
+  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libstdcpp +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
 endef
 
 define Package/asterisk18-mod/description
@@ -451,6 +451,7 @@ define Package/asterisk18-mod/install
 	done
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/astcanary $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/default
 	$(INSTALL_DATA)  ./files/asterisk.default $(1)/etc/default/asterisk
 	$(INSTALL_DIR) $(1)/etc/init.d

asterisk-1.8.x-mod/files/asterisk.hotplug

@@ -5,14 +5,15 @@
 config_load voice_client
 config_get bindintf SIP bindintf
 
-[ "$INTERFACE" == "$bindintf" ] || exit 0
+[ "$INTERFACE" == "$bindintf" -o -z "$bindintf" ] || exit 0
 
 . /lib/functions/network.sh
 
 if [ -n "$bindintf" ]; then
 	network_get_ipaddr bindaddr "$bindintf"
-	bindaddr="${bindaddr:-0.0.0.0}"
-	sed -i "s/bindaddr=.*/bindaddr=$bindaddr/g" /etc/asterisk/sip.conf
-	[ -e /var/run/asterisk/asterisk.ctl ] && /etc/init.d/asterisk reload
+	[ -z "$bindaddr" ] && network_get_ipaddr6 bindaddr "$bindintf"
 fi
 
+bindaddr="${bindaddr:-0.0.0.0}"
+sed -i "s/bindaddr=.*/bindaddr=$bindaddr/g" /etc/asterisk/sip.conf
+[ -e /var/run/asterisk/asterisk.ctl ] && /etc/init.d/asterisk reload

asterisk-1.8.x-mod/files/asterisk.init

@@ -32,7 +32,7 @@ start_service() {
 	init_asterisk
 
 	procd_open_instance
-	procd_set_param command "$PROG" -f
+	procd_set_param command /usr/bin/taskset 2 "$PROG" -f -p -q
 	procd_set_param respawn
 	procd_close_instance
 #	service_start /usr/sbin/asterisk

ated/Makefile

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

brcmslic/Makefile

@@ -0,0 +1,47 @@
+#
+# 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.1
+PKG_SOURCE_URL:=git@private.inteno.se:brcmslic
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=837ec19e37650e424e77c921672a0806e198ba7b
+PKG_NAME:=brcmslic
+
+
+RSTRIP:=true
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/brcmslic
+  CATEGORY:=Utilities
+  TITLE:=Brcmslic
+  URL:=
+  DEPENDS:=
+endef
+
+define Package/brcmslic/description
+	Brcmslic
+endef
+
+
+define Package/brcmslic/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d/
+
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/brcmslic $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endpt $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,brcmslic))

brcmslic/files/dect.config

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

dectmngr2/Makefile

@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=1.1.0
-PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=17aa3b1d8d372ebcf4d37379f7cc4fb59c461d4b
+PKG_SOURCE_VERSION:=930b8908a0159cfdef9d5c8861791db176dad7f5
 PKG_NAME:=dectmngr2
 
 

endptcfg/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptcfg
-PKG_VERSION:=0.2
+PKG_VERSION:=0.3
 
 PKG_SOURCE_VERSION:=1194b05278bd0945ca5c76436e56617b86871a65
 ifeq ($(CONFIG_ENDPT_OPEN),y)

fping/Makefile

@@ -0,0 +1,54 @@
+#
+# 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/Makefile

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

ice-client/Makefile

@@ -19,18 +19,18 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=4.3.0
-PKG_RELEASE:=RC7
-PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+BASE_PKG_VERSION:=5.3.8
+PKG_RELEASE:=
+PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)-$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=042e769eb37e0a2a7000b88e7f73e74f50ce52b7
+PKG_SOURCE_VERSION:=5cc855907b9d6a13d36fd619b579fcf3c6f24b5c
 ifeq ($(CONFIG_ICE_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
+TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
-PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(TARGET_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 else
@@ -154,6 +154,7 @@ 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

ice-client/files/ice-client.uci_default

@@ -1,13 +1,15 @@
 #!/bin/sh
 
 grep -rq "^ice:" /etc/passwd || {
-	local password="$(db get hw.board.wpaKey)"
-	if [ -n "$password" ]; then
-		adduser -D -H -s /bin/false ice
-		(echo $password; sleep 1; echo $password) | passwd ice >/dev/null 2>&1
-	fi
+	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
 
@@ -47,6 +49,7 @@ config login
 	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'
@@ -56,6 +59,7 @@ config login
 	list write 'juci-usb'
 	list write 'core'
 	list write 'unauthenticated'
+
 EOF
 }
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2017-03-17
+PKG_VERSION:=3.0-2018-03-01
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ff91f29aef6aa366db9bfaad20783fef853509e4
+PKG_SOURCE_VERSION:=af5476c35d03c03f82c22a65cba932f6df096808
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -66,6 +66,10 @@ define Build/Prepare
 endef
 endif
 
+ifeq ($(CONFIG_TARGET_IBOARDID),"EX400")
+TARGET_CFLAGS += -DEX400
+endif
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
@@ -122,16 +126,18 @@ endif
 
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(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/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
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/90-cwmpfirewall
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(CP) ./files/icwmp.hotplug $(1)/etc/hotplug.d/iface/90-icwmp
 ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
 	$(INSTALL_DIR) $(1)/usr/share/icwmp
 	$(CP) $(PKG_BUILD_DIR)/scripts/defaults $(1)/usr/share/icwmp

icwmp/files/icwmp.hotplug

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

inbd/Makefile

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

inteno-netmodes/Makefile

@@ -12,6 +12,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/inteno-netmodes
   CATEGORY:=Base system
+  DEPENDS:=+fping
   TITLE:=Predefined Network Modes
 endef
 

inteno-netmodes/files/etc/hotplug.d/iface/01-close-ports-repeater

@@ -1,39 +0,0 @@
-[ "$INTERFACE" != "wan" ] && exit
-ip="$(ip a show $DEVICE | awk '/inet / {print $2; exit}')"
-ip="${ip%%/*}"
-
-[ -z "$ip" ] && exit
-
-handle_rule() {
-	local name enabled
-	enabled=$2
-	config_get name $1 name
-	if [ "$name" == "Repeater-Management" ]; then
-		uci set firewall.$1.enabled="$enabled"
-		uci commit firewall
-	fi
-}
-
-set_enabled() {
-	local enabled=$1
-	config_load firewall
-	config_foreach handle_rule rule $enabled
-}
-
-test_ip() {
-	if [ -n "$(echo $ip | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ]; then
-		set_enabled 1
-	else
-		set_enabled 0
-	fi
-}
-	
-
-case "$(uci -q get netmode.setup.curmode)" in
-                repeater|repeater_dualdown)
-			test_ip
-                ;;
-                *)
-			exit
-                ;;
-esac

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

@@ -0,0 +1,119 @@
+#!/bin/sh
+
+[ "$INTERFACE" != "wan" ] && exit
+
+. /lib/functions/network.sh
+
+network_get_ipaddr ip $INTERFACE
+repeaterready="$(uci -q get netmode.setup.repeaterready)"
+
+[ -z "$ip" ] && exit
+
+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
+}
+
+set_disabled() {
+	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
+}
+
+switch_mode() {
+	[ "$repeaterready" == "1" ] || return
+
+	# flush the ip on br-lan; br-lan will anyhow be deleted.
+	# this is needed if the ip received on the wan is also from the same net
+	ip addr flush dev br-lan
+
+	# flush iptables in case the MASTER
+	# tries to configure us before
+	# firewall is disabled the proper way
+	iptables -F
+
+	ubus call leds set  '{"state" : "allflash"}'
+
+	local 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
+
+	# go head with switching mode
+	touch -f /tmp/switching_mode
+	echo "Switching to 'extender' mode" > /dev/console
+	uci -q set netmode.setup.curmode='repeater'
+	uci set netmode.setup.repeaterready=0
+	uci commit netmode
+	/etc/init.d/netmode reload
+	echo "Restarting network services" > /dev/console
+	ubus call network reload
+	wifi reload nodat
+	ubus call router.network reload
+	ubus call leds set  '{"state" : "normal"}'
+	rm -f /tmp/switching_mode
+}
+
+test_ip() {
+	if [ -n "$(echo $ip | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ]; then
+		# private IP
+		switch_mode
+		set_disabled 1
+	else
+		# public IP
+		set_disabled 0
+		[ "$1" -eq "1" ] && {
+			uci set netmode.setup.repeaterready=0
+			uci commit netmode
+			local pid="$(ps | grep wificontro[l] | awk '/repeater/ {print $1}')"
+			[ "$pid" != "" ] && kill -9 $pid
+			pid="$(pidof netmode-client-detect)"
+			[ "$pid" == "" ] && /sbin/netmode-client-detect &
+
+			# set default JUCI page to overview
+			uci -q set juci.juci.homepage="overview"
+			uci commit juci
+		}
+	fi
+}
+
+case "$(uci -q get netmode.setup.curmode)" in
+		repeater*) test_ip ;;
+		*) [ "$repeaterready" == "1" ] && test_ip 1;;
+esac
+

inteno-netmodes/files/etc/hotplug.d/iface/100-lan-follow-wan

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+
+follow_wan='0'
+config_load dhcp
+config_get follow_wan 'lan' dhcpv6_follow_wan 0
+
+test $follow_wan = '1' || exit 0
+
+PROTO=""
+
+get_dhcp_version_of_interface() {
+	config_get PROTO $INTERFACE proto
+
+	if [ -n "$PROTO" ]; then
+		return
+	fi
+}
+
+config_load network
+config_foreach get_dhcp_version_of_interface interface
+
+lan_v6_on() {
+	logger -t lan-follow-wan "turning ON IPv6 on LAN"
+	uci set dhcp.lan.dhcpv6='server'
+}
+
+lan_v6_off() {
+	logger -t lan-follow-wan "turning OFF IPv6 on LAN"
+	uci set dhcp.lan.dhcpv6='disabled'
+}
+
+case "$ACTION" in
+	ifup)
+		if [ "$PROTO" = "dhcpv6" ]; then
+			network_flush_cache
+			network_get_ipaddr6 current_ipv6_address $INTERFACE
+
+			if [ -n "$current_ipv6_address" ]; then
+				lan_v6_on
+			else
+				lan_v6_off
+			fi
+		elif [ "$PROTO" = "dhcp" ]; then
+			lan_v6_off
+		fi
+
+		uci commit
+		/etc/init.d/odhcpd restart
+
+		;;
+esac

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

@@ -0,0 +1,251 @@
+#!/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
+
+local lockfile="/tmp/70-shiftrange.lock"
+local restricted_nets=""
+local 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

@@ -3,16 +3,23 @@
 . /lib/functions.sh
 include /lib/network
 
+# exit if no wet interface is available
+uci show wireless | grep mode | grep -q wet || exit
+
 ps | grep hotplug | grep button && exit
 
-WANDEV="eth0.2"
+MTK=0
+[ "$(db -q get hw.board.hardware)" == "EX400" ] && MTK=1
+
+WANDEV="$(uci get layer2_interface_ethernet.Wan.ifname)"
+[ $MTK -eq 1 ] && WANDEV="eth0.2"
 
 [ "$INTERFACE" != "$WANDEV" ] && exit
 
 defroute=$(ip route | grep default | awk '{print$3}')
 
 case "$(uci get netmode.setup.curmode)" in
-		repeater|repeater_dualdown)
+		repeater*)
 			echo "Preparing to switch mode"
 		;;
 		*)
@@ -21,8 +28,6 @@ case "$(uci get netmode.setup.curmode)" in
 		;;
 esac
 
-echo "0" > /sys/devices/virtual/net/br-wan/bridge/multicast_snooping
-
 get_wifi_wet_interface() {
 	handle_interface() {
 		config_get mode "$1" mode
@@ -32,7 +37,7 @@ get_wifi_wet_interface() {
 		fi
 	}
 	config_load wireless
-	config_foreach handle_interface wifi-iface "$device"
+	config_foreach handle_interface wifi-iface
 }
 
 get_wifi_iface_cfgstr() {
@@ -41,14 +46,16 @@ get_wifi_iface_cfgstr() {
 		[ "$ifname" == "$2" ] && echo "wireless.$1"
 	}
 	config_load wireless
-	config_foreach get_cfgno wifi-iface $1 $2
+	config_foreach get_cfgno wifi-iface $1
 }
 
-link=$(swconfig dev switch0 port 0 get link | awk '{print$2}' | cut -d':' -f2)
+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)
 
 case "$ACTION" in
 	add|register)
 		[ "$link" == "down" ] && return
+		ubus call leds set  '{"state" : "allflash"}'
 		echo "Autoswitch to Extender mode" > /dev/console
 		sleep 2
 		wetif="$(get_wifi_wet_interface)"
@@ -63,10 +70,16 @@ case "$ACTION" in
 		uci set network.wan.ifname="$(echo $WANDEV $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$wetif //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
 		uci commit network
 		ubus call network reload
+		sleep 1
+		ubus call network.device set_state "{\"name\":\"$wetif\", \"defer\":true}"
+		[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss down 2>/dev/null
 		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
+		ubus call router.network reload
+		ubus call leds set  '{"state" : "normal"}'
 	;;
 	remove|unregister)
 		[ "$link" == "up" ] && return
+		ubus call leds set  '{"state" : "allflash"}'
 		echo "Autoswitch to Repeater mode" > /dev/console
 		sleep 2
 		wetif="$(get_wifi_wet_interface)"
@@ -81,6 +94,16 @@ case "$ACTION" in
 		uci set network.wan.ifname="$(echo $wetif $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$WANDEV //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
 		uci commit network
 		ubus call network reload
-		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
+		sleep 1
+		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
+		[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss up 2>/dev/null
+		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || {
+			killall -9 wifi
+			wifi reload nodat
+			killall -USR1 udhcpc
+		}
+		ubus call router.network reload
+		ubus call leds set  '{"state" : "normal"}'
 	;;
 esac
+

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

@@ -3,6 +3,9 @@
 START=10
 USE_PROCD=1
 
+TMPDIR=/var/netmodes
+OLD_MODE_FILE=/var/netmodes/old_mode
+
 . /usr/share/libubox/jshn.sh
 . /lib/network/config.sh
 
@@ -41,13 +44,29 @@ get_device() {
 
 populate_netmodes() {
 	[ -f /etc/config/netmode -a -d $modedir ] || return
+	local curmode
+
+	config_load netmode
+
+	config_get curmode setup curmode
+
+	mkdir -p $TMPDIR
+
+	if [ "$curmode" == "routed" ]; then
+		local hw="$(db -q get hw.board.hardware)"
+		if [ "$hw" == "EX400" ]; then
+			curmode="routed_mtk"
+		else
+			curmode="routed_brcm"
+		fi
+	fi
+
+	echo $curmode > $OLD_MODE_FILE
 
 	delete_netmode() {
 		uci delete netmode.$1
 	}
 
-	config_load netmode
-
 	config_foreach delete_netmode netmode
 	uci commit netmode
 
@@ -59,11 +78,21 @@ populate_netmodes() {
 	lan5=$(get_device LAN5)
 
 	for file in $(find $modedir -type f); do
-		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
+		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)
@@ -80,7 +109,6 @@ populate_netmodes() {
 			desc=""
 			exp=""
 			uci -q set netmode.$mode=netmode
-			uci -q set netmode.$mode.conf=$mode
 			json_load "$(cat $modedir/$mode/DETAILS)"
 
 			if json_select excluded_boards; then
@@ -142,72 +170,154 @@ populate_netmodes() {
 			json_get_var reboot reboot
 			uci -q set netmode.$mode.reboot="$reboot"
 	done
+
+	config_get curmode setup curmode
+	[ -d /etc/netmodes/$curmode ] || {
+		[ "$(db -q get hw.board.hardware)" == "EX400" ] && uci -q set netmode.setup.curmode="routed_mtk" || uci -q set netmode.setup.curmode="routed_brcm"
+	}
+
 	uci commit netmode
 }
 
-convert_macros() {
-	local BMAC=$(db -q get hw.board.BaseMacAddr | tr -d ':')
-	local MACLAN=$(printf "%0.12x\n" $((0x$BMAC)))
-	local MACWAN=$(printf "%0.12x\n" $((0x$BMAC + 1)))
-	local BSSID=$(printf "%0.12x\n" $((0x$BMAC + 2)))
-	local BSSID4=$(echo -n $BSSID | tail -c 4 | tr 'a-z' 'A-Z')
-
-	MACLAN=$(echo $MACLAN | sed -e "s/.\{2\}/&:/g")
-	MACWAN=$(echo $MACWAN | sed -e "s/.\{2\}/&:/g")
-
-	MACLAN=${MACLAN:0:17}
-	MACWAN=${MACWAN:0:17}
-
-	grep -q "\$MACLAN" /etc/config/network && sed -i "s/\$MACLAN/$MACLAN/g" /etc/config/network
-	grep -q "\$MACWAN" /etc/config/network && sed -i "s/\$MACWAN/$MACWAN/g" /etc/config/network
-	grep -q "\$BSSID4" /etc/config/network && sed -i "s/\$BSSID4/$BSSID4/g" /etc/config/network
-}
-
 switch_netmode() {
 	[ -f /etc/config/netmode -a -d $modedir ] || return
 
+	local netreload="$1"
+	local curmode conf repeaterready old_mode
+
 	config_load netmode
 
 	config_get curmode setup curmode
-	config_get conf $curmode conf
-	cp /etc/netmodes/$conf/* /etc/config/
+
+	config_get repeaterready setup repeaterready "0"
+	if [ "$repeaterready" == "1" ] ; then
+		uci -q set netmode.setup.repeaterready="0"
+		uci commit netmode
+	fi
+
+	if [ "$curmode" == "repeater" ]; then
+		local hw="$(db -q get hw.board.hardware)"
+		if [ "$hw" == "EX400" ]; then
+			curmode="repeater_mtk_5g_up_dual_down"
+		else
+			curmode="repeater_brcm_2g_up_dual_down"
+		fi
+		uci set netmode.setup.curmode="$curmode"
+		uci commit netmode
+	fi
+	if [ "$curmode" == "routed" ]; then
+		local hw="$(db -q get hw.board.hardware)"
+		if [ "$hw" == "EX400" ]; then
+			curmode="routed_mtk"
+		else
+			curmode="routed_brcm"
+		fi
+		uci set netmode.setup.curmode="$curmode"
+		uci commit netmode
+	fi
+
+	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/enviroment reload
+                return
+        fi
+
+        echo $curmode >$OLD_MODE_FILE
+
+	[ -d "/etc/netmodes/$curmode" ] || return
+	cp /etc/netmodes/$curmode/* /etc/config/
 	rm -f /etc/config/DETAILS
-	convert_macros
 	sync
-
-	case "$curmode" in
-		repeater|repeater_dualdown)
-			echo "0" > /sys/devices/virtual/net/br-wan/bridge/multicast_snooping
-		;;
-	esac
-
 	local reboot=$(uci -q get netmode.$curmode.reboot)
 	local askcred=$(uci -q get netmode.$curmode.askcred)
 	if [ "$reboot" == "0" ]; then
-		#/etc/init.d/enviroment reload
-		if [ "$askcred" == "1" -a -f /tmp/wifi_imported_credentials ]; then
-			wifi import "$(cat /tmp/wifi_imported_credentials)"
-			rm -f /tmp/wifi_imported_credentials
-			ubus call network reload
-			wifi reload nodat
-			sleep 5
-			ubus call router.network reload
-		fi
+		/etc/init.d/enviroment reload
+		case "$curmode" in
+			routed*)
+				ubus call uci commit '{"config":"network"}'
+			;;
+			repeater*)
+				if [ -f /etc/init.d/omcproxy ]; then
+					/etc/init.d/omcproxy stop
+				fi
+				if [ "$netreload" != "0" ]; then
+					ubus call uci commit '{"config":"network"}'
+				fi
+			;;
+		esac
 	else
 		reboot &
 	fi
 }
 
+start_client_listener() {
+	local curmode repeaterready ulcpid
+
+	config_load netmode
+	config_get repeaterready setup repeaterready 0
+
+	ulcpid=$(ps | grep "ubus listen client" | grep -v grep | awk '{print$1}')
+
+	[ $repeaterready -eq 1 ] && {
+		killall -SIGKILL netmode-client-detect >/dev/null 2>&1
+		kill -9 $ulcpid >/dev/null 2>&1
+		return
+	}
+
+	config_get curmode setup curmode
+
+	case "$curmode" in
+		repeater*)
+			killall -SIGKILL netmode-client-detect >/dev/null 2>&1
+			kill -9 $ulcpid >/dev/null 2>&1
+		;;
+		*)
+			pidof netmode-client-detect || /sbin/netmode-client-detect &
+		;;
+	esac
+}
+
+start_netmode_discover() {
+	local curmode repeaterready
+
+	killall -9 netmode-discover >/dev/null 2>&1
+
+	config_load netmode
+	config_get repeaterready setup repeaterready 0
+
+	[ $repeaterready -eq 1 ] && return
+
+	config_get curmode setup curmode
+
+	case "$curmode" in
+		repeater*)
+			/sbin/netmode-discover &
+		;;
+	esac
+}
+
 start_service() {
 	populate_netmodes
+	start_client_listener
+	start_netmode_discover
 }
 
 reload_service() {
-        switch_netmode
+        switch_netmode "$1"
 
 	# set default JUCI page to overview
 	uci -q set juci.juci.homepage="overview"
 	uci commit juci
+
+	start_client_listener
+	start_netmode_discover
+}
+
+stop_service() {
+	killall -SIGKILL netmode-client-detect >/dev/null 2>&1
+	killall -9 netmode-discover >/dev/null 2>&1
 }
 
 service_triggers()

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

@@ -4,6 +4,13 @@ config wifi-status 'status'
 	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'

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

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

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

@@ -4,6 +4,13 @@ config wifi-status 'status'
 	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'

inteno-netmodes/files/etc/netmodes/one_bridged_port/DETAILS

@@ -0,0 +1,16 @@
+{
+	"description": [
+		{ "en" : "Routed, LAN1 bridged" },
+		{ "sv" : "Routed, LAN1 bryggad" }
+
+	],
+	"explanation": [
+		{ "en" : "LAN4 port is bridged with internet" },
+                { "sv" : "LAN4 port överbryggas med internet" }
+	],
+	"excluded_boards" : [
+		"EX4*"
+	],
+	"credentials" : 0
+}
+

inteno-netmodes/files/etc/netmodes/one_bridged_port/network

@@ -0,0 +1,31 @@
+
+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 '$LAN2 $LAN3 $LAN4'
+	option ip6assign '64'
+	
+config interface 'wan'
+	option type 'bridge'
+	option proto 'dhcp'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
+	option ifname '$WAN.1 $LAN1'
+	option reqopts '43 66 67 128 132 224 225 226'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname '@wan'
+	option reqaddress 'try'
+	option reqprefix 'auto'
+

inteno-netmodes/files/etc/netmodes/repeater/firewall

@@ -1,113 +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		wan
-	list   network		'wan'
-	option input		REJECT
-	option output		ACCEPT
-	option forward		REJECT
-	option masq		1
-	option mtu_fix		1
-
-# 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
-
-config rule
-	option name		Repeater-Management
-	option src		wan
-	option proto		tcp
-	option dest_port	'22 80 8080 8181 9876'
-	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/repeater_brcm_2g_up_5g_down/DETAILS

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

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

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

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

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

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

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

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

@@ -10,9 +10,11 @@
 	"excluded_boards" : [
 		"DG15*",
 		"DG40*",
-		"EG40*"
+		"EG40*",
+		"EX40*",
+		"F*"
 	],
-	"uplink_band": 'b',
+	"uplink_band" : "b",
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }

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

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

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

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

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

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

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

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

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/owsd

@@ -0,0 +1,39 @@
+config owsd 'global'
+	option sock '/var/run/ubus.sock'
+	option www '/www'
+	option redirect '/cgi-bin/luci:/cacheflush.html'
+
+config owsd-listen 'loopback'
+	option port '80'
+	option interface 'loopback'
+	option ipv6 'on'
+	list origin '*'
+
+config owsd-listen 'lan'
+	option port '80'
+	option interface 'lan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	option whitelist_dhcp_domains '1'
+
+config owsd-listen 'wan'
+	option port '80'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8080'
+	option port '8080'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8181'
+	option port '8181'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+

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

@@ -4,14 +4,20 @@ config wifi-status 'status'
 	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  1
+	option channel  auto
 	option bandwidth '20'
-	option hwmode   11n
+	option hwmode   auto
 	option htmode   HT20
 	option country 'DE'
-	option beamforming 0
 
 config wifi-iface
 	option device   ra0
@@ -21,15 +27,16 @@ config wifi-iface
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	ra0
+	option wps_pbc	1
 
 config wifi-device  rai0
 	option band a
-	option channel  36
+	option channel  auto
 	option bandwidth '80'
 	option hwmode   11ac
 	option htmode   VHT80
 	option country 'DE'
-	option beamforming 0
+	option beamforming 1
 
 config wifi-iface
 	option device   rai0
@@ -39,6 +46,7 @@ config wifi-iface
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	rai0
+	option wps_pbc	1
 
 config wifi-iface
 	option device   ra0

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

@@ -8,11 +8,10 @@
 		{ "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" : [
-		"DG15*",
-		"DG40*",
-		"EG40*"
+		"*G*",
+		"F*"
 	],
-	"uplink_band": 'a',
+	"uplink_band" : 'a',
 	"credentials" : 1,
-	"reboot" : 0
+	"reboot" : 1
 }

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/owsd

@@ -0,0 +1,39 @@
+config owsd 'global'
+	option sock '/var/run/ubus.sock'
+	option www '/www'
+	option redirect '/cgi-bin/luci:/cacheflush.html'
+
+config owsd-listen 'loopback'
+	option port '80'
+	option interface 'loopback'
+	option ipv6 'on'
+	list origin '*'
+
+config owsd-listen 'lan'
+	option port '80'
+	option interface 'lan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	option whitelist_dhcp_domains '1'
+
+config owsd-listen 'wan'
+	option port '80'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8080'
+	option port '8080'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8181'
+	option port '8181'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+

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

@@ -4,14 +4,20 @@ config wifi-status 'status'
 	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  1
+	option channel  auto
 	option bandwidth '20'
-	option hwmode   11n
+	option hwmode   auto
 	option htmode   HT20
 	option country 'DE'
-	option beamforming 0
 
 config wifi-iface
 	option device   ra0
@@ -21,15 +27,16 @@ config wifi-iface
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	ra0
+	option wps_pbc	1
 
 config wifi-device  rai0
 	option band a
-	option channel  36
+	option channel  auto
 	option bandwidth '80'
 	option hwmode   11ac
 	option htmode   VHT80
 	option country 'DE'
-	option beamforming 0
+	option beamforming 1
 
 config wifi-iface
 	option device   rai0
@@ -39,6 +46,7 @@ config wifi-iface
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	rai0
+	option wps_pbc	1
 
 config wifi-iface
 	option device   rai0

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

@@ -7,6 +7,9 @@
 		{ "en" : "" },
 		{ "sv" : "" }
 	],
+	"excluded_boards" : [
+		"EX4*"
+	],
 	"credentials" : 0
 }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9,15 +9,27 @@ config defaults
 # 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
@@ -27,16 +39,6 @@ config rule
 	option dest_port	68
 	option target		ACCEPT
 	option family		ipv4
-	option hidden		1
-
-config rule
-	option name		Repeater-Management
-	option src		wan
-	option proto		tcp
-	option dest_port	'22 80 8080 8181 9876'
-	option target		ACCEPT
-	option family		ipv4
-	option hidden		1
 
 # Allow IPv4 ping
 config rule
@@ -46,7 +48,13 @@ config rule
 	option icmp_type	echo-request
 	option family		ipv4
 	option target		ACCEPT
-	option hidden		1
+
+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
@@ -60,13 +68,24 @@ config rule
 	option dest_port	546
 	option family		ipv6
 	option target		ACCEPT
-	option hidden		1
+
+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
+	option proto	icmp
 	list icmp_type		echo-request
 	list icmp_type		echo-reply
 	list icmp_type		destination-unreachable
@@ -81,7 +100,6 @@ config rule
 	option limit		1000/sec
 	option family		ipv6
 	option target		ACCEPT
-	option hidden		1
 
 # Allow essential forwarded IPv6 ICMP traffic
 config rule
@@ -99,15 +117,37 @@ config rule
 	option limit		1000/sec
 	option family		ipv6
 	option target		ACCEPT
-	option hidden		1
+
+# 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 SIP and RTP traffic
+# include a file with rules for prioritizing some specific packets
 config include
-	option path /etc/firewall.sip
+	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/omcproxy

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

@@ -4,14 +4,20 @@ config wifi-status 'status'
 	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  1
+	option channel  auto
 	option bandwidth '20'
-	option hwmode   11n
+	option hwmode   auto
 	option htmode   HT20
 	option country 'DE'
-	option beamforming 0
 
 config wifi-iface
 	option device   ra0
@@ -20,15 +26,16 @@ config wifi-iface
 	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
+	option wps_pbc	1
 
 config wifi-device  rai0
 	option band a
-	option channel  36
+	option channel  auto
 	option bandwidth '80'
 	option hwmode   11ac
 	option htmode   VHT80
 	option country 'DE'
-	option beamforming 0
+	option beamforming 1
 
 config wifi-iface
 	option device   rai0
@@ -37,4 +44,5 @@ config wifi-iface
 	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
+	option wps_pbc	1
 

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

@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# receive new client events
+# and trigger wificontrol in --router mode for that client
+
+. /usr/share/libubox/jshn.sh
+
+local 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" \
+				-e "^34:E3:80" \
+	&& 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
+			echo "netmode-client-detect: a new Inteno device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
+			ubus call repeater get_creds '{"network":"'$network'","file":"/tmp/wificontrol.txt"}'
+			/sbin/wificontrol --router --destination $ipaddr
+		fi
+	done
+done

inteno-netmodes/files/sbin/netmode-conf

@@ -0,0 +1,289 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+state="exit"
+TMPPATH="/tmp/netmode_config_backup"
+CURMODE=""
+SLEEPTIME=300
+
+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/
+		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" ] || exit
+
+# let netmode-handler up to 20 seconds to finish switching mode
+for tm in 2 4 6 8; do
+	if [ ! -f /tmp/switching_mode ]; then
+		break
+	fi
+	sleep $tm
+done
+
+[ "$from_gui" == "true" ] && backup
+
+json_load "`cat $file`"
+json_select "wifi_ifaces"
+
+local 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
+
+local apcliband="a"
+case $curmode in
+	*_2g_*) apcliband="b";;
+esac
+
+i=1
+
+local 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"
+	exit
+}
+
+repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta'"  | sed 's/.*\[\([0-9]\)\].*/\1/')
+
+[ "$repeater_iface_num" ] && {
+	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
+local b_num=0
+local 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"
+			exit
+		}
+		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"
+                        exit
+                }
+		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"
+			exit
+		}
+		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
+	fi
+	i=$((i+1))
+	json_select ..
+done
+
+if [ -z $repeater_iface_num ] ; then
+	i=$((b_num + a_num))
+else
+	i=$((b_num + a_num + 1))
+fi
+
+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_interface_ethernet -a -f /etc/config/layer2_interface_ethernet ] && /etc/init.d/layer2_interface_ethernet reload
+	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
+			exit
+		else
+			i=$((i-10))
+			sleep 9
+		fi
+	done
+	restore "back"
+else
+	if [ "$state" == "exit" ]; then
+		return
+	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_interface_ethernet -a -f /etc/config/layer2_interface_ethernet ] && /etc/init.d/layer2_interface_ethernet reload
+	ubus call leds set '{"state":"normal"}'
+fi

inteno-netmodes/files/sbin/netmode-discover

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+local unlisted mac ipaddr netmask mask
+
+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
+	unlisted=0
+
+	ps | grep -q wifi | grep -q reload || {
+		for mac in $(brctl showmacs br-wan 2>/dev/null | tail -n +2 | grep no | awk '{print$2}'); do
+			grep -q "$mac" /proc/net/arp || unlisted=$((unlisted+1))
+		done
+
+		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" ]; then
+		fping -c 1 -t 1000 -g $ipaddr/$mask -q >/dev/null 2>&1
+	fi
+
+	sleep 40
+done
+

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

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

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

@@ -0,0 +1,141 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+get_if_creds() {
+	local section=$1
+	local network=$2
+	local net dev ssid key encryption band
+	config_get net $section "network" "lan"
+	if [ "$net" == "$network" ]; then
+		config_get dev $section "device"
+		band="$(uci -q get wireless.$dev.band)"
+		config_get ssid $section ssid
+		config_get key $section key
+		config_get encryption $section encryption
+		config_get disabled $section disabled 0
+		[ $disabled -eq 1 ] && return
+		[ "$ssid" == "" -o "$band" == "" ] && return
+		json_add_object
+		json_add_string "ssid" "$ssid"
+		json_add_string "band" "$band"
+		json_add_string "key" "$key"
+		json_add_string "encryption" "$encryption"
+		json_close_object
+	fi
+}
+
+validate_file() {
+	local file="$1"
+	local real="$(readlink -f `dirname $file`)"
+	real="${real}/`basename $file`"
+	case "$real" in
+		/tmp/*)
+			touch $real && return 0 || return 1
+		;;
+		*)
+			return 1
+		;;
+	esac
+}
+
+write_error(){
+	json_init
+	json_add_string "status" "error: $1"
+	json_dump
+	exit 1
+}
+
+duplicate_if_single_radio() {
+	json_select "wifi-ifaces"
+	local i=1
+	local dummy band dup_band num_radios
+
+	num_radios="$(uci -q show wireless | grep wifi-device | wc -l)"
+
+	[ "$num_radios" == "2" ] && return
+
+	band="$(uci -q get wireless.@wifi-device[0].band)"
+
+	[ "$band" == "a" ] && dup_band="b"
+	[ "$band" == "b" ] && dup_band="a"
+	[ -z "$dup_band" ] && return
+
+
+	while json_get_var dummy $i; do
+		i=$((i+1))
+	done
+	i=$((i-1))
+	local ssid key encryption
+	while [ $i -gt 0 ]; do
+		json_select $i
+		json_get_var ssid ssid
+		json_get_var key key
+		json_get_var encryption encryption
+		json_select ..
+		json_add_object
+		json_add_string "ssid" "$ssid"
+		json_add_string "band" "$dup_band"
+		json_add_string "key" "$key"
+		json_add_string "encryption" "$encryption"
+		json_close_object
+		i=$((i-1))
+	done
+}
+
+case "$1" in
+	list)
+		echo '{ "get_creds": { "network": "str", "file": "str" }, "set_creds": { "file": "str", "from_gui": "str" } }'
+	;;
+	call)
+		case "$2" in
+			get_creds)
+				#TODO: if not routed exit
+				local curmode="$(uci -q get netmode.setup.curmode)"
+				case $curmode in
+					*repeater*) write_error "not in repeater mode";;
+				esac
+				local network file input
+				read input
+				json_load $input
+				json_get_var network network
+				json_get_var file file
+
+				json_init
+				json_add_array "wifi-ifaces"
+				config_load wireless
+				config_foreach get_if_creds "wifi-iface" "$network"
+				json_close_array
+
+				duplicate_if_single_radio
+
+				if [ "$file" == "" ]; then
+					json_dump
+				else
+					validate_file $file && json_dump -i >$file || write_error "invalid filename (\"$file\"), file must be in /tmp/ and in an existing directory"
+				fi
+				json_init
+				json_add_string "status" success
+				json_dump
+			;;
+			set_creds)
+				local file from_gui
+				read input
+				json_load "$input"
+				json_get_var file file
+				json_get_var from_gui from_gui
+				validate_file "$file" || write_error "invalid filename (\"$file\"), file must be in /tmp and exist"
+				json_load "`cat $file`" || write_error "invalid file content"
+				json_select "wifi_ifaces" || write_error "invalid file content"
+
+
+				json_init
+				json_add_string "status" success
+				json_dump
+
+				netmode-conf "$file" "$from_gui" >/dev/null 2>&1 &
+			;;
+		esac
+	;;
+esac

iop/configs/config

@@ -3,7 +3,7 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-CONFIG_LOCALMIRROR="http://mirror.inteno.se/mirror"
+# CONFIG_LOCALMIRROR is not set
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
@@ -22,7 +22,7 @@ CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_ice-client=y
 CONFIG_PACKAGE_ice-client-camerawatch=m
-# CONFIG_PACKAGE_ice-client-fileme is not set
+CONFIG_PACKAGE_ice-client-fileme=m
 CONFIG_PACKAGE_ice-client-gigaset=m
 CONFIG_PACKAGE_ice-client-guest=m
 CONFIG_PACKAGE_ice-client-iperf=m
@@ -31,6 +31,7 @@ CONFIG_PACKAGE_ice-client-monitor=m
 CONFIG_PACKAGE_ice-client-netrounds=m
 CONFIG_PACKAGE_ice-client-rshell=m
 CONFIG_PACKAGE_ice-client-texec=m
+CONFIG_PACKAGE_icwmp-curl=y
 CONFIG_PACKAGE_inteno-netmodes=y
 CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
@@ -55,9 +56,11 @@ CONFIG_PACKAGE_juci-dropbear=y
 CONFIG_PACKAGE_juci-ethernet=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
+CONFIG_PACKAGE_juci-ice-client=y
+CONFIG_PACKAGE_juci-icwmp=y
 CONFIG_PACKAGE_juci-igmpinfo=y
 CONFIG_PACKAGE_juci-inteno-backup=y
-CONFIG_PACKAGE_juci-inteno-multiwan=y
+CONFIG_PACKAGE_juci-mwan3=y
 CONFIG_PACKAGE_juci-inteno-provisioning=y
 CONFIG_PACKAGE_juci-inteno-qos=y
 CONFIG_PACKAGE_juci-inteno-voice-client=y
@@ -69,8 +72,10 @@ CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-owsd=y
+CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
+CONFIG_PACKAGE_juci-samba=y
 CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
@@ -83,12 +88,15 @@ CONFIG_PACKAGE_juci-utils=y
 CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-siit=y
 CONFIG_PACKAGE_layer2interface=y
+CONFIG_PACKAGE_libcgroup-daemon=y
+CONFIG_PACKAGE_libcgroup=y
 # CONFIG_PACKAGE_libcgroup-utils is not set
 CONFIG_PACKAGE_ldd=y
 CONFIG_PACKAGE_libdaemon=y
 CONFIG_PACKAGE_libffmpeg-mini=y
 CONFIG_PACKAGE_libgmp=y
 CONFIG_PACKAGE_libreadline=y
+CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_minidlna=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mtd-utils=y
@@ -96,7 +104,7 @@ CONFIG_PACKAGE_mtd-utils-deubinize=y
 CONFIG_PACKAGE_mtd-utils-imagewrite=y
 CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y
 CONFIG_PACKAGE_mtd-utils-nanddump=y
-CONFIG_PACKAGE_multiwan=y
+CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_odhcp6c=y
@@ -104,12 +112,13 @@ CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_p910nd=y
+# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
 CONFIG_PACKAGE_ppp-mod-pppoa=y
 CONFIG_PACKAGE_ppp-mod-pppol2tp=y
+CONFIG_PACKAGE_ppp-mod-pptp=y
 CONFIG_PACKAGE_ppp-multilink=y
 # CONFIG_PACKAGE_ppp is not set
 CONFIG_PACKAGE_qos-scripts=y
@@ -119,6 +128,8 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_samba3=y
+CONFIG_PACKAGE_samba3-nmbd=y
 CONFIG_PACKAGE_snmpd=y
 CONFIG_PACKAGE_strace=y
 CONFIG_PACKAGE_tc=y
@@ -149,12 +160,21 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
 CONFIG_BUSYBOX_CONFIG_HTTPD=y
 CONFIG_BUSYBOX_CONFIG_INSMOD=y
+CONFIG_BUSYBOX_CONFIG_MODINFO=y
+CONFIG_BUSYBOX_CONFIG_MODPROBE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_BUSYBOX_CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 CONFIG_BUSYBOX_CONFIG_LAST_SYSTEM_ID=999
 CONFIG_BUSYBOX_CONFIG_LOGIN=y
 CONFIG_BUSYBOX_CONFIG_LSMOD=y
 CONFIG_BUSYBOX_CONFIG_LSPCI=y
 CONFIG_BUSYBOX_CONFIG_LSUSB=y
 CONFIG_BUSYBOX_CONFIG_MICROCOM=y
+CONFIG_BUSYBOX_CONFIG_MPSTAT=y
 CONFIG_BUSYBOX_CONFIG_RMMOD=y
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y
@@ -189,3 +209,5 @@ CONFIG_LIBCURL_CRYPTO_AUTH=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
 # CONFIG_SIGNED_PACKAGES is not set
+CONFIG_KERNEL_DEVTMPFS=y
+CONFIG_KERNEL_DEVTMPFS_MOUNT=y

iop/iop.completion

@@ -5,14 +5,14 @@
 
 _iop_get_profiles()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -name '*.diff' \
+    find feeds/targets/iopsys-*/ -name '*.diff' \
         |awk -F'/' '{print$NF}' \
         |awk -F. '{print$1}'
 }
 
 _iop_get_models()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
+    find feeds/targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
         |awk -F'/' '{print$NF}' \
         |egrep '^(cg|dg|eg|vg|vox)[0-9]'
 }
@@ -36,7 +36,7 @@ _iop()
              feeds_update genconfig generate_tarballs install_key \
              scp_changes setup_host ssh_install_key ssh_sysupgrade \
              ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
-             update_package"
+             update_package update_feed_branches"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/extract_core.sh

@@ -1,88 +1,132 @@
 #!/bin/bash
 
-# Intermediate repo for core packages
-core_repo=git@public.inteno.se:iopsys-cc-core.git
-
-# Repo to which core packages should be imported
-import_repo=git@public.inteno.se:feed-inteno-openwrt.git
-import_branch=openwrt-cc-core
-
-
-function export_core {
-
-    local path=$1
-
-    # export paths to their own branches in an intermediate repo
-    repo=$(basename $path)
-    git subtree push -q --prefix=$path $core_repo $repo
-}
-
-
-function update_core {
-    
-    local path=$1
-    
-    if [ ! -d $topdir/feeds/feed_inteno_openwrt ]; then
-	echo "You need to run ./iop feeds_update"
-	exit -1
-    fi
-
-    # ensure that we are synced with the remote
-    cd $topdir/feeds/feed_inteno_openwrt
-    git checkout $import_branch
-    git pull
-
-    # first install subtrees if they don't already exist
-    repo=$(basename $path)
-    git subtree add --prefix=$repo $core_repo $repo
-    
-    # install subtrees in feed from intermediate repo
-    repo=$(basename $path)
-    echo "Exporting $repo"
-    git subtree pull -q -m "Exporting $repo" --prefix=$repo $core_repo $repo
-
-    # update import repo sync branch
-    git push origin $import_branch
-}
-
-function display_help {
-    
-    echo "Usage: ./iop export_core -e path/to/package"
-}
-
 function extract_core {
+	initial_commit=1427738ac4b77f474999ae21af1a8b916468df36
+	patch_dir=extract_core_patches
+	topdir=$(pwd)
 
-# Dir of script location
-topdir=$(pwd)
+	# Paths to packages that should be exported.
+	paths+='package/network/services/base-files '
+	paths+='package/network/services/dnsmasq '
+	paths+='package/network/config/firewall '
+	paths+='package/network/config/netifd '
+	paths+='package/network/config/qos-scripts '
+	paths+='package/system/procd '
+	paths+='package/utils/busybox '
 
+	function print_usage {
+		echo "Usage: $0 extract_core"
+		echo "  -p <path-to-package> | default"
+		echo "  -r <import-repo>"
+		echo "  -b <import-branch>"
+		echo ""
+		echo "Example: $0 extract_core"
+		echo "  -p package/utils/busybox"
+		echo "  -r feeds/feed_inteno_openwrt"
+		echo "  -b devel"
+	}
 
-if [ $# -eq 0 ]; then
-    display_help
-    exit -1
-fi
+	function orphan_branch {
+		local branch=$1
 
-# Execute user command
-while getopts "he:" opt; do
-    case $opt in
-	e)
-	    path=${OPTARG}
-	    echo "Extracting ${path} from core to ${import_repo}:${import_branch}"
-	    export_core $path
-	    update_core $path
-	    ;;
-	h)
-	    display_help
-	    exit 0
-	    ;;
-	\?)
-	    display_help
-	    exit -1
-	    ;;
-	esac
-done
+		git checkout --orphan $branch
+		git rm -rf --cached *
+		git rm -rf --cached .empty
+		rm -rf *
+		rm -rf .empty
+	}
 
+	function export_core {
+		local path=$1
+
+		echo "Extracting ${path} from core to ${import_repo}:${import_branch}"
+
+		# Generate patches from start of openwrt repo.
+		mkdir -p $patch_dir
+		repo=$(basename $path)
+		dir=$(dirname $path)
+		git format-patch $initial_commit $path -o $patch_dir
+
+		# Remove dirname from patches to commit the packages to the
+		# top directory in the destination repo.
+		ls $patch_dir | while read line; do
+			sdir=$(echo "$dir/" | sed 's/\//\\\//g')
+			sed -i "s/$sdir//g" $patch_dir/$line
+		done
+		
+		cd $import_repo
+		
+		if [ -n "$(git rev-parse -q --verify remotes/origin/$repo)" ]; then
+			# Create temporary branch to apply patches on.
+			# We need to do this as git am does not like it
+			# when patches have already been applied.
+			orphan_branch tmp
+			git am $topdir/$patch_dir/*
+			
+			# Rebase and merge.
+			git rebase origin/$repo
+			git checkout --track -b $repo origin/$repo
+			git merge tmp
+			git br -d tmp
+		else
+			# Remote branch does not exist for packet so create it.
+			orphan_branch $repo
+			git am $topdir/$patch_dir/*
+		fi
+
+		git push origin $repo
+		
+		# Merge the package branch into the main branch.
+		git checkout $import_branch
+		git merge $repo -m "Syncing $repo"
+		git push origin $import_branch
+		git br -d $repo
+		
+		rm -rf $topdir/$patch_dir
+		cd $topdir
+	}
+
+	# Execute user command
+	while getopts "p:r:b:h" opt; do
+		case $opt in
+			p)
+				export_path=${OPTARG}
+				;;
+			r)
+				import_repo=${OPTARG}
+				;;
+			b)
+				import_branch=${OPTARG}
+				;;
+			h)
+				print_usage
+				exit 1
+				;;
+			\?)
+				print_usage
+				exit 1
+				;;
+		esac
+	done
+
+	if [ ! -n "$export_path" ] || [ ! -n "$import_repo" ] || [ ! -n "$import_branch" ]; then
+   		print_usage
+		exit 1
+	fi
+
+	if [ "$export_path" == "default" ]; then
+		echo "Extracting default packages:"
+		for p in $paths; do
+			export_core $p
+
+		done
+	else
+		export_core $export_path
+	fi
+
+	exit 0
 }
 
-register_command "extract_core" "Extract core package to feeds_inteno_openwrt"
+register_command "extract_core" "Extract core package to separate feed"
 
 

iop/scripts/feeds_update.sh

@@ -24,12 +24,18 @@ function feeds_update {
     else
 	./scripts/feeds update
     fi
+	./scripts/feeds update -ai
+
+    # replace core packages with iopsys versions
+    if [ $override == 1 ]; then
+	./scripts/feeds install -f -p openwrt_cc_core -a
+    fi
 
     # targets need to be installed explicitly
     ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
     ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
     ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
-    
+
     # install all packages
     ./scripts/feeds install -a 
 
@@ -48,6 +54,3 @@ function feeds_update {
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
 
-
-
-

iop/scripts/genconfig.sh

@@ -7,16 +7,15 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/feed_inteno_packages/iop/configs"
+	export CONFIGPATH="package/feeds/iopsys/iop/configs"
 	CUSTPATH="customerconfigs"
-	CUSTREPO="git@private.inteno.se:customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
-	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25"
-	iopsys_brcm63xx_arm="dg400 eg400"
+	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
+	iopsys_brcm63xx_arm="dg400 eg400 sdx_500rg f104w f104 dg400prime dg400primeb 963138REF_P502"
 	iopsys_ramips="ex400"
 	ramips="mt7621"
 	target="bogus"
@@ -64,6 +63,7 @@ function genconfig {
 		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
+		mediatekAllowed=0
 
 		allowedRepos="$(ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null | grep -w 'R\|W' | awk '{print$NF}')"
 		for repo in $allowedRepos; do
@@ -72,6 +72,7 @@ function genconfig {
 			ice-client) iceAllowed=1 ;;
 			endptcfg) endptAllowed=1 ;;
 			natalie-dect*) natalieAllowed=1 ;;
+			linux) mediatekAllowed=1 ;;
 			esac
 		done
 	}
@@ -104,7 +105,7 @@ function genconfig {
 		local ALL="$1"
 		local CUSTOMER="$2"
 		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
-			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common)"
+			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common | grep -v juci-theme)"
 			if [ "$boards" ]; then
 				echo "$CUSTOMER has following boards:"
 				for board in $boards; do
@@ -118,10 +119,10 @@ function genconfig {
 			exit 1
 		elif [ -d $CUSTCONF ]; then
 			local customers="$(ls -1 $CUSTCONF)"
-			if [ "$customers" -a "$1" == 1 ]; then
+			if [ "$customers" -a "$ALL" == 1 ]; then
 				for customer in $customers; do
 					echo $customer
-					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common)"
+					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common | grep -v juci-theme)"
 					if [ "$boards" ]; then
 						for board in $boards; do
 							echo -e "\t$board"
@@ -142,16 +143,6 @@ function genconfig {
 	}
 
 
-	use_local_mirror()
-	{
-		if wget -T 3 -t 2 -O /dev/null $LOCAL_MIRROR >/dev/null 2>/dev/null; then
-			echo "mirror [$LOCAL_MIRROR] exists. Using local mirror"
-			sed -i "s;CONFIG_LOCALMIRROR=.*;CONFIG_LOCALMIRROR=\"$LOCAL_MIRROR\";" .config
-		else
-			echo "mirror [$LOCAL_MIRROR] does not exist. Not using local mirror"
-		fi
-	}
-
 	generate_config()
 	{
 	DIFFFILE="$1"
@@ -164,15 +155,17 @@ function genconfig {
 
 	setup_dirs()
 	{
-		if [ $DEVELOPER -eq 1 ]; then
+		if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | grep -qw ${CUSTREPO:22}; then
 			if [ ! -d "$CUSTPATH" ]; then
-			git clone "$CUSTREPO" "$CUSTPATH"
+				git clone "$CUSTREPO" "$CUSTPATH"
 			elif [ $IMPORT -eq 1 ]; then
-			cd $CUSTPATH
-			v "git pull"
-			git pull
-			cd - >/dev/null #go back
+				cd $CUSTPATH
+				v "git pull"
+				git pull
+				cd - >/dev/null #go back
 			fi
+		else
+			echo "You do not have access to $CUSTREPO"
 		fi
 
 		if [ ! -d "$FILEDIR" ]; then
@@ -200,9 +193,18 @@ function genconfig {
 		if [ $target == "bogus" ]; then
 			echo "Hardware profile does not exist"
 			exit 1
-		elif [ -n "$CUSTOMER" -a ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
-			echo "Customer profile does not exist"
-			exit 1
+		elif [ -n "$CUSTOMER" ]; then
+			if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
+				echo "Customer profile for '$CUSTOMER' does not exist"
+				exit 1
+			elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
+				echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
+				if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+					echo "Common profile configuration will be used"
+				else
+					exit 1
+				fi
+			fi
 		fi
 
 		# Generate base config
@@ -214,6 +216,13 @@ function genconfig {
 			cp $CONFIGPATH/config .config
 		fi
 
+		# Add target diff
+		local target_name=$(echo $target | sed 's/_/-/g')
+		local target_conf=target/linux/${target_name}/config
+		if [ -f $target_conf ]; then
+			cat $target_conf >> .config
+		fi
+
 		# Apply profile diff to master config if selected
 		if [ -n "$PROFILE" ]; then
 			if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then
@@ -267,28 +276,36 @@ function genconfig {
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
 
 		# developer mode selected ?
+		echo "CONFIG_DEVEL=y" >>.config
 		if [ $DEVELOPER -eq 1 ]; then
 			# rewrite url to clone with ssh instead of http
-			echo "CONFIG_DEVEL=y" >>.config
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
 			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
 			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
+			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
 		else
+			echo "CONFIG_GITMIRROR_REWRITE=n" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
 			echo "CONFIG_ICE_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
+			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
 		fi
 
 		# Force regeneration of themes
-		touch package/feeds/feed_inteno_juci/juci/Makefile
+		touch package/feeds/juci/juci/Makefile
 
 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets
 		touch package/kernel/linux/Makefile
 
+		# we need to signal to bradcom SDK that we have changed the board id
+		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
+		# so just touch that file.
+		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
+				
 		# Set default values based on selected parameters
 		v "$(make defconfig 2>&1)"
 
@@ -327,6 +344,7 @@ function genconfig {
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
 			-p|--profile) export PROFILE="$2"; shift;;
+			-r|--repo) export CUSTREPO="$2"; shift;;
 			-s|--override) export SRCTREEOVERR=1;;
 			-h|--help) usage;;
 			-l|--list) list_customers 0 $2;;
@@ -340,12 +358,11 @@ function genconfig {
 			esac
 			shift;
 		done
+
+		CUSTREPO="${CUSTREPO:-git@private.inteno.se:customerconfigs}"
+
 		setup_dirs
 		create_and_copy_files "$1" "$2"
-
-		if [ $masterconfig -eq 1 ]; then
-			use_local_mirror
-		fi
 	fi
 }
 

iop/scripts/generate_tarballs.sh

@@ -2,15 +2,16 @@
 
 
 build_bcmkernel_consumer() {
-	local tarfile bcmkernelcommith
-	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/$sdkversion.mk | cut -d'=' -f2)
+	local tarfile bcmkernelcommith sdkversion
+	sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
+	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/broadcom/bcmkernel/$sdkversion.mk | cut -d'=' -f2)
 	# do not build bcmopen sdk if it was already built before
-	ssh $SERVER "ls $FPATH/bcmopen-$profile-$bcmkernelcommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/bcmkernel-3.4-$sdkversion/bcm963xx/release
 	sh do_consumer_release -p $profile -y
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
-	scp $tarfile $SERVER:$FPATH/bcmopen-$profile-$bcmkernelcommith.tar.gz
+	scp $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
 	rm -f $tarfile
 	cd $curdir
 }
@@ -19,8 +20,8 @@ build_natalie_consumer() {
 	# create natalie-dect open version tar file
 	local natalieversion nataliecommith
 	grep -q "CONFIG_TARGET_NO_DECT=y" .config && return
-	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
-	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
+	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
+	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
 	ssh $SERVER "ls $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/natalie-dect-$natalieversion/
 	mkdir natalie-dect-open-$natalieversion
@@ -37,8 +38,8 @@ build_endptcfg_consumer() {
 	# create endptcfg open version tar file
 	local endptversion endptcommith
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
-	endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
-	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
+	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptcfg/Makefile | cut -d'=' -f2)
+	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptcfg/Makefile | cut -d'=' -f2)
 	ssh $SERVER "ls $FPATH/endptcfg-$profile-$endptversion-$endptcommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/endptcfg-$endptversion/
 	mkdir endptcfg-open-$endptversion
@@ -54,19 +55,52 @@ build_endptcfg_consumer() {
 build_ice_consumer() {
 	# create ice-client open version tar file
 	local iceversion icebasever icerelease icecommith
-	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | head -1 | cut -d'=' -f2)
-	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
-	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
+	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/ice-client/Makefile | head -1 | cut -d'=' -f2)
+	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
+	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
 	iceversion=$icebasever$icerelease
-	ssh $SERVER "ls $FPATH/ice-client-$profile-$iceversion-$icecommith.tar.gz" && return
-	cd ./build_dir/target-*_uClibc-0.9.33.*/ice-client-$icebasever/ipkg-*
-	tar -czv  ice-client -f ice-client-$profile-$iceversion-$icecommith.tar.gz
-	scp ice-client-$profile-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
-	cp ice-client-$profile-$iceversion-$icecommith.tar.gz $curdir/
-	rm -f ice-client-$profile-$iceversion-$icecommith.tar.gz
+	ssh $SERVER "ls $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
+	cd ./build_dir/target-*_uClibc-0.9.33.*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
+	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
+	scp ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
+	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
+	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
 	cd $curdir
 }
 
+build_mediatek_kernel() {
+	local mediatek_commit kernel_version kernel
+
+	mediatek_commit=$(grep CONFIG_KERNEL_GIT_COMMIT .config | cut -d '=' -f2 | tr -d '"')
+	kernel_version=$(grep KERNEL_PATCHVER target/linux/iopsys-ramips/Makefile  | cut -d '=' -f2)
+	kernel=linux-${kernel_version}.*
+	ssh $SERVER "ls $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
+	echo "Building mediatek kernel tarball from kernel commit:"	
+	echo $mediatek_commit
+	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips_*/$kernel
+
+	# Save Kconfig files to recreate the same kernel config,
+	# delete everyting else.
+	find drivers/net/wireless/mt_wifi -type f ! -name Kconfig | xargs rm
+	find drivers/net/wireless/rlt_wifi -type f ! -name Kconfig | xargs rm
+
+	# remove git repo
+	rm -rf .git
+
+	# patch kernel for openstk
+	ls consumer_release | while read line; do patch -p1 < consumer_release/$line; done
+	cd ..
+
+	tar -czv $kernel -f mediatek-kernel-open-$mediatek_commit.tar.gz
+	scp mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
+	cd $curdir
+}
+
+function print_usage {
+	echo "Usage: $0 generate_tarballs"
+	echo "  -t <target>"
+}
+
 function generate_tarballs {
 
     SERVER="god@software.inteno.se"
@@ -74,14 +108,47 @@ function generate_tarballs {
 
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
+    target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
+    board=$(grep CONFIG_TARGET_IBOARDID .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
-    sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
     curdir=$(pwd)
 
-    build_bcmkernel_consumer
-    build_natalie_consumer
-    build_endptcfg_consumer
-    build_ice_consumer
+
+	# Execute user command
+	while getopts "t:h" opt; do
+		case $opt in
+			t)
+				stk_target=${OPTARG}
+				;;
+			h)
+				print_usage
+				exit 1
+				;;
+			\?)
+				print_usage
+				exit 1
+				;;
+		esac
+	done
+
+	if [ ! -n "$stk_target" ]; then
+		print_usage
+		exit 1
+	fi
+
+	if [ "$stk_target" == "broadcom" ]; then
+		build_bcmkernel_consumer
+		build_natalie_consumer
+		build_endptcfg_consumer
+		build_ice_consumer
+	elif [ "$stk_target" == "mediatek" ]; then
+		build_mediatek_kernel
+		build_ice_consumer		
+	else
+		echo "Invalid target: $stk_target"
+		print_usage
+		exit 1
+	fi
 
 }
 

iop/scripts/ssh_sysupgrade.sh

@@ -34,7 +34,7 @@ function ssh_sysupgrade_latest {
 		exit 1
 	fi
 	{ cd `dirname $0`
-		IMAGE=`ls -Art bin/*/*.y2 | tail -n1`
+		IMAGE=`ls -Art bin/*/*.y[23] | tail -n1`
 		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop ssh_sysupgrade $1 $IMAGE $2
 	}
 }

iop/scripts/update_feed_branches.sh

@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Exported interface
+function update_feed_branches {
+	local release="$1"
+	local ipath="$(pwd)"
+	local branch="$2"
+	local curbranch
+
+	[ -n "$release" ] || {
+		echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
+		echo ""
+		echo "If you do not give a branch as argument,"
+		echo "<RELEASE> branch will be updated to commit"
+		echo "hash given in feeds.conf for each feed repo"
+		exit 1
+	}
+
+	if [ -n "$branch" ]; then
+		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
+		if git diff-index --quiet HEAD; then
+			curbranch=`git symbolic-ref HEAD 2>/dev/null`
+			curbranch=${curbranch##refs/heads/}
+			if [ -z $curbranch ]; then
+				curbranch=`git log -1 --pretty=format:"%H"`
+			fi
+			git checkout $branch || {
+				echo "couldn't checkout branch $branch"
+				exit 99
+			}
+		else
+			echo "You have unsaved changes."
+			exit 99
+		fi
+	else
+		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
+	fi
+
+	ifeeds="$(grep -r feed_inteno feeds.conf  | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"
+
+	for f in $ifeeds; do
+		commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
+		cd $ipath/feeds/feed_inteno_$f
+		git branch -D $release 2>/dev/null
+		echo "feed_inteno_$f: updating release branch $release to commit $commith"
+		git checkout $commith
+		git push origin :$release
+		git checkout -b $release
+		git push origin $release
+		cd $ipath
+	done
+
+	if [ -n "$branch" ]; then
+		echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
+		git checkout $curbranch
+	else
+		echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
+	fi
+}
+
+register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"

iop/scripts/update_package.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-
-
 print_git_update()
 {
     echo "pkg -> ${PKG_NAME}"
@@ -396,7 +394,7 @@ insert_hash_in_feeds_config()
 check_packages()
 {
     echo -e "${Green}_______________________________________________________________________________${Color_Off}"
-    echo "Now checking if any changes has been done to the packages."
+    echo "Now checking if any changes have been done to the packages."
     echo -e "${Green}_______________________________________________________________________________${Color_Off}"
 
     # only scan in the build directory that is currently in use.
@@ -538,7 +536,7 @@ check_feeds()
 	    read answer
 
 	    case $answer in
-		n|N)
+		n|N|'')
 		    continue;;
 	    esac
 	    branch_uptodate feeds/${feed}
@@ -586,7 +584,8 @@ usage(){
 # Exported interface
 function update_package {
 
-    UPDATE=0
+	UPDATE=0
+
     Color_Off='\033[0m'       # Text Reset
 
     # Regular Colors

iup/Makefile

@@ -21,7 +21,7 @@ define Package/iup
 endef
 
 define Package/iup/description
-	This package contains Intenos IUP Client
+	This package contains Inteno's IUP Client
 endef
 
 define Build/Compile

iup/files/sbin/iup

@@ -4,6 +4,7 @@ echo $$ > /var/run/iup.pid
 
 . /lib/functions.sh
 . /lib/functions/network.sh
+. /lib/functions/savecfg.sh
 . /usr/share/libubox/jshn.sh
 
 include /lib/upgrade
@@ -13,20 +14,30 @@ export IUPCONFFILES=/tmp/iup/sysupgrade.conffiles.tar.gz
 export IUPMD5=/etc/configchecksums
 export CONFILESLURP='/tmp/iup/*.conf'
 export IUPTEMP="/tmp/iup"
-export IUPUSERCFG="/tmp/iupusercfg"
-export IUPUSERCFG_WIFI="/tmp/iupusercfg_wifi"
 export INTERACTIVE=0
 export VERBOSE=0
 export CONF=1
-export DESKEY=$(cat /proc/nvram/DesKey | tr -d '\n' | hexdump -e '16/1 "%02x"')
-export MAC=$(cat /proc/nvram/BaseMacAddr)
+export DESKEY=
+export MAC=
 export RANGE=10
 export RETRYSTOP=5
 export SLEEP=10
-#remove whitespace
-MAC=${MAC// /}
-#lower to upper Conversion
-MAC=$(echo $MAC | tr '[a-z]' '[A-Z]')
+
+local sysinfo=$(ubus call router.system info)
+json_load "$sysinfo"
+json_select system
+json_get_var MAC basemac
+json_select ..
+json_select keys
+json_get_var DESKEY des
+json_select ..
+
+# MAC lowercase to uppercase and remove ':'
+MAC=$(echo $MAC | tr '[a-z]' '[A-Z]' | tr -d ':')
+
+# Convert DESKEY to HEX format
+DESKEY=$(echo $DESKEY | tr -d '\n' | hexdump -e '16/1 "%02x"')
+
 
 # no verbose:	no output
 # -v		log to system log
@@ -69,41 +80,7 @@ reload ()
 
 save_usercfg()
 {
-	rm -f $IUPUSERCFG $IUPUSERCFG_WIFI
-	touch $IUPUSERCFG $IUPUSERCFG_WIFI
-
-	# save the firewall redirects/port forwarding
-	uci show firewall | grep redirect >> $IUPUSERCFG
-
-	# save the parental rules
-	local parentalrules=$(uci show firewall | grep -i "Parental Rule" | grep -o "rule\[.*\]")
-	for rule in $parentalrules ; do
-		rule=${rule//\[/\\[} # escape [
-		rule=${rule//]/\]} # escape ]
-		uci show firewall | grep "$rule" >>$IUPUSERCFG
-	done
-
-	# tranfsorm the output of uci show into a uci script
-
-	# prepend "set" to each line NOT containing "]="
-	# firewall.@redirect[0].enabled='1' becomes
-	# set firewall.@redirect[0].enabled='1'
-	sed -i '/.*]=.*/! s/.*/set \0/' $IUPUSERCFG
-
-	# prepend "add" to each line containing "]="
-	# AND keep only the package name (before the first dot) and section type (after equal)
-	# firewall.@redirect[0]=redirect becomes
-	# add firewall redirect
-	sed -i 's/\(.*\)\..*]=\(.*\)/add \1 \2/' $IUPUSERCFG
-
-	# change all the array indexes to [-1]
-	sed -i 's/\[.\?.\?.\?.\?\]/[-1]/' $IUPUSERCFG
-
-	# commit at the end of the script
-	[ -s $IUPUSERCFG ] && echo "commit" >> $IUPUSERCFG
-
-	# save wireless interfaces
-	uci show wireless | grep "wifi-iface" > $IUPUSERCFG_WIFI
+	savecfg_save_config fw_redirect fw_parental wifi
 }
 
 apply_usercfg()
@@ -114,64 +91,11 @@ apply_usercfg()
 	config_get_bool keep configserver keepuserconfig "0"
 	v "apply_usercfg(): keepuserconfig = $keep"
 	if [ "$keep" != "1" ] ; then
-		rm -f $IUPUSERCFG $IUPUSERCFG_WIFI
+		savecfg_rm_files
 		return
 	fi
 
-	local index ifname network
-	local newindex newifname newnetwork
-
-	# loop through all the user wifi-ifaces
-	for index in $(seq 0 99) ; do
-		ifname=$(sed -n 's/.*wifi-iface\['$index'\]\.ifname='\''\(.*\)'\''/\1/p' $IUPUSERCFG_WIFI )
-		[ "$ifname" ] || break
-		network=$(sed -n 's/.*wifi-iface\['$index'\]\.network='\''\(.*\)'\''/\1/p' $IUPUSERCFG_WIFI )
-
-		newindex=""
-		newifname=""
-		newnetwork=""
-
-		# loop through all the newly configured wifi-ifaces
-		for newindex in $(seq 0 99) ; do
-			newifname=$( uci show wireless | grep wifi-iface | sed -n 's/.*wifi-iface\['$newindex'\]\.ifname='\''\(.*\)'\''/\1/p' )
-			if [ -z "$newifname" ] ; then
-				# no newifname means that all the wifi-ifaces have already been parsed
-				newindex="-1"
-				break
-			fi
-			newnetwork=$(uci show wireless | grep wifi-iface | sed -n 's/.*wifi-iface\['$newindex'\]\.network='\''\(.*\)'\''/\1/p' )
-
-			# two wifi interfaces are the same if "ifname" and "network" are the same
-			if [ "$newifname" == "$ifname" ] && [ "$newnetwork" == "$network" ] ; then
-				break
-			fi
-		done
-
-		# prepend "set" to each line NOT containing "]="
-		# wireless.@wifi-iface[$index].<option>='<value>' becomes
-		# set wireless.@wifi-iface[$index].<option>='<value>'
-		sed -i '/.*]=.*/! s/\(.*\[\)'$index'\(\].*\)/set \1'$newindex'\2/' $IUPUSERCFG_WIFI
-
-		if [ "$newindex" == "-1" ] ; then
-			# prepend "add" to each line containing "]="
-			# AND keep only the package name (before the first dot) and section type (after equal)
-			# wireless.@wifi-iface[0]=wifi-iface becomes
-			# add wireless wifi-iface
-			sed -i 's/\(.*\)\..*\['$index'\]=\(.*\)/add \1 \2/' $IUPUSERCFG_WIFI
-		else
-			# no need to create a new uci section, just delete the line defining a new section
-			sed -i '/\(.*\)\..*\['$index'\]=\(.*\)/d' $IUPUSERCFG_WIFI
-		fi
-
-	done
-	# commit at the end of the script
-	[ -s $IUPUSERCFG_WIFI ] && echo "commit" >> $IUPUSERCFG_WIFI
-
-	# run the uci batch scripts
-	cat $IUPUSERCFG | uci batch >/dev/null 2>&1
-	cat $IUPUSERCFG_WIFI | uci batch >/dev/null 2>&1
-
-	rm -f $IUPUSERCFG $IUPUSERCFG_WIFI
+	savecfg_apply_config fw_redirect fw_parental wifi
 }
 
 handle_provisioning() {
@@ -229,7 +153,7 @@ handle_provisioning() {
 		  fi
 		done
 	fi
-	if [ ! -s "$IUPCONFFILES" ]; then
+	if [ ! -s "$IUPCONFFILES" ] && [ "$enabled" -eq 1 ]; then
 		echo "File not Found"
 		reboot="off"
 		CONF=0
@@ -271,7 +195,7 @@ handle_Downloaded_file()
 					for f in $CONFILESLURP
 					do
 						v "File to be applied $f and config $(cat $f)"
-						uci import -f $f
+						uci -f $f import
 					done
 					pack=$(get_packages $CONFILESLURP)
 					v "Packages to be commited: $pack"
@@ -476,8 +400,6 @@ parse_dhcp_options()
 	json_get_var vlanid vlanid # option 132
 	json_get_var vlanpriority vlanpriority # option 133
 
-	v "Processing dhcp options"
-
 	if [ $privopt224 ]; then
 		v "dhcp option 224 firmware url $privopt224"
 		handle_option224 $privopt224
@@ -536,32 +458,54 @@ parse_dhcp_options()
 # return 1 if the default gateway is not reachable after $wait_time
 wait_for_default_gateway()
 {
-	local gateway
-	local device
+	local gateway device nameservers
 	local wait_time=120
 	local wait_interval=10
+	local interface="$1"
 
 	while [ true ] ; do
 
-		gateway=""
 		device=""
+
 		network_flush_cache
-		network_get_gateway gateway wan #true
-		network_get_device device wan
-		device="${device:+-I }$device"
-		if ping -q -w 1 -c 1 $device $gateway >/dev/null 2>&1 ; then
-			[ "$wait_time" -lt "60" ] && v "Default gateway $gateway is reachable"
-			sleep $wait_interval
-			return 0
+
+		if [ -z "$interface" ]; then
+			network_find_wan interface
 		fi
 
-		v "Waiting for default gateway. Countdown $wait_time seconds"
+		if [ -n "$interface" ]; then
+			network_get_device device $interface
+
+			if [ "$device" ]; then
+				device="${device:+-I }$device"
+				network_get_gateway gateway $interface true
+
+				# ping gateways to check uplink
+				if ping -q -w1 -c 1 $device $gateway >/dev/null 2>&1 ; then
+					[ "$wait_time" -lt "60" ] && v "Default gateway $gateway is reachable"
+					sleep $wait_interval
+					return 0
+				fi
+
+				# try the nameservers too
+				nameservers="$(grep nameserver /var/resolv.conf.auto | awk '{print $2}')"
+				for ns in $nameservers; do
+					if ping -q -w 1 -c 1 $device $ns >/dev/null 2>&1 ; then
+						[ "$wait_time" -lt "60" ] && v "Name server $ns is reachable"
+						sleep $wait_interval
+						return 0
+					fi
+				done
+			fi
+		fi
+
+		v "Waiting for default gateway or name server. Countdown $wait_time seconds"
 		sleep $wait_interval
 		wait_time=$((wait_time - wait_interval))
 		[ "$wait_time" -le "0" ] && break # timer expired
 	done
 
-	return 1 # default gateway not reachable
+	return 1 # default gateway and name server are not reachable
 }
 
 
@@ -586,10 +530,17 @@ main()
 		shift;
 	done
 
-	if ! wait_for_default_gateway ; then
-		v "Default gateway is not reachable. Aborting iup."
+	local interface=""
+
+	config_load provisioning
+	config_get interface polling interface
+
+	if ! wait_for_default_gateway $interface; then
+		v "Neither default gateway nor name server are reachable. Aborting iup."
 		exit 1
 	fi
+	# reload config to get latest values
+	config_load provisioning
 
 	if [ ! -f $IUPMD5 ]; then
 		v "Creating file $IUPMD5"
@@ -602,7 +553,6 @@ main()
 	local software
 	local sofwareminuspath
 
-	config_load provisioning
 	#check if iup should be used or if its overridden by /etc/config
 	config_get configurl configserver	url
 	config_get reboot configserver reboot

layer2interface/broadcom/etc/hotplug.d/switch/10-switch

@@ -0,0 +1,113 @@
+. /lib/network/config.sh
+
+# FIX: for EG300 WAN port for release 3.13.1 - 4.x
+if [ "$INTERFACE" == "eth2" ]; then
+	touch /var/update.eth2
+fi
+# end FIX
+
+addif() {
+	# check if wan had a event and start all related services
+	wan=`uci -q get layer2_interface_ethernet.Wan.baseifname`
+	if [ "$INTERFACE" == "$wan" ]; then
+		/etc/init.d/layer2_interface_ethernet start
+		/etc/init.d/layer2_interface_vlan start
+	fi
+}
+
+delif() {
+	##remove ethernet wan and nuke any vlans associated
+	wan=`uci -q get layer2_interface_ethernet.Wan.baseifname`
+	if [ "$INTERFACE" == "$wan"  ]; then
+		/etc/init.d/layer2_interface_ethernet stop
+	fi
+}
+
+# true if speed on interface is Gbit
+gigatest() {
+	local speed=$(ethctl $INTERFACE media-type 2>&1 | awk '{if (NR == 2) print $6}')
+	case "$speed" in
+		1000*) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+# true if there is a link on any lan port
+lan_test () {
+	local landev=$(db get hw.board.ethernetLanPorts)
+	local ledontest
+	for dev in $landev; do
+		ledontest=$(cat /sys/class/net/$dev/operstate)
+		if [ "$ledontest" == "up" ]; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+# true if adsl or vdsl is up.
+dsltest() {
+	if cat /var/state/layer2_interface 2>/dev/null | grep 'adsl\|vdsl' | grep up; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+case "$ACTION" in
+	add|register)
+		case "$PHYSDEVDRIVER" in
+			natsemi) sleep 1 ;;
+		esac
+		addif
+		local interfname=$(interfacename $INTERFACE)
+		local operstate=$(cat /sys/class/net/$INTERFACE/operstate)
+#		if [ "$operstate" == "up" ]; then
+		if true ; then
+			case "$interfname" in
+				GbE*)
+					ubus call led.lan           set '{"state" : "ok"}'
+					ubus call led.gbe           set '{"state" : "ok"}'
+					ubus call led.gbe_phy_link  set '{"state" : "ok"}'
+					ubus call led.gbe_phy_speed set '{"state": "off"}'
+					$(gigatest) && ubus call led.gbe_phy_speed set '{"state":"ok"}'
+				;;
+				LAN*)
+					ubus call led.lan set '{"state":"ok"}'
+				;;
+				WAN*)
+					ubus call led.wan           set '{"state" : "ok"}'
+					ubus call led.wan_phy_link  set '{"state" : "ok"}'
+					ubus call led.wan_phy_speed set '{"state" : "off"}'
+					$(gigatest) && ubus call led.wan_phy_speed set '{"state":"ok"}'
+				;;
+			esac
+		fi		
+	;;
+	remove|unregister)
+		local interfname=$(interfacename $INTERFACE)
+		local operstate=$(cat /sys/class/net/$INTERFACE/operstate)
+		if [ "$operstate" == "down" ]; then
+			case "$interfname" in
+				GbE*)
+					ubus call led.gbe           set '{"state" : "off"}'
+					ubus call led.gbe_phy_link  set '{"state" : "off"}'
+					ubus call led.gbe_phy_speed set '{"state" : "off"}'
+					$(lan_test) || ubus call led.lan set '{"state":"off"}'
+				;;
+				LAN*)
+					$(lan_test) || ubus call led.lan set '{"state":"off"}'
+				;;
+				WAN*)
+					ubus call led.wan           set '{"state" : "off"}'
+					ubus call led.wan_phy_speed set '{"state" : "off"}'
+					ubus call led.wan_phy_link  set '{"state" : "off"}'
+					# is this needed here ?? don't the dsl hotplug event control this ???
+#					$(dsltest) || ubus call led.dsl set '{"state":"off"}'
+				;;
+			esac
+		fi
+		delif
+	;;
+esac
+

layer2interface/broadcom/etc/init.d/layer2_interface

@@ -16,6 +16,7 @@ start_service() {
 	local AnnexL
 	local ADSL2plus
 	local VDSL2
+	local GFast
 	local a8a
 	local b8b
 	local c8c
@@ -23,11 +24,14 @@ start_service() {
 	local a12a
 	local b12b
 	local a17a
+	local a30a
+	local b35b
 	local US0
 	local bitswap
 	local sra
 	local vdsl
 
+
 	config_load layer2_interface
 	config_get Glite capabilities Glite
 	config_get GDmt capabilities GDmt
@@ -36,6 +40,7 @@ start_service() {
 	config_get ADSL2plus capabilities ADSL2plus
 	config_get AnnexL capabilities AnnexL
 	config_get VDSL2 capabilities VDSL2
+	config_get GFast capabilities GFast
 	config_get AnnexM capabilities AnnexM
 
 	config_get a8a capabilities 8a
@@ -45,6 +50,9 @@ start_service() {
 	config_get a12a capabilities 12a
 	config_get b12b capabilities 12b
 	config_get a17a capabilities 17a
+	config_get a30a capabilities 30a
+	config_get b35b capabilities 35b
+	config_get BrcmPriv1 capabilities BrcmPriv1
 
 	config_get US0 capabilities US0
 	config_get bitswap capabilities bitswap
@@ -58,6 +66,7 @@ start_service() {
 	ADSL2plus=$(echo $ADSL2plus | sed 's/Enabled\|1/p/g')
 	AnnexM=$(echo $AnnexM | sed 's/Enabled\|1/m/g')
 	VDSL2=$(echo $VDSL2 | sed 's/Enabled\|1/v/g')
+	GFast=$(echo $GFast | sed 's/Enabled\|1/f/g')
 
 	a8a=$(echo $a8a | sed 's/Enabled\|1/8a/g')
 	b8b=$(echo $b8b | sed 's/Enabled\|1/8b/g')
@@ -66,7 +75,10 @@ start_service() {
 	a12a=$(echo $a12a | sed 's/Enabled\|1/12a/g')
 	b12b=$(echo $b12b | sed 's/Enabled\|1/12b/g')
 	a17a=$(echo $a17a | sed 's/Enabled\|1/17a/g')
-
+	a30a=$(echo $a30a | sed 's/Enabled\|1/30a/g')
+	b35b=$(echo $b35b | sed 's/Enabled\|1/BrcmPriv1/g')
+	BrcmPriv1=$(echo $BrcmPriv1 | sed 's/Enabled\|1/BrcmPriv1/g')
+	[ -n "$b35b" ] && BrcmPriv1=""
 	US0=$(echo $US0 | sed 's/1/on/g')
 	US0=$(echo $US0 | sed 's/0/off/g')
 	bitswap=$(echo $bitswap | sed 's/1/on/g')
@@ -78,18 +90,20 @@ start_service() {
 
 	xtmctl start
 	xtmctl operate intf --state 1 enable
-	json_load "$(ubus call router.system info)"
-	json_select specs
-	json_get_var vdsl vdsl
+	vdsl=$(db get hw.board.hasVdsl)
 
 	if [ $vdsl -eq 1 ]; then
-		echo "xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM$VDSL2 --profile \"$a8a $b8b $c8c $d8d $a12a $b12b $a17a\" --sra $sra --bitswap $bitswap --us0 $US0"
-		xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM$VDSL2 --profile "$a8a $b8b $c8c $d8d $a12a $b12b $a17a" --sra $sra --bitswap $bitswap --us0 $US0
+		echo "xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM$VDSL2$GFast --profile \"$a8a $b8b $c8c $d8d $a12a $b12b $a17a $a30a $b35b $BrcmPriv1\" --sra $sra --bitswap $bitswap --us0 $US0"
+		xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM$VDSL2$GFast --profile "$a8a $b8b $c8c $d8d $a12a $b12b $a17a $a30a $b35b $BrcmPriv1" --sra $sra --bitswap $bitswap --us0 $US0
 	else
 		echo "xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM --sra $sra --bitswap $bitswap"
 		xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM --sra $sra --bitswap $bitswap
 	fi
 
+	if [ "$GFast" == "f" ]; then
+		# enable V43 tone set for GFAST
+		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x400000 0x400000
+	fi
 }
 
 

layer2interface/broadcom/etc/init.d/layer2_interface_ethernet

@@ -50,11 +50,11 @@ addethernet() {
 	config_get baseifname $1 baseifname
 	config_get ifname $1 ifname
 	config_get bridge $1 bridge
+	config_get mac2 $1 mac2
 	
 	ifname="${ifname:-$baseifname.1}"
 
-	brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge"
-
+	brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge" "$mac2"
 }
 
 boot() {
@@ -95,12 +95,15 @@ start_service() {
 	echo "Setting up Ethernet WAN"
 	config_load layer2_interface_ethernet
 	config_foreach addethernet ethernet_interface
+	/etc/init.d/layer2_interface_vlan start
 }
 
 stop_service() {
 	local ifname
 	config_load layer2_interface_ethernet
 	config_foreach removeethernet ethernet_interface
+	/etc/init.d/layer2_interface_vlan stop
+	sleep 1
 }
 
 reload_service() {
@@ -112,4 +115,3 @@ service_triggers() {
 	procd_add_reload_trigger layer2_interface_ethernet
 }
 
-

layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate

@@ -1,30 +1,13 @@
 #!/bin/sh
 
-local hasEthWan="1"
+local hasEthWan="$(db -q get hw.board.hasEthWan)"
+hasEthWan=${hasEthWan:-1}
 local hasAdsl="$(db -q get hw.board.hasAdsl)"
 local hasVdsl="$(db -q get hw.board.hasVdsl)"
 
 local LANPORTS="$(db -q get hw.board.ethernetLanPorts)"
 local WANPORTS=""
 
-# populate layer2_interface_ethernet #
-if [ "$hasEthWan" == "1" ]; then
-	local wanEthernetPort="$(db -q get hw.board.ethernetWanPort)"
-	wanEthernetPort="${wanEthernetPort:-eth0}"
-	if [ ! -f /etc/config/layer2_interface_ethernet -o -z "$(uci -q get layer2_interface_ethernet.@ethernet_interface[0].ifname)" ]; then
-		cat > /etc/config/layer2_interface_ethernet <<EOF
-config ethernet_interface 'Wan'
-	option name 'WAN'
-	option baseifname '${wanEthernetPort}'
-	option ifname '${wanEthernetPort}.1'
-EOF
-	fi
-	local ifname="$(uci -q get layer2_interface_ethernet.@ethernet_interface[0].ifname)"
-	[ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname"
-elif [ "$hasEthWan" == "0" ]; then
-	echo "" > /etc/config/layer2_interface_ethernet
-fi
-
 # populate layer2_interface #
 if [ "$hasAdsl" == "1" ]; then
 	if [ ! -f /etc/config/layer2_interface -o -z "$(uci -q get layer2_interface.capabilities)" ]; then
@@ -60,6 +43,28 @@ elif [ "$hasAdsl" == "0" -a "$hasVdsl" == "0" ]; then
 	echo "" > /etc/config/layer2_interface
 fi
 
+# populate layer2_interface_vdsl #
+if [ "$hasVdsl" == "1" ]; then
+	local wanVdslPort=$(db -q get hw.board.vdslWanPort)
+	wanVdslPort="${wanVdslPort:-ptm0}"
+	if [ ! -f /etc/config/layer2_interface_vdsl -o -z "$(uci -q get layer2_interface_vdsl.@vdsl_interface[0].ifname)" ]; then
+		cat > /etc/config/layer2_interface_vdsl <<EOF
+config vdsl_interface
+	option 'unit' '0'
+	option 'ifname' '${wanVdslPort}.1'
+	option 'baseifname' '${wanVdslPort}'
+	option 'name' 'VDSL2'
+	option 'dslat' '1'
+	option 'ptmprio' '1'
+	option 'ipqos' '1'
+EOF
+	fi
+	local ifname="$(uci -q get layer2_interface_vdsl.@vdsl_interface[0].ifname)"
+	[ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname"
+elif [ "$hasVdsl" == "0" ]; then
+	echo "" > /etc/config/layer2_interface_vdsl
+fi
+
 # populate layer2_interface_adsl #
 if [ "$hasAdsl" == "1" ]; then
 	local wanAdslPort=$(db -q get hw.board.adslWanPort)
@@ -84,26 +89,22 @@ elif [ "$hasAdsl" == "0" ]; then
 	echo "" > /etc/config/layer2_interface_adsl
 fi
 
-# populate layer2_interface_vdsl #
-if [ "$hasVdsl" == "1" ]; then
-	local wanVdslPort=$(db -q get hw.board.vdslWanPort)
-	wanVdslPort="${wanVdslPort:-ptm0}"
-	if [ ! -f /etc/config/layer2_interface_vdsl -o -z "$(uci -q get layer2_interface_vdsl.@vdsl_interface[0].ifname)" ]; then
-		cat > /etc/config/layer2_interface_vdsl <<EOF
-config vdsl_interface
-	option 'unit' '0'
-	option 'ifname' '${wanVdslPort}.1'
-	option 'baseifname' '${wanVdslPort}'
-	option 'name' 'VDSL2'
-	option 'dslat' '1'
-	option 'ptmprio' '1'
-	option 'ipqos' '1'
+# populate layer2_interface_ethernet #
+if [ "$hasEthWan" == "1" ]; then
+	local wanEthernetPort="$(db -q get hw.board.ethernetWanPort)"
+	wanEthernetPort="${wanEthernetPort:-eth0}"
+	if [ ! -f /etc/config/layer2_interface_ethernet -o -z "$(uci -q get layer2_interface_ethernet.@ethernet_interface[0].ifname)" ]; then
+		cat > /etc/config/layer2_interface_ethernet <<EOF
+config ethernet_interface 'Wan'
+	option name 'WAN'
+	option baseifname '${wanEthernetPort}'
+	option ifname '${wanEthernetPort}.1'
 EOF
 	fi
-	local ifname="$(uci -q get layer2_interface_vdsl.@vdsl_interface[0].ifname)"
+	local ifname="$(uci -q get layer2_interface_ethernet.@ethernet_interface[0].ifname)"
 	[ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname"
-elif [ "$hasVdsl" == "0" ]; then
-	echo "" > /etc/config/layer2_interface_vdsl
+elif [ "$hasEthWan" == "0" ]; then
+	echo "" > /etc/config/layer2_interface_ethernet
 fi
 
 # populate network config ifnames #

layer2interface/broadcom/lib/network/brcmwifi.sh

@@ -91,12 +91,13 @@ wlmngr_doWlConf() {
 wlmngr_setupMbssMacAddr() {
 	local idx=$1
 	local hwaddr
-
+	wlmngr_WlConfDown $idx
 	for vif in $(nvram get "wl$idx"_vifs); do
 		hwaddr=$(nvram get "$vif"_hwaddr)
 		ifconfig $vif hw ether $hwaddr 2>/dev/null
 		wlctl -i $vif cur_etheraddr $hwaddr 2>/dev/null
 	done
+	wlmngr_doWlConf $idx
 }
 
 #enableSSD() {
@@ -200,14 +201,14 @@ enableBSD() {
 					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
 					nvram set ${wdev}_bsd_sta_select_policy="20 -60 0 0 1 0 0 0 0 0x42"
 					nvram set ${wdev}_bsd_steer_prefix=$wdev
-					nvram set ${wdev}_bsd_steering_policy="0 0 0 -60 0 0x52"
+					nvram set ${wdev}_bsd_steering_policy="0 0 0 -60 0 0x0"
 				else
 					# 5G
 					nvram set ${wdev}_bsd_if_qualify_policy="30 0x0"
 					nvram set ${wdev}_bsd_if_select_policy=$wdev_to_steer
 					nvram set ${wdev}_bsd_sta_select_policy="20 $rssi_threshold 0 0 1 0 0 0 0 0x40"
 					nvram set ${wdev}_bsd_steer_prefix=$wdev
-					nvram set ${wdev}_bsd_steering_policy="80 5 3 $rssi_threshold 0 0x40"
+					nvram set ${wdev}_bsd_steering_policy="80 5 3 $rssi_threshold 0 0x0"
 				fi
 			else
 				# Bandwidth Usage based policy #
@@ -261,6 +262,7 @@ wlmngr_startWsc()
 	nvram set wps_timeout_enable=0
 	#nvram get wps_config_method
 	nvram set wps_version2=enabled # extra
+	nvram set wps_oob_configured=1
 	nvram set lan_wps_oob=disabled # extra
 	nvram set lan_wps_reg=enabled # extra
 
@@ -347,6 +349,9 @@ wlmngr_doQoS() {
 
 wlmngr_finalize() {
 	local idx=$1
+	local dconpoll="$(uci -q get wireless.wl$idx.dconpoll)"
+
+	dconpoll=${dconpoll:-0}
 
 	wlctl -i wl$idx phy_watchdog 1
 	wlctl -i wl$idx fcache 1
@@ -355,8 +360,8 @@ wlmngr_finalize() {
 	local pcid="$(wlctl -i wl$idx revinfo | awk 'FNR == 2 {print}' | cut -d'x' -f2)"
 	local isac="$(db get hw.$pcid.is_ac)"
 	if [ "$isac" == "1" ]; then
-		wlctl -i wl$idx msglevel +radar +dfs 2>/dev/null
-		dhdctl -i wl$idx dconpoll 200 2>/dev/null
+		#wlctl -i wl$idx msglevel +dfs 2>/dev/null
+		dhdctl -i wl$idx dconpoll $dconpoll 2>/dev/null
 	fi
 	local rdrthrs="$(db get hw.$pcid.radarthrs)"
 	if [ -n "$rdrthrs" ]; then
@@ -367,6 +372,19 @@ wlmngr_finalize() {
 	# this piece of code is -required- to make br-lan's mac work properly
 	# in all cases
 	sendarp -s br-lan -d br-lan
+
+	# set power percent
+	local pwrpercent="$(uci -q get wireless.wl$idx.txpower)"
+	pwrpercent=${pwrpercent:-100}
+	wlctl -i wl$idx pwr_percent $pwrpercent
+
+	# set message level
+	wlctl -i wl$idx msglevel 0x0 2>/dev/null
+	dhdctl -i wl$idx msglevel 0x0 2>/dev/null
+	for msg in $(uci -q get wireless.wl$idx.msglevel); do
+		wlctl -i wl$idx msglevel +$msg 2>/dev/null
+		dhdctl -i wl$idx msglevel +$msg 2>/dev/null
+	done
 }
 
 wlmngr_issueServiceCmd() {

layer2interface/broadcom/lib/network/vlan.sh

@@ -58,17 +58,45 @@ ifbaseexists()
 	return 0
 }
 
+get_bridge_of() {
+
+        find_network() {
+                local config="$1"
+                local iface="$2"
+                local net=
+                local if_type
+                ifname="$(uci get network.$config.ifname)"
+                if_type="$(uci get network.$config.type)"
+                [ "$if_type" == "bridge" ] || return
+                for ifc in $ifname; do
+                        if [ "$ifc" == "$iface" ]; then
+                                net=$config
+                                break
+                        fi
+                done
+                [ -n "$net" ] && echo $net
+        }
+
+        config_load network
+        config_foreach find_network interface $1
+}
+
 check_mac_address()
 {
-	local baseifname="$1"
-	local vlan="$2"
-	local basemac
-	local mac=$(ifconfig -a | grep "^${baseifname}.${vlan} " | awk '{print $NF}')
-	local mac_in_use=$(ifconfig -a | grep "$mac" | grep -v "^${baseifname}.${vlan}[ ]")
-	if [ "$mac_in_use" ]; then
-		basemac=$(ifconfig -a | grep "^$baseifname " | awk '{print $NF}')
-		ifconfig ${baseifname}.${vlan} hw ether $basemac
-	fi
+        local baseifname="$1"
+        local vlan="$2"
+        local basemac
+        local mac=$(ifconfig -a | grep "^${baseifname}.${vlan} " | awk '{print $NF}')
+        local br_name=$(get_bridge_of ${baseifname}.${vlan})
+        if [ -n "$br_name" ];then
+                local mac_in_use=$(ifconfig -a | grep "$mac" | grep -v "^${baseifname}.${vlan}[ ]" | grep -v "$br_name")
+        else
+                local mac_in_use=$(ifconfig -a | grep "$mac" | grep -v "^${baseifname}.${vlan}[ ]")
+        fi
+        if [ "$mac_in_use" ]; then
+                basemac=$(ifconfig -a | grep "^$baseifname " | awk '{print $NF}')
+                ifconfig ${baseifname}.${vlan} hw ether $basemac
+        fi
 }
 
 addbrcmvlan()
@@ -161,12 +189,38 @@ addbrcmvlan()
 	fi
 }
 
+update_last_mac_group()
+{
+	local ifname=$1
+	local last_mac_group=$2
+
+	local full_mac modified_mac dev_mac
+
+	full_mac="$(ifconfig $ifname | awk '{print $NF; exit}')"
+
+	[ "${full_mac}" == "" ] && return
+
+	modified_mac="${full_mac:0:15}${last_mac_group}"
+
+	devs="wl0 wl1 bcmsw"
+
+	for dev in $devs; do
+		dev_mac="$(ifconfig $dev | awk '{print $NF; exit}')"
+		if [ "$dev_mac" == "$modified_mac" ]; then
+			return
+		fi
+	done
+
+	ifconfig $ifname hw ether "${modified_mac}"
+}
+
 
 brcm_virtual_interface_rules()
 {
 	local baseifname=$1
 	local ifname=$2
 	local bridge=$3
+	local last_mac_group=$4
 
 	bridge="${bridge:-0}"
 
@@ -230,6 +284,10 @@ brcm_virtual_interface_rules()
 		vlanctl --if $baseifname --rx --tags 0 --set-rxif $ifname --filter-vlan-dev-mac-addr 1 --rule-insert-before -1
 	fi
 
+	if [ "$last_mac_group" != "" ]; then
+		update_last_mac_group $ifname $last_mac_group
+	fi
+
 	ifconfig $ifname up
 	ifconfig $ifname multicast
 }

libtrace/Makefile

@@ -7,7 +7,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/apietila/libtrace.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_VERSION:=HEAD
+PKG_SOURCE_VERSION:=e4b4c5cce35a52da152776a00532aa0b80879c5b
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

loop-detector/Makefile

@@ -0,0 +1,48 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=loop-detector
+PKG_VERSION:=1.0
+
+PKG_SOURCE_VERSION:=d0fb770eacd6691b98df138b60f5116e02f71a9b
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/loop-detector
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define Package/loop-detector
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=L2 Loop detector
+  DEPENDS:= +libpcap +libuci +libpthread
+endef
+
+define Package/loop-detector/description
+	L2 Loop detection package
+endef
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE
+
+TARGET_LDFLAGS += \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+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
+
+define Package/loop-detector/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/loop-detector $(1)/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) ./files/loop_detection.init $(1)/etc/init.d/loop_detection
+	$(INSTALL_DIR) $(1)/etc/config
+	$(CP) ./files/loop_detection.config $(1)/etc/config/loop_detection
+endef
+
+$(eval $(call BuildPackage,loop-detector))

loop-detector/files/loop_detection.config

@@ -0,0 +1,5 @@
+config loop-detect loop
+	option enabled '1'
+	option discovery_interval '10'
+	option recovery_check_tries '5'
+

loop-detector/files/loop_detection.init

@@ -0,0 +1,36 @@
+#!/bin/sh /etc/rc.common
+
+START=21
+STOP=89
+
+USE_PROCD=1
+NAME=loop-detector
+
+start_service() {
+	local enabled
+
+	config_load loop_detection
+	config_get_bool enabled loop enabled 1
+
+	if [ $enabled -eq 1 ]; then
+		procd_open_instance
+		procd_set_param command "/sbin/loop-detector"
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}
+
+stop() {
+	service_stop /sbin/loop-detector
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger loop_detection
+}
+
+reload_service() {
+	stop
+	start
+}
+

natalie-dect-h/Makefile

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

natalie-dect/Makefile

@@ -18,11 +18,12 @@ PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-12.26
+PKG_SOURCE_URL:=git@dev.iopsys.eu:dialog/natalie-dect-12.26
 PKG_SOURCE_PROTO:=git
 endif
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/image.mk

peripheral_manager/Makefile

@@ -12,9 +12,9 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=2217e777ce56b53878ca467a06025db935c235eb
+PKG_SOURCE_VERSION:=959eca8ab2b50eaccfff9c710cffe5b317bb6ad1
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)