questd: fix broken dependencies for Questd

Improved the logic to decrease the call response
Limit the logs to 100 to avoid ubus call timeout.

ated/Makefile

@@ -1,15 +1,8 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
+# Copyright (C) 2016 inteno
 #
-#
-# 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.
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
@@ -24,13 +17,9 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 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,9 +13,6 @@ 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

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

bbf/Makefile

@@ -1,120 +0,0 @@
-#
-# Copyright (C) 2021 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libbbfdm
-PKG_VERSION:=3.7.9
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3b44e4430ad4ca5735647dd69bc30d0e56218850
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-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 +libcurl
-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 and TR143 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_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)/usr/share/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-endef
-
-define Package/libbbfdm/prerm
-	#!/bin/sh
-	rm -rf /etc/bbfdm/*
-	exit 0
-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)/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

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

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

bulkdata/Makefile

@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2020 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:=bulkdata
-PKG_VERSION:=1.0.0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api
-endef
-
-define Package/$(PKG_NAME)/description
-	BBF BulkData Collection
-endef
-
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

bulkdata/files/etc/config/bulkdata

@@ -1,43 +0,0 @@
-
-config bulkdata 'bulkdata'
-	option enable '0'
-	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
-	option log_level '3'
-
-config profile
-	option profile_id '1'
-	option enable '0'
-	option name ''
-	option nbre_of_retained_failed_reports '0'
-	option protocol 'http'
-	option encoding_type ''
-	option reporting_interval '86400'
-	option time_reference '0'
-	option csv_encoding_field_separator ','
-	option csv_encoding_row_separator '
'
-	option csv_encoding_escape_character '"'
-	option csv_encoding_report_format 'column'
-	option csv_encoding_row_time_stamp 'unix'
-	option json_encoding_report_format 'objecthierarchy'
-	option json_encoding_report_time_stamp 'unix'
-	option http_url ''
-	option http_username ''
-	option http_password ''
-	option http_compression 'none'
-	option http_method 'post'
-	option http_use_date_header '1'
-	option http_retry_enable '0'
-	option http_retry_minimum_wait_interval '5'
-	option http_retry_interval_multiplier '2000'
-	option http_persist_across_reboot '0'
-
-config profile_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-
-config profile_http_request_uri_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-

bulkdata/files/etc/init.d/bulkdatad

@@ -1,34 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Bulkdata Software
-# Copyright (C) 2020 iopsys Software Solutions AB
-# Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-
-START=99
-STOP=10
-
-USE_PROCD=1
-PROG="/usr/sbin/bulkdatad"
-
-start_service() {
-	local bulkdata_enable=`uci -q get bulkdata.bulkdata.enable`
-	if [ "$bulkdata_enable" = "1" ]; then
-		procd_open_instance
-		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
-		procd_close_instance
-	fi
-}
-
-boot() {
-	start
-}
-
-reload_service() {
-	stop
-	start 
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger bulkdata
-}

bulkdata/src/Makefile

@@ -1,23 +0,0 @@
-PROG = bulkdatad
-LIB = libbulkdata.so
-
-PROG_OBJS = bulkdata.o common.o config.o http.o log.o report.o times.o buci.o
-LIB_OBJS = datamodel.o
-
-PROG_CFLAGS = $(CFLAGS) -Wall -Werror -fPIC
-PROG_LDFLAGS = $(LDFLAGS) -lubus -luci -lubox -ljson-c -lcurl -lblobmsg_json -lbbfdm -lbbf_api
-LIB_LDFLAGS = $(LDFLAGS) -lbbf_api
-
-%.o: %.c
-	$(CC) $(PROG_CFLAGS) $(FPIC) -c -o $@ $<
-
-all: $(PROG) $(LIB)
-
-$(PROG): $(PROG_OBJS)
-	$(CC) $(PROG_CFLAGS) -o $@ $^ $(PROG_LDFLAGS)
-
-$(LIB): $(LIB_OBJS)
-	$(CC) $(PROG_CFLAGS) $(LIB_LDFLAGS) -shared -o $@ $^
-
-clean:
-	rm -f *.o $(PROG) $(LIB)

bulkdata/src/buci.c

@@ -1,265 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#include <strings.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include "buci.h"
-
-struct uci_context *uci_ctx = NULL;
-
-int buci_init(void)
-{
-	uci_ctx = uci_alloc_context();
-	if (!uci_ctx) {
-		return -1;
-	}
-	return 0;
-}
-
-int buci_fini(void)
-{
-	if (uci_ctx) {
-		uci_free_context(uci_ctx);
-	}
-
-	return 0;
-}
-
-static bool buci_validate_section(const char *str)
-{
-	if (!*str)
-		return false;
-
-	for (; *str; str++) {
-		unsigned char c = *str;
-
-		if (isalnum(c) || c == '_')
-			continue;
-
-		return false;
-	}
-	return true;
-}
-
-static int buci_init_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *package, char *section, char *option, char *value)
-{
-	memset(ptr, 0, sizeof(struct uci_ptr));
-
-	/* value */
-	if (value) {
-		ptr->value = value;
-	}
-	ptr->package = package;
-	if (!ptr->package)
-		goto error;
-
-	ptr->section = section;
-	if (!ptr->section) {
-		ptr->target = UCI_TYPE_PACKAGE;
-		goto lastval;
-	}
-
-	ptr->option = option;
-	if (!ptr->option) {
-		ptr->target = UCI_TYPE_SECTION;
-		goto lastval;
-	} else {
-		ptr->target = UCI_TYPE_OPTION;
-	}
-
-lastval:
-	if (ptr->section && !buci_validate_section(ptr->section))
-		ptr->flags |= UCI_LOOKUP_EXTENDED;
-
-	return 0;
-
-error:
-	return -1;
-}
-
-struct uci_section *buci_walk_section(char *package, char *section_type, struct uci_section *prev_section)
-{
-	struct uci_ptr ptr;
-	struct uci_element *e;
-	struct uci_section *next_section;
-
-	if (section_type == NULL) {
-		if (prev_section) {
-			e = &prev_section->e;
-			if (e->list.next == &prev_section->package->sections)
-				return NULL;
-			e = container_of(e->list.next, struct uci_element, list);
-			next_section = uci_to_section(e);
-			return next_section;
-		}
-		else {
-			if (buci_init_ptr(uci_ctx, &ptr, package, NULL, NULL, NULL)) {
-				return NULL;
-			}
-			if (uci_lookup_ptr(uci_ctx, &ptr, NULL, true) != UCI_OK) {
-				return NULL;
-			}
-			if (ptr.p->sections.next == &ptr.p->sections)
-				return NULL;
-			e = container_of(ptr.p->sections.next, struct uci_element, list);
-			next_section = uci_to_section(e);
-
-			return next_section;
-		}
-	}
-	else {
-		struct uci_list *ul, *shead = NULL;
-
-		if (prev_section) {
-			ul = &prev_section->e.list;
-			shead = &prev_section->package->sections;
-		}
-		else {
-			if (buci_init_ptr(uci_ctx, &ptr, package, NULL, NULL, NULL)) {
-				return NULL;
-			}
-			if (uci_lookup_ptr(uci_ctx, &ptr, NULL, true) != UCI_OK) {
-				return NULL;
-			}
-			ul = &ptr.p->sections;
-			shead = &ptr.p->sections;
-		}
-		while (ul->next != shead) {
-			e = container_of(ul->next, struct uci_element, list);
-			next_section = uci_to_section(e);
-			if (strcmp(next_section->type, section_type) == 0)
-				return next_section;
-			ul = ul->next;
-		}
-		return NULL;
-	}
-	return NULL;
-}
-
-void buci_print_list(struct uci_list *uh, char **val, char *delimiter)
-{
-	struct uci_element *e;
-	static char buffer[512];
-	char *buf = buffer;
-	*buf = '\0';
-
-	uci_foreach_element(uh, e) {
-		if (*buf) {
-			strcat(buf, delimiter);
-			strcat(buf, e->name);
-		}
-		else {
-			strcpy(buf, e->name);
-		}
-	}
-	*val = buf;
-}
-
-struct uci_element *buci_lookup_list(struct uci_list *list, const char *name)
-{
-	struct uci_element *e;
-
-	uci_foreach_element(list, e) {
-		if (!strcmp(e->name, name))
-			return e;
-	}
-	return NULL;
-}
-
-int uci_lookup_ptr_bysection(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_section *section, char *option, char *value)
-{
-	struct uci_element *e;
-	memset(ptr, 0, sizeof(struct uci_ptr));
-
-	ptr->package = section->package->e.name;
-	ptr->section = section->e.name;
-	ptr->option = option;
-	ptr->value = value;
-	ptr->flags |= UCI_LOOKUP_DONE;
-
-	ptr->p = section->package;
-	ptr->s = section;
-
-	if (ptr->option) {
-		e = buci_lookup_list(&ptr->s->options, ptr->option);
-		if (!e)
-			return UCI_OK;
-		ptr->o = uci_to_option(e);
-		ptr->last = e;
-		ptr->target = UCI_TYPE_OPTION;
-	}
-	else {
-		ptr->last = &ptr->s->e;
-		ptr->target = UCI_TYPE_SECTION;
-	}
-
-	ptr->flags |= UCI_LOOKUP_COMPLETE;
-
-	return UCI_OK;
-}
-
-char *buci_get_value_bysection(struct uci_section *section, char *option)
-{
-	struct uci_ptr ptr;
-	char *val = "";
-
-	if (uci_lookup_ptr_bysection(uci_ctx, &ptr, section, option, NULL) != UCI_OK) {
-		return val;
-	}
-
-	if (!ptr.o)
-		return val;
-
-	if(ptr.o->type == UCI_TYPE_LIST) {
-		buci_print_list(&ptr.o->v.list, &val, " ");
-		return val;
-	}
-
-	if (ptr.o->v.string)
-		return ptr.o->v.string;
-	else
-		return val;
-}
-
-char *buci_get_value(char *package, char *section, char *option)
-{
-	struct uci_ptr ptr;
-	char *val = "";
-
-	if (!section || !option)
-		return val;
-
-	if (buci_init_ptr(uci_ctx, &ptr, package, section, option, NULL)) {
-		return val;
-	}
-	if (uci_lookup_ptr(uci_ctx, &ptr, NULL, true) != UCI_OK) {
-		return val;
-	}
-
-	if (!ptr.o)
-		return val;
-
-	if(ptr.o->type == UCI_TYPE_LIST) {
-		buci_print_list(&ptr.o->v.list, &val, " ");
-		return val;
-	}
-
-	if (ptr.o->v.string)
-		return ptr.o->v.string;
-	else
-		return val;
-}

bulkdata/src/buci.h

@@ -1,31 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __BUCI_H
-#define __BUCI_H
-
-#include <uci.h>
-
-int buci_init(void);
-int buci_fini(void);
-struct uci_section *buci_walk_section(char *package, char *section_type, struct uci_section *prev_section);
-void buci_print_list(struct uci_list *uh, char **val, char *delimiter);
-struct uci_element *buci_lookup_list(struct uci_list *list, const char *name);
-int uci_lookup_ptr_bysection(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_section *section, char *option, char *value);
-char *buci_get_value_bysection(struct uci_section *section, char *option);
-char *buci_get_value(char *package, char *section, char *option);
-
-#define buci_foreach_section(package, section_type, section) \
-	for (section = buci_walk_section(package, section_type, NULL); \
-		section != NULL; \
-		section = buci_walk_section(package, section_type, section))
-
-#endif //__BUCI_H

bulkdata/src/bulkdata.c

@@ -1,144 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <libubox/uloop.h>
-
-#include "http.h"
-#include "config.h"
-#include "log.h"
-#include "common.h"
-#include "report.h"
-#include "times.h"
-#include "bulkdata.h"
-
-struct bulkdata bulkdata_main = {0};
-int profiles_number = 0;
-
-void bulkdata_profile_cb(struct uloop_timeout *timeout);
-
-int get_retry_period(int min)
-{
-        srand(time(NULL));
-        return rand()%min + min;
-}
-
-static void bulkdata_run_profiles(struct bulkdata *bulkdata)
-{
-	unsigned int next_period;
-	int i = 0;
-
-	for (i = 0; i < profiles_number; i++) {
-		bulkdata->profile[i].utimer.cb = bulkdata_profile_cb;
-		LIST_HEAD(failedreports);
-		bulkdata->profile[i].failed_reports = &failedreports;
-		next_period = get_next_period(bulkdata->profile[i].time_reference, bulkdata->profile[i].reporting_interval);
-		bulkdata_log(SINFO, "The session of profile_id %d will be start in %d sec", bulkdata->profile[i].profile_id, next_period);
-		uloop_timeout_set(&bulkdata->profile[i].utimer, next_period * 1000);
-	}
-}
-
-int http_send_report(struct profile *profile, char *report)
-{
-	char *msg_in = NULL;
-	int http_code;
-
-	http_client_init(profile);
-	bulkdata_log(SINFO, "Send the report of profile_id %d to Bulkdata Collector", profile->profile_id);
-	http_code = http_send_message(profile, report, strlen(report), &msg_in);
-	http_client_exit();
-	return http_code;
-}
-
-void bulkdata_profile_cb(struct uloop_timeout *timeout)
-{
-	struct profile *profile;
-	unsigned int http_code, retry_period;
-	char *report = NULL;
-
-	profile = container_of(timeout, struct profile, utimer);
-	time_t now = time(NULL);
-
-	bulkdata_log(SINFO, "New session of profile_id %d started", profile->profile_id);
-	if(profile->retry_count == 0 || profile->next_retry > now || !profile->http_retry_enable) //Perdiodic execution
-		create_encoding_bulkdata_report(profile, &report);
-	else
-		create_failed_report(profile, &report);
-
-	bulkdata_log(SDEBUG, "The content of the profile_id report %d is :\n==========\n%s\n==========\n", profile->profile_id, report);
-	http_code= http_send_report(profile, report);
-	if(http_code != 200){
-		if(profile->retry_count == 0 || profile->next_retry > now || !profile->http_retry_enable) {  //Perdiodic execution
-			retry_period = get_retry_period(profile->http_retry_minimum_wait_interval);
-			profile->next_period = now + profile->reporting_interval;
-			profile->next_retry = now + retry_period;
-			profile->retry_count = 1;
-			profile->min_retry = profile->http_retry_minimum_wait_interval * 2;
-			if((profile->next_retry < profile->next_period) && profile->http_retry_enable) {
-				bulkdata_log(SINFO, "Retry session of profile_id %d in %d sec", profile->profile_id, retry_period);
-				uloop_timeout_set(timeout, 1000 * retry_period);
-			}
-			else {
-				bulkdata_log(SINFO, "Start New session of profile_id %d in %d sec", profile->profile_id, profile->reporting_interval);
-				uloop_timeout_set(timeout, 1000 * profile->reporting_interval);
-			}
-		} else { //Retry execution
-			retry_period= get_retry_period(profile->min_retry);
-			profile->min_retry*=2;
-			profile->next_retry+=retry_period;
-			profile->retry_count++;
-			if(profile->next_retry < profile->next_period) {
-				bulkdata_log(SINFO, "Retry session of profile_id %d in %d sec", profile->profile_id, retry_period);
-				uloop_timeout_set(timeout, 1000 * retry_period);
-			}
-			else {
-				bulkdata_log(SINFO, "Retry session of profile_id %d in %d sec", profile->profile_id, (profile->next_period-profile->next_retry+retry_period));
-				uloop_timeout_set(timeout, 1000 * (profile->next_period-profile->next_retry+retry_period));
-			}
-		}
-		if(profile->new_report){
-			bulkdata_add_failed_report(profile, profile->new_report);
-			FREE(profile->new_report);
-		}
-		FREE(report);
-	} else {
-		if(profile->retry_count == 0 || profile->next_retry > now || !profile->http_retry_enable) {
-			bulkdata_log(SINFO, "Start New session of profile_id %d in %d sec", profile->profile_id, profile->reporting_interval);
-			uloop_timeout_set(timeout, 1000 * profile->reporting_interval);
-		}
-		else {
-			bulkdata_log(SINFO, "Retry session of profile_id %d in %d sec", profile->profile_id, (profile->next_period-profile->next_retry));
-			uloop_timeout_set(timeout, 1000 * (profile->next_period-profile->next_retry));
-		}
-		FREE(profile->new_report);
-		FREE(report);
-		empty_failed_reports_list(profile);
-		profile->retry_count= 0;
-	}
-}
-
-int main(void)
-{
-	struct bulkdata *bulkdata = &bulkdata_main;
-	if (bulkdata_config_init(bulkdata) == -1)
-		return -1;
-	bulkdata_log(SINFO, "Start bulkdatad daemon");
-	
-	uloop_init();
-	bulkdata_run_profiles(bulkdata);
-	uloop_run();
-	uloop_done();
-
-	bulkdata_config_fini(bulkdata);
-	bulkdata_log(SINFO, "Stop bulkdatad daemon");
-	return 0;
-}

bulkdata/src/bulkdata.h

@@ -1,18 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __BULKDATA_H
-#define __BULKDATA_H
-
-extern struct bulkdata bulkdata_main;
-extern int profiles_number;
-
-#endif /* __BULKDATA_H */

bulkdata/src/bulkdata.md

@@ -1,105 +0,0 @@
-# README #
-
-bulkdatad is an implementation of The HTTP bulk data collection mechanism which is an extended feature of CPE and other agents implementing TR-069(CWMP) or TR-369(USP), defined by the Broadband Forum. It provides a means by which an Auto-Configuration Server (ACS), or USP Controller, can configure an agent to periodically send a JSON or CSV formatted set of Device information to an HTTP server running a data collection application.
-
-## Configuration File ##
-
-The bulkdatad UCI configuration is located in **'/etc/config/bulkdata'**, and contains 4 sections: **bulkdata**, **profile**, **profile\_parameter** and **profile\_http\_request\_uri\_parameter**.
-
-```
-config bulkdata 'bulkdata'
-	option enable '0'
-	option log_level '3'
-
-config profile
-	option profile_id '1'
-	option enable '0'
-	option csv_encoding_row_time_stamp 'unix'
-	option json_encoding_report_time_stamp 'unix'
-	option http_retry_minimum_wait_interval '5'
-	option http_retry_interval_multiplier '2000'
-
-config profile_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-
-config profile_http_request_uri_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-```
-
-### bulkdata section ###
-
-It defines **bulkdata configuration**: enable and log\_level.
-
-| Name        |  Type   | Description                                                                                     |
-| ----------- | ------- | ----------------------------------------------------------------------------------------------- |
-| `enable`    | boolean | Enables the BulkData feature if set to **1**.                                                     |
-| `log_level` | integer | Specifies the log type to use, by default **'INFO'**. The possible types are **'EMERG', 'ALERT', 'CRITIC' ,'ERROR', 'WARNING', 'NOTICE', 'INFO' and 'DEBUG'**. |
-
-### profile section ###
-
-It defines **the profile section configuration**: enable, name,... The possible options for **profile** section are listed below:
-
-| Name                               |  Type   | Description                                    |
-| ---------------------------------- | ------- | ---------------------------------------------- |
-| `profile_id`                       | integer | The profile id to use. |
-| `enable`                           | boolean | If set to **1**, enables the bulkdata profile. |
-| `name`                             | string  | The name of the profile. |
-| `nbre_of_retained_failed_reports`  | integer | The number of failed reports to be retained and transmitted at the end of the current reporting interval. |
-| `protocol`                         | string  | The protocol used for the collection profile. |
-| `encoding_type`                    | string  | The encoding type used for the collection profile. |
-| `reporting_interval`               | integer | The reporting interval in seconds. |
-| `time_reference`                   | integer | The time reference to determine when the profile will be transmitted to the ACS collector. |
-| `csv_encoding_field_separator`     | string  | The field separator to use when encoding CSV data. |
-| `csv_encoding_row_separator`       | string  | The row separator to use when encoding CSV data. |
-| `csv_encoding_escape_character`    | string  | The escape character to use when encoding CSV data. |
-| `csv_encoding_report_format`       | string  | Describes how reports will be formatted. Two possible formats are supported: **'ParameterPerRow' and 'ParameterPerColumn'**. |
-| `csv_encoding_row_time_stamp`      | string  | The format of the timestamp to use for data inserted into the row. The row time stamp supported are **'Unix-Epoch', 'ISO-8601' and 'None'**. |
-| `json_encoding_report_format`      | string  | Describes the report format. The supported report formats are **'ObjectHierarchy' and 'NameValuePair'**. |
-| `json_encoding_report_time_stamp`  | string  | The format of the timestamp to use for the JSON Object named "CollectionTime". The supported timestamp are **'Unix-Epoch', 'ISO-8601' and 'None'**. |
-| `http_url`                         | string  | The URL of the collection server. |
-| `http_username`                    | string  | The username of the collection server. |
-| `http_password`                    | string  | The password of the collection server. |
-| `http_compression`                 | string  | The HTTP Compression mechanism used by the collection server. The supported compression mechanism are **'GZIP', 'Compress' and 'Deflate'**. |
-| `http_method`                      | string  | The HTTP method used by the collection server. Two methods are supported: **'POST' and 'PUT'**. |
-| `http_use_date_header`             | boolean | If set to **1**, the CPE encodes the HTTP Date Header. |
-| `http_retry_enable`                | boolean | If set to **1**, the CPE retries unsuccessful attempts to transfer data. |
-| `http_retry_minimum_wait_interval` | integer | The data transfer retry wait interval. |
-| `http_retry_interval_multiplier`   | integer | The retry interval multiplier. |
-| `http_persist_across_reboot`       | boolean | If set to **1**, failed data transfers must be persisted across reboots. |
-
-### profile_parameter section ###
-
-It defines **the profile\_parameter section configuration**: profile\_id, name, reference.
-
-| Name         |  Type   | Description                             |
-| ------------ | ------- | --------------------------------------- |
-| `profile_id` | integer | The id of the used profile.             |
-| `name`       | string  | The name of the profile parameter.      |
-| `reference`  | string  | The reference of the profile parameter. |
-
-### profile_http_request_uri_parameter section ###
-
-It defines **the profile\_http\_request\_uri\_parameter section configuration**: profile\_id, name, reference.
-
-| Name         |  Type   | Description                             |
-| ------------ | ------- | --------------------------------------- |
-| `profile_id` | integer | The id of the used profile.             |
-| `name`       | string  | The name of the Request-URI parameter.  |
-| `reference`  | string  | The reference of the profile parameter. |
-
-## Dependencies ##
-
-To successfully build bulkdatad, the following libraries are needed:
-
-| Dependency  | Link                                        | License        |
-| ----------- | ------------------------------------------- | -------------- |
-| libuci      | https://git.openwrt.org/project/uci.git     | LGPL 2.1       |
-| libubox     | https://git.openwrt.org/project/libubox.git | BSD            |
-| libjson-c   | https://s3.amazonaws.com/json-c_releases    | MIT            |
-| libcurl     | https://dl.uxnr.de/mirror/curl              | MIT            |
-| libbbfdm    | https://dev.iopsys.eu/iopsys/bbf.git        | LGPL 2.1       |
-

bulkdata/src/common.c

@@ -1,450 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
-
-#include "common.h"
-
-static pathnode *head = NULL;
-static pathnode *temphead = NULL;
-
-int bulkdata_dm_ctx_init(struct dmctx *ctx)
-{
-	struct bulkdata *bulkdata = &bulkdata_main;
-	dm_ctx_init(ctx, bulkdata->instance_mode);
-	return 0;
-}
-
-int bulkdata_dm_ctx_clean(struct dmctx *ctx)
-{
-	dm_ctx_clean(ctx);
-	return 0;
-}
-
-static char **str_split(const char* str, const char* delim, size_t* numtokens)
-{
-	char *s = strdup(str);
-	size_t tokens_alloc = 1;
-	size_t tokens_used = 0;
-	char **tokens = calloc(tokens_alloc, sizeof(char*));
-	char *token, *strtok_ctx;
-	for (token = strtok_r(s, delim, &strtok_ctx); token != NULL; token = strtok_r(NULL, delim, &strtok_ctx)) {
-		if (tokens_used == tokens_alloc) {
-			tokens_alloc *= 2;
-			tokens = realloc(tokens, tokens_alloc * sizeof(char*));
-		}
-		tokens[tokens_used++] = strdup(token);
-	}
-	// cleanup
-	if (tokens_used == 0) {
-		FREE(tokens);
-	} else {
-		tokens = realloc(tokens, tokens_used * sizeof(char*));
-	}
-	*numtokens = tokens_used;
-	FREE(s);
-	return tokens;
-}
-
-static bool bulkdata_match(const char *string, const char *pattern)
-{
-	regex_t re;
-	if (regcomp(&re, pattern, REG_EXTENDED) != 0) return 0;
-	int status = regexec(&re, string, 0, NULL, 0);
-	regfree(&re);
-	if (status != 0) return false;
-	return true;
-}
-
-static bool is_res_required(char *str, int *start, int *len)
-{
-	char temp_char[NAME_MAX] = {'\0'};
-
-	if (bulkdata_match(str, GLOB_CHAR)) {
-		int s_len = strlen(str);
-		int b_len = s_len, p_len = s_len;
-
-		char *star = strchr(str, '*');
-		if(star)
-			s_len = star - str;
-		*start = MIN(MIN(s_len, p_len), b_len);
-		if (*start == s_len)
-			*len = 1;
-
-		strncpy(temp_char, str+*start, *len);
-
-		if (bulkdata_match(temp_char, "[*+]+"))
-			return true;
-	}
-	*start = strlen(str);
-	return false;
-}
-
-static void insert(char *data, bool active)
-{
-	pathnode *link = (pathnode*) calloc(1, sizeof(pathnode));
-	if(!link) {
-		return;
-	}
-
-	link->ref_path = data;
-
-	if(active) {
-		link->next = head;
-		head = link;
-	} else {
-		link->next = temphead;
-		temphead = link;
-	}
-}
-
-static void swap_heads(void)
-{
-	pathnode *temp = head;
-	head = temphead;
-	temphead = temp;
-}
-
-static void deleteList(void)
-{
-	pathnode *ptr = head, *temp;
-	while(ptr != NULL) {
-		temp = ptr;
-		free(ptr->ref_path);
-		if(ptr->next != NULL) {
-			ptr = ptr->next;
-		} else {
-			ptr = NULL;
-		}
-		free(temp);
-	}
-	head = NULL;
-	swap_heads();
-}
-
-void bulkdata_add_data_to_list(struct list_head *dup_list, char *name, char *value, char *type)
-{
-	struct resultsnode *link;
-	link = calloc(1, sizeof(struct resultsnode));
-	list_add_tail(&link->list, dup_list);
-	link->name = strdup(name);
-	link->data = strdup(value);
-	link->type = strdup(type);
-}
-
-void bulkdata_delete_data_from_list(struct resultsnode *link)
-{
-	list_del(&link->list);
-	FREE(link->name);
-	FREE(link->data);
-	FREE(link->type);
-	FREE(link);
-}
-
-void bulkdata_free_data_from_list(struct list_head *dup_list)
-{
-	struct resultsnode *link;
-	while (dup_list->next != dup_list) {
-		link = list_entry(dup_list->next, struct resultsnode, list);
-		bulkdata_delete_data_from_list(link);
-	}
-}
-
-static bool bulkdata_get(int operation, char *path, struct dmctx *dm_ctx)
-{
-	int fault = 0;
-
-	switch(operation) {
-		case CMD_GET_NAME:
-			fault = dm_entry_param_method(dm_ctx, CMD_GET_NAME, path, "true", NULL);
-			break;
-		case CMD_GET_VALUE:
-			fault = dm_entry_param_method(dm_ctx, CMD_GET_VALUE, path, NULL, NULL);
-			break;
-		default:
-			return false;
-	}
-
-	if (dm_ctx->list_fault_param.next != &dm_ctx->list_fault_param) {
-		return false;
-	}
-	if (fault) {
-		return false;
-	}
-	return true;
-}
-
-char *bulkdata_get_value_param(char *path)
-{
-	struct dmctx ctx = {0};
-	struct dm_parameter *n;
-	char *value = NULL;
-
-	bulkdata_dm_ctx_init(&ctx);
-	if(bulkdata_get(CMD_GET_VALUE, path, &ctx)) {
-		list_for_each_entry(n, &ctx.list_parameter, list) {
-			value = strdup(n->data);
-			break;
-		}
-	}
-	bulkdata_dm_ctx_clean(&ctx);
-	return value;
-}
-
-void bulkdata_get_value(char *path, struct list_head *list)
-{
-	struct dmctx ctx = {0};
-	struct dm_parameter *n;
-
-	bulkdata_dm_ctx_init(&ctx);
-	if(bulkdata_get(CMD_GET_VALUE, path, &ctx)) {
-		list_for_each_entry(n, &ctx.list_parameter, list) {
-			bulkdata_add_data_to_list(list, n->name, n->data, n->type);
-		}
-	}
-	bulkdata_dm_ctx_clean(&ctx);
-}
-
-bool bulkdata_get_name(char *path)
-{
-	struct dmctx ctx = {0};
-	struct dm_parameter *n;
-	bool ret = false;
-
-	bulkdata_dm_ctx_init(&ctx);
-	if(bulkdata_get(CMD_GET_NAME, path, &ctx)) {
-		list_for_each_entry(n, &ctx.list_parameter, list) {
-			insert(strdup(n->name), false);
-		}
-		ret = true;
-	}
-	bulkdata_dm_ctx_clean(&ctx);
-	return ret;
-}
-
-static void fill_node_path(void)
-{
-	pathnode *p=head;
-	while(p!=NULL) {
-		bulkdata_get_name(p->ref_path);
-		p=p->next;
-	}
-	deleteList();
-}
-
-static void bulkdata_filter_results(char *path, int start, int end)
-{
-	int startpos = start, m_index = 0, m_len = 0;
-	char *pp = path + startpos;
-	char exp[NAME_MAX] = {'\0'};
-
-	if(start >= end) {
-		return;
-	}
-
-	if(!is_res_required(pp, &m_index, &m_len)) {
-		//append rest of the path to the final list
-		if(pp == path ) {
-			insert(strdup(pp), true);
-			return;
-		}
-
-		pathnode *p = head;
-		while(p != NULL) {
-			char name[NAME_MAX] = {'\0'};
-			strcpy(name, p->ref_path);
-			strcat(name, pp);
-			insert(strdup(name), false);
-			p = p->next;
-		}
-		deleteList();
-		return;
-	}
-
-	// Get the string before the match
-	char name[NAME_MAX]={'\0'};
-	strncpy(name, pp, m_index);
-
-	pathnode *p = head;
-	if(p == NULL) {
-		insert(strdup(name), false);
-	}
-
-	while(p != NULL) {
-		char ref_name[NAME_MAX] = {'\0'};
-		sprintf(ref_name, "%s%s", p->ref_path, name);
-		insert(strdup(ref_name), false);
-		p = p->next;
-	}
-	deleteList();
-
-	startpos += m_index;
-	strncpy(exp, pp+m_index, m_len);
-	pp = path + startpos;
-	fill_node_path();
-	startpos += 2;
-	bulkdata_filter_results(path, startpos, end);
-}
-
-static void bulkdata_parse_results(struct list_head *list)
-{
-	pathnode *p = head;
-	while(p != NULL) {
-		bulkdata_get_value(p->ref_path, list);
-		p = p->next;
-	}
-	deleteList();
-}
-
-void bulkdata_get_value_results(char *path, struct list_head *list)
-{
-	bulkdata_filter_results(path, 0, strlen(path));
-	bulkdata_parse_results(list);
-}
-
-char *create_request_url(struct profile *profile)
-{
-	int i = 0, http_uri_number = profile->profile_http_request_uri_parameter_number;
-	char *value, *uri_param = NULL, *uri_tmp = NULL, *http_url = NULL; 
-
-	for (i = 0; i < http_uri_number; i++)
-	{
-		if((profile->profile_http_uri_parameter[i].reference == NULL) || (profile->profile_http_uri_parameter[i].name == NULL))
-			continue;
-		value = bulkdata_get_value_param(profile->profile_http_uri_parameter[i].reference);
-		if(!uri_param) {
-			asprintf(&uri_param, "&%s=%s", profile->profile_http_uri_parameter[i].name, value);
-			free(value);
-		}
-		else {
-			uri_tmp = strdup(uri_param);
-			free(uri_param);
-			asprintf(&uri_param, "%s&%s=%s", uri_tmp, profile->profile_http_uri_parameter[i].name, value);
-			free(value);
-			free(uri_tmp);
-		}
-	}
-	if(uri_param) {
-		asprintf(&http_url, "%s%s", profile->http_url, uri_param);
-		free(uri_param);
-	} else {
-		asprintf(&http_url, "%s", profile->http_url);
-	}
-	return http_url;
-}
-
-char *get_bulkdata_profile_parameter_name(char *paramref, char *paramname, char *param)
-{
-	char **paramarr, *idx1 = NULL, *idx2 = NULL, *res = NULL, *instance = NULL, *tmp = NULL, *retparam = NULL, *s = NULL;
-	int i, j = 0;
-	size_t length;
-
-	if(paramname == NULL || strlen(paramname) <= 0)
-		return strdup(param);
-	paramarr = str_split(paramref, "*", &length);
-	res = strdup(paramname);
-	for(i = 0; i < length; i++) {
-		if(i == length - 1)
-			break;
-		j++;
-		idx1 = strstr(param, paramarr[i]);
-		idx2 = strstr(param, paramarr[i+1]);
-		instance = (char*)calloc(idx2 - idx1 - strlen(paramarr[i]) + 1, sizeof(char));
-		memcpy(instance, idx1 + strlen(paramarr[i]), idx2 - idx1 - strlen(paramarr[i]));
-		tmp = strdup(res);
-		FREE(res);
-		asprintf(&res, "%s.%s", tmp, instance);
-		FREE(tmp);
-		FREE(instance);
-	}
-	if ((s = strstr(param,paramarr[j]) ) != NULL && strlen(s) == strlen(paramarr[j]))
-		asprintf(&retparam, "%s", res);
-	else
-		asprintf(&retparam, "%s.%s", res, strstr(param, paramarr[j]) + strlen(paramarr[j]));
-
-	FREE(res);
-	for(int k = 0; k < length; k++)
-		FREE(paramarr[k]);
-	FREE(paramarr);
-
-	return retparam;
-}
-
-void append_string_to_string(char *strappend, char **target)
-{
-	char *tmp = NULL;
-
-	if(strappend == NULL || strlen(strappend) <= 0)
-		return;
-	if(*target == NULL || strlen(*target) <= 0) {
-		*target = strdup(strappend);
-		return;
-	} else {
-		tmp = strdup(*target);
-		FREE(*target);
-	}
-	asprintf(target, "%s%s", tmp, strappend);
-	FREE(tmp);
-}
-
-void bulkdata_add_failed_report(struct profile *profile, char *freport)
-{
-	struct failed_reports *report, *retreport, *rtmp;
-
-	if(profile->nbre_failed_reports < profile->nbre_of_retained_failed_reports || profile->nbre_of_retained_failed_reports < 0) {
-		profile->nbre_failed_reports++;
-	} else {
-		list_for_each_entry_safe(retreport, rtmp, profile->failed_reports, list) {
-			bulkdata_delete_failed_report(retreport);
-			break;
-		}
-	}
-	report = calloc(1, sizeof(struct failed_reports));
-	list_add_tail(&report->list, profile->failed_reports);
-	report->freport= strdup(freport);
-}
-
-void bulkdata_delete_failed_report(struct failed_reports *report)
-{
-	if(report != NULL) {
-		list_del(&report->list);
-		FREE(report->freport);
-		FREE(report);
-	}
-}
-
-struct failed_reports* empty_failed_reports_list(struct profile *profile)
-{
-	struct failed_reports *report, *rtmp;
-
-	if(list_empty(profile->failed_reports))
-		return NULL;
-	list_for_each_entry_safe(report, rtmp, profile->failed_reports, list) {
-		list_del(&report->list);
-		FREE(report->freport);
-		FREE(report);
-	}
-	return NULL;
-}
-
-void add_failed_reports_to_report_csv(struct profile *profile, char **report, int isnext)
-{
-	struct failed_reports *retreport = NULL;
-	int j = 0;
-
-	if(list_empty(profile->failed_reports))
-		return;
-	list_for_each_entry(retreport, profile->failed_reports, list) {
-		if(!j && isnext) {
-			j = 1;
-			continue;
-		}
-		append_string_to_string(retreport->freport, report);
-	}
-}

bulkdata/src/common.h

@@ -1,69 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __COMMON_H
-#define __COMMON_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <regex.h>
-#include <sys/param.h>
-
-#include <libubox/blobmsg.h>
-#include <libubox/blobmsg_json.h>
-#include <libubox/utils.h>
-#include <libubus.h>
-
-#include <libbbfdm/dmentry.h>
-#include <libbbfdm/dmbbfcommon.h>
-
-#include "config.h"
-#include "log.h"
-#include "bulkdata.h"
-
-typedef struct pathnode {
-	char *ref_path;
-	struct pathnode *next;
-} pathnode;
-
-typedef struct resultsnode {
-	struct list_head list;
-	char *name;
-	char *data;
-	char *type;
-} resultsnode;
-
-struct failed_reports {
-	struct list_head list;
-	char *freport;
-};
-
-#define GLOB_CHAR "[[+*]+"
-
-int bulkdata_dm_ctx_init(struct dmctx *ctx);
-int bulkdata_dm_ctx_clean(struct dmctx *ctx);
-
-char *bulkdata_get_value_param(char *path);
-void bulkdata_get_value(char *path, struct list_head *list);
-
-void bulkdata_free_data_from_list(struct list_head *dup_list);
-void bulkdata_get_value_results(char *path, struct list_head *list);
-char *create_request_url(struct profile *profile);
-char *get_bulkdata_profile_parameter_name(char *paramref, char *paramname, char *param);
-void append_string_to_string(char *strappend, char **target);
-void bulkdata_add_failed_report(struct profile *profile, char *freport);
-void bulkdata_delete_failed_report(struct failed_reports *report);
-
-struct failed_reports *empty_failed_reports_list(struct profile *profile);
-void add_failed_reports_to_report_csv(struct profile *profile, char **report, int isnext);
-
-#endif //__COMMON_H

bulkdata/src/config.c

@@ -1,523 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
-
-#include <stdio.h>
-#include <strings.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "log.h"
-#include "config.h"
-#include "buci.h"
-#include "common.h"
-#include "bulkdata.h"
-
-int get_log_level_config(struct bulkdata *bulkdata)
-{
-	char *value = NULL;
-
-	buci_init();
-	value = buci_get_value("bulkdata", "bulkdata", "log_level");
-	if(value != NULL && *value != '\0')
-		bulkdata->log_level = atoi(value);
-	else
-		bulkdata->log_level = DEFAULT_LOGLEVEL;
-	bulkdata_log(SDEBUG,"Log Level of Bulkdata is : %d", bulkdata->log_level);
-	buci_fini();
-	return 0;
-}
-
-int get_amd_version_config(struct bulkdata *bulkdata)
-{
-	char *value = NULL;
-
-	buci_init();
-	value = buci_get_value("cwmp", "cpe", "amd_version");
-	if(value != NULL && *value != '\0')
-		bulkdata->amd_version = atoi(value);
-	else
-		bulkdata->amd_version = DEFAULT_AMD_VERSION;
-	bulkdata_log(SDEBUG,"CWMP Amendment Version is : %d", bulkdata->amd_version);
-	buci_fini();
-	return 0;
-}
-
-int get_instance_mode_config(struct bulkdata *bulkdata)
-{
-	char *value = NULL;
-
-	buci_init();
-	value = buci_get_value("cwmp", "cpe", "instance_mode");
-	if(value != NULL && *value != '\0') {
-		if(!strcmp(value, "InstanceNumber"))
-			bulkdata->instance_mode = INSTANCE_MODE_NUMBER;
-		else
-			bulkdata->instance_mode = INSTANCE_MODE_ALIAS;
-	}
-	else
-		bulkdata->instance_mode = DEFAULT_INSTANCE_MODE;
-	bulkdata_log(SDEBUG,"CWMP Instance Mode is : %d", bulkdata->instance_mode);
-	buci_fini();
-
-	return 0;
-}
-
-int get_device_id_config(struct bulkdata *bulkdata)
-{
-	struct dmctx dmctx = {0};
-
-	bulkdata_dm_ctx_init(&dmctx);
-	bulkdata->device_id.manufacturer_oui = bulkdata_get_value_param("Device.DeviceInfo.ManufacturerOUI");
-	bulkdata->device_id.product_class = bulkdata_get_value_param("Device.DeviceInfo.ProductClass");
-	bulkdata->device_id.serial_number = bulkdata_get_value_param("Device.DeviceInfo.SerialNumber");
-	bulkdata_dm_ctx_clean(&dmctx);
-
-	return 0;
-}
-
-int load_profile_config(struct bulkdata *bulkdata, struct uci_section *s, int i)
-{
-	char *value = NULL;
-
-	value = buci_get_value_bysection(s, "profile_id");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_id = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The profile_id of profile_id %d is : %d", i, bulkdata->profile[i].profile_id);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "nbre_of_retained_failed_reports");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].nbre_of_retained_failed_reports = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The nombre of retained failed reports of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].nbre_of_retained_failed_reports);
-	}
-
-	value = buci_get_value_bysection(s, "protocol");
-	if(value != NULL && *value != '\0' && strcasecmp(value, "http")==0) {
-		bulkdata->profile[i].protocol = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The protocol of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].protocol);
-	} else
-		return -1;
-	
-	value = buci_get_value_bysection(s, "encoding_type");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].encoding_type = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The encoding type of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].encoding_type);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "reporting_interval");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].reporting_interval = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The reporting interval of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].reporting_interval);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "time_reference");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].time_reference = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The time reference of profile_id %d is : %ld", bulkdata->profile[i].profile_id, bulkdata->profile[i].time_reference);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "csv_encoding_field_separator");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_field_separator = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding field separator of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_field_separator);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "csv_encoding_row_separator");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_row_separator = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding row separator of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_row_separator);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "csv_encoding_escape_character");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_escape_character = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding escape character of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_escape_character);
-	}
-
-	value = buci_get_value_bysection(s, "csv_encoding_report_format");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_report_format = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding report format of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_report_format);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "csv_encoding_row_time_stamp");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_row_time_stamp = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding row time stamp of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_row_time_stamp);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "json_encoding_report_format");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].json_encoding_report_format = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The json encoding report format of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].json_encoding_report_format);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "json_encoding_report_time_stamp");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].json_encoding_report_time_stamp = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The json encoding report time stamp of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].json_encoding_report_time_stamp);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_url");
-	if(value != NULL && *value != '\0') {
-		char *url = NULL;
-		asprintf(&url, "%s?oui=%s&pc=%s&sn=%s", value, bulkdata->device_id.manufacturer_oui, bulkdata->device_id.serial_number, bulkdata->device_id.serial_number);
-		bulkdata->profile[i].http_url = strdup(url);
-		free(url);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP url of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_url);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_username");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_username = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP username of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_username);
-	} else {
-		bulkdata->profile[i].http_username = NULL;
-	}
-
-	value = buci_get_value_bysection(s, "http_password");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_password = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP password of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_password);
-	} else {
-		bulkdata->profile[i].http_password = NULL;
-	}
-
-	value = buci_get_value_bysection(s, "http_compression");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_compression = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP compression of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_compression);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_method");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_method = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP method of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_method);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_use_date_header");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_use_date_header = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP use date header of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_use_date_header);
-	}
-
-	value = buci_get_value_bysection(s, "http_retry_enable");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_retry_enable = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP retry enable of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_retry_enable);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_retry_minimum_wait_interval");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_retry_minimum_wait_interval = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP retry minimum wait interval of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_retry_minimum_wait_interval);
-	}
-
-	value = buci_get_value_bysection(s, "http_retry_interval_multiplier");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_retry_interval_multiplier = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP retry interval multiplier of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_retry_interval_multiplier);
-	}
-
-	value = buci_get_value_bysection(s, "http_persist_across_reboot");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_persist_across_reboot = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP persist across reboot of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_persist_across_reboot);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_ssl_capath");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_ssl_capath = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP ssl capath of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_ssl_capath);
-	} else {
-		bulkdata->profile[i].http_ssl_capath = NULL;
-	}
-
-	value = buci_get_value_bysection(s, "http_insecure_enable");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_insecure_enable = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP insecure enable of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_insecure_enable);
-	}
-
-	bulkdata->profile[i].retry_count = 0;
-	bulkdata->profile[i].nbre_failed_reports = 0;
-
-	return 0;
-}
-
-int get_profiles_enable(struct bulkdata *bulkdata)
-{
-	struct uci_section *s;
-	char *enable;
-	int i = 0, nbr_profiles = 0;
-
-	buci_init();
-
-	buci_foreach_section("bulkdata", "profile", s) {
-		enable = buci_get_value_bysection(s, "enable");
-		if(strcmp(enable, "1") == 0) {
-			nbr_profiles++;
-		}
-	}
-
-	if(nbr_profiles != 0)
-		bulkdata->profile = calloc(2, sizeof(struct profile));
-	
-	buci_foreach_section("bulkdata", "profile", s) {
-		enable = buci_get_value_bysection(s, "enable");
-		if(strcmp(enable, "1") == 0) {
-			if(load_profile_config(bulkdata, s, i) == -1) {
-				bulkdata_log(SCRIT,"Not able to start bulkdata: some required bulkdata configurations in profile must be set");
-				return -1;
-			}
-			i++;
-		}
-	}
-	profiles_number = nbr_profiles;
-
-	buci_fini();
-	return 0;
-}
-
-int load_profile_parameter_config(struct bulkdata *bulkdata, struct uci_section *s, int i, int j)
-{
-	char *value = NULL;
-
-	value = buci_get_value_bysection(s, "name");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_parameter[j].name = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The parameter name %d of profile_id %d is : %s", j+1, bulkdata->profile[i].profile_id, bulkdata->profile[i].profile_parameter[j].name);
-	} else {
-		bulkdata->profile[i].profile_parameter[j].name = NULL;
-	}
-
-	value = buci_get_value_bysection(s, "reference");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_parameter[j].reference = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The parameter reference %d of profile_id %d is : %s", j+1, bulkdata->profile[i].profile_id, bulkdata->profile[i].profile_parameter[j].reference);
-	} else
-		return -1;
-
-	return 0;
-}
-
-int get_profiles_parameters(struct bulkdata *bulkdata)
-{
-	struct uci_section *s;
-	char *profile_id;
-	int i, j, nbr_profile_parameters;
-
-	buci_init();
-
-	for (i = 0; i < profiles_number; i++) {
-		j = 0;
-		nbr_profile_parameters = 0;
-		buci_foreach_section("bulkdata", "profile_parameter", s) {
-			profile_id = buci_get_value_bysection(s, "profile_id");
-			if(bulkdata->profile[i].profile_id != atoi(profile_id))
-				continue;
-			nbr_profile_parameters++;
-			if(nbr_profile_parameters == 1) {
-				bulkdata->profile[i].profile_parameter = calloc(1, sizeof(struct profile_parameter));
-			} else {
-				bulkdata->profile[i].profile_parameter = realloc(bulkdata->profile[i].profile_parameter, nbr_profile_parameters * sizeof(struct profile_parameter));
-			}
-			if(load_profile_parameter_config(bulkdata, s, i, j) == -1) {
-				bulkdata_log(SCRIT,"Not able to start bulkdata: some required bulkdata configurations in profile_parameter must be set");
-				return -1;
-			}
-			j++;
-		}
-		bulkdata->profile[i].profile_parameter_number = nbr_profile_parameters;
-	}
-
-	buci_fini();
-	return 0;
-}
-
-int load_profile_http_request_uri_parameter_config(struct bulkdata *bulkdata, struct uci_section *s, int i, int j)
-{
-	char *value = NULL;
-
-	value = buci_get_value_bysection(s, "name");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_http_uri_parameter[j].name = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP resuest URI parameter name %d of profile_id %d is : %s", j+1, bulkdata->profile[i].profile_id, bulkdata->profile[i].profile_http_uri_parameter[j].name);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "reference");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_http_uri_parameter[j].reference = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP resuest URI parameter reference %d of profile_id %d is : %s", j+1, bulkdata->profile[i].profile_id, bulkdata->profile[i].profile_http_uri_parameter[j].reference);
-	} else
-		return -1;
-
-	return 0;
-}
-
-int get_profile_http_request_uri_parameter(struct bulkdata *bulkdata)
-{
-	struct uci_section *s;
-	char *profile_id;
-	int i, j, nbr_profile_http_request_uri_parameter;
-
-	buci_init();
-
-	for (i = 0; i < profiles_number; i++) {
-		j = 0;
-		nbr_profile_http_request_uri_parameter = 0;
-		buci_foreach_section("bulkdata", "profile_http_request_uri_parameter", s) {
-			profile_id = buci_get_value_bysection(s, "profile_id");
-			if(bulkdata->profile[i].profile_id != atoi(profile_id))
-				continue;
-			nbr_profile_http_request_uri_parameter++;
-			if(nbr_profile_http_request_uri_parameter == 1) {
-				bulkdata->profile[i].profile_http_uri_parameter = calloc(1, sizeof(struct profile_http_request_uri_parameter));
-			} else {
-				bulkdata->profile[i].profile_http_uri_parameter = realloc(bulkdata->profile[i].profile_http_uri_parameter, nbr_profile_http_request_uri_parameter * sizeof(struct profile_http_request_uri_parameter));
-			}
-			if(load_profile_http_request_uri_parameter_config(bulkdata, s, i, j)== -1) {
-				bulkdata_log(SCRIT,"Not able to start bulkdata: some required bulkdata configurations in profile_http_request_uri_parameter must be set");
-				return -1;
-			}
-			j++;
-		}
-		bulkdata->profile[i].profile_http_request_uri_parameter_number = nbr_profile_http_request_uri_parameter;
-	}
-
-	buci_fini();
-	return 0;
-}
-
-int bulkdata_config_init(struct bulkdata *bulkdata)
-{
-	get_log_level_config(bulkdata);
-	get_amd_version_config(bulkdata);
-	get_instance_mode_config(bulkdata);
-	get_device_id_config(bulkdata);
-	if (get_profiles_enable(bulkdata) == -1)
-		return -1;
-	if (get_profiles_parameters(bulkdata) == -1)
-		return -1;
-	if (get_profile_http_request_uri_parameter(bulkdata) == -1)
-		return -1;
-	return 0;
-}
-
-int free_device_id_config(struct bulkdata *bulkdata)
-{
-	FREE(bulkdata->device_id.manufacturer_oui);
-	FREE(bulkdata->device_id.product_class);
-	FREE(bulkdata->device_id.serial_number);
-	return 0;
-}
-
-int free_profiles_enable(struct bulkdata *bulkdata)
-{
-	for(int i = 0; i < profiles_number; i++) {
-		FREE(bulkdata->profile[i].protocol);
-		FREE(bulkdata->profile[i].encoding_type);
-		FREE(bulkdata->profile[i].csv_encoding_field_separator);
-		FREE(bulkdata->profile[i].csv_encoding_row_separator);
-		FREE(bulkdata->profile[i].csv_encoding_escape_character);
-		FREE(bulkdata->profile[i].csv_encoding_report_format);
-		FREE(bulkdata->profile[i].csv_encoding_row_time_stamp);
-		FREE(bulkdata->profile[i].json_encoding_report_format);
-		FREE(bulkdata->profile[i].json_encoding_report_time_stamp);
-		FREE(bulkdata->profile[i].http_url);
-		FREE(bulkdata->profile[i].http_username);
-		FREE(bulkdata->profile[i].http_password);
-		FREE(bulkdata->profile[i].http_compression);
-		FREE(bulkdata->profile[i].http_method);
-		FREE(bulkdata->profile[i].http_ssl_capath);
-	}
-	FREE(bulkdata->profile);
-	return 0;
-}
-
-int free_profiles_parameters(struct bulkdata *bulkdata)
-{
-	for(int i = 0; i < profiles_number; i++) {
-		for(int j = 0; j < bulkdata->profile[i].profile_parameter_number; j++) {
-			FREE(bulkdata->profile[i].profile_parameter[j].name);
-			FREE(bulkdata->profile[i].profile_parameter[j].reference);
-		}
-		FREE(bulkdata->profile[i].profile_parameter);
-	}
-	return 0;
-}
-
-int free_profile_http_request_uri_parameter(struct bulkdata *bulkdata)
-{
-	for(int i = 0; i < profiles_number; i++) {
-		for(int j = 0; j < bulkdata->profile[i].profile_http_request_uri_parameter_number; j++) {
-			FREE(bulkdata->profile[i].profile_http_uri_parameter[j].name);
-			FREE(bulkdata->profile[i].profile_http_uri_parameter[j].reference);
-		}
-		FREE(bulkdata->profile[i].profile_http_uri_parameter);
-	}
-	return 0;
-}
-
-int bulkdata_config_fini(struct bulkdata *bulkdata)
-{
-	free_device_id_config(bulkdata);
-	free_profiles_parameters(bulkdata);
-	free_profile_http_request_uri_parameter(bulkdata);
-	free_profiles_enable(bulkdata);
-	return 0;
-}

bulkdata/src/config.h

@@ -1,103 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <time.h>
-#include <libubox/uloop.h>
-
-#define DEFAULT_AMD_VERSION 2
-#define DEFAULT_INSTANCE_MODE 0
-
-typedef struct device_id {
-	char *manufacturer_oui;
-	char *product_class;
-	char *serial_number;
-} device_id;
-
-typedef struct profile_parameter {
-	int profile_id;
-	char *name;
-	char *reference;
-} profile_parameter;
-
-typedef struct profile_http_request_uri_parameter {
-	int profile_id;
-	char *name;
-	char *reference;
-} profile_http_request_uri_parameter;
-
-typedef struct profile {
-	struct uloop_timeout utimer;
-	int profile_id;
-	int nbre_of_retained_failed_reports;
-	int nbre_failed_reports;
-	int reporting_interval;
-	int profile_parameter_number;
-	int profile_http_request_uri_parameter_number;
-	int http_retry_minimum_wait_interval;
-	int http_retry_interval_multiplier;
-	int min_retry;
-	int retry_count;
-	char *protocol;
-	char *encoding_type;
-	char *csv_encoding_field_separator;
-	char *csv_encoding_row_separator;
-	char *csv_encoding_escape_character;
-	char *csv_encoding_report_format;
-	char *csv_encoding_row_time_stamp;
-	char *json_encoding_report_format;
-	char *json_encoding_report_time_stamp;
-	char *http_url;
-	char *http_username;
-	char *http_password;
-	char *http_compression;
-	char *http_method;
-	char *http_ssl_capath;
-	char *new_report;
-	time_t time_reference;
-	time_t next_retry;
-	time_t next_period;
-	bool http_persist_across_reboot;
-	bool http_insecure_enable;
-	bool enable;
-	bool http_use_date_header;
-	bool http_retry_enable;
-	struct profile_parameter *profile_parameter;
-	struct profile_http_request_uri_parameter *profile_http_uri_parameter;
-	struct list_head *failed_reports;
-} profile;
-
-typedef struct bulkdata {
-	struct device_id							device_id;
-	struct profile								*profile;
-	int 										log_level;
-	int 										amd_version;
-	unsigned int 								instance_mode;
-} bulkdata;
-
-int bulkdata_config_init(struct bulkdata *bulkdata);
-int bulkdata_config_fini(struct bulkdata *bulkdata);
-
-#ifndef FREE
-#define FREE(x) do { if(x) {free(x); x = NULL;} } while (0)
-#endif
-
-#endif //__CONFIG_H
-
-
-
-
-

bulkdata/src/datamodel.h

@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2020 iopsys Software Solutions AB
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- *		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
- */
-
-#ifndef _BULKDATA_H_
-#define _BULKDATA_H_
-
-#include <libbbf_api/dmcommon.h>
-
-extern DMOBJ tDeviceBulkDataObj[];
-extern DMOBJ tBulkDataObj[];
-extern DMLEAF tBulkDataParams[];
-extern DMOBJ tBulkDataProfileObj[];
-extern DMLEAF tBulkDataProfileParams[];
-extern DMLEAF tBulkDataProfileParameterParams[];
-extern DMLEAF tBulkDataProfileCSVEncodingParams[];
-extern DMLEAF tBulkDataProfileJSONEncodingParams[];
-extern DMOBJ tBulkDataProfileHTTPObj[];
-extern DMLEAF tBulkDataProfileHTTPParams[];
-extern DMLEAF tBulkDataProfileHTTPRequestURIParameterParams[];
-
-#endif //__BULKDATA_H_
-

bulkdata/src/http.c

@@ -1,196 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
-
-#include "http.h"
-
-static struct http_client http_c;
-static CURL *curl;
-
-int http_client_init(struct profile *profile)
-{
-	char *url = create_request_url(profile);
-	if(url) {
-		asprintf(&http_c.url, "%s", url);
-		free(url);
-	}
-	bulkdata_log(SINFO, "ACS url: %s", http_c.url);
-
-	curl_global_init(CURL_GLOBAL_SSL);
-	curl = curl_easy_init();
-	if (!curl) return -1;
-
-	return 0;
-}
-
-void http_client_exit(void)
-{
-	FREE(http_c.url);
-
-	if (http_c.header_list) {
-		curl_slist_free_all(http_c.header_list);
-		http_c.header_list = NULL;
-	}
-
-	curl_easy_cleanup(curl);
-	curl_global_cleanup();
-
-}
-
-static size_t http_get_response(void *buffer, size_t size, size_t rxed, char **msg_in)
-{
-	char *c;
-
-	if (asprintf(&c, "%s%.*s", *msg_in, (int) (size * rxed), (char *)buffer) == -1) {
-		FREE(*msg_in);
-		return -1;
-	}
-
-	free(*msg_in);
-	*msg_in = c;
-
-	return size * rxed;
-}
-
-int http_send_message(struct profile *profile, char *msg_out, int msg_out_len, char **msg_in)
-{
-	CURLcode res;
-	long http_code = 0;
-	char errbuf[CURL_ERROR_SIZE];
-
-	http_c.header_list = NULL;
-	http_c.header_list = curl_slist_append(http_c.header_list, "User-Agent: iopsys-bulkdata");
-	if (!http_c.header_list) return -1;
-
-	if (profile->http_use_date_header) {
-		if (bulkdata_get_time() != NULL) {
-			http_c.header_list = curl_slist_append(http_c.header_list, bulkdata_get_time());
-			if (!http_c.header_list) return -1;
-		}
-	}
-
-	if (strcmp(profile->encoding_type, "json") == 0) {
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Type: application/json; charset=\"utf-8\"");
-		if (!http_c.header_list) return -1;
-
-		if(strcmp (profile->json_encoding_report_format, "objecthierarchy") == 0) {
-			http_c.header_list = curl_slist_append(http_c.header_list, "BBF-Report-Format: \"ObjectHierarchy\"");
-			if (!http_c.header_list) return -1;
-		} else if(strcmp(profile->json_encoding_report_format, "namevaluepair") == 0) {
-			http_c.header_list = curl_slist_append(http_c.header_list, "BBF-Report-Format: \"NameValuePair\"");
-			if (!http_c.header_list) return -1;
-		}
-	} else if(strcmp(profile->encoding_type, "csv") == 0) {
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Type: text/csv; charset=\"utf-8\"");
-		if (!http_c.header_list) return -1;
-
-		if(strcmp (profile->csv_encoding_report_format, "row") == 0) {
-			http_c.header_list = curl_slist_append(http_c.header_list, "BBF-Report-Format: \"ParameterPerRow\"");
-			if (!http_c.header_list) return -1;
-		} else if(strcmp (profile->csv_encoding_report_format, "column") == 0) {
-			http_c.header_list = curl_slist_append(http_c.header_list, "BBF-Report-Format: \"ParameterPerColumn\"");
-			if (!http_c.header_list) return -1;
-		}
-	}
-
-	curl_easy_setopt(curl, CURLOPT_URL, http_c.url);
-	curl_easy_setopt(curl, CURLOPT_USERNAME, profile->http_username);
-	curl_easy_setopt(curl, CURLOPT_PASSWORD, profile->http_password);
-	curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC|CURLAUTH_DIGEST);
-	curl_easy_setopt(curl, CURLOPT_TIMEOUT, HTTP_TIMEOUT);
-	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, HTTP_TIMEOUT);
-	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
-	curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
-
-	if(strcasecmp(profile->http_compression, "gzip") == 0) {
-		curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "gzip");
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Encoding: gzip");
-	} else if(strcasecmp(profile->http_compression, "compress") == 0) {
-		curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "compress");
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Encoding: compress");
-	} else if(strcasecmp(profile->http_compression, "deflate") == 0) {
-		curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "deflate");
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Encoding: deflate");	
-	}
-
-	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, http_c.header_list);
-	if(strcasecmp(profile->http_method, "put") == 0)
-		curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
-	curl_easy_setopt(curl, CURLOPT_POSTFIELDS, msg_out);
-	if (msg_out)
-		curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long) msg_out_len);
-	else
-		curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0);
-
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, http_get_response);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, msg_in);
-
-	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf);
-	
-	if (profile->http_ssl_capath)
-		curl_easy_setopt(curl, CURLOPT_CAPATH, profile->http_ssl_capath);
-	if (profile->http_insecure_enable) {
-		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);
-		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);		
-	}
-	*msg_in = (char *) calloc (1, sizeof(char));
-
-	res = curl_easy_perform(curl);
-
-	if(res != CURLE_OK) {
-		size_t len = strlen(errbuf);
-		if(len) {
-			if (errbuf[len - 1] == '\n') errbuf[len - 1] = '\0';
-			bulkdata_log(SCRIT, "libcurl: (%d) %s", res, errbuf);
-		} else {
-			bulkdata_log(SCRIT, "libcurl: (%d) %s", res, curl_easy_strerror(res));
-		}
-	}
-
-	if (!strlen(*msg_in))
-		FREE(*msg_in);
-
-	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
-	if(http_code == 200)
-		bulkdata_log(SINFO, "Receive HTTP 200 OK from Bulkdata Collector");
-	else if(http_code == 401)
-		bulkdata_log(SINFO, "Receive HTTP 401 Unauthorized from Bulkdata Collector");
-	else if(http_code == 204)
-		bulkdata_log(SINFO, "Receive HTTP 204 No Content from Bulkdata Collector");
-	else
-		bulkdata_log(SINFO, "Receive HTTP %d from Bulkdata Collector", http_code);
-
-	if(http_code == 415)
-	{
-		strcpy(profile->http_compression, "None");
-		goto error;
-	}
-	if (http_code != 200 && http_code != 204)
-		goto error;
-
-	curl_easy_reset(curl);
-	if (http_c.header_list) {
-		curl_slist_free_all(http_c.header_list);
-		http_c.header_list = NULL;
-	}
-
-	if (res) goto error;
-
-	return http_code;
-
-error:
-	FREE(*msg_in);
-	if (http_c.header_list) {
-		curl_slist_free_all(http_c.header_list);
-		http_c.header_list = NULL;
-	}
-	return -1;
-}

bulkdata/src/http.h

@@ -1,37 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __HTTP_H
-#define __HTTP_H
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <curl/curl.h>
-#include "config.h"
-#include "log.h"
-#include "times.h"
-#include "common.h"
-
-#define HTTP_TIMEOUT 30
-
-struct http_client
-{
-	struct curl_slist *header_list;
-	char *url;
-};
-
-int http_client_init(struct profile *profile);
-void http_client_exit(void);
-int http_send_message(struct profile *profile, char *msg_out, int msg_out_len, char **msg_in);
-
-#endif //__HTTP_H

bulkdata/src/log.c

@@ -1,57 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <time.h>
-
-#include "bulkdata.h"
-#include "config.h"
-#include "log.h"
-
-static const int log_syslogmap[] = {
-	[SCRIT] = LOG_CRIT,
-	[SWARNING] = LOG_WARNING,
-	[SNOTICE] = LOG_NOTICE,
-	[SINFO] = LOG_INFO,
-	[SDEBUG] = LOG_DEBUG
-};
-
-static const char* log_str[] = {
-	[SCRIT] = "CRITICAL",
-	[SWARNING] = "WARNING",
-	[SNOTICE] = "NOTICE",
-	[SINFO] = "INFO",
-	[SDEBUG] = "DEBUG"
-};
-
-void bulkdata_log(int priority, const char *format, ...)
-{
-	va_list vl;
-
-	if (priority <= bulkdata_main.log_level) {
-		time_t t = time(NULL);
-		struct tm tm = *localtime(&t);
-		va_start(vl, format);
-		printf("%d-%02d-%02d %02d:%02d:%02d [bulkdata] %s - ", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, log_str[priority]);
-		vprintf(format, vl);
-		va_end(vl);
-		printf("\n");
-
-		openlog("bulkdata", 0, LOG_DAEMON);
-		va_start(vl, format);
-		vsyslog(log_syslogmap[priority], format, vl);
-		va_end(vl);
-		closelog();
-	}
-}

bulkdata/src/log.h

@@ -1,28 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __LOG_H
-#define __LOG_H
-
-#define DEFAULT_LOGLEVEL SINFO
-
-enum bulkdata_log_level_enum {
-	SCRIT,
-	SWARNING,
-	SNOTICE,
-	SINFO,
-	SDEBUG,
-	__MAX_SLOG
-};
-
-void bulkdata_log(int priority, const char *format, ...);
-
-#endif //__LOG_H

bulkdata/src/report.c

@@ -1,336 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*		Author: Omar Kallel <omar.kallel@pivasoftware.com>
-*
-*/
-
-#include "report.h"
-
-static void add_new_json_obj(json_object *json_obj, char *name, char *data, char *type)
-{
-	json_object *jobj;
-	if(strstr(type, "unsignedInt") || strstr(type, "int") || strstr(type, "long"))
-		jobj = json_object_new_int64(atoi(data));
-	else if(strstr(type, "bool"))
-		jobj = json_object_new_boolean(atoi(data));
-	else
-		jobj = json_object_new_string(data);
-
-	json_object_object_add(json_obj, name, jobj);
-}
-
-static void create_json_bulkdata_report_object_hierarchy(struct profile *profile, char **report)
-{
-	struct json_object *json_obj, *json_obj1, *json_obj2;
-	struct resultsnode *p;
-	int i, j, profile_param_number = profile->profile_parameter_number;
-	char *param_name, *result, *pch, *pchr, *collection_time = NULL;
-	char buf[1024] = {0};
-
-	json_obj = json_object_new_object();
-	get_time_stamp(profile->json_encoding_report_time_stamp, &collection_time);
-	if(collection_time) {
-		if(strcmp(profile->json_encoding_report_time_stamp, "iso8601") == 0)
-			json_object_object_add(json_obj, "CollectionTime", json_object_new_string(collection_time));
-		else
-			json_object_object_add(json_obj, "CollectionTime", json_object_new_int64(atoi(collection_time)));
-		free(collection_time);
-	}
-	json_obj2 = json_obj;
-	for (i = 0; i < profile_param_number; i++) {
-		LIST_HEAD(results_list);
-		bulkdata_get_value_results(profile->profile_parameter[i].reference, &results_list);
-		list_for_each_entry(p, &results_list, list) {
-			char *argv[128] = {0};
-			j = 0;
-			param_name = get_bulkdata_profile_parameter_name(profile->profile_parameter[i].reference, profile->profile_parameter[i].name, p->name);
-			strcpy(buf, param_name);
-			for (pch = strtok_r(buf, ".", &pchr); pch != NULL; pch = strtok_r(NULL, ".", &pchr)) {
-				argv[j] = pch;
-				json_obj1 = (json_object *)bbf_api_dmjson_select_obj(json_obj, argv);
-				if (json_obj1)
-					json_obj2 = json_obj1;
-				else {
-					if (pchr != NULL && *pchr != '\0') {
-						json_object *new_obj = json_object_new_object();
-						json_object_object_add(json_obj2, pch, new_obj);
-						json_obj2 = new_obj;
-					}
-					else
-						add_new_json_obj(json_obj2, pch, p->data, p->type);
-				}
-				j++;
-			}
-		}
-		bulkdata_free_data_from_list(&results_list);
-		FREE(param_name);
-	}
-	result = (char *)json_object_to_json_string_ext(json_obj, JSON_C_TO_STRING_PRETTY);
-	*report = strdup(result);
-	json_object_put(json_obj);
-}
-
-static void create_json_bulkdata_report_name_value_pair(struct profile *profile, char **report)
-{
-	struct json_object *json_obj;
-	struct resultsnode *p;
-	char *param_name, *result, *collection_time = NULL;
-	int i = 0, profile_param_number = profile->profile_parameter_number;
-
-	json_obj = json_object_new_object();
-	get_time_stamp(profile->json_encoding_report_time_stamp, &collection_time);
-	if(collection_time) {
-		if(strcmp(profile->json_encoding_report_time_stamp, "iso8601") == 0)
-			json_object_object_add(json_obj, "CollectionTime", json_object_new_string(collection_time));
-		else
-			json_object_object_add(json_obj, "CollectionTime", json_object_new_int64(atoi(collection_time)));
-		free(collection_time);
-	}
-	for (i = 0; i < profile_param_number; i++) {
-		LIST_HEAD(results_list);
-		bulkdata_get_value_results(profile->profile_parameter[i].reference, &results_list);
-		list_for_each_entry(p, &results_list, list) {
-			param_name = get_bulkdata_profile_parameter_name(profile->profile_parameter[i].reference, profile->profile_parameter[i].name, p->name);
-			add_new_json_obj(json_obj, param_name, p->data, p->type);
-			FREE(param_name);
-		}
-		bulkdata_free_data_from_list(&results_list);
-	}
-	result = (char *)json_object_to_json_string_ext(json_obj, JSON_C_TO_STRING_PRETTY);
-	*report = strdup(result);
-	json_object_put(json_obj);
-}
-
-static void add_failed_reports_to_report_json(struct profile *profile, char *new_report, char **report, int isnext)
-{
-	json_object *json_obj, *json_array, *json_string;
-	struct failed_reports *retreport = NULL;
-	char *msgout = NULL;
-	int j = 0;
-
-	json_obj = json_object_new_object();
-	json_array = json_object_new_array();
-	json_object_object_add(json_obj,"Report", json_array);
-
-	if(list_empty(profile->failed_reports))
-		goto new_report;
-
-	list_for_each_entry(retreport, profile->failed_reports, list) {
-		if(!j && isnext) {
-			j = 1;
-			continue;
-		}
-		json_string = json_tokener_parse(retreport->freport);
-		json_object_array_add(json_array, json_string);
-	}
-
-new_report :
-	if(new_report) {
-		json_string = json_tokener_parse(new_report);
-		json_object_array_add(json_array, json_string);
-	}
-
-	msgout = (char *)json_object_to_json_string_ext(json_obj, JSON_C_TO_STRING_PRETTY);
-	*report = strdup(msgout);
-	json_object_put(json_obj);
-}
-
-static void create_report_json(char *new_report, char **report)
-{
-	json_object *json_obj, *json_array, *json_string;
-	char *msgout = NULL;
-
-	json_obj = json_object_new_object();
-	json_array = json_object_new_array();
-	json_object_object_add(json_obj,"Report", json_array);
-
-	if(new_report) {
-		json_string = json_tokener_parse(new_report);
-		json_object_array_add(json_array, json_string);
-	}
-
-	msgout = (char *)json_object_to_json_string_ext(json_obj, JSON_C_TO_STRING_PRETTY);
-	*report = strdup(msgout);
-	json_object_put(json_obj);
-}
-
-int create_json_bulkdata_report(struct profile *profile, char **report)
-{
-	/*
-	 * create json msg of current report
-	 * parse failed reports list and add it to the report
-	 * then add new report to the report
-	 */
-	char *msgout;
-
-	profile->new_report = NULL;
-	if(strcmp(profile->json_encoding_report_format, "objecthierarchy") == 0) {
-		create_json_bulkdata_report_object_hierarchy(profile, &msgout);
-	} else if(strcmp(profile->json_encoding_report_format, "namevaluepair") == 0) {
-		create_json_bulkdata_report_name_value_pair(profile, &msgout);
-	}
-
-	if(profile->nbre_of_retained_failed_reports != 0) {
-		if(profile->nbre_failed_reports >= profile->nbre_of_retained_failed_reports && profile->nbre_of_retained_failed_reports > 0)
-			add_failed_reports_to_report_json(profile, msgout, report, 1);
-		else
-			add_failed_reports_to_report_json(profile, msgout, report, 0);
-	} else {
-		create_report_json(msgout, report);
-	}
-
-	append_string_to_string(msgout, &profile->new_report);
-	FREE(msgout);
-	return 0;
-}
-
-int create_csv_bulkdata_report(struct profile *profile, char **report)
-{
-	/*
-	 * create csv msg of current report
-	 * parse failed reports list and add it to the report
-	 */
-	int i;
-	struct resultsnode *p;
-	char *str1 = NULL, *str2 = NULL, *str = NULL, *paramprofilename, *timestamp = NULL, *type = NULL, rowseparator = '\0', separator = '\0';
-
-	if(strcmp(profile->csv_encoding_row_separator, "&#10;") == 0)
-		rowseparator = '\n';
-	else if(strcmp(profile->csv_encoding_row_separator, "&#13;") == 0)
-		rowseparator = '\r';
-
-	if(profile->csv_encoding_field_separator)
-		separator = profile->csv_encoding_field_separator[0];
-
-	get_time_stamp(profile->csv_encoding_row_time_stamp, &timestamp);
-	/*
-	 * Create header ReportTimestamp,ParameterName,ParameterValue,ParameterType in case of ParameterPerRow
-	 */
-	if(strcmp(profile->csv_encoding_report_format, "row") == 0) {
-		if(timestamp == NULL)
-			asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-		else
-			asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
-		append_string_to_string(str, report);
-		FREE(str);
-		if(profile->nbre_of_retained_failed_reports != 0) {
-			if(profile->nbre_failed_reports >= profile->nbre_of_retained_failed_reports && profile->nbre_of_retained_failed_reports > 0)
-				add_failed_reports_to_report_csv(profile, report, 1);
-			else
-				add_failed_reports_to_report_csv(profile, report, 0);
-		}
-	}
-	if(strcmp(profile->csv_encoding_report_format, "column") == 0 && timestamp != NULL) {
-		if(profile->nbre_of_retained_failed_reports != 0) {
-			if(profile->nbre_failed_reports >= profile->nbre_of_retained_failed_reports && profile->nbre_of_retained_failed_reports > 0)
-				add_failed_reports_to_report_csv(profile, report, 1);
-			else
-				add_failed_reports_to_report_csv(profile, report, 0);
-		}
-		append_string_to_string("ReportTimestamp", &str1);
-		append_string_to_string(timestamp, &str2);
-	}
-
-	/*
-	 * Add New reports
-	 */
-	profile->new_report = NULL;
-	for(i = 0; i < profile->profile_parameter_number; i++) {
-		LIST_HEAD(results_list);
-		bulkdata_get_value_results(profile->profile_parameter[i].reference, &results_list);
-		list_for_each_entry(p, &results_list, list) {
-			paramprofilename = get_bulkdata_profile_parameter_name(profile->profile_parameter[i].reference, profile->profile_parameter[i].name, p->name);
-			if(strcmp(profile->csv_encoding_report_format, "row") == 0) {
-				type = strstr(p->type, ":");
-				if(timestamp == NULL)
-					asprintf(&str, "%s%c%s%c%s%c", paramprofilename, separator, p->data, separator, type+1, rowseparator);
-				else
-					asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, paramprofilename, separator, p->data, separator, type+1, rowseparator);
-				append_string_to_string(str, report);
-				append_string_to_string(str, &profile->new_report);
-				FREE(str);
-			} else if(strcmp(profile->csv_encoding_report_format, "column") == 0) {
-				if(str1 == NULL || strlen(str1) <= 0)
-					asprintf(&str, "%s", paramprofilename);
-				else
-					asprintf(&str, "%c%s", separator, paramprofilename);
-				append_string_to_string(str, &str1);
-				FREE(str);
-				if(str2 == NULL || strlen(str2) <= 0)
-					asprintf(&str, "%s", p->data);
-				else
-					asprintf(&str, "%c%s", separator, p->data);
-				append_string_to_string(str, &str2);
-				FREE(str);
-			}
-			FREE(paramprofilename);
-		}
-		bulkdata_free_data_from_list(&results_list);
-	}
-	if(strcmp(profile->csv_encoding_report_format, "column") == 0) {
-		asprintf(&str, "%c", rowseparator);
-		append_string_to_string(str, &str1);
-		append_string_to_string(str, &str2);
-		append_string_to_string(str1, report);
-		append_string_to_string(str2, report);
-		append_string_to_string(str1, &profile->new_report);
-		append_string_to_string(str2, &profile->new_report);
-	}
-	FREE(str);
-	FREE(str1);
-	FREE(str2);
-	FREE(timestamp);
-	return 0;
-}
-
-static void create_json_failed_report(struct profile *profile, char **report)
-{
-	add_failed_reports_to_report_json(profile, NULL, report, 0);
-}
-
-static void create_csv_failed_report(struct profile *profile, char **report)
-{
-	char rowseparator = '\0', separator = '\0', *timestamp = NULL;
-
-	if(strcmp(profile->csv_encoding_row_separator, "&#10;") == 0) {
-		rowseparator = '\n';
-	} else if(strcmp(profile->csv_encoding_row_separator, "&#13;") == 0) {
-		rowseparator = '\r';
-	}
-
-	if(profile->csv_encoding_field_separator)
-		separator = profile->csv_encoding_field_separator[0];
-
-	get_time_stamp(profile->csv_encoding_row_time_stamp, &timestamp);
-	if(strcmp(profile->csv_encoding_report_format, "row") == 0) {
-		if(timestamp == NULL)
-			asprintf(report, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-		else
-			asprintf(report, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
-	}
-	add_failed_reports_to_report_csv(profile, report, 0);
-}
-
-void create_encoding_bulkdata_report(struct profile *profile, char **report)
-{
-	if(strcasecmp(profile->encoding_type, "json") == 0) {
-		create_json_bulkdata_report(profile, report);
-	} else if(strcasecmp(profile->encoding_type, "csv") == 0) {
-		create_csv_bulkdata_report(profile, report);
-	}
-}
-
-void create_failed_report(struct profile *profile, char **report)
-{
-	if(strcasecmp(profile->encoding_type, "json") == 0) {
-		create_json_failed_report(profile, report);
-	} else if(strcasecmp(profile->encoding_type, "csv") == 0) {
-		create_csv_failed_report(profile, report);
-	}
-}

bulkdata/src/report.h

@@ -1,24 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*		Author: Omar Kallel <omar.kallel@pivasoftware.com>
-*
-*/
-
-#ifndef __REPORT_H_
-#define __REPORT_H_
-
-#include <json-c/json.h>
-#include "common.h"
-#include "times.h"
-#include "config.h"
-
-void create_encoding_bulkdata_report(struct profile *profile, char **report);
-void create_failed_report(struct profile *profile, char **report);
-
-#endif /* __REPORT_H_ */

bulkdata/src/times.c

@@ -1,62 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include "times.h"
-
-const char *bulkdata_get_time(void)
-{
-	static char local_time[64];
-
-	time_t t_time = time(NULL);
-	struct tm *t_tm = localtime(&t_time);
-	if (t_tm == NULL)
-		return NULL;
-
-	if (strftime(local_time, sizeof(local_time),"Date: %a, %d %b %Y %X%z GMT", t_tm) == 0)
-		return NULL;
-
-	return local_time;
-}
-
-void get_time_stamp(const char *format, char **timestamp)
-{
-	time_t now = time(NULL);
-
-	if (strcmp(format, "unix") == 0) {
-		asprintf(timestamp, "%ld", now);
-	} else if (strcmp(format, "iso8601") == 0) {
-		char buf[32] = {0};
-		struct tm *ts = localtime(&now);
-		strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S%Z", ts);
-		asprintf(timestamp, "%s", buf);
-	} else
-		timestamp = NULL;
-}
-
-unsigned int get_next_period(time_t time_reference, int reporting_interval)
-{
-	unsigned int next_period;
-	time_t now = time(NULL);
-
-	if (now > time_reference)
-		next_period = reporting_interval - ((now - time_reference) % reporting_interval);
-	else
-		next_period = (time_reference - now) % reporting_interval;
-
-	if (next_period == 0)
-		next_period = reporting_interval;
-
-	return next_period;
-}

bulkdata/src/times.h

@@ -1,19 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __TIMES_H
-#define __TIMES_H
-
-const char *bulkdata_get_time(void);
-void get_time_stamp(const char *format, char **timestamp);
-unsigned int get_next_period(time_t time_reference, int reporting_interval);
-
-#endif /* __TIMES_H */

catv/Makefile

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

catv/files/etc/init.d/catv

@@ -1,4 +1,7 @@
 #!/bin/sh /etc/rc.common
+#
+# Copyright (C) 2015 inteno.org
+#
 
 START=71
 USE_PROCD=1

crashlog/Makefile

@@ -1,18 +1,9 @@
-#
-# 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,15 +4,16 @@ START=99
 
 send_log()
 {
-	nr=$(db get hw.board.serial_number)
-	hw=$(db get hw.board.model_name)
-	fam=$(db get hw.board.iopVerFam)
+	nr=$(db get hw.board.serialNumber)
+	hw=$(db get hw.board.hardware)
+	hwv=$(db get hw.board.hardwareVersion)
+	bid=$(db get hw.board.boardId)
 	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/${fam}_${hw}_${sw}_${nr}
+	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${bid}_${hwv}_${hw}_${sw}_${nr}
 	    if [ $? == 0 ]
 	    then
 	       break;
@@ -27,7 +28,7 @@ fill_in_default()
     /sbin/uci add system log
     /sbin/uci rename system.@log[-1]=crashlog
     /sbin/uci set system.crashlog.enable=no
-    /sbin/uci set system.crashlog.server="crashlog.iopsys.eu"
+    /sbin/uci set system.crashlog.server="crash.inteno.se"
     /sbin/uci commit
 }
 

crashlog/files/sbin/logcore

@@ -20,7 +20,7 @@ fill_in_default()
     /sbin/uci add system log
     /sbin/uci rename system.@log[-1]=corelog
     /sbin/uci set system.corelog.enable=no
-    /sbin/uci set system.corelog.server="corelog.iopsys.eu"
+    /sbin/uci set system.corelog.server="crash.inteno.se"
     /sbin/uci commit
 }
 
@@ -50,11 +50,12 @@ cat >$TMP_CORE
 # more memory to work with. normally this would do nothing.
 cat >/dev/null
 
-nr=$(db get hw.board.serial_number)
-hw=$(db get hw.board.model_name)
-fam=$(hw.board.iopVerFam)
+nr=$(db get hw.board.serialNumber)
+hw=$(db get hw.board.hardware)
+hwv=$(db get hw.board.hardwareVersion)
+bid=$(db get hw.board.boardId)
 sw=$(db get hw.board.iopVersion)
 
-scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${fam}_${hw}_${sw}_${nr}
+scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${bid}_${hwv}_${hw}_${sw}_${nr}
 rm $TMP_CORE
 

crashlog/readme

@@ -24,7 +24,7 @@ What we need is the public key for the clients.
 For dropbear "dropbearkey -y -f files/etc/dropbear/logid" will generate the public key.
 
 ----------
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@iopsys
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@inteno
 ----------
 
 The public key should be just one line. Add that line to the 

crun/Makefile

@@ -1,50 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=crun
-PKG_VERSION:=0.17
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/containers/crun.git
-PKG_SOURCE_VERSION:=0e9229ae34caaebcb86f1fde18de3acaf18c6d9a
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/crun
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+yajl +argp-standalone +libcap +libseccomp
-  TITLE:=A fast and low-memory footprint OCI Container Runtime fully written in C
-endef
-
-define Package/crun/description
-  crun conforms to the OCI Container Runtime specifications
-endef
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-TARGET_LDFLAGS += -largp
-
-MAKE_FLAGS := \
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)"
-	
-define Build/Configure
-	cd $(PKG_BUILD_DIR)/ && sh autogen.sh && ./configure
-endef	
-
-define Package/crun/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/crun $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,crun))

crun/patches/01-fix-for-openwrt-and-kernel-4-19.patch

@@ -1,217 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5e9f2f9..5ed99bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -52,16 +52,6 @@ AS_IF([test "x$enable_seccomp" != "xno"], [
- 	])
- ])
- 
--dnl libsystemd
--AC_ARG_ENABLE([systemd],
--	AS_HELP_STRING([--disable-systemd], [Ignore systemd and disable support]))
--AS_IF([test "x$enable_systemd" != "xno"], [
--	AC_CHECK_HEADERS([systemd/sd-bus.h], [], [AC_MSG_ERROR([*** Missing libsystemd headers])])
--	AS_IF([test "$ac_cv_header_systemd_sd_bus_h" = "yes"], [
--		AC_SEARCH_LIBS(sd_bus_match_signal_async, [systemd], [AC_DEFINE([HAVE_SYSTEMD], 1, [Define if libsystemd is available])], [AC_MSG_ERROR([*** Failed to find libsystemd])])
--	])
--])
--
- dnl ebpf
- AC_ARG_ENABLE([bpf],
- 	AS_HELP_STRING([--disable-bpf], [Ignore eBPF and disable support]))
-@@ -114,26 +104,6 @@ AS_IF([test "x$enable_criu" != "xno"], [
- FOUND_LIBS=$LIBS
- LIBS=""
- 
--AC_MSG_CHECKING([for new mount API (fsconfig)])
--AC_COMPILE_IFELSE(
--	[AC_LANG_SOURCE([[
--			#include <linux/mount.h>
--			int cmd = FSCONFIG_CMD_CREATE;
--		]])],
--		[AC_MSG_RESULT(yes)
--		 AC_DEFINE([HAVE_FSCONFIG_CMD_CREATE], 1, [Define if FSCONFIG_CMD_CREATE is available])],
--		[AC_MSG_RESULT(no)])
--
--AC_MSG_CHECKING([for seccomp notify API])
--AC_COMPILE_IFELSE(
--	[AC_LANG_SOURCE([[
--			#include <linux/seccomp.h>
--			int cmd = SECCOMP_GET_NOTIF_SIZES;
--		]])],
--		[AC_MSG_RESULT(yes)
--		 AC_DEFINE([HAVE_SECCOMP_GET_NOTIF_SIZES], 1, [Define if SECCOMP_GET_NOTIF_SIZES is available])],
--		[AC_MSG_RESULT(no)])
--
- AC_DEFINE([LIBCRUN_PUBLIC], [__attribute__((visibility("default"))) extern], [LIBCRUN_PUBLIC])
- AC_SUBST([FOUND_LIBS])
- AC_SUBST([CRUN_LDFLAGS])
-diff --git a/src/libcrun/cgroup.c b/src/libcrun/cgroup.c
-index 29c1f7a..77dc441 100644
---- a/src/libcrun/cgroup.c
-+++ b/src/libcrun/cgroup.c
-@@ -575,23 +575,6 @@ get_file_owner (const char *path, uid_t *uid, gid_t *gid)
-   struct stat st;
-   int ret;
- 
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (AT_FDCWD, path, AT_STATX_DONT_SYNC, STATX_UID | STATX_GID, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--
--      return ret;
--    }
--  *uid = stx.stx_uid;
--  *gid = stx.stx_gid;
--  return ret;
--
--fallback:
--#endif
-   ret = stat (path, &st);
-   if (UNLIKELY (ret < 0))
-     return ret;
-diff --git a/src/libcrun/error.h b/src/libcrun/error.h
-index aa3f3aa..477a2fe 100644
---- a/src/libcrun/error.h
-+++ b/src/libcrun/error.h
-@@ -18,9 +18,6 @@
- #ifndef ERROR_H
- #define ERROR_H
- #include <config.h>
--#ifdef HAVE_ERROR_H
--#  include <error.h>
--#else
- #  define error(status, errno, fmt, ...)                      \
-     do                                                        \
-       {                                                       \
-@@ -35,7 +32,6 @@
-           exit (status);                                      \
-       }                                                       \
-     while (0)
--#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdbool.h>
-diff --git a/src/libcrun/utils.c b/src/libcrun/utils.c
-index cbde9b6..5ef7f5f 100644
---- a/src/libcrun/utils.c
-+++ b/src/libcrun/utils.c
-@@ -164,22 +164,6 @@ get_file_type_fd (int fd, mode_t *mode)
-   struct stat st;
-   int ret;
- 
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (fd, "", AT_EMPTY_PATH | AT_STATX_DONT_SYNC, STATX_TYPE, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--
--      return ret;
--    }
--  *mode = stx.stx_mode;
--  return ret;
--
--fallback:
--#endif
-   ret = fstat (fd, &st);
-   *mode = st.st_mode;
-   return ret;
-@@ -191,22 +175,6 @@ get_file_type_at (int dirfd, mode_t *mode, bool nofollow, const char *path)
-   struct stat st;
-   int ret;
- 
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (dirfd, path, (nofollow ? AT_SYMLINK_NOFOLLOW : 0) | AT_STATX_DONT_SYNC, STATX_TYPE, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--
--      return ret;
--    }
--  *mode = stx.stx_mode;
--  return ret;
--
--fallback:
--#endif
-   ret = fstatat (dirfd, path, &st, nofollow ? AT_SYMLINK_NOFOLLOW : 0);
-   *mode = st.st_mode;
-   return ret;
-@@ -550,22 +518,7 @@ get_file_size (int fd, off_t *size)
- {
-   struct stat st;
-   int ret;
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (fd, "", AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC, STATX_SIZE, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--      return ret;
--    }
--  *size = stx.stx_size;
--
--  return ret;
- 
--fallback:
--#endif
-   ret = fstat (fd, &st);
-   *size = st.st_size;
-   return ret;
-@@ -1060,7 +1013,6 @@ run_process (char **args, libcrun_error_t *err)
-   _exit (EXIT_FAILURE);
- }
- 
--#ifndef HAVE_FGETPWENT_R
- static unsigned
- atou (char **s)
- {
-@@ -1126,7 +1078,6 @@ fgetpwent_r (FILE *f, struct passwd *pw, char *line, size_t size, struct passwd
-     errno = rv;
-   return rv;
- }
--#endif
- 
- int
- set_home_env (uid_t id)
-@@ -1690,29 +1641,6 @@ copy_rec_stat_file_at (int dfd, const char *path, mode_t *mode, off_t *size, dev
-   struct stat st;
-   int ret;
- 
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (dfd, path, AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC,
--               STATX_TYPE | STATX_MODE | STATX_SIZE | STATX_UID | STATX_GID, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--
--      return ret;
--    }
--
--  *mode = stx.stx_mode;
--  *size = stx.stx_size;
--  *rdev = makedev (stx.stx_rdev_major, stx.stx_rdev_minor);
--  *uid = stx.stx_uid;
--  *gid = stx.stx_gid;
--
--  return ret;
--
--fallback:
--#endif
-   ret = fstatat (dfd, path, &st, AT_SYMLINK_NOFOLLOW);
- 
-   *mode = st.st_mode;

dectmngr/Makefile

@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2021 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:=dectmngr
-PKG_RELEASE:=3
-PKG_VERSION:=3.0.9
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b742ea24a85a67e15270f5d66a5af28f25b653f9
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-RSTRIP:=true
-export BUILD_DIR
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Utilities
- 	TITLE:=DECT Manager
- 	DEPENDS:= +libubox +ubus
-endef
-
-define Package/$(PKG_NAME)/description
-	DECT manager is a daemon that provides UBUS RPC objects and sends UBUS events for communication with the DECT chip.
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -av --exclude=.* ~/git/voip/dectmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-MAKE_FLAGS += \
-	CFLAGS+="-Wall"
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/dectmngr
-	$(CP) ./files/etc/* $(1)/etc/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/files/etc/init.d/dect

@@ -1,63 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2021 OpenWrt.org
-#
-
-source /lib/functions/uci-defaults.sh
-
-START=70
-STOP=12
-
-USE_PROCD=1
-NAME=dectmngr
-PROG=/usr/sbin/dectmngr
-
-# Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
-stop_and_wait_dectmngr() {
-	pidof $NAME && killall -q $NAME
-
-	pidof $NAME && sleep 2 # wait for the process to stop gracefully
-	while pidof $NAME; do
-		killall -q -9 $NAME 
-		sleep 1
-	done
-}
-
-start_service() {
-	test $(db get hw.board.hasDect) = "0" && return
-
-	echo 1 > /sys/class/gpio/gpio14/value
-
-	rm -f /tmp/dect-cmbs.log /tmp/dect-cmbs_Host_log.txt /tmp/dectmngr.log
-
-	procd_open_instance
-	procd_set_param command $PROG -comname ttyH0 -log /tmp/dect-cmbs.log
-	procd_set_param respawn 6 2 3
-	procd_set_param term_timeout 20
-	procd_set_param triggers asterisk
-	procd_close_instance
-}
-
-stop_service() {
-	test $(db get hw.board.hasDect) = "0" && return
-
-	echo 0 > /sys/class/gpio/gpio14/value
-	stop_and_wait_dectmngr
-}
-
-reload_service() {
-	stop_and_wait_dectmngr
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger asterisk
-}
-
-boot() {
-	echo 14 > /sys/class/gpio/export
-	echo out > /sys/class/gpio/gpio14/direction
-	start
-}
-

dectmngr/files/scripts/load_sound_modules.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-SOUND_BASE=/lib/modules/$(uname -r)/kernel/sound
-SOUND_MODULES="$SOUND_BASE/soundcore.ko $SOUND_BASE/core/snd.ko $SOUND_BASE/core/snd-timer.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/snd-pcm.ko $SOUND_BASE/core/snd-hwdep.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/seq/snd-seq-device.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/seq/snd-seq.ko $SOUND_BASE/core/snd-rawmidi.ko "
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/usb/snd-usbmidi-lib.ko $SOUND_BASE/usb/snd-usb-audio.ko"
-
-load_sound_modules() {
-	for mod in $SOUND_MODULES; do
-		insmod $mod
-	done
-}
-
-unload_sound_modules() {
-	local modules=
-
-	# reverse the order
-	for mod in $SOUND_MODULES; do
-		modules="$mod $modules"
-	done
-
-	for mod in $modules; do
-		rmmod $mod
-	done
-}

dectmngr2/Makefile

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_RELEASE:=1
+PKG_VERSION:=1.3.0
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=5a5c94b289c79bc3a635b8d742dd9b73dcc0615f
+PKG_NAME:=dectmngr2
+
+
+RSTRIP:=true
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dectmngr2
+  CATEGORY:=Utilities
+  TITLE:=Dectmngr2
+  URL:=
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
+endef
+
+define Package/dectmngr2/description
+	Dectmngr2
+endef
+
+
+define Package/dectmngr2/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/dect/
+	$(INSTALL_DIR) $(1)/etc/config/
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults/
+
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/nvs_default $(1)/etc/dect/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dectmngr-wrapper.sh $(1)/usr/sbin/
+	$(CP) ./files/dect.config $(1)/etc/config/dect
+	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
+endef
+
+$(eval $(call BuildPackage,dectmngr2))

dectmngr2/files/dect.config

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

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

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

dslmngr/Makefile

@@ -8,25 +8,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d17c699c1fc9588303d6da35ac2250903bf17cd8
+PKG_SOURCE_VERSION:=7522faab4142fe2c0ac8cbf71bb0cc5bd49f0750
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
@@ -44,7 +42,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +easy-soc-libs
 endef
 
 define Package/dslmngr/description
@@ -55,7 +53,6 @@ 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,29 +1,19 @@
-#
-# 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.1
+PKG_VERSION:=1.0
 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)
 endef
 
 define Package/easy-qos/description
-	This package contains Easy QoS utility
+	This package contains Easy QoS utitie
 endef
 
 define Build/Prepare
@@ -39,11 +29,7 @@ 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

@@ -1,301 +0,0 @@
-#!/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" -o "${protocol}" == "tcpudp" ]; then
+			if [ "${protocol}" == "none" ]; 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" -o "${protocol}" == "tcpudp" ]; then
+			if [ "${protocol}" == "none" ]; then
 				create_rule tcp ${macaddr} ${prio_num}
 				create_rule udp ${macaddr} ${prio_num}
 			else

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

@@ -158,7 +158,7 @@ manage_rule() {
 	port_list=$(echo ${port}|sed 's/ /,/g')
 
 	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
+		if [ "${proto}" == "none" ]; 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,5 +4,7 @@ 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

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

easy-soc-libs/Config.in

@@ -1,5 +1,23 @@
-# libeasy configuration
+if (PACKAGE_libwifi || PACKAGE_libdsl || PACKAGE_libethernet)
+menu "configurations"
 
-config LIBWIFI_USE_CTRL_IFACE
-	bool "Use UNIX sockets"
+config IOP_LLA_LIBS_DEBUG
+	bool "Enable debugging support"
 	default n
+
+config LIBWIFI_DEBUG
+	depends on PACKAGE_libwifi
+	bool "Enable wifi debugging"
+	default n
+
+config LIBDSL_DEBUG
+	depends on PACKAGE_libdsl
+	bool "Enable xdsl debugging"
+	default n
+
+config LIBDSL_TEST
+	depends on PACKAGE_libdsl
+	bool "Libdsl test program"
+	default n
+endmenu
+endif

easy-soc-libs/Makefile

@@ -1,47 +1,60 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
+# Copyright (C) 2018 Iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.1.89
+PKG_VERSION:=1.0.14
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=509c57cdcbabcc819932e673718c1a305bf32009
+PKG_SOURCE_VERSION:=76a0b60abe97499e4fe83bffd5fd698ba8b336bc
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
 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
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=IOPSYS Easy SoC libraries
-  SUBMENU:=IOPSYS Easy SoC libraries
+  TITLE:=IOPSYS easy SoC libraries
+  SUBMENU:=IOPSYS easy SoC libraries
   DEPENDS:=+libopenssl
   MENU:=1
 endef
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+define Package/libwifi/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/libwifi
+  $(call Package/easy-soc-libs)
+  TITLE:= WiFi library (libwifi)
+  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
+endef
+
+define Package/libethernet
+  $(call Package/easy-soc-libs)
+  TITLE:= Ethernet library (libethernet)
+  DEPENDS+=+TARGET_iopsys_ramips:swconfig
+endef
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
   TARGET_PLATFORM=BROADCOM
-  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
@@ -51,35 +64,26 @@ else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
 else ifeq ($(CONFIG_TARGET_intel_mips),y)
   TARGET_PLATFORM=INTEL
   TARGET_CFLAGS +=-DIOPSYS_INTEL
-else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
-  TARGET_PLATFORM=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
-  TARGET_PLATFORM=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
 else
   $(info Unexpected CONFIG_TARGET)
 endif
 
 export TARGET_PLATFORM
 
+ifdef CONFIG_IOP_LLA_LIBS_DEBUG
+  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
+endif
+
+define Package/libdsl
+  $(call Package/easy-soc-libs)
+  TITLE:= XDSL library (libdsl)
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
+endef
+
 subdirs := \
-	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
-	$(if $(CONFIG_PACKAGE_libqos),libqos)
-
-EASY_SOC_LIBS := \
-	libeasy \
-	libwifi \
-	libdsl \
-	libethernet \
-	libqos
-
-ifeq ($(CONFIG_LIBWIFI_USE_CTRL_IFACE),y)
-  TARGET_CFLAGS +=-DLIBWIFI_USE_CTRL_IFACE
-endif
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
@@ -99,36 +103,57 @@ define Build/Prepare
 endef
 endif
 
-include easy.mk
-include wifi.mk
-include dsl.mk
-include ethernet.mk
-include qos.mk
-
-ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),\
-	$(PKG_BUILD_DIR)/.config_$(patsubst "%",%,$(CONFIG_TARGET_PROFILE)))
-define Build/Compile/rebuild
-	$(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.so\* | $(XARGS) rm -f;
-	$(if $(wildcard $(PKG_BUILD_DIR)/config_*), \
-		rm -f $(PKG_BUILD_DIR)/.config_*)
+define Build/InstallDev/libwifi
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef
-endif
 
-STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(TARGET_CFLAGS) | mkhash md5)
+define Build/InstallDev/libdsl
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+endef
+
+define Build/InstallDev/libethernet
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
+endef
 
 define Build/Compile
-	$(Build/Compile/rebuild)
-	touch $(PKG_BUILD_DIR)/.config_$(CONFIG_TARGET_PROFILE)
 	$(call Build/Compile/Default)
-	$(foreach dir,$(subdirs),$(call Build/Compile/$(dir)))
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
+endif
 endef
 
 define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
-define Package/easy-soc-libs/install
-	:
+define Package/libwifi/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef
 
-$(eval $(foreach e,$(EASY_SOC_LIBS),$(call BuildPackage,$(e))))
+define Package/libethernet/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
+endef
+
+define Package/libdsl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
+endif
+endef
+
+$(eval $(call BuildPackage,libwifi))
+$(eval $(call BuildPackage,libdsl))
+$(eval $(call BuildPackage,libethernet))

easy-soc-libs/dsl.mk

@@ -1,47 +0,0 @@
-
-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 \
-	   +TARGET_intel_mips:kmod-ppa-drv
-endef
-
-define Package/libdsl/config
-  if PACKAGE_libdsl
-	  config LIBDSL_DEBUG
-		depends on PACKAGE_libdsl
-		bool "Enable dsl debugging"
-		default n
-
-	  config LIBDSL_TEST
-		depends on PACKAGE_libdsl
-		bool "Enable dsl test program"
-		default n
-
-  endif
-endef
-
-define Build/InstallDev/libdsl
-	$(INSTALL_DIR) $(1)/usr/include/xdsl
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(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
-
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-define Build/Compile/libdsl
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endef
-endif
-
-define Package/libdsl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
-endef

easy-soc-libs/easy.mk

@@ -1,28 +0,0 @@
-
-
-define Package/libeasy
-  $(call Package/easy-soc-libs)
-  TITLE:= Common helper functions library (libeasy)
-  DEPENDS+=+libnl +libnl-route
-endef
-
-define Package/libeasy/config
-    source "$(SOURCE)/Config.in"
-endef
-
-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/if_utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/debug.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-
-define Package/libeasy/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/ethernet.mk

@@ -1,27 +0,0 @@
-
-define Package/libethernet
-  $(call Package/easy-soc-libs)
-  TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
-endef
-
-define Package/libethernet/config
-  config LIBETHERNET_DEBUG
-	depends on PACKAGE_libethernet
-	bool "Enable ethernet debugging"
-	default n
-
-endef
-
-define Build/InstallDev/libethernet
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
-endef
-
-define Package/libethernet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/qos.mk

@@ -1,27 +0,0 @@
-
-define Package/libqos
-  $(call Package/easy-soc-libs)
-  TITLE:= QoS library (libqos)
-  DEPENDS+=+libnl +libnl-route +libeasy
-endef
-
-define Package/libqos/config
-  config LIBQOS_DEBUG
-	depends on PACKAGE_libqos
-	bool "Enable qos debugging"
-	default n
-
-endef
-
-define Build/InstallDev/libqos
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/qos.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libqos/libqos.so $(1)/usr/lib/
-endef
-
-define Package/libqos/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/libqos*.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/wifi.mk

@@ -1,29 +0,0 @@
-
-define Package/libwifi
-  $(call Package/easy-soc-libs)
-  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel
-endef
-
-define Package/libwifi/config
-  if PACKAGE_libdsl
-	  config LIBWIFI_DEBUG
-		depends on PACKAGE_libwifi
-		bool "Enable wifi debugging"
-		default n
-
-  endif
-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/
-endef
-
-define Package/libwifi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-

endptmngr/Makefile

@@ -1,47 +1,35 @@
 #
-# Copyright (C) 2018 IOPSYS Software Solutions AB
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.4
-PKG_SOURCE_VERSION:=510b885c049b8ba06772dae59e64b370d0fded3e
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
+PKG_VERSION:=0.2
+PKG_SOURCE_VERSION:=ef49d57c3824df4dfb4921d39461e2bd14f918a7
+
 
 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:=https://download.iopsys.eu/iopsys/opensdk/
+PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=endptmngr-open
 PATCH_DIR:=
-PKG_HASH:=skip
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_NAME:=endptmngr
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
+PKG_NAME:=endptmngr
 endif
 
+RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
 
-# All config variable that are passed to the make invocation, directly or
-# indirectly. This ensures that the package is rebuilt on config-changes.
-PKG_CONFIG_DEPENDS := \
-	CONFIG_TARGET_BOARD
-
-export CONFIG_BRCM_SDK_VER_504001
-export CONFIG_BRCM_SDK_VER_504002
-export CONFIG_BRCM_SDK_VER_504003
-export CONFIG_BRCM_SDK_VER_504004
-export CONFIG_BRCM_SDK_VER_504005
 
 
 include $(INCLUDE_DIR)/package.mk
@@ -54,7 +42,7 @@ define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +uci +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
+  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
 endef
 
 define Package/endptmngr/description

ethmngr/Makefile

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

fatrace/Makefile

@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2006-2010 OpenWrt.org
 #
-# This is free software, licensed under the GNU General Public License v3.
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
@@ -20,9 +20,6 @@ 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
 

fping/Makefile

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

gigaset-elements/.gitignore

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

gigaset-elements/Makefile

@@ -0,0 +1,65 @@
+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:=GPLv2
+  PKG_LICENSE:=Genexis
   PKG_LICENSE_URL:=
 endef
 

gryphon-led-module/src/main.c

@@ -46,10 +46,9 @@ static ssize_t get_led_color(struct device *dev,
 	/* [ln] todo: dummy implementation */
 	int len;
 
-	len = scnprintf(buf, PAGE_SIZE, "%d\n", 123);
+	len = sprintf(buf, "%d\n", 123);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-		return -EIO;
 	}
 
 	return len;
@@ -100,69 +99,8 @@ static ssize_t set_led_color(struct device *dev,
 }
 static DEVICE_ATTR(led_color, S_IRUGO | S_IWUSR, get_led_color, set_led_color);
 
-static ssize_t get_led_brightness(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	int len;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	len = scnprintf(buf, PAGE_SIZE, "%x\n", sk9822->led_brightness);
-	if (len <= 0) {
-		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-		return -EIO;
-	}
-
-	return len;
-}
-
-/**
- * @brief Set LED brightness
- * @retval count number of bytes written
- * @retval -EINVAL if the message is not a valid hexadecimal number
- * @retval -EIO for all other errors (e.g. leds cannot be configured)
- */
-static ssize_t set_led_brightness(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
-{
-	int ret = 0;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-	unsigned long val = SK9822_DEFAULT_BRIGHTNESS;
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	if (kstrtoul(buf, 16, &val)) {
-		return -EINVAL;
-	}
-
-	if(val > SK9822_DEFAULT_BRIGHTNESS) {
-		val = SK9822_DEFAULT_BRIGHTNESS;
-	}
-
-	sk9822->led_brightness = (uint8_t)val;
-
-	// Now push to the HW
-	ret = sk9822_update(sk9822);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to update led\n");
-		return -EIO;
-	}
-
-	return count;
-}
-static DEVICE_ATTR(led_brightness, S_IRUGO | S_IWUSR, get_led_brightness, set_led_brightness);
-
-
 static struct attribute *sk9822_dev_attrs[] = {
 	 &dev_attr_led_color.attr,
-	 &dev_attr_led_brightness.attr,
 	 NULL
 };
 
@@ -191,8 +129,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (ret < 0) {
 		dev_warn(&pdev->dev, "Could not read led-count property\n");
 		leds->led_count = SK9822_DEFAULT_NUM_LEDS;
-	} else {
-		printk(KERN_INFO "Got led count: %u\n", leds->led_count);
 	}
 
 	leds->led_colors = devm_kzalloc(&pdev->dev,
@@ -204,7 +140,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, leds);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
 	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
 	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
@@ -212,12 +148,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	dev_warn(&pdev->dev, "Kernel version Not supported\n");
 	exit(1);
 #endif
-	if (IS_ERR(leds->clock_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
-				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
-		return PTR_ERR(leds->clock_gpio);
-	}
 
 	gpiod_direction_output(leds->clock_gpio, 1);
 	if (IS_ERR(leds->clock_gpio)) {
@@ -230,7 +160,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 		gpiod_set_value(leds->clock_gpio, 0);
 	}
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
 	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
 	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
@@ -238,12 +168,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	dev_warn(&pdev->dev, "Kernel version Not supported\n");
 	exit(1);
 #endif
-	if (IS_ERR(leds->data_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
-				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
-		return PTR_ERR(leds->data_gpio);
-	}
 
 	gpiod_direction_output(leds->data_gpio, 1);
 	if (IS_ERR(leds->data_gpio)) {

icgroupd/Makefile

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

icgroupd/files/cgroupd

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

icgroupd/files/cgroups.config

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

icgroupd/files/cgroups.init

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

icwmp/Config_cwmp.in

@@ -1,4 +1,4 @@
-if PACKAGE_icwmp
+if PACKAGE_icwmp-curl || PACKAGE_icwmp-zstream
 
 config CWMP_SCRIPTS_FULL
 	bool "Install all icwmp scripts"
@@ -19,9 +19,17 @@ 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

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

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
+# Copyright (C) 2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,18 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=6.5.4-2021-03-23
+PKG_VERSION:=4.0-2019-11-19
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5a4e7a0cfb2cdc2576f1c93388760691cec8ee85
+PKG_SOURCE_VERSION:=7491e611712afb6ebf88098a099b25ef8c2f0a8b
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -27,28 +24,80 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl
+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/$(PKG_NAME)/description
+define Package/icwmp_stun
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 stun Client
+	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+endef
+
+define Package/icwmp_xmpp
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 xmpp feature
+	DEPENDS:=+libuci +libubox +libexpat +libstrophe
+endef
+
+define Package/icwmp_twamp
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 twamp feature
+	DEPENDS:=+libuci
+endef
+
+define Package/icwmp_udpechoserver
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 udpechoserver feature
+	DEPENDS:=+libuci
+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
+endef
+
+define Package/icwmp/description
  A free client implementation of CWMP (TR-069) protocol
 endef
 
-define Package/$(PKG_NAME)/config
+define Package/icwmp-curl
+  $(call Package/icwmp/Default)
+  TITLE+= (using libcurl)
+  DEPENDS+= +libcurl
+  VARIANT:=curl
+endef
+
+define Package/icwmp-zstream
+  $(call Package/icwmp/Default)
+  TITLE+= (using libzstream)
+  DEPENDS+= +libzstream
+  VARIANT:=zstream
+endef
+
+define Package/icwmp-zstream/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
@@ -56,6 +105,12 @@ 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
 
@@ -75,6 +130,27 @@ CONFIGURE_ARGS += \
 	--with-uci-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
+	
+ifeq ($(CONFIG_UPNP_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-upnptr064
+endif
+	
+ifeq ($(CONFIG_XMPP_ENABLE),y)
+CONFIGURE_ARGS += \
+	--enable-xmpp
+endif
+	
+ifeq ($(BUILD_VARIANT),zstream)
+CONFIGURE_ARGS += \
+	--enable-http=zstream \
+	--with-zstream-include-path=$(STAGING_DIR)/usr/include
+endif
+
+ifeq ($(BUILD_VARIANT),curl)
+CONFIGURE_ARGS += \
+	--enable-http=curl
+endif
 
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
@@ -96,10 +172,23 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/$(PKG_NAME)/install
+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/icwmpd $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/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
 ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
 	$(INSTALL_DIR) $(1)/usr/share/icwmp
 	$(CP) $(PKG_BUILD_DIR)/scripts/defaults $(1)/usr/share/icwmp
@@ -110,8 +199,57 @@ endif
 	$(CP) ./files/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/postinst
+define Package/icwmp_stun/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_stund $(1)/etc/init.d/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_stun $(1)/etc/config
+endef
+
+define Package/icwmp_xmpp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_xmppd $(1)/usr/sbin/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
+	$(CP) ./xmpp-files/* $(1)/
+endef
+
+define Package/icwmp_udpechoserver/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
+endef
+
+define Package/icwmp_twamp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_twampd $(1)/usr/sbin/icwmp_twampd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_twampd $(1)/etc/init.d/icwmp_twampd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(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
+endef
+
+
+define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
+	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
 	if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Enabling rc.d symlink for icwmpd"
 		/etc/init.d/icwmpd enable
@@ -119,7 +257,7 @@ define Package/$(PKG_NAME)/postinst
 	exit 0
 endef
 
-define Package/$(PKG_NAME)/prerm
+define Package/icwmp-$(BUILD_VARIANT)/prerm
 	#!/bin/sh
 	if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Disabling rc.d symlink for icwmpd"
@@ -128,4 +266,11 @@ define Package/$(PKG_NAME)/prerm
 	exit 0
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+
+$(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))

icwmp/README

@@ -0,0 +1,136 @@
+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/config/cwmp

@@ -1,47 +0,0 @@
-config acs 'acs'
-	option url ''
-	option userid '' #$OUI-$SER
-	option passwd 'iopsys'
-	option periodic_inform_enable 'true'
-	option periodic_inform_interval '1800'
-	option periodic_inform_time '0001-01-01T00:00:00Z'
-	option ParameterKey ''
-	option dhcp_discovery 'enable'
-	# compression possible configs: GZIP, Deflate, Disabled
-	option compression 'Disabled'
-	#­ possible configs interval :[1:65535]
-	option retry_min_wait_interval '5'
-	#­ possible configs interval :[1000:65535]
-	option retry_interval_multiplier '2000'
-	option https_ssl_capath ''
-	option ipv6_enable '0'
-	option ip_version '4'
-
-config cpe 'cpe'
-	option interface 'eth0.1'
-	option default_wan_interface 'wan'
-	option log_to_console 'disable'
-	option log_to_file 'enable'
-	# log_severity: INFO (Default)	
-	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'INFO'
-	option log_file_name '/var/log/icwmpd.log'
-	option log_max_size '102400'
-	option userid '' #$OUI-$SER
-	option passwd 'iopsys'
-	option port '7547'
-	option ubus_socket '/var/run/ubus.sock'
-	option provisioning_code ''
-	option amd_version '5'
-	# compression possible configs: InstanceNumber, InstanceAlias
-	option instance_mode 'InstanceNumber'
-	option session_timeout '60'
-	option notification '1'
-	option exec_download '0'
-	option periodic_notify_enable '1'
-	option periodic_notify_interval '10'
-	
-config lwn 'lwn'
-	option enable '1'
-	option hostname ''
-	option port '0'

icwmp/files/etc/firewall.cwmp

@@ -1,21 +0,0 @@
-#created by the icwmp package 
-zone_name=""
-port=""
-if [ "$zone_name" = "" ]; then
-	exit 0
-elif [ "$zone_name" = "icwmp" ]; then
-	iptables -nL zone_icwmp_input 2> /dev/null
-	if [ $? != 0 ]; then
-		iptables -N zone_icwmp_input
-		iptables -t filter -A INPUT -j zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
-	else			
-		iptables -F zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
-	fi			
-else
-	iptables -F zone_icwmp_input 2> /dev/null
-	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -X zone_icwmp_input 2> /dev/null
-fi
-#iptables -I FW_ZONE -p tcp -s ACS_ADDRESS --dport PORT -j ACCEPT --comment "Open ACS port"

icwmp/files/etc/init.d/icwmpd

@@ -1,189 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015-2019 iopsys Software Solutions AB
-
-. /lib/functions.sh
-include /lib/network
-. /usr/share/libubox/jshn.sh
-
-START=99
-STOP=10
-
-USE_PROCD=1
-PROG="/usr/sbin/icwmpd"
-
-EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
-
-validate_url() {
-	# SCHEMA_LIST: contain list of possible schemas that could be present in the acs url
-	# Example: SCHEMA_LIST="http https"
-	SCHEMA_LIST="http"
-
-	for schema in $SCHEMA_LIST;	do
-		dest=`echo $1 | sed 's/$schema:\/\///g' | cut -f1 -d \/ | cut -f1 -d:`
-		if [ "_$dest" != "_" ]; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-get_acs_url() {
-	local default_acs="http://10.10.1.6:8000/openacs/acs"
-	local acs_dhcp_discovery="$(uci -q get cwmp.acs.dhcp_discovery)"
-	local url="$(uci -q get cwmp.acs.url)"
-	local dhcp_url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
-
-	if [ "$acs_dhcp_discovery" == "enable" -a -n "$dhcp_url" -o -z "$url" ]; then
-		url="$dhcp_url"
-		echo "ACS URL from DHCP server: $url"
-		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url" || url="$default_acs"
-	elif [ -n "$url" ];then
-		url="$(uci -q get cwmp.acs.url)"
-		echo "ACS URL from configuration: $url"
-	else
-		url="$default_acs"
-		echo "Using default ACS URL: $url"
-		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url"
-	fi
-
-	validate_url "$url"
-	if [ "$?" != "0" ];then
-		echo "Invalid ACS URL: $url"
-		exit 1
-	fi
-}
-
-enable_dhcp_option43() {
-	local wan=$1
-	local discovery=0
-	case $2 in
-		enable|1) discovery=1 ;;
-	esac
-
-	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local enabled
-	local newreqopts=
-	local baseopts=
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local tropts="43"
-	local oldreqopts="$reqopts"
-	local ropt iopt
-	for ropt in $reqopts; do
-		case $ropt in
-			43) ;;
-			*) baseopts="$baseopts $ropt" ;;
-		esac
-	done
-	ropt=""
-	reqopts="$baseopts $tropts"
-	for ropt in $reqopts; do
-		case $ropt in
-			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
-			*) newreqopts="$newreqopts $ropt" ;;
-		esac
-	done
-	if [ $proto == "dhcp" ]; then
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		[ "$newreqopts" == "$oldreqopts" ] && return
-		uci -q set network.$wan.reqopts="$newreqopts"
-		uci commit network
-		ubus call network reload
-	fi
-	########################################################
-}
-
-wait_for_option43() {
-	local time=$1
-	local default_wan_interface dhcp_discovery url
-
-	config_get default_wan_interface cpe default_wan_interface "wan"
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get url acs url
-
-	enable_dhcp_option43 $default_wan_interface $dhcp_discovery
-
-	local tm=0
-
-	if [ "$dhcp_discovery" == "enable" -o "$dhcp_discovery" == "1" ]
-	then
-		echo "Waiting for discovery of ACS URL from dhcp server ..."
-		while [ $tm -le $time ]
-		do
-			acs_url=`uci -P /var/state -q get cwmp.acs.dhcp_url`
-			if [ "$acs_url" != "" ]
-			then
-				break
-			else
-				sleep 1
-			fi
-			tm=$((tm+1))
-		done
-	fi
-}
-
-wait_for_resolvfile() {
-	local time=$1
-	local tm=1
-
-	local resolvfile="$(uci -q get dhcp.@dnsmasq[0].resolvfile)"
-	[ -n "$resolvfile" ] || return
-
-	while [ ! -f $resolvfile ]; do
-		sleep 1
-		[ $tm -ge $time ] && break
-		tm=$((tm+1))
-	done
-}
-
-set_wan_interface() {
-	local l3_device=""
-	local default_wan_interface=""
-
-	config_get default_wan_interface cpe default_wan_interface "wan"
-	json_load "$(ifstatus $default_wan_interface)"
-	json_get_var l3_device l3_device
-	if [ "$l3_device" != "" ];then
-		uci -q set cwmp.cpe.interface="$l3_device"
-		uci -q commit cwmp
-	fi
-}
-
-start_service() {
-	if [ ! -f /tmp/.icwmpd_boot ]; then
-		touch /etc/icwmpd/.icwmpd_boot
-		touch /tmp/.icwmpd_boot
-	else
-		[ -f /sbin/netifd ] && echo "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-		[ -f /etc/config/wireless ] && echo "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
-		[ -f /usr/sbin/dnsmasq ] && echo "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-		[ -f /etc/config/dhcp ] && echo "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-		[ -f /usr/sbin/asterisk ] && echo "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
-
-		config_load cwmp
-		set_wan_interface
-		wait_for_option43 20
-		get_acs_url
-
-		procd_open_instance
-		procd_set_param command "$PROG"
-		if [ "$1" = "GetRPCMethods" ];then
-			procd_append_param command -g
-		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
-			procd_append_param command -b
-		fi
-		procd_set_param respawn "3" "7" "0"
-		procd_close_instance
-	fi
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
-}
-

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

@@ -1,32 +0,0 @@
-# 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)
-
-# Get userid values
-acs_userid=$(uci -q get cwmp.acs.userid)
-cpe_userid=$(uci -q get cwmp.cpe.userid)
-
-# Only set if they are empty
-if [ -z "$acs_userid" ]
-then
-    uci -q set cwmp.acs.userid="${mac:0:6}-${serial}"
-fi
-
-if [ -z "$cpe_userid" ]
-then
-    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
-fi
-
-# No need for commit here, it is done by uci_apply_defaults().

icwmp/files/etc/uci-defaults/90-cwmpfirewall

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOT
-        delete firewall.cwmp
-        set firewall.cwmp=include
-        set firewall.cwmp.path=/etc/firewall.cwmp
-        set firewall.cwmp.reload=1
-        commit firewall
-EOT
-
-exit 0
-

icwmp/files/lib/upgrade/keep.d/icwmp

@@ -1 +0,0 @@
-/etc/icwmpd/.icwmpd_backup_session.xml

icwmp/files/lib/upgrade/post-rootfs-fixup.d/215-icwmp

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# As part of sysupgrade we copy CWMP Backup Session XML file.
-
-
-# Abort on any error.
-set -e
-
-
-# Do nothing if user want to discard old settings.
-if [ -n "$SAVE_CONFIG" ] && [ $SAVE_CONFIG -eq 0 ]; then
-	exit 0
-fi
-
-# Source functions.
-for f in /lib/upgrade/iopsys*.sh; do
-	[ -r "$f" -a -s "$f" ] || continue
-	source $f
-done
-
-
-if [ -s "${2}/etc/icwmpd/.icwmpd_backup_session.xml" ]; then
-	cat "${2}/etc/icwmpd/.icwmpd_backup_session.xml" > "/etc/icwmpd/.icwmpd_backup_session.xml"
-fi
-
-# Report success.
-log "post-hooks" "CWMP Backup Session XML file migrated"
-
-exit 0

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

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -f /etc/config/xmpp ] || exit 0
+[ -f /etc/config/cwmp_xmpp ] || exit 0
 
 [ "$ACTION" == "ifup" ] || exit 0
 [ "$INTERFACE" == "loopback" ] && exit 0
@@ -17,5 +17,5 @@ local proto="$(uci -q get network.$INTERFACE.proto)"
 local ifname="$(uci -q get network.$INTERFACE.ifname)"
 [ "${ifname:0:1}" == "@" ] && exit 0
 
-/etc/init.d/xmppd reload &
+/etc/init.d/icwmp_xmppd reload &
 

ieee1905/Config.in

@@ -1,29 +0,0 @@
-if PACKAGE_ieee1905 || PACKAGE_lib1905al
-
-menu "developer/debug options"
-
-	config IEEE1905_MAP_COMPLETE_NETWORK
-		bool "Create network topology for complete network"
-		default n
-
-	config IEEE1905_SPEED_UP_DISCOVERY
-		bool "Speed up discovery of an AL in network"
-		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
-endmenu
-endif

ieee1905/Makefile

@@ -1,142 +0,0 @@
-#
-# Copyright (C) 2019 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ieee1905
-PKG_VERSION:=2.1.42
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6d07dbd36a195f916d2008179a819355ce79bb57
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-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 +libieee1905 +ubox +libpcap +libopenssl +libwifi +libeasy
-endef
-
-define Package/ieee1905/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/ieee1905/description
- IEEE1905 stack with extended functionalities.
-endef
-
-define Package/libieee1905
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=IEEE1905 cmdu tlv utility library
-endef
-
-define Package/libwsc
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Wifi Simple Configuration building and processing library
-  DEPENDS= +libopenssl +libuci +libubus
-endef
-
-define Package/lib1905hle
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=IEEE1905 hle stack library
-endef
-
-LIBS := \
-	$(if $(CONFIG_PACKAGE_libwsc),libwsc.so)
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-	-fstrict-aliasing \
-	-Wall \
-	-Wextra
-
-MAKE_FLAGS += \
-	LIBS="$(LIBS)"
-
-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_MAP_COMPLETE_NETWORK),y)
-TARGET_CFLAGS += -DIEEE1905_MAP_COMPLETE_NETWORK
-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)/etc/ieee1905
-	$(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/libieee1905/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib/libieee1905.so
-endef
-
-define Package/libwsc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/libwsc.so
-endef
-
-define Build/InstallDev/libwsc.so
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwsc/include/wsc.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/ieee1905
-	$(INSTALL_DIR) $(1)/usr/include/ieee1905
-	$(INSTALL_DIR) $(1)/usr/include/lib1905hle
-	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/ieee1905/
-	$(CP) $(PKG_BUILD_DIR)/libieee1905/include/*.h $(1)/usr/include/ieee1905/
-	$(CP) $(PKG_BUILD_DIR)/lib1905hle/include/*.h $(1)/usr/include/lib1905hle/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib
-	$(foreach lib,$(LIBS),$(call Build/InstallDev/$(lib),$(1),$(2));)
-endef
-
-$(eval $(call BuildPackage,libieee1905))
-$(eval $(call BuildPackage,lib1905hle))
-$(eval $(call BuildPackage,libwsc))
-$(eval $(call BuildPackage,ieee1905))

ieee1905/files/etc/config/ieee1905

@@ -1,17 +0,0 @@
-config ieee1905 'ieee1905'
-        option enabled '1'
-        option debug  true
-        option debug_level  2
-        option macaddress 'auto'
-        option registrar 0
-        option cmdu_event 1
-        option map_plugin 1
-
-config security 'security'
-        list method 'PBC'
-
-config al-iface
-        option enabled 1
-        option ifname 'br-lan'
-        option media 'bridge'
-

ieee1905/files/etc/init.d/ieee1905

@@ -1,72 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=96
-STOP=22
-
-USE_PROCD=1
-PROG=/usr/sbin/ieee1905d
-
-validate_ieee1905_section()
-{
-	uci_validate_section ieee1905 ieee1905 "${1}" \
-		'debug:bool:false' \
-		'enabled:bool:false'
-}
-
-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()
-{
-	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
-}
-
-service_running() {
-        ubus -t 2 wait_for wifi
-}
-
-start_service() {
-
-	[ -d /usr/lib/ieee1905 ] || mkdir -p /usr/lib/ieee1905
-
-	procd_open_instance ieee1905
-	procd_set_param command ${PROG}
-	configure_ieee1905 "ieee1905"
-	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"
-	procd_add_reload_trigger "ieee1905"
-}

ifbt/Makefile

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

ifsi/Makefile

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

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

@@ -0,0 +1,74 @@
+/*
+ * 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

@@ -14,14 +14,10 @@ PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
 PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 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

@@ -9,20 +9,17 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=inbd
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=10f765f3d0fcc226b6ecf0c481598c9e7f76315e
+PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 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

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

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

iop/config

@@ -7,27 +7,19 @@ CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
 CONFIG_PACKAGE_alsa-lib=y
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_atftp=m
-CONFIG_PACKAGE_atftpd=m
-CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
 CONFIG_PACKAGE_comgt-ncm=y
+CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-1905=y
-CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_mosquitto-client-ssl=y
-CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_wfadatad=y
-CONFIG_PACKAGE_imonitor=m
+CONFIG_PACKAGE_icwmp-curl=y
+CONFIG_PACKAGE_ifbt=y
+CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_iopupgrade=y
 CONFIG_PACKAGE_ip-full=y
@@ -38,22 +30,47 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
-CONFIG_PACKAGE_jq=y
 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_libreswan=m
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_map=y
+CONFIG_PACKAGE_kmod-siit=y
+CONFIG_PACKAGE_libcgroup-daemon=y
+CONFIG_PACKAGE_libcgroup=y
+# CONFIG_PACKAGE_libcgroup-utils is not set
+CONFIG_PACKAGE_libdaemon=y
+CONFIG_PACKAGE_libffmpeg-mini=y
+CONFIG_PACKAGE_libgmp=y
+CONFIG_PACKAGE_libreadline=y
+CONFIG_PACKAGE_loop-detector=m
+CONFIG_PACKAGE_minidlna=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
@@ -61,16 +78,15 @@ 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
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_owsd=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
@@ -84,40 +100,42 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-rpcsys=y
 CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_samba3=y
+CONFIG_PACKAGE_samba3-nmbd=y
+CONFIG_PACKAGE_snmpd=y
 CONFIG_PACKAGE_strace=y
-CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_terminfo=y
+CONFIG_PACKAGE_tptest=y
 CONFIG_PACKAGE_traceroute6=y
-CONFIG_PACKAGE_uledd=y
 CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
-CONFIG_PACKAGE_uspd=y
-CONFIG_PACKAGE_vsftpd-tls=m
+CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_wifilife=y
 CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 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
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
 CONFIG_BUSYBOX_CONFIG_ARPING=y
-CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
 # CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
-# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
+CONFIG_BUSYBOX_CONFIG_HTTPD=y
 # CONFIG_BUSYBOX_CONFIG_INSMOD is not set
 # CONFIG_BUSYBOX_CONFIG_MODINFO is not set
 # CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
@@ -161,67 +179,14 @@ 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_BUSYBOX_CONFIG_BLOCKDEV=y
-CONFIG_BUSYBOX_CONFIG_PARTPROBE=y
-CONFIG_BUSYBOX_CONFIG_LFS=y
-CONFIG_BUSYBOX_CONFIG_FDISK=y
-CONFIG_BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GPT_LABEL=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_BUSYBOX_CONFIG_IONICE=y
-CONFIG_BUSYBOX_CONFIG_RENICE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_F2FS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
-CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
+# CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
 # CONFIG_SIGNED_PACKAGES is not set
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_LOCALMIRROR="https://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=""
-
-# Generate rootfs tar file
-CONFIG_TARGET_ROOTFS_TARGZ=y
-
-# 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
+CONFIG_LOCALMIRROR="http://download.iopsys.eu/iopsys/mirror/"
 

iop/iop.completion

@@ -35,7 +35,7 @@ _iop()
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
              feeds_update genconfig generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
-             update_package update_feed_branches ssh_upgrade smoketest"
+             update_package update_feed_branches ssh_upgrade"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/extract_core.sh

@@ -6,9 +6,13 @@ 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 '
 
@@ -20,13 +24,7 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		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 "  -r feeds/lede_core"
 		echo "  -b devel"
 	}