Redmine#27829 - easy-soc-libs: Use correct chipset defintions

The struct for passing ioctl() data does differ in size
(and offsets) on different platforms, hence we need to pass
the correct defines to the compiler.

Change-Id: If81a4bd79b21c5e93443e5ef48fb3f1b07058f60

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=1.2-2020-03-29
+PKG_VERSION:=1.6-2020-08-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=231350c496e3cd7cf62b6287c09c1f2834d41488
+PKG_SOURCE_VERSION:=bfe14a431d408614ed30e2d831ebd927eab719e2
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

crashlog/files/etc/init.d/crashlog

@@ -27,7 +27,7 @@ fill_in_default()
     /sbin/uci add system log
     /sbin/uci rename system.@log[-1]=crashlog
     /sbin/uci set system.crashlog.enable=no
-    /sbin/uci set system.crashlog.server="crash.inteno.se"
+    /sbin/uci set system.crashlog.server="crashlog.iopsys.eu"
     /sbin/uci commit
 }
 

crashlog/files/sbin/logcore

@@ -20,7 +20,7 @@ fill_in_default()
     /sbin/uci add system log
     /sbin/uci rename system.@log[-1]=corelog
     /sbin/uci set system.corelog.enable=no
-    /sbin/uci set system.corelog.server="crash.inteno.se"
+    /sbin/uci set system.corelog.server="corelog.iopsys.eu"
     /sbin/uci commit
 }
 

dectmngr2/Makefile

@@ -16,7 +16,6 @@ PKG_NAME:=dectmngr2
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
 
-RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

dslmngr/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fcad1331eb134b5f0cc05526aa897df61fc4fec0
+PKG_SOURCE_VERSION:=63525fe43aa57a710bb097e4c0ed496c4032db6d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif

easy-qos/files/etc/uci-defaults/60-easyqos-reqs

@@ -4,7 +4,5 @@ uci -q batch <<-EOT
         set firewall.easyqos=include
         set firewall.easyqos.path=/etc/firewall.easyqos
         set firewall.easyqos.reload=1
-	uci del_list firewall.easyqos._access_w="root"
-	uci add_list firewall.easyqos._access_w="root"
         commit firewall
 EOT

easy-soc-events/Makefile

@@ -0,0 +1,109 @@
+# All rights reserved.
+# See LICENSE for more information.
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=easy-soc-events
+PKG_VERSION:=1.1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/easy-soc-events.git
+PKG_SOURCE_VERSION:=5c582b0165b574dc94e4865f82e0bb91fa561754
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_BUILD_DIR:=$(BUILD_DIR)/easy-soc-events-$(PKG_VERSION)
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+
+include $(INCLUDE_DIR)/package.mk
+
+-include $(TOPDIR)/.config
+
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
+  LINUX_DIR=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.1
+  LINUX_VERSION := 4.1.52
+  LINUXINCLUDE=-Iarch/$(LINUX_KARCH)/mach-bcm963xx/include
+  BCM_BS_PROFILE := $(patsubst "%",%,$(CONFIG_BCM_KERNEL_PROFILE))
+  FS_DIR := $(BUILD_DIR)/bcmkernel/bcm963xx/targets/$(BCM_BS_PROFILE)/fs
+  MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)/extra
+  TARGET_MODULES_DIR:=/$(MODULES_SUBDIR)
+endif
+
+
+define KernelPackage/easy-soc-events/default
+  SUBMENU:=Other modules
+endef
+
+define KernelPackage/easy-soc-events
+  $(KernelPackage/easy-soc-events/default)
+  TITLE:=Helper module for netlink event notification
+  FILES:=$(PKG_BUILD_DIR)/easyevent.ko
+  AUTOLOAD:=$(call AutoLoad,11,easyevent)
+endef
+
+define KernelPackage/easy-soc-events-test
+  $(KernelPackage/easy-soc-events/default)
+  TITLE:=Test module for event notification through easyevent
+  DEPENDS+=+kmod-easy-soc-events
+  FILES+=$(PKG_BUILD_DIR)/test/testevent.ko
+endef
+
+
+define KernelPackage/easy-soc-events/description
+  This is a helper module to generate and pass netlink events from
+  kernel to user applications.
+endef
+
+#NOSTDINC_FLAGS :=
+
+ifdef CONFIG_PACKAGE_kmod-easy-soc-events
+  PKG_MAKE_FLAGS += CONFIG_EASYEVENT=y
+endif
+
+LINUXINCLUDE += \
+		-I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
+		-Iarch/$(LINUX_KARCH)/include \
+		-Iarch/$(LINUX_KARCH)/include/generated \
+		-Iarch/$(LINUX_KARCH)/include/generated/$(LINUX_UAPI_DIR) \
+		-I$(LINUX_DIR)/include/generated/uapi \
+		-Iarch/$(LINUX_KARCH)/include/$(LINUX_UAPI_DIR) \
+		-include ./include/linux/kconfig.h
+
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+endef
+
+define Build/Compile
+	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
+		$(KERNEL_MAKE_FLAGS) V=1 \
+		$(PKG_MAKE_FLAGS) \
+		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
+		LINUXINCLUDE="$(LINUXINCLUDE)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		modules
+endef
+
+
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
+define KernelPackage/easy-soc-events/install-extra
+	cp $(PKG_BUILD_DIR)/easyevent.ko $(FS_DIR)/lib/modules/$(LINUX_VERSION)/extra
+endef
+endif
+
+define KernelPackage/easy-soc-events/install
+	$(call KernelPackage/easy-soc-events/install-extra)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
+	#$(INSTALL_DIR) $(STAGING_DIR)/usr/include/linux
+	#$(CP) $(PKG_BUILD_DIR)/easysoc-event.h $(STAGING_DIR)/usr/include/linux/
+	#$(CP) $(PKG_BUILD_DIR)/easysoc-event.h $(LINUX_DIR)/include/linux/
+	$(CP) $(PKG_BUILD_DIR)/easyevent.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/wifievent.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/easyevent.h $(LINUX_DIR)/include/generated/uapi
+	$(CP) $(PKG_BUILD_DIR)/wifievent.h $(LINUX_DIR)/include/generated/uapi
+endef
+
+$(eval $(call KernelPackage,easy-soc-events-test))
+$(eval $(call KernelPackage,easy-soc-events))

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=3.1.5
+PKG_VERSION:=3.3.12
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=794dbaeb2f6ff3070ba3cbae71e754ee93d03606
+PKG_SOURCE_VERSION:=f508577fae01c4820fad884a5a0847d26104721c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -54,7 +54,7 @@ endef
 define Package/libethernet
   $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+TARGET_iopsys_ramips:swconfig
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
 endef
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
@@ -64,8 +64,17 @@ ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
   KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_panther),y)
+    TARGET_CFLAGS +=-DCONFIG_BCM96846
+  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_tiger),y)
+    TARGET_CFLAGS +=-DCONFIG_BCM96858
+  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_eagle),y)
+    TARGET_CFLAGS +=-DCONFIG_BCM963178
+  else
+    TARGET_CFLAGS +=-DCONFIG_BCM963138
+  endif
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
@@ -75,6 +84,12 @@ else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
 else ifeq ($(CONFIG_TARGET_intel_mips),y)
   TARGET_PLATFORM=INTEL
   TARGET_CFLAGS +=-DIOPSYS_INTEL
+else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
 else
   $(info Unexpected CONFIG_TARGET)
 endif

endptmngr/Makefile

@@ -7,9 +7,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=156c3f01d6e48d4cc2ffdcb1eb38ff7656478dd0
-PKG_LICENSE:=GPLv2
+PKG_VERSION:=0.3
+PKG_SOURCE_VERSION:=34ae1996beda98691d779e49f231bd662fc87cda
+PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)
@@ -19,13 +19,12 @@ PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=endptmngr-open
 PATCH_DIR:=
 else
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_NAME:=endptmngr
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif
 
-RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

ethmngr/Makefile

@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2020 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ethmngr
+PKG_VERSION:=1.0.4
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=b7135381aedf1bde6f7ab10b41be372a9bd7d155
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ethmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Ethernet status and configration utility
+  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl
+endef
+
+define Package/ethmngr/description
+ This package can be used to configure and provide status about
+ the ethernet interfaces and ports through UBUS.
+ It uses APIs from the libethernet.so library.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+define Package/ethmngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/ethmngr.init $(1)/etc/init.d/ethmngr
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,ethmngr))

ethmngr/files/ethmngr.init

@@ -0,0 +1,19 @@
+#!/bin/sh /etc/rc.common
+
+START=95
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/ethmngr
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+        stop
+        start
+}

fping/Makefile

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

icgroupd/Makefile

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

icgroupd/files/cgroupd

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

icgroupd/files/cgroups.config

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

icgroupd/files/cgroups.init

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

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2020-03-25
+PKG_VERSION:=4.0-2020-06-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=087ba5b857573a312d34c675a6fd5f88c0e46912
+PKG_SOURCE_VERSION:=7a6da73ae20abc27baf3aa4c1b2c1c0c0ecac82e
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -78,7 +78,7 @@ define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm  +libbbf_api
 endef
 
 define Package/icwmp/description

icwmp/README

@@ -1,136 +0,0 @@
-1)Build
-    Requirements<74>:
-	librairies:
-	- libuci.so
-	- libexpat.so
-	- libcurl.so
-	- libpthread.so
-	- libopenssl.so
-	- libz.so
-	- libcrypto.so
-	the librairies should be present in the "staging_dir/target-i386_uClibc-0.9.30.1/usr/lib/"  or "staging_dir/toolchain-mips_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/lib"
-	
-	header files and folders:
-	- expat.h
-	- expat_external.h
-	- uci.h
-	- uci_config.h
-	- zlib.h
-	- curl folder
-	- openssl folder
-	the header files and folders should be present in the staging_dir/target-i386_uClibc-0.9.30.1/usr/include/ or staging_dir/toolchain-i386_gcc-4.1.2_uClibc-0.9.30.1/usr/include/
-
-
-if a librairie doesn't exist:
- 	a- run make menuconfig and select the librarie
-	b- build the librarie package
-
-2) Build
-
-this software is composed of 3 packages:
-- icwmp package:  contains icwmpd daemon
-- cwmp lib package: contains cwmplib and contains cwmp_value_change binary. They could be used by other user space applications in order to notify the icwmp daemon when paramter changes
-- cwmp kernel package: contains cwmp kernel module. This module could be used by other kernel modules to notify the icwmpd daemon  when kernel parameter changes
-
-The three packages should be selected in the make menu config in order to get the three packages compiled.
-To compile the three packages: $ make package/cwmpd/compile 
-
-3) OpenWRT settings
-in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script file:
- uci_set_state provisioning iup tr069url "$url"
- uci_set_state provisioning iup provisioningcode "$provisioningcode"
-
-4) Run
-    Requirements:
-	- libuci package should be installed
-	- libexpat package should be installed
-	- libcurl package should be installed
-	- libpthread package should be installed
-	- libopenssl package should be installed
-	- libz package should be installed
-	- libcrypto package should be installed
-    
-    Configure the acs url in the /etc/config/icwmp
-    and then start the cwmpd service: /etc/init.d/icwmpd start
-    for the help: /etc/init.d/icwmpd
-
-5) Value Change
-
-5.1) value change for user space applications (using the libcwmp)
-
-Before using the libcwmp, we should check that the libcwmp package is selected in "make menu config". and we should check that the package is compiled.
-The libcwmp should be installed uin the OpenWRT firmware
-
-example of using libcwmp
-in myapplication.c
-
-#...
-#include <cwmp_lib.h>
-#...
-
-int anyfunction ()
-{
-   .....
-   /* parameter change here  */
-   /* so we inform the icwmp: */
-   lib_api_cwmp_value_change_call (3, "InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress","lan2","3");
-   .....
-/*
-Description of lib_api_cwmp_value_change_call input parameters
- parameter 1 : is the number of input string in the function lib_api_cwmp_value_change_call
- parameter 2 : is the parameter path
- parameter 3 : is the first correspondence related to the first indice
- parameter 4 : is the second correspondence related to the second indice
-   .
-   .
-   .
- parameter n : is the (n-2) correspondence related to the (n-2) indice
-*/
-
-}
-
-5.2) value change for user space applications (using the cwmp_value_change CLI)
-
-Before using the libcwmp, we should check that the libcwmp package is selected in "make menu config". and we should check that the package is compiled.
-The libcwmp should be installed uin the OpenWRT firmware
-
-in OpenWRT:
-
-root@OpenWrt:~# cwmp_value_change InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress "lan2" "3"
-
-in this case the command will force cwmp client to send a notification to the ACS (if and only if the parameter path as configured as active or as passive parameter using the setAttributeParameter method)
-
-5.3) value change for kernel space modules
-Before using the cwmp kernel module for value change, we should check that the kernel module package is selected in "make menu config". and we should check that the package is compiled.
-The kernel module should be installed uin the OpenWRT firmware and should be insert before all other kernel modules
-
-example of using cwmp kernel module
-in mykernelmodule.c
-
-#...
-#include <linux/cwmp_kernel.h>
-#...
-
-int anykernelfunction ()
-{
-   .....
-   /* parameter change here  */
-   /* so we inform the cwmp: */
-   kernel_api_cwmp_value_change_call (3, "InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress","lan2","3");
-   .....
-/*
-Description of lib_api_cwmp_value_change_call input parameters
- parameter 1 : is the number of input string in the function lib_api_cwmp_value_change_call
- parameter 2 : is the parameter path
- parameter 3 : is the first correspondence related to the first indice
- parameter 4 : is the second correspondence related to the second indice
-   .
-   .
-   .
- parameter n : is the (n-2) correspondence related to the (n-2) indice
-*/
-
-}
-
-
-

ieee1905/Config.in

@@ -2,13 +2,9 @@ if PACKAGE_ieee1905 || PACKAGE_lib1905al
 
 menu "developer/debug options"
 
-	config IEEE1905_SEND_EMPTY_TLVS
-		bool "Allow sending of empty TLVs"
-		default y
-
-	config IEEE1905_FIX_BROKEN_TLVS
-		bool "Allow reception of missing TLVs"
-		default y
+	config IEEE1905_MAP_COMPLETE_NETWORK
+		bool "Create network topology for complete network"
+		default n
 
 	config IEEE1905_SPEED_UP_DISCOVERY
 		bool "Speed up discovery of an AL in network"
@@ -29,10 +25,5 @@ menu "developer/debug options"
 			bool "ALME server over TCP port"
 
 	endchoice
-
-	config IEEE1905_REGISTER_EXTENSION_BBF
-		bool "Enable BBF extensions"
-		default n
-
 endmenu
 endif

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=2.0.15
+PKG_VERSION:=2.0.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=83e44c1cfcfec3a52a9ae61e9d954885caddb331
+PKG_SOURCE_VERSION:=44035a3bb0dd7e9fc1feb037c72c2c0d33692a98
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
@@ -23,7 +23,7 @@ define Package/ieee1905
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 daemon
-  DEPENDS:= +libuci +libjson-c +lib1905al +lib1905ubus
+  DEPENDS:= +libuci +libjson-c +lib1905 +ubox +libpcap +libopenssl +libwifi +libeasy
 endef
 
 define Package/ieee1905/config
@@ -34,18 +34,10 @@ define Package/ieee1905/description
  IEEE1905 stack with extended functionalities.
 endef
 
-define Package/lib1905al
+define Package/lib1905
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=IEEE1905 stack library
-  DEPENDS:= +libpcap +libopenssl +libwifi +libeasy +libuci
-endef
-
-define Package/lib1905ubus
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=IEEE1905 ubus library
-  DEPENDS:= +ubox +libjson-c
+  TITLE:=IEEE1905 cmdu tlv utility library
 endef
 
 define Package/lib1905hle
@@ -61,12 +53,6 @@ TARGET_CFLAGS += \
 	-Wall \
 	-Wextra
 
-ifeq ($(CONFIG_IEEE1905_SEND_EMPTY_TLVS),y)
-TARGET_CFLAGS += -DSEND_EMPTY_TLVS
-endif
-ifeq ($(CONFIG_IEEE1905_FIX_BROKEN_TLVS),y)
-TARGET_CFLAGS += -DFIX_BROKEN_TLVS
-endif
 ifeq ($(CONFIG_IEEE1905_SPEED_UP_DISCOVERY),y)
 TARGET_CFLAGS += -DSPEED_UP_DISCOVERY
 endif
@@ -79,8 +65,8 @@ endif
 ifeq ($(CONFIG_IEEE1905_ALME_OVER_UBUS),y)
 TARGET_CFLAGS += -DALME_OVER_UBUS
 endif
-ifeq ($(CONFIG_IEEE1905_REGISTER_EXTENSION_BBF),y)
-TARGET_CFLAGS += -DREGISTER_EXTENSION_BBF
+ifeq ($(CONFIG_IEEE1905_MAP_COMPLETE_NETWORK),y)
+TARGET_CFLAGS += -DIEEE1905_MAP_COMPLETE_NETWORK
 endif
 
 ifeq ($(LOCAL_DEV),1)
@@ -105,31 +91,23 @@ define Package/lib1905hle/install
 	$(CP) $(PKG_BUILD_DIR)/lib/lib1905hle.so $(1)/usr/lib/lib1905hle.so
 endef
 
-define Package/lib1905al/install
+define Package/lib1905/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/lib1905al.so $(1)/usr/lib/lib1905al.so
-endef
-
-define Package/lib1905ubus/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/lib1905ubus.so $(1)/usr/lib/lib1905ubus.so
+	$(CP) $(PKG_BUILD_DIR)/lib/lib1905.so $(1)/usr/lib/lib1905.so
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/lib1905al
+	$(INSTALL_DIR) $(1)/usr/include/lib1905
+	$(INSTALL_DIR) $(1)/usr/include/ieee1905
 	$(INSTALL_DIR) $(1)/usr/include/lib1905hle
-	$(INSTALL_DIR) $(1)/usr/include/lib1905ubus
-	$(CP) $(PKG_BUILD_DIR)/lib1905al/include/*.h $(1)/usr/include/lib1905al/
-	$(CP) $(PKG_BUILD_DIR)/lib1905ubus/include/*.h $(1)/usr/include/lib1905ubus/
+	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/ieee1905/
+	$(CP) $(PKG_BUILD_DIR)/lib1905/include/*.h $(1)/usr/include/lib1905/
 	$(CP) $(PKG_BUILD_DIR)/lib1905hle/include/*.h $(1)/usr/include/lib1905hle/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/lib1905al.so $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/lib1905ubus.so $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/lib1905hle.so $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/lib1905.so $(1)/usr/lib
 endef
 
-$(eval $(call BuildPackage,lib1905al))
-$(eval $(call BuildPackage,lib1905ubus))
+$(eval $(call BuildPackage,lib1905))
 $(eval $(call BuildPackage,lib1905hle))
 $(eval $(call BuildPackage,ieee1905))

ieee1905/files/etc/config/ieee1905

@@ -1,20 +1,20 @@
-config ieee1905
+config ieee1905 'ieee1905'
         option enabled '1'
         option debug  true
-
-config al
-        option enabled '1'
-        option basemacint 'wan'
-      # option almac ''
-        option mapall true
-      # option registrar true
         option debug_level  2
-      # option alme_port  8888
-        option cmdu_event true
-        option discovery_timer 60
-        option map_plugin false
+        option macaddress 'auto'
+        option registrar 0
+        option cmdu_event 1
+        option map_plugin 0
+
+config security 'security'
+        list method 'PBC'
+	option ssid ''
+	option encryption ''
+        option key 'TESTPASSWORD'
 
 config al-iface
-        option enabled '0'
+        option enabled 1
         option ifname 'br-lan'
         option media 'bridge'
+

ieee1905/files/etc/init.d/ieee1905

@@ -5,8 +5,6 @@ STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/ieee1905d
-AL_CONF=/tmp/ieee1905.config
-INTERFACE=""
 
 validate_ieee1905_section()
 {
@@ -15,247 +13,6 @@ validate_ieee1905_section()
 		'enabled:bool:false'
 }
 
-get_device_name() {
-	local device
-	# Get wan L3 interface
-	ubus list |grep -iq network.interface.${1}
-	if [ "$?" -eq 0 ]; then
-		json_load "$(ubus -t 2 call network.interface.${1} status)"
-		json_get_var device device
-		echo ${device}
-	fi
-}
-
-get_interface_mac() {
-	local l3 basemac
-	l3=$(get_device_name ${1})
-	if [ -n ${l3} ]; then
-		json_load "$(ubus -t 2 call network.device status "{\"name\":\"${l3}\"}")"
-		json_get_var basemac macaddr
-	fi
-	local first=0x$(echo $basemac |cut -d : -f 1)
-	local rest=$(echo $basemac |cut -d : -f 2-)
-	# Set local bit
-	first=$((first|2))
-	first=$(printf "%02x" $first)
-	basemac="${first}:${rest}"
-	echo ${basemac}
-}
-
-validate_al_iface_section()
-{
-	uci_validate_section ieee1905 al-iface "${1}" \
-		'enabled:bool:false' \
-		'ifname:string:br-lan' \
-		'media:string:bridge' \
-		'manufacturer_name:string' \
-		'model_name:string' \
-		'model_number:string:000000' \
-		'device_name:string' \
-		'serial_number:string'
-}
-
-get_ifindex()
-{
-	local ifname=${1}
-	local ifindex=$(cat /sys/class/net/${ifname}/upper_*/ifindex 2>/dev/null)
-	if [ -z ${ifindex} ]; then
-		ifindex=$(cat /sys/class/net/${ifname}/ifindex)
-	fi
-	echo ${ifindex}
-}
-
-get_wlan_passkey()
-{
-	local ifname=${1}
-	local pass=""
-	local count=0
-
-	while true
-	do
-		local devname=$(uci get wireless.@wifi-iface[${count}].ifname 2>/dev/null)
-		if [ $? -ne 0 ]; then
-			break;
-		fi
-		if [ "${devname}"=="${ifname}" ]; then
-			pass=$(uci get wireless.@wifi-iface[${count}].key 2>/dev/null)
-			break;
-		fi
-		count=$((count+1))
-	done
-	echo ${pass}
-}
-
-configure_interface()
-{
-	local ifname media enabled manufacturer_name model_name model_number device_name serial_number
-	local uuid ifindex
-
-	validate_al_iface_section ${1} || {
-		echo "Validation of al-iface sec failed"
-		exit 1;
-	}
-
-	if [ ${enabled} -eq 0 ]; then
-		return;
-	fi
-
-	# Only continue if interface exists
-	ifconfig ${ifname} 2>/dev/null 1>/dev/null
-	if [ $? -ne 0 ]; then
-		return;
-	fi
-
-	if [ -z ${INTERFACE} ]; then
-		INTERFACE=${ifname}
-	else
-		INTERFACE="${INTERFACE},${ifname}"
-	fi
-
-	if [ -z ${manufacturer_name} ]; then
-		manufacturer_name=$(db get hw.board.iopVerCustomer)
-	fi
-
-	if [ -z ${model_name} ]; then
-		model_name=$(db get hw.board.model_name)
-	fi
-
-	if [ -z ${device_name} ]; then
-		device_name=$(db get hw.board.model_name)
-	fi
-
-	if [ -z ${serial_number} ]; then
-		serial_number=$(db get hw.board.serial_number)
-	fi
-
-	if [ "${media}"=="bridge" ]; then
-		echo "Get interfaces from bridge"
-		local lower=$(ls -1 /sys/class/net/${ifname}/|grep lower_|tr '_' ' '|awk '{printf $2" "}')
-		for intf in ${lower}
-		do
-			ubus list wifi.ap.${intf} 2>/dev/null 1>/dev/null
-			if [ $? -eq 0 ]; then
-				INTERFACE="${INTERFACE},${intf}"
-				uuid=$(cat /proc/sys/kernel/random/uuid)
-				ifindex=$(get_ifindex ${intf})
-				local key=$(get_wlan_passkey ${ifname})
-				json_add_object
-				json_add_string ifname ${intf}
-				json_add_string media "wifi"
-				json_add_string network_key ${key}
-				json_add_string manufacturer_name ${manufacturer_name}
-				json_add_string model_name ${model_name}
-				json_add_string model_number ${model_number}
-				json_add_string device_name ${device_name}
-				json_add_string serial_number ${serial_number}
-				json_add_string uuid ${uuid}
-				json_add_int ifindex ${ifindex}
-				json_close_object
-			fi
-		done
-	fi
-	uuid=$(cat /proc/sys/kernel/random/uuid)
-	ifindex=$(get_ifindex ${ifname})
-
-	json_add_object
-	json_add_string ifname ${ifname}
-
-	if [ "${media}"=="bridge" ]; then
-		json_add_string media "eth"
-	elif [ "${media}"=="wifi" ]; then
-		local key=$(get_wlan_passkey ${ifname})
-		json_add_string media "wifi"
-		json_add_string network_key ${key}
-	else
-		json_add_string media ${media}
-	fi
-
-	json_add_string manufacturer_name ${manufacturer_name}
-	json_add_string model_name ${model_name}
-	json_add_string model_number ${model_number}
-	json_add_string device_name ${device_name}
-	json_add_string serial_number ${serial_number}
-	json_add_string uuid ${uuid}
-	json_add_int ifindex ${ifindex}
-	json_close_object
-}
-
-validate_al_section()
-{
-	uci_validate_section ieee1905 meshcomms "${1}" \
-		'enabled:bool:false' \
-		'basemacint:string:wan' \
-		'almac:string' \
-		'registrar:bool:false' \
-		'mapall:bool:true' \
-		'debug_level:uinteger:1' \
-		'alme_port:port:8888' \
-		'cmdu_event:bool:true' \
-		'discovery_timer:uinteger:60' \
-		'map_plugin:bool:false'
-}
-
-
-configure_al_entity()
-{
-	local enabled almac basemacint mapall debug_level alme_port l3device basemac intf
-	local registrar cmdu_event discovery_timer map_plugin
-
-	validate_al_section ${1} || {
-		echo "Validation of al section failed"
-		exit 1;
-	}
-
-	if [ -z ${almac} ]; then
-		basemac=$(get_interface_mac ${basemacint})
-	else
-		basemac=${almac}
-	fi
-
-
-	local fname cname model cUrl
-	fname=$(db get hw.board.boardId)
-	cname=$(db get hw.board.iopVerCustomer)
-	model=$(db get hw.board.routerModel)
-	# get ip from lan bridge first
-	cUrl=$(ifconfig br-lan 2>/dev/null|grep "inet addr:"|tr ':' ' '|awk '{printf $3}')
-	if [ -z ${cUrl} ]; then
-		cUrl=$(ifconfig br-wan 2>/dev/null|grep "inet addr:"|tr ':' ' '|awk '{printf $3}')
-	fi
-	if [ -z ${cUrl} ]; then
-		cUrl="http://192.168.1.1"
-	fi
-
-	json_init
-	# fill the al-iface info
-	json_add_array al-iface
-	config_foreach configure_interface al-iface
-	json_close_array
-
-	json_add_object deviceInfo
-	json_add_string friendly_name ${fname}
-	json_add_string manufacturer_name ${cname}
-	json_add_string model ${model}
-	json_add_string control_url ${cUrl}
-	json_close_object
-
-	json_add_object al
-	json_add_int enabled ${enabled}
-	json_add_string mac ${basemac}
-	json_add_string interfaces ${INTERFACE}
-	json_add_int map ${mapall}
-	json_add_int registrar ${registrar}
-	json_add_int debug_level ${debug_level}
-	json_add_int alme_port ${alme_port}
-	json_add_int cmdu_event ${cmdu_event}
-	json_add_int discovery_timer ${discovery_timer}
-	json_add_int map_plugin ${map_plugin}
-	json_close_object
-
-	json_dump >${AL_CONF}
-	sync
-}
-
 configure_ieee1905()
 {
 	local enabled debug
@@ -277,25 +34,21 @@ configure_ieee1905()
 	fi
 }
 
-configure_network() {
-	[ -f ${AL_CONF} ] && rm ${AL_CONF}
-
+configure_network()
+{
 	ebtables -L FORWARD|grep -iqE "1:80:C2:(0)+:(0)+:13.*-j.*DROP"
 	if [ "$?" -ne 0 ]; then
 		echo "Applying drop rule to drop pkts forwared by kernel to 1905.1 multicast mac"
 		ebtables -A FORWARD -d 01:80:c2:00:00:13 -j DROP
 	fi
-
-	config_load ieee1905
-	config_foreach configure_ieee1905 ieee1905
-	config_foreach configure_al_entity al
 }
 
 start_service() {
 	procd_open_instance ieee1905
 	procd_set_param command ${PROG}
+	configure_ieee1905 "ieee1905"
 	configure_network
-	# procd_set_param respawn
+	procd_set_param respawn
 	procd_close_instance
 }
 

ifbt/Makefile

@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifbt
-PKG_VERSION:=0.3
-
-PKG_SOURCE_VERSION:=c9a7db18b15a59b03b756d00a0a630e98d9541c5
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=README
-
-include $(INCLUDE_DIR)/package.mk
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-TARGET_PLATFORM:=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_INTEL
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_PLATFORM:=-DIOPSYS_MEDIATEK
-else
-$(info (UNEXPECTED CONFIG TARGET))
-endif
-
-export TARGET_PLATFORM
-
-define Package/ifbt
-	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c  +libwifi +libjson-c
-	TITLE:=Fast BSS Transition
-endef
-
-define Package/ifbt/description
-	ifbt is Iopsys application for fast BSS transition
-endef
-
-define Package/ifbt/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifbt $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ifbt))

inbd/Makefile

@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=inbd
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
+PKG_SOURCE_VERSION:=3135944f3357a7a2c1c206be7b65bbb7ac6d1e58
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 

iop/config

@@ -11,19 +11,16 @@ CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
 CONFIG_PACKAGE_comgt-ncm=y
-CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_easy-qos=y
 CONFIG_PACKAGE_ethtool=y
 CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_icwmp-curl=y
-CONFIG_PACKAGE_ifbt=y
-CONFIG_PACKAGE_imonitor=y
+CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_iopupgrade=y
+CONFIG_PACKAGE_iopupgrade=m
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
@@ -33,47 +30,23 @@ CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-config-backup=y
-CONFIG_PACKAGE_juci-ddns=y
-CONFIG_PACKAGE_juci-diagnostics=y
 CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
-CONFIG_PACKAGE_juci-dropbear=y
-CONFIG_PACKAGE_juci-easyqos=y
-CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
-CONFIG_PACKAGE_juci-icwmp=y
-CONFIG_PACKAGE_juci-igmpinfo=y
-CONFIG_PACKAGE_juci-minidlna=y
 CONFIG_PACKAGE_juci-mod-status=y
 CONFIG_PACKAGE_juci-mod-system=y
-CONFIG_PACKAGE_juci-mwan3=y
-CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-device=y
 CONFIG_PACKAGE_juci-network-dsl=y
 CONFIG_PACKAGE_juci-network-netifd=y
-CONFIG_PACKAGE_juci-network-port=y
-CONFIG_PACKAGE_juci-openvpn=y
-CONFIG_PACKAGE_juci-owsd=y
-CONFIG_PACKAGE_juci-realtime-graphs=y
-CONFIG_PACKAGE_juci-samba=y
-CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
-CONFIG_PACKAGE_juci-upnp=y
-CONFIG_PACKAGE_juci-usb=y
-CONFIG_PACKAGE_juci-voice-client=y
-CONFIG_PACKAGE_juci-wifilife=y
 CONFIG_PACKAGE_juci-wireless=y
 CONFIG_PACKAGE_juci-theme-iopsys=y
-CONFIG_PACKAGE_kmod-siit=y
-CONFIG_PACKAGE_libcgroup-daemon=y
-CONFIG_PACKAGE_libcgroup=y
-# CONFIG_PACKAGE_libcgroup-utils is not set
 CONFIG_PACKAGE_libdaemon=y
-CONFIG_PACKAGE_libffmpeg-mini=y
 CONFIG_PACKAGE_libgmp=y
 CONFIG_PACKAGE_libreadline=y
+CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_loop-detector=m
-CONFIG_PACKAGE_minidlna=y
+CONFIG_PACKAGE_lscpu=y
+CONFIG_PACKAGE_map=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
@@ -90,7 +63,6 @@ CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
-CONFIG_PACKAGE_power-management=y
 CONFIG_PACKAGE_ppp-mod-pppoa=y
 CONFIG_PACKAGE_ppp-mod-pppoe=y
 CONFIG_PACKAGE_ppp-mod-pppol2tp=y
@@ -104,15 +76,14 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-rpcsys=y
+CONFIG_PACKAGE_rsync=y
 CONFIG_PACKAGE_rulengd=y
-CONFIG_PACKAGE_samba3=y
-CONFIG_PACKAGE_samba3-nmbd=y
-CONFIG_PACKAGE_snmpd=y
 CONFIG_PACKAGE_strace=y
+CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_tptest=y
 CONFIG_PACKAGE_traceroute6=y
 CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
@@ -121,8 +92,6 @@ CONFIG_PACKAGE_usbreset=y
 CONFIG_PACKAGE_uspd=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_wifilife=y
 CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
@@ -187,11 +156,18 @@ CONFIG_BUSYBOX_CONFIG_MOUNTPOINT=y
 CONFIG_BUSYBOX_CONFIG_RUN_PARTS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_LEVELS=y
+CONFIG_BUSYBOX_CONFIG_GZIP_FAST=2
+CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
+CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION=y
+CONFIG_BUSYBOX_CONFIG_USLEEP=y
+CONFIG_BUSYBOX_CONFIG_REALPATH=y
+CONFIG_BUSYBOX_CONFIG_TTY=y
 CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
-# CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
 # CONFIG_SIGNED_PACKAGES is not set
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y

iop/scripts/feeds_update.sh

@@ -32,7 +32,7 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-mips iopsys-brcm63xx-arm iopsys-ramips intel_mips"
+    targets="iopsys-brcm63xx-mips iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt"
     for target in $targets
     do
 	rm -f target/linux/$target
@@ -57,6 +57,3 @@ function feeds_update {
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
 
-
-
-

iop/scripts/genconfig.sh

@@ -18,6 +18,8 @@ function genconfig {
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
 	intel_mips="target/linux/intel_mips"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -79,8 +81,33 @@ function genconfig {
 
 	# Takes a board name and returns the target name in global var $target
 	set_target() {
-	    local profile=$1
+		local profile=$1
 
+		[ -n "$profile" ] || return
+
+		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
+			local targetpath="./target/linux/$TARGET"
+			local profiles=
+			local pfound=0
+
+			if [ -e "$targetpath/genconfig" ]; then
+				profiles=$(cd $targetpath; ./genconfig)
+
+				for p in $profiles; do
+					if [ $p == $profile ]; then
+						pfound=1
+						break
+					fi
+				done
+			fi
+
+			if [ $pfound -eq 1 ]; then
+				target="$(echo $TARGET | tr '-' '_')"
+				config_path="$targetpath/config"
+			fi
+
+			return
+		fi
 
 		[ -e $brcm63xx_mips/genconfig ] &&
 			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
@@ -90,9 +117,13 @@ function genconfig {
 			iopsys_ramips=$(cd $ramips; ./genconfig)
 		[ -e $intel_mips/genconfig ] &&
 			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
+		[ -e $x86/genconfig ] &&
+			iopsys_x86=$(cd $x86; ./genconfig)
+		[ -e $armvirt/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips; do
+			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -133,6 +164,22 @@ function genconfig {
 		fi
 	    done
 
+	    for p in $iopsys_x86; do
+		if [ $p == $profile ]; then
+		    target="iopsys_x86"
+			config_path="$x86/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_armvirt; do
+		if [ $p == $profile ]; then
+		    target="iopsys_armvirt"
+			config_path="$armvirt/config"
+		    return
+		fi
+	    done
+
 	}
 
 	git remote -v | grep -q http || {
@@ -142,13 +189,11 @@ function genconfig {
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
-		wifilifeAllowed=0
 
 		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
 		git ls-remote git@dev.iopsys.eu:mediatek/linux.git -q 2>/dev/null && mediatekAllowed=1
 		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
 		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/wifilife.git -q 2>/dev/null && wifilifeAllowed=1
 	}
 
 	v() {
@@ -162,6 +207,7 @@ function genconfig {
 		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
 		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
+		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
 		echo -e "  -s|--override\t\tEnable 'Package source tree override'"
 		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
 		echo -e "  -h|--help\t\tShow this message"
@@ -169,7 +215,7 @@ function genconfig {
 		echo -e "  -a|--list-all\t\tList all Customers and their board types"
 		echo -e "  -b|--boards\t\tList all board types"
 		echo
-		echo "Example ./iop genconfig dg200 TELIA"
+		echo "Example ./iop genconfig eg400 OPERATORX"
 		echo "(if no customerconfig is chosen, iopsys config will be used)"
 		echo
 		exit 0
@@ -220,12 +266,12 @@ function genconfig {
 
 	generate_config()
 	{
-	DIFFFILE="$1"
-	MASTERFILE="$2"
-	while read p; do
-		v "$p"
-		sed -r -i "$p" $MASTERFILE
-	done < $DIFFFILE
+		DIFFFILE="$1"
+		MASTERFILE="$2"
+		while read p; do
+			v "$p"
+			sed -r -i "$p" $MASTERFILE
+		done < $DIFFFILE
 	}
 
 	setup_dirs()
@@ -300,7 +346,7 @@ function genconfig {
 		    cat $config_path/$BOARDTYPE/config >> .config
 		fi
 
-		#special handling for intel_mips which use TARGET_DEVICES
+		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
 		if [ "$target" = "intel_mips" ]; then
 			subtarget="xrx500"
 			echo "CONFIG_TARGET_${target}=y" >> .config
@@ -309,6 +355,11 @@ function genconfig {
 			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			device=$(echo $BOARDTYPE | tr a-z A-Z)
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		elif [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -361,14 +412,12 @@ function genconfig {
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
 			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
-			[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		else
 			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
 			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
-			echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		fi
 
 		if [ -n "$BRCM_MAX_JOBS" ]
@@ -421,6 +470,7 @@ function genconfig {
 			-c|--clean) export CLEAN=1;;
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
+			-t|--target) export TARGET="$2"; shift;;
 			-p|--profile) export PROFILE="$2"; shift;;
 			-r|--repo) export CUSTREPO="$2"; shift;;
 			-s|--override) export SRCTREEOVERR=1;;

iop/scripts/genconfig_min.sh

@@ -0,0 +1,453 @@
+#!/bin/bash
+
+function genconfig_min {
+	export CLEAN=0
+	export SRCTREEOVERR=0
+	export FILEDIR="files/"
+	CURRENT_CONFIG_FILE=".current_config_file"
+	export CONFIGPATH="package/feeds/iopsys/iop"
+	CUSTPATH="customerconfigs"
+	export CUSTCONF="customerconfigs/customers"
+	export VERBOSE=0
+	#always use the mirror
+	export DEVELOPER=0
+	target="bogus"
+	config_path=""
+	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	intel_mips="target/linux/intel_mips"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
+
+	Red='\033[0;31m'          # Red
+	Color_Off='\033[0m'       # Text Reset
+	Yellow='\033[0;33m'       # Yellow
+
+	function find_last {
+	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
+	}
+
+	function is_new {
+	    for opt in $conf_warned
+	    do
+		if [ "$opt" == "$1" ]
+		then
+		    return 1
+		fi
+	    done
+	    # option not found return true
+	    return 0
+	}
+
+	function verify_config {
+	    IFS=$'\n'
+	    org=$(<.genconfig.config)
+	    unset IFS
+	    local num
+	    local conf_opt
+	    local conf_org
+	    local conf_new
+
+	    #echo "lines to check $tot_lines"
+	    num=0
+	    for line in $org
+	    do
+		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
+		if [ -n "${conf_opt}" ]
+		then
+		    conf_org=$(find_last ${conf_opt} .genconfig.config)
+		    conf_new=$(find_last ${conf_opt} .config)
+		    if [ "$conf_org" != "$conf_new" ]
+		    then
+			if is_new $conf_opt
+			then
+			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
+			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
+			    echo "This is a real problem somebody needs to investigate"
+			    echo ""
+			    conf_warned="$conf_warned $conf_opt"
+			fi
+		    else
+			true
+			# for debug to see all options
+			#echo -e "wanted [$conf_org] got [$conf_new]"
+		    fi
+		fi
+		num=$((num+1))
+	    done
+	}
+
+	# Takes a board name and returns the target name in global var $target
+	set_target() {
+	    local profile=$1
+
+		[ -n "$profile" ] || return
+
+		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
+			local targetpath="./target/linux/$TARGET"
+			local profiles=
+			local pfound=0
+
+			if [ -e "$targetpath/genconfig" ]; then
+				profiles=$(cd $targetpath; ./genconfig)
+
+				for p in $profiles; do
+					if [ $p == $profile ]; then
+						pfound=1
+						break
+					fi
+				done
+			fi
+
+			if [ $pfound -eq 1 ]; then
+				target="$(echo $TARGET | tr '-' '_')"
+				config_path="$targetpath/config"
+			fi
+
+			return
+		fi
+
+		[ -e $brcm63xx_mips/genconfig ] &&
+			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
+		[ -e $brcm63xx_arm/genconfig ] &&
+			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
+		[ -e $ramips/genconfig ] &&
+			iopsys_ramips=$(cd $ramips; ./genconfig)
+		[ -e $intel_mips/genconfig ] &&
+			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
+		[ -e $x86/genconfig ] &&
+			iopsys_x86=$(cd $x86; ./genconfig)
+		[ -e $armvirt/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+
+	    if [ "$profile" == "LIST" ]; then
+			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt; do
+				echo "$list based boards:"
+				for b in ${!list}; do
+					echo -e "\t$b"
+				done
+			done
+			return
+	    fi
+
+	    for p in $iopsys_brcm63xx_mips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_brcm63xx_mips"
+			config_path="$brcm63xx_mips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_brcm63xx_arm; do
+		if [ $p == $profile ]; then
+		    target="iopsys_brcm63xx_arm"
+			config_path="$brcm63xx_arm/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_ramips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_ramips"
+			config_path="$ramips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_intel_mips; do
+		if [ $p == $profile ]; then
+		    target="intel_mips"
+			config_path="$intel_mips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_x86; do
+		if [ $p == $profile ]; then
+		    target="iopsys_x86"
+			config_path="$x86/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_armvirt; do
+		if [ $p == $profile ]; then
+		    target="iopsys_armvirt"
+			config_path="$armvirt/config"
+		    return
+		fi
+	    done
+
+	}
+
+	git remote -v | grep -q http || {
+		DEVELOPER=1
+
+		bcmAllowed=0
+		endptAllowed=0
+		natalieAllowed=0
+		mediatekAllowed=0
+
+		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
+		git ls-remote git@dev.iopsys.eu:mediatek/linux.git -q 2>/dev/null && mediatekAllowed=1
+		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
+		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
+	}
+
+	v() {
+		[ "$VERBOSE" -ge 1 ] && echo "$@"
+	}
+
+	usage() {
+		echo
+		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
+		echo
+		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
+		echo -e "  -v|--verbose\t\tVerbose"
+		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
+		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
+		echo -e "  -s|--override\t\tEnable 'Package source tree override'"
+		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
+		echo -e "  -h|--help\t\tShow this message"
+		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
+		echo -e "  -a|--list-all\t\tList all Customers and their board types"
+		echo -e "  -b|--boards\t\tList all board types"
+		echo
+		echo "Example ./iop genconfig dg400prime IOPSYS"
+		echo
+		exit 0
+	}
+
+	list_customers()
+	{
+		local ALL="$1"
+		local CUSTOMER="$2"
+		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
+			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common )"
+			if [ "$boards" ]; then
+				echo "$CUSTOMER has following boards:"
+				for board in $boards; do
+					echo -e "\t$board"
+				done
+			else
+				echo "No boards found for $CUSTOMER"
+			fi
+		elif [ "$CUSTOMER" ]; then
+			echo "No customer called $CUSTOMER"
+			exit 1
+		elif [ -d $CUSTCONF ]; then
+			local customers="$(ls -1 $CUSTCONF)"
+			if [ "$customers" -a "$ALL" == 1 ]; then
+				for customer in $customers; do
+					echo $customer
+					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common )"
+					if [ "$boards" ]; then
+						for board in $boards; do
+							echo -e "\t$board"
+						done
+					else
+						echo "has no boards"
+					fi
+				done
+			elif [ "$customers" ]; then
+				echo -e "$customers"
+			else
+				echo "no customers found"
+			fi
+		else
+			echo "No $CUSTCONF folder found"
+		fi
+		exit 0
+	}
+
+
+	generate_config()
+	{
+	DIFFFILE="$1"
+	MASTERFILE="$2"
+	while read p; do
+		v "$p"
+		sed -r -i "$p" $MASTERFILE
+	done < $DIFFFILE
+	}
+
+	setup_dirs()
+	{
+
+		if [ ! -d "$FILEDIR" ]; then
+			mkdir -p $FILEDIR
+		elif [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
+			v "rm -rf $FILEDIR*"
+			rm -rf $FILEDIR*
+		fi
+	}
+
+	create_and_copy_files()
+	{
+		local BOARDTYPE=$1
+		shift
+		local CUSTOMERS=$@
+
+		# Validate seleced board and customers
+		set_target $BOARDTYPE
+		if [ $target == "bogus" ]; then
+			echo "Hardware profile does not exist"
+			exit 1
+		elif [ -n "$CUSTOMERS" ]; then
+			for CUSTOMER in $CUSTOMERS; do
+				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
+			done
+		fi
+
+		# Generate base config
+		rm -f .config
+		v "Config $BOARDTYPE selected"
+		v "cp $CONFIGPATH/config .config"
+		cp $CONFIGPATH/config .config
+
+		if [ -f $config_path/config ]; then
+		    cat $config_path/config >> .config
+		fi
+		if [ -f $config_path/$BOARDTYPE/config ]; then
+		    cat $config_path/$BOARDTYPE/config >> .config
+		fi
+
+		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
+		if [ "$target" = "intel_mips" ]; then
+			subtarget="xrx500"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+			device=$(echo $BOARDTYPE | tr a-z A-Z)
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		elif [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		else
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
+		fi
+
+		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
+
+		# Add customerconfig diff if a customer is selected
+		if [ -n "$CUSTOMERS" ]; then
+			for CUSTOMER in $CUSTOMERS; do
+				if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
+					v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
+					cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
+				fi
+				if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
+					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
+					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
+				fi
+				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
+					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
+				fi
+				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
+					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
+					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
+				fi
+			done
+		fi
+
+		# Set target version
+		local GIT_TAG=$(git describe --abbrev=0 --tags)
+		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
+
+
+		# Enable Package source tree override if selected
+		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
+
+		# developer mode selected ?
+		echo "CONFIG_DEVEL=y" >>.config
+
+		if [ -n "$BRCM_MAX_JOBS" ]
+		then
+		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
+		fi
+
+		# 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
+
+		# Store generated config
+		cp .config .genconfig.config
+
+		# Set default values based on selected parameters
+		v "$(make defconfig 2>&1)"
+
+		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+
+		# Clean base-file package to force rebuild when changing profile
+		v "$(make package/base-files/clean 2>&1)"
+
+		verify_config
+	}
+
+	####### main #####
+	if [ ! -e tmp/.iop_bootstrap ]; then
+		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
+		echo "Run: iop feeds_update"
+		exit 0
+	fi
+
+	if [ $# -eq 0 ]; then
+		echo Current profile:
+		cat $CURRENT_CONFIG_FILE
+		echo "Try ./iop genconfig -h' to get instructions if you want to change current config"
+		exit 0
+	else
+		while [ -n "$1" ]; do
+			case "$1" in
+
+			-c|--clean) export CLEAN=1;;
+			-n|--no-update) export IMPORT=0;;
+			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
+			-t|--target) export TARGET="$2"; shift;;
+			-p|--profile) export PROFILE="$2"; shift;;
+			-r|--repo) export CUSTREPO="$2"; shift;;
+			-s|--override) export SRCTREEOVERR=1;;
+			-S|--brcmsingel) export BRCM_MAX_JOBS=1;;
+			-h|--help) usage;;
+			-l|--list) list_customers 0 $2;;
+			-a|--list-all)list_customers 1;;
+			-b|--boards)set_target LIST;exit 0;;
+			-*)
+				echo "Invalid option: $1 "
+				echo "Try -h or --help for more information."
+				exit 1
+				;;
+			*) break;;
+			esac
+			shift;
+		done
+
+		setup_dirs
+		create_and_copy_files "$@"
+	fi
+}
+
+register_command "genconfig_min" "Generate configuration for customer with manual board configuration"

iop/scripts/generate_tarballs.sh

@@ -59,23 +59,6 @@ build_endptmngr_consumer() {
 	cd "$curdir"
 }
 
-build_wifilife_consumer() {
-	local ver commit
-	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
-	commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
-	[ -n "$ver" -a -n "$commit" ] || return
-	ssh $SERVER "test -f $FPATH/wifilife-$target-${ver}_${commit}.tar.xz" && return
-	cd ./build_dir/target-*/wifilife-$ver/ipkg-* || cd ./build_dir/target-mips*musl-*/wifilife-$ver/ipkg-*
-	mkdir -p wifilife-$ver/src
-	cp -rf wifilife/usr/sbin/* wifilife-$ver/src/
-	tar Jcf wifilife-${target}-${ver}_${commit}.tar.xz wifilife-$ver
-	scp -pv wifilife-$target-${ver}_${commit}.tar.xz $SERVER:$FPATH/
-	cp wifilife-${target}-${ver}_${commit}.tar.xz $curdir/
-	rm -rf wifilife-$ver
-	rm -f wifilife-${target}-${ver}_${commit}.tar.xz
-	cd "$curdir"
-}
-
 build_mediatek_kernel() {
 	local mediatek_commit kernel
 
@@ -100,8 +83,8 @@ build_mediatek_wifi_consumer() {
 	local ver commit
 	local chip=$1
 
-	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/mt${chip}/Makefile | cut -d'=' -f2)
-	commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/mt${chip}/Makefile | cut -d'=' -f2)
+	ver=$(grep -w "PKG_VERSION:" ./feeds/mediatek/mt${chip}/Makefile | cut -d'=' -f2)
+	commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/mediatek/mt${chip}/Makefile | cut -d'=' -f2)
 	[ -n "$ver" -a -n "$commit" ] || return
 	ssh $SERVER "test -f $FPATH/mtk${chip}e-${ver}_${commit}.tar.xz" && return
 	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/mtk${chip}e-$ver/ipkg-*
@@ -163,12 +146,10 @@ function generate_tarballs {
 		build_bcmkernel_consumer
 		build_natalie_consumer
 		build_endptmngr_consumer
-		build_wifilife_consumer
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel
 		build_mediatek_wifi_consumer 7603
 		build_mediatek_wifi_consumer 7615
-		build_wifilife_consumer
 	else
 		echo "Invalid target: $stk_target"
 		print_usage

iup/Makefile

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=iup
-PKG_VERSION:=0.0.1
-PKG_RELEASE:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/iup
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=iup client
-  DEPENDS:=+libuci +uci +busybox
-endef
-
-define Package/iup/description
-	This package contains Inteno's IUP Client
-endef
-
-define Build/Compile
-	true
-endef
-
-define Package/iup/install
-	$(INSTALL_DIR) $(1)/sbin
-	cp -r ./files/*  $(1)/
-endef
-
-$(eval $(call BuildPackage,iup))

iup/files/etc/config/provisioning

@@ -1,17 +0,0 @@
-package 'provisioning'
-
-config 'general' 'polling'
-        option 'enabled' 'on'
-        option 'starttime' '03'
-        option 'interval' 'daily'
-
-config 'server' 'configserver'
-        option enabled 'off'
-
-
-config 'server' 'iup'
-        option 'enabled' 'on'
-
-config software 'uppgradeserver'
-        option enabled 'off'
-                              

iup/files/etc/init.d/iup

@@ -1,133 +0,0 @@
-#!/bin/sh /etc/rc.common
-# iup at boot
-# Copyright (C) 2007 OpenWrt.org
-
-START=98
-STOP=15
-USE_PROCD=1
-
-. /lib/functions.sh
-
-include /lib/network
-
-CRONPATH="/etc/crontabs/root"
-RANGE=60
-
-management_interfaces() {
-	local DHCP_IFACES=""
-
-	is_notbridged_dhcp() {
-		local config="$1"
-		local proto="$(uci -q get network.$config.proto)"
-		local typ="$(uci -q get network.$config.type)"
-		if [ "$proto" == "dhcp" -a "$typ" != "bridge" ]; then
-			DHCP_IFACES="$DHCP_IFACES $config"
-		fi
-	}
-
-	config_load network
-	config_foreach is_notbridged_dhcp interface
-	echo $DHCP_IFACES
-}
-
-init_iup() {
-	local polling_enabled
-	local interval
-	local starttime
-	local nummber
-	number=$RANDOM
-
-	[ -f $CRONPATH ] || touch $CRONPATH
-
-	config_load provisioning
-	config_get polling_enabled polling enabled on
-	config_get interval  polling  interval
-	config_get starttime  polling  starttime
-
-	### Ask for IUP related DHCP options only if IUP is enabled ###
-	new_reqopts() {
-		local net=$1
-		local enabled
-		local newreqopts=
-		local baseopts=
-		local reqopts="$(uci -q get network.$net.reqopts)"
-		local iupopts="66 67 128 224 225 226"
-		local ropt iopt
-		config_get enabled iup enabled "on"
-		for ropt in $reqopts; do
-			case $ropt in
-				66|67|128|224|225|226) ;;
-				*) baseopts="$baseopts $ropt" ;;
-			esac
-		done
-		ropt=""
-		reqopts="$baseopts $iupopts"
-		for ropt in $reqopts; do
-			case $ropt in
-				66|67|128|224|225|226) [ $enabled == "on" ] && newreqopts="$newreqopts $ropt" ;;
-				*) newreqopts="$newreqopts $ropt" ;;
-			esac
-		done
-
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		echo "$newreqopts"
-	}
-	for net in $(management_interfaces); do
-		uci -q set network.$net.reqopts="$(new_reqopts $net)"
-	done
-	uci commit network
-	ubus call network reload
-	#################################################################
-
-	if [ $polling_enabled == "off" ]; then
-		sed -i "/\/sbin\/iup/d" $CRONPATH
-		logger -s -t /etc/init.d/iup[$$] "Provisioning polling unscheduled" 2>/dev/console
-		return
-	fi
-
-	local log_hour=$starttime
-	local log_minute
-	local log_interval=$interval
-	if [ $interval == "weekly" ]; then
-		interval="0"
-		log_interval="$log_interval/sunday"
-	elif [ $interval == "hourly" ]; then
-		interval='*'
-		starttime='*'
-	else
-		interval='*'
-	fi
-        let "number %= $RANGE"
-	if ! grep -q "$starttime  \* \* \\$interval     /sbin/iup" "$CRONPATH" ; then
-		if grep -q "iup" "$CRONPATH" ; then
-			sed -i "/iup/d" $CRONPATH
-		fi
-		echo "$number $starttime * * $interval     /sbin/iup -v > /dev/null 2>&1" >> $CRONPATH
-		fsync $CRONPATH
-		/etc/init.d/cron restart
-	fi
-	log_minute=$(awk '/\/sbin\/iup/ {print $1}' /etc/crontabs/root)
-	logger -s -t /etc/init.d/iup[$$] "Provisioning is scheduled at $log_hour:$log_minute $log_interval" 2>/dev/console
-}
-
-start_service() {
-	init_iup
-
-	/sbin/iup -v &
-}
-
-stop_service() {
-	if [ -f "/tmp/run/iup.pid" ]; then
-		kill -9 $(cat /tmp/run/iup.pid)
-		rm -rf /tmp/run/iup.pid
-	fi
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-        procd_add_reload_trigger provisioning
-}

iup/files/etc/uci-defaults/85-iup-set-dhcp-reqopts

@@ -1,57 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-management_interfaces() {
-	local DHCP_IFACES=""
-
-	is_notbridged_dhcp() {
-		local config="$1"
-		local proto="$(uci -q get network.$config.proto)"
-		local typ="$(uci -q get network.$config.type)"
-		if [ "$proto" == "dhcp" -a "$typ" != "bridge" ]; then
-			DHCP_IFACES="$DHCP_IFACES $config"
-		fi
-	}
-
-	config_load network
-	config_foreach is_notbridged_dhcp interface
-	echo $DHCP_IFACES
-}
-
-set_iup_reqopts() {
-	### Ask for IUP related DHCP options only if IUP is enabled ###
-	new_reqopts() {
-		local net=$1
-		local enabled="$(uci -q get provisioning.iup.enabled)"
-		enabled="${enabled:-on}"
-		local newreqopts=
-		local baseopts=
-		local reqopts="$(uci -q get network.$net.reqopts)"
-		local iupopts="66 67 128 224 225 226"
-		local ropt iopt
-		local net
-		for ropt in $reqopts; do
-			case $ropt in
-				66|67|128|224|225|226) ;;
-				*) baseopts="$baseopts $ropt" ;;
-			esac
-		done
-		ropt=""
-		reqopts="$baseopts $iupopts"
-		for ropt in $reqopts; do
-			case $ropt in
-				66|67|128|224|225|226) [ $enabled == "on" ] && newreqopts="$newreqopts $ropt" ;;
-				*) newreqopts="$newreqopts $ropt" ;;
-			esac
-		done
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		echo "$newreqopts"
-	}
-	for net in $(management_interfaces); do
-		uci -q set network.$net.reqopts="$(new_reqopts $net)"
-	done
-	uci commit network
-}
-
-set_iup_reqopts

iup/files/lib/functions/dhcp_option_relay.sh

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

iup/files/sbin/iup

@@ -1,595 +0,0 @@
-#!/bin/sh
-
-echo $$ > /var/run/iup.pid
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-. /lib/functions/savecfg.sh
-. /lib/functions/dhcp_option_relay.sh
-. /usr/share/libubox/jshn.sh
-
-include /lib/upgrade
-include /lib/network
-
-export IUPCONFFILES=/tmp/iup/sysupgrade.conffiles.tar.gz
-export IUPMD5=/etc/configchecksums
-export CONFILESLURP='/tmp/iup/*.conf'
-export IUPTEMP="/tmp/iup"
-export INTERACTIVE=0
-export VERBOSE=0
-export CONF=1
-export DESKEY=
-export MAC=
-export RANGE=10
-export RETRYSTOP=5
-export SLEEP=10
-
-json_load "$(ubus call router.system info)"
-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
-# -v -v		log to system log and console
-# -v -v -v	log to system log, console and stderr
-v() {
-	[ "$VERBOSE" -eq 0 ] && return
-	[ "$VERBOSE" -eq 1 ] && logger -t $0[$$] "$@" && return
-	[ "$VERBOSE" -eq 2 ] && logger -s -t $0[$$] "$@" >/dev/console 2>&1 && return
-	[ "$VERBOSE" -eq 3 ] && logger -s -t $0[$$] "$@" 2>&1 | tee /dev/console && return
-}
-
-vv() {
-	VERBOSE="$(($VERBOSE + 1))"
-	v "$@"
-	VERBOSE="$(($VERBOSE - 1))"
-
-}
-
-get_packages()
-{
-	local pack
-	pack=$(grep -w 'package' $1)
-	pack=${pack//package/}
-	#pack=${pack//[\'|\"]/}
-	echo $pack | tr -d '\"' | tr -d "'"
-}
-
-reload ()
-{
-	local pack
-	pack=$(get_packages $1)
-	v "Calling ubus call uci commit for $pack"
-	for packname in $pack
-	do
-		ubus call uci commit '{"config":"'$packname'"}'
-		sleep 1
-	done
-}
-
-save_usercfg()
-{
-	savecfg_save_config fw_redirect fw_parental wifi
-}
-
-apply_usercfg()
-{
-	# decide to save the user changes based on keepuserconfig received through provisioning
-	local keep
-	config_load provisioning
-	config_get_bool keep configserver keepuserconfig "0"
-	v "apply_usercfg(): keepuserconfig = $keep"
-	if [ "$keep" != "1" ] ; then
-		savecfg_rm_files
-		return
-	fi
-
-	savecfg_apply_config fw_redirect fw_parental wifi
-}
-
-handle_provisioning() {
-	local config="$1"
-	local default="$2"
-	local enabled
-	local url
-	local tftpfile
-	local host
-	local md5
-	local defaultreset
-	local pack
-	local packname
-	local number=$RANDOM
-	local retry=1
-	local number
-	local incsleep=$SLEEP
-	let "number %= $RANGE"
-	if [[ ! -e $IUPTEMP ]]; then
-		mkdir $IUPTEMP
-	fi
-	touch $IUPCONFFILES
-	config_get_bool enabled "$config" enabled "$default"
-	config_get_bool defaultreset "$config" defaultreset
-	config_get deckey "$config" deckey
-	if [ "$enabled" -eq 1	]; then
-		if [ "$config" == "iup" ]; then
-			v "Using url received in dhcp options"
-			config_get url "$config" urliup
-		else
-			config_get url "$config" url
-		fi
-		url=${url//\$MAC/$MAC}
-		v "Downloading from url \"$url\""
-
-		while [ $retry -le $RETRYSTOP ]
-		do
-		  if [ ${url%%:*} == "tftp" ]; then
-			tftpfile=${url#*\/\/}
-			host=${tftpfile%%\/*}
-			tftpfile=${tftpfile#*\/}
-
-			/usr/bin/tftp -l $IUPCONFFILES -r "$tftpfile" -g "$host"
-		  else
-			get_image "$url" "cat" > $IUPCONFFILES
-		  fi
-		  if [ -s $IUPCONFFILES ]; then
-			v "Download finished"
-			retry=$((RETRYSTOP + 1))
-		  else
-		  v "Download failed, retrying in $incsleep seconds"
-		  sleep $incsleep
-		  incsleep=$((incsleep * retry + number))
-		  retry=$((retry+1))
-		  fi
-		done
-	fi
-	if [ ! -s "$IUPCONFFILES" ] && [ "$enabled" -eq 1 ]; then
-		echo "File not Found"
-		reboot="off"
-		CONF=0
-	else
-		handle_Downloaded_file $deckey
-	fi
-}
-
-handle_Downloaded_file()
-{
-	local DECKEY
-	local KEY
-	[ -n "$1" ] && DECKEY=$(echo $1 | tr -d '\n' | hexdump -e '16/1 "%02x"')
-	KEY=${DECKEY:-$DESKEY}
-	local img_type
-	case "$(get_image_type "$IUPCONFFILES")" in
-                "INTENO") img_type=2 ;;
-                "CFE+FS") img_type=1 ;;
-                "FS")     img_type=0 ;;
-                *)      img_type="UNKNOWN";;
-        esac
-
-        if [ "$img_type" == "UNKNOWN" ] ; then
-		case "$(hexdump -v -n 2 -e '1/1 "%02x"' $IUPCONFFILES)" in
-			1f8b)
-				v "Downloaded file is an unencrypted config"
-				md5=$(md5sum $IUPCONFFILES)
-				md5="${md5%% *}" # remove the first space and everything after it
-				md5sum "$IUPCONFFILES" >> "$IUPMD5.temp"
-				if grep -q "$md5" "$IUPMD5"; then
-					v "Config is already up to date, nothing to do"
-					#because config is up to date we need to disable last step reboot if set
-					reboot="off"
-					rm -rf $IUPTEMP
-				else
-					save_usercfg
-					cd $IUPTEMP
-					tar xvzf $IUPCONFFILES
-					for f in $CONFILESLURP
-					do
-						v "File to be applied $f and config $(cat $f)"
-						uci -f $f import
-					done
-					pack=$(get_packages $CONFILESLURP)
-					v "Packages to be commited: $pack"
-					for packname in $pack
-					do
-						uci commit $packname
-					done
-					apply_usercfg
-					reboot=`uci -q  get provisioning.configserver.reboot`
-					if [ "$reboot" != "on" ]; then
-						sync
-						reload $CONFILESLURP
-					fi
-					rm -rf $IUPTEMP
-
-					cp /rom/etc/uci-defaults/* /etc/uci-defaults/
-					sync
-				fi
-			;;
-			*)
-				v "Downloaded file is an encrypted config"
-				if [ $KEY ]; then
-					openssl enc -d -des-ede -nosalt -K $KEY -iv "0000000000000000" -in $IUPCONFFILES -out $IUPCONFFILES.tmp
-					if [ $? -eq 0 ]; then
-						v "Decryption successful"
-						mv $IUPCONFFILES.tmp $IUPCONFFILES
-						handle_Downloaded_file
-					else
-						v "Decryption Failed! Exiting"
-						rm -rf $IUPTEMP
-						exit 1
-					fi
-				else
-					v "No Key Defined"
-					rm -rf $IUPTEMP
-					exit 1
-				fi
-			;;
-		esac
-	else
-		v "Downloaded file is a firmware, will start reflashing"
-		if [ "$defaultreset" -eq 1 ]; then
-			v "Not saving configuration over reflash"
-			 /sbin/sysupgrade -v -n $IUPCONFFILES
-		else
-			v "Saving configuration over reflash"
-			/sbin/sysupgrade -v $IUPCONFFILES
-		fi
-	fi
-}
-
-# function: change_to_vlan
-# arg 1 = vlan id
-# arg 2 = vlan priority
-# arg 3 = $INTERFACE
-change_to_vlan() {
-	# local variables.
-	local name="vlan$1"	# construct name = vlan + vlanid.
-	local base_dev		# varible holding device name of wan port.
-	local wan_if		# variable holding wan interfaces.
-	local new_wan_if	#
-
-	# extract device name.
-	network_get_device base_dev $3
-
-	# bring down old interface/device.
-	ifdown "${base_dev}"
-	v "option 132: bringing down old if: ${base_dev}"
-
-	# extract base name of device.
-	base_dev=$(echo ${base_dev} | cut -d. -f1)
-
-	# add "VLAN interface" to the "end of the file".
-	uci add network device
-	uci rename network.@device[-1]=${name}
-	uci set network.@device[-1].type=8021q
-	uci set network.@device[-1].ifname=${base_dev}
-	uci set network.@device[-1].name="${base_dev}.${1}"
-	uci set network.@device[-1].vid=${1}
-	uci set network.@device[-1].priority=${2}
-	# and commit the change.
-	uci commit network
-	v "option 132: committed update to file network"
-
-	# reload configuration files.
-	ubus call network reload
-	v "option 132: reload network config"
-
-	# replace old interface (like eth0.1 with new eth0.101).
-	wan_if=$(uci get network.$3.ifname)
-	v "option 132: old network.${3}.ifname: $wan_if"
-
-	# loop through the string, remove any word close to "base_dev".
-	for word in ${wan_if}; do
-	#echo $word
-	case $word in
-		${base_dev}*) # don't add if.
-		;;
-		*)	new_wan_if=${word}' '${new_wan_if}  # add if.
-			#new_wan_if+=" ${word}"  # probably not working in ash.
-		;;
-	esac
-	done
-	# append new interface.
-	new_wan_if=${new_wan_if}${base_dev}.${1}
-	uci set network.wan.ifname="${new_wan_if}"
-	# and commit the change.
-	uci commit network
-	v "option 132: committed update to file network: ifname=${new_wan_if}"
-
-	# reboot into new if configuration.
-	vv "Rebooting"
-	export REBOOT_REASON=iup
-	/sbin/reboot
-}
-
-handle_option224()
-{
-	if [ -z "$1" ] ; then
-		echo "No argument"
-		return 1
-	fi
-
-	if [ $(echo $1|grep -o "," | wc -l) -eq 0 ] ; then
-		url=$1
-	else
-		url=$(echo $1|cut -d',' -f1)
-		a=$(echo $1|cut -d',' -f2)
-		b=$(echo $1|cut -d',' -f3)
-		c=$(echo $1|cut -d',' -f4)
-	fi
-
-	currdate=$(date +"%Y-%m-%d")
-
-	active=0
-	if [ -z $a ] ; then
-		active=1
-	elif [ $a ] && [ $b ] && [ $a -lt 25 ] ; then
-		#Time
-		begin=$(date +%s -d"$currdate $a")
-		now=$(date +%s)
-		end=$((begin+3600*$b))
-		if [ $now -gt $begin ] && [ $now -lt $end ] ; then
-			active=1
-		fi
-	elif [ $a ] && [ $b ] && [ $c ] && [ $a -gt 25 ]  ; then
-		#Date
-		y=$(echo $a| cut -c1-4)
-		m=$(echo $a| cut -c5-6)
-		d=$(echo $a| cut -c7-8)
-		begin=$(date +%s -d"$y-$m-$d $b")
-		now=$(date +%s)
-		end=$((begin+3600*$c))
-		if [ $now -gt $begin ] && [ $now -lt $end ] ; then
-			active=1
-		fi
-	else
-		echo "Bad format"
-		return 1
-	fi
-
-	softwareminuspath=${url##*/}
-
-	if [ $url ] && [ $active -eq 1 ]; then
-		v "Software version to download \"$softwareminuspath\""
-		local sysinfo=$(ubus call router.system info)
-		json_load "$sysinfo"
-		json_select system
-		json_get_var firmware firmware
-		local firmware_new=${softwareminuspath%.*}	# remove extension (.w, .y or .y2) from filename
-		if [ "$firmware_new" != "$firmware" ] ; then
-			v "Firmware found $url will start flashing"
-			v "Currently running firmware: \"$firmware\""
-			v "Newly received firmware:    \"$firmware_new\""
-			wait_for_dns $url
-			v "Start flashing"
-			/sbin/sysupgrade -v $url &
-			return 1
-		else
-			v "Firmware is up to date, nothing to do"
-			return 0
-		fi
-	fi
-}
-
-
-parse_dhcp_options()
-{
-	local the_json="$@"
-
-	# process the dhcp_option_relay sections
-	dhcp_option_relay_parse "$the_json"
-
-	# Process IUP related DHCP options #
-	local privopt224 privopt225 privopt226 vendorspecinf httpurl128
-	local tftp bootfile vlanid vlanpriority interface
-
-	json_load "$the_json"
-	json_get_var interface interface
-	json_get_var privopt224 privopt224
-	json_get_var privopt225 privopt225
-	json_get_var privopt226 privopt226
-	json_get_var vendorspecinf vendorspecinf # option 43
-	json_get_var httpurl128 httpurl128
-	json_get_var tftp tftp # option 66
-	json_get_var bootfile bootfile #option 67
-	json_get_var vlanid vlanid # option 132
-	json_get_var vlanpriority vlanpriority # option 133
-
-	if [ $privopt224 ]; then
-		v "dhcp option 224 firmware url $privopt224"
-		handle_option224 $privopt224
-		[ $? -eq 1 ] && exit
-	fi
-
-	if [ $vendorspecinf ]; then
-		v "dhcp option 43 tr69 url $vendorspecinf"
-		url=${vendorspecinf%%,*}; rest=${vendorspecinf#*,}
-		provisioningcode=${rest%%,*};
-		[ -f /etc/config/cwmp ] && uci_set_state cwmp acs dhcp_url "$url"
-		uci_set_state provisioning iup urlcwmp "$url"
-		uci_set_state provisioning iup url "$url"
-		uci_set_state provisioning iup provisioningcode "$provisioningcode"
-	elif [ $httpurl128 ]; then
-		v "dhcp option 128 http config url $httpurl128"
-		uci_set_state provisioning iup urliup "$httpurl128"
-	elif [ $tftp ]; then
-		v "dhcp option 66 tftp config url $tftp"
-		if [ ${bootfile:0:1} == '/' ]; then
-			uci_set_state provisioning iup urliup "tftp://$tftp$bootfile"
-		else
-			uci_set_state provisioning iup urliup "tftp://$tftp/$bootfile"
-		fi
-	fi
-
-	# vlanid (and vlanpriority)
-	if [ -n "$vlanid" -a -n "$vlanpriority" ]; then
-		v "dhcp option 132 vlanid: ${vlanid} vlanpriority: ${vlanpriority}"
-		change_to_vlan ${vlanid} ${vlanpriority} ${interface}
-	elif [ -n "$vlanid" ]; then
-		v "dhcp option 132 vlanid: ${vlanid}"
-		change_to_vlan ${vlanid} 0 ${interface}
-	elif [ -n "$privopt225" ] || [ -n "$privopt226" ]; then
-		# opt225 and opt226 can be used together or separatly
-		if [ -n "$privopt225" ]; then
-			v "dhcp option 225: $privopt225"
-			# option225 is allowd to change only once per CPE
-			if [ "$(uci get -q ice.cloud.frozen)" != "1" ] ; then
-				uci set ice.cloud.frozen="1"
-				uci set ice.cloud.enabled="1"
-				uci set ice.cloud.server="$privopt225"
-			fi
-		fi
-		if [ -n "$privopt226" ]; then
-			v "dhcp option 226: $privopt226"
-			[ -z "$(uci get -q ice.dhcp)" ] && uci set ice.dhcp="dhcp"
-			uci set ice.dhcp.opt226connectionid="$privopt226"
-			ubus send dhcp.opt226connectionid '{"opt226connectionid":"","value":"'$privopt226'"}'
-		fi
-		uci commit
-	fi
-}
-
-# wait_for_default_gateway to become reachable
-# return 0 if the default gateway is reachable
-# return 1 if the default gateway is not reachable after $wait_time
-wait_for_default_gateway()
-{
-	local gateway
-	local device
-	local wait_time=120
-	local wait_interval=10
-
-	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
-		fi
-
-		# try the nameservers too
-		for ns in $(grep nameserver /var/resolv.conf.auto | awk '{print $2}'); 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
-
-		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 and name server are not reachable
-}
-
-
-main()
-{
-
-	while [ -n "$1" ]; do
-		case "$1" in
-			-v) export VERBOSE="$(($VERBOSE + 1))";;
-			-q) export VERBOSE="$(($VERBOSE - 1))";;
-			--dhcp-options)
-				shift
-				parse_dhcp_options "$@"
-				exit 0
-				;;
-			-*)
-				echo "Invalid option: $1"
-				exit 1
-			;;
-			*) break;;
-		esac
-		shift;
-	done
-
-	if ! wait_for_default_gateway ; then
-		v "Neither default gateway nor name server are reachable. Aborting iup."
-		exit 1
-	fi
-
-	if [ ! -f $IUPMD5 ]; then
-		v "Creating file $IUPMD5"
-		touch $IUPMD5
-	fi
-
-
-	local iupurl
-	local configurl
-	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
-	config_get iupurl iup	urliup
-
-	if [ $configurl ]; then
-		handle_provisioning configserver "0"
-	elif [ $iupurl ]; then
-		handle_provisioning iup "1"
-	else
-		v "No provisioning server configured"
-		exit
-	fi
-
-	config_load provisioning
-	config_foreach handle_provisioning subconfig "0"
-	config_get software uppgradeserver url
-	sofwareminuspath=${software##*/}
-
-	if [ $software ]; then
-		v "Software version to download \"$sofwareminuspath\""
-		local sysinfo=$(ubus call router.system info)
-		json_load "$sysinfo"
-		json_select system
-		json_get_var firmware firmware
-		json_get_var filesystem filesystem
-	        if [ "$filesystem" == "JFFS2" ] ; then
-	                firmware=$firmware.w
-		else
-			firmware=$firmware.y3
-		fi
-		if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
-			v "Software \"$software\""
-			handle_provisioning uppgradeserver "0"
-		else
-			v "Will not update software, already up to date"
-		fi
-	fi
-
-	if [ $CONF -eq 1 ]; then
-		mv "$IUPMD5.temp" $IUPMD5
-	fi
-
-	if [ "$reboot" == "on" ]; then
-		vv "Rebooting"
-		export REBOOT_REASON=iup
-		/sbin/reboot
-	fi
-
-	rm -rf /var/run/iup.pid
-}
-
-main $@

libcgroup/Makefile

@@ -1,105 +0,0 @@
-#
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libcgroup
-PKG_VERSION:=0.41
-PKG_RELEASE:=1
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE_VERSION:=2186c97f60df7efe86ddadd5e3d9d36dd4923b98
-
-PKG_SOURCE_URL:=git://git.code.sf.net/p/libcg/libcg
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)+git$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-#PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libcgroup
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libpthread
-  TITLE:=Control group configuration library
-  URL:=https://sourceforge.net/p/libcg/
-endef
-
-define Package/libcgroup/description
-  Control groups, a new kernel feature in Linux 2.6.24 provides a file system
-  interface to manipulate and control the details on task grouping including
-  creation of new task groups (control groups), permission handling and task
-  assignment.
-endef
-
-define Package/libcgroup-daemon
-  SECTION:=base
-  CATEGORY:=Base system
-  DEPENDS:=+libcgroup +librt
-  TITLE:=Control group management daemon
-  URL:=https://sourceforge.net/p/libcg/
-endef
-
-define Package/libcgroup-utils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libcgroup
-  TITLE:=Control group configuration utilities
-  URL:=https://sourceforge.net/p/libcg/
-endef
-
-#define Package/libcgroup/conffiles
-#	/etc/config/cgroups
-#endef
-
-CONFIGURE_ARGS += \
-		--disable-bindings \
-		--disable-pam \
-		--enable-static \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/libcgroup
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libcgroup/*.h $(1)/usr/include/libcgroup/
-
-	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcgroup.* $(1)/usr/lib/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libcgroup.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libcgroup/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcgroup.so* $(1)/usr/lib/
-endef
-
-define Package/libcgroup-daemon/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin
-
-	# move to its own package?
-	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
-	$(INSTALL_CONF) ./files/cgroups.config $(1)/etc/config/cgroups
-	$(INSTALL_BIN) ./files/cgroups.init $(1)/etc/init.d/cgroups
-endef
-
-define Package/libcgroup-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,libcgroup))
-$(eval $(call BuildPackage,libcgroup-daemon))
-$(eval $(call BuildPackage,libcgroup-utils))

libcgroup/files/cgroups.config

@@ -1,40 +0,0 @@
-config cgroups cgroups
-	option enabled 1
-	option defgroup iopsys/normal
-
-config cgroup _root_
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup iopsys
-	list option cpu.shares=4096
-	list option memory.limit_in_bytes=-1
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup iopsys_normal
-	list option cpu.shares=1024
-	list option memory.limit_in_bytes=-1
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup iopsys_high
-	list option cpu.shares=4096
-	list option memory.limit_in_bytes=-1
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup 3prt
-	list option cpu.shares=1024
-	list option memory.limit_in_bytes=75M
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup 3prt_normal
-	list option cpu.shares=1024
-	list option memory.limit_in_bytes=75M
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup 3prt_high
-	list option cpu.shares=4096
-	list option memory.limit_in_bytes=75M
-	list option memory.move_charge_at_immigrate=1
-
-config procmap procmap
-	list procmap minidlna=3prt/normal
-

libcgroup/files/cgroups.init

@@ -1,123 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=01
-USE_PROCD=1
-#PROCD_DEBUG=1
-NAME=cgrulesengd
-
-CGBASEDIR=/sys/fs/cgroup
-CGCONFIG="cgroups"
-
-CGRULESCONF=/tmp/cgrules.conf
-CGCONFIGCONF=/tmp/cgconfig.conf
-
-
-cgroupinit_add_knob_val_to_list () {
-CG_KNOB_VAL_LIST="$CG_KNOB_VAL_LIST
-$1"
-}
-
-cgroupinit_create_group () {
-	local cgrp=$1
-	local dir curr
-
-	if [ "$cgrp" == "_root_" ]; then
-		dir=.
-	else
-		dir=$(echo $cgrp |tr '_' '/')
-	fi
-
-	echo -e "group $dir {" >> $CGCONFIGCONF
-
-	CG_KNOB_VAL_LIST=
-	config_list_foreach $cgrp option cgroupinit_add_knob_val_to_list
-	CG_KNOB_VAL_LIST=$(echo "$CG_KNOB_VAL_LIST" |sort)
-	curr="_none_"
-
-	for knob_val in $CG_KNOB_VAL_LIST ; do
-		local ctrlr knob val
-		
-		knob=$(echo $knob_val |awk -F= '{print $1}')
-		ctrlr=$(echo $knob |awk -F. '{print $1}')
-		val=$(echo $knob_val |awk -F= '{print $2}')
-
-		if [ "$curr" != "$ctrlr" ]; then
-			[ "$curr" == "_none_" ] || echo -e "\t}" >> $CGCONFIGCONF
-			curr=$ctrlr
-			echo -e "\t$curr {" >> $CGCONFIGCONF
-		fi
-
-		echo -e "\t\t$knob = \"$val\";" >> $CGCONFIGCONF
-	done
-
-	[ "$curr" == "_none_" ] || echo -e "\t}" >> $CGCONFIGCONF
-	echo -e "}\n" >> $CGCONFIGCONF
-}
-
-cgroupinit_add_to_rules () {
-	local name_grp=$1
-	local name grp
-
-	name=$(echo $name_grp |awk -F= '{print $1}')
-	grp=$(echo $name_grp |awk -F= '{print $2}')
-
-	echo -e "*:$name\t*\t$grp" >> $CGRULESCONF
-}
-
-cgroupinit_generate_config () {
-	local enab defgrp
-
-	config_load $CGCONFIG
-
-	config_get enab cgroups enabled "1"
-	[ $enab -eq 0 ] && return 1
-
-	config_get defgrp cgroups defgroup "_undef_"
-	[ "$defgrp" == "_undef_" ] && return 1
-
-	# mount here instead of in cgconfigparser to get all options right
-	# mounting without any controllers listed means mount all available
-	if ! grep -q " $CGBASEDIR cgroup " /proc/mounts; then
-		mount -t cgroup -o nodev,noexec,nosuid cgroup $CGBASEDIR
-		[ $? -eq 0 ] || return 1
-	fi
-
-	echo -n '' > $CGCONFIGCONF
-	config_foreach cgroupinit_create_group cgroup
-
-	echo -n '' > $CGRULESCONF
-	config_list_foreach procmap procmap cgroupinit_add_to_rules
-	echo -e "*\t*\t$defgrp" >> $CGRULESCONF
-
-	return 0
-}
-
-# cgrulesengd has hardcoded paths for configuration files
-# use symlinks to point to generated config files
-cgroupinit_cgrulesengd_fixup () {
-	[ -r /etc/cgrules.conf ] || ln -s $CGRULESCONF /etc/cgrules.conf
-	[ -r /etc/cgconfig.conf ] || ln -s $CGCONFIGCONF /etc/cgconfig.conf
-	[ -d /etc/cgconfig.d ] || mkdir /etc/cgconfig.d
-}
-
-start_service () {
-	cgroupinit_generate_config
-	[ $? -eq 0 ] || return
-
-	cgroupinit_cgrulesengd_fixup
-	/usr/sbin/cgconfigparser -l $CGCONFIGCONF || return
-
-	procd_open_instance
-	procd_set_param command /usr/sbin/cgrulesengd --nodaemon --syslog
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service () {
-	/usr/sbin/cgclear
-}
-
-service_triggers() {
-        procd_add_reload_trigger $CGCONFIG
-}
-

libmicroxml/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=2012-06-11
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://dev.freecwmp.org/microxml
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mirror/microxml.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

libpicoevent/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.2
+PKG_VERSION:=0.3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libpicoevent.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=f4ab03b22fca57cec6c959fb5c54bcdd64c32467
 PKG_NAME:=libpicoevent
 
-PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE:=LGPL-2.1-only
 PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

libtrace/Makefile

@@ -34,7 +34,7 @@ define Package/libtrace
   CATEGORY:=Libraries
   TITLE:=Libtrace library for packet trace processing
   URL:=http://research.wand.net.nz/software/libtrace.php
-  DEPENDS:=+libpcap +libpthread +zlib +libbz2 +liblzo +librt +$(CXX_DEPENDS)
+  DEPENDS:=+libpcap +libpthread +zlib +libbz2 +liblzo +librt +liblzma +$(CXX_DEPENDS)
 endef
 
 define Package/libtrace/description

logrotate/Makefile

@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=logrotate
-PKG_VERSION:=3.7.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/l/logrotate
-PKG_MD5SUM:=552639142e163745f6bcd4f1f3816d8a
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/logrotate
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libpopt
-  TITLE:=rotates, compresses, and mails system logs
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default, \
-		RPM_OPT_FLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \
-		LDFLAGS="$(EXTRA_LDFLAGS)" \
-		logrotate \
-	)
-endef
-
-define Package/logrotate/install	
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) ${PKG_BUILD_DIR}/logrotate $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) ./files/logrotate.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/logrotate.d
-endef
-
-$(eval $(call BuildPackage,logrotate))

logrotate/files/logrotate.conf

@@ -1,30 +0,0 @@
-# rotate log files weekly
-weekly
-#daily
-
-# keep 4 weeks worth of backlogs
-rotate 4
-
-# create new (empty) log files after rotating old ones
-create
-
-notifempty
-nomail
-#olddir /var/log/backup/
-missingok
-#dateext
-
-# uncomment this if you want your log files compressed
-#compress
-
-# packages can drop log rotation information into this directory
-include /etc/logrotate.d
-
-# no packages own lastlog or wtmp -- we'll rotate them here
-#/var/log/wtmp {
-#    monthly
-#    create 0664 root utmp
-#    rotate 1
-#}
-
-# system-specific logs may be also be configured here.

logrotate/patches/01-dateext_maxage.patch

@@ -1,433 +0,0 @@
-diff -u -ruN logrotate-3.7.1.orig/config.c logrotate-3.7.1/config.c
---- logrotate-3.7.1.orig/config.c	2003-08-07 07:13:14.000000000 -0400
-+++ logrotate-3.7.1/config.c	2005-05-24 12:21:09.000000000 -0400
-@@ -511,6 +511,14 @@
- 		newlog->flags &= ~LOG_FLAG_IFEMPTY;
- 
- 		*endtag = oldchar, start = endtag;
-+	    } else if (!strcmp(start, "dateext")) {
-+		newlog->flags |= LOG_FLAG_DATEEXT;
-+
-+		*endtag = oldchar, start = endtag;
-+	    } else if (!strcmp(start, "nodateext")) {
-+		newlog->flags &= ~LOG_FLAG_DATEEXT;
-+
-+		*endtag = oldchar, start = endtag;
- 	    } else if (!strcmp(start, "noolddir")) {
- 		newlog->oldDir = NULL;
- 
-@@ -670,6 +678,21 @@
- 		    }
- 		    *endtag = oldchar, start = endtag;
- 		}
-+	    } else if (!strcmp(start, "maxage")) {
-+		*endtag = oldchar, start = endtag;
-+
-+		if (!isolateValue(configFile, lineNum, "maxage count", &start,
-+				  &endtag)) {
-+		    oldchar = *endtag, *endtag = '\0';
-+
-+		    newlog->rotateAge = strtoul(start, &chptr, 0);
-+		    if (*chptr || newlog->rotateAge < 0) {
-+			message(MESS_ERROR, "%s:%d bad maximum age '%s'\n",
-+				configFile, lineNum, start);
-+			return 1;
-+		    }
-+		    *endtag = oldchar, start = endtag;
-+		}
- 	    } else if (!strcmp(start, "errors")) {
- 		message(MESS_DEBUG, "%s: %d: the errors directive is deprecated and no longer used.\n",
- 			configFile, lineNum);
-diff -u -ruN logrotate-3.7.1.orig/logrotate.8 logrotate-3.7.1/logrotate.8
---- logrotate-3.7.1.orig/logrotate.8	2003-08-07 07:13:14.000000000 -0400
-+++ logrotate-3.7.1/logrotate.8	2005-05-24 12:21:09.000000000 -0400
-@@ -200,6 +200,11 @@
- Log files are rotated every day.
- 
- .TP
-+\fBdateext\fR
-+Archive old versions of log files adding a daily extension like YYYYMMDD
-+instead of simply adding a number.
-+
-+.TP
- \fBdelaycompress\fR
- Postpone compression of the previous log file to the next rotation cycle.
- This has only effect when used in combination with \fBcompress\fR.
-@@ -246,6 +251,12 @@
- instead of the just-rotated file (this is the default).
- 
- .TP
-+\fBmaxage\fR \fIcount\fR
-+Remove rotated logs older than <count> days. The age is only checked
-+if the logfile is to be rotated. The files are mailed to the
-+configured address if \fBmaillast\fR and \fBmail\fR are configured.
-+
-+.TP
- \fBmissingok\fR
- If the log file is missing, go on to the next one without issuing an error
- message. See also \fBnomissingok\fR.
-diff -u -ruN logrotate-3.7.1.orig/logrotate.c logrotate-3.7.1/logrotate.c
---- logrotate-3.7.1.orig/logrotate.c	2004-10-19 17:41:24.000000000 -0400
-+++ logrotate-3.7.1/logrotate.c	2005-05-24 12:21:09.000000000 -0400
-@@ -11,6 +11,7 @@
- #include <sys/wait.h>
- #include <time.h>
- #include <unistd.h>
-+#include <glob.h>
- 
- #ifdef WITH_SELINUX
- #include <selinux/selinux.h>
-@@ -22,6 +23,10 @@
- #include "log.h"
- #include "logrotate.h"
- 
-+#if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
-+#define GLOB_ABORTED GLOB_ABEND
-+#endif
-+
- typedef struct {
-     char * fn;
-     struct tm lastRotated;	/* only tm.mon, tm_mday, tm_year are good! */
-@@ -42,6 +47,14 @@
- char * mailCommand = DEFAULT_MAIL_COMMAND;
- time_t nowSecs = 0;
- 
-+static int globerr(const char * pathname, int theerr) {
-+    message(MESS_ERROR, "error accessing %s: %s\n", pathname,
-+	strerror(theerr));
-+
-+    /* We want the glob operation to continue, so return 0 */
-+    return 1;
-+}
-+
- static logState * findState(const char * fn, struct stateSet * sip) {
-     int i;
-     logState * states = sip->states;
-@@ -49,9 +62,11 @@
-     struct tm now = *localtime(&nowSecs);
-     time_t lr_time;
- 
-+    /* find the filename fn in the statesPtr list */
-     for (i = 0; i < numStates; i++) 
- 	if (!strcmp(fn, states[i].fn)) break;
- 
-+    /* not in statesPtr list, so add new entry */
-     if (i == numStates) {
- 	i = numStates++;
- 	states = realloc(states, sizeof(*states) * numStates);
-@@ -121,6 +136,17 @@
-     return rc;
- }
- 
-+static int removeLogFile(char * name) {
-+    message(MESS_DEBUG, "removing old log %s\n", name);
-+
-+    if (!debug && unlink(name)) {
-+	message(MESS_ERROR, "Failed to remove old log %s: %s\n",
-+		name, strerror(errno));
-+	return 1;
-+    }
-+    return 0;
-+}
-+
- static int compressLogFile(char * name, logInfo * log, struct stat *sb) {
-     char * compressedName;
-     const char ** fullCommand;
-@@ -265,6 +291,25 @@
-     return rc;
- }
- 
-+static int mailLogWrapper (char * mailFilename, char * mailCommand, int logNum, logInfo * log) {
-+    /* if the log is compressed (and we're not mailing a
-+     * file whose compression has been delayed), we need
-+     * to uncompress it */
-+    if ((log->flags & LOG_FLAG_COMPRESS) &&
-+	!((log->flags & LOG_FLAG_DELAYCOMPRESS) &&
-+	    (log->flags & LOG_FLAG_MAILFIRST))) {
-+	if (mailLog(mailFilename, mailCommand,
-+		    log->uncompress_prog, log->logAddress,
-+		    log->files[logNum]))
-+	    return 1;
-+    } else {
-+	if (mailLog(mailFilename, mailCommand, NULL,
-+		    log->logAddress, mailFilename))
-+	    return 1;
-+    }
-+    return 0;
-+}
-+
- static int copyTruncate(char * currLog, char * saveLog, struct stat * sb, int flags) {
-     char buf[BUFSIZ];
-     int fdcurr = -1, fdsave = -1;
-@@ -479,6 +524,9 @@
-     char * baseName;
-     char * dirName;
-     char * firstRotated;
-+    char * glob_pattern;
-+    glob_t globResult;
-+    int rc;
-     size_t alloc_size;
-     int rotateCount = log->rotateCount ? log->rotateCount : 1;
-     int logStart = (log->logStart == -1) ? 1 : log->logStart;
-@@ -509,7 +557,7 @@
- 
-     alloc_size = strlen(dirName) + strlen(baseName) + 
-                  strlen(log->files[logNum]) + strlen(fileext) +
--                 strlen(compext) + 10;
-+                 strlen(compext) + 18;
-     
-     oldName = alloca(alloc_size);
-     newName = alloca(alloc_size);
-@@ -531,16 +579,116 @@
-     /* First compress the previous log when necessary */
-     if (log->flags & LOG_FLAG_COMPRESS &&
-         log->flags & LOG_FLAG_DELAYCOMPRESS) {
--        struct stat sbprev;
--	
--        sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
--        if (stat(oldName, &sbprev)) {
--            message(MESS_DEBUG, "previous log %s does not exist\n",
--		    oldName);
--        } else {
--	    hasErrors = compressLogFile(oldName, log, &sbprev);
-+	if (log->flags & LOG_FLAG_DATEEXT) {
-+	               /* glob for uncompressed files with our pattern */
-+	    glob_pattern = malloc(strlen(dirName) + strlen(baseName)
-+				  + strlen(fileext) + 44 );
-+	    sprintf(glob_pattern,
-+		    "%s/%s-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]%s",
-+		    dirName, baseName, fileext);
-+	    rc = glob(glob_pattern, 0, globerr, &globResult);
-+	    if (!rc && globResult.gl_pathc > 0) {
-+		for (i = 0; i < globResult.gl_pathc && !hasErrors; i++) {
-+		    struct stat sbprev;
-+		    sprintf(oldName,"%s",(globResult.gl_pathv)[i]);
-+		    if (stat(oldName, &sbprev)) {
-+			message(MESS_DEBUG, "previous log %s does not exist\n", oldName);
-+		    } else {
-+			hasErrors = compressLogFile(oldName, log, &sbprev);
-+		    }
-+		}
-+	    } else {
-+		message (MESS_DEBUG, "glob finding logs to compress failed\n");
-+		/* fallback to old behaviour */
-+		sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
-+	    }
-+	    globfree(&globResult);
-+	    free(glob_pattern);
-+	} else {
-+	    struct stat sbprev;
-+
-+	    sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
-+	    if (stat(oldName, &sbprev)) {
-+		message(MESS_DEBUG, "previous log %s does not exist\n",
-+			oldName);
-+	    } else {
-+		hasErrors = compressLogFile(oldName, log, &sbprev);
-+	    }
- 	}
-     }
-+
-+    firstRotated = alloca(strlen(dirName) + strlen(baseName) +
-+			  strlen(fileext) + strlen(compext) + 30);
-+
-+    if(log->flags & LOG_FLAG_DATEEXT) {
-+	/* glob for compressed files with our pattern
-+	 * and compress ext */
-+	glob_pattern = malloc(strlen(dirName)+strlen(baseName)
-+			      +strlen(fileext)+strlen(compext)+44);
-+	sprintf(glob_pattern,
-+		"%s/%s-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]%s%s",
-+		dirName, baseName, fileext, compext);
-+	rc = glob(glob_pattern, 0, globerr, &globResult);
-+	if (!rc) {
-+	    /* search for files to drop, if we find one remember it,
-+	     * if we find another one mail and remove the first and
-+	     * remember the second and so on */
-+	    struct stat fst_buf;
-+	    int mail_out = -1;
-+	    /* remove the first (n - rotateCount) matches
-+	     * no real rotation needed, since the files have
-+	     * the date in their name */
-+	    for (i = 0; i < globResult.gl_pathc; i++) {
-+		if( !stat((globResult.gl_pathv)[i],&fst_buf) ) {
-+		    if ((i <= ((int)globResult.gl_pathc - rotateCount)) 
-+			|| ((log->rotateAge > 0)
-+			    && (((nowSecs - fst_buf.st_mtime)/60/60/24)
-+				> log->rotateAge))) {
-+			if ( mail_out != -1 ) {
-+			    if (!hasErrors && log->logAddress) {
-+				char * mailFilename = (globResult.gl_pathv)[mail_out];
-+				hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
-+				if (!hasErrors)
-+				    hasErrors = removeLogFile(mailFilename);
-+			    }
-+			}
-+			mail_out = i;
-+		    }
-+		}
-+	    }
-+	    if ( mail_out != -1 ) {
-+		/* oldName is oldest Backup found (for unlink later) */
-+		sprintf(oldName, "%s", (globResult.gl_pathv)[mail_out]);
-+		strcpy(disposeName, oldName);
-+	    } else
-+		disposeName = NULL;
-+	} else {
-+	    message (MESS_DEBUG, "glob finding old rotated logs failed\n");
-+	    disposeName = NULL;
-+	}
-+	/* firstRotated is most recently created/compressed rotated log */
-+	sprintf(firstRotated, "%s/%s-%04d%02d%02d%s%s",
-+		dirName, baseName, now.tm_year+1900,
-+		now.tm_mon+1, now.tm_mday, fileext, compext);
-+	globfree(&globResult);
-+	free(glob_pattern);
-+    } else {
-+	if ( log->rotateAge ) {
-+	    struct stat fst_buf;
-+	    for (i=1; i <= rotateCount; i++) {
-+		sprintf(oldName, "%s/%s.%d%s%s", dirName, baseName,
-+			rotateCount + 1, fileext, compext);
-+		if(!stat(oldName,&fst_buf)
-+		    && (((nowSecs - fst_buf.st_mtime)/60/60/24)
-+			> log->rotateAge)) {
-+		    char * mailFilename = (globResult.gl_pathv)[i];
-+		    if (!hasErrors && log->logAddress)
-+			hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
-+		    if (!hasErrors)
-+			hasErrors = removeLogFile(mailFilename);
-+		}
-+	    }
-+	}
-     
-     sprintf(oldName, "%s/%s.%d%s%s", dirName, baseName,
-             logStart + rotateCount, fileext, compext);
-@@ -548,8 +696,6 @@
-     
-     strcpy(disposeName, oldName);
-     
--    firstRotated = alloca(strlen(dirName) + strlen(baseName) +
--                          strlen(fileext) + strlen(compext) + 30);
-     sprintf(firstRotated, "%s/%s.%d%s%s", dirName, baseName,
-             logStart, fileext, 
- 	    (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext);
-@@ -600,12 +746,27 @@
- 	    }
- 	}
-     }
--    
-+    } /* !LOG_FLAG_DATEEXT */
-+ 
-     finalName = oldName;
--    
--    /* note: the gzip extension is *not* used here! */
--    sprintf(finalName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
--    
-+
-+    if(log->flags & LOG_FLAG_DATEEXT) {
-+	char * destFile = alloca(strlen(dirName) + strlen(baseName) +
-+				 strlen(fileext) + strlen(compext) + 30);
-+	struct stat fst_buf;
-+	sprintf(finalName, "%s/%s-%04d%02d%02d%s",
-+		dirName, baseName, now.tm_year+1900,
-+		now.tm_mon+1, now.tm_mday, fileext);
-+	sprintf(destFile, "%s%s", finalName, compext);
-+	if(!stat(destFile,&fst_buf)) {
-+	    message (MESS_DEBUG, "destination %s already exists, skipping rotation\n", firstRotated);
-+	    hasErrors = 1;
-+	}
-+    } else {
-+	/* note: the gzip extension is *not* used here! */
-+	sprintf(finalName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
-+    }
-+ 
-     /* if the last rotation doesn't exist, that's okay */
-     if (!debug && access(disposeName, F_OK)) {
-         message(MESS_DEBUG, "log %s doesn't exist -- won't try to "
-@@ -613,9 +774,6 @@
-         disposeName = NULL;
-     } 
-     
--    free(dirName);
--    free(baseName);
--    
-     if (!hasErrors) {
-         if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
-             message(MESS_DEBUG, "running prerotate script\n");
-@@ -722,33 +880,12 @@
-             else
-                 mailFilename = disposeName;
- 
--            if (mailFilename) {
--		/* if the log is compressed (and we're not mailing a
--		   file whose compression has been delayed), we need
--		   to uncompress it */
--                if ((log->flags & LOG_FLAG_COMPRESS) &&
--		    !((log->flags & LOG_FLAG_DELAYCOMPRESS) &&
--		      (log->flags & LOG_FLAG_MAILFIRST))) {
--		    if (mailLog(mailFilename, mailCommand, 
--				log->uncompress_prog, log->logAddress, 
--				log->files[logNum])) 
--			hasErrors = 1;
--		} else {
--		    if (mailLog(mailFilename, mailCommand, NULL, 
--			        log->logAddress, mailFilename))
--			hasErrors = 1;
--		}
--	    }
-+            if (mailFilename)
-+		hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
-         }
- 	
-         if (!hasErrors && disposeName) {
--            message(MESS_DEBUG, "removing old log %s\n", disposeName);
--	    
--            if (!debug && unlink(disposeName)) {
--                message(MESS_ERROR, "Failed to remove old log %s: %s\n",
--			disposeName, strerror(errno));
--                hasErrors = 1;
--	    }
-+	    hasErrors = removeLogFile(disposeName);
- 	}
-     }
-     
-@@ -761,6 +898,8 @@
- 	  }
- 	}
- #endif
-+    free(dirName);
-+    free(baseName);
-     return hasErrors;
- }
- 
-@@ -1047,7 +1186,9 @@
- 
- int main(int argc, const char ** argv) {
-     logInfo defConfig = { NULL, NULL, 0, NULL, ROT_SIZE, 
--			  /* threshHold */ 1024 * 1024, 0,
-+			  /* threshHold */ 1024 * 1024,
-+			  /* rotateCount */ 0,
-+			  /* rotateAge */ 0,
- 			  /* log start */ -1,
- 			  /* pre, post */ NULL, NULL,
- 			  /* first, last */ NULL, NULL,
-diff -u -ruN logrotate-3.7.1.orig/logrotate.h logrotate-3.7.1/logrotate.h
---- logrotate-3.7.1.orig/logrotate.h	2003-08-07 07:13:14.000000000 -0400
-+++ logrotate-3.7.1/logrotate.h	2005-05-24 12:21:09.000000000 -0400
-@@ -15,6 +15,7 @@
- #define LOG_FLAG_MAILFIRST	(1 << 6)
- #define LOG_FLAG_SHAREDSCRIPTS	(1 << 7)
- #define LOG_FLAG_COPY		(1 << 8)
-+#define LOG_FLAG_DATEEXT	(1 << 9)
- 
- #define NO_FORCE_ROTATE 0
- #define FORCE_ROTATE    1
-@@ -34,6 +35,7 @@
-     enum { ROT_DAYS, ROT_WEEKLY, ROT_MONTHLY, ROT_SIZE, ROT_FORCE } criterium;
-     unsigned int threshhold;
-     int rotateCount;
-+    int rotateAge;
-     int logStart;
-     char * pre, * post, * first, * last;
-     char * logAddress;

logrotate/patches/02-datehack.patch

@@ -1,12 +0,0 @@
-diff -u -ruN logrotate-3.7.1.orig/logrotate.c logrotate-3.7.1/logrotate.c
---- logrotate-3.7.1.orig/logrotate.c	2004-10-19 17:41:24.000000000 -0400
-+++ logrotate-3.7.1/logrotate.c	2005-05-24 12:12:26.000000000 -0400
-@@ -1002,7 +1002,7 @@
- 	}
- 	
- 	/* Hack to hide earlier bug */
--	if ((year != 1900) && (year < 1996 || year > 2100)) {
-+	if ((year != 1900) && (year < 1970 || year > 2100)) {
- 	    message(MESS_ERROR, "bad year %d for file %s in state file %s\n",
- 		    year, argv[0], stateFilename);
- 	    fclose(f);

logrotate/patches/03-ignore_hidden.patch

@@ -1,14 +0,0 @@
---- logrotate-3.7/config.c.orig	2005-04-26 22:57:53.000000000 -0400
-+++ logrotate-3.7/config.c	2005-04-26 22:59:36.000000000 -0400
-@@ -142,6 +142,11 @@
- 	(!fname[1] || (fname[1] == '.' && !fname[2])))
- 	return 0;
- 
-+    /* Don't include 'hidden' files either; this breaks Gentoo 
-+       portage config file management http://bugs.gentoo.org/87683 */
-+    if (fname[0] == '.')
-+	return 0;
-+
-     /* Check if fname is ending in a taboo-extension; if so, return
-        false */
-     for (i = 0; i < tabooCount; i++) {

logrotate/patches/04-no_tmpdir.patch

@@ -1,54 +0,0 @@
-diff -u -ruN logrotate-3.7.1-cur/logrotate.c logrotate-3.7.1/logrotate.c
---- logrotate-3.7.1-cur/logrotate.c	2005-05-25 18:20:41.000000000 -0400
-+++ logrotate-3.7.1/logrotate.c	2005-05-25 18:21:10.000000000 -0400
-@@ -90,10 +90,7 @@
- }
- 
- static int runScript(char * logfn, char * script) {
--    int fd;
--    char *filespec;
-     int rc;
--    char buf[256];
- 
-     if (debug) {
- 	message(MESS_DEBUG, "running script with arg %s: \"%s\"\n", 
-@@ -101,38 +98,12 @@
- 	return 0;
-     }
- 
--    filespec = buf;
--    snprintf(buf, sizeof(buf), "%s/logrotate.XXXXXX", getenv("TMPDIR") ?: "/tmp");
--    fd = -1;
--    if (!filespec || (fd = mkstemp(filespec)) < 0 || fchmod(fd, 0700)) {
--	message(MESS_DEBUG, "error creating %s: %s\n", filespec,
--		strerror(errno));
--	if (fd >= 0) {
--	    close(fd);
--	    unlink(filespec);
--	}
--	return -1;
--    }
--
--    if (write(fd, "#!/bin/sh\n\n", 11) != 11 ||
--	write(fd, script, strlen(script)) != strlen(script)) {
--	message(MESS_DEBUG, "error writing %s\n", filespec);
--	close(fd);
--	unlink(filespec);
--	return -1;
--    }
--
--    close(fd);
--
-     if (!fork()) {
--	execlp(filespec, filespec, logfn, NULL);
-+	execl("/bin/sh", "sh", "-c", script, NULL);
- 	exit(1);
-     }
- 
-     wait(&rc);
--
--    unlink(filespec);
--
-     return rc;
- }
- 

logrotate/patches/05-taboo_to_debug.patch

@@ -1,12 +0,0 @@
-diff -u -ruN logrotate-3.7.1.orig/config.c logrotate-3.7.1/config.c
---- logrotate-3.7.1.orig/config.c	2003-08-07 07:13:14.000000000 -0400
-+++ logrotate-3.7.1/config.c	2005-05-24 12:13:41.000000000 -0400
-@@ -147,7 +147,7 @@
-     for (i = 0; i < tabooCount; i++) {
- 	if (!strcmp(fname + strlen(fname) - strlen(tabooExts[i]),
- 	    tabooExts[i])) {
--	    message(MESS_ERROR, "Ignoring %s, because of %s "
-+	    message(MESS_DEBUG, "Ignoring %s, because of %s "
- 		    "ending\n", fname, tabooExts[i]);
- 
- 	    return 0;

logrotate/patches/06-weekly.patch

@@ -1,22 +0,0 @@
---- logrotate-3.7.1-old/logrotate.c	2004-10-19 23:41:24.000000000 +0200
-+++ logrotate-3.7.1-new/logrotate.c	2005-10-02 17:29:22.380767321 +0200
-@@ -424,12 +424,15 @@ int findNeedRotating(logInfo * log, int 
-         switch (log->criterium) {
-           case ROT_WEEKLY:
-             /* rotate if:
--                  1) the current weekday is before the weekday of the
--                     last rotation
-+                  1) the day of the week is the same as the day of the week of
-+                     the previous rotation but not the same day of the year
-+                     this will rotate it on the same day every week, but not
-+                     twice a day.
-                   2) more then a week has passed since the last
-                      rotation */
--            state->doRotate = ((now.tm_wday < state->lastRotated.tm_wday) ||
--			       ((mktime(&now) - mktime(&state->lastRotated)) >
-+            state->doRotate = ((now.tm_wday == state->lastRotated.tm_wday &&
-+				now.tm_yday != state->lastRotated.tm_yday) ||
-+				((mktime(&now) - mktime(&state->lastRotated)) >
- 				(7 * 24 * 3600)));
-             break;
-           case ROT_MONTHLY:

map-1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-1905
-PKG_VERSION:=0.0.1
+PKG_VERSION:=0.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c5f002e7a90246107f1db2f38206f5c7fc7e1a66
+PKG_SOURCE_VERSION:=5fed40b905a673e41eee05fc60e4a424a9826b56
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
@@ -23,13 +23,19 @@ define Package/map-1905
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:= MultiAP Stack
-  DEPENDS:= +ubox +lib1905al +libwifi
+  DEPENDS:= +ubox +ieee1905
 endef
 
 define Package/map-1905/description
  MultiAP plugin for ieee1905d based on Wifi alliance's MAP-r2 specification
 endef
 
+define Package/libmaputils
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WFA MultiAP utility library
+endef
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
@@ -58,7 +64,12 @@ endif
 
 define Package/map-1905/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifimap-2.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifimap2.so $(1)/usr/lib/
+endef
+
+define Package/libmaputils/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmaputils.so $(1)/usr/lib/libmaputils.so
 endef
 
 define Build/InstallDev
@@ -66,7 +77,9 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/map1905
 	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/map1905/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifimap-2.so $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifimap2.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libmaputils.so $(1)/usr/lib/
 endef
 
+$(eval $(call BuildPackage,libmaputils))
 $(eval $(call BuildPackage,map-1905))

map-agent/Makefile

@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2020 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=map-agent
+PKG_VERSION:=2.0.1
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=362ddbaf2b9a5510c89b740fcc23d8425770da3d
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-agent.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/map-agent
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WiFi multi-AP Agent (EasyMesh R2)
+  DEPENDS:=+libwifi +libuci +libubox +ubus
+endef
+
+define Package/map-agent/description
+ This package implements EasyMesh R2 compliant WiFi Agent.
+endef
+
+define Package/map-agent/config
+	#source "$(SOURCE)/Config.in"
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+MAKE_PATH:=src
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/map-agent
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/src/include/*.h $(1)/usr/include/map-agent
+	$(CP) $(PKG_BUILD_DIR)/src/utils/timer_impl.h $(1)/usr/include/map-agent
+	$(CP) $(PKG_BUILD_DIR)/src/utils/*.so* $(1)/usr/lib/
+endef
+
+define Package/map-agent/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/src/utils/*.so* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,map-agent))

mcastmngr/Makefile

@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2013-2020 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=mcastmngr
+PKG_VERSION:=1.0.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mcastmngr
+	CATEGORY:=Utilities
+	TITLE:=multicast packets manager daemon
+endef
+
+define Package/mcastmngr/description
+	Configures IGMP and MLD snooping and proxy
+endef
+
+#define Build/Prepare
+#        $(CP) -rf ./mcastmngr/* $(PKG_BUILD_DIR)/
+#endef
+
+define Build/Compile
+endef
+
+define Package/mcastmngr/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,mcastmngr))

mcastmngr/files/etc/hotplug.d/iface/mcast.hotplug

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+[ "$ACTION" = ifup ] || exit 0
+
+. /lib/functions/network.sh
+
+network_get_device l3device $INTERFACE
+
+[ -n "$l3device" ] || exit 0
+
+compare_mcast_proxy_upstream() {
+        local upstream
+	local mode="$2"
+
+	if [ "$mode" == "proxy" ]; then
+		config_get upstream $1 upstream_interface
+	else
+		config_get upstream $1 interface
+	fi
+
+	for dev in $upstream; do
+		if [ "$l3device" == "$dev" ]; then
+			ubus call uci commit '{"config":"mcast"}'
+			exit
+		fi
+	done
+}
+
+config_load mcast
+config_foreach compare_mcast_proxy_upstream "proxy" "proxy"
+config_foreach compare_mcast_proxy_upstream "snooping" "snooping"

mcastmngr/files/etc/init.d/mcast

@@ -0,0 +1,41 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=10
+
+USE_PROCD=1
+NAME=mcast
+
+include /lib/network
+include /lib/mcast
+
+
+service_triggers() {
+	procd_add_reload_trigger network $NAME
+}
+
+start_service() {
+	if [ -f "/etc/config/mcast" ]; then
+		configure_mcast
+	fi
+
+	procd_open_instance
+	procd_set_param command "$PROG_EXE"
+	procd_set_param respawn
+	procd_close_instance
+}
+
+boot() {
+	setup_mcast_mode
+	start
+}
+
+stop_service() {
+	service_stop $PROG_EXE
+}
+
+reload_service() {
+	stop
+	start
+}
+

mcastmngr/files/etc/uci-defaults/61-mcast_config_generate

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+generate_igmp_global_params(){
+	uci add mcast igmp
+	uci rename mcast.@igmp[-1]="igmp"
+	uci set mcast.@igmp[-1].max_membership="20"
+	uci set mcast.@igmp[-1].max_msf="10"
+	uci set mcast.@igmp[-1].qrv="2"
+	uci set mcast.@igmp[-1].force_version="0"
+
+	uci add mcast mld
+	uci rename mcast.@mld[-1]="mld"
+	uci set mcast.@mld[-1].mldv1_unsolicited_report_interval="10"
+	uci set mcast.@mld[-1].mldv2_unsolicited_report_interval="1"
+	uci set mcast.@mld[-1].qrv="2"
+	uci set mcast.@mld[-1].force_version="0"
+
+	uci commit mcast
+}
+
+generate_mcast_config(){
+
+	up_itf="$(uci -q get network.wan.ifname)"
+
+	uci add mcast proxy
+	uci rename mcast.@proxy[-1]="igmp_proxy_1"
+	uci set mcast.@proxy[-1].enable="1"
+	uci set mcast.@proxy[-1].proto="igmp"
+	uci set mcast.@proxy[-1].version="2"
+	uci set mcast.@proxy[-1].robustness="2"
+	uci set mcast.@proxy[-1].query_interval="125"
+	uci set mcast.@proxy[-1].query_response_interval="100"
+	uci set mcast.@proxy[-1].last_member_query_interval="10"
+	uci set mcast.@proxy[-1].fast_leave="1"
+	uci set mcast.@proxy[-1].snooping_mode="2"
+	uci set mcast.@proxy[-1].lan_to_lan="0"
+	uci add_list mcast.@proxy[-1].downstream_interface="br-lan"
+
+	IFS=" "
+	for itf in $up_itf; do
+		uci add_list mcast.@proxy[-1].upstream_interface="$itf"
+	done
+
+	uci add_list mcast.@proxy[-1].filter="239.0.0.0/8"
+	uci commit mcast
+}
+
+if [ -s "/etc/config/mcast" ]; then
+	if uci -q get mcast.@proxy[0] >/dev/null; then
+		# return if there is any valid content
+		exit
+	else
+		rm -f /etc/config/mcast
+	fi
+fi
+touch /etc/config/mcast
+
+generate_igmp_global_params
+
+generate_mcast_config

mcastmngr/files/lib/mcast/broadcom.sh

@@ -0,0 +1,538 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+include /lib/network
+
+CONFFILE=/var/mcpd.conf
+PROG_EXE=/usr/sbin/mcpd
+
+# Parameters available in snooping configuration
+igmp_s_enable=0
+igmp_s_version=2
+igmp_s_robustness=2
+igmp_s_mode=0
+igmp_s_iface=""
+igmp_s_exceptions=""
+
+mld_s_enable=0
+mld_s_version=2
+mld_s_robustness=2
+mld_s_mode=0
+mld_s_iface=""
+mld_s_exceptions=""
+
+# Global params
+max_groups=25
+max_msf=10
+max_members=25
+mldv1_unsolicited_report_interval=10
+mldv2_unsolicited_report_interval=1
+
+# Parameters available in proxy configuration
+igmp_p_enable=0
+igmp_p_version=2
+igmp_query_interval=125
+igmp_q_resp_interval=100
+igmp_last_mem_q_int=10
+igmp_fast_leave=1
+igmp_p_robustness=2
+igmp_p_mode=0
+igmp_p_up_interfaces=""
+igmp_p_down_interfaces=""
+igmp_p_exceptions=""
+
+mld_p_enable=0
+mld_p_version=1
+mld_query_interval=125
+mld_q_resp_interval=100
+mld_last_mem_q_int=10
+mld_fast_leave=1
+mld_p_robustness=2
+mld_p_mode=0
+mld_p_up_interfaces=""
+mld_p_down_interfaces=""
+mld_p_exceptions=""
+
+# Standard parameters need by BCM's multicast daemon
+l_2_l_mcast=0
+allow_brdevice=0
+
+proxdevs=""
+ethwan="$(db -q get hw.board.ethernetWanPort)"
+
+read_snooping() {
+	local config="$1"
+	local sec_enable
+	local proto
+
+	config_get sec_enable "$config" enable 0
+	config_get proto "$config" proto
+
+	if [ "$sec_enable" == "0" ]; then
+		return
+	fi
+
+	if [ "$proto" == "igmp" ]; then
+		igmp_s_enable=$sec_enable
+		config_get igmp_s_version "$config" version 2
+		config_get igmp_s_robustness "$config" robustness 2
+		config_get igmp_s_mode "$config" snooping_mode 0
+		config_get igmp_s_iface "$config" interface
+		config_get igmp_s_exceptions "$config" filter
+		config_get l_2_l_mcast "$config" lan_to_lan
+		return
+	fi
+
+	if [ "$proto" == "mld" ]; then
+		mld_s_enable=$sec_enable
+		config_get mld_s_version "$config" version 2
+		config_get mld_s_robustness "$config" robustness 2
+		config_get mld_s_mode "$config" snooping_mode 0
+		config_get mld_s_iface "$config" interface
+		config_get mld_s_exceptions "$config" filter
+		config_get l_2_l_mcast "$config" lan_to_lan
+		return
+	fi
+}
+
+read_proxy() {
+	local config="$1"
+	local sec_enable
+	local proto
+
+	config_get sec_enable "$config" enable 0
+	config_get proto "$config" proto
+
+	if [ "$sec_enable" == "0" ]; then
+		return
+	fi
+
+	if [ "$proto" == "igmp" ]; then
+		igmp_p_enable=$sec_enable
+		config_get igmp_p_version "$config" version 2
+		config_get igmp_query_interval "$config" query_interval 125
+		config_get igmp_q_resp_interval "$config" query_response_interval 100
+		config_get igmp_last_mem_q_int "$config" last_member_query_interval 10
+		config_get igmp_fast_leave "$config" fast_leave 1
+		config_get igmp_p_robustness "$config" robustness 2
+		config_get igmp_p_mode "$config" snooping_mode 0
+		config_get igmp_p_up_interfaces "$config" upstream_interface
+		config_get igmp_p_down_interfaces "$config" downstream_interface
+		config_get igmp_p_exceptions "$config" filter
+		config_get l_2_l_mcast "$config" lan_to_lan
+		return
+	fi
+
+	if [ "$proto" == "mld" ]; then
+		mld_p_enable=$sec_enable
+		config_get mld_p_version "$config" version 2
+		config_get mld_query_interval "$config" query_interval 125
+		config_get mld_q_resp_interval "$config" query_response_interval 100
+		config_get mld_last_mem_q_int "$config" last_member_query_interval 10
+		config_get mld_fast_leave "$config" fast_leave 1
+		config_get mld_p_robustness "$config" robustness 2
+		config_get mld_p_mode "$config" snooping_mode 0
+		config_get mld_p_up_interfaces "$config" upstream_interface
+		config_get mld_p_down_interfaces "$config" downstream_interface
+		config_get mld_p_exceptions "$config" filter
+		config_get l_2_l_mcast "$config" lan_to_lan
+		return
+	fi
+}
+
+config_snooping_common_params() {
+	local protocol="$1"
+	echo "${protocol}-default-version $2" >> $CONFFILE
+	echo "${protocol}-robustness-value $3" >> $CONFFILE
+	echo "${protocol}-max-groups $max_groups" >> $CONFFILE 
+	echo "${protocol}-max-sources $max_msf" >> $CONFFILE
+	echo "${protocol}-max-members $max_members" >> $CONFFILE
+	echo "${protocol}-snooping-enable $4" >> $CONFFILE
+}
+
+config_mcast_querier_params() {
+	local protocol="$1"
+	local query_interval=$2
+	local q_resp_interval=$3
+	local last_mem_q_int=$4
+
+	echo "${protocol}-query-interval $query_interval" >> $CONFFILE
+	echo "${protocol}-query-response-interval $q_resp_interval" >> $CONFFILE
+	echo "${protocol}-last-member-query-interval $last_mem_q_int" >> $CONFFILE
+}
+
+config_snooping_on_bridge() {
+	local protocol="$1"
+	local bcm_mcast_p=1
+	echo "${protocol}-snooping-interfaces $2" >> $CONFFILE
+
+	[ "$protocol" == "mld" ] && bcm_mcast_p=2
+
+	for snpif in $2; do
+		case "$snpif" in
+			br-*)
+				# set snooping mode on the bridge
+				bcmmcastctl mode -i $snpif -p $bcm_mcast_p -m $3
+				# set L2L snooping mode on the bridge
+				bcmmcastctl l2l -i $snpif -p $bcm_mcast_p -e $l_2_l_mcast # set L2L snooping mode on the bridge
+			;;
+		esac
+	done
+}
+
+handle_bridged_proxy_interface() {
+	local p2="$1"
+	local p_enable=0
+
+	if [ "$p2" == "igmp" ]; then
+		p_enable=$igmp_p_enable
+	else
+		p_enable=$mld_p_enable
+	fi
+
+	if [ $p_enable -eq 1 -a $allow_brdevice -eq 1 ]
+	then
+		proxdevs="$proxdevs $2"
+		echo "upstream-interface $2" >>$CONFFILE
+	else
+		json_load "$(devstatus $2)"
+		itr=1
+		json_select bridge-members
+		while json_get_var dev $itr; do
+			case "$dev" in
+				*.*)
+					port="$(echo "$dev" | cut -d'.' -f 1)"
+					if [ $port == $ethwan ]; then
+						ifconfig $dev | grep RUNNING >/dev/null && proxdevs="$proxdevs $dev" && break
+					fi
+					;;
+			esac
+			itr=$(($itr + 1))
+		done
+		json_select ..
+	fi
+}
+
+config_mcast_proxy_interface() {
+	local itr
+	local p1="$1"
+	local p_enable
+
+	if [ "$p1" == "igmp" ]; then
+		p_enable=$igmp_p_enable
+	else
+		p_enable=$mld_p_enable
+	fi
+
+	for proxif in $2; do
+		case "$proxif" in
+			br-*)
+				handle_bridged_proxy_interface $p1 $proxif
+			;;
+			*)
+				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
+			;;
+		esac
+	done
+
+	if [ $p_enable -eq 1 ]; then
+		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
+	fi
+
+	[ -n "$proxdevs" ] && echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
+}
+
+configure_mcpd_snooping() {
+	local protocol="$1"
+	local exceptions
+	local filter_ip=""
+	
+	# Configure snooping related params
+	if [ "$protocol" == "igmp" ]; then
+		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_s_mode
+		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
+		config_mcast_proxy_interface $protocol "$igmp_s_iface"
+		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
+		exceptions=$igmp_s_exceptions
+	elif [ "$protocol" == "mld" ]; then
+		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_s_mode
+		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
+		config_mcast_proxy_interface $protocol "$mld_s_iface"
+		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
+		exceptions=$mld_s_exceptions
+	fi
+
+	echo "${protocol}-proxy-enable 0" >> $CONFFILE
+	if [ -n "$exceptions" ]; then
+		IFS=" "
+		for excp in $exceptions; do
+			case $excp in
+			*/*)
+				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
+				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
+				filter_ip="$filter_ip $tmp/$tmp1"
+				;;
+			*)
+				filter_ip="$filter_ip $excp"
+				;;
+			esac
+		done
+		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
+	fi
+}
+
+configure_mcpd_proxy() {
+	local protocol="$1"
+	local fast_leave=0
+	local exceptions=""
+
+	# Configure snooping related params
+	if [ "$protocol" == "igmp" ]; then
+		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_p_mode
+		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
+		config_mcast_proxy_interface $protocol "$igmp_p_up_interfaces"
+		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $igmp_p_mode
+		fast_leave=$igmp_fast_leave
+		exceptions=$igmp_p_exceptions
+	elif [ "$protocol" == "mld" ]; then
+		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_p_mode
+		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
+		config_mcast_proxy_interface $protocol "$mld_p_up_interfaces"
+		config_snooping_on_bridge $protocol $mld_p_down_interfaces $mld_p_mode
+		fast_leave=$mld_fast_leave
+		exceptions=$mld_p_exceptions
+	fi
+
+	# This function will only be hit in case proxy is enabled, so hard coding
+	# proxy enable should not be a problem
+	echo "${protocol}-proxy-enable 1" >> $CONFFILE
+	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
+
+	if [ -n "$exceptions" ]; then
+		IFS=" "
+		for excp in $exceptions; do
+			case $excp in
+			*/*)
+				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
+				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
+				filter_ip="$filter_ip $tmp/$tmp1"
+				;;
+			*)
+				filter_ip="$filter_ip $excp"
+				;;
+			esac
+		done
+		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
+	fi
+}
+
+disable_snooping() {
+	local bcm_mcast_p=$1
+
+	for br in $(brctl show | grep 'br-' | awk '{print$1}' | tr '\n' ' '); do
+		bcmmcastctl mode -i $br -p $bcm_mcast_p -m 0 # disable snooping on all bridges
+		bcmmcastctl l2l -i $br -p $bcm_mcast_p -e 0 # disable L2L snooping on all bridges
+	done
+}
+
+configure_mcpd() {
+	disable_snooping 1
+	disable_snooping 2
+
+	# BCM's mcpd does not allow configuration of proxy and L2 snooping simultaneously, hence
+	# here, if proxy is to be configured then the configuration params of snooping are ignored.
+	if [ "$igmp_p_enable" == "1" ]; then
+		configure_mcpd_proxy igmp
+	elif [ "$igmp_s_enable" == "1" ]; then
+		configure_mcpd_snooping igmp
+	fi
+
+	proxdevs=""
+	if [ "$mld_p_enable" == "1" ]; then
+		configure_mcpd_proxy mld
+	elif [ "$mld_s_enable" == "1" ]; then
+		configure_mcpd_snooping mld
+	fi
+}
+
+read_mcast_snooping_params() {
+	config_load mcast
+	config_foreach read_snooping snooping
+}
+
+read_mcast_proxy_params() {
+	config_load mcast
+	config_foreach read_proxy proxy
+}
+
+config_global_params() {
+	local igmp_qrv
+	local igmp_force_version
+	local mld_qrv
+	local mld_force_version
+
+	config_load mcast
+	config_get max_msf igmp max_msf 10
+	config_get max_groups igmp max_membership 25
+	config_get igmp_qrv igmp qrv 2
+	config_get igmp_force_version igmp force_version 0
+
+	config_get mld_qrv mld qrv 2
+	config_get mldv1_unsolicited_report_interval mld mldv1_unsolicited_report_interval 10
+	config_get mldv2_unsolicited_report_interval mld mldv2_unsolicited_report_interval 1
+	config_get mld_force_version mld force_version 0
+
+	# mcpd internally writes max_groups and max_msf, no need to modify
+	# here directly
+	echo $igmp_qrv > /proc/sys/net/ipv4/igmp_qrv
+	echo $igmp_force_version > /proc/sys/net/ipv4/conf/all/force_igmp_version
+
+	echo $mld_qrv >  /proc/sys/net/ipv6/mld_qrv
+	echo $mld_force_version > /proc/sys/net/ipv6/conf/all/force_mld_version
+	echo $mldv1_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv1_unsolicited_report_interval
+	echo $mldv2_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv2_unsolicited_report_interval
+}
+
+setup_mcast_mode() {
+	# set the mode at chip to allow both tagged and untagged multicast forwarding
+	bs /b/c iptv lookup_method=group_ip_src_ip
+}
+
+configure_mcast() {
+	rm -f $CONFFILE
+	touch $CONFFILE
+
+	config_global_params
+
+	read_mcast_snooping_params
+	read_mcast_proxy_params
+
+	configure_mcpd
+}
+
+read_mcast_stats() {
+	cat /proc/net/igmp_snooping > /tmp/igmp_stats
+	local mcast_addrs=""
+	local ifaces=""
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_iface=0
+			snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+			if [ -z "$ifaces" ]; then
+				ifaces="$snoop_iface"
+				continue
+			fi
+
+			IFS=" "
+			for ifx in $ifaces; do
+				if [ $ifx == $snoop_iface ]; then
+					found_iface=1
+					break
+				fi
+			done
+
+			if [ $found_iface -eq 0 ]; then
+				ifaces="$ifaces $snoop_iface"
+				continue
+			fi
+			;;
+		esac
+	done < /tmp/igmp_stats
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_ip=0
+			grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
+			if [ -z "$mcast_addrs" ]; then
+				mcast_addrs="$grp_ip"
+				continue
+			fi
+
+			IFS=" "
+			for ip_addr in $mcast_addrs; do
+				if [ $ip_addr == $grp_ip ]; then
+					found_ip=1
+					break
+				fi
+			done
+
+			if [ $found_ip -eq 0 ]; then
+				mcast_addrs="$mcast_addrs $grp_ip"
+				continue
+			fi
+			;;
+		esac
+	done < /tmp/igmp_stats
+
+	json_init
+	json_add_array "snooping"
+	json_add_object ""
+	IFS=" "
+	for intf in $ifaces; do
+		while read line; do
+		# reading each line
+			case $line in
+			br-*)
+				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+				if [ "$snoop_iface" != "$intf" ]; then
+					continue
+				fi
+				json_add_string "interface" "$intf"
+				json_add_array "groups"
+				break
+				;;
+			esac
+		done < /tmp/igmp_stats
+		IFS=" "
+		for gip_addr in $mcast_addrs; do
+			grp_obj_added=0
+			while read line; do
+			# reading each line
+				case $line in
+				br-*)
+					snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+					if [ "$snoop_iface" != "$intf" ]; then
+						continue
+					fi
+					grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
+					if [ "$grp_ip" != "$gip_addr" ]; then
+						continue
+					fi
+					if [ $grp_obj_added -eq 0 ]; then
+						json_add_object ""
+						gip="$(ipcalc.sh $gip_addr | grep IP | awk '{print substr($0,4)}')"
+						json_add_string "groupaddr" "$gip"
+						json_add_array "clients"
+						grp_obj_added=1
+					fi
+
+					json_add_object ""
+					host_ip="$(echo $line | awk -F ' ' '{ print $13 }')"
+					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
+					json_add_string "ipaddr" "$h_ip"
+					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
+					json_add_string "device" "$src_port"
+					timeout="$(echo $line | awk -F ' ' '{ print $14 }')"
+					json_add_int "timeout" "$timeout"
+					json_close_object #close the associated device object
+					;;
+				esac
+			done < /tmp/igmp_stats
+			json_close_array #close the associated devices array
+			json_close_object # close the groups object
+		done # close the loop for group addresses
+		json_close_array #close the groups array
+	done # close the loop for interfaces
+	json_close_object # close the snooping object
+	json_close_array # close the snooping array
+	json_dump
+
+	rm -f /tmp/igmp_stats
+}

mcastmngr/files/usr/libexec/rpcd/mcast

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+include /lib/mcast
+
+case "$1" in
+	list)
+		echo '{ "stats":{} }'
+		;;
+	call)
+		case "$2" in
+			stats)
+				read_mcast_stats
+				;;
+		esac
+		;;
+esac

mt7603/Makefile

@@ -1,67 +0,0 @@
-# All rights reserved.
-# See LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mtk7603e
-PKG_VERSION:=4.1.2.0_20190222
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:mediatek/mt7603.git
-PKG_SOURCE_VERSION:=4e94b2c3f45b7d5374ed988cdad925d5ca30b838
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-
-MTK7603_CONFIG:=$(shell cat mtk7603e.config)
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/mtk7603e
-  CATEGORY:=Mediatek drivers
-  TITLE:=WiFi drivers
-  #DEPENDS:= +wifi-profile
-ifneq ($(CONFIG_MTK_FAST_NAT_SUPPORT), )
-ifneq ($(CONFIG_NET_MEDIATEK_HNAT), )
-  DEPENDS+=+kmod-mediatek_hnat
-endif
-endif
-  FILES:=$(PKG_BUILD_DIR)/mt7603_wifi_ap/mt7603e.ko
-  AUTOLOAD:=$(call AutoProbe, mt7603e)
-  MENU:=1
-endef
-
-## check following
-#CONFIG_MT7603E_HOTSPOT=y (depends on missing WAPP_SUPPORT)
-#CONFIG_MT7603E_MBO_SUPPORT=y
-#CONFIG_MT7603E_MAP_SUPPORT=y
-#CONFIG_MT7603E_TXBF_SUPPORT=y (undef -DVHT_TXBF_SUPPORT)
-#CONFIG_MT7603E_ACL_V2_SUPPORT=y (build error)
-#CONFIG_MT7603E_DFS_SUPPORT=y (unnecessary)
-#CONFIG_MT7603E_SINGLE_SKU_V2=y  (fix: get_single_sku_path())
-#CONFIG_MT7603E_WDS_SUPPORT=y ( incomplete? )
-#CONFIG_MT7603E_BTCOEX_CONCURRENT=y (undefined)
-
-NOSTDINC_FLAGS := -DCONFIG_SECOND_IF_MT7615E -DCONFIG_FIRST_IF_MT7603E \
-		-Wno-misleading-indentation
-
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) V=1 \
-		$(MTK7603_CONFIG) \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/mt7603_wifi_ap" \
-		modules
-endef
-
-define KernelPackage/mtk7603e/install
-	$(INSTALL_DIR) $(1)/etc_ro/wlan
-	$(INSTALL_DIR) $(1)/etc_ro/Wireless/RT2860
-	$(INSTALL_DIR) $(1)/etc/Wireless/RT2860
-	$(CP) ./files/MT7603_EEPROM.bin $(1)/etc_ro/wlan
-	$(CP) ./files/RT2860.dat $(1)/etc/Wireless/RT2860/RT2860.dat
-	$(CP) ./files/SingleSKU.dat $(1)/etc_ro/Wireless/RT2860
-endef
-
-$(eval $(call KernelPackage,mtk7603e))

mt7603/files/RT2860.dat

@@ -1,409 +0,0 @@
-Default
-AccessControlList0=
-AccessControlList1=
-AccessControlList10=
-AccessControlList11=
-AccessControlList12=
-AccessControlList13=
-AccessControlList14=
-AccessControlList15=
-AccessControlList2=
-AccessControlList3=
-AccessControlList4=
-AccessControlList5=
-AccessControlList6=
-AccessControlList7=
-AccessControlList8=
-AccessControlList9=
-AccessPolicy0=0
-AccessPolicy1=0
-AccessPolicy10=0
-AccessPolicy11=0
-AccessPolicy12=0
-AccessPolicy13=0
-AccessPolicy14=0
-AccessPolicy15=0
-AccessPolicy2=0
-AccessPolicy3=0
-AccessPolicy4=0
-AccessPolicy5=0
-AccessPolicy6=0
-AccessPolicy7=0
-AccessPolicy8=0
-AccessPolicy9=0
-AckPolicy=0;0;0;0
-APACM=0;0;0;0
-APAifsn=3;7;1;1
-ApCliAuthMode=WPA2PSK
-ApCliBssid=
-ApCliDefaultKeyID=
-ApCliEnable=0
-ApCliEncrypType=AES
-ApCliKey1Str=
-ApCliKey1Str1=
-ApCliKey1Type=0
-ApCliKey2Str=
-ApCliKey2Str1=
-ApCliKey2Type=0
-ApCliKey3Str=
-ApCliKey3Str1=
-ApCliKey3Type=0
-ApCliKey4Str=
-ApCliKey4Str1=
-ApCliKey4Type=0
-ApCliSsid=
-ApCliWirelessMode=9
-ApCliWPAPSK=
-ApCliWPAPSK1=
-APCwmax=6;10;4;3
-APCwmin=4;4;3;2
-APSDCapable=0
-APTxop=0;0;94;47
-AuthMode=WPA2PSK
-AutoChannelSelect=1
-AutoChannelSkipList=2;3;4;5;7;8;9;10;12;13;14
-AutoProvisionEn=0
-BandSteering=0
-BasicRate=15
-BeaconPeriod=100
-BFBACKOFFenable=0
-BgndScanSkipCh=
-BGProtection=0
-BndStrgBssIdx=
-BSSACM=0;0;0;0
-BSSAifsn=3;7;2;2
-BSSCwmax=10;10;4;3
-BSSCwmin=4;4;3;2
-BssidNum=4
-BSSTxop=0;0;94;47
-BW_Enable=0
-BW_Guarantee_Rate=
-BW_Maximum_Rate=
-BW_Priority=
-BW_Root=0
-CalCacheApply=0
-CarrierDetect=0
-Channel=auto
-ChannelGrp=
-CountryCode=DE
-CountryRegion=1
-CountryRegionABand=1
-CP_SUPPORT=2
-CSPeriod=6
-DBDC_MODE=0
-DebugFlags=0
-DefaultKeyID=1
-DfsCalibration=0
-DfsEnable=0
-DfsFalseAlarmPrevent=1
-DfsZeroWait=0
-DfsZeroWaitCacTime=255
-DisableOLBC=0
-DtimPeriod=1
-E2pAccessMode=2
-EAPifname=br0
-EDCCAEnable=1
-EncrypType=AES
-EthConvertMode=dongle
-EtherTrafficBand=0
-Ethifname=
-ETxBfEnCond=1
-FineAGC=0
-FixedTxMode=
-ForceRoamSupport=
-FragThreshold=2346
-FreqDelta=0
-FtSupport=0
-GreenAP=1
-G_BAND_256QAM=1
-HideSSID=0
-HT_AMSDU=1
-HT_AutoBA=1
-HT_BADecline=0
-HT_BAWinSize=64
-HT_BSSCoexistence=1
-HT_BW=0
-HT_DisallowTKIP=1
-HT_EXTCHA=1
-HT_GI=1
-HT_HTC=1
-HT_LDPC=1
-HT_LinkAdapt=0
-HT_MCS=33
-HT_MpduDensity=5
-HT_OpMode=0
-HT_PROTECT=1
-HT_RDG=0
-HT_RxStream=4
-HT_STBC=1
-HT_TxStream=4
-IcapMode=0
-idle_timeout_interval=0
-IEEE80211H=1
-IEEE8021X=0
-IgmpSnEnable=1
-ITxBfEn=1
-Key1Str=
-Key1Str1=
-Key1Str10=
-Key1Str11=
-Key1Str12=
-Key1Str13=
-Key1Str14=
-Key1Str15=
-Key1Str16=
-Key1Str2=
-Key1Str3=
-Key1Str4=
-Key1Str5=
-Key1Str6=
-Key1Str7=
-Key1Str8=
-Key1Str9=
-Key1Type=0
-Key2Str=
-Key2Str1=
-Key2Str10=
-Key2Str11=
-Key2Str12=
-Key2Str13=
-Key2Str14=
-Key2Str15=
-Key2Str16=
-Key2Str2=
-Key2Str3=
-Key2Str4=
-Key2Str5=
-Key2Str6=
-Key2Str7=
-Key2Str8=
-Key2Str9=
-Key2Type=0
-Key3Str=
-Key3Str1=
-Key3Str10=
-Key3Str11=
-Key3Str12=
-Key3Str13=
-Key3Str14=
-Key3Str15=
-Key3Str16=
-Key3Str2=
-Key3Str3=
-Key3Str4=
-Key3Str5=
-Key3Str6=
-Key3Str7=
-Key3Str8=
-Key3Str9=
-Key3Type=0
-Key4Str=
-Key4Str1=
-Key4Str10=
-Key4Str11=
-Key4Str12=
-Key4Str13=
-Key4Str14=
-Key4Str15=
-Key4Str16=
-Key4Str2=
-Key4Str3=
-Key4Str4=
-Key4Str5=
-Key4Str6=
-Key4Str7=
-Key4Str8=
-Key4Str9=
-Key4Type=0
-LinkTestSupport=0
-MACRepeaterEn=
-MACRepeaterOuiMode=2
-MeshAuthMode=WPA2PSK
-MeshAutoLink=0
-MeshDefaultkey=0
-MeshEncrypType=AES
-MeshId=
-MeshWEPKEY=
-MeshWPAKEY=
-MUTxRxEnable=0
-NoForwarding=0
-NoForwardingBTNBSSID=0
-own_ip_addr=10.10.10.254
-
-PcieAspm=0
-PERCENTAGEenable=0
-PhyRateLimit=0
-PMFMFPC=1
-PMFMFPR=0
-PMFSHA256=0
-PMKCachePeriod=10
-PowerUpCckOfdm=0:0:0:0:0:0:0
-PowerUpHT20=0:0:0:0:0:0:0
-PowerUpHT40=0:0:0:0:0:0:0
-PowerUpVHT160=0:0:0:0:0:0:0
-PowerUpVHT20=0:0:0:0:0:0:0
-PowerUpVHT40=0:0:0:0:0:0:0
-PowerUpVHT80=0:0:0:0:0:0:0
-PreAntSwitch=
-PreAuth=0
-PreAuthifname=br0
-RadioLinkSelection=0
-RadioOn=1
-RADIUS_Acct_Key=
-RADIUS_Acct_Port=1813
-RADIUS_Acct_Server=
-RADIUS_Key1=
-RADIUS_Key10=
-RADIUS_Key11=
-RADIUS_Key12=
-RADIUS_Key13=
-RADIUS_Key14=
-RADIUS_Key15=
-RADIUS_Key16=
-RADIUS_Key2=
-RADIUS_Key3=
-RADIUS_Key4=
-RADIUS_Key5=
-RADIUS_Key6=
-RADIUS_Key7=
-RADIUS_Key8=
-RADIUS_Key9=
-RADIUS_Port=
-RADIUS_Server=
-RDRegion=CE
-RED_Enable=1
-RekeyInterval=3600
-RekeyMethod=DISABLE
-RRMEnable=255
-RTSThreshold=2347
-session_timeout_interval=0
-ShortSlot=1
-SKUenable=0
-SSID=IOPSYS.mt2
-SSID1=IOPSYS.mt2.1
-SSID10=
-SSID11=
-SSID12=
-SSID13=
-SSID14=
-SSID15=
-SSID16=
-SSID2=IOPSYS.mt2.2
-SSID3=IOPSYS.mt2.3
-SSID4=IOPSYS.mt2.4
-SSID5=
-SSID6=
-SSID7=
-SSID8=
-SSID9=
-StationKeepAlive=0
-StreamMode=0
-StreamModeMac0=
-StreamModeMac1=
-StreamModeMac2=
-StreamModeMac3=
-TGnWifiTest=0
-ThermalRecal=0
-TxBurst=1
-TxPower=100
-TxPreamble=1
-VHT_BW=0
-VHT_BW_SIGNAL=0
-VHT_LDPC=1
-VHT_Sec80_Channel=auto
-VHT_SGI=1
-VHT_STBC=1
-VLANID=0
-VLANPriority=0
-VLANTag=0
-VOW_Airtime_Ctrl_En=
-VOW_Airtime_Fairness_En=0
-VOW_BW_Ctrl=0
-VOW_Group_Backlog=
-VOW_Group_DWRR_Max_Wait_Time=
-VOW_Group_DWRR_Quantum=
-VOW_Group_Max_Airtime_Bucket_Size=
-VOW_Group_Max_Rate=
-VOW_Group_Max_Rate_Bucket_Size=
-VOW_Group_Max_Ratio=
-VOW_Group_Max_Wait_Time=
-VOW_Group_Min_Airtime_Bucket_Size=
-VOW_Group_Min_Rate=
-VOW_Group_Min_Rate_Bucket_Size=
-VOW_Group_Min_Ratio=
-VOW_Rate_Ctrl_En=
-VOW_Refill_Period=
-VOW_RX_En=1
-VOW_Sta_BE_DWRR_Quantum=
-VOW_Sta_BK_DWRR_Quantum=
-VOW_Sta_DWRR_Max_Wait_Time=
-VOW_Sta_VI_DWRR_Quantum=
-VOW_Sta_VO_DWRR_Quantum=
-VOW_WATF_Enable=
-VOW_WATF_MAC_LV0=
-VOW_WATF_MAC_LV1=
-VOW_WATF_MAC_LV2=
-VOW_WATF_MAC_LV3=
-VOW_WATF_Q_LV0=
-VOW_WATF_Q_LV1=
-VOW_WATF_Q_LV2=
-VOW_WATF_Q_LV3=
-VOW_WMM_Search_Rule_Band0=
-VOW_WMM_Search_Rule_Band1=
-WapiAsCertPath=
-WapiAsIpAddr=
-WapiAsPort=
-Wapiifname=
-WapiPsk1=
-WapiPsk10=
-WapiPsk11=
-WapiPsk12=
-WapiPsk13=
-WapiPsk14=
-WapiPsk15=
-WapiPsk16=
-WapiPsk2=
-WapiPsk3=
-WapiPsk4=
-WapiPsk5=
-WapiPsk6=
-WapiPsk7=
-WapiPsk8=
-WapiPsk9=
-WapiPskType=
-WapiUserCertPath=
-WCNTest=0
-Wds0Key=
-Wds1Key=
-Wds2Key=
-Wds3Key=
-WdsEnable=0
-WdsEncrypType=AES
-WdsList=
-WdsPhyMode=0
-WHNAT=0
-WiFiTest=0
-WirelessMode=9
-WmmCapable=1
-WPAPSK=1234554321
-WPAPSK1=1111100000
-WPAPSK10=
-WPAPSK11=
-WPAPSK12=
-WPAPSK13=
-WPAPSK14=
-WPAPSK15=
-WPAPSK16=
-WPAPSK2=2222200000
-WPAPSK3=3333300000
-WPAPSK4=4444400000
-WPAPSK5=
-WPAPSK6=
-WPAPSK7=
-WPAPSK8=
-WPAPSK9=
-WscConfMode=0
-WscConfStatus=2
-FtOtd=0
-FtRic=0
-FtMdId1=500

mt7603/files/SingleSKU.dat

@@ -1,16 +0,0 @@
-# Single SKU Max Power Table
-# |CCK 1~11 | |    OFDM 6 ~ 54      | |             HT20 MCS 0 ~ 15                 | |             HT40 MCS 0 ~ 15                 |
-ch1 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 13 13 13 13 13 13 13 13
-ch2 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16
-ch3 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16 14 14 14 14 14 14 14 14 12 12 12 12 12 12 12 12
-ch4 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16 14 14 14 14 14 14 14 14 16 16 16 16 16 16 16 16
-ch5 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16 14 14 14 14 14 14 14 14 16 16 16 16 16 16 16 16
-ch6 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16 14 14 14 14 14 14 14 14 16 16 16 16 16 16 16 16
-ch7 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16 14 14 14 14 14 14 14 14 16 16 16 16 16 16 16 16
-ch8 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16 14 14 14 14 14 14 14 14 16 16 16 16 16 16 16 16
-ch9 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16 14 14 14 14 14 14 14 14 12 12 12 12 12 12 12 12
-ch10 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 16 16 16 16 16 16 16 16 14 14 14 14 14 14 14 14    
-ch11 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 13 13 13 13 13 13 13 13 14 14 14 14 14 14 14 14  
-ch12 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15                          
-ch13 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15 
-ch14 13 13 13 13 14 14 14 14 14 14 14 14 15 15 15 15 15 15 15 15  

mt7603/mtk7603e.config

@@ -1,84 +0,0 @@
-CONFIG_SUPPORT_OPENWRT=y
-CONFIG_RT_FIRST_CARD=7603
-CONFIG_RT_SECOND_CARD=7615
-CONFIG_RT_THIRD_CARD=0
-CONFIG_FIRST_IF_MT7603E=y
-CONFIG_SECOND_IF_MT7615E=y
-CONFIG_THIRD_IF_NONE=y
-CONFIG_RT_FIRST_IF_RF_OFFSET=0x0
-CONFIG_RT_SECOND_IF_RF_OFFSET=0x8000
-CONFIG_RT_THIRD_IF_RF_OFFSET=0x4000
-CONFIG_RT_FIRST_CARD_EEPROM="efuse"
-CONFIG_RT_SECOND_CARD_EEPROM="efuse"
-CONFIG_RT_THIRD_CARD_EEPROM="efuse"
-CONFIG_FIRST_IF_EEPROM_EFUSE=y
-CONFIG_SECOND_IF_EEPROM_EFUSE=y
-CONFIG_FIRST_IF_IPAILNA=y
-CONFIG_SECOND_IF_IPAILNA=y
-CONFIG_WIFI_DRIVER=y
-CONFIG_WIFI_BASIC_FUNC=y
-CONFIG_MULTI_INF_SUPPORT=y
-CONFIG_DOT11_N_SUPPORT=y
-CONFIG_G_BAND_256QAM_SUPPORT=y
-CONFIG_ICAP_SUPPORT=y
-CONFIG_MT_AP_SUPPORT=y
-CONFIG_BACKGROUND_SCAN_SUPPORT=y
-CONFIG_SMART_CARRIER_SENSE_SUPPORT=y
-CONFIG_MT_DFS_SUPPORT=y
-CONFIG_WSC_INCLUDED=y
-CONFIG_WSC_V2_SUPPORT=y
-CONFIG_DOT11W_PMF_SUPPORT=y
-CONFIG_TXBF_SUPPORT=y
-CONFIG_IGMP_SNOOP_SUPPORT=y
-CONFIG_ATE_SUPPORT=y
-CONFIG_UAPSD=y
-CONFIG_WIFI_MODE_AP=y
-CONFIG_WDS_SUPPORT=y
-CONFIG_MBSS_SUPPORT=y
-CONFIG_APCLI_SUPPORT=y
-CONFIG_MAC_REPEATER_SUPPORT=y
-CONFIG_VOW_SUPPORT=y
-CONFIG_BAND_STEERING=y
-CONFIG_MUMIMO_SUPPORT=y
-CONFIG_MU_RA_SUPPORT=y
-CONFIG_GREENAP_SUPPORT=y
-CONFIG_TPC_SUPPORT=y
-CONFIG_RLM_CAL_CACHE_SUPPORT=y
-CONFIG_CAL_BIN_FILE_SUPPORT=y
-CONFIG_WIFI_EAP_FEATURE=y
-CONFIG_WPA3_SUPPORT=y
-CONFIG_SPECTRUM_SUPPORT=y
-CONFIG_PRE_CAL_TRX_SET1_SUPPORT=y
-CONFIG_MCAST_RATE_SPECIFIC=y
-CONFIG_PRE_CAL_TRX_SET2_SUPPORT=y
-CONFIG_PCIE_ASPM_DYM_CTRL_SUPPORT=y
-CONFIG_CHIP_MT7603E=y
-CONFIG_MT_MAC=y
-CONFIG_MT7603E_RALINK_MT7603E=y
-CONFIG_MT7603E_RTMP_PCI_SUPPORT=y
-CONFIG_MT7603E_NEW_RATE_ADAPT_SUPPORT=y
-CONFIG_MT7603E_AGS_SUPPORT=y
-CONFIG_MT7603E_UAPSD=y
-CONFIG_MT7603E_MT_MAC=y
-CONFIG_MT7603E_WSC_INCLUDED=y
-CONFIG_MT7603E_WSC_V2_SUPPORT=y
-CONFIG_MT7603E_DOT11W_PMF_SUPPORT=y
-CONFIG_MT7603E_DOT11N_DRAFT3=y
-CONFIG_MT7603E_DOT11R_FT_SUPPORT=y
-CONFIG_MT7603E_DOT11K_RRM_SUPPORT=y
-CONFIG_MT7603E_WNM_SUPPORT=y
-CONFIG_MT7603E_INTERWORKING=y
-CONFIG_MT7603E_IGMP_SNOOP_SUPPORT=y
-CONFIG_MT7603E_LED_CONTROL_SUPPORT=y
-CONFIG_MT7603E_MBSS_SUPPORT=y
-CONFIG_MT7603E_APCLI_SUPPORT=y
-CONFIG_MT7603E_MULTI_APCLI_SUPPORT=y
-CONFIG_MT7603E_MAC_REPEATER_SUPPORT=y
-CONFIG_MT7603E_ATE_SUPPORT=y
-CONFIG_MT7603E_BAND_STEERING_7603=y
-CONFIG_MT7603E_MULTI_INF_SUPPORT=y
-CONFIG_MT7603E_WPA3_SUPPORT=y
-CONFIG_MT7603E_OWE_SUPPORT=y
-CONFIG_MT7603E_SECURITY_IMPROVEMENT_SUPPORT=y
-CONFIG_MT7603E_NEW_BW2040_COEXIST_SUPPORT=y
-CONFIG_MT7603E_RLT_AP_SUPPORT=m

mt7603/patches/001-mt7603e-initial-iopsys-port.patch

@@ -1,191 +0,0 @@
-diff -uprN a/mt7603_wifi/common/cmm_info.c b/mt7603_wifi/common/cmm_info.c
---- a/mt7603_wifi/common/cmm_info.c	2019-02-22 10:01:55.000000000 +0100
-+++ b/mt7603_wifi/common/cmm_info.c	2019-12-08 21:47:48.553113878 +0100
-@@ -132,7 +132,7 @@ INT Set_DriverVersion_Proc(RTMP_ADAPTER
- {
- #ifdef CONFIG_AP_SUPPORT
- 	IF_DEV_CONFIG_OPMODE_ON_AP(pAd)
--		DBGPRINT(RT_DEBUG_OFF, ("Driver version-%s %s %s\n", AP_DRIVER_VERSION, __DATE__, __TIME__));
-+		DBGPRINT(RT_DEBUG_OFF, ("Driver version-%s\n", AP_DRIVER_VERSION));
- 		DBGPRINT(RT_DEBUG_OFF, ("Driver Patch\n"));
- 		DBGPRINT(RT_DEBUG_OFF, ("001 : 4AC + MGMT PSE queue pkt stuck detect & AP tr_entry is memory currupted\n"));
- 		DBGPRINT(RT_DEBUG_OFF, ("002 : wifi_forward support\n"));
-diff -uprN a/mt7603_wifi/os/linux/rt_linux.c b/mt7603_wifi/os/linux/rt_linux.c
---- a/mt7603_wifi/os/linux/rt_linux.c	2019-02-22 10:01:39.000000000 +0100
-+++ b/mt7603_wifi/os/linux/rt_linux.c	2019-12-08 22:16:27.246150818 +0100
-@@ -47,8 +47,8 @@
- #endif
- 
- #if defined(CONFIG_RA_HW_NAT) || defined(CONFIG_RA_HW_NAT_MODULE)
--#include "../../../../../../../../net/nat/hw_nat/ra_nat.h"
--#include "../../../../../../../../net/nat/hw_nat/frame_engine.h"
-+#include <../net/nat/hw_nat/ra_nat.h>
-+#include <../net/nat/hw_nat/frame_engine.h>
- #endif
- 
- /* TODO */
-@@ -855,18 +855,27 @@ void RtmpOSFileSeek(RTMP_OS_FD osfd, int
- int RtmpOSFileRead(RTMP_OS_FD osfd, char *pDataPtr, int readLen)
- {
- 	/* The object must have a read method */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
- 	if (osfd->f_op && osfd->f_op->read) {
- 		return osfd->f_op->read(osfd, pDataPtr, readLen, &osfd->f_pos);
--	} else {
--		DBGPRINT(RT_DEBUG_ERROR, ("no file read method\n"));
--		return -1;
-+#else
-+		if (osfd->f_mode & FMODE_CAN_READ) {
-+			return __vfs_read(osfd, pDataPtr, readLen,&osfd->f_pos);
-+#endif
-+		} else {
-+			DBGPRINT(RT_DEBUG_ERROR, ("no file read method\n"));
-+			return -1;
-+		}
- 	}
--}
- 
- 
- int RtmpOSFileWrite(RTMP_OS_FD osfd, char *pDataPtr, int writeLen)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
- 	return osfd->f_op->write(osfd, pDataPtr, (size_t) writeLen, &osfd->f_pos);
-+#else
-+	return __vfs_write(osfd, pDataPtr, (size_t) writeLen, &osfd->f_pos);
-+#endif
- }
- 
- 
-diff -uprN a/mt7603_wifi/os/linux/rt_proc.c b/mt7603_wifi/os/linux/rt_proc.c
---- a/mt7603_wifi/os/linux/rt_proc.c	2019-02-22 10:01:39.000000000 +0100
-+++ b/mt7603_wifi/os/linux/rt_proc.c	2019-12-08 21:47:48.553113878 +0100
-@@ -61,7 +61,7 @@ int wl_proc_exit(void);
- #endif /* PROCREG_DIR */
- 
- #ifdef CONFIG_PROC_FS
--extern struct proc_dir_entry *procRegDir;
-+struct proc_dir_entry *procRegDir;
- 
- #ifdef VIDEO_TURBINE_SUPPORT
- extern BOOLEAN UpdateFromGlobal;
-diff -uprN a/mt7603_wifi/os/linux/rt_profile.c b/mt7603_wifi/os/linux/rt_profile.c
---- a/mt7603_wifi/os/linux/rt_profile.c	2019-02-22 10:01:39.000000000 +0100
-+++ b/mt7603_wifi/os/linux/rt_profile.c	2019-12-09 10:27:49.609507632 +0100
-@@ -30,8 +30,8 @@
- #endif
- 
- #if defined (CONFIG_RA_HW_NAT)  || defined (CONFIG_RA_HW_NAT_MODULE)
--#include "../../../../../../../../net/nat/hw_nat/ra_nat.h"
--#include "../../../../../../../../net/nat/hw_nat/frame_engine.h"
-+#include <../net/nat/hw_nat/ra_nat.h>
-+#include <../net/nat/hw_nat/frame_engine.h>
- #endif
- 
- 
-@@ -689,7 +689,11 @@ NDIS_STATUS	RTMPReadParametersHook(RTMP_
- 		{
- #ifndef OS_ABL_SUPPORT
- 			// TODO: need to roll back when convert into OSABL code
--				 fsize = (ULONG)srcf->f_dentry->d_inode->i_size;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
-+				fsize = (ULONG)srcf->f_dentry->d_inode->i_size;
-+#else
-+				fsize = (ULONG)srcf->f_path.dentry->d_inode->i_size;
-+#endif
- 				if (buf_size < (fsize + 1))
- 					buf_size = fsize + 1;
- #endif /* OS_ABL_SUPPORT */
-diff -uprN a/mt7603_wifi_ap/Makefile b/mt7603_wifi_ap/Makefile
---- a/mt7603_wifi_ap/Makefile	2019-02-22 10:01:27.000000000 +0100
-+++ b/mt7603_wifi_ap/Makefile	2019-12-08 21:52:10.253012796 +0100
-@@ -16,6 +16,90 @@ DRV_NAME = mt7603_wifi
- RT_WIFI_DIR = ../mt7603_wifi
- endif
- 
-+ifeq ($(CONFIG_SUPPORT_OPENWRT),y)
-+###EXTRA_CFLAGS += -DCONFIG_SUPPORT_OPENWRT
-+ifneq ($(CONFIG_RT_FIRST_CARD),)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD=$(CONFIG_RT_FIRST_CARD)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_IF_RF_OFFSET=$(CONFIG_RT_FIRST_IF_RF_OFFSET)
-+endif
-+ifneq ($(CONFIG_RT_SECOND_CARD),)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD=$(CONFIG_RT_SECOND_CARD)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_IF_RF_OFFSET=$(CONFIG_RT_SECOND_IF_RF_OFFSET)
-+endif
-+ifneq ($(CONFIG_RT_THIRD_CARD),)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_CARD=$(CONFIG_RT_THIRD_CARD)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_IF_RF_OFFSET=$(CONFIG_RT_THIRD_IF_RF_OFFSET)
-+endif
-+ifeq ($(CONFIG_FIRST_IF_EEPROM_PROM),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"prom\""
-+else
-+ifeq ($(CONFIG_FIRST_IF_EEPROM_EFUSE),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"efuse\""
-+else
-+ifeq ($(CONFIG_FIRST_IF_EEPROM_FLASH),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"flash\""
-+endif
-+endif
-+endif
-+ifeq ($(CONFIG_SECOND_IF_EEPROM_PROM),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"prom\""
-+else
-+ifeq ($(CONFIG_SECOND_IF_EEPROM_EFUSE),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"efuse\""
-+else
-+ifeq ($(CONFIG_SECOND_IF_EEPROM_FLASH),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"flash\""
-+endif
-+endif
-+endif
-+ifeq ($(CONFIG_THIRD_IF_EEPROM_PROM),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_CARD_EEPROM="\"prom\""
-+else
-+ifeq ($(CONFIG_THIRD_IF_EEPROM_EFUSE),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_CARD_EEPROM="\"efuse\""
-+else
-+ifeq ($(CONFIG_THIRD_IF_EEPROM_FLASH),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_CARD_EEPROM="\"flash\""
-+endif
-+endif
-+endif
-+endif
-+
-+ifeq ($(CONFIG_FIRST_IF_EPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_FIRST_IF_EPAELNA
-+else
-+ifeq ($(CONFIG_FIRST_IF_IPAILNA),y)
-+EXTRA_CFLAGS += -DCONFIG_FIRST_IF_IPAILNA
-+else
-+ifeq ($(CONFIG_FIRST_IF_IPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_FIRST_IF_IPAELNA
-+endif
-+endif
-+endif
-+ifeq ($(CONFIG_SECOND_IF_EPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_SECOND_IF_EPAELNA
-+else
-+ifeq ($(CONFIG_SECOND_IF_IPAILNA),y)
-+EXTRA_CFLAGS += -DCONFIG_SECOND_IF_IPAILNA
-+else
-+ifeq ($(CONFIG_SECOND_IF_IPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_SECOND_IF_IPAELNA
-+endif
-+endif
-+endif
-+ifeq ($(CONFIG_THIRD_IF_EPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_THIRD_IF_EPAELNA
-+else
-+ifeq ($(CONFIG_THIRD_IF_IPAILNA),y)
-+EXTRA_CFLAGS += -DCONFIG_THIRD_IF_IPAILNA
-+else
-+ifeq ($(CONFIG_THIRD_IF_IPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_THIRD_IF_IPAELNA
-+endif
-+endif
-+endif
-+
-+
- ########################################################
- # Common files
- ########################################################

mt7603/patches/002-mt7603e-fix-os_alloc_mem-incorrect-argument.patch

@@ -1,12 +0,0 @@
-diff -uprN a/mt7603_wifi/ap/ap_cfg.c b/mt7603_wifi/ap/ap_cfg.c
---- a/mt7603_wifi/ap/ap_cfg.c	2020-02-15 13:29:48.306146391 +0100
-+++ b/mt7603_wifi/ap/ap_cfg.c	2020-02-15 13:30:08.838820056 +0100
-@@ -3329,7 +3329,7 @@ INT RTMPAPSetInformation(
- 			UCHAR *Buf;
- 			struct wnm_command *cmd_data;
- 
--			os_alloc_mem(Buf, (UCHAR **)&Buf, wrq->u.data.length);
-+			os_alloc_mem(NULL, (UCHAR **)&Buf, wrq->u.data.length);
- 			Status = copy_from_user(Buf, wrq->u.data.pointer, wrq->u.data.length);
- 			cmd_data = (struct wnm_command *)Buf;
- 			if (wnm_handle_command(pAd, cmd_data) != NDIS_STATUS_SUCCESS)

mt7615/Makefile

@@ -1,64 +0,0 @@
-# All rights reserved.
-# See LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mtk7615e
-PKG_VERSION:=5.0.4.0_20190503
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:mediatek/mt7615.git
-PKG_SOURCE_VERSION:=12c69fe1912113d16d17292bcee6415a8c9ab131
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-
-MTK7615_CONFIG:=$(shell cat mtk7615e.config)
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/mtk7615e
-  CATEGORY:=Mediatek drivers
-  TITLE:=WiFi drivers
-  #DEPENDS:= +wifi-profile
-ifneq ($(CONFIG_MTK_FAST_NAT_SUPPORT), )
-ifneq ($(CONFIG_NET_MEDIATEK_HNAT), )
-  DEPENDS+=+kmod-mediatek_hnat
-endif
-endif
-ifneq ($(CONFIG_MTK_WHNAT_SUPPORT), )
-  FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko \
-	$(PKG_BUILD_DIR)/mt_wifi/embedded/plug_in/whnat/mt_whnat.ko
-  AUTOLOAD:=$(call AutoProbe,mt_wifi mt_whnat)
-else
-  FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko
-  AUTOLOAD:=$(call AutoProbe,mt_wifi)
-endif
-  MENU:=1
-endef
-
-NOSTDINC_FLAGS := -DCONFIG_SECOND_IF_MT7615E -DCONFIG_FIRST_IF_MT7603E \
-		-Wno-misleading-indentation
-
-
-define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) V=1 \
-		$(MTK7615_CONFIG) \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/mt_wifi_ap" \
-		modules
-endef
-
-define KernelPackage/mtk7615e/install
-	$(INSTALL_DIR) $(1)/etc_ro/wlan
-	$(INSTALL_DIR) $(1)/etc_ro/Wireless/iNIC
-	$(INSTALL_DIR) $(1)/etc/wireless
-	$(INSTALL_DIR) $(1)/etc/Wireless/iNIC
-	$(CP) ./files/MT7615_EEPROM.bin $(1)/etc_ro/wlan
-	$(CP) ./files/l1profile.dat $(1)/etc/wireless
-	$(CP) ./files/iNIC_ap.dat $(1)/etc/Wireless/iNIC
-	$(CP) ./files/SingleSKU.dat $(1)/etc_ro/Wireless/iNIC
-	$(CP) ./files/SingleSKU_BF.dat $(1)/etc_ro/Wireless/iNIC
-endef
-
-$(eval $(call KernelPackage,mtk7615e))

mt7615/files/SingleSKU.dat

@@ -1,46 +0,0 @@
-# 5G Channel OFDM    VHT20     VHT40     VHT80     VHT160     Txstream_Delta  TxSpatialStream_Delta
-Band: 5G OFDM_6M OFDM_9M OFDM_12M OFDM_18M OFDM_24M OFDM_36M OFDM_48M OFDM_54M VHT20_MCS0 VHT20_MCS1 VHT20_MCS2 VHT20_MCS3 VHT20_MCS4 VHT20_MCS5 VHT20_MCS6 VHT20_MCS7 VHT20_MCS8 VHT20_MCS9 VHT40_MCS0 VHT40_MCS1 VHT40_MCS2 VHT40_MCS3 VHT40_MCS4 VHT40_MCS5 VHT40_MCS6 VHT40_MCS7 VHT40_MCS8 VHT40_MCS9 VHT80_MCS0 VHT80_MCS1 VHT80_MCS2 VHT80_MCS3 VHT80_MCS4 VHT80_MCS5 VHT80_MCS6 VHT80_MCS7 VHT80_MCS8 VHT80_MCS9 VHT160_MCS0 VHT160_MCS1 VHT160_MCS2 VHT160_MCS3 VHT160_MCS4 VHT160_MCS5 VHT160_MCS6 VHT160_MCS7 VHT160_MCS8 VHT160_MCS9 Txstream_3T Txstream_2T Txstream_1T Txstream_1SS Txstream_2SS Txstream_3SS Txstream_4SS
-Ch184 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch188 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch192 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch196 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch8 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch12 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch16 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch36 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch40 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch44 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch48 12 12 12 12 12 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch52 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch56 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch60 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch64 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch68 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch72 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch76 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch80 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch84 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch88 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch92 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch96 12 12 12 12 12 10 10 10 10 10 10 10 14 14 14 14 14 14 14 14 14 14 14 14 14 14 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch100 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch104 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch108 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch112 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch116 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch120 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch124 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch128 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch132 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch136 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch140 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch144 16 16 16 16 16 15 15 15 15 15 15 15 13 13 13 13 13 13 13 15 15 15 15 15 15 15 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch149 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch153 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch157 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch161 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch165 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch169 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch173 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch177 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0
-Ch181 19 19 19 19 19 17 17 17 17 17 17 17 20 20 20 20 20 20 20 18 18 18 18 18 18 18 9 9 9 9 9 9 9 1 3 6 6 3 1 0

mt7615/files/SingleSKU_BF.dat

@@ -1,55 +0,0 @@
-# Single SKU Max Power Table (unit is 1 dBm)                          
-                          
-# 5G Channel                          
-Band: 5G MaxPower_4T MaxPower_3T MaxPower_2T                        
-Ch184 7 30 30                        
-Ch188 7 30 30                        
-Ch192 7 30 30                        
-Ch196 7 30 30                        
-Ch8 7 30 30                        
-Ch12 7 30 30                        
-Ch16 7 30 30                        
-Ch36 7 30 30                        
-Ch40 7 30 30                        
-Ch44 7 30 30                        
-Ch48 7 30 30                        
-Ch52 7 30 30                        
-Ch56 7 30 30                        
-Ch60 7 30 30                        
-Ch64 7 30 30                        
-Ch68 7 30 30                        
-Ch72 7 30 30                        
-Ch76 7 30 30                        
-Ch80 7 30 30                        
-Ch84 7 30 30                        
-Ch88 7 30 30                        
-Ch92 7 30 30                        
-Ch96 7 30 30                        
-Ch100 14 30 30                        
-Ch104 14 30 30                        
-Ch108 14 30 30                        
-Ch112 14 30 30                        
-Ch116 14 30 30                        
-Ch120 14 30 30                        
-Ch124 14 30 30                        
-Ch128 14 30 30                        
-Ch132 14 30 30                        
-Ch136 14 30 30                        
-Ch140 14 30 30                        
-Ch144 14 30 30                        
-Ch149 14 30 30                        
-Ch153 14 30 30                        
-Ch157 14 30 30                        
-Ch161 14 30 30                        
-Ch165 14 30 30                        
-Ch169 14 30 30                        
-Ch173 14 30 30                        
-Ch177 14 30 30                        
-Ch181 14 30 30                        
-                          
-                          
-                          
-                          
-                          
-                          
-                          

mt7615/files/iNIC_ap.dat

@@ -1,409 +0,0 @@
-Default
-AccessControlList0=
-AccessControlList1=
-AccessControlList10=
-AccessControlList11=
-AccessControlList12=
-AccessControlList13=
-AccessControlList14=
-AccessControlList15=
-AccessControlList2=
-AccessControlList3=
-AccessControlList4=
-AccessControlList5=
-AccessControlList6=
-AccessControlList7=
-AccessControlList8=
-AccessControlList9=
-AccessPolicy0=0
-AccessPolicy1=0
-AccessPolicy10=0
-AccessPolicy11=0
-AccessPolicy12=0
-AccessPolicy13=0
-AccessPolicy14=0
-AccessPolicy15=0
-AccessPolicy2=0
-AccessPolicy3=0
-AccessPolicy4=0
-AccessPolicy5=0
-AccessPolicy6=0
-AccessPolicy7=0
-AccessPolicy8=0
-AccessPolicy9=0
-AckPolicy=0;0;0;0
-APACM=0;0;0;0
-APAifsn=3;7;1;1
-ApCliAuthMode=OPEN
-ApCliBssid=
-ApCliDefaultKeyID=
-ApCliEnable=1
-ApCliEncrypType=NONE
-ApCliKey1Str=
-ApCliKey1Str1=
-ApCliKey1Type=1
-ApCliKey2Str=
-ApCliKey2Str1=
-ApCliKey2Type=1
-ApCliKey3Str=
-ApCliKey3Str1=
-ApCliKey3Type=1
-ApCliKey4Str=
-ApCliKey4Str1=
-ApCliKey4Type=1
-ApCliSsid=none
-ApCliWirelessMode=15
-ApCliWPAPSK=
-ApCliWPAPSK1=
-APCwmax=6;10;4;3
-APCwmin=4;4;3;2
-APSDCapable=0
-APTxop=0;0;94;47
-AuthMode=WPA2PSK
-AutoChannelSelect=3
-AutoChannelSkipList=116;120;124;128;140;144
-AutoProvisionEn=0
-BandSteering=0
-BasicRate=15
-BeaconPeriod=100
-BFBACKOFFenable=0
-BgndScanSkipCh=
-BGProtection=0
-BndStrgBssIdx=
-BSSACM=0;0;0;0
-BSSAifsn=3;7;2;2
-BSSCwmax=10;10;4;3
-BSSCwmin=4;4;3;2
-BssidNum=4
-BSSTxop=0;0;94;47
-BW_Enable=0
-BW_Guarantee_Rate=
-BW_Maximum_Rate=
-BW_Priority=
-BW_Root=0
-CalCacheApply=0
-CarrierDetect=0
-Channel=auto
-ChannelGrp=
-CountryCode=DE
-CountryRegion=1
-CountryRegionABand=1
-CP_SUPPORT=2
-CSPeriod=6
-DBDC_MODE=0
-DebugFlags=0
-DefaultKeyID=1
-DfsCalibration=0
-DfsEnable=1
-DfsFalseAlarmPrevent=1
-DfsZeroWait=1
-DfsZeroWaitCacTime=255
-DisableOLBC=0
-DtimPeriod=1
-E2pAccessMode=1
-EAPifname=br0
-EDCCAEnable=1
-EncrypType=AES
-EthConvertMode=dongle
-EtherTrafficBand=0
-Ethifname=
-ETxBfEnCond=1
-FineAGC=0
-FixedTxMode=
-ForceRoamSupport=
-FragThreshold=2346
-FreqDelta=0
-FtSupport=0
-GreenAP=1
-G_BAND_256QAM=1
-HideSSID=0
-HT_AMSDU=1
-HT_AutoBA=1
-HT_BADecline=0
-HT_BAWinSize=64
-HT_BSSCoexistence=1
-HT_BW=1
-HT_DisallowTKIP=1
-HT_EXTCHA=1
-HT_GI=1
-HT_HTC=1
-HT_LDPC=1
-HT_LinkAdapt=0
-HT_MCS=33
-HT_MpduDensity=5
-HT_OpMode=0
-HT_PROTECT=1
-HT_RDG=0
-HT_RxStream=4
-HT_STBC=1
-HT_TxStream=4
-IcapMode=0
-idle_timeout_interval=0
-IEEE80211H=1
-IEEE8021X=0
-IgmpSnEnable=1
-ITxBfEn=1
-Key1Str=
-Key1Str1=
-Key1Str10=
-Key1Str11=
-Key1Str12=
-Key1Str13=
-Key1Str14=
-Key1Str15=
-Key1Str16=
-Key1Str2=
-Key1Str3=
-Key1Str4=
-Key1Str5=
-Key1Str6=
-Key1Str7=
-Key1Str8=
-Key1Str9=
-Key1Type=0
-Key2Str=
-Key2Str1=
-Key2Str10=
-Key2Str11=
-Key2Str12=
-Key2Str13=
-Key2Str14=
-Key2Str15=
-Key2Str16=
-Key2Str2=
-Key2Str3=
-Key2Str4=
-Key2Str5=
-Key2Str6=
-Key2Str7=
-Key2Str8=
-Key2Str9=
-Key2Type=0
-Key3Str=
-Key3Str1=
-Key3Str10=
-Key3Str11=
-Key3Str12=
-Key3Str13=
-Key3Str14=
-Key3Str15=
-Key3Str16=
-Key3Str2=
-Key3Str3=
-Key3Str4=
-Key3Str5=
-Key3Str6=
-Key3Str7=
-Key3Str8=
-Key3Str9=
-Key3Type=0
-Key4Str=
-Key4Str1=
-Key4Str10=
-Key4Str11=
-Key4Str12=
-Key4Str13=
-Key4Str14=
-Key4Str15=
-Key4Str16=
-Key4Str2=
-Key4Str3=
-Key4Str4=
-Key4Str5=
-Key4Str6=
-Key4Str7=
-Key4Str8=
-Key4Str9=
-Key4Type=0
-LinkTestSupport=0
-MACRepeaterEn=0
-MACRepeaterOuiMode=
-MeshAuthMode=WPA2PSK
-MeshAutoLink=0
-MeshDefaultkey=0
-MeshEncrypType=AES
-MeshId=
-MeshWEPKEY=
-MeshWPAKEY=
-MUTxRxEnable=0
-NoForwarding=0
-NoForwardingBTNBSSID=0
-own_ip_addr=10.10.10.254
-
-PcieAspm=0
-PERCENTAGEenable=1
-PhyRateLimit=0
-PMFMFPC=1
-PMFMFPR=0
-PMFSHA256=0
-PMKCachePeriod=10
-PowerUpCckOfdm=0:0:0:0:0:0:0
-PowerUpHT20=0:0:0:0:0:0:0
-PowerUpHT40=0:0:0:0:0:0:0
-PowerUpVHT160=0:0:0:0:0:0:0
-PowerUpVHT20=0:0:0:0:0:0:0
-PowerUpVHT40=0:0:0:0:0:0:0
-PowerUpVHT80=0:0:0:0:0:0:0
-PreAntSwitch=
-PreAuth=0
-PreAuthifname=br0
-RadioLinkSelection=0
-RadioOn=1
-RADIUS_Acct_Key=
-RADIUS_Acct_Port=1813
-RADIUS_Acct_Server=
-RADIUS_Key1=
-RADIUS_Key10=
-RADIUS_Key11=
-RADIUS_Key12=
-RADIUS_Key13=
-RADIUS_Key14=
-RADIUS_Key15=
-RADIUS_Key16=
-RADIUS_Key2=
-RADIUS_Key3=
-RADIUS_Key4=
-RADIUS_Key5=
-RADIUS_Key6=
-RADIUS_Key7=
-RADIUS_Key8=
-RADIUS_Key9=
-RADIUS_Port=1812
-RADIUS_Server=0
-RDRegion=CE
-RED_Enable=1
-RekeyInterval=3600
-RekeyMethod=DISABLE
-RRMEnable=255
-RTSThreshold=2347
-session_timeout_interval=0
-ShortSlot=1
-SKUenable=1
-SSID=IOPSYS.mt5
-SSID1=IOPSYS.mt5.1
-SSID10=
-SSID11=
-SSID12=
-SSID13=
-SSID14=
-SSID15=
-SSID16=
-SSID2=IOPSYS.mt5.2
-SSID3=IOPSYS.mt5.3
-SSID4=IOPSYS.mt5.4
-SSID5=
-SSID6=
-SSID7=
-SSID8=
-SSID9=
-StationKeepAlive=0
-StreamMode=0
-StreamModeMac0=
-StreamModeMac1=
-StreamModeMac2=
-StreamModeMac3=
-TGnWifiTest=0
-ThermalRecal=0
-TxBurst=1
-TxPower=100
-TxPreamble=1
-VHT_BW=1
-VHT_BW_SIGNAL=0
-VHT_LDPC=1
-VHT_Sec80_Channel=auto
-VHT_SGI=1
-VHT_STBC=1
-VLANID=0
-VLANPriority=0
-VLANTag=0
-VOW_Airtime_Ctrl_En=
-VOW_Airtime_Fairness_En=0
-VOW_BW_Ctrl=0
-VOW_Group_Backlog=
-VOW_Group_DWRR_Max_Wait_Time=
-VOW_Group_DWRR_Quantum=
-VOW_Group_Max_Airtime_Bucket_Size=
-VOW_Group_Max_Rate=
-VOW_Group_Max_Rate_Bucket_Size=
-VOW_Group_Max_Ratio=
-VOW_Group_Max_Wait_Time=
-VOW_Group_Min_Airtime_Bucket_Size=
-VOW_Group_Min_Rate=
-VOW_Group_Min_Rate_Bucket_Size=
-VOW_Group_Min_Ratio=
-VOW_Rate_Ctrl_En=
-VOW_Refill_Period=
-VOW_RX_En=1
-VOW_Sta_BE_DWRR_Quantum=
-VOW_Sta_BK_DWRR_Quantum=
-VOW_Sta_DWRR_Max_Wait_Time=
-VOW_Sta_VI_DWRR_Quantum=
-VOW_Sta_VO_DWRR_Quantum=
-VOW_WATF_Enable=
-VOW_WATF_MAC_LV0=
-VOW_WATF_MAC_LV1=
-VOW_WATF_MAC_LV2=
-VOW_WATF_MAC_LV3=
-VOW_WATF_Q_LV0=
-VOW_WATF_Q_LV1=
-VOW_WATF_Q_LV2=
-VOW_WATF_Q_LV3=
-VOW_WMM_Search_Rule_Band0=
-VOW_WMM_Search_Rule_Band1=
-WapiAsCertPath=
-WapiAsIpAddr=
-WapiAsPort=
-Wapiifname=
-WapiPsk1=
-WapiPsk10=
-WapiPsk11=
-WapiPsk12=
-WapiPsk13=
-WapiPsk14=
-WapiPsk15=
-WapiPsk16=
-WapiPsk2=
-WapiPsk3=
-WapiPsk4=
-WapiPsk5=
-WapiPsk6=
-WapiPsk7=
-WapiPsk8=
-WapiPsk9=
-WapiPskType=
-WapiUserCertPath=
-WCNTest=0
-Wds0Key=
-Wds1Key=
-Wds2Key=
-Wds3Key=
-WdsEnable=0
-WdsEncrypType=AES
-WdsList=
-WdsPhyMode=0
-WHNAT=1
-WiFiTest=0
-WirelessMode=15
-WmmCapable=1
-WPAPSK=1234554321
-WPAPSK1=1111100000
-WPAPSK10=
-WPAPSK11=
-WPAPSK12=
-WPAPSK13=
-WPAPSK14=
-WPAPSK15=
-WPAPSK16=
-WPAPSK2=2222200000
-WPAPSK3=3333300000
-WPAPSK4=4444400000
-WPAPSK5=
-WPAPSK6=
-WPAPSK7=
-WPAPSK8=
-WPAPSK9=
-WscConfMode=0
-WscConfStatus=2
-FtOtd=0
-FtRic=0
-FtMdId1=500

mt7615/files/iNIC_ap_5G.dat

@@ -1,406 +0,0 @@
-Default
-AccessControlList0=
-AccessControlList1=
-AccessControlList10=
-AccessControlList11=
-AccessControlList12=
-AccessControlList13=
-AccessControlList14=
-AccessControlList15=
-AccessControlList2=
-AccessControlList3=
-AccessControlList4=
-AccessControlList5=
-AccessControlList6=
-AccessControlList7=
-AccessControlList8=
-AccessControlList9=
-AccessPolicy0=0
-AccessPolicy1=0
-AccessPolicy10=0
-AccessPolicy11=0
-AccessPolicy12=0
-AccessPolicy13=0
-AccessPolicy14=0
-AccessPolicy15=0
-AccessPolicy2=0
-AccessPolicy3=0
-AccessPolicy4=0
-AccessPolicy5=0
-AccessPolicy6=0
-AccessPolicy7=0
-AccessPolicy8=0
-AccessPolicy9=0
-AckPolicy=0;0;0;0
-APACM=0;0;0;0
-APAifsn=3;7;1;1
-ApCliAuthMode=
-ApCliBssid=
-ApCliDefaultKeyID=
-ApCliEnable=
-ApCliEncrypType=
-ApCliKey1Str=
-ApCliKey1Str1=
-ApCliKey1Type=
-ApCliKey2Str=
-ApCliKey2Str1=
-ApCliKey2Type=
-ApCliKey3Str=
-ApCliKey3Str1=
-ApCliKey3Type=
-ApCliKey4Str=
-ApCliKey4Str1=
-ApCliKey4Type=
-ApCliSsid=
-ApCliWirelessMode=
-ApCliWPAPSK=
-ApCliWPAPSK1=
-APCwmax=6;10;4;3
-APCwmin=4;4;3;2
-APSDCapable=1
-APTxop=0;0;94;47
-AuthMode=WPA2PSK
-AutoChannelSelect=3
-AutoChannelSkipList=
-AutoProvisionEn=0
-BandSteering=0
-BasicRate=15
-BeaconPeriod=100
-BFBACKOFFenable=0
-BgndScanSkipCh=
-BGProtection=0
-BndStrgBssIdx=
-BSSACM=0;0;0;0
-BSSAifsn=3;7;2;2
-BSSCwmax=10;10;4;3
-BSSCwmin=4;4;3;2
-BssidNum=1
-BSSTxop=0;0;94;47
-BW_Enable=0
-BW_Guarantee_Rate=
-BW_Maximum_Rate=
-BW_Priority=
-BW_Root=0
-CalCacheApply=0
-CarrierDetect=0
-Channel=auto
-ChannelGrp=
-CountryCode=DE
-CountryRegion=1
-CountryRegionABand=1
-CP_SUPPORT=2
-CSPeriod=6
-DBDC_MODE=0
-DebugFlags=0
-DefaultKeyID=1
-DfsCalibration=0
-DfsEnable=0
-DfsFalseAlarmPrevent=1
-DfsZeroWait=0
-DfsZeroWaitCacTime=255
-DisableOLBC=0
-DtimPeriod=1
-E2pAccessMode=1
-EAPifname=br0
-EDCCAEnable=1
-EncrypType=AES
-EthConvertMode=dongle
-EtherTrafficBand=0
-Ethifname=
-ETxBfEnCond=1
-FineAGC=0
-FixedTxMode=
-ForceRoamSupport=
-FragThreshold=2346
-FreqDelta=0
-FtSupport=0
-GreenAP=1
-G_BAND_256QAM=1
-HideSSID=0
-HT_AMSDU=1
-HT_AutoBA=1
-HT_BADecline=0
-HT_BAWinSize=64
-HT_BSSCoexistence=1
-HT_BW=1
-HT_DisallowTKIP=1
-HT_EXTCHA=1
-HT_GI=1
-HT_HTC=1
-HT_LDPC=1
-HT_LinkAdapt=0
-HT_MCS=33
-HT_MpduDensity=5
-HT_OpMode=0
-HT_PROTECT=1
-HT_RDG=0
-HT_RxStream=4
-HT_STBC=1
-HT_TxStream=4
-IcapMode=0
-idle_timeout_interval=0
-IEEE80211H=1
-IEEE8021X=0
-IgmpSnEnable=1
-ITxBfEn=1
-Key1Str=
-Key1Str1=
-Key1Str10=
-Key1Str11=
-Key1Str12=
-Key1Str13=
-Key1Str14=
-Key1Str15=
-Key1Str16=
-Key1Str2=
-Key1Str3=
-Key1Str4=
-Key1Str5=
-Key1Str6=
-Key1Str7=
-Key1Str8=
-Key1Str9=
-Key1Type=0
-Key2Str=
-Key2Str1=
-Key2Str10=
-Key2Str11=
-Key2Str12=
-Key2Str13=
-Key2Str14=
-Key2Str15=
-Key2Str16=
-Key2Str2=
-Key2Str3=
-Key2Str4=
-Key2Str5=
-Key2Str6=
-Key2Str7=
-Key2Str8=
-Key2Str9=
-Key2Type=0
-Key3Str=
-Key3Str1=
-Key3Str10=
-Key3Str11=
-Key3Str12=
-Key3Str13=
-Key3Str14=
-Key3Str15=
-Key3Str16=
-Key3Str2=
-Key3Str3=
-Key3Str4=
-Key3Str5=
-Key3Str6=
-Key3Str7=
-Key3Str8=
-Key3Str9=
-Key3Type=0
-Key4Str=
-Key4Str1=
-Key4Str10=
-Key4Str11=
-Key4Str12=
-Key4Str13=
-Key4Str14=
-Key4Str15=
-Key4Str16=
-Key4Str2=
-Key4Str3=
-Key4Str4=
-Key4Str5=
-Key4Str6=
-Key4Str7=
-Key4Str8=
-Key4Str9=
-Key4Type=0
-LinkTestSupport=0
-MACRepeaterEn=
-MACRepeaterOuiMode=2
-MeshAuthMode=
-MeshAutoLink=0
-MeshDefaultkey=0
-MeshEncrypType=
-MeshId=
-MeshWEPKEY=
-MeshWPAKEY=
-MUTxRxEnable=0
-NoForwarding=0
-NoForwardingBTNBSSID=0
-own_ip_addr=10.10.10.254
-
-PcieAspm=0
-PERCENTAGEenable=1
-PhyRateLimit=0
-PMFMFPC=1
-PMFMFPR=0
-PMFSHA256=0
-PMKCachePeriod=10
-PowerUpCckOfdm=0:0:0:0:0:0:0
-PowerUpHT20=0:0:0:0:0:0:0
-PowerUpHT40=0:0:0:0:0:0:0
-PowerUpVHT160=0:0:0:0:0:0:0
-PowerUpVHT20=0:0:0:0:0:0:0
-PowerUpVHT40=0:0:0:0:0:0:0
-PowerUpVHT80=0:0:0:0:0:0:0
-PreAntSwitch=
-PreAuth=0
-PreAuthifname=br0
-RadioLinkSelection=0
-RadioOn=1
-RADIUS_Acct_Key=
-RADIUS_Acct_Port=1813
-RADIUS_Acct_Server=
-RADIUS_Key1=
-RADIUS_Key10=
-RADIUS_Key11=
-RADIUS_Key12=
-RADIUS_Key13=
-RADIUS_Key14=
-RADIUS_Key15=
-RADIUS_Key16=
-RADIUS_Key2=
-RADIUS_Key3=
-RADIUS_Key4=
-RADIUS_Key5=
-RADIUS_Key6=
-RADIUS_Key7=
-RADIUS_Key8=
-RADIUS_Key9=
-RADIUS_Port=1812
-RADIUS_Server=0
-RDRegion=CE
-RED_Enable=1
-RekeyInterval=3600
-RekeyMethod=DISABLE
-RRMEnable=255
-RTSThreshold=2347
-session_timeout_interval=0
-ShortSlot=1
-SKUenable=1
-SSID=
-SSID1=IOPSYS.mt5
-SSID10=
-SSID11=
-SSID12=
-SSID13=
-SSID14=
-SSID15=
-SSID16=
-SSID2=
-SSID3=
-SSID4=
-SSID5=
-SSID6=
-SSID7=
-SSID8=
-SSID9=
-StationKeepAlive=0
-StreamMode=0
-StreamModeMac0=
-StreamModeMac1=
-StreamModeMac2=
-StreamModeMac3=
-TGnWifiTest=0
-ThermalRecal=0
-TxBurst=1
-TxPower=100
-TxPreamble=1
-VHT_BW=1
-VHT_BW_SIGNAL=0
-VHT_LDPC=1
-VHT_Sec80_Channel=0
-VHT_SGI=1
-VHT_STBC=1
-VLANID=0
-VLANPriority=0
-VLANTag=0
-VOW_Airtime_Ctrl_En=
-VOW_Airtime_Fairness_En=1
-VOW_BW_Ctrl=0
-VOW_Group_Backlog=
-VOW_Group_DWRR_Max_Wait_Time=
-VOW_Group_DWRR_Quantum=
-VOW_Group_Max_Airtime_Bucket_Size=
-VOW_Group_Max_Rate=
-VOW_Group_Max_Rate_Bucket_Size=
-VOW_Group_Max_Ratio=
-VOW_Group_Max_Wait_Time=
-VOW_Group_Min_Airtime_Bucket_Size=
-VOW_Group_Min_Rate=
-VOW_Group_Min_Rate_Bucket_Size=
-VOW_Group_Min_Ratio=
-VOW_Rate_Ctrl_En=
-VOW_Refill_Period=
-VOW_RX_En=1
-VOW_Sta_BE_DWRR_Quantum=
-VOW_Sta_BK_DWRR_Quantum=
-VOW_Sta_DWRR_Max_Wait_Time=
-VOW_Sta_VI_DWRR_Quantum=
-VOW_Sta_VO_DWRR_Quantum=
-VOW_WATF_Enable=
-VOW_WATF_MAC_LV0=
-VOW_WATF_MAC_LV1=
-VOW_WATF_MAC_LV2=
-VOW_WATF_MAC_LV3=
-VOW_WATF_Q_LV0=
-VOW_WATF_Q_LV1=
-VOW_WATF_Q_LV2=
-VOW_WATF_Q_LV3=
-VOW_WMM_Search_Rule_Band0=
-VOW_WMM_Search_Rule_Band1=
-WapiAsCertPath=
-WapiAsIpAddr=
-WapiAsPort=
-Wapiifname=
-WapiPsk1=
-WapiPsk10=
-WapiPsk11=
-WapiPsk12=
-WapiPsk13=
-WapiPsk14=
-WapiPsk15=
-WapiPsk16=
-WapiPsk2=
-WapiPsk3=
-WapiPsk4=
-WapiPsk5=
-WapiPsk6=
-WapiPsk7=
-WapiPsk8=
-WapiPsk9=
-WapiPskType=
-WapiUserCertPath=
-WCNTest=0
-Wds0Key=
-Wds1Key=
-Wds2Key=
-Wds3Key=
-WdsEnable=0
-WdsEncrypType=NONE
-WdsList=
-WdsPhyMode=0
-WHNAT=1
-WiFiTest=0
-WirelessMode=15
-WmmCapable=1
-WPAPSK=
-WPAPSK1=12345678
-WPAPSK10=
-WPAPSK11=
-WPAPSK12=
-WPAPSK13=
-WPAPSK14=
-WPAPSK15=
-WPAPSK16=
-WPAPSK2=
-WPAPSK3=
-WPAPSK4=
-WPAPSK5=
-WPAPSK6=
-WPAPSK7=
-WPAPSK8=
-WPAPSK9=
-WscConfMode=0
-WscConfStatus=2

mt7615/files/l1profile.dat

@@ -1,27 +0,0 @@
-Default
-INDEX0=MT7603
-INDEX0_profile_path=/etc/Wireless/RT2860/RT2860.dat
-INDEX0_EEPROM_offset=0x0
-INDEX0_EEPROM_size=0x4000
-INDEX0_EEPROM_name=e2p
-INDEX0_main_ifname=ra0
-INDEX0_ext_ifname=ra
-INDEX0_wds_ifname=wds
-INDEX0_apcli_ifname=apcli
-INDEX0_mesh_ifname=mesh
-INDEX0_nvram_zone=dev1
-INDEX0_single_sku_path=/etc_ro/Wireless/RT2860/SingleSKU.dat
-INDEX0_bf_sku_path=/etc_ro/Wireless/RT2860/SingleSKU_BF.dat
-INDEX1=MT7615
-INDEX1_profile_path=/etc/Wireless/iNIC/iNIC_ap.dat
-INDEX1_EEPROM_offset=0x4000
-INDEX1_EEPROM_size=0x4000
-INDEX1_EEPROM_name=e2p
-INDEX1_main_ifname=rai0
-INDEX1_ext_ifname=rai
-INDEX1_wds_ifname=wdsi
-INDEX1_apcli_ifname=apclii
-INDEX1_mesh_ifname=meshi
-INDEX1_nvram_zone=dev2
-INDEX1_single_sku_path=/etc_ro/Wireless/iNIC/SingleSKU.dat
-INDEX1_bf_sku_path=/etc_ro/Wireless/iNIC/SingleSKU_BF.dat

mt7615/globalconfig.in

@@ -1,250 +0,0 @@
-# Kconfig for mtk wifi
-
-config MTK_WIFI_DRIVER
-	bool
-	default y
-	depends on (PACKAGE_kmod-mtk7615e || PACKAGE_kmod-mtk7603e)
-	select MTK_SUPPORT_OPENWRT
-	select MTK_MT_WIFI
-	select MTK_WIFI_BASIC_FUNC
-
-if MTK_WIFI_DRIVER
-
-menu "First WiFi card"
-choice
-	prompt "Choose First WiFi card"
-	default MTK_FIRST_IF_MT7603E
-
-	config MTK_FIRST_IF_NONE
-	bool "None"
-
-	config MTK_FIRST_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_FIRST_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-
-endchoice
-
-config  MTK_RT_FIRST_CARD
-        int
-        depends on ! MTK_FIRST_IF_NONE
-        default 7603 if MTK_FIRST_IF_MT7603E
-	default 7615 if MTK_FIRST_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_FIRST_CARD
-	string "WiFi driver build directory name"
-	default "rlt_wifi"
-
-config  MTK_RT_FIRST_IF_RF_OFFSET
-        hex "RF offset of 1st card"
-        depends on ! MTK_FIRST_IF_NONE
-        default 0x0
-
-#prompt "WiFi detailed options for 1st card"
-
-choice
-	prompt "EEPROM Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_EEPROM_EFUSE
-
-	config MTK_FIRST_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_FIRST_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_FIRST_IF_EEPROM_EFUSE
-	bool "EFUSE"
-
-endchoice
-
-config MTK_RT_FIRST_CARD_EEPROM
-	string
-	depends on ! MTK_FIRST_IF_NONE
-	default "prom" if MTK_FIRST_IF_EEPROM_PROM
-	default "efuse" if MTK_FIRST_IF_EEPROM_EFUSE
-	default "flash" if MTK_FIRST_IF_EEPROM_FLASH
-
-choice
-	prompt "PA/LNA Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_IPAILNA
-
-	config MTK_FIRST_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_FIRST_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_FIRST_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-menu "Operation Modes for 1st card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-	#select MTK_MT_STA_SUPPORT
-endchoice
-
-source "ap.config.in"
-
-endmenu
-endmenu
-### endmenu for 1st wifi card #######
-
-#### menu starts for 2nd wifi card ###
-menu "Second WiFi card"
-
-choice
-	prompt "Choose Second WiFi card"
-	default MTK_SECOND_IF_MT7615E
-
-	config MTK_SECOND_IF_NONE
-	bool "None"
-
-	config MTK_SECOND_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_SECOND_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-endchoice
-
-config  MTK_RT_SECOND_CARD
-        int
-        depends on ! MTK_SECOND_IF_NONE
-        default 7603 if MTK_SECOND_IF_MT7603E
-	default 7615 if MTK_SECOND_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_SECOND_CARD
-	string "WiFi driver build directory name"
-	default "mt_wifi"
-
-config  MTK_RT_SECOND_IF_RF_OFFSET
-        hex "RF offset of 2nd card"
-        depends on ! MTK_SECOND_IF_NONE
-        default 0x8000
-
-#prompt "WiFi detailed options for 2nd card"
-
-choice
-	prompt "EEPROM Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_EEPROM_EFUSE
-
-	config MTK_SECOND_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_SECOND_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_SECOND_IF_EEPROM_EFUSE
-	bool "EFUSE"
-endchoice
-
-config MTK_RT_SECOND_CARD_EEPROM
-	string
-	depends on ! MTK_SECOND_IF_NONE
-	default "prom" if MTK_SECOND_IF_EEPROM_PROM
-	default "efuse" if MTK_SECOND_IF_EEPROM_EFUSE
-	default "flash" if MTK_SECOND_IF_EEPROM_FLASH
-
-
-choice
-        prompt "PA/LNA Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_IPAILNA
-
-	config MTK_SECOND_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_SECOND_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_SECOND_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-
-menu "Operation Modes for 2nd card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-endchoice
-
-source "ap.config.in"
-
-endmenu
-
-endmenu
-### endmenu for 2nd wifi card #######
-
-
-#### placeholder for 3rd wifi card ###
-config MTK_THIRD_IF_NONE
-	bool
-	default y
-
-config  MTK_RT_THIRD_CARD
-        int
-	default 0
-
-config  MTK_RT_THIRD_IF_RF_OFFSET
-        hex
-	default 0x4000
-
-config MTK_RT_THIRD_CARD_EEPROM
-	string
-	default "efuse"
-### placehlder for 3rd wifi card #######
-
-
-config MTK_MULTI_INF_SUPPORT
-	bool
-	default y if !MTK_FIRST_IF_NONE && !MTK_SECOND_IF_NONE
-
-
-source "common.config.in"
-
-#if MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-#	config MTK_MT_MAC
-#		bool
-#		default y
-#		select MTK_RATE_ADAPTION
-#		select MTK_RATE_ADAPT_AGBS_SUPPORT
-#		select MTK_DOT11_N_SUPPORT
-#		select MTK_DOT11_VHT_AC
-#		select MTK_HDR_TRANS_TX_SUPPORT
-#		select MTK_HDR_TRANS_RX_SUPPORT
-#endif
-
-endif #MTK_WIFI_DRIVER#

mt7615/mtk7615e.config

@@ -1,84 +0,0 @@
-CONFIG_SUPPORT_OPENWRT=y
-CONFIG_RT_FIRST_CARD=7603
-CONFIG_RT_SECOND_CARD=7615
-CONFIG_RT_THIRD_CARD=0
-CONFIG_FIRST_IF_MT7603E=y
-CONFIG_SECOND_IF_MT7615E=y
-CONFIG_THIRD_IF_NONE=y
-CONFIG_RT_FIRST_IF_RF_OFFSET=0x0
-CONFIG_RT_SECOND_IF_RF_OFFSET=0x8000
-CONFIG_RT_THIRD_IF_RF_OFFSET=0x4000
-CONFIG_RT_FIRST_CARD_EEPROM="efuse"
-CONFIG_RT_SECOND_CARD_EEPROM="efuse"
-CONFIG_RT_THIRD_CARD_EEPROM="efuse"
-CONFIG_FIRST_IF_EEPROM_EFUSE=y
-CONFIG_SECOND_IF_EEPROM_EFUSE=y
-CONFIG_FIRST_IF_IPAILNA=y
-CONFIG_SECOND_IF_IPAILNA=y
-CONFIG_WIFI_DRIVER=y
-CONFIG_WIFI_BASIC_FUNC=y
-CONFIG_MULTI_INF_SUPPORT=y
-CONFIG_DOT11_N_SUPPORT=y
-CONFIG_DOT11_VHT_AC=y
-CONFIG_G_BAND_256QAM_SUPPORT=y
-CONFIG_ICAP_SUPPORT=y
-CONFIG_BACKGROUND_SCAN_SUPPORT=y
-CONFIG_SMART_CARRIER_SENSE_SUPPORT=y
-CONFIG_MT_DFS_SUPPORT=y
-CONFIG_TXBF_SUPPORT=y
-CONFIG_ATE_SUPPORT=y
-CONFIG_WIFI_MODE_AP=y
-CONFIG_WDS_SUPPORT=y
-CONFIG_MBSS_SUPPORT=y
-CONFIG_APCLI_SUPPORT=y
-CONFIG_MULTI_APCLI_SUPPORT=y
-CONFIG_MAC_REPEATER_SUPPORT=y
-CONFIG_VOW_SUPPORT=y
-CONFIG_BAND_STEERING=y
-CONFIG_MUMIMO_SUPPORT=y
-CONFIG_MU_RA_SUPPORT=y
-CONFIG_GREENAP_SUPPORT=y
-CONFIG_TPC_SUPPORT=y
-CONFIG_RLM_CAL_CACHE_SUPPORT=y
-CONFIG_CAL_BIN_FILE_SUPPORT=y
-CONFIG_WIFI_EAP_FEATURE=y
-CONFIG_WPA3_SUPPORT=y
-CONFIG_SPECTRUM_SUPPORT=y
-CONFIG_PRE_CAL_TRX_SET1_SUPPORT=y
-CONFIG_MCAST_RATE_SPECIFIC=y
-CONFIG_PRE_CAL_TRX_SET2_SUPPORT=y
-CONFIG_PCIE_ASPM_DYM_CTRL_SUPPORT=y
-CONFIG_CHIP_MT7615E=y
-CONFIG_MT_MAC=y
-CONFIG_RTMP_PCI_SUPPORT=y
-CONFIG_NEW_RATE_ADAPT_SUPPORT=y
-CONFIG_AGS_SUPPORT=y
-CONFIG_UAPSD=y
-CONFIG_MT_MAC=y
-CONFIG_WSC_INCLUDED=y
-CONFIG_WSC_V2_SUPPORT=y
-CONFIG_DOT11W_PMF_SUPPORT=y
-CONFIG_DOT11N_DRAFT3=y
-CONFIG_DOT11R_FT_SUPPORT=y
-CONFIG_DOT11K_RRM_SUPPORT=y
-CONFIG_WNM_SUPPORT=y
-CONFIG_INTERWORKING=y
-CONFIG_IGMP_SNOOP_SUPPORT=y
-CONFIG_LED_CONTROL_SUPPORT=y
-CONFIG_ATE_SUPPORT=y
-CONFIG_MULTI_INF_SUPPORT=y
-CONFIG_OWE_SUPPORT=y
-CONFIG_SECURITY_IMPROVEMENT_SUPPORT=y
-CONFIG_MT_AP_SUPPORT=m
-CONFIG_DEFAULT_5G_PROFILE=y
-CONFIG_PASSPOINT_R2=y
-CONFIG_DSCP_QOS_MAP_SUPPORT=y
-CONFIG_DSCP_PRI_SUPPORT=7
-CONFIG_MBO_SUPPORT=y
-CONFIG_TXRX_STAT_SUPPORT=y
-CONFIG_VLAN_SUPPORT=y
-CONFIG_MAP_SUPPORT=y
-CONFIG_CUSTOMER_VENDOR_IE_SUPPORT=y
-CONFIG_BRCM_256QAM_SUPPORT=y
-CONFIG_HDR_TRANS_TX_SUPPORT=y
-CONFIG_HDR_TRANS_RX_SUPPORT=y

mt7615/patches/001-mt7615e-disable-multi-profile-and-set-default-to-5Ghz.patch

@@ -1,33 +0,0 @@
-From 58f33070591a5a11b532b8365874d0eb104b0aab Mon Sep 17 00:00:00 2001
-From: Anjan Chanda <anjan.chanda@iopsys.eu>
-Date: Sun, 23 Feb 2020 12:30:45 +0100
-Subject: [PATCH] disable multi profile and set default to 5G
-
----
- mt_wifi_ap/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mt_wifi_ap/Makefile b/mt_wifi_ap/Makefile
-index a49520d..f8f16ab 100644
---- a/mt_wifi_ap/Makefile
-+++ b/mt_wifi_ap/Makefile
-@@ -192,12 +192,12 @@ cmm_objs := $(SRC_EMBEDDED_DIR)/common/action.o\
- 		$(SRC_DIR)/protocol/protection.o\
- 		$(SRC_EMBEDDED_DIR)/common/misc_app.o
- 
--EXTRA_CFLAGS += -DMULTI_PROFILE
--cmm_objs += $(SRC_EMBEDDED_DIR)/common/multi_profile.o
-+#EXTRA_CFLAGS += -DMULTI_PROFILE
-+#cmm_objs += $(SRC_EMBEDDED_DIR)/common/multi_profile.o
- 
--ifeq ($(CONFIG_DEFAULT_5G_PROFILE),y)
-+#ifeq ($(CONFIG_DEFAULT_5G_PROFILE),y)
- EXTRA_CFLAGS += -DDEFAULT_5G_PROFILE
--endif
-+#endif
- 
- ########################################################
- # Coex related files
--- 
-2.7.4
-

multiwan/Makefile

@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2010-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=multiwan
-PKG_VERSION:=1.0.22
-PKG_RELEASE:=2
-
-PKG_LICENSE:=GPLv2
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/multiwan
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+ip +iptables +kmod-ipt-conntrack +iptables-mod-conntrack-extra +iptables-mod-ipopt
-  TITLE:=Simple multi WAN configuration
-  URL:=ftp://ftp.netlab7.com/
-  MAINTAINER:=Craig M. Coffee <craigc@netlab7.com>
-endef
-
-define Package/multiwan/description
-An agent script that makes Multi-WAN configuration simple,
-easy and manageable. Complete with load balancing, failover and an easy
-to manage traffic ruleset.
-endef
-
-define Package/multiwan/conffiles
-/etc/config/multiwan
-endef
-
-define Build/Compile
-endef
-
-define Package/multiwan/install
-	$(CP) ./files/* $(1)
-endef
-
-define Package/multiwan/postinst
-[ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/multiwan enable
-exit 0
-endef
-
-$(eval $(call BuildPackage,multiwan))

multiwan/files/etc/config/multiwan

@@ -1,57 +0,0 @@
-
-config 'multiwan' 'config'
-	# REMOVE THIS LINE OR PUT TO 1 TO ENABLE MULTIWAN
-	option 'enabled' '0'
-
-	option 'default_route' 'balancer'
-	# health_monitor below is defaulted to parallel, and can be set to
-	# serial to save system resources.
-	# option 'health_monitor' 'serial'
-	# option 'debug' '1'
-
-config 'interface' 'wan'
-	option 'weight' '10'
-	option 'health_interval' '10'
-	option 'icmp_hosts' 'dns'
-	# icmp_count is defaulted to 1, and can be increased to reduce
-	# false positives.
-	# option 'icmp_count' '3'
-	option 'timeout' '3'
-	option 'health_fail_retries' '3'
-	option 'health_recovery_retries' '5'
-	option 'failover_to' 'wwan'
-	option 'dns' 'auto'
-
-config 'interface' 'wwan'
-	option 'weight' '10'
-	option 'health_interval' '10'
-	option 'icmp_hosts' 'gateway'
-	option 'timeout' '3'
-	option 'health_fail_retries' '3'
-	option 'health_recovery_retries' '5'
-	option 'failover_to' 'balancer'
-	option 'dns' '208.67.222.222 208.67.220.220'
-
-#config 'mwanfw'
-#	option 'src' '192.168.1.0/24'
-#	option 'dst' 'ftp.netlab7.com'
-#	option 'proto' 'tcp'
-#	option 'ports' '21'
-#	option 'wanrule' 'wan2'
-
-# VoIP traffic goes through wan
-# config 'mwanfw'
-	# option 'src' '192.168.1.0/24'
-	# option 'proto' 'udp'
-	# option 'port_type' 'source-ports'
-	# option 'ports' '5060,16384:16482'
-	# option 'wanrule' 'wan'
-
-#config 'mwanfw'
-#	option 'src' '192.168.0.3'
-#	option 'proto' 'icmp'
-#	option 'wanrule' 'balancer'
-
-#config 'mwanfw'
-#	option 'dst' 'www.whatismyip.com'
-#	option 'wanrule' 'fastbalancer'

multiwan/files/etc/init.d/multiwan

@@ -1,25 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=99
-EXTRA_COMMANDS="single"
-USE_PROCD=1
-
-start_service () {
-   /usr/bin/multiwan agent &
-}
-
-stop_service () {
-  sh /usr/bin/multiwan stop
-}
-
-reload_service () {
-  /usr/bin/multiwan restart &
-}
-
-single () {
-  /usr/bin/multiwan single &
-}
-
-service_triggers() {
-        procd_add_reload_trigger multiwan
-}
-

natalie-dect/Makefile

@@ -15,7 +15,7 @@ PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=git@dev.iopsys.eu:dialog/natalie-dect-12.26
+PKG_SOURCE_URL:=https://dev.iopsys.eu/dialog/natalie-dect-12.26.git
 PKG_SOURCE_PROTO:=git
 endif
 

ndt/Makefile

@@ -11,6 +11,7 @@ PKG_RELEASE:=3
 PKG_BUILD_DIR:=${BUILD_DIR}/ndt-$(PKG_VERSION)
 PKG_SOURCE:=ndt-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://software.internet2.edu/sources/ndt
+PKG_HASH=098d9d55536b8a0ab07ef13eb15b7fd4
 
 PKG_LICENSE:=NONSTANDARD_PERMISSIV
 PKG_LICENSE_FILES:=COPYRIGHT

netmode/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=netmode
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=6406325e72d7ddd0ff7aaa3a87669519021bdb11
+PKG_SOURCE_VERSION:=5c8abbdf86e4651c7c6f14f784cfb52e69979f96
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
 

netmode/files/etc/config/netmode

@@ -1,9 +1,8 @@
-config mode 'setup'
+config netmoded 'netmoded'
+	option enabled '0'
+
+config setup 'setup'
+	option enabled '0'
         option dir '/etc/netmodes'
-        option detail ''
-        option curmode 'routed'
-
-config tools 'tools'
-	option wificontrol 0
-	option arp_discovery 1
+#	option mode 'router'
 

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

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

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

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/functions/netmode.sh
-
-ps | grep hotplug | grep button && exit
-
-[ -z "$INTERFACE" ] && exit
-
-defroute=$(ip route | grep default | awk '{print$3}')
-
-case "$(uci get netmode.setup.curmode)" in
-		repeater*)
-		;;
-		*)
-			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || {
-				logger -s -t "80-repeater" "ping to $defroute failed, sending USR1 to udhcpc" >/dev/console
-				killall -USR1 udhcpc
-			}
-			exit
-		;;
-esac
-
-case "$ACTION" in
-	add|register|remove|unregister) correct_uplink $INTERFACE;;
-esac
-

netmode/files/etc/init.d/netmode

@@ -9,6 +9,13 @@ NETMODED="/sbin/netmoded"
 . /lib/functions/netmode.sh
 
 start_netmoded() {
+	config_load netmode
+
+        config_get enabled netmoded enabled 0
+        if [ "$enabled" != "1" ]; then
+		return
+	fi
+
 	procd_open_instance
 	procd_set_param command $NETMODED
 
@@ -24,18 +31,12 @@ start_service() {
 	populate_netmodes
 
 	start_netmoded
-	start_netmode_tools
 }
 
 reload_service() {
         switch_netmode
 
 	start_netmoded
-	start_netmode_tools
-}
-
-stop_service() {
-	stop_netmode_tools
 }
 
 service_triggers()

netmode/files/etc/netmodes/bridge/DETAILS

@@ -0,0 +1,9 @@
+{
+	"description": [
+		{ "en" : "Bridge Mode" }
+	],
+	"explanation": [
+		{ "en" : "NAT is disabled." }
+	],
+	"reboot" : 0
+}

netmode/files/etc/netmodes/bridge/scripts/pre/bridge_mode.sh

@@ -0,0 +1,92 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+BRIDGEPORTS=""
+
+get_vlan() {
+	local device="$1"
+	for section in $(uci show network | grep "=device" | cut -d '=' -f1); do
+		if [ "$(uci -q get $section.ifname)" == "$device" ]; then
+			uci -q get $section.name
+			break
+		fi
+	done
+}
+
+add_wifi_devs()
+{
+
+	add_wdev()
+	{
+		local cfg=$1
+#		local disabled
+
+#		config_get_bool disabled $cfg disabled 0
+#		config_get_bool ifname $cfg ifname
+	
+#		if [ $disabled -eq 0 -a -n "$ifname" ]; then
+#			BRIDGEPORTS="$ifname"
+#		fi
+
+		uci -q set wireless.$cfg.network="wan"
+	}
+
+	config_load wireless
+	config_foreach add_wdev "wifi-iface"
+
+	uci -q commit wireless
+}
+
+add_xtm_devs() {
+	local section device vlan
+
+	for section in $(uci show dsl | grep "=.*tm-device" | cut -d'=' -f1); do
+		if [ -n "$(uci -q get $section.device)" ]; then
+
+			vlan="$(get_vlan $device)"
+			[ -n "$vlan" ] && device="$vlan"
+		
+			if [ -n "$device" ]; then
+				BRIDGEPORTS="$BRIDGEPORTS $device"
+			fi
+
+		fi
+	done
+}
+
+add_eth_ports() {
+
+	add_port()
+	{
+		local cfg=$1
+		local ifname vlan
+
+		config_get ifname $cfg ifname
+
+		vlan="$(get_vlan $ifname)"
+		[ -n "$vlan" ] && ifname="$vlan"
+	
+		if [ -n "$ifname" ]; then
+			BRIDGEPORTS="$BRIDGEPORTS $ifname"
+		fi
+	}
+
+	config_load ports
+	config_foreach add_port "ethport"
+}
+
+add_xtm_devs
+add_eth_ports
+add_wifi_devs
+
+BRIDGEPORTS="$(echo $BRIDGEPORTS | sed -e 's/[[:space:]]*$//')"
+
+uci -q set network.wan.type="bridge"
+uci -q set network.wan.ifname="$BRIDGEPORTS"
+uci -q set network.wan6.ifname="@wan"
+uci -q delete network.lan.ifname
+
+ubus call uci commit '{"config":"network"}'
+

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/DETAILS

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

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/network

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

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/scripts/post/apply_wet_cfg.sh

@@ -1,38 +0,0 @@
-#if wet in wireless config and SSID nad KEY was saved for it, apply to config
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-
-parse_wet_json()
-{
-	local interface=$1
-	local mode key encryption ssid connect_bssid
-
-	config_get mode $interface mode
-	[ "$mode" = "wet" ] || return
-
-	json_load "$(cat /tmp/netmodecfg)" 2> /dev/null
-	json_get_var ssid ssid
-	json_get_var key key
-	json_get_var encryption encryption
-	json_get_var connect_bssid connect_bssid
-
-	uci -q set wireless.$1.key="$key"
-	uci -q set wireless.$1.encryption="$encryption"
-	uci -q set wireless.$1.ssid="$ssid"
-	uci -q set wireless.$1.connect_bssid="$connect_bssid"
-	uci commit wireless
-}
-
-apply_wet_cfg()
-{
-	[ -f /tmp/netmodecfg ] || return
-
-	config_load wireless
-	config_foreach parse_wet_json "wifi-iface"
-
-	rm /tmp/netmodecfg 2> /dev/null
-}
-
-apply_wet_cfg

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/scripts/pre/disable_ubusproxy.sh

@@ -1,2 +0,0 @@
-uci -q set owsd.ubusproxy.enable="0"
-uci -q commit owsd

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/scripts/pre/save_wet_cfg.sh

@@ -1,38 +0,0 @@
-#if mode wet in wireless config has SSID Key, save them
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-
-parse_wet_cfg()
-{
-	local interface=$1
-	local mode key encryption ssid connect_bssid
-
-	config_get mode $interface mode
-	[ "$mode" = "wet" ] || return
-
-	config_get ssid $interface ssid
-	config_get key $interface key
-	config_get encryption $interface encryption
-	config_get connect_bssid $interface connect_bssid
-
-	[ -n "$key" ] || return
-	[ -n "$encryption" ] || return
-
-	json_init
-	json_add_string "ssid" "$ssid"
-	json_add_string "key" "$key"
-	json_add_string "encryption" "$encryption"
-	json_add_string "connect_bssid" "$connect_bssid"
-
-	echo "`json_dump`" > /tmp/netmodecfg
-}
-
-save_wet_cfg()
-{
-	config_load wireless
-	config_foreach parse_wet_cfg "wifi-iface"
-}
-
-save_wet_cfg

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/wireless

@@ -1,55 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config wifi-device  ra0
-	option band b
-	option channel  auto
-	option bandwidth '20'
-	option hwmode   auto
-	option htmode   HT20
-	option country 'DE'
-
-config wifi-iface
-	option device   ra0
-	option network  wan
-	option mode     ap
-	#option ssid AUTO-CREATED AT FIRST BOOT
-	option encryption psk2
-	#option key AUTO-CREATED AT FIRST BOOT
-	option ifname	ra0
-	option wps	1
-
-config wifi-device  rai0
-	option band a
-	option channel  auto
-	option bandwidth '80'
-	option hwmode   11ac
-	option htmode   VHT80
-	option country 'DE'
-	option beamforming 1
-
-config wifi-iface
-	option device   rai0
-	option network  wan
-	option mode     ap
-	#option ssid AUTO-CREATED AT FIRST BOOT
-	option encryption psk2
-	#option key AUTO-CREATED AT FIRST BOOT
-	option ifname	rai0
-	option wps	1
-
-config wifi-iface
-	option device   rai0
-	option network  wan
-	option mode     wet
-	#option ssid AUTO-CREATED AT FIRST BOOT
-	option encryption psk2
-	#option key AUTO-CREATED AT FIRST BOOT
-	option ifname	apclii0
-

netmode/files/etc/netmodes/routed_mtk/DETAILS

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

netmode/files/etc/netmodes/routed_mtk/dhcp

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

netmode/files/etc/netmodes/routed_mtk/firewall

@@ -1,153 +0,0 @@
-config settings 'settings'
-        option disabled '0'
-
-config defaults
-	option syn_flood	1
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		REJECT
-# Uncomment this line to disable ipv6 rules
-#	option disable_ipv6	1
-
-config zone
-	option name		lan
-	list   network		'lan'
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		ACCEPT
-
-config zone
-	option name		wan
-	list   network		'wan'
-	list   network		'wan6'
-	option input		REJECT
-	option output		ACCEPT
-	option forward		REJECT
-	option masq		1
-	option mtu_fix		1
-
-config forwarding
-	option src		lan
-	option dest		wan
-
-# We need to accept udp packets on port 68,
-# see https://dev.openwrt.org/ticket/4108
-config rule
-	option name		Allow-DHCP-Renew
-	option src		wan
-	option proto		udp
-	option dest_port	68
-	option target		ACCEPT
-	option family		ipv4
-
-# Allow IPv4 ping
-config rule
-	option name		Allow-Ping
-	option src		wan
-	option proto		icmp
-	option icmp_type	echo-request
-	option family		ipv4
-	option target		ACCEPT
-
-config rule
-	option name		Allow-IGMP
-	option src		wan
-	option proto		igmp
-	option family		ipv4
-	option target		ACCEPT
-
-# Allow DHCPv6 replies
-# see https://dev.openwrt.org/ticket/10381
-config rule
-	option name		Allow-DHCPv6
-	option src		wan
-	option proto		udp
-	option src_ip		fe80::/10
-	option src_port		547
-	option dest_ip		fe80::/10
-	option dest_port	546
-	option family		ipv6
-	option target		ACCEPT
-
-config rule
-	option name		Allow-MLD
-	option src		wan
-	option proto		icmp
-	option src_ip		fe80::/10
-	list icmp_type		'130/0'
-	list icmp_type		'131/0'
-	list icmp_type		'132/0'
-	list icmp_type		'143/0'
-	option family		ipv6
-	option target		ACCEPT
-
-# Allow essential incoming IPv6 ICMP traffic
-config rule
-	option name		Allow-ICMPv6-Input
-	option src		wan
-	option proto	icmp
-	list icmp_type		echo-request
-	list icmp_type		echo-reply
-	list icmp_type		destination-unreachable
-	list icmp_type		packet-too-big
-	list icmp_type		time-exceeded
-	list icmp_type		bad-header
-	list icmp_type		unknown-header-type
-	list icmp_type		router-solicitation
-	list icmp_type		neighbour-solicitation
-	list icmp_type		router-advertisement
-	list icmp_type		neighbour-advertisement
-	option limit		1000/sec
-	option family		ipv6
-	option target		ACCEPT
-
-# Allow essential forwarded IPv6 ICMP traffic
-config rule
-	option name		Allow-ICMPv6-Forward
-	option src		wan
-	option dest		*
-	option proto		icmp
-	list icmp_type		echo-request
-	list icmp_type		echo-reply
-	list icmp_type		destination-unreachable
-	list icmp_type		packet-too-big
-	list icmp_type		time-exceeded
-	list icmp_type		bad-header
-	list icmp_type		unknown-header-type
-	option limit		1000/sec
-	option family		ipv6
-	option target		ACCEPT
-
-# allow IPsec/ESP and ISAKMP passthrough
-config rule
-	option src		wan
-	option dest		lan
-	option proto		esp
-	option target		ACCEPT
-
-config rule
-	option src		wan
-	option dest		lan
-	option dest_port	500
-	option proto		udp
-	option target		ACCEPT
-
-config dmz dmz
-	option enabled '0'
-	option exclude_ports '5060 7547'
-
-# include a file with users custom iptables rules
-config include
-	option path /etc/firewall.user
-	option reload 1
-
-# include a file with rules for prioritizing some specific packets
-config include
-	option path /etc/firewall.qos
-	option reload 1
-
-# include a file with rules for DMZ Host
-config include dmzhost
-	option path /etc/firewall.dmz
-	option reload 1
-

netmode/files/etc/netmodes/routed_mtk/network

@@ -1,53 +0,0 @@
-config interface 'loopback'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'lan'
-	option type 'bridge'
-	option proto 'static'
-	option is_lan '1'
-	option ipaddr '192.168.1.1'
-	option netmask '255.255.255.0'
-	option ip6assign '60'
-	option ifname 'eth0.1'
-
-config device 'lan_dev'
-	option name 'eth0.1'
-	# Unused?
-	#option macaddr '$MACLAN'
-	option vid 1
-
-config interface 'wan'
-	option ifname 'eth0.2'
-	option proto 'dhcp'
-	#option hostname AUTO-CREATED AT FIRST BOOT
-	#option vendorid AUTO-CREATED AT FIRST BOOT
-	option reqopts '66 67 128 224'
-
-config device 'wan_dev'
-	option name 'eth0.2'
-	# Unused?
-	#option macaddr '$MACWAN'
-	option vid 2
-
-config interface 'wan6'
-	option ifname '@wan'
-	option proto 'dhcpv6'
-
-config switch
-	option name 'switch0'
-	option reset '1'
-	option enable_vlan '1'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '1'
-	option ports '1 6t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '2'
-	option ports '0 6t'
-

netmode/files/etc/netmodes/routed_mtk/wireless

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

netmode/files/etc/netmodes/router/DETAILS

@@ -0,0 +1,9 @@
+{
+	"description": [
+		{ "en" : "Router Mode" }
+	],
+	"explanation": [
+		{ "en" : "NAT is enabled." }
+	],
+	"reboot" : 0
+}

netmode/files/etc/netmodes/router/scripts/pre/router_mode.sh

@@ -0,0 +1,94 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+WANPORTS=""
+LANPORTS=""
+
+get_vlan() {
+	local device="$1"
+	for section in $(uci show network | grep "=device" | cut -d '=' -f1); do
+		if [ "$(uci -q get $section.ifname)" == "$device" ]; then
+			uci -q get $section.name
+			break
+		fi
+	done
+}
+
+add_wifi_devs()
+{
+
+	add_wdev()
+	{
+		local cfg=$1
+
+		config_get mode $cfg mode "ap"
+
+		if [ "$mode" == "ap" ]; then
+			uci -q set wireless.$cfg.network="lan"
+		fi
+	}
+
+	config_load wireless
+	config_foreach add_wdev "wifi-iface"
+
+	uci -q commit wireless
+}
+
+add_xtm_devs() {
+	local section device vlan
+
+	for section in $(uci show dsl | grep "=.*tm-device" | cut -d'=' -f1); do
+		device="$(uci -q get $section.device)"
+
+		if [ -n "$device" ]; then
+			vlan="$(get_vlan $device)"
+			[ -n "$vlan" ] && device="$vlan"
+
+			if [ -n "$device" ]; then
+				WANPORTS="$WANPORTS $device"
+			fi
+		fi
+	done
+}
+
+add_eth_ports() {
+
+	add_port()
+	{
+		local cfg=$1
+		local uplink ifname vlan
+
+		config_get ifname $cfg ifname
+		config_get_bool uplink $cfg uplink 0
+	
+		vlan="$(get_vlan $ifname)"
+		[ -n "$vlan" ] && ifname="$vlan"
+
+		if [ $uplink -eq 1 ]; then
+			WANPORTS="$WANPORTS $ifname"
+		else
+			LANPORTS="$LANPORTS $ifname"
+		fi
+	}
+
+	config_load ports
+	config_foreach add_port "ethport"
+}
+
+add_xtm_devs
+add_eth_ports
+add_wifi_devs
+
+WANPORTS="$(echo $WANPORTS | sed -e 's/[[:space:]]*$//')"
+LANPORTS="$(echo $LANPORTS | sed -e 's/[[:space:]]*$//')"
+
+uci -q set network.wan.type="anywan"
+uci -q set network.wan.ifname="$WANPORTS"
+uci -q set network.wan6.ifname="@wan"
+uci -q set network.lan.type="bridge"
+uci -q set network.lan.ifname="$LANPORTS"
+
+ubus call uci commit '{"config":"network"}'
+