uspd: Added conversion of unsigned long values

-------------------------------------------------------------------------------
* 4851bc6 Merge branch 'production-button' into 'devel'
* 4dd5f3c Peripheral-manager: Add production mode support for button
-------------------------------------------------------------------------------
commit 4851bc6a0ee52a6f3399ac26a70e4ccced1b72cc
Author: Benjamin Larsson <benjamin.larsson@iopsys.eu>
Date: 2020-05-08 13:33:47 +0200

    Merge branch 'production-button' into 'devel'

    Peripheral-manager: Add production mode support for button

    See merge request iopsys/peripheral-manager!2
Base directory -> /
 src/button.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 118 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit 4dd5f3c38a7a4e5c7fcc5c9461f0f13a99023fb4
Author: pitchaiah prakash <pitchaiah.murugan@iopsys.eu>
Date: 2020-05-08 12:20:16 +0200

    Peripheral-manager: Add production mode support for button

Base directory -> /
 src/button.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 118 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------

ated/Makefile

@@ -1,8 +1,15 @@
 #
-# Copyright (C) 2016 inteno
+# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
 #
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 
 include $(TOPDIR)/rules.mk
@@ -20,6 +27,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 #PKG_BUILD_PARALLEL:=1
 

bashdb/Makefile

@@ -13,6 +13,9 @@ PKG_MD5SUM:=b72c17870bfab2fd791b1f6de4d79f9e
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)

bbf/Config_bbfdm.in

@@ -0,0 +1,27 @@
+if PACKAGE_libbbfdm
+
+config LIBBBFDM_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
+
+config BBF_TR181
+	bool "Compile with tr181 device features"
+	default y
+
+config BBF_TR104
+	bool "Compile with tr104 voice features"
+	default y
+
+config BBF_TR143
+	bool "Compile with tr143 diagnostics features"
+	default y
+
+config BBF_TR157
+	bool "Compile with tr157 bulkdata collector features"
+	default y
+	
+config BBF_TR064
+	bool "Compile with tr064 features"
+	default n
+
+endif

bbf/Makefile

@@ -0,0 +1,126 @@
+#
+# Copyright (C) 2019 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libbbfdm
+PKG_VERSION:=1.2-2020-05-12
+PKG_FIXUP:=autoreconf
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=80652051f58e5070cd047594599ae4a82257d18f
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+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:=LGPL-2.1
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libbbf_api
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for libbbfdm API
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+endef
+
+define Package/libbbfdm
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls
+endef
+
+define Package/libbbfdm/config
+	source "$(SOURCE)/Config_bbfdm.in"
+endef
+
+define Package/libbbf_api/description
+ Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
+endef
+
+define Package/libbbfdm/description
+ Library contains the data model tree. It includes TR181, TR104, TR143, TR157 and TR064 data models
+endef
+
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
+define Build/Prepare
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE -D_AADJ
+
+ifeq ($(CONFIG_BBF_TR181),y)
+CONFIGURE_ARGS += \
+	--enable-tr181
+endif
+
+ifeq ($(CONFIG_BBF_TR104),y)
+CONFIGURE_ARGS += \
+	--enable-tr104
+endif
+
+ifeq ($(CONFIG_BBF_TR143),y)
+CONFIGURE_ARGS += \
+	--enable-tr143
+endif
+
+ifeq ($(CONFIG_BBF_TR157),y)
+CONFIGURE_ARGS += \
+	--enable-tr157
+endif
+
+ifeq ($(CONFIG_BBF_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-tr064
+endif
+
+ifeq ($(CONFIG_PACKAGE_libopenssl),y)
+CONFIGURE_ARGS += \
+	--enable-libopenssl
+endif
+
+ifeq ($(CONFIG_PACKAGE_libmbedtls),y)
+CONFIGURE_ARGS += \
+	--enable-libmbedtls
+endif
+
+define Package/libbbf_api/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
+endef
+
+define Package/libbbfdm/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
+	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
+	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/dmtree/tr157/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libbbf_api))
+$(eval $(call BuildPackage,libbbfdm))

bbk_cli/Makefile

@@ -0,0 +1,42 @@
+#
+# Copright (C) 2018 The Internet Foundation In Sweden
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bbk_cli
+PKG_SOURCE_VERSION:=7b810a696c78b746185c11282bdbe3fb7f8c5d4b
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/dotse/bbk.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/bbk_cli
+	CATEGORY:=Utilities
+	DEPENDS:=+libpthread +libstdcpp
+	TITLE:=Bredbandskollen CLI - A bandwidth measurement tool
+endef
+
+define Package/bbk_cli/description
+	To measure connection speed in an environment that is missing a web browser, 
+	for example, in a server, you can use our command line interface bbk_cli, 
+	which is available for some of the most common operating systems.
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/src/cli CROSS_COMPILE="$(TARGET_CROSS)"
+endef
+
+define Package/bbk_cli/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cli/cli $(1)/sbin/bbk_cli
+endef
+
+$(eval $(call BuildPackage,bbk_cli))

bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch

@@ -0,0 +1,25 @@
+diff --git a/src/framework/engine.h b/src/framework/engine.h
+index 57a48ad..9e1bc36 100644
+--- a/src/framework/engine.h
++++ b/src/framework/engine.h
+@@ -10,6 +10,7 @@
+ #include <map>
+ #include <vector>
+ #include <string>
++#include <sys/select.h>
+ 
+ #include "logger.h"
+ 
+diff --git a/src/framework/mk.inc b/src/framework/mk.inc
+index 793e211..13275be 100644
+--- a/src/framework/mk.inc
++++ b/src/framework/mk.inc
+@@ -7,7 +7,7 @@ OS:=$(shell uname)
+ CXXFLAGS += -O2 -W -Wall -I$(DIRLEVEL)
+ 
+ ifeq ($(OS),Linux)
+-CXX = g++
++CXX = $(CROSS_COMPILE)g++
+ endif
+ 
+ ifeq ($(OS),Darwin)

bootchart2/Makefile

@@ -18,6 +18,9 @@ PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bootchart2

catv/Makefile

@@ -1,9 +1,19 @@
+#
+# Copyright (C) 2018 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=catv
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/catv

cifsd-tools/Makefile

@@ -0,0 +1,53 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=cifsd-tools
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/namjaejeon/cifsd-tools.git
+PKG_SOURCE_DATE:=2019-02-14
+PKG_SOURCE_VERSION:=a7d7dfc40524b88dbcb2052034a75f446b3cefdd
+PKG_MIRROR_HASH:=a74f95a79c3cdcc78e66c080729141abee0d821e21a326d88b11d849738314fb
+
+PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=autogen.sh aclocal.m4
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/cifsd-tools
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Filesystem
+  TITLE:=Kernel CIFS/SMB server support and userspace tools
+  DEPENDS:=+kmod-fs-cifsd +glib2 +libnl-core +libnl-genl $(ICONV_DEPENDS)
+endef
+
+define Package/cifsd-tools/description
+  Userspace tools (cifsd, cifsadmin) for the CIFS/SMB kernel fileserver.
+  The config file location is /etc/cifs/smb.conf
+endef
+
+define Package/cifsd-tools/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcifsdtools.so* $(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/etc/cifs
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/smb.conf.example $(1)/etc/cifs
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/cifsd.config $(1)/etc/config/cifsd
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/cifsd.init $(1)/etc/init.d/cifsd
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{cifsadmin,cifsd} $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,cifsd-tools))

cifsd-tools/files/cifsd.config

@@ -0,0 +1,9 @@
+config global 'global'
+	option server_string	'CIFSD on OpenWRT'
+	option ipc_timeout	'8' # IPC timeout is used as a workaround for uninterruptible sleep until this is fixed upstream.
+
+config share
+	option name	'share'
+	option comment	'Default guest share'
+	option path	'/mnt'
+	option guest_ok	'yes'

cifsd-tools/files/cifsd.init

@@ -0,0 +1,161 @@
+#!/bin/sh /etc/rc.common
+
+START=90
+USE_PROCD=1
+PROG=/usr/sbin/cifsd
+USER_DB=/etc/cifs/cifsdpwd.db
+CIFS_ADMIN=cifsadmin
+
+EXTRA_COMMANDS="users"
+EXTRA_HELP="	users	Show list of users created by cifsadmin"
+
+users() {
+	[ -f "$USER_DB" ] && cut -d ':' $USER_DB -f1 || \
+		printf "No users available.\n"
+}
+
+validate_cifsd_global() {
+	uci_validate_section cifsd global global \
+		'server_string:string' \
+		'workgroup:string' \
+		'netbios_name:string' \
+		'interface:string' \
+		'ipc_timeout:uinteger'
+}
+
+validate_cifsd_share() {
+	uci_validate_section cifsd share "${1}" \
+		'name:string' \
+		'comment:string' \
+		'path:string' \
+		'guest_ok:bool' \
+		'read_only:bool' \
+		'allow_hosts:list' \
+		'deny_hosts:list' \
+		'users:string' \
+		'invalid_users:string' \
+		'create_mask:string' \
+		'dir_mask:string' \
+		'max_connections:uinteger' \
+		'veto_files:list'
+}
+
+validate_cifsd_users() {
+	uci_validate_section cifsd users "${1}" \
+		'user:string' \
+		'password:string' \
+		'desc:string'
+}
+
+load_cifsd_global() {
+	local server_string
+	local workgroup
+	local netbios_name
+	local ipc_timeout
+
+	validate_cifsd_global
+
+	echo -e "[global]" >> /var/etc/cifsd.conf
+	[ -n "$server_string" ] && echo -e "\tserver string = $server_string" >> /var/etc/cifsd.conf
+	[ -n "$workgroup" ] && echo -e "\tworkgroup = $workgroup" >> /var/etc/cifsd.conf
+	[ -n "$netbios_name" ] && echo -e "\tnetbios name = $netbios_name" >> /var/etc/cifsd.conf
+	[ -n "$ipc_timeout" ] && echo -e "\tipc timeout name = $ipc_timeout" >> /var/etc/cifsd.conf || \
+		echo -e "\tipc timeout name = 8" >> /var/etc/cifsd.conf
+}
+
+load_cifsd_share() {
+	local name
+	local comment
+	local path
+	local guest_ok
+	local allow_hosts
+	local deny_hosts
+	local users
+	local invalid_users
+	local max_connections
+	local veto_files
+	local dir_mask
+	local create_mask
+	local read_only
+
+	validate_cifsd_share ${1}
+
+	if [ -z "$name" -o -z "$path" ]; then
+		logread -t ${0} "Missing name or path."
+		return
+	fi
+
+	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/cifsd.conf
+	[ -n "$comment" ] && echo -e "\tcomment = $comment" >> /var/etc/cifsd.conf
+	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /var/etc/cifsd.conf
+	[ -n "$allow_hosts" ] && echo -e "\tallow hosts = $allow_hosts" >> /var/etc/cifsd.conf
+	[ -n "$deny_hosts" ] && echo -e "\tdeny hosts = $deny_hosts" >> /var/etc/cifsd.conf
+	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/cifsd.conf
+	[ -n "$invalid_users" ] && echo -e "\tinvalid users = $invalid_users" >> /var/etc/cifsd.conf
+	[ -n "$max_connections" ] && echo -e "\tmax connections = $max_connections" >> /var/etc/cifsd.conf
+	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/cifsd.conf
+	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/cifsd.conf
+
+	if [ -n "$read_only" ]; then
+		echo -e "\tread only = $read_only" >> /var/etc/cifsd.conf
+		if [ "${read_only}" -eq "0" ]; then
+			echo -e "\twrite ok = 1" >> /var/etc/cifsd.conf
+		fi
+	else
+		echo -e "\twrite ok = 1" >> /var/etc/cifsd.conf
+	fi
+
+	[ -n "$veto_files" ] && echo -e "\tveto files = $veto_files" >> /var/etc/cifsd.conf
+}
+
+load_cifsd_users() {
+	local user
+	local password
+	local desc
+
+	validate_cifsd_users ${1}
+	[ $(which ${CIFS_ADMIN}) ] || {
+		logread -t ${0} "${CIFS_ADMIN} tools is not available"
+		return;
+	}
+
+	cifsadmin -a "${user}" -p "${password}"
+	if [ "$?" -ne 0 ]; then
+		logread -t ${0} "Failed to create/update ${user}"
+	fi
+}
+
+service_triggers()
+{
+	procd_add_config_trigger "config.change" "cifsd" /etc/init.d/cifsd restart
+}
+
+init_config() {
+	[ -f "/var/etc/cifsd.conf" ] && rm /var/etc/cifsd.conf
+
+	config_load cifsd
+	load_cifsd_global
+
+	# Delete existing users
+	[ -f "${USER_DB}" ] && {
+		rm -f "${USER_DB}"
+	}
+	config_foreach load_cifsd_users users
+	config_foreach load_cifsd_share share
+}
+
+start_service() {
+	. /lib/functions.sh
+	init_config
+
+	[ ! "$(grep cifsd /proc/modules)" ] && modprobe cifsd
+	procd_open_instance
+	procd_set_param command /usr/bin/env LANG=en_US.UTF-8 $PROG -c /var/etc/cifsd.conf
+	procd_set_param respawn
+	procd_close_instance
+}
+
+stop_service() {
+	killall cifsd
+	# IPC timeout will kill the remaining processes.
+}

cifsd/001-fix_implicit_declarations.patch

@@ -0,0 +1,73 @@
+For some reason, fs.h on Inteno kernel is missing inode->i_mutex nesting subclasses for the lock validator
+which is triggering implicit declaration error. To workaround this hardcore use of mutex_lock by removing
+kernel version check.
+---
+--- a/vfs.c
++++ b/vfs.c
+@@ -544,15 +544,9 @@ int cifsd_vfs_setattr(struct cifsd_work
+ 
+ 	attrs->ia_valid |= ATTR_CTIME;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock(inode);
+-	err = notify_change(dentry, attrs, NULL);
+-	inode_unlock(inode);
+-#else
+ 	mutex_lock(&inode->i_mutex);
+ 	err = notify_change(dentry, attrs, NULL);
+ 	mutex_unlock(&inode->i_mutex);
+-#endif
+ 
+ 	if (update_size)
+ 		put_write_access(inode);
+@@ -753,11 +747,8 @@ int cifsd_vfs_remove_file(char *name)
+ 	if (!dir->d_inode)
+ 		goto out;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock_nested(dir->d_inode, I_MUTEX_PARENT);
+-#else
+ 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
+-#endif
++
+ 	dentry = lookup_one_len(last, dir, strlen(last));
+ 	if (IS_ERR(dentry)) {
+ 		err = PTR_ERR(dentry);
+@@ -783,11 +774,7 @@ int cifsd_vfs_remove_file(char *name)
+ 
+ 	dput(dentry);
+ out_err:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_unlock(dir->d_inode);
+-#else
+ 	mutex_unlock(&dir->d_inode->i_mutex);
+-#endif
+ out:
+ 	path_put(&parent);
+ 	return err;
+@@ -1302,11 +1289,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
+ 	int err = 0;
+ 
+ 	dget(dentry);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock(dir->d_inode);
+-#else
+ 	mutex_lock(&dir->d_inode->i_mutex);
+-#endif
++
+ 	if (!dentry->d_inode || !dentry->d_inode->i_nlink) {
+ 		err = -ENOENT;
+ 		goto out;
+@@ -1318,11 +1302,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
+ 		err = vfs_unlink(dir->d_inode, dentry, NULL);
+ 
+ out:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_unlock(dir->d_inode);
+-#else
+ 	mutex_unlock(&dir->d_inode->i_mutex);
+-#endif
++
+ 	dput(dentry);
+ 	if (err)
+ 		cifsd_debug("failed to delete, err %d\n", err);

cifsd/Makefile

@@ -0,0 +1,60 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=cifsd
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/namjaejeon/cifsd.git
+PKG_SOURCE_DATE:=2019-03-05
+PKG_SOURCE_VERSION:=e1715ce125d55b125b1b58a6f1819ef8e54cc3ba
+PKG_MIRROR_HASH:=521585ebfda0ecc02372b1a38ebf762fbbcead6d0b754a47599a5bf6bfdb3fb6
+
+PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/fs-cifsd
+	SUBMENU:=Filesystems
+	TITLE:=CIFS/SMB kernel server support
+	FILES:=$(PKG_BUILD_DIR)/cifsd.$(LINUX_KMOD_SUFFIX)
+	DEPENDS+= \
+		+kmod-nls-base \
+		+kmod-nls-utf8 \
+		+kmod-crypto-md4 \
+		+kmod-crypto-md5 \
+		+kmod-crypto-hmac \
+		+kmod-crypto-ecb \
+		+kmod-crypto-des \
+		+kmod-crypto-sha256 \
+		+kmod-crypto-cmac \
+		+kmod-crypto-sha512 \
+		+kmod-crypto-aead \
+		+kmod-crypto-ccm
+	KCONFIG:= \
+		CONFIG_KEYS=y \
+		CONFIG_CRYPTO_ARC4=y
+endef
+
+define KernelPackage/fs-cifsd/description
+	Kernel module for a CIFS/SMBv2,3 fileserver.
+endef
+
+TARGET_CFLAGS+= -DCONFIG_CIFSD_ACL
+
+MAKE_OPTS:=\
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	M="$(PKG_BUILD_DIR)"
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CONFIG_CIFS_SERVER=m \
+		modules
+endef
+
+$(eval $(call KernelPackage,fs-cifsd))

cifsd/patches/001-fix_implicit_declarations.patch

@@ -0,0 +1,69 @@
+--- a/vfs.c
++++ b/vfs.c
+@@ -544,15 +544,9 @@ int cifsd_vfs_setattr(struct cifsd_work
+ 
+ 	attrs->ia_valid |= ATTR_CTIME;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock(inode);
+-	err = notify_change(dentry, attrs, NULL);
+-	inode_unlock(inode);
+-#else
+ 	mutex_lock(&inode->i_mutex);
+ 	err = notify_change(dentry, attrs, NULL);
+ 	mutex_unlock(&inode->i_mutex);
+-#endif
+ 
+ 	if (update_size)
+ 		put_write_access(inode);
+@@ -753,11 +747,8 @@ int cifsd_vfs_remove_file(char *name)
+ 	if (!dir->d_inode)
+ 		goto out;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock_nested(dir->d_inode, I_MUTEX_PARENT);
+-#else
+ 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
+-#endif
++
+ 	dentry = lookup_one_len(last, dir, strlen(last));
+ 	if (IS_ERR(dentry)) {
+ 		err = PTR_ERR(dentry);
+@@ -783,11 +774,7 @@ int cifsd_vfs_remove_file(char *name)
+ 
+ 	dput(dentry);
+ out_err:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_unlock(dir->d_inode);
+-#else
+ 	mutex_unlock(&dir->d_inode->i_mutex);
+-#endif
+ out:
+ 	path_put(&parent);
+ 	return err;
+@@ -1302,11 +1289,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
+ 	int err = 0;
+ 
+ 	dget(dentry);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock(dir->d_inode);
+-#else
+ 	mutex_lock(&dir->d_inode->i_mutex);
+-#endif
++
+ 	if (!dentry->d_inode || !dentry->d_inode->i_nlink) {
+ 		err = -ENOENT;
+ 		goto out;
+@@ -1318,11 +1302,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
+ 		err = vfs_unlink(dir->d_inode, dentry, NULL);
+ 
+ out:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_unlock(dir->d_inode);
+-#else
+ 	mutex_unlock(&dir->d_inode->i_mutex);
+-#endif
++
+ 	dput(dentry);
+ 	if (err)
+ 		cifsd_debug("failed to delete, err %d\n", err);

crashlog/Makefile

@@ -1,9 +1,18 @@
+#
+# 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:=crashlog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
 
 include $(INCLUDE_DIR)/package.mk
 

crashlog/files/etc/init.d/crashlog

@@ -4,16 +4,15 @@ START=99
 
 send_log()
 {
-	nr=$(db get hw.board.serialNumber)
-	hw=$(db get hw.board.hardware)
-	hwv=$(db get hw.board.hardwareVersion)
-	bid=$(db get hw.board.boardId)
+	nr=$(db get hw.board.serial_number)
+	hw=$(db get hw.board.model_name)
+	fam=$(db get hw.board.iopVerFam)
 	sw=$(db get hw.board.iopVersion)
 	server=$(/sbin/uci get system.crashlog.server)
 
 	while true
 	do
-	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${bid}_${hwv}_${hw}_${sw}_${nr}
+	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${fam}_${hw}_${sw}_${nr}
 	    if [ $? == 0 ]
 	    then
 	       break;

crashlog/files/sbin/logcore

@@ -50,12 +50,11 @@ cat >$TMP_CORE
 # more memory to work with. normally this would do nothing.
 cat >/dev/null
 
-nr=$(db get hw.board.serialNumber)
-hw=$(db get hw.board.hardware)
-hwv=$(db get hw.board.hardwareVersion)
-bid=$(db get hw.board.boardId)
+nr=$(db get hw.board.serial_number)
+hw=$(db get hw.board.model_name)
+fam=$(hw.board.iopVerFam)
 sw=$(db get hw.board.iopVersion)
 
-scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${bid}_${hwv}_${hw}_${sw}_${nr}
+scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${fam}_${hw}_${sw}_${nr}
 rm $TMP_CORE
 

dectmngr2/Makefile

@@ -1,21 +1,21 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# 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_RELEASE:=1
 PKG_VERSION:=1.3.0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=637aa9ef231f81d195f7a1b67c70af445ade7fee
+PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
 PKG_NAME:=dectmngr2
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
 
-RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -29,7 +29,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent endptmngr
 endef
 
 define Package/dectmngr2/description

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

@@ -12,7 +12,7 @@ if [ -e "/proc/nvram/BoardId" ]; then
 		echo "0xfffffff2" >/proc/nvram/ulBoardStuffOption
 
 		db -q batch <<-EOT
-			set hw.board.hasDect=1
+			set hw.board.has_dect=1
 			commit hw.board
 		EOT
 	fi

dslmngr/Makefile

@@ -13,12 +13,15 @@ PKG_VERSION:=1.0.0
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7522faab4142fe2c0ac8cbf71bb0cc5bd49f0750
+PKG_SOURCE_VERSION:=fcad1331eb134b5f0cc05526aa897df61fc4fec0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,7 +45,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +easy-soc-libs
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/dslmngr/description
@@ -53,6 +56,7 @@ endef
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(STAGING_DIR)/usr/include/xdsl \
 	-D_GNU_SOURCE
 
 MAKE_FLAGS += \

easy-qos/Makefile

@@ -1,19 +1,29 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# 
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-qos
-PKG_VERSION:=1.0
+PKG_VERSION:=1.1
 PKG_RELEASE:=0
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
+  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_brcm63xx_mips)
 endef
 
 define Package/easy-qos/description
-	This package contains Easy QoS utitie
+	This package contains Easy QoS utility
 endef
 
 define Build/Prepare
@@ -29,7 +39,11 @@ define Package/easy-qos/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
+ifeq ($(CONFIG_TARGET_intel_mips),y)
+	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
+else
 	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
+endif
 	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
 endef

easy-qos/files/etc/init.d/easy_qos.classcfg

@@ -0,0 +1,301 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+RULE_LIST="/tmp/easy_qos_rule.list"
+CLIENT_LIST="/tmp/easy_qos_class_client.list"
+BRIDGE_INTF=""
+
+[ -f /etc/profile.d/intel.sh ] && {
+	. /etc/profile.d/intel.sh
+	sh /etc/profile.d/intel.sh
+}
+
+log() {
+	echo "${@}"|logger -t easy_qos_class -p debug
+}
+
+exec_log() {
+	${@}
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+	fi
+}
+
+exec_class_log() {
+	${@} |grep -i successful
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+		return 1
+	fi
+	return 0
+}
+
+get_priority() {
+	local prio=$(echo $1|tr [A-Z] [a-z]);
+	case "${prio}" in
+		"lowest")
+			echo 8;;
+		"low")
+			echo 7;;
+		"besteffort")
+			echo 6;;
+		"normal")
+			echo 5;;
+		"video")
+			echo 4;;
+		"medium")
+			echo 3;;
+		"high")
+			echo 2;;
+		"highest")
+			echo 1;;
+	esac
+}
+
+get_mark() {
+	local prio=$(echo $1|tr [A-Z] [a-z]);
+	case "${prio}" in
+		"lowest")
+			echo "0x41/0x3df";;
+		"low")
+			echo "0x82/0x3df";;
+		"besteffort")
+			echo "0xc3/0x3df";;
+		"normal")
+			echo "0x104/0x3df";;
+		"video")
+			echo "0x145/0x3df";;
+		"medium")
+			echo "0x186/0x3df";;
+		"high")
+			echo "0x1c7/0x3df";;
+		"highest")
+			echo "0x208/0x3df";;
+	esac
+}
+
+clean_client_entries() {
+	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
+}
+
+map_client_entries() {
+	local clients ip mac host
+
+	json_load "$(ubus call router.network 'clients')"
+	json_get_keys keys
+
+	for key in ${keys};
+	do
+		json_select ${key}
+		json_get_vars ipaddr macaddr hostname
+		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
+		json_select ..
+	done
+
+	json_init
+
+	IFS=";"
+	for client in ${clients};
+	do
+		macaddr=$(echo ${client} | cut -d" " -f1)
+		json_add_object "${macaddr//:/_}"
+		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
+		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
+		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
+		json_close_object
+	done
+
+	IFS=' '
+	echo `json_dump` > ${CLIENT_LIST}
+	json_cleanup
+}
+
+# Find the IP of a corresponding mac from arp table
+get_ipaddress() {
+	local clients ip mac host
+
+	json_load "$(cat ${CLIENT_LIST})"
+	json_get_keys keys
+
+	# jshn seems a bit iffy on having : in key, replace by _
+	json_select "${1//:/_}" 2 > /dev/null
+	json_get_var ip ip
+
+	echo "$ip"
+}
+
+check_and_create() {
+	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
+	# Create rule if not exists
+	if [ ${?} -ne 0 ]; then
+		exec_log iptables -t mangle -A PREROUTING ${@}
+	else
+		log "Rule exists for ${@}"
+	fi
+}
+
+create_ip_rule() {
+	local proto=$1; shift
+	local src_ip=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+
+	cmd="-j EXTMARK --set-mark ${mark}";
+	if [ "${proto}" != "icmp" ]; then
+		if [ -n "${ports}" ]; then
+			cmd="--match multiport --dports ${ports} ${cmd}";
+		fi
+	fi
+
+	if [ "${proto}" == "icmp" ]; then
+		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
+	elif [ "${proto}" == "all" ]; then
+		cmd="-p all $cmd"
+	else
+		cmd="-p ${proto} -m ${proto} $cmd"
+	fi
+	cmd="-s ${src_ip} $cmd"
+
+	check_and_create ${cmd}
+}
+
+is_lan_bridge() {
+	local _section=$1
+	local _type
+	local _is_lan
+
+	config_get _type "$section" "type"
+	config_get _is_lan "$section" "is_lan"
+
+	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
+		BRIDGE_INTF="br-${_section}"
+	fi
+}
+
+get_bridge_interface() {
+	config_load network
+	config_foreach is_lan_bridge interface
+}
+
+validate_rule_section()
+{
+	uci_validate_section easy_qos rule "${1}" \
+		'priority:string' \
+		'macaddr:string' \
+		'proto:string:none' \
+		'port:list(uinteger)' \
+		'comment:string:none'
+}
+
+# Clear existing rules before applying new rules
+clear_existing_rules() {
+	# execute the delete rules written onto a file then delete the file
+	[ -f ${RULE_LIST} ] || return 0
+
+	while read line
+	do
+		log "Deleting old classification rules"
+		exec_class_log classcfg -D ${line} -i ${BRIDGE_INTF}
+	done <${RULE_LIST}
+
+	local rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
+	while [ -n "${rule}" ]; do
+		exec_log iptables -t mangle ${rule}
+		rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
+	done
+	sync
+
+	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
+}
+
+# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
+create_rule() {
+	local proto=$1; shift
+	local mac_addr=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+	# Rule name is uniqe, so we take hash of all the input as rule_name
+	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
+
+	cmd="-j mark --mark ${mark}";
+
+	if [ "${mac_addr}" != "none" ]; then
+		cmd="--smac ${mac_addr} ${cmd}";
+	fi
+
+	if [ "${proto}" != "icmp" ]; then
+		if [ "${ports}" != "none" ]; then
+			IFS=","
+			for port in ${ports};
+			do
+				cmd="--dport ${port}:${port} ${cmd}";
+			done
+			IFS=' '
+		fi
+	fi
+	if [ "${proto}" != "none" ]; then
+		cmd="-p ${proto} $cmd"
+	fi
+	cmd="-i ${BRIDGE_INTF} $cmd"
+	cmd="-A ${rule_name} $cmd"
+
+	# Store the rule_names for cleanup on reload
+	exec_class_log classcfg ${cmd}
+	[ $? -eq 0 ] && \
+		echo ${rule_name}  >> ${RULE_LIST}
+}
+
+manage_rule() {
+	local cfg="$1"
+	local priority macaddr proto port comment prio_num port_list ip ipmark
+
+	validate_rule_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+
+	prio_num=$(get_priority ${priority})
+	port_list=$(echo ${port}|sed 's/ /,/g')
+	ipmark=$(get_mark ${priority})
+	ip=$(get_ipaddress ${macaddr})
+
+	if [ -n "${prio_num}" ]; then
+		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
+			create_rule tcp ${macaddr} ${prio_num} ${port_list}
+			create_rule udp ${macaddr} ${prio_num} ${port_list}
+			if [ -n "${ip}" ]; then
+				create_ip_rule tcp ${ip} ${ipmark} ${port_list}
+				create_ip_rule udp ${ip} ${ipmark} ${port_list}
+			fi
+		else
+			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
+			if [ -n "${ip}" ]; then
+				create_ip_rule ${proto} ${ip} ${ipmark} ${port_list}
+			fi
+		fi
+	fi
+}
+
+reload_service() {
+	get_bridge_interface
+	map_client_entries
+	clear_existing_rules
+	config_load easy_qos
+	config_foreach manage_rule rule
+	clean_client_entries
+}
+
+start_service() {
+	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
+	reload_service
+	log "Easy QoS class installed"
+}
+
+service_triggers() {
+	procd_add_reload_trigger "easy_qos" "network"
+}
+

easy-qos/files/etc/init.d/easy_qos.ebtables

@@ -102,7 +102,7 @@ manage_rule() {
 	prio_num=$(get_priority ${priority})
 	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
 		for p in ${port}; do
-			if [ "${protocol}" == "none" ]; then
+			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
 				create_rule tcp ${macaddr} ${prio_num} ${p}
 				create_rule udp ${macaddr} ${prio_num} ${p}
 			else
@@ -111,7 +111,7 @@ manage_rule() {
 		done
 		# Create rule for all ports if port is not mentioned in uci
 		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" ]; then
+			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
 				create_rule tcp ${macaddr} ${prio_num}
 				create_rule udp ${macaddr} ${prio_num}
 			else

easy-qos/files/etc/init.d/easy_qos.iptables

@@ -103,18 +103,18 @@ validate_rule_section()
 
 # Clear existing rules before applying new rules
 clear_existing_rules() {
-	local rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
+	local rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
 	while [ -n "${rule}" ]; do
 		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
+		rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
 	done
 }
 
 check_and_create() {
-	iptables -t mangle -C OUTPUT ${@} 2>/dev/null
+	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
 	# Create rule if not exists
 	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A OUTPUT ${@}
+		exec_log iptables -t mangle -A PREROUTING ${@}
 	else
 		log "Rule exists for ${@}"
 	fi
@@ -158,7 +158,7 @@ manage_rule() {
 	port_list=$(echo ${port}|sed 's/ /,/g')
 
 	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" ]; then
+		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
 			create_rule tcp ${ip} ${prio_num} ${port_list}
 			create_rule udp ${ip} ${prio_num} ${port_list}
 		else

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,70 @@
+# 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.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/easy-soc-events.git
+PKG_SOURCE_VERSION:=f340418462d0aa119f8009d4321f18dc9c4e47b1
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+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
+LINUXINCLUDE=-Iarch/$(LINUX_KARCH)/mach-bcm963xx/include
+endif
+
+
+define KernelPackage/easy-soc-events
+  SUBMENU:=Other modules
+  TITLE:=Helper module for netlink event notification
+  FILES:=$(PKG_BUILD_DIR)/easyevent.ko
+  AUTOLOAD:=$(call AutoProbe,easyevent)
+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 :=
+
+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 \
+		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
+		LINUXINCLUDE="$(LINUXINCLUDE)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		modules
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
+	$(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))

easy-soc-libs/Makefile

@@ -1,24 +1,29 @@
 #
-# Copyright (C) 2018 Iopsys
+# Copyright (C) 2020 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=1.0.0
+PKG_VERSION:=3.1.6
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9b7accf0ac4f7c8010fb06ba83df9e53264b429a
+PKG_SOURCE_VERSION:=0a9c1df3d0b75c434473a351103a9283de87190c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/easy-soc-libs
@@ -34,10 +39,16 @@ define Package/libwifi/config
   source "$(SOURCE)/Config.in"
 endef
 
+define Package/libeasy
+  $(call Package/easy-soc-libs)
+  TITLE:= Common helper functions library (libeasy)
+  DEPENDS+=+libnl +libnl-route
+endef
+
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
+  DEPENDS+=+libnl +libnl-route +libeasy
 endef
 
 define Package/libethernet
@@ -77,10 +88,11 @@ endif
 define Package/libdsl
   $(call Package/easy-soc-libs)
   TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
 endef
 
 subdirs := \
+	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
 	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
@@ -103,17 +115,28 @@ define Build/Prepare
 endef
 endif
 
+define Build/InstallDev/libeasy
+	$(INSTALL_DIR) $(1)/usr/include/easy
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/event.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/utils.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
+endef
+
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
 
 define Build/InstallDev/libdsl
-	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/xdsl
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/xdsl
+	$(CP) $(PKG_BUILD_DIR)/libdsl/xtm.h $(1)/usr/include/xdsl
+	$(CP) $(PKG_BUILD_DIR)/libdsl/common.h $(1)/usr/include/xdsl
 	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
 endef
 
@@ -135,9 +158,14 @@ define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
+define Package/libeasy/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
+endef
+
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
 
 define Package/libethernet/install
@@ -154,6 +182,11 @@ ifeq ($(CONFIG_LIBDSL_TEST),y)
 endif
 endef
 
+define Package/easy-soc-libs/install
+	:
+endef
+
+$(eval $(call BuildPackage,libeasy))
 $(eval $(call BuildPackage,libwifi))
 $(eval $(call BuildPackage,libdsl))
 $(eval $(call BuildPackage,libethernet))

endptmngr/Makefile

@@ -1,33 +1,34 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2018 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=631e61b7ab5d86f2f4c86756a117badff9fb0f2c
-
+PKG_VERSION:=0.3
+PKG_SOURCE_VERSION:=afbfc4e8976fbcf9d4284338289d9d143664caa6
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_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)
+PKG_BUILD_PARALLEL:=1
 
 
 
@@ -41,7 +42,7 @@ define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
+  DEPENDS:= +libubox +ubus +libpicoevent +bcmkernel @TARGET_HAS_VOICE
 endef
 
 define Package/endptmngr/description

fatrace/Makefile

@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2006-2010 OpenWrt.org
 #
-# This is free software, licensed under the GNU General Public License v2.
+# This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
 
@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 #PKG_BUILD_PARALLEL:=1
 

gigaset-elements/.gitignore

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

gigaset-elements/Makefile

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

gryphon-led-module/Makefile

@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  PKG_LICENSE:=Genexis
+  PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
 

gryphon-led-module/src/sk9822.h

@@ -22,7 +22,7 @@
 #include <linux/types.h>
 
 #define SK9822_DEFAULT_NUM_LEDS 32 // U16, used if DT param fails
-#define SK9822_DEFAULT_BRIGHTNESS 1  // 5-bit brightness, 0-31
+#define SK9822_DEFAULT_BRIGHTNESS 15  // 5-bit brightness, 0-31
 
 typedef struct {
 	uint8_t b;

ice-client/Config.in

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

ice-client/files/ice-client.uci_default

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

icgroupd/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 Inteno Broadband AB
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.

icwmp/Config_cwmp.in

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

icwmp/Config_datamodel.in

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

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-05-21
+PKG_VERSION:=4.0-2020-05-08
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3ae6954f55e90a339561719a0328c0cf3a4b018c
+PKG_SOURCE_VERSION:=d0eae460525c9dc735b12649ea338d1b81dc44bb
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -30,46 +32,53 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libdatamodel
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-endef
-
 define Package/icwmp_stun
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 stun Client
-	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 stun Client
+  DEPENDS:=+PACKAGE_icwmp_stun:libubus +PACKAGE_icwmp_stun:libuci +PACKAGE_icwmp_stun:libubox +PACKAGE_icwmp_stun:libjson-c +PACKAGE_icwmp_stun:libopenssl +PACKAGE_icwmp_stun:libblobmsg-json
 endef
 
 define Package/icwmp_xmpp
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 xmpp feature
-	DEPENDS:=+libuci +libubox +libexpat +libstrophe
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 xmpp feature
+  DEPENDS:=+PACKAGE_icwmp_xmpp:libuci +PACKAGE_icwmp_xmpp:libubox +PACKAGE_icwmp_xmpp:libexpat +PACKAGE_icwmp_xmpp:libstrophe
 endef
 
 define Package/icwmp_twamp
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 twamp feature
-	DEPENDS:=+libuci
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 twamp feature
+  DEPENDS:=+PACKAGE_icwmp_twamp:libuci
 endef
 
 define Package/icwmp_udpechoserver
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 udpechoserver feature
-	DEPENDS:=+libuci
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 udpechoserver feature
+  DEPENDS:=+PACKAGE_icwmp_udpechoserver:libuci
+endef
+
+define Package/icwmp_bulkdata
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 BulkData Collection
+  DEPENDS:=+PACKAGE_icwmp_bulkdata:libubus +PACKAGE_icwmp_bulkdata:libuci +PACKAGE_icwmp_bulkdata:libubox +PACKAGE_icwmp_bulkdata:libjson-c +PACKAGE_icwmp_bulkdata:libcurl +PACKAGE_icwmp_bulkdata:curl +PACKAGE_icwmp_bulkdata:libblobmsg-json +PACKAGE_icwmp_bulkdata:libbbfdm
+endef
+
+define Package/icwmp-tr098
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=CWMP client for TR-098 Data Model
+  DEPENDS:=+PACKAGE_icwmp-tr098:libuci +PACKAGE_icwmp-tr098:libmicroxml +PACKAGE_icwmp-tr098:libubox +PACKAGE_icwmp-tr098:jshn +PACKAGE_icwmp-tr098:libubus +PACKAGE_icwmp-tr098:libblobmsg-json +PACKAGE_icwmp-tr098:libpthread +PACKAGE_icwmp-tr098:ubusd +PACKAGE_icwmp-tr098:shflags +PACKAGE_icwmp-tr098:getopt +PACKAGE_icwmp-tr098:zlib +PACKAGE_icwmp-tr098:libjson-c +PACKAGE_icwmp-tr098:libopenssl +PACKAGE_icwmp-tr098:curl +PACKAGE_icwmp-tr098:libcurl +PACKAGE_icwmp-tr098:libtr098
 endef
 
 define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl +libtrace +libdatamodel
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm
 endef
 
 define Package/icwmp/description
@@ -79,25 +88,21 @@ endef
 define Package/icwmp-curl
   $(call Package/icwmp/Default)
   TITLE+= (using libcurl)
-  DEPENDS+= +libcurl
+  DEPENDS+= +PACKAGE_icwmp-curl:libcurl
   VARIANT:=curl
 endef
 
 define Package/icwmp-zstream
   $(call Package/icwmp/Default)
   TITLE+= (using libzstream)
-  DEPENDS+= +libzstream
+  DEPENDS+= +PACKAGE_icwmp-zstream:libzstream
   VARIANT:=zstream
 endef
 
-define Package/icwmp-zstream/config
+define Package/icwmp-curl/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef
 
-define Package/libdatamodel/config
-	source "$(SOURCE)/Config_datamodel.in"
-endef
-
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare
@@ -105,15 +110,39 @@ define Build/Prepare
 endef
 endif
 
-ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_CFLAGS += -DEX400
-endif
-
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
+ifeq ($(CONFIG_PACKAGE_icwmp-tr098),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_tr098
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_xmpp),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_xmpp
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_stun),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_stun
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_udpechoserver),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_udpechoserver
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_twamp),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_twamp
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_bulkdata),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_bulkdata
+endif
+
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -131,16 +160,6 @@ CONFIGURE_ARGS += \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
 	
-ifeq ($(CONFIG_UPNP_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-upnptr064
-endif
-	
-ifeq ($(CONFIG_XMPP_ENABLE),y)
-CONFIGURE_ARGS += \
-	--enable-xmpp
-endif
-	
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \
@@ -172,23 +191,17 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/libdatamodel/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
-endef
-
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/icwmpd $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/90-cwmpfirewall
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/* $(1)/etc/uci-defaults/
 ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
 	$(INSTALL_DIR) $(1)/usr/share/icwmp
 	$(CP) $(PKG_BUILD_DIR)/scripts/defaults $(1)/usr/share/icwmp
@@ -199,6 +212,11 @@ endif
 	$(CP) ./files/* $(1)/
 endef
 
+define Package/icwmp-tr098/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
+endef
+
 define Package/icwmp_stun/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
@@ -215,6 +233,7 @@ define Package/icwmp_xmpp/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
+	$(CP) ./xmpp-files/* $(1)/
 endef
 
 define Package/icwmp_udpechoserver/install
@@ -235,17 +254,15 @@ define Package/icwmp_twamp/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
 endef
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
-	$(CP) $(PKG_BUILD_DIR)/dm/*.h $(1)/usr/include/libdatamodel
-	$(CP) $(PKG_BUILD_DIR)/dm/dmtree/common/root.h $(1)/usr/include/libdatamodel
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.a $(1)/lib
+define Package/icwmp_bulkdata/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_bulkdatad $(1)/usr/sbin/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_bulkdatad $(1)/etc/init.d/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
 endef
 
-
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -265,11 +282,11 @@ define Package/icwmp-$(BUILD_VARIANT)/prerm
 	exit 0
 endef
 
-
 $(eval $(call BuildPackage,icwmp-curl))
-$(eval $(call BuildPackage,libdatamodel))
 $(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp_twamp))
-$(eval $(call BuildPackage,icwmp-zstream))
+$(eval $(call BuildPackage,icwmp_bulkdata))
+$(eval $(call BuildPackage,icwmp-tr098))
+#$(eval $(call BuildPackage,icwmp-zstream))

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

icwmp/files/etc/uci-defaults/85-cwmp-set-userid

@@ -0,0 +1,24 @@
+
+# Copy defaults by the factory to the cwmp UCI user section.
+
+
+# Get factory base MAC.
+baseMac=$(db -q get hw.board.basemac)
+
+# Erase colon and space characters.
+baseMac=${baseMac//:/}
+baseMac=${baseMac// /}
+
+# Caseing and fixed length string.
+mac=$(printf "%12.12X" $((0x$baseMac)))
+
+# Get system serial number.
+serial=$(db -q get hw.board.serial_number)
+
+uci -q batch <<-EOF
+	set cwmp.acs.userid="${mac:0:6}-${serial}"
+	set cwmp.cpe.userid="${mac:0:6}-${serial}"
+EOF
+
+
+# No need for commit here, it is done by uci_apply_defaults().

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

@@ -41,4 +41,14 @@ set_cwmp_reqopts() {
 	fi
 }
 
+regenerate_ssl_link(){
+	local cert_dir="/etc/ssl/certs"
+	local all_file=$(ls $cert_dir/*.pem)
+	for cfile in $all_file
+	do
+		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
+	done
+}
+
 set_cwmp_reqopts
+regenerate_ssl_link

icwmp/xmpp-files/etc/hotplug.d/iface/91-icwmp_xmpp

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+[ -f /etc/config/cwmp_xmpp ] || exit 0
+
+[ "$ACTION" == "ifup" ] || exit 0
+[ "$INTERFACE" == "loopback" ] && exit 0
+
+local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
+
+local islan="$(uci -q get network.$INTERFACE.is_lan)"
+[ "$islan" == "1" ] && exit 0
+
+local proto="$(uci -q get network.$INTERFACE.proto)"
+[ "$proto" == "none" ] && exit 0
+
+local ifname="$(uci -q get network.$INTERFACE.ifname)"
+[ "${ifname:0:1}" == "@" ] && exit 0
+
+/etc/init.d/icwmp_xmppd reload &
+

ieee1905/Config.in

@@ -0,0 +1,38 @@
+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_SPEED_UP_DISCOVERY
+		bool "Speed up discovery of an AL in network"
+		default y
+
+	config IEEE1905_DO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
+		bool "Do not accept M1/M2 messages from unknown AL(s)"
+		default y
+
+	choice
+		prompt "Select ALME support"
+		default IEEE1905_ALME_OVER_UBUS
+
+		config IEEE1905_ALME_OVER_UBUS
+			bool "ALME methods supported over ubus"
+
+		config IEEE1905_ALME_OVER_TCP
+			bool "ALME server over TCP port"
+
+	endchoice
+
+	config IEEE1905_REGISTER_EXTENSION_BBF
+		bool "Enable BBF extensions"
+		default n
+
+endmenu
+endif

ieee1905/Makefile

@@ -0,0 +1,135 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ieee1905
+PKG_VERSION:=2.0.15
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=223e41d6d21ba519b8c14c9f6a4e65c57dc5cda2
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ieee1905
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=IEEE1905 daemon
+  DEPENDS:= +libuci +libjson-c +lib1905al +lib1905ubus
+endef
+
+define Package/ieee1905/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/ieee1905/description
+ IEEE1905 stack with extended functionalities.
+endef
+
+define Package/lib1905al
+  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
+endef
+
+define Package/lib1905hle
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=IEEE1905 hle stack library
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-D_GNU_SOURCE \
+	-fstrict-aliasing \
+	-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
+ifeq ($(CONFIG_IEEE1905_DO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS),y)
+TARGET_CFLAGS += -DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
+endif
+ifeq ($(CONFIG_IEEE1905_ALME_OVER_TCP),y)
+TARGET_CFLAGS += -DALME_OVER_TCP
+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
+endif
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/ieee1905/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/ieee1905/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/usr/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/etc/init.d/ieee1905 $(1)/etc/init.d/ieee1905
+	$(INSTALL_DATA) ./files/etc/config/ieee1905 $(1)/etc/config/ieee1905
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ieee1905d $(1)/usr/sbin/
+endef
+
+define Package/lib1905hle/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/lib1905hle.so $(1)/usr/lib/lib1905hle.so
+endef
+
+define Package/lib1905al/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
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/lib1905al
+	$(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)/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
+endef
+
+$(eval $(call BuildPackage,lib1905al))
+$(eval $(call BuildPackage,lib1905ubus))
+$(eval $(call BuildPackage,lib1905hle))
+$(eval $(call BuildPackage,ieee1905))

ieee1905/files/etc/config/ieee1905

@@ -0,0 +1,20 @@
+config 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
+
+config al-iface
+        option enabled '0'
+        option ifname 'br-lan'
+        option media 'bridge'

ieee1905/files/etc/init.d/ieee1905

@@ -0,0 +1,311 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/ieee1905d
+AL_CONF=/tmp/ieee1905.config
+INTERFACE=""
+
+validate_ieee1905_section()
+{
+	uci_validate_section ieee1905 ieee1905 "${1}" \
+		'debug:bool:false' \
+		'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
+
+	validate_ieee1905_section ${1} || {
+		echo "Validation of ieee1905 section failed"
+		exit 1;
+	}
+
+	if [ ${debug} -eq 1 ]; then
+		# Forward stdout of the command to logd
+		procd_set_param stdout 1
+		# Same for stderr
+		procd_set_param stderr 1
+	fi
+
+	if [ ${enabled} -ne 1 ]; then
+		exit 0;
+	fi
+}
+
+configure_network() {
+	[ -f ${AL_CONF} ] && rm ${AL_CONF}
+
+	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_network
+	# procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "network"
+	procd_add_reload_trigger "wireless"
+	procd_add_reload_trigger "netmode"
+}

ifbt/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ifbt
-PKG_VERSION:=0.1
+PKG_VERSION:=0.3
 
-PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
+PKG_SOURCE_VERSION:=c9a7db18b15a59b03b756d00a0a630e98d9541c5
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
 
@@ -16,6 +16,9 @@ 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)

ifsi/Makefile

@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2015 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifsi
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-LDFLAGS+= \
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-		-Wl,-rpath-link=$(STAGING_DIR)/lib
-
-define Package/ifsi
-  CATEGORY:=Utilities
-  DEPENDS:=+ubus +libubox
-  TITLE:=Inteno Functional Script Interface
-endef
-
-define Package/ifsi/description
-	Inteno Functional Script Interface
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Package/ifsi/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifsi $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ifsi))

ifsi/src/Makefile

@@ -1,17 +0,0 @@
-CC		= gcc
-CFLAGS		= -g -Wall
-LOCLIBS		= 
-LIBS		= -lubus -lubox -lblobmsg_json
-OBJS		= ifsi.o
-SRCS		= ifsi.c
-LIBSRCS		= 
-ISRCS		= 
-
-all: ifsi
-
-ifsi: ${OBJS}
-	${CC} ${LDFLAGS} ${LIBSRCS} -o ifsi ${OBJS} ${LIBS}
-
-clean:
-	rm -f ifsi *.o
-

ifsi/src/ifsi.c

@@ -1,74 +0,0 @@
-/*
- * ifsi -- Inteno functional script interface
- *
- * Copyright (C) 2012-2013 Inteno Broadband Technology AB. All rights reserved.
- *
- * Author: dev@inteno.se
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <unistd.h>
-
-#include <libubox/blobmsg.h>
-#include <libubox/blobmsg_json.h>
-#include <libubox/uloop.h>
-
-#include <libubus.h>
-
-static struct ubus_context *ctx;
-static struct ubus_event_handler event_listener;
-static struct blob_buf b;
-
-
-static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev,
-			  const char *type, struct blob_attr *msg)
-{
-	char *str;
-	uint32_t id;
-
-	str = blobmsg_format_json(msg, true);
-	fprintf(stdout, "I got %s event %s\n", type, str);
-	free(str);
-}
-
-int main(int argc, char **argv)
-{
-	const char *ubus_socket = NULL;
-	int ret;
-
-	uloop_init();
-
-	ctx = ubus_connect(ubus_socket);
-	if (!ctx) {
-		fprintf(stderr, "Failed to connect to ubus\n");
-		return 1;
-	}
-
-	ubus_add_uloop(ctx);
-
-	event_listener.cb = receive_event;
-	ret = ubus_register_event_handler(ctx, &event_listener, "*");
-	if (ret)
-		fprintf(stderr, "Couldn't register to router events\n");
-
-	uloop_run();
-
-	ubus_free(ctx);
-	uloop_done();
-
-	return 0;
-}
-

imonitor/Makefile

@@ -18,6 +18,9 @@ PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 

inbd/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
+PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 
@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 

inotify-tools/Makefile

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

inotify-tools/files/usr/bin/iop_write_monitor

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

iop/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2019 iopsys
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=iop
 PKG_VERSION:=1.0
 PKG_RELEASE:=0
+PKG_LICENSE:=GPLv2
 
 include $(INCLUDE_DIR)/package.mk
 

iop/config

@@ -14,12 +14,13 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=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_ifbt=m
+CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_iopupgrade=y
 CONFIG_PACKAGE_ip-full=y
@@ -31,46 +32,20 @@ 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-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_libffmpeg-mini=m
 CONFIG_PACKAGE_libgmp=y
 CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_loop-detector=m
-CONFIG_PACKAGE_minidlna=y
+CONFIG_PACKAGE_minidlna=m
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
@@ -78,6 +53,7 @@ CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=y
+CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_odhcp6c=y
 CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y
@@ -86,7 +62,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
@@ -100,20 +75,20 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rsync=y
 CONFIG_PACKAGE_rulengd=y
-CONFIG_PACKAGE_samba3=y
-CONFIG_PACKAGE_samba3-nmbd=y
-CONFIG_PACKAGE_snmpd=y
+CONFIG_PACKAGE_samba3=m
+CONFIG_PACKAGE_samba3-nmbd=m
 CONFIG_PACKAGE_strace=y
 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
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
+CONFIG_PACKAGE_uspd=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_libwifi=y
@@ -123,7 +98,6 @@ CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
 CONFIG_TARGET_CUSTOMER="IOPSYS"
-CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
@@ -179,6 +153,18 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_PAM is not set
 # CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
+CONFIG_BUSYBOX_CONFIG_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
@@ -188,5 +174,28 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"
+CONFIG_LOCALMIRROR="http://download.iopsys.eu/iopsys/mirror/"
+
+# Generation of /etc/banner.
+CONFIG_IMAGEOPT=y
+CONFIG_VERSIONOPT=y
+CONFIG_VERSION_MANUFACTURER="iopsysWrt"
+CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
+
+# Disable as much as possible of OpenWrt messy "pre-init" stuff.
+CONFIG_PREINITOPT=y
+# CONFIG_TARGET_PREINIT_SUPPRESS_STDERR is not set
+CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y
+CONFIG_TARGET_PREINIT_TIMEOUT=1
+# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set
+# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set
+CONFIG_TARGET_PREINIT_IFNAME=""
+CONFIG_TARGET_PREINIT_IP=""
+CONFIG_TARGET_PREINIT_NETMASK=""
+CONFIG_TARGET_PREINIT_BROADCAST=""
+
+# The urandom-seed package is very strange. It seeds urandom with urandom...
+# Disable it. Most SoCs nowadays has HW random generators anyway.
+# CONFIG_PACKAGE_urandom-seed is not set
+# CONFIG_PACKAGE_urngd is not set
 

iop/scripts/extract_core.sh

@@ -6,13 +6,9 @@ function extract_core {
 	topdir=$(pwd)
 
 	# Paths to packages that should be exported.
-	paths+='package/network/services/dnsmasq '
 	paths+='package/network/config/firewall '
 	paths+='package/network/config/netifd '
-	paths+='package/network/config/qos-scripts '
 	paths+='package/utils/busybox '
-	paths+='package/base-files '
-	paths+='package/system/procd '
 	paths+='package/system/rpcd '
 	paths+='package/network/services/openvpn '
 
@@ -24,7 +20,13 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		echo "  -r feeds/lede_core"
+		echo "  -r feeds/openwrt_core"
+		echo "  -b devel"
+		echo ""
+		echo "Extract all default packages:"
+		echo "$0 extract_core"
+		echo "  -p default"
+		echo "  -r feeds/openwrt_core"
 		echo "  -b devel"
 	}
 

iop/scripts/feeds_update.sh

@@ -28,7 +28,7 @@ function feeds_update {
 
     # replace core packages with iopsys versions
     if [ $override == 1 ]; then
-		./scripts/feeds install -f -p lede_core -a
+		./scripts/feeds install -f -p openwrt_core -a
     fi
 
     # targets need to be installed explicitly

iop/scripts/genconfig.sh

@@ -139,7 +139,6 @@ function genconfig {
 		DEVELOPER=1
 
 		bcmAllowed=0
-		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
@@ -150,7 +149,6 @@ function genconfig {
 		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
-		git ls-remote git@private.inteno.se:ice-client.git -q -q 2>/dev/null && iceAllowed=1
 	}
 
 	v() {
@@ -232,18 +230,20 @@ function genconfig {
 
 	setup_dirs()
 	{
-		if git ls-remote $CUSTREPO -q 2>/dev/null; then
-			if [ ! -d "$CUSTPATH" ]; then
-				git clone "$CUSTREPO" "$CUSTPATH"
-			elif [ $IMPORT -eq 1 ]; then
-				cd $CUSTPATH
-				v "git pull"
-				git pull
-				cd - >/dev/null #go back
+		git remote -v | grep -q http || {
+			if git ls-remote $CUSTREPO -q 2>/dev/null; then
+				if [ ! -d "$CUSTPATH" ]; then
+					git clone "$CUSTREPO" "$CUSTPATH"
+				elif [ $IMPORT -eq 1 ]; then
+					cd $CUSTPATH
+					v "git pull"
+					git pull
+					cd - >/dev/null #go back
+				fi
+			else
+				echo "You do not have access to $CUSTREPO"
 			fi
-		else
-			echo "You do not have access to $CUSTREPO"
-		fi
+		}
 
 		if [ ! -d "$FILEDIR" ]; then
 			mkdir -p $FILEDIR
@@ -346,6 +346,8 @@ function genconfig {
 		# 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 Pckage source tree override if selected
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
@@ -356,7 +358,6 @@ function genconfig {
 			# rewrite url to clone with ssh instead of http
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
 			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
-			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
 			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
@@ -364,7 +365,6 @@ function genconfig {
 		else
 			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
-			echo "CONFIG_ICE_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
 			echo "CONFIG_MEDIATEK_OPEN=y" >> .config

iop/scripts/genconfig_min.sh

@@ -0,0 +1,381 @@
+#!/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"
+
+	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
+
+		[ -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)
+
+	    if [ "$profile" == "LIST" ]; then
+			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips; 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
+
+	}
+
+	v() {
+		[ "$VERBOSE" -ge 1 ] && echo "$@"
+	}
+
+	usage() {
+		echo
+		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
+		echo
+		echo -e "  -v|--verbose\t\tVerbose"
+		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 which use TARGET_DEVICES
+		if [ "$target" = "intel_mips" ]; then
+			subtarget="xrx500"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+			device=$(echo $BOARDTYPE | tr a-z A-Z)
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		else
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
+		fi
+
+		echo "$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"		CUSTREPO="${CUSTREPO:-}"
+
+					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
+
+			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
+			-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,30 +59,20 @@ build_endptmngr_consumer() {
 	cd "$curdir"
 }
 
-build_ice_consumer() {
-	# create ice-client open version tar file
-	local iceversion icebasever icerelease icecommith
-	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/ice-client/Makefile | head -1 | cut -d'=' -f2)
-	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
-	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
-	iceversion=$icebasever$icerelease
-	[ -n "$target" -a -n "$iceversion" -a -n "$icecommith" ] || return
-	ssh $SERVER "test -f $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
-	cd ./build_dir/target-*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
-	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	scp -pv ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
-	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
-	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	cd "$curdir"
-}
-
 build_wifilife_consumer() {
+	local target="$1"
 	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-*
+	if [ "$target" == "iopsys-ramips" ]; then
+		cd ./build_dir/target-mipsel_1004kc_musl/wifilife-$ver/ipkg-*
+	elif [ "$target" == "iopsys-brcm63xx-arm" ]; then
+		cd ./build_dir/target-arm_xscale_musl_eabi/wifilife-$ver/ipkg-*
+	else
+		return
+	fi
 	mkdir -p wifilife-$ver/src
 	cp -rf wifilife/usr/sbin/* wifilife-$ver/src/
 	tar Jcf wifilife-${target}-${ver}_${commit}.tar.xz wifilife-$ver
@@ -94,27 +84,18 @@ build_wifilife_consumer() {
 }
 
 build_mediatek_kernel() {
-	local mediatek_commit kernel_version kernel
+	local mediatek_commit kernel
 
 	mediatek_commit=$(grep CONFIG_KERNEL_GIT_COMMIT .config | cut -d '=' -f2 | tr -d '"')
-	kernel_version=$(grep KERNEL_PATCHVER target/linux/iopsys-ramips/Makefile  | cut -d '=' -f2)
-	kernel=linux-${kernel_version}.*
+	kernel=linux-git*
 	[ -n "$mediatek_commit" ] || return
 	ssh $SERVER "test -f $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
 	echo "Building mediatek kernel tarball from kernel commit:"	
 	echo $mediatek_commit
-	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/$kernel
-
-	# Save Kconfig files to recreate the same kernel config,
-	# delete everyting else.
-	find drivers/net/wireless/mt_wifi -type f ! -name Kconfig | xargs rm
-	find drivers/net/wireless/rlt_wifi -type f ! -name Kconfig | xargs rm
+	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/linux-git*
 
 	# remove git repo
 	rm -rf .git
-
-	# patch kernel for openstk
-	ls consumer_release | while read line; do patch -p1 < consumer_release/$line; done
 	cd ..
 
 	tar -czv $kernel -f mediatek-kernel-open-$mediatek_commit.tar.gz
@@ -122,6 +103,26 @@ build_mediatek_kernel() {
 	cd "$curdir"
 }
 
+build_mediatek_wifi_consumer() {
+	local ver commit
+	local chip=$1
+
+	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-*
+	mkdir -p mtk${chip}e-$ver/src
+	cp -rf kmod-mtk${chip}e/etc mtk${chip}e-$ver/src/
+	cp -rf kmod-mtk${chip}e/lib mtk${chip}e-$ver/src/
+	tar Jcf mtk${chip}e-${ver}_${commit}.tar.xz mtk${chip}e-$ver
+	scp -pv mtk${chip}e-${ver}_${commit}.tar.xz $SERVER:$FPATH/
+	cp mtk${chip}e-${ver}_${commit}.tar.xz $curdir/
+	rm -rf mtk${chip}e-$ver
+	rm -f mtk${chip}e-${ver}_${commit}.tar.xz
+	cd "$curdir"
+}
+
 function print_usage {
 	echo "Usage: $0 generate_tarballs"
 	echo "  -t <target>"
@@ -129,14 +130,14 @@ function print_usage {
 
 function generate_tarballs {
 
-    SERVER="god@software.inteno.se"
-    FPATH="/var/www/html/iopsys/consumer"
+    SERVER="god@download.iopsys.eu"
+    FPATH="/var/www/html/iopsys/opensdk"
 
     set -e
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
     target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
-    board=$(grep CONFIG_TARGET_IBOARDID .config | cut -d'=' -f2 | tr -d '"')
+    board=$(grep CONFIG_TARGET_FAMILY .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
     majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
     minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
@@ -169,12 +170,12 @@ function generate_tarballs {
 		build_bcmkernel_consumer
 		build_natalie_consumer
 		build_endptmngr_consumer
-		build_ice_consumer
-		build_wifilife_consumer
+		build_wifilife_consumer "$target"
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel
-		build_ice_consumer		
-		build_wifilife_consumer
+		build_mediatek_wifi_consumer 7603
+		build_mediatek_wifi_consumer 7615
+		build_wifilife_consumer "$target"
 	else
 		echo "Invalid target: $stk_target"
 		print_usage

iop/scripts/install_key.sh

@@ -9,8 +9,7 @@ function install_key {
 
     echo "::sysinit:/etc/init.d/rcS S boot" >files/etc/inittab
     echo "::shutdown:/etc/init.d/rcS K shutdown" >>files/etc/inittab
-    echo "tty/0::askfirst:/bin/ash --login" >>files/etc/inittab
-    echo "console::askfirst:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
+    echo "console::askconsolelate:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
 
     echo Done
 }

iop/scripts/licenses_gen.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+function license_report {
+    LICDIR="/tmp/licenses-generator/"
+    LICBIN="${LICDIR}/bin"
+
+
+    dpkg -s python3 python3-requests python3-yaml python3-mako python3-six &> /dev/null
+    if [ $? -ne 0 ]
+        then
+            echo "Missing dependencies"
+            sudo apt-get update
+            sudo apt-get install python3 python3-requests python3-yaml python3-mako python3-six
+
+        else
+            echo    "Dependecy check passed"
+    fi
+
+
+if [ -d "$LICDIR" ]; then
+  ### Take action if $DIR exists ###
+  echo "Creating json licences file and html formated report"
+else
+  ###  Control will jump here if $DIR does NOT exists ###
+  echo "Error: licenses-generator not found. getting from iopsys repo"
+  git clone git@dev.iopsys.eu:iopsys/licenses-generator.git $LICDIR
+fi
+  LICGET=`${LICBIN}/licenses-generator  gen-License bin/`
+  echo $LICGET
+  ${LICBIN}/licenses-generator gen-licrprt $LICGET
+exit 0
+
+}
+
+
+register_command "license_report" "Generate a Licence report on latest build in json format and html under reports"

iopupgrade/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2019 iopsys
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 

iopupgrade/files/sbin/iopu

@@ -25,6 +25,7 @@ log_stdout=1		# set to 0 to prevent the log to also print to stdout
 upd_noreboot=0		# set to 1 if we should not reboot after programming
 upd_forceimage=0	# set this to force upgrade even if image is for wrong board.
 upd_forceboot=0		# set this to force upgrade of boot loader
+upd_keepconfig=0	# set this to keep the current configuration.
 ###############################################################################
 # import external functions
 source /lib/upgrade/iopsys.sh
@@ -51,25 +52,41 @@ function log {
 # anyhting it calls as stdout/stderr might no longer exist
 function finish {
 
-    if [ "$run_cleanup" == "1" ]
+    if [ $run_cleanup -eq 1 ]
     then
 
 	function_call upd_cleanup
+	run_cleanup=0
 	log ""
     fi
 
-    if [ "$run_mount_cleanup" == "1" ]
+    if [ $run_mount_cleanup -eq 1 ]
     then
 	log "Cleaning up after mount"
 	umount_newroot
     fi
     # always kill the timeout process, will leave the sleep but that is harmless
     # as long as the kill will nerver be run.
-    kill $TIMEOUT_PID 2>/dev/null
+    if [ -n "$TIMEOUT_PID" ]; then
+        kill $TIMEOUT_PID 2>/dev/null
+        TIMEOUT_PID=""
+    fi
 
     lock -u /tmp/iopu.lock
 }
 
+function ctrl_c {
+
+    # on ctrl-c we remove the exit handler as it is called directly.
+    trap - EXIT
+
+    # call cleanup function
+    finish
+
+    # do not continue program
+    exit 1
+}
+
 function sig_pipe {
     log_stdout=0  # stdin,stdout,stderr do not exist anymore
     log "Got sigpipe. Turning of log printing to stdout"
@@ -77,7 +94,6 @@ function sig_pipe {
 
 # if a timout happens terminate
 function timeout {
-    finish
     exit 1
 }
 
@@ -133,6 +149,7 @@ function umount_newroot {
     umount /tmp/newroot_overlay/rom
     umount /tmp/newroot_overlay
     umount /tmp/newroot
+    rmdir /tmp/newroot_overlay /tmp/newroot
     run_mount_cleanup=0
 }
 
@@ -141,11 +158,23 @@ function usage {
     echo ""
     echo "opts:"
     echo ""
-    echo "	-n	Do not do the final reboot of the target board"
-    echo "	-c	Keep configuration"
-    echo "	-x	Force install even if firmware is not for this board"
-    echo "	-b	Force install of bootloader regardless of version installed"
-    echo "	-r	Jump into chroot env of other system"
+    echo "	-n		Do not do the final reboot of the target board"
+    echo "	-c		Keep configuration"
+    echo "	-x		Force install even if firmware is not for this board"
+    echo "	-b		Force install of bootloader regardless of version installed"
+    echo "	-r		Jump into chroot env of other system"
+    echo "	-C \"command\"	Execute command in chroot env of other system"
+}
+
+# Execute command in newroot(other system root)
+function newroot_exec {
+
+    upd_vol=$(get_flashbank_next)
+    mount_newroot
+    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay "$@")
+    echo ""
+    umount_newroot
+
 }
 
 ###############################################################################
@@ -161,10 +190,11 @@ then
 fi
 
 trap finish EXIT
+trap ctrl_c INT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE
 
-while getopts "nrxb" opt; do
+while getopts "nrxbhcC:" opt; do
     case $opt in
 	n)
 	    upd_noreboot=1
@@ -175,16 +205,19 @@ while getopts "nrxb" opt; do
 	b)
 	    upd_forceboot=1
 	    ;;
+	c)
+	    upd_keepconfig=1
+	    ;;
 	r)
-	    upd_vol=$(get_flashbank_next)
-	    mount_newroot
-	    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay /bin/sh)
-	    echo ""
-	    umount_newroot
-	    exit 0
+	    newroot_exec /bin/sh
+	    exit
+	    ;;
+	C)
+	    newroot_exec "${OPTARG}"
+	    exit
 	    ;;
 	h)
-	    upd_usage
+	    usage
 	    exit 1
 	    ;;
     esac
@@ -193,8 +226,7 @@ done
 # put a timeout on this if it takes longer than 120 seconds we should abort
 # and clean up
 (
-sleep 120	# if 2 minutes pass
-kill -ALRM $$	2>/dev/null # send it a SIGALRM signal
+	sleep 120 && kill -ALRM $$ 2>/dev/null		# send it a SIGALRM signal
 )&
 TIMEOUT_PID=$!
 
@@ -211,7 +243,7 @@ fi
 cur_vol=$(get_flashbank_current)
 upd_vol=$(get_flashbank_next)
 
-# convert volume name "rootfs_$upd_vol" into ubifs volume id
+# convert volume name "rootfs_$upd_vol" into ubi volume id
 upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
 log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
 
@@ -227,29 +259,32 @@ function_call upd_conf_kernel
 log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
 run_cleanup=1	# When we start to actually write data there might be some
 		# things that need cleanup if we get an error/crash
-iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id
-
-# in case of any error we abort
-if [ $? -ne 0 ]; then
-    log "iopupgrade program Failed"
-    exit 1
+if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; then
+	log "iopupgrade program Failed"
+	exit 1
 fi
 
 log "Firmware programmed to flash."
 
-
-log "Transfering configuration to new system."
-
 # Force upgrade of boot loader
 [ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
 
+if [ $upd_keepconfig -eq 1 ]; then
+	log "Transfering configuration to new system."
+	chroot_cmdline="$chroot_cmdline -c"
+fi
+
 mount_newroot
-chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline
+if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
+	log "Configuration migration failed!"
+	exit 1
+fi
 umount_newroot
 
-log "Update fully installed."
+log "New firmware fully installed."
 run_cleanup=0
 
+
 # Now make sure that we actually boot the new system on the next reboot
 upd_finnish
 
@@ -271,8 +306,3 @@ else
 fi
 
 
-
-
-
-
-

iopupgrade/files/sbin/iopu_chroot

@@ -14,6 +14,7 @@
 # by functions declared in this script
 upd_forceboot=0
 log_stdout=1		# set to 0 to prevent the log to also print to stdout
+upd_keepconfig=0	# set this to keep the current configuration.
 
 ###############################################################################
 # import external functions
@@ -24,33 +25,36 @@ source /lib/upgrade/iopsys.sh
 
 # only call function if it exists
 function_call() {
-    if type "$1" 2>/dev/null >/dev/null
-    then
-	$1 $@
-    fi
+	if [ -n "$1" ] && type "$1" 2>/dev/null >/dev/null
+	then
+		$1 "$@" || exit
+	fi
 }
 # Cleanup and error handling functions.
 function log {
-    TIME=$(date)
-    [ $log_stdout -eq 1 ] && echo "$@"
-    echo "[$TIME] $@" >>/root/upd_log
+	TIME=$(date)
+	[ $log_stdout -eq 1 ] && echo "$@"
+	echo "[$TIME] $@" >>/root/upd_log
 }
 
 
-while getopts "hb" opt; do
-    case $opt in
-	h)
-	    upd_usage
-	    exit 1
-	    ;;
-	b)
-	    upd_forceboot=1
-	    ;;
-	\?)
-	    echo "Invalid option: -$OPTARG" >&2
-	    exit 1
-	    ;;
-    esac
+while getopts "hbc" opt; do
+	case $opt in
+		h)
+			upd_usage
+			exit 1
+			;;
+		c)
+			upd_keepconfig=1
+			;;
+		b)
+			upd_forceboot=1
+			;;
+		\?)
+			echo "Invalid option: -$OPTARG" >&2
+			exit 1
+			;;
+	esac
 done
 
 # copy old install log over
@@ -59,3 +63,9 @@ cp /tmp/oldroot/tmp/upd_log /root/upd_log
 # Upgrade boot loader if needed.
 function_call upd_program_boot
 
+# Let the new upgrade do whatever it needs,
+# such as configuration migration etc.
+if [ $upd_keepconfig -eq 1 -a -x /lib/upgrade/post-rootfs-fixup ]; then
+	(/lib/upgrade/post-rootfs-fixup /dev/null /tmp/oldroot) || exit
+fi
+

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 $@

iwatchdog/Makefile

@@ -1,6 +1,9 @@
+# Copyright (C) 2019 iopsys
 #
-# Copyright (C) 2013 Inteno
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
+
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -8,6 +11,9 @@ PKG_NAME:=iwatchdog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 
@@ -22,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/iwatchdog
   CATEGORY:=Utilities
-  TITLE:=Inteno watchdog
+  TITLE:=IOPSYS watchdog
 endef
 
 define Package/iwatchdog/description

json-editor/Makefile

@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2019 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=json-editor
+PKG_RELEASE:=1.0.0
+
+PKG_SOURCE_VERSION:=44b32937a062ec4ffc9f7355841dc94ab6efa50f
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/json-editor.git
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/json-editor
+  SECTION:=base
+  CATEGORY:=Libraries
+  DEPENDS:=+libjson-c +libblobmsg-json
+  TITLE:=JSON-editor
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/src/json-editor.h $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libjson-editor.so $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,json-editor))

libcgroup/Makefile

@@ -100,6 +100,6 @@ define Package/libcgroup-utils/install
 	$(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))
+#$(eval $(call BuildPackage,libcgroup))
+#$(eval $(call BuildPackage,libcgroup-daemon))
+#$(eval $(call BuildPackage,libcgroup-utils))

libjwt/Makefile

@@ -17,6 +17,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_FIXUP:=autoreconf
 
+PKG_LICENSE:=LGPLv3
+PKG_LICENSE_FILES:=COPYING
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libjwt

libmicroxml/Makefile

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2012-2014 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:=libmicroxml
+PKG_VERSION:=2012-06-11
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://dev.freecwmp.org/microxml
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_LICENSE:=LGPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmicroxml
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=XML library
+  MAINTAINER:=Luka Perkov <luka@openwrt.org>
+endef
+
+define Package/libmicroxml/description
+ A micro sized XML library
+endef
+
+CONFIGURE_ARGS += \
+	--disable-threads \
+	--enable-static \
+	--enable-shared
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig
+endef
+
+define Package/libmicroxml/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libmicroxml))

libmicroxml/patches/100-fix-memleak.patch

@@ -0,0 +1,130 @@
+diff --git a/mxml-file.c b/mxml-file.c
+index 02eca9d..f10d202 100644
+--- a/mxml-file.c
++++ b/mxml-file.c
+@@ -363,9 +363,12 @@ mxmlSaveFile(mxml_node_t    *node,	/* I - Node to write */
+   * Write the node...
+   */
+ 
+-  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0)
++  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0){
++    global_free(global);
+     return (-1);
+-
++  }
++  
++  global_free(global);
+   if (col > 0)
+     if (putc('\n', fp) < 0)
+       return (-1);
+@@ -1448,6 +1451,7 @@ mxml_load_data(
+   if ((buffer = malloc(64)) == NULL)
+   {
+     mxml_error("Unable to allocate string buffer!");
++    global_free(global);
+     return (NULL);
+   }
+ 
+@@ -2083,11 +2087,12 @@ mxml_load_data(
+ 		 node->parent ? node->parent->value.element.name : "(null)");
+ 
+       mxmlDelete(first);
+-
++      global_free(global);
+       return (NULL);
+     }
+   }
+ 
++  global_free(global);
+   if (parent)
+     return (parent);
+   else
+@@ -2102,7 +2107,7 @@ error:
+   mxmlDelete(first);
+ 
+   free(buffer);
+-
++  global_free(global);
+   return (NULL);
+ }
+ 
+diff --git a/mxml-private.c b/mxml-private.c
+index 4378ca3..ea6e452 100644
+--- a/mxml-private.c
++++ b/mxml-private.c
+@@ -41,6 +41,32 @@
+  * This code currently supports AIX, HP-UX, Linux, Mac OS X, Solaris, and
+  * Windows.  It might work on the BSDs and IRIX, but I haven't tested that.
+  */
++void *global_mem[16] = {0};
++
++static void *global_calloc(int x, int size)
++{
++  int i;
++  void *m = calloc(x, size);
++  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i > 0; i--) {
++    global_mem[i] = global_mem[i-1];
++  }
++  global_mem[0] = m;
++  return m;
++}
++
++void global_free(void *m)
++{
++  int i;
++  if (m == NULL)
++    return;
++  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i >= 0; i--) {
++    if (global_mem[i] == m) {
++      global_mem[i] = NULL;
++      free(m);
++      break;
++    }
++  }
++}
+ 
+ #if defined(__sun) || defined(_AIX)
+ #  pragma fini(_mxml_fini)
+@@ -148,7 +174,6 @@ mxml_real_cb(mxml_node_t *node)		/* I - Current node */
+   return (MXML_REAL);
+ }
+ 
+-
+ #ifdef HAVE_PTHREAD_H			/**** POSIX threading ****/
+ #  include <pthread.h>
+ 
+@@ -190,7 +215,6 @@ _MXML_FINI(void)
+   }
+ }
+ 
+-
+ /*
+  * '_mxml_global()' - Get global data.
+  */
+@@ -205,7 +229,7 @@ _mxml_global(void)
+ 
+   if ((global = (_mxml_global_t *)pthread_getspecific(_mxml_key)) == NULL)
+   {
+-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
++    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
+     pthread_setspecific(_mxml_key, global);
+ 
+     global->num_entity_cbs = 1;
+@@ -288,7 +312,7 @@ _mxml_global(void)
+ 
+   if ((global = (_mxml_global_t *)TlsGetValue(_mxml_tls_index)) == NULL)
+   {
+-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
++    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
+ 
+     global->num_entity_cbs = 1;
+     global->entity_cbs[0]  = _mxml_entity_cb;
+diff --git a/mxml-private.h b/mxml-private.h
+index c591208..72ed338 100644
+--- a/mxml-private.h
++++ b/mxml-private.h
+@@ -43,3 +43,4 @@ typedef struct _mxml_global_s
+ extern _mxml_global_t	*_mxml_global(void);
+ extern int		_mxml_entity_cb(const char *name);
+ 
++extern void global_free(void *m);

libpicoevent/Makefile

@@ -8,12 +8,14 @@
 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:=7875222706cb6999af0361ef0aebdc85cd75c127
+PKG_SOURCE_VERSION:=f4ab03b22fca57cec6c959fb5c54bcdd64c32467
 PKG_NAME:=libpicoevent
 
+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
 

librpc/Makefile

@@ -0,0 +1,33 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=librpc
+PKG_RELEASE=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=$(LEDE_GIT)/project/librpc-uclibc.git
+PKG_SOURCE_DATE:=2015-11-04
+PKG_SOURCE_VERSION:=a921e3ded051746f9f7cd5e5a312fb6771716aac
+PKG_MIRROR_HASH:=22c8dc55e1c4e8e31635a37708a3ce622a6ca33ebd918a4321b0be6ffce89b21
+CMAKE_INSTALL:=1
+PKG_USE_MIPS16:=0
+
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/librpc
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=uClibc RPC library
+endef
+
+define Package/librpc/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/librpc.so $(1)/lib/
+endef
+
+$(eval $(call BuildPackage,librpc))

libtrace/Makefile

@@ -12,12 +12,16 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
+CXX_DEPENDS:=libstdcpp
+
 define Package/libtrace/Default
   SECTION:=net
   CATEGORY:=Network
@@ -30,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

lmbench/Makefile

@@ -15,6 +15,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/lmbench/
 PKG_MD5SUM:=b3351a3294db66a72e2864a199d37cbf
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 PKG_BUILD_DEPENDS:=librpc
 
 include $(INCLUDE_DIR)/package.mk

logrotate/Makefile

@@ -19,6 +19,9 @@ 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

loop-detector/Makefile

@@ -1,3 +1,9 @@
+# Copyright (C) 2019 iopsys
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=loop-detector
@@ -11,6 +17,9 @@ 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:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 include $(INCLUDE_DIR)/package.mk
 
 

ltq-nand/Makefile

@@ -16,6 +16,9 @@ PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/archive/
 #PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand.git
 #PKG_SOURCE_VERSION:=07b5b0331af6de4174dab2c02bf260ee9625452a
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/host-build.mk
 
 

map-1905/Makefile

@@ -0,0 +1,87 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=map-1905
+PKG_VERSION:=0.0.5
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=c525f73488a4b5da178cfc6968a9bde73cf8edb7
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/map-1905
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:= MultiAP Stack
+  DEPENDS:= +libuci +libjson-c +ubox +libpcap +libopenssl +libwifi +libeasy +libuci
+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 \
+	-fstrict-aliasing \
+	-Wall \
+	-Wextra
+
+TARGET_CFLAGS += -DSEND_EMPTY_TLVS
+TARGET_CFLAGS += -DFIX_BROKEN_TLVS
+TARGET_CFLAGS += -DSPEED_UP_DISCOVERY
+TARGET_CFLAGS += -DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
+TARGET_CFLAGS += -DALME_OVER_UBUS
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/map-1905/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/map-1905/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifimap-2.so $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/usr/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/etc/init.d/ieee1905 $(1)/etc/init.d/ieee1905
+	$(INSTALL_DATA) ./files/etc/config/ieee1905 $(1)/etc/config/ieee1905
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ieee1905d/ieee1905d $(1)/usr/sbin/
+	$(CP) $(PKG_BUILD_DIR)/ieee1905d/lib/lib1905.so $(1)/usr/lib/lib1905.so
+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
+	$(INSTALL_DIR) $(1)/usr/include
+	$(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)/libmaputils.so $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libmaputils))
+$(eval $(call BuildPackage,map-1905))

map-1905/files/etc/config/ieee1905

@@ -0,0 +1,17 @@
+config ieee1905
+        option enabled '1'
+        option debug  true
+
+config al
+        option enabled '1'
+        option basemacint 'wan'
+        option mapall 0
+      # option registrar true
+        option debug_level  2
+        option cmdu_event false
+        option map_plugin 1
+
+config al-iface
+        option enabled '1'
+        option ifname 'br-lan'
+        option media 'bridge'

map-1905/files/etc/init.d/ieee1905

@@ -0,0 +1,276 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/ieee1905d
+AL_CONF=/tmp/ieee1905.config
+INTERFACE=""
+
+validate_ieee1905_section()
+{
+	uci_validate_section ieee1905 ieee1905 "${1}" \
+		'debug:bool:false' \
+		'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'
+}
+
+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 [ "${media}" = "bridge" ]; then
+		echo "Get interfaces from bridge">/dev/console
+		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_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_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
+
+	validate_ieee1905_section ${1} || {
+		echo "Validation of ieee1905 section failed"
+		exit 1;
+	}
+
+	if [ ${debug} -eq 1 ]; then
+		# Forward stdout of the command to logd
+		# procd_set_param stdout 1
+		# Same for stderr
+		procd_set_param stderr 1
+	fi
+
+	if [ ${enabled} -ne 1 ]; then
+		exit 0;
+	fi
+}
+
+configure_network() {
+	[ -f ${AL_CONF} ] && rm ${AL_CONF}
+
+	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_network
+	# procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "network"
+	procd_add_reload_trigger "wireless"
+	procd_add_reload_trigger "netmode"
+}

mapagent/Makefile

@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2020 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mapagent
+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/mapagent
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WiFi multi-AP Agent (EasyMesh R2)
+  DEPENDS:=+libwifi +libuci +libubox +ubus
+endef
+
+define Package/mapagent/description
+ This package implements EasyMesh R2 compliant WiFi Agent.
+endef
+
+define Package/mapagent/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/mapagent/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,mapagent))

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

@@ -0,0 +1,35 @@
+#!/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
+}
+
+stop_service() {
+	service_stop $PROG_EXE
+}
+
+reload_service() {
+	stop
+	start
+}
+

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

@@ -0,0 +1,55 @@
+#!/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(){
+	section="$1"
+
+	config_get type "$section" "type"
+	if [ "$type" != "bridge" ]; then
+		return
+	fi
+
+	uci add mcast snooping
+	uci rename mcast.@snooping[-1]="msnoop_1"
+	uci set mcast.@snooping[-1].enable="0"
+	uci set mcast.@snooping[-1].proto="igmp"
+	uci set mcast.@snooping[-1].version="2"
+	uci set mcast.@snooping[-1].robustness="2"
+	uci set mcast.@snooping[-1].aggregation="0"
+	uci set mcast.@snooping[-1].interface="br-$section"
+	uci commit mcast
+}
+
+if [ -s "/etc/config/mcast" ]; then
+	if uci -q get mcast.@snooping[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
+
+config_load network
+config_foreach generate_mcast_config interface

mcastmngr/files/lib/mcast/broadcom.sh

@@ -0,0 +1,367 @@
+#!/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_iface=""
+igmp_s_exceptions=""
+
+mld_s_enable=0
+mld_s_version=2
+mld_s_robustness=2
+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_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_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_iface "$config" interface
+		config_get igmp_s_exceptions "$config" filter
+		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_iface "$config" interface
+		config_get mld_s_exceptions "$config" filter
+		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
+		config_get igmp_q_resp_interval "$config" query_response_interval
+		config_get igmp_last_mem_q_int "$config" last_member_query_interval
+		config_get igmp_fast_leave "$config" fast_leave 1
+		config_get igmp_p_robustness "$config" robustness 2
+		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
+		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
+		config_get mld_q_resp_interval "$config" query_response_interval
+		config_get mld_last_mem_q_int "$config" last_member_query_interval
+		config_get mld_fast_leave "$config" fast_leave 1
+		config_get mld_p_robustness "$config" robustness 2
+		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
+		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
+			;;
+			*)
+				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
+
+	
+	# Configure snooping related params
+	if [ "$protocol" == "igmp" ]; then
+		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_s_enable
+		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_enable
+		exceptions=$igmp_s_exceptions
+	elif [ "$protocol" == "mld" ]; then
+		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_s_enable
+		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_enable
+		exceptions=$mld_s_exceptions
+	fi
+
+	echo "${protocol}-proxy-enable 0" >> $CONFFILE
+	[ -n "$exceptions" ] && echo "${protocol}-mcast-snoop-exceptions $exceptions" >> $CONFFILE
+}
+
+configure_mcpd_proxy() {
+	local s_mode=2
+	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 $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_p_up_interfaces
+		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $s_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 $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_p_up_interfaces
+		config_snooping_on_bridge $protocol $mld_p_down_interfaces $s_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
+
+	[ -n "$exceptions" ] && echo "$protocol-mcast-snoop-exceptions $exceptions" >> $CONFFILE
+}
+
+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
+}
+
+configure_mcast() {
+	rm -f $CONFFILE
+	touch $CONFFILE
+
+	config_global_params
+
+	read_mcast_snooping_params
+	read_mcast_proxy_params
+
+	configure_mcpd
+}

mqtt-ciotc/Makefile

@@ -16,6 +16,8 @@ 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:=Apache-2.0
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mqtt-ciotc

multiwan/Makefile

@@ -11,6 +11,8 @@ PKG_NAME:=multiwan
 PKG_VERSION:=1.0.22
 PKG_RELEASE:=2
 
+PKG_LICENSE:=GPLv2
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/multiwan

natalie-dect-h/Makefile

@@ -13,9 +13,11 @@ PKG_VERSION:=12.26
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=https://dev.iopsys.eu/dialog/natalie-dect-h.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2
+PKG_SOURCE_VERSION:=f3889dc3f80bed10374f46430009aca24448bdcc
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=PROPRIETARY RTX
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/image.mk
 include $(INCLUDE_DIR)/kernel.mk

natalie-dect/Makefile

@@ -1,8 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2019 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
@@ -14,17 +11,19 @@ PKG_SOURCE_VERSION:=378c404fba3efc8f1bcde54370a5370670fa1853
 ifeq ($(CONFIG_NATALIE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+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
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
+PKG_LICENSE:=PROPRIETARY
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/image.mk
 include $(INCLUDE_DIR)/kernel.mk

ndisc/Makefile

@@ -15,6 +15,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6
 PKG_MD5SUM:=50cb4c19606cf6ff2b7388e71832f579
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk