mcastmngr: Support hybrid proxying/snooping.

Support running mcproxy and snooping simultanous.

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.10.0
+PKG_VERSION:=1.9.4
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=75195a112e3aef2b07e224afbbffcb15368be58f
+PKG_SOURCE_VERSION:=094ee2ecb7135827848e5325cb0b8e4e209056f9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -100,37 +100,35 @@ endif
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
-
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
-
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_api $(1)/usr/share/bbfdm/scripts/
-
+	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
 	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
 endef
 
 define Package/libbbfdm/install
+	$(INSTALL_DIR) $(1)/lib
+	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm/
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/share/bbfdm/libbbfdm.so
-
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
-
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
+	$(INSTALL_BIN) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/97-firewall-service
+	$(INSTALL_BIN) ./files/etc/uci-defaults/99-link-core-plugins $(1)/etc/uci-defaults/99-link-core-plugins
+	$(INSTALL_BIN) ./files/etc/uci-defaults/90-remove-nonexisting-microservices $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
-
+	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
+	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
 ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
 	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so $(1)
 endif
-
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_activate_handler.sh $(1)/usr/share/bbfdm/scripts/
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_check_idle.sh $(1)/usr/share/bbfdm/scripts/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm/scripts/
 endef
 
 define Package/libbbfdm/prerm

bbfdm/files/etc/uci-defaults/90-remove-nonexisting-microservices

@@ -0,0 +1,18 @@
+#!/bin/sh
+. /lib/functions.sh
+
+remove_nonexisting_microservice() {
+	local input_json
+
+	config_get input_json "$1" input_json ""
+
+	if [ -z "${input_json}" ]; then
+		uci_remove bbfdm "${1}"
+	fi
+}
+
+config_load bbfdm
+config_foreach remove_nonexisting_microservice "micro_service"
+
+exit 0
+

bbfdm/files/etc/uci-defaults/99-link-core-plugins

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+UNIFIED_PATH="/usr/share/bbfdm/plugins/"
+
+log() {
+	echo "$@" | logger -t bbfdm.uci-default -p info
+}
+
+# Link JSON plugins
+for f in `ls -1 /etc/bbfdm/json/*.json`; do
+	log "# BBFDM JSON plugin ${f} not aligned #"
+	ln -s ${f} "${UNIFIED_PATH}"
+done
+
+# Link DotSo plugins
+for f in `ls -1 /usr/lib/bbfdm/*.so`; do
+	log "# BBFDM DotSO plugin ${f} not aligned #"
+	ln -s ${f} "${UNIFIED_PATH}"
+done
+
+# Link JSON plugins
+for f in `ls -1 /etc/bbfdm/plugins/*.json`; do
+	log "# BBFDM JSON plugin ${f} not aligned #"
+	ln -s ${f} "${UNIFIED_PATH}"
+done
+
+# Link DotSo plugins
+for f in `ls -1 /etc/bbfdm/plugins/*.so`; do
+	log "# BBFDM DotSO plugin ${f} not aligned #"
+	ln -s ${f} "${UNIFIED_PATH}"
+done
+
+exit 0
+

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.11
+PKG_VERSION:=2.1.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=5dd9cd3cfc95e9dce5f64fe9cadd274bb31b8fa6
+PKG_SOURCE_VERSION:=e472e90feec31d9f318ea8c732ab564002e25db1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

bulkdata/files/etc/init.d/bulkdatad

@@ -12,21 +12,12 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
-	if [ ! -f "/var/state/bulkdatad" ]; then
-		touch /var/state/bulkdatad
-		uci -q -c /var/state set bulkdatad.global='global'
-		uci -q -c /var/state commit bulkdatad
-	fi
-
-	if [ "$enable" -eq "1" ]; then
+	[ "$enable" -eq "1" ] && {
 		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
 		procd_set_param respawn
 		procd_close_instance "bulkdata"
-	else
-		uci -q -c /var/state set bulkdatad.global.status='Disabled'
-		uci -q -c /var/state commit bulkdatad
-	fi
+	}
 }
 
 reload_service() {

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.7
+PKG_VERSION:=3.6.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=98999eb75755f79a3c8a7e802e024b42914d1efc
+PKG_SOURCE_VERSION:=85c173d1fac535726b2e750be8c282b74fb7dbca
 PKG_MIRROR_HASH:=skip
 endif
 

dnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=f6223f6034a57753ae9d1552ab1334194b1deaff
+PKG_SOURCE_VERSION:=03d8d79c1221adb92b5789c03e2489d26c6ae184
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

dslmngr/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.6
+PKG_VERSION:=1.2.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
-PKG_SOURCE_VERSION:=2b1ecbd2079dbd88ed6d58b277b91dcf5038d869
+PKG_SOURCE_VERSION:=4a6f6f829006e481eeb20bcb121f7938d12c60ec
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip

ebtables-extensions/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ebtables-extensions
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.3
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=35fb79f95c47d90e3791c7e126048b451f078f24
+PKG_SOURCE_VERSION:=d3de8b0ac52ce9f96ef5a0a6277a6730879fc793
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

emctrl2/Makefile

@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2020-2024 iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=emctrl2
-PKG_VERSION:=1.0.0
-
-PKG_LICENSE:=BSD-3-Clause
-
-include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk
-
-define Package/emctrl2
- CATEGORY:=Utilities
- TITLE:= EasyMesh Controller V2
- DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
-endef
-
-define Package/emctrl2/description
-	Em Controller to provide extended WiFi DataElement features
-endef
-
-define Package/emctrl2/install
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libemctrl2.so $(1) wifidmd
-endef
-
-$(eval $(call BuildPackage,emctrl2))

emctrl2/src/Makefile

@@ -1,21 +0,0 @@
-LIBOUT := libemctrl2.so
-
-LIBOBJS := datamodel_override.o
-
-PROG_CFLAGS = $(CFLAGS) -Wno-unused-parameter -fstrict-aliasing -g
-LIB_LDFLAGS = $(LDFLAGS)
-
-FPIC := -fPIC
-
-.PHONY: all
-
-%.o: %.c
-	$(CC) $(PROG_CFLAGS) $(FPIC) -c -o $@ $<
-
-all: $(LIBOUT)
-
-$(LIBOUT): $(LIBOBJS)
-	$(CC) $(PROG_CFLAGS) $(LIB_LDFLAGS) -shared -o $@ $^
-
-clean:
-	rm -f *.o $(LIBOUT)

emctrl2/src/datamodel_override.c

@@ -1,546 +0,0 @@
-/*
- * Copyright (C) 2023 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: <Name> <Surname> <name.surname@iopsys.eu>
- */
-
-#include <libbbfdm-api/dmcommon.h>
-
-
-/*************************************************************
-* ENTRY METHOD
-**************************************************************/
-static int browseWiFiDataElementsNetworkSSIDInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
-{
-	//TODO
-	struct dm_data *curr_data = NULL;
-	char *inst = NULL, *mld_id = NULL;
-
-	// loop to create multiple multi-instance objects
-	for(int i=0; i<=1; i++) {
-		char inst[3] = {0};
-
-		// inst is instance number for the object
-		snprintf(inst, sizeof(inst), "%d", i+1);
-		// This API creates instance, curr_data is to pass some instance specific information to child object, children can access this info from *prev_data
-		if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)curr_data, inst) == DM_STOP)
-			break;
-	}
-	return 0;
-}
-
-static int browseWiFiDataElementsNetworkDeviceDefault8021QInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
-{
-	//TODO
-	BBF_ERR("Debug print");
-	// Instances can be created statically as well
-	DM_LINK_INST_OBJ(dmctx, parent_node, prev_data, "1");
-	return 0;
-}
-
-static int browseWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
-{
-	//TODO
-	BBF_ERR("Debug print");
-	return 0;
-}
-
-/*************************************************************
-* ADD & DEL OBJ
-**************************************************************/
-static int addObjWiFiDataElementsNetworkDeviceDefault8021Q(char *refparam, struct dmctx *ctx, void *data, char **instance)
-{
-	//TODO
-	return 0;
-}
-
-static int delObjWiFiDataElementsNetworkDeviceDefault8021Q(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action)
-{
-	//TODO
-	return 0;
-}
-
-/*************************************************************
-* GET & SET PARAM
-**************************************************************/
-static int get_WiFiDataElementsNetwork_SSIDNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	int cnt = get_number_of_entries(ctx, data, instance, browseWiFiDataElementsNetworkSSIDInst);
-	dmasprintf(value, "%d", cnt);
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_SSID(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_Band(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_AKMsAllowed(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_SuiteSelector(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_AdvertisementEnabled(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_MFPConfig(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_MobilityDomain(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkSSID_HaulType(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDevice_TrafficSeparationAllowed(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDevice_Default8021QNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	int cnt = get_number_of_entries(ctx, data, instance, browseWiFiDataElementsNetworkDeviceDefault8021QInst);
-	dmasprintf(value, "%d", cnt);
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceDefault8021Q_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int set_WiFiDataElementsNetworkDeviceDefault8021Q_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-	switch (action)	{
-		case VALUECHECK:
-			if (bbfdm_validate_boolean(ctx, value))
-				return FAULT_9007;
-			break;
-		case VALUESET:
-			//TODO
-			break;
-	}
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceDefault8021Q_PrimaryVID(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int set_WiFiDataElementsNetworkDeviceDefault8021Q_PrimaryVID(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-	switch (action)	{
-		case VALUECHECK:
-			if (bbfdm_validate_unsignedInt(ctx, value, RANGE_ARGS{{NULL,"4095"}}, 1))
-				return FAULT_9007;
-			break;
-		case VALUESET:
-			//TODO
-			break;
-	}
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceDefault8021Q_DefaultPCP(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int set_WiFiDataElementsNetworkDeviceDefault8021Q_DefaultPCP(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-	switch (action)	{
-		case VALUECHECK:
-			if (bbfdm_validate_unsignedInt(ctx, value, RANGE_ARGS{{NULL,"7"}}, 1))
-				return FAULT_9007;
-			break;
-		case VALUESET:
-			//TODO
-			break;
-	}
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_Time(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_APOrigin(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_TriggerEvent(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_SteeringApproach(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_APDestination(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_SteeringDuration(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	//TODO
-	return 0;
-}
-
-static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_SteeringHistoryNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-	int cnt = get_number_of_entries(ctx, data, instance, browseWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryInst);
-	dmasprintf(value, "%d", cnt);
-	return 0;
-}
-
-/*************************************************************
-* OPERATE COMMANDS
-**************************************************************/
-static operation_args wifidataelementsnetwork_settrafficseparation_args = {
-    .in = (const char *[]) {
-        "Enable",
-        NULL
-    },
-    .out = (const char *[]) {
-        "Status",
-        NULL
-    }
-};
-
-static int get_operate_args_WiFiDataElementsNetwork_SetTrafficSeparation(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-    *value = (char *)&wifidataelementsnetwork_settrafficseparation_args;
-    return 0;
-}
-
-static int operate_WiFiDataElementsNetwork_SetTrafficSeparation(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-    //TODO
-    return 0;
-}
-
-static operation_args wifidataelementsnetwork_setpreferredbackhauls_args = {
-    .in = (const char *[]) {
-        NULL
-    },
-    .out = (const char *[]) {
-        "Status",
-        NULL
-    }
-};
-
-static int get_operate_args_WiFiDataElementsNetwork_SetPreferredBackhauls(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-    *value = (char *)&wifidataelementsnetwork_setpreferredbackhauls_args;
-    return 0;
-}
-
-static int operate_WiFiDataElementsNetwork_SetPreferredBackhauls(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-    //TODO
-    return 0;
-}
-
-static operation_args wifidataelementsnetwork_setssid_args = {
-    .in = (const char *[]) {
-        "SSID",
-        "Enable",
-        "AddRemoveChange",
-        "PassPhrase",
-        "Band",
-        "AKMsAllowed",
-        "SuiteSelector",
-        "AdvertisementEnabled",
-        "MFPConfig",
-        "MobilityDomain",
-        "HaulType",
-        NULL
-    },
-    .out = (const char *[]) {
-        "Status",
-        NULL
-    }
-};
-
-static int get_operate_args_WiFiDataElementsNetwork_SetSSID(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-    *value = (char *)&wifidataelementsnetwork_setssid_args;
-    return 0;
-}
-
-static int operate_WiFiDataElementsNetwork_SetSSID(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-    //TODO
-    return 0;
-}
-
-static operation_args wifidataelementsnetwork_setmscsdisallowed_args = {
-    .in = (const char *[]) {
-        "MSCSDisallowedStaList",
-        NULL
-    },
-    .out = (const char *[]) {
-        "Status",
-        NULL
-    }
-};
-
-static operation_args wifidataelementsnetworkdevice_setstasteeringstate_args = {
-    .in = (const char *[]) {
-        "Disallowed",
-        NULL
-    },
-    .out = (const char *[]) {
-        "Status",
-        NULL
-    }
-};
-
-static int get_operate_args_WiFiDataElementsNetworkDevice_SetSTASteeringState(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-    *value = (char *)&wifidataelementsnetworkdevice_setstasteeringstate_args;
-    return 0;
-}
-
-static int operate_WiFiDataElementsNetworkDevice_SetSTASteeringState(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-    //TODO
-    return 0;
-}
-
-static operation_args wifidataelementsnetworkdevicemultiapdevicebackhaul_steerwifibackhaul_args = {
-    .in = (const char *[]) {
-        "TargetBSS",
-        "Channel",
-        "TimeOut",
-        NULL
-    },
-    .out = (const char *[]) {
-        "Status",
-        NULL
-    }
-};
-
-static int get_operate_args_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_SteerWiFiBackhaul(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-    *value = (char *)&wifidataelementsnetworkdevicemultiapdevicebackhaul_steerwifibackhaul_args;
-    return 0;
-}
-
-static int operate_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_SteerWiFiBackhaul(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-    //TODO
-    return 0;
-}
-
-static operation_args wifidataelementsnetworkdeviceradio_channelscanrequest_args = {
-    .in = (const char *[]) {
-        "OpClass",
-        "ChannelList",
-        "ScanType",
-        "DwellTime",
-        "DFSDwellTime",
-        "HomeTime",
-        NULL
-    },
-    .out = (const char *[]) {
-        "Status",
-        NULL
-    }
-};
-
-static int get_operate_args_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-    *value = (char *)&wifidataelementsnetworkdeviceradio_channelscanrequest_args;
-    return 0;
-}
-
-static int operate_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-    //TODO
-    return 0;
-}
-
-static operation_args wifidataelementsnetworkdeviceradiobssstamultiapsta_btmrequest_args = {
-    .in = (const char *[]) {
-        "DisassociationImminent",
-        "DisassociationTimer",
-        "BSSTerminationDuration",
-        "ValidityInterval",
-        "SteeringTimer",
-        "TargetBSS",
-        NULL
-    },
-    .out = (const char *[]) {
-        "Status",
-        NULL
-    }
-};
-
-static int get_operate_args_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_BTMRequest(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
-{
-    *value = (char *)&wifidataelementsnetworkdeviceradiobssstamultiapsta_btmrequest_args;
-    return 0;
-}
-
-static int operate_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_BTMRequest(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
-{
-    //TODO
-    return 0;
-}
-/**********************************************************************************************************************************
-*                                            OBJ & PARAM DEFINITION
-***********************************************************************************************************************************/
-DMLEAF tWiFiDataElementsNetworkParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
-{"SSIDNumberOfEntries", &DMREAD, DMT_UNINT, get_WiFiDataElementsNetwork_SSIDNumberOfEntries, NULL, BBFDM_BOTH},
-{"SetTrafficSeparation()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetwork_SetTrafficSeparation, operate_WiFiDataElementsNetwork_SetTrafficSeparation, BBFDM_USP},
-{"SetPreferredBackhauls()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetwork_SetPreferredBackhauls, operate_WiFiDataElementsNetwork_SetPreferredBackhauls, BBFDM_USP},
-{"SetSSID()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetwork_SetSSID, operate_WiFiDataElementsNetwork_SetSSID, BBFDM_USP},
-{0}
-};
-
-/* *** Device.WiFi.DataElements.Network.SSID.{i}. *** */
-DMLEAF tWiFiDataElementsNetworkSSIDParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
-{"SSID", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_SSID, NULL, BBFDM_BOTH},
-{"Band", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_Band, NULL, BBFDM_BOTH},
-{"Enable", &DMREAD, DMT_BOOL, get_WiFiDataElementsNetworkSSID_Enable, NULL, BBFDM_BOTH},
-{"AKMsAllowed", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_AKMsAllowed, NULL, BBFDM_BOTH},
-{"SuiteSelector", &DMREAD, DMT_HEXBIN, get_WiFiDataElementsNetworkSSID_SuiteSelector, NULL, BBFDM_BOTH},
-{"AdvertisementEnabled", &DMREAD, DMT_BOOL, get_WiFiDataElementsNetworkSSID_AdvertisementEnabled, NULL, BBFDM_BOTH},
-{"MFPConfig", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_MFPConfig, NULL, BBFDM_BOTH},
-{"MobilityDomain", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_MobilityDomain, NULL, BBFDM_BOTH},
-{"HaulType", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_HaulType, NULL, BBFDM_BOTH},
-{0}
-};
-
-/* *** Device.WiFi.DataElements.Network. *** */
-DMOBJ tWiFiDataElementsNetworkObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, dynamicleaf, nextobj, leaf, linker, bbfdm_type, uniqueKeys */
-{"SSID", &DMREAD, NULL, NULL, NULL, browseWiFiDataElementsNetworkSSIDInst, NULL, NULL, NULL, tWiFiDataElementsNetworkSSIDParams, NULL, BBFDM_BOTH, NULL},
-{0}
-};
-
-DMLEAF tWiFiDataElementsNetworkDeviceParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
-{"TrafficSeparationAllowed", &DMREAD, DMT_BOOL, get_WiFiDataElementsNetworkDevice_TrafficSeparationAllowed, NULL, BBFDM_BOTH},
-{"SetSTASteeringState()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetworkDevice_SetSTASteeringState, operate_WiFiDataElementsNetworkDevice_SetSTASteeringState, BBFDM_USP},
-{"Default8021QNumberOfEntries", &DMREAD, DMT_UNINT, get_WiFiDataElementsNetworkDevice_Default8021QNumberOfEntries, NULL, BBFDM_BOTH},
-{0}
-};
-
-/* *** Device.WiFi.DataElements.Network.Device.{i}.Default8021Q.{i}. *** */
-DMLEAF tWiFiDataElementsNetworkDeviceDefault8021QParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
-{"Enable", &DMWRITE, DMT_BOOL, get_WiFiDataElementsNetworkDeviceDefault8021Q_Enable, set_WiFiDataElementsNetworkDeviceDefault8021Q_Enable, BBFDM_BOTH},
-{"PrimaryVID", &DMWRITE, DMT_UNINT, get_WiFiDataElementsNetworkDeviceDefault8021Q_PrimaryVID, set_WiFiDataElementsNetworkDeviceDefault8021Q_PrimaryVID, BBFDM_BOTH},
-{"DefaultPCP", &DMWRITE, DMT_UNINT, get_WiFiDataElementsNetworkDeviceDefault8021Q_DefaultPCP, set_WiFiDataElementsNetworkDeviceDefault8021Q_DefaultPCP, BBFDM_BOTH},
-{0}
-};
-
-DMOBJ tWiFiDataElementsNetworkDeviceObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, dynamicleaf, nextobj, leaf, linker, bbfdm_type, uniqueKeys, version*/
-{"Default8021Q", &DMWRITE, addObjWiFiDataElementsNetworkDeviceDefault8021Q, delObjWiFiDataElementsNetworkDeviceDefault8021Q, NULL, browseWiFiDataElementsNetworkDeviceDefault8021QInst, NULL, NULL, NULL, tWiFiDataElementsNetworkDeviceDefault8021QParams, NULL, BBFDM_BOTH, NULL},
-{0}
-};
-
-DMLEAF tWiFiDataElementsNetworkDeviceMultiAPDeviceBackhaulParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
-{"SteerWiFiBackhaul()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_SteerWiFiBackhaul, operate_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_SteerWiFiBackhaul, BBFDM_USP},
-{0}
-};
-
-
-DMLEAF tWiFiDataElementsNetworkDeviceRadioParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
-{"ChannelScanRequest()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest, operate_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest, BBFDM_USP},
-{0}
-};
-
-/* *** Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringHistory.{i}. *** */
-DMLEAF tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
-{"Time", &DMREAD, DMT_TIME, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_Time, NULL, BBFDM_BOTH},
-{"APOrigin", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_APOrigin, NULL, BBFDM_BOTH},
-{"TriggerEvent", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_TriggerEvent, NULL, BBFDM_BOTH},
-{"SteeringApproach", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_SteeringApproach, NULL, BBFDM_BOTH},
-{"APDestination", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_APDestination, NULL, BBFDM_BOTH},
-{"SteeringDuration", &DMREAD, DMT_UNINT, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_SteeringDuration, NULL, BBFDM_BOTH},
-{0}
-};
-
-/* *** Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA. *** */
-DMOBJ tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTAObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, dynamicleaf, nextobj, leaf, linker, bbfdm_type, uniqueKeys */
-{"SteeringHistory", &DMREAD, NULL, NULL, NULL, browseWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryInst, NULL, NULL, NULL, tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryParams, NULL, BBFDM_BOTH, NULL},
-{0}
-};
-
-DMLEAF tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTAParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
-{"SteeringHistoryNumberOfEntries", &DMREAD, DMT_UNINT, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_SteeringHistoryNumberOfEntries, NULL, BBFDM_BOTH},
-{"BTMRequest()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_BTMRequest, operate_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_BTMRequest, BBFDM_USP},
-{0}
-};
-
-DM_MAP_OBJ tDynamicObj[] = {
-/* parentobj, nextobject, parameter */
-{"Device.WiFi.DataElements.Network.", tWiFiDataElementsNetworkObj, tWiFiDataElementsNetworkParams},
-{"Device.WiFi.DataElements.Network.Device.{i}.", tWiFiDataElementsNetworkDeviceObj, tWiFiDataElementsNetworkDeviceParams},
-{"Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.", NULL, tWiFiDataElementsNetworkDeviceMultiAPDeviceBackhaulParams},
-{"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.", NULL, tWiFiDataElementsNetworkDeviceRadioParams},
-{"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.", tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTAObj,tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTAParams},
-{0}
-};

firewallmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
-PKG_SOURCE_VERSION:=94246676dc2e2db29b94fcffec1be3cee3ec8e9f
+PKG_SOURCE_VERSION:=d4bdd162cf37b3373df2448a70dcb4fbc1113535
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -53,21 +53,15 @@ endif
 
 define Package/firewallmngr/install
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/lib/port-trigger
 
 	$(INSTALL_BIN) ./files/port-trigger/etc/init.d/port-trigger $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/port-trigger/etc/config/port-trigger $(1)/etc/config/
 	$(INSTALL_DATA) ./files/port-trigger/lib/port-trigger/port_trigger.sh $(1)/lib/port-trigger/
 endif
-	$(INSTALL_BIN) ./files/firewall.portmap $(1)/etc/
-	$(INSTALL_DATA) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/
-
-	$(INSTALL_BIN) ./files/firewall.service $(1)/etc/
-	$(INSTALL_DATA) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/
-
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
 endef
 

fluent-bit/files/fluent-bit.conf

@@ -1,15 +0,0 @@
-[SERVICE]
-    flush           3
-    daemon          Off
-    log_level       info
-    parsers_file    /etc/fluent-bit/parsers.conf
-
-[INPUT]
-    name            syslog
-    tag             syslog
-    path            /dev/log
-
-[OUTPUT]
-    name            null
-    match           *
-

fluent-bit/patches/0001-fix_out_file_plugin.patch

@@ -1,14 +0,0 @@
-diff --git a/plugins/out_file/file.c b/plugins/out_file/file.c
-index 2e47c9666..42ace24c6 100644
---- a/plugins/out_file/file.c
-+++ b/plugins/out_file/file.c
-@@ -45,6 +45,9 @@
- #define NEWLINE "\n"
- #endif
- 
-+#undef PATH_MAX
-+#define PATH_MAX 256
-+
- struct flb_file_conf {
-     const char *out_path;
-     const char *out_file;

fluentbit/Makefile

@@ -1,20 +1,18 @@
 #
-# Copyright (C) 2024 IOPSYS
+# Copright (C) 2018 The Internet Foundation In Sweden
 #
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=fluent-bit
-PKG_VERSION:=3.1.0
+PKG_NAME:=fluentbit
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
-PKG_SOURCE_VERSION=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=9bedfabf859b88a2cfcf51cc17669b83a170e85427ce562131366cb1542b52ae
-endif
+PKG_SOURCE_VERSION:=v3.0.5
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -22,32 +20,25 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-define Package/fluent-bit
+define Package/fluentbit
 	CATEGORY:=Utilities
-	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison
-	TITLE:=Fluent-Bit
-	URL:=https://fluentbit.io/
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts
+	TITLE:=FluentBit
 endef
 
-define Package/fluent-bit/description
+define Package/fluentbit/description
 	Fluent Bit is a super fast, lightweight, and highly scalable logging and metrics processor and forwarder.
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        $(CP) -rf ./fluent-bit/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 # General options
-TARGET_LDFLAGS +=-lfts -latomic
+TARGET_LDFLAGS+=-lfts -latomic
 
 CMAKE_OPTIONS+= \
 	-DFLB_RELEASE=Yes \
-	-DFLB_SMALL=No \
+	-DFLB_SMALL=Yes \
 	-DEXCLUDE_FROM_ALL=true \
-	-DFLB_SHARED_LIBS=Yes \
-	-DFLB_DEBUG=Yes \
+	-DBUILD_SHAREDD_LIBS=Yes \
+	-DFLB_DEBUG=No \
 	-DFLB_ALL=No \
 	-DFLB_JEMALLOC=No \
 	-DFLB_EXAMPLES=No \
@@ -165,12 +156,10 @@ CMAKE_OPTIONS += \
 	-DFLB_OUT_CHRONICLE=No \
 	-DFLB_OUT_PGSQL=No
 
-define Package/fluent-bit/install
+define Package/fluentbit/install
+	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/fluent-bit
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/fluent-bit $(1)/usr/sbin/
-	$(INSTALL_DATA) ./files/fluent-bit.conf $(1)/etc/fluent-bit/fluent-bit.conf
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/parsers.conf $(1)/etc/fluent-bit/parsers.conf
 endef
 
-$(eval $(call BuildPackage,fluent-bit))
+$(eval $(call BuildPackage,fluentbit))

icwmp/Config.in

@@ -1,6 +0,0 @@
-menu "Configuration"
-
-config ICWMP_MGMT_FROM_USP
-	bool "Support configuration of ManagementServer from USP"
-	default y
-endmenu

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.8
+PKG_VERSION:=9.7.19
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=580f923cfc89aa9f151096d8606dde71e4604d08
+PKG_SOURCE_VERSION:=db40cb6311003c9a49e78f0e2f740aae465266a8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -32,21 +32,8 @@ define Package/icwmp
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
   DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
-  MENU:=1
 endef
 
-define Package/icwmp/description
- TR069 client implementation with bbfdm backend for TR181 support
-endef
-
-define Package/icwmp/config
-	source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_ICWMP_MGMT_FROM_USP),y)
-EXTRA_CFLAGS += -DCWMP_DUAL_SUPPORT=BBFDM_BOTH
-endif
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
@@ -64,7 +51,6 @@ define Package/icwmp/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
-	$(INSTALL_BIN) ./files/etc/critical_services.json $(1)/etc/icwmpd/critical_services.json
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/

icwmp/files/etc/config/cwmp

@@ -41,7 +41,6 @@ config cpe 'cpe'
 	option active_notif_throttle '0'
 	option disable_gatewayinfo '0'
 	option fw_upgrade_keep_settings '1'
-	option clock_sync_timeout '128'
 	
 config lwn 'lwn'
 	option enable '0'

icwmp/files/etc/critical_services.json

@@ -1,11 +0,0 @@
-{
-	"services_list": [
-			"firewall",
-			"network",
-			"dhcp",
-			"stunc",
-			"xmpp",
-			"wireless",
-			"time"
-	]
-}

icwmp/files/etc/firewall.cwmp

@@ -6,7 +6,7 @@ log() {
 }
 
 get_firewall_zone() {
-	zone="$(uci show firewall|grep network|grep -w ${1}|cut -d. -f 2)"
+	zone="$(uci show firewall|grep network|grep ${1}|cut -d. -f 2)"
 	zone="${zone:-wan}" # defaults to wan zone
 	echo "$zone"
 }

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.5.1
+PKG_VERSION:=8.4.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b0e9ef0934888281ba7db7843738e56e6541665a
+PKG_SOURCE_VERSION:=e2f68a0ba54a6abf3481cdbb24d2dcc81e7f199c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/scripts/genconfig_wrap.sh

@@ -13,7 +13,8 @@ function genconfig {
     target_script="./scripts/gen_config.py"
 
     # First convert all to lowercase
-    args=$(to_lowercase "$@")
+    #args=$(to_lowercase "$@")
+    args="$@"
 
     # Check if an option is provided
     if [[ ${args[0]} == -* ]]; then
@@ -24,6 +25,10 @@ function genconfig {
     fi
 
     ${target_script} ${args[@]}
+    if [ "$?" != "0" ]; then
+        echo "Testing ./feeds/customerprofiles"
+        PROFILES="./feeds/customerprofiles,profiles" ${target_script} ${args[@]}
+    fi
 }
 
 register_command "genconfig" "Generate configuration for board and customer"

iopsys-analytics/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aea91816de703cf1c72490f51c2aa73c2f61640d
+PKG_SOURCE_VERSION:=fb84c1019a8a0fbfb624d9df8eb3604806645510
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopsys-analytics.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ipt-trigger/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipt-trigger
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.1
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4f3d4427403e0a9be7653c1b92907ae8ae5f21ae
+PKG_SOURCE_VERSION:=8d4b4520a2935a5717a27f486a3fc78357b2a0cd
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ipt-trigger.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

libdpp/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdpp
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6024efd3db9dd490c07465ea9b0c15120063165c
+PKG_SOURCE_VERSION:=1f82436531d4bb094b0b74e99613e0dfc84eada3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.110
+PKG_VERSION:=7.2.109
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d94e3029e4e9d14907fd6b283218defb4d319f5a
+PKG_SOURCE_VERSION:=cc72f5ab0171cd0fc29bb48dafff6751ab2f0d9c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libethernet/patches/0001-econet-Handle-unbound-HSGMII-LAN-interfaces.patch

@@ -0,0 +1,36 @@
+From be00aa9bd064d1defd94e78835249d0ca04c0440 Mon Sep 17 00:00:00 2001
+From: Markus Gothe <markus.gothe@genexis.eu>
+Date: Sun, 21 Apr 2024 15:30:18 +0200
+Subject: [PATCH] econet: Handle unbound HSGMII LAN interfaces.
+
+---
+ econet/ecnt_prvt.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/econet/ecnt_prvt.c b/econet/ecnt_prvt.c
+index 12c537f..a37fb49 100644
+--- a/econet/ecnt_prvt.c
++++ b/econet/ecnt_prvt.c
+@@ -212,6 +212,7 @@ int hsgmii_lan_prvt_get_port_statistics(char *ifname, struct eth_stats *stats, s
+ 	if (!strncmp(driver_name, DRIVER_NAME, DRIVER_NAME_LEN)) {
+ 		int i = 0, hsgmii_index = -1;
+ 		const char *hsgmii_iftype;
++		char cmdbuf[512] = {0};
+ 
+ 		for (; i < ARRAY_SIZE(hsgmii_lookup_tbl); i++) {
+ 			int j = 0;
+@@ -235,6 +236,11 @@ int hsgmii_lan_prvt_get_port_statistics(char *ifname, struct eth_stats *stats, s
+ 		memset(&tx_stats, 0, sizeof(ECNT_FEMGR_GDMA2_TX_STATISTICS));
+ 		memset(&rx_stats, 0, sizeof(ECNT_FEMGR_GDMA2_RX_STATISTICS));
+ 
++		/* Handle unbound interface statistics */
++		chrCmd(cmdbuf, sizeof(cmdbuf), "cat /proc/tc3162/%s_rebind | awk '{ print $3 }'", ifname);
++		if (cmdbuf[0] != '\0' && strtoul(cmdbuf, NULL, 0) == 1)
++			return 0;
++
+ 		if (!fe_lib_get_hsgmii_tx_statistics(&tx_stats, hsgmii_index)) {
+ 			fill_stats_tx_from_gdma(stats, rstats, &tx_stats);
+ 		}
+-- 
+2.43.2
+

libethernet/patches/0002-libethernet-Improve-counter-logic-for-Airoha.patch

@@ -0,0 +1,162 @@
+From 6e7216e657dfb59e869e393ef58e6b4593c16fc7 Mon Sep 17 00:00:00 2001
+From: Markus Gothe <markus.gothe@genexis.eu>
+Date: Thu, 22 Aug 2024 22:00:25 +0200
+Subject: [PATCH] libethernet: Improve counter logic for Airoha.
+
+Improve the counter logic to support 64-bit counters
+for internal switch and different MACs for 'ae_wan'.
+
+Also add support for represeting TX/RX bytes and errors.
+Fix calculation of unicast packets.
+---
+ econet/ecnt_prvt.c | 76 +++++++++++++++++++++++++++++++---------------
+ 1 file changed, 51 insertions(+), 25 deletions(-)
+
+diff --git a/econet/ecnt_prvt.c b/econet/ecnt_prvt.c
+index a37fb49..2c42a03 100644
+--- a/econet/ecnt_prvt.c
++++ b/econet/ecnt_prvt.c
+@@ -143,10 +143,10 @@ static void fill_stats_tx_from_gdma(struct eth_stats *stats, struct eth_rmon_sta
+ 		return;
+ 
+ 	if (stats != NULL) {
+-		stats->tx_bytes = 0;
++		stats->tx_bytes = tx_stats->frame_len;
+ 		stats->tx_packets = tx_stats->frame_cnt;
+ 		stats->tx_errors = 0;
+-		stats->tx_ucast_packets = 0;
++		stats->tx_ucast_packets = tx_stats->frame_cnt - (tx_stats->broadcast + tx_stats->multicast);
+ 		stats->tx_mcast_packets = tx_stats->broadcast;
+ 		stats->tx_bcast_packets = tx_stats->multicast;
+ 		stats->tx_discard_packets = tx_stats->drop_cnt;
+@@ -154,7 +154,7 @@ static void fill_stats_tx_from_gdma(struct eth_stats *stats, struct eth_rmon_sta
+ 
+ 	if (rstats != NULL) {
+ 		rstats->tx.packets = tx_stats->frame_cnt;
+-		rstats->tx.bytes = 0;
++		rstats->tx.bytes = tx_stats->frame_len;
+ 		rstats->tx.bcast_packets = tx_stats->broadcast;
+ 		rstats->tx.mcast_packets = tx_stats->multicast;
+ 		rstats->tx.crc_err_packets = 0;
+@@ -175,10 +175,10 @@ static void fill_stats_rx_from_gdma(struct eth_stats *stats, struct eth_rmon_sta
+ 		return;
+ 
+ 	if (stats != NULL) {
+-		stats->rx_bytes = 0;
++		stats->rx_bytes = rx_stats->frame_len;
+ 		stats->rx_packets = rx_stats->frame_cnt;
+-		stats->rx_errors = 0;
+-		stats->rx_ucast_packets = 0;
++		stats->rx_errors = rx_stats->crc + rx_stats->jabber + rx_stats->fragment + rx_stats->undersize + rx_stats->oversize;
++		stats->rx_ucast_packets = rx_stats->frame_cnt - (rx_stats->broadcast + rx_stats->multicast);
+ 		stats->rx_mcast_packets = rx_stats->broadcast;
+ 		stats->rx_bcast_packets = rx_stats->multicast;
+ 		stats->rx_discard_packets = rx_stats->drop_cnt;
+@@ -187,12 +187,12 @@ static void fill_stats_rx_from_gdma(struct eth_stats *stats, struct eth_rmon_sta
+ 
+ 	if (rstats != NULL) {
+ 		rstats->rx.packets = rx_stats->frame_cnt;
+-		rstats->rx.bytes = 0;
++		rstats->rx.bytes = rx_stats->frame_len;
+ 		rstats->rx.bcast_packets = rx_stats->broadcast;
+ 		rstats->rx.mcast_packets = rx_stats->multicast;
+-		rstats->rx.crc_err_packets = 0;
+-		rstats->rx.under_sz_packets = 0;
+-		rstats->rx.over_sz_packets = 0;
++		rstats->rx.crc_err_packets = rx_stats->crc;
++		rstats->rx.under_sz_packets = rx_stats->undersize;
++		rstats->rx.over_sz_packets = rx_stats->oversize;
+ 		rstats->rx.packets_64bytes = rx_stats->eq_64;
+ 		rstats->rx.packets_65to127bytes = rx_stats->from_65_to_127;
+ 		rstats->rx.packets_256to511bytes = rx_stats->from_256_to_511;
+@@ -259,23 +259,50 @@ int hsgmii_lan_prvt_get_port_statistics(char *ifname, struct eth_stats *stats, s
+ }
+ 
+ int ae_wan_prvt_get_port_statistics(struct eth_stats *stats, struct eth_rmon_stats *rstats) {
++	char cmdbuf[512] = {0};
+ 	ECNT_FEMGR_GDMA2_TX_STATISTICS tx_stats;
+ 	ECNT_FEMGR_GDMA2_RX_STATISTICS rx_stats;
+ 
+ 	memset(&tx_stats, 0, sizeof(ECNT_FEMGR_GDMA2_TX_STATISTICS));
+ 	memset(&rx_stats, 0, sizeof(ECNT_FEMGR_GDMA2_RX_STATISTICS));
+ 
+-	if (!fe_lib_get_gdma2_tx_statistics(&tx_stats)) {
+-		fill_stats_tx_from_gdma(stats, rstats, &tx_stats);
+-	}
++	chrCmd(cmdbuf, sizeof(cmdbuf), "cat /proc/tc3162/ae_wan_switch_hsgmii_lan");
++	if (cmdbuf[0] != '\0' && strcmp(cmdbuf, "pon") != 0) {
++		int i = 0, hsgmii_index = -1;
++		for (; i < ARRAY_SIZE(hsgmii_lookup_tbl); i++) {
++			if (!strcmp(cmdbuf, hsgmii_lookup_tbl[i].iftype)) {
++				hsgmii_index = hsgmii_lookup_tbl[i].idx;
++				break;
++			}
++		}
+ 
+-	if (!fe_lib_get_gdma2_rx_statistics(&rx_stats)) {
+-		fill_stats_rx_from_gdma(stats, rstats, &rx_stats);
+-	}
++		if (hsgmii_index == -1)
++			return -1;
+ 
+-	if (rstats != NULL) {
+-		get_pause_stats_from_proc("", "ae_wan", &rstats->rx.pause_packets,
+-					  &rstats->tx.pause_packets);
++		if (!fe_lib_get_hsgmii_tx_statistics(&tx_stats, hsgmii_index)) {
++			fill_stats_tx_from_gdma(stats, rstats, &tx_stats);
++		}
++		if (!fe_lib_get_hsgmii_rx_statistics(&rx_stats, hsgmii_index)) {
++			fill_stats_rx_from_gdma(stats, rstats, &rx_stats);
++		}
++
++		if (rstats != NULL) {
++			get_pause_stats_from_proc("hsgmii_", cmdbuf, &rstats->rx.pause_packets,
++						  &rstats->tx.pause_packets);
++		}
++	} else {
++		if (!fe_lib_get_gdma2_tx_statistics(&tx_stats)) {
++			fill_stats_tx_from_gdma(stats, rstats, &tx_stats);
++		}
++
++		if (!fe_lib_get_gdma2_rx_statistics(&rx_stats)) {
++			fill_stats_rx_from_gdma(stats, rstats, &rx_stats);
++		}
++
++		if (rstats != NULL) {
++			get_pause_stats_from_proc("", "ae_wan", &rstats->rx.pause_packets,
++						  &rstats->tx.pause_packets);
++		}
+ 	}
+ 
+ 	return 0;
+@@ -305,14 +332,12 @@ int ecnt_prvt_get_port_statistics(uint32_t port,
+ 	}
+ 
+ 	if (stats != NULL) {
+-		stats->tx_bytes =
+-			portcnt.TxBytesCnt_Lo;
+-		stats->rx_bytes =
+-			portcnt.RxBytesCnt_Lo;
++		stats->tx_bytes = (((uint64_t)portcnt.TxBytesCnt_Hi) << 32) + portcnt.TxBytesCnt_Lo;
++		stats->rx_bytes = (((uint64_t)portcnt.RxBytesCnt_Hi) << 32) + portcnt.RxBytesCnt_Lo;
+ 		stats->tx_packets = portcnt.TxPktsCnt;
+ 		stats->rx_packets = portcnt.RxPktsCnt;
+ 		stats->tx_errors = 0;
+-		stats->rx_errors = 0;
++		stats->rx_errors = portcnt.RxAlignmentErrorCnt + portcnt.RxCRCFramesCnt + portcnt.RxUnderSizePktsCnt + portcnt.RxFragmentErrorCnt + portcnt.RxOverSizePktsCnt;
+ 		stats->tx_ucast_packets = portcnt.TxUniPktsCnt;
+ 		stats->rx_ucast_packets = portcnt.RxUniPktsCnt;
+ 		stats->tx_mcast_packets = portcnt.TxMultiPktsCnt;
+@@ -330,7 +355,8 @@ int ecnt_prvt_get_port_statistics(uint32_t port,
+ 			rstats->__rmon_field.drop_events = \
+ 				portcnt.__ecnt_prefix ## DropFramesCnt; \
+ 			rstats->__rmon_field.bytes = \
+-				portcnt.__ecnt_prefix ## BytesCnt_Lo; \
++				(((uint64_t)portcnt.__ecnt_prefix ## BytesCnt_Hi) << 32) \
++				+ portcnt.__ecnt_prefix ## BytesCnt_Lo; \
+ 			rstats->__rmon_field.packets = portcnt.__ecnt_prefix ## PktsCnt;\
+ 			rstats->__rmon_field.bcast_packets = \
+ 				portcnt.__ecnt_prefix ## BroadPktsCnt; \
+-- 
+2.46.0
+

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.5.2
+PKG_VERSION:=7.4.75
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e93fcd63354489846e5bb2450c7e8059774577d5
+PKG_SOURCE_VERSION:=92176d664063be63c03bfe2e353193b3291b714a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

logmngr/Config.in

@@ -1,26 +0,0 @@
-if PACKAGE_logmngr
-choice
-	prompt "Select backend for syslog management"
-	default LOGMNGR_BACKEND_FLUENTBIT
-	depends on PACKAGE_logmngr
-	help
-		Select which backend daemon to use for syslog management
-
-config LOGMNGR_BACKEND_FLUENTBIT
-	bool "Use fluent-bit for log management"
-	help
-		Enable this option to use fluent-bit for log management.
-
-config LOGMNGR_BACKEND_SYSLOG_NG
-	bool "Use syslog-ng for log management"
-	help
-		Enable this option to use syslog-ng for log management.
-
-endchoice
-config LOGMNGR_LOGROTATE
-	bool "Logrotate support"
-	depends on PACKAGE_logmngr
-	default y
-	help
-		It adds support for logrotate functionality.
-endif

logmngr/Makefile

@@ -1,74 +0,0 @@
-#
-# Copyright (C) 2024 iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=logmngr
-PKG_VERSION:=1.0.1
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
-PKG_SOURCE_VERSION:=ec10abb3cc0f3b96eb806c9c67e18d9d134287e9
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk
-
-MAKE_PATH:=bbf_plugin
-
-define Package/logmngr
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=Logging Manager
- DEPENDS:=+libbbfdm-api +LOGMNGR_BACKEND_FLUENTBIT:fluent-bit +LOGMNGR_LOGROTATE:logrotate
- DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng
-endef
-
-define Package/logmngr/description
-	Configure log management. This package has the datamodel as well as the
-	the backend implementation for handling syslog.
-endef
-
-define Package/$(PKG_NAME)/config
-        source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ./logmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/logmngr/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/logmngr.init $(1)/etc/init.d/logmngr
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/logread $(1)/usr/sbin
-
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/10-logmngr_config_generate $(1)/etc/uci-defaults/
-
-	$(INSTALL_DIR) $(1)/lib/logmngr
-ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
-	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/.
-endif
-ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
-	$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/.
-endif
-	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1)
-ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y)
-	$(INSTALL_BIN) ./files/11-logmngr_logrotate_config_generate $(1)/etc/uci-defaults/
-	$(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/.
-	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1)
-endif
-endef
-
-$(eval $(call BuildPackage,logmngr))

logmngr/files/10-logmngr_config_generate

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-if [ -s "/etc/config/logmngr" ]; then
-	if uci -q get logmngr.@globals[0] >/dev/null; then
-		# return if there is any valid content
-		exit
-	else
-		rm -f /etc/config/logmngr
-	fi
-fi
-touch /etc/config/logmngr
-
-uci set logmngr.globals=globals
-uci set logmngr.globals.enable=1
-
-uci set logmngr.a1=action
-uci set logmngr.a1.name="ac1"
-
-uci set logmngr.lf1=log_file
-uci set logmngr.lf1.enable=1
-uci set logmngr.lf1.action="ac1"
-uci set logmngr.lf1.file="/var/log/messages"
-uci commit logmngr

logmngr/files/11-logmngr_logrotate_config_generate

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ -s "/etc/config/logmngr" ]; then
-	if uci -q get logmngr.@log_rotate[0] >/dev/null; then
-		# return if there is any valid content
-		exit
-	fi
-	uci set logmngr.lro1=log_rotate
-	uci set logmngr.lro1.enable=1
-	uci set logmngr.lro1.file_name="/var/log/messages"
-	uci set logmngr.lro1.file_count=1
-	uci set logmngr.lro1.max_file_size=1000000
-	uci commit logmngr
-fi

logmngr/files/lib/logmngr/fluent-bit.sh

@@ -1,319 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/logmngr/logrotate.sh
-
-CONF_FILE=/etc/fluent-bit/fluent-bit.conf
-TMP_CONF_FILE=/tmp/fluent-bit/fluent-bit.conf
-
-create_config_file() {
-	mkdir -p /tmp/fluent-bit
-	rm -f ${TMP_CONF_FILE}
-	touch ${TMP_CONF_FILE}
-}
-
-create_service_section() {
-	# the service section of the fluent-bit.conf file has hardcoded values,
-	# no need to lookup any uci section to configure this section
-	echo "[SERVICE]" >> ${TMP_CONF_FILE}
-	echo "    flush        3" >> ${TMP_CONF_FILE}
-	echo "    daemon       off" >> ${TMP_CONF_FILE}
-	echo "    log_level    info" >> ${TMP_CONF_FILE}
-	echo "    parsers_file /etc/fluent-bit/parsers.conf" >> ${TMP_CONF_FILE}
-}
-
-create_input_section() {
-	local tag="$1"
-	# the input in our case is always syslog, hence, this section of the
-	# fluent-bit.conf file has hardcoded values as well that do not depend
-	# on any uci value
-	echo "[INPUT]" >> ${TMP_CONF_FILE}
-	echo "    name        syslog" >> ${TMP_CONF_FILE}
-	echo "    tag         $tag" >> ${TMP_CONF_FILE}
-	echo "    path        /dev/log" >> ${TMP_CONF_FILE}
-}
-
-generate_facility_regex() {
-	local facility_level=$1
-	local pri=0
-
-	if [ "$facility_level" == "24" ]; then
-		# value 24 means all facility level, which is as good as not
-		# generating a filter section, so return
-		return
-	fi
-
-	# facility_level is a list value, hence, generate regex for
-	# each value
-	IFS=" "
-	for val in $facility_level; do
-		# as per rfc 5424 and 3164, pri in syslog msg is
-		# facility*8+severity. Severity value can range from 0-7 hence
-		# generate regex for each.
-		for sval in 0 1 2 3 4 5 6 7; do
-			pri=`expr $val \* 8 + $sval`
-			echo "    regex        pri $pri" >> ${TMP_CONF_FILE}
-		done
-	done
-
-}
-
-generate_severity_regex() {
-	local sev_level="$1"
-	local sev_compare="$2"
-	local sev_action="$3"
-
-	local pri=0
-	local param="exclude"
-
-	if [ "$sev_action" == "0" ]; then
-		param="regex"
-	fi
-
-	local fval=0
-	if [ "$sev_compare" == "0" ]; then
-		# generate regex for all facility values, with severity=sev_level
-		while [ $fval -le 23 ] ; do
-			pri=`expr $fval \* 8 + $sev_level`
-			echo "    $param        pri $pri" >> ${TMP_CONF_FILE}
-			fval=$((fval + 1))
-		done
-	elif [ "$sev_compare" == "1" ]; then
-		# generate regex for all severity value greater than or equal to
-		# sev_level. please, lower value have higher precedence, so sev_level
-		# 0 which is emergency has higher precedence than error which is 3
-		while [ $fval -le 23 ] ; do
-			sval=0
-			while [ $sev_level -ge $sval ]; do
-				pri=`expr $fval \* 8 + $sval`
-				echo "    $param        pri $pri" >> ${TMP_CONF_FILE}
-				sval=$((sval + 1))
-			done
-			fval=$((fval + 1))
-		done
-	fi
-}
-
-handle_filter_conf() {
-	local section="$1" # config filter
-	local filter_name="$2"
-	local name
-
-	# no need to proceed if name of filter section is not one of the values
-	# listed in option filter in config action section
-	config_get name $section name
-	if [ "$name" != "$filter_name" ]; then
-		return
-	fi
-
-	# as per data model, at a time either facility_level or severity_level can
-	# be specified along with pattern_match. hence, first process and generate
-	# regex for pattern_match which is common in both condition. Next, we will
-	# process facility_level and return if facility level is defined and not
-	# process severity related params at all.
-
-	local pattern_match
-	config_get pattern_match $section pattern_match
-	if [ -n "$pattern_match" ]; then
-		echo "    regex        $pattern_match" >> ${TMP_CONF_FILE}
-	fi
-
-	local facility_level
-	config_get facility_level $section facility_level
-
-	if [ -n "$facility_level" ]; then
-		generate_facility_regex $facility_level
-		# return from here since if facility_level is defined, then no
-		# need to process severity_level
-		return
-	fi
-
-	local sev_level
-	local sev_compare
-	local sev_action
-	config_get sev_level $section severity_level
-
-	if [ -n "$sev_level" ]; then
-		# value 1 of severity compare corresponds to data model
-		# and system default which is EqualorHigher
-		config_get sev_compare $section severity_compare 1
-		# value 0 of severity action corresponds to data model
-		# and system default that is log
-		config_get sev_action $section severity_action 0
-
-		generate_severity_regex $sev_level $sev_compare $sev_action
-	fi
-}
-
-create_filter_section() {
-	local match="$1"
-
-	echo "[FILTER]" >> ${TMP_CONF_FILE}
-	echo "    name        grep" >> ${TMP_CONF_FILE}
-	echo "    match       $match" >> ${TMP_CONF_FILE}
-	echo "    logical_op  or" >> ${TMP_CONF_FILE} # handle multiple filters
-}
-
-handle_filter_ref() {
-	local filter_name="$1"
-	config_foreach handle_filter_conf filter "$filter_name"
-}
-
-handle_log_file() {
-	local section="$1" # out_file section
-	local match="$2"
-	local action_ref
-
-	config_get action_ref $section action
-	if [ "$action_ref" != "$match" ]; then
-		return
-	fi
-
-	local enabled
-	config_get enabled $section enable
-	if [ "$enabled" == 0 ]; then
-		return
-	fi
-
-	local file
-	config_get file $section file
-	if [ -z "$file" ]; then
-		return
-	fi
-
-	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
-	echo "    name         file" >> ${TMP_CONF_FILE}
-	echo "    match        $match" >> ${TMP_CONF_FILE}
-	echo "    file        $file" >> ${TMP_CONF_FILE}
-}
-
-handle_log_remote() {
-	local section="$1"
-	local match="$2"
-	local action_ref
-
-	config_get action_ref $section action
-	if [ "$action_ref" != "$match" ]; then
-		return
-	fi
-
-	local enabled
-	config_get enabled $section enable
-	if [ "$enabled" == 0 ]; then
-		return
-	fi
-
-
-	local address
-	config_get address $section log_ip
-	if [ -z "$address" ]; then
-		return
-	fi
-
-	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
-	echo "    name         syslog" >> ${TMP_CONF_FILE}
-	echo "    match        $match" >> ${TMP_CONF_FILE}
-	echo "    host         $address" >> ${TMP_CONF_FILE}
-
-	local proto # holds value tcp or udp
-	config_get proto $section proto
-	if [ -n "$proto" ]; then
-		if [ "$proto" == "tls" ]; then
-			echo "    mode         tcp" >> ${TMP_CONF_FILE}
-			echo "    tls          on" >> ${TMP_CONF_FILE}
-		else
-			echo "    mode         $proto" >> ${TMP_CONF_FILE}
-		fi
-	fi
-
-	local port
-	config_get port $section port
-	if [ -n "$port" ]; then
-		echo "    port         $port" >> ${TMP_CONF_FILE}
-	fi
-
-	local cert
-	local peer_verify
-	config_get cert $section cert
-	if [ -n "$cert" ]; then
-		echo "    tls.crt_file $cert" >> ${TMP_CONF_FILE}
-
-		config_get peer_verify $section peer_verify
-		if [ "$peer_verify" == "1" ]; then
-			echo "    tls.verify     on" >> ${TMP_CONF_FILE}
-		fi
-	fi
-}
-
-handle_action() {
-	local section="$1"
-
-	local filter
-	config_get filter $section filter
-
-	# use config action option name as tag for input
-	local tag
-	config_get tag $section name
-	if [ -z "$tag" ]; then
-		return
-	fi
-
-	create_input_section $tag
-	if [ -n "$filter" ]; then
-		# the only fluentbit filter that is useful for the datamodel is
-		# grep. Also, fluentbit does not seem to handle multiple instances
-		# of FILTER of same kind. Hence, each filter section corresponding
-		# to an action entry in the uci would translate for us into a set of
-		# regex/exclude values instead of individual FILTER section per uci
-		# section filter is a list, treat according
-		create_filter_section $tag
-
-		IFS=" "
-		for finst in $filter; do
-			handle_filter_ref $finst
-		done
-	fi
-
-	# handle output, each action can be associated with a out_log and out_syslog
-	# section so figure out if any out_log or out_syslog section is associated
-	# with this and action and setup output accordingly.
-	config_foreach handle_log_file log_file "$tag"
-	config_foreach handle_log_remote log_remote "$tag"
-
-
-}
-
-handle_action_section() {
-	config_foreach handle_action action
-}
-
-apply_config_file() {
-	cp ${TMP_CONF_FILE} ${CONF_FILE}
-}
-
-PROG=/usr/sbin/fluent-bit
-logmngr_init() {
-	create_config_file
-
-	config_load logmngr
-	local enabled
-	config_get enabled globals enable
-
-	if [ "$enabled" == "0" ]; then
-		return
-	fi
-
-	create_service_section
-	handle_action_section
-	apply_config_file
-
-	if [ -f /lib/logmngr/logrotate.sh ]; then
-		logrotate_init
-	fi
-
-	procd_open_instance logmngr
-	procd_set_param command $PROG -c $CONF_FILE
-	procd_set_param file $CONF_FILE
-	procd_set_param respawn
-	procd_close_instance
-}

logmngr/files/lib/logmngr/logrotate.sh

@@ -1,96 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-LOGROTATE_FILE=/etc/logrotate.conf
-LOGROTATE_TMP_FILE=/tmp/logrotate/logrotate.conf
-
-create_logrotate_file() {
-	mkdir -p /tmp/logrotate
-	rm -f ${LOGROTATE_TMP_FILE}
-	touch ${LOGROTATE_FILE}
-}
-
-
-handle_logrotate() {
-	local section="$1"
-
-	local enabled
-	config_get enabled $section enable
-	if [ "$enabled" == "0" ]; then
-		return
-	fi
-
-	local file_name
-	config_get file_name $section file_name
-	if [ -z "$file_name" ]; then
-		# no file to rotate, return
-		return
-	fi
-
-	echo -e "$file_name {" >> ${LOGROTATE_TMP_FILE}
-	echo -e "\tcreate" >> ${LOGROTATE_TMP_FILE}
-	echo -e "\tmissingok" >> ${LOGROTATE_TMP_FILE}
-	echo -e "\tnotifempty" >> ${LOGROTATE_TMP_FILE}
-
-	local file_count
-	config_get file_count $section file_count
-	if [ -n "$file_count" ]; then
-		echo -e "\trotate $file_count" >> ${LOGROTATE_TMP_FILE}
-	fi
-
-	local max_file_size
-	config_get max_file_size $section max_file_size
-	if [ -n "$max_file_size" ]; then
-		echo -e "\tmaxsize $max_file_size" >> ${LOGROTATE_TMP_FILE}
-	fi
-
-	local duration
-	config_get duration $section duration
-	if [ -n "$duration" ]; then
-		echo -e "\tminutes $duration" >> ${LOGROTATE_TMP_FILE}
-	fi
-
-	local retention
-	config_get retention $section retention
-	if [ -n "$retention" ]; then
-		echo -e "\tmaxage $retention" >> ${LOGROTATE_TMP_FILE}
-	fi
-
-	local compression
-	config_get compression $section compression
-	if [ -n "$compression" ]; then
-		echo -e "\tcompress" >> ${LOGROTATE_TMP_FILE}
-		echo -e "\tcompresscmd $compression" >> ${LOGROTATE_TMP_FILE}
-	fi
-
-	echo -e "\tpostrotate" >> ${LOGROTATE_TMP_FILE}
-	echo -e "\t\tservice logmngr restart" >> ${LOGROTATE_TMP_FILE}
-	echo -e "\t\tsleep 1" >> ${LOGROTATE_TMP_FILE}
-	echo -e "\tendscript" >> ${LOGROTATE_TMP_FILE}
-	echo -e "}" >> ${LOGROTATE_TMP_FILE} # close the logfile section
-}
-
-apply_logrotate_file() {
-	cp ${LOGROTATE_TMP_FILE} ${LOGROTATE_FILE}
-}
-
-config_cron_job() {
-	# taking the liberty to configure the cron job hourly, that is, at the end
-	# of each hour, check if logrotation is needed. The logrotate daemon, when
-	# triggered hourly, will still honour the configure log rotation duration,
-	# the only slight different being that if the minutes for log rotation
-	# are configured in such a way that it falls within the hour, then the
-	# log rotation will be done at the completion of hour and not before. I do
-	# not think this is a drawback in the interest of keeping things simple.
-	sed -i '/logrotate/d' /etc/crontabs/root
-	echo "0 * * * * logrotate ${LOGROTATE_FILE}" >> /etc/crontabs/root
-	/etc/init.d/cron restart
-}
-
-logrotate_init() {
-	create_logrotate_file
-	config_foreach handle_logrotate log_rotate
-	apply_logrotate_file
-	config_cron_job
-}

logmngr/files/lib/logmngr/syslog-ng.sh

@@ -1,345 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/logmngr/logrotate.sh
-
-CONF_FILE=/etc/syslog-ng.conf
-TMP_CONF_FILE=/tmp/syslog-ng/syslog-ng.conf
-
-create_config_file() {
-	mkdir -p /tmp/syslog-ng
-	rm -f ${TMP_CONF_FILE}
-	touch ${TMP_CONF_FILE}
-}
-
-create_option_section() {
-	# the option section of the syslog-ng.conf file has hardcoded values,
-	# no need to lookup any uci section to configure this section
-	echo -e "@version: 4.4" >> ${TMP_CONF_FILE}
-	echo -e '@include "scl.conf"' >> ${TMP_CONF_FILE}
-	echo -e "options {" >> ${TMP_CONF_FILE}
-	echo -e "\tchain_hostnames(no);" >> ${TMP_CONF_FILE}
-	echo -e "\tcreate_dirs(yes);" >> ${TMP_CONF_FILE}
-	echo -e "\tkeep_hostname(yes);" >> ${TMP_CONF_FILE}
-	echo -e "\tlog_fifo_size(256);" >> ${TMP_CONF_FILE}
-	echo -e "\tlog_msg_size(1024);" >> ${TMP_CONF_FILE}
-	echo -e "\tstats(freq(0));" >> ${TMP_CONF_FILE}
-	echo -e "\tflush_lines(0);" >> ${TMP_CONF_FILE}
-	echo -e "\tuse_fqdn(no);" >> ${TMP_CONF_FILE}
-	echo "};" >> ${TMP_CONF_FILE}
-
-}
-
-create_input_section() {
-	local tag="$1"
-	# the input in our case is always syslog, hence, this section of the
-	# fluent-bit.conf file has hardcoded values as well that do not depend
-	# on any uci value
-	echo -e "source $tag {" >> ${TMP_CONF_FILE}
-	echo -e "\tinternal();" >> ${TMP_CONF_FILE}
-	echo -e "\tunix-dgram("/dev/log");" >> ${TMP_CONF_FILE}
-	echo "};" >> ${TMP_CONF_FILE}
-}
-
-generate_facility_regex() {
-	local facility_level=$1
-
-	if [ "$facility_level" == "24" ]; then
-		# value 24 means all facility level, which is as good as not
-		# generating a filter section, so return
-		return
-	fi
-
-	# facility_level is a list value, hence, generate regex for
-	# each value
-	IFS=" "
-	for val in $facility_level; do
-		echo -e "\tfacility($val);" >> ${TMP_CONF_FILE}
-	done
-
-}
-
-generate_severity_regex() {
-	local sev_level="$1"
-	local sev_compare="$2"
-	local sev_action="$3"
-
-	if [ "$sev_compare" == "0" ]; then
-		case $sev_level in
-		"0") echo -e "\tlevel(emerg)" >> ${TMP_CONF_FILE}
-		;;
-		"1") echo -e "\tlevel(alert)" >> ${TMP_CONF_FILE}
-		;;
-		"2") echo -e "\tlevel(crit)" >> ${TMP_CONF_FILE}
-		;;
-		"3") echo -e "\tlevel(err)" >> ${TMP_CONF_FILE}
-		;;
-		"4") echo -e "\tlevel(warning)" >> ${TMP_CONF_FILE}
-		;;
-		"5") echo -e "\tlevel(notice)" >> ${TMP_CONF_FILE}
-		;;
-		"6") echo -e "\tlevel(info)" >> ${TMP_CONF_FILE}
-		;;
-		"7") echo -e "\tlevel(debug)" >> ${TMP_CONF_FILE}
-		;;
-		esac
-	elif [ "$sev_compare" == "1" ]; then
-		# generate regex for all severity value greater than or equal to
-		# sev_level
-		case $sev_level in
-		"0") echo -e "\tlevel(emerg)" >> ${TMP_CONF_FILE}
-		;;
-		"1") echo -e "\tlevel(alert..emerg)" >> ${TMP_CONF_FILE}
-		;;
-		"2") echo -e "\tlevel(crit..emerg)" >> ${TMP_CONF_FILE}
-		;;
-		"3") echo -e "\tlevel(err..emerg)" >> ${TMP_CONF_FILE}
-		;;
-		"4") echo -e "\tlevel(warning..emerg)" >> ${TMP_CONF_FILE}
-		;;
-		"5") echo -e "\tlevel(notice..emerg)" >> ${TMP_CONF_FILE}
-		;;
-		"6") echo -e "\tlevel(info..emerg)" >> ${TMP_CONF_FILE}
-		;;
-		"7") echo -e "\tlevel(debug..emerg)" >> ${TMP_CONF_FILE}
-		;;
-		esac
-	fi
-}
-
-handle_filter_conf() {
-	local section="$1" # config filter
-	local filter_name="$2"
-	local name
-
-	# no need to proceed if name of filter section is not one of the values
-	# listed in option filter in config action section
-	config_get name $section name
-	if [ "$name" != "$filter_name" ]; then
-		return
-	fi
-	echo -e "filter $name {" >> ${TMP_CONF_FILE}
-
-	# as per data model, at a time either facility_level or severity_level can
-	# be specified along with pattern_match. hence, first process and generate
-	# regex for pattern_match which is common in both condition. Next, we will
-	# process facility_level and return if facility level is defined and not
-	# process severity related params at all.
-
-	local pattern_match
-	config_get pattern_match $section pattern_match
-	if [ -n "$pattern_match" ]; then
-		# the pattern here is in tag=>value pair, hence, break the pattern
-		# and fill this filed
-		local tag=$(echo $pattern_match | awk '{print $1}')
-		local value=$(echo $pattern_match | awk '{print $2}')
-		echo -e "\tmatch("$value" value("$tag"))" >> ${TMP_CONF_FILE}
-	fi
-
-	local facility_level
-	config_get facility_level $section facility_level
-
-	if [ -n "$facility_level" ]; then
-		generate_facility_regex $facility_level
-		# return from here since if facility_level is defined, then no
-		# need to process severity_level
-		echo "};" >> ${TMP_CONF_FILE}
-		return
-	fi
-
-	local sev_level
-	local sev_compare
-	local sev_action
-	config_get sev_level $section severity_level
-
-	if [ -n "$sev_level" ]; then
-		# value 1 of severity compare corresponds to data model
-		# and system default which is EqualorHigher
-		config_get sev_compare $section severity_compare 1
-		# value 0 of severity action corresponds to data model
-		# and system default that is log
-		config_get sev_action $section severity_action 0
-
-		generate_severity_regex $sev_level $sev_compare $sev_action
-	fi
-	echo "};" >> ${TMP_CONF_FILE}
-}
-
-handle_filter_ref() {
-	local filter_name="$1"
-	config_foreach handle_filter_conf filter "$filter_name"
-}
-
-handle_log_file() {
-	local section="$1" # out_file section
-	local match="$2"
-	local filter="$3"
-	local action_ref
-
-	config_get action_ref $section action
-	if [ "$action_ref" != "$match" ]; then
-		return
-	fi
-
-	local enabled
-	config_get enabled $section enable
-	if [ "$enabled" == 0 ]; then
-		return
-	fi
-
-	local file
-	config_get file $section file
-	if [ -z "$file" ]; then
-		return
-	fi
-
-
-	echo -e "destination file_$match {" >> ${TMP_CONF_FILE}
-	echo -e "\tfile("$file");" >> ${TMP_CONF_FILE}
-	echo -e "};" >> ${TMP_CONF_FILE}
-
-	# now generate the log section for each action section to bring into effect
-	# the filter, destination, source sections create above
-	echo -e "log {" >> ${TMP_CONF_FILE}
-	echo -e "\tsource($tag);" >> ${TMP_CONF_FILE}
-	if [ -n "$filter" ]; then
-		IFS=" "
-		for finst in $filter; do
-			echo -e "\tfilter($finst);" >> ${TMP_CONF_FILE}
-		done
-	fi
-	echo -e "\tdestination(file_$match);" >> ${TMP_CONF_FILE} # log_file
-	echo -e "};" >> ${TMP_CONF_FILE} # close log section
-}
-
-handle_log_remote() {
-	local section="$1"
-	local match="$2"
-	local filter="$3"
-	local action_ref
-
-	config_get action_ref $section action
-	if [ "$action_ref" != "$match" ]; then
-		return
-	fi
-
-	local enabled
-	config_get enabled $section enable
-	if [ "$enabled" == 0 ]; then
-		return
-	fi
-
-
-	local address
-	config_get address $section log_ip
-	if [ -z "$address" ]; then
-		return
-	fi
-
-	echo -e "destination remote_$match {" >> ${TMP_CONF_FILE}
-	echo -e "\tsyslog(" >> ${TMP_CONF_FILE}
-	echo -e "\t\t"$address"" >> ${TMP_CONF_FILE}
-
-	local proto # holds value tcp or udp
-	config_get proto $section proto
-	if [ -n "$proto" ]; then
-		echo -e "\t\ttransport($proto)" >> ${TMP_CONF_FILE}
-	fi
-
-	local port
-	config_get port $section port
-	if [ -n "$port" ]; then
-		echo -e "\t\tport($port)" >> ${TMP_CONF_FILE}
-	fi
-
-	local cert
-	local peer_verify
-	config_get cert $section cert
-	if [ -n "$cert" ]; then
-		echo -e "\t\ttls(" >> ${TMP_CONF_FILE}
-		echo -e "\t\t\tcert-file($cert)" >> ${TMP_CONF_FILE}
-
-		config_get peer_verify $section peer_verify
-		if [ "$peer_verify" == "1" ]; then
-			echo -e "\t\t\tpeer-verify(required-trusted)" >> ${TMP_CONF_FILE}
-		fi
-		echo -e "\t\t)" >> ${TMP_CONF_FILE} # close tls section
-	fi
-	echo -e "\t);" >> ${TMP_CONF_FILE} # close syslog section
-	echo -e "};" >> ${TMP_CONF_FILE} # close destination section
-
-	# now generate the log section for each action section to bring into effect
-	# the filter, destination, source sections create above
-	echo -e "log {" >> ${TMP_CONF_FILE}
-	echo -e "\tsource($tag);" >> ${TMP_CONF_FILE}
-	if [ -n "$filter" ]; then
-		IFS=" "
-		for finst in $filter; do
-			echo -e "\tfilter($finst);" >> ${TMP_CONF_FILE}
-		done
-	fi
-	echo -e "\tdestination(remote_$match);" >> ${TMP_CONF_FILE} # log_file
-	echo -e "};" >> ${TMP_CONF_FILE} # close log section
-}
-
-handle_action() {
-	local section="$1"
-
-	local filter
-	config_get filter $section filter
-
-	# use config action option name as tag for input
-	local tag
-	config_get tag $section name
-	if [ -z "$tag" ]; then
-		return
-	fi
-
-	create_input_section $tag
-	if [ -n "$filter" ]; then
-		IFS=" "
-		for finst in $filter; do
-			handle_filter_ref $finst
-		done
-	fi
-
-	# handle output, each action can be associated with a out_log and out_syslog
-	# section so figure out if any out_log or out_syslog section is associated
-	# with this and action and setup output accordingly.
-	config_foreach handle_log_file log_file "$tag" "$filter"
-	config_foreach handle_log_remote log_remote "$tag" "$filter"
-}
-
-handle_action_section() {
-	config_foreach handle_action action
-}
-
-apply_config_file() {
-	cp ${TMP_CONF_FILE} ${CONF_FILE}
-}
-
-PROG=/usr/sbin/syslog-ng-ctl
-
-logmngr_init() {
-	create_config_file
-
-	config_load logmngr
-	local enabled
-	config_get enabled globals enable
-
-	if [ "$enabled" == "0" ]; then
-		return
-	fi
-
-	create_option_section
-	handle_action_section
-	apply_config_file
-
-	if [ -f /lib/logmngr/logrotate.sh ]; then
-		logrotate_init
-	fi
-
-	procd_open_instance logmngr
-	procd_set_param command $PROG reload
-	procd_close_instance
-}

logmngr/files/logmngr.init

@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=12
-STOP=89
-USE_PROCD=1
-
-. /lib/functions.sh
-include /lib/logmngr
-
-start_service() {
-	logmngr_init
-}
-
-service_triggers() {
-	procd_add_reload_trigger logmngr
-}

logmngr/files/logread

@@ -1,108 +0,0 @@
-#!/bin/sh
-# Shell script compatibility wrapper for /sbin/logread
-#
-# Copyright (C) 2019 Dirk Brenken <dev@brenken.org>
-#
-# 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.
-#
-# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-. /lib/functions.sh
-
-# use /var/log/messages as default
-logfile="/var/log/messages"
-
-
-handle_log_file() {
-	local section="$1"
-
-	local enabled
-	config_get enabled $section enable
-	if [ "$enabled" == 0 ]; then
-		return
-	fi
-
-	local file
-	config_get file $section file
-	if [ -z "$file" ]; then
-		return
-	fi
-
-	logfile="$file"
-}
-
-config_load logmngr
-config_get logmngr_enabled globals enable
-if [ "$logmngr_enabled" == "0" ]; then
-	printf "%s\n" "Error: logmngr is not enabled!"
-	exit 2
-fi
-
-# treat the last enabled log_file as logfile
-config_foreach handle_log_file log_file
-
-if [ ! -f "${logfile}" ]
-then
-	printf "%s\n" "Error: logfile $logfile not found!"
-	exit 2
-fi
-
-usage()
-{
-	printf "%s\n" "Usage: logread [options]"
-	printf "%s\n" "Options:"
-	printf "%5s %-10s%s\n" "-l" "<count>" "Got only the last 'count' messages"
-	printf "%5s %-10s%s\n" "-e" "<pattern>" "Filter messages with a regexp"
-	printf "%5s %-10s%s\n" "-f" "" "Follow log messages"
-	printf "%5s %-10s%s\n" "-h" "" "Print this help message"
-}
-
-if [ -z "${1}" ]
-then
-	cat "${logfile}"
-	exit 0
-else
-	while [ "${1}" ]
-	do
-		case "${1}" in
-			-l)
-				shift
-				count="${1//[^0-9]/}"
-				tail -n "${count:-50}" "${logfile}"
-				exit 0
-				;;
-			-e)
-				shift
-				pattern="${1}"
-				grep -E "${pattern}" "${logfile}"
-				exit 0
-				;;
-			-f)
-				tail -f "${logfile}"
-				exit 0
-				;;
-			-fe)
-				shift
-				pattern="${1}"
-				tail -f "${logfile}" | grep -E "${pattern}"
-				exit 0
-				;;
-			-h|*)
-				usage
-				exit 1
-				;;
-		esac
-		shift
-	done
-fi

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.1.1.9
+PKG_VERSION:=6.1.1.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8779b993dc8075aa48525340b9e86e13fa7ac54b
+PKG_SOURCE_VERSION:=cd3caa0fc30cdfc5b9392bce8ecaebb4b17f3b3d
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-agent/files/lib/multiap/map_genconfig

@@ -86,12 +86,6 @@ generate_multiap_config() {
 			[ "$disable_mlo" == "1" ] || {
 				uci set wireless.$dev.mlo="1"
 				uci set wireless.$dev.mlo_capable="1"
-
-				# Prevent driver crash for extender - remove it after fix
-				[ "$network_mode" == "extender" -a "$mode_band" == "6" ] && {
-					uci set wireless.$dev.mlo="0"
-					uci set wireless.$dev.mlo_capable="0"
-				}
 				uci commit wireless
 
 				# Disable for MLD/MLO

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.1.1.5
+PKG_VERSION:=6.1.1.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cb27de727b787bdb58bc4bf42fdef8732cb78134
+PKG_SOURCE_VERSION:=dfa994dbb956b355cad26fbc33b5be04f37e0064
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

mcastmngr/files/broadcom/lib/mcast/broadcom.sh

@@ -128,14 +128,14 @@ configure_mcpd_snooping() {
 		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
 		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
 		config_snooping_upstream_interface "$igmp_s_iface"
-		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
+		config_snooping_on_bridge $protocol "$igmp_s_iface" $igmp_s_mode
 		exceptions=$igmp_s_exceptions
 		fast_leave=$igmp_s_fast_leave
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
 		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
 		config_snooping_upstream_interface "$mld_s_iface"
-		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
+		config_snooping_on_bridge $protocol "$mld_s_iface" $mld_s_mode
 		exceptions=$mld_s_exceptions
 		fast_leave=$mld_s_fast_leave
 	fi
@@ -171,14 +171,14 @@ configure_mcpd_proxy() {
 		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_p_mode
 		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$igmp_p_up_interfaces"
-		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $igmp_p_mode
+		config_snooping_on_bridge $protocol "$igmp_p_down_interfaces" $igmp_p_mode
 		fast_leave=$igmp_fast_leave
 		exceptions=$igmp_p_exceptions
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_p_mode
 		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$mld_p_up_interfaces"
-		config_snooping_on_bridge $protocol $mld_p_down_interfaces $mld_p_mode
+		config_snooping_on_bridge $protocol "$mld_p_down_interfaces" $mld_p_mode
 		fast_leave=$mld_fast_leave
 		exceptions=$mld_p_exceptions
 	fi
@@ -236,7 +236,7 @@ configure_mcpd() {
 
 setup_mcast_mode() {
 	# set the mode at chip to allow both tagged and untagged multicast forwarding
-	bs /b/c iptv lookup_method=group_ip_src_ip
+	bs /b/c iptv lookup_method=group_ip_src_ip_vid
 }
 
 configure_mcast() {

mcastmngr/files/broadcom/usr/libexec/rpcd/mcast

@@ -64,23 +64,11 @@ read_mcast_stats() {
 
 	json_init
 	json_add_array "snooping"
-	json_add_object ""
 	IFS=" "
 	for intf in $ifaces; do
-		while read line; do
-		# reading each line
-			case $line in
-			br-*)
-				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-				if [ "$snoop_iface" != "$intf" ]; then
-					continue
-				fi
-				json_add_string "interface" "$intf"
-				json_add_array "groups"
-				break
-				;;
-			esac
-		done < /tmp/igmp_stats
+		json_add_object ""
+		json_add_string "interface" "$intf"
+		json_add_array "groups"
 		IFS=" "
 		for gip_addr in $mcast_addrs; do
 			grp_obj_added=0
@@ -116,12 +104,14 @@ read_mcast_stats() {
 					;;
 				esac
 			done < /tmp/igmp_stats
-			json_close_array #close the associated devices array
-			json_close_object # close the groups object
+			if [ $grp_obj_added -eq 1 ]; then
+				json_close_array #close the associated devices array
+				json_close_object # close the groups object
+			fi
 		done # close the loop for group addresses
 		json_close_array #close the groups array
+		json_close_object # close the snooping object
 	done # close the loop for interfaces
-	json_close_object # close the snooping object
 	json_close_array # close the snooping array
 	json_dump
 

mcastmngr/files/linux/lib/mcast/linux.sh

@@ -395,13 +395,15 @@ config_mcproxy() {
 	disable_snooping
 	if [ "$igmp_p_enable" == "1" ]; then
 		config_mcproxy_instance igmp "$igmp_p_version"
-	elif [ "$igmp_s_enable" == "1" ]; then
+	fi
+	if [ "$igmp_s_enable" == "1" ]; then
 		config_snooping igmp "$igmp_s_version"
 	fi
 
 	if [ "$mld_p_enable" == "1" ]; then
 		config_mcproxy_instance mld "$mld_p_version"
-	elif [ "$mld_s_enable" == "1" ]; then
+	fi
+	if [ "$mld_s_enable" == "1" ]; then
 		config_snooping mld "$mld_s_version"
 	fi
 }

mcastmngr/files/linux/usr/libexec/rpcd/mcast

@@ -85,23 +85,11 @@ read_mcast_stats() {
 
 	json_init
 	json_add_array "snooping"
-	json_add_object ""
 	IFS=" "
 	for intf in $ifaces; do
-		while read line; do
-		# reading each line
-			case $line in
-			br-*)
-				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-				if [ "$snoop_iface" != "$intf" ]; then
-					continue
-				fi
-				json_add_string "interface" "$intf"
-				json_add_array "groups"
-				break
-				;;
-			esac
-		done < "$temp_igmp_file"
+		json_add_object ""
+		json_add_string "interface" "$intf"
+		json_add_array "groups"
 		IFS=" "
 		for gip_addr in $mcast_addrs; do
 			grp_obj_added=0
@@ -137,12 +125,14 @@ read_mcast_stats() {
 					;;
 				esac
 			done < "$temp_igmp_file"
-			json_close_array #close the associated devices array
-			json_close_object # close the groups object
+			if [ $grp_obj_added -eq 1 ]; then
+				json_close_array #close the associated devices array
+				json_close_object # close the groups object
+			fi
 		done # close the loop for group addresses
 		json_close_array #close the groups array
+		json_close_object # close the snooping object
 	done # close the loop for interfaces
-	json_close_object # close the snooping object
 	json_close_array # close the snooping array
 	json_dump
 

mcastmngr/patches/70000_allow_duplicate_downstream_proxy_intf.patch

@@ -0,0 +1,40 @@
+diff --git a/bbf_plugin/x_iopsys_eu_igmp.c b/bbf_plugin/x_iopsys_eu_igmp.c
+index 576099c..a6b0e5e 100644
+--- a/bbf_plugin/x_iopsys_eu_igmp.c
++++ b/bbf_plugin/x_iopsys_eu_igmp.c
+@@ -60,7 +60,7 @@ static void sync_mcast_dmmap_iface_sec(struct uci_list *proxy_iface, char *s_mod
+ 	struct uci_section *d_sec;
+ 	int found = 0;
+ 	char key[1024] = "";
+-	char *s_name;
++	char *s_name, *intf_dir, *intf_smode;
+ 
+ 	uci_foreach_element(proxy_iface, e) {
+ 		char *p_ifname = dmstrdup(e->name);
+@@ -75,7 +75,12 @@ static void sync_mcast_dmmap_iface_sec(struct uci_list *proxy_iface, char *s_mod
+ 		// file corresponding to this interface
+ 		uci_path_foreach_option_eq(bbfdm, dmmap_package, dmmap_sec, "ifname", key, d_sec) {
+ 			dmuci_get_value_by_section_string(d_sec, "section_name", &s_name);
+-			if (strcmp(s_name, section_name(s)) == 0) {
++			dmuci_get_value_by_section_string(d_sec, "upstream", &intf_dir);
++			dmuci_get_value_by_section_string(d_sec, "snooping_mode", &intf_smode);
++
++			if (strcmp(s_name, section_name(s)) == 0 &&
++					strcmp(intf_dir, up_iface) == 0 &&
++					strcmp(intf_smode, s_mode) == 0) {
+ 				add_dmmap_config_dup_list(dup_list, s, d_sec);
+ 				found = 1;
+ 				break;
+@@ -1640,12 +1645,6 @@ static void sync_proxy_interface_sections(struct uci_section *s, char *section,
+ 				val = dmstrdup(e->name);
+ 				if (DM_STRCMP(val, pch) == 0) {
+ 					found = 1;
+-					if (!up_iface) {
+-						// if entry is found and upstream was set to
+-						// false, then, remove this entry
+-						dmuci_del_list_value_by_section(s, section, val);
+-					}
+-
+ 					// Further action is not required
+ 					break;
+ 				}

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=8.0.5.4
+PKG_VERSION:=8.0.1.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=eb7bddb8c0bd00b7e5d33daa9d51725309ac50b9
+PKG_SOURCE_VERSION:=aebe4c8e306f89026daf5a987dc1db98befd3474
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

obuspa/files/etc/obuspa/dmcaching_exclude.json

@@ -2,6 +2,7 @@
   "dmcaching_exclude": [
     "Device.Hosts.Host.",
     "Device.IEEE1905.",
-    "Device.WiFi.DataElements."
+    "Device.WiFi.DataElements.",
+    "Device.NAT.InterfaceSetting."
   ]
 }

obuspa/patches/0001-validate-controller-mtp.patch

@@ -1,8 +1,10 @@
+diff --git a/src/core/device.h b/src/core/device.h
+index 5e367b7..db154a5 100644
 --- a/src/core/device.h
 +++ b/src/core/device.h
-@@ -336,6 +336,10 @@ void DEVICE_CONTROLLER_SetInheritedRole(
- int DEVICE_CONTROLLER_CountEnabledWebsockClientConnections(void);
- #endif
+@@ -330,6 +330,10 @@ int DEVICE_MTP_ValidateMqttReference(dm_req_t *req, char *value);
+ void DEVICE_CONTROLLER_SetRolesFromMqtt(int mqtt_instance, int role_instance);
+ char *DEVICE_CONTROLLER_GetControllerTopic(int mqtt_instance);
  
 +#ifdef OBUSPA_CONTROLLER_MTP_VERIFY
 +bool DEVICE_CONTROLLER_IsMTPAllowed(char *endpoint_id, mtp_conn_t *mpc);
@@ -11,9 +13,11 @@
  #ifndef REMOVE_USP_BROKER
  int DEVICE_SUBSCRIPTION_RouteNotification(Usp__Msg *usp, int instance);
  bool DEVICE_SUBSCRIPTION_MarkVendorLayerSubs(int broker_instance, subs_notify_t notify_type, char *path, int group_id);
+diff --git a/src/core/device_controller.c b/src/core/device_controller.c
+index 97ca11d..19c91f1 100644
 --- a/src/core/device_controller.c
 +++ b/src/core/device_controller.c
-@@ -967,6 +967,78 @@ int DEVICE_CONTROLLER_QueueBinaryMessage
+@@ -952,6 +952,78 @@ int DEVICE_CONTROLLER_QueueBinaryMessage(mtp_send_item_t *msi, char *endpoint_id
      return USP_ERR_OK;
  }
  
@@ -92,9 +96,11 @@
  /*********************************************************************//**
  **
  ** DEVICE_CONTROLLER_IsMTPConfigured
+diff --git a/src/core/msg_handler.c b/src/core/msg_handler.c
+index 2a04d39..0b3074b 100644
 --- a/src/core/msg_handler.c
 +++ b/src/core/msg_handler.c
-@@ -1210,6 +1210,15 @@ int ValidateUspRecord(UspRecord__Record
+@@ -1206,6 +1206,15 @@ int ValidateUspRecord(UspRecord__Record *rec, mtp_conn_t *mtpc)
      usp_service_instance = USP_BROKER_GetUspServiceInstance(rec->from_id, 0);
  #endif
  

obuspa/patches/0002-supress-group-get-error.patch

@@ -1,6 +1,6 @@
 --- a/src/core/cli_server.c
 +++ b/src/core/cli_server.c
-@@ -785,10 +785,6 @@ int ExecuteCli_Get(char *arg1, char *arg
+@@ -758,10 +758,6 @@ int ExecuteCli_Get(char *arg1, char *arg
              USP_ASSERT(gge->value != NULL);
              SendCliResponse("%s => %s\n", gge->path, gge->value);
          }
@@ -11,3 +11,36 @@
      }
  
      GROUP_GET_VECTOR_Destroy(&ggv);
+--- a/src/core/handle_get.c
++++ b/src/core/handle_get.c
+@@ -260,26 +260,16 @@ void FormPathExprResponse(int get_expr_i
+         return;
+     }
+ 
+-    // If there was an error in getting any of the parameters associated with the path expression,
+-    // then just add the first error, without any of the parameter values, for this path expression result
+-    for (i=0; i < gi->num_entries; i++)
+-    {
+-        gge = &ggv->vector[gi->index + i];
+-        if (gge->err_code != USP_ERR_OK)
+-        {
+-            (void)AddGetResp_ReqPathRes(resp, path_expr, gge->err_code, gge->err_msg);
+-            return;
+-        }
+-    }
+-
+     // If the code gets here, then the value of all parameters were retrieved successfully, so add their values to the result_params
+     req_path_result = AddGetResp_ReqPathRes(resp, path_expr, USP_ERR_OK, "");
+     for (i=0; i < gi->num_entries; i++)
+     {
+         gge = &ggv->vector[gi->index + i];
+ 
+-        // Simple format contains a resolved_path_result for every object (and sub object)
+-        AddResolvedPathResult(req_path_result, gge->path, gge->value);
++        if (gge->err_code == USP_ERR_OK) {
++            // Simple format contains a resolved_path_result for every object (and sub object)
++            AddResolvedPathResult(req_path_result, gge->path, gge->value);
++	}
+     }
+ }
+ 

obuspa/patches/0008-fix_cmake_warning.patch

@@ -0,0 +1,10 @@
+--- a/src/protobuf-c/protobuf-c.c
++++ b/src/protobuf-c/protobuf-c.c
+@@ -1926,6 +1926,7 @@ repeated_field_pack_to_buffer(const Prot
+ 		buffer->append(buffer, rv, scratch);
+ 		tmp = pack_buffer_packed_payload(field, count, array, buffer);
+ 		assert(tmp == payload_len);
++		(void)tmp; // Keep cmake production build happy
+ 		return rv + payload_len;
+ 	} else {
+ 		size_t siz;

obuspa/patches/0011-max_controllers.patch

@@ -1,6 +1,6 @@
 --- a/src/core/mqtt.c
 +++ b/src/core/mqtt.c
-@@ -241,6 +241,8 @@ void AddConnackSubscription(mqtt_client_
+@@ -233,6 +233,8 @@ void HandleMqttDisconnect(mqtt_client_t
  #define DEFINE_MQTT_TrustCertVerifyCallbackIndex(index) \
  int MQTT_TrustCertVerifyCallback_##index (int preverify_ok, X509_STORE_CTX *x509_ctx) \
  {\
@@ -9,7 +9,7 @@
      return DEVICE_SECURITY_TrustCertVerifyCallbackWithCertChain(preverify_ok, x509_ctx, &mqtt_clients[index].cert_chain);\
  }
  
-@@ -251,6 +253,11 @@ DEFINE_MQTT_TrustCertVerifyCallbackIndex
+@@ -243,6 +245,11 @@ DEFINE_MQTT_TrustCertVerifyCallbackIndex
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(2);
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(3);
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(4);
@@ -21,7 +21,7 @@
  // Add more, with incrementing indexes here, if you change MAX_MQTT_CLIENTS
  
  //------------------------------------------------------------------------------------
-@@ -261,10 +268,15 @@ ssl_verify_callback_t* mqtt_verify_callb
+@@ -253,10 +260,15 @@ ssl_verify_callback_t* mqtt_verify_callb
      MQTT_TrustCertVerifyCallbackIndex(2),
      MQTT_TrustCertVerifyCallbackIndex(3),
      MQTT_TrustCertVerifyCallbackIndex(4),

obuspa/patches/0012-check_mqtt_host_alive.patch

@@ -0,0 +1,102 @@
+--- a/src/core/mqtt.c
++++ b/src/core/mqtt.c
+@@ -63,6 +63,8 @@
+ 
+ #include <mosquitto.h>
+ 
++#include <curl/curl.h>
++
+ // Defines for MQTT Property Values
+ #define PUBLISH 0x30
+ #define CONTENT_TYPE 3
+@@ -2192,6 +2194,75 @@ exit:
+     }
+ }
+ 
++static int _check_host_rechability(CURL *handle, curl_infotype type, char *data, size_t size, void *userp)
++{
++    bool *palive = (bool *)userp;
++
++    USP_ASSERT(palive != NULL);
++    switch(type) {
++        case CURLINFO_HEADER_OUT:
++        case CURLINFO_HEADER_IN:
++            *palive = true;
++            break;
++        case CURLINFO_TEXT:
++        {
++            USP_LOG_Debug("CURL DATA:: [%s]", data);
++            if (strstr(data, "Connected to ") != NULL) {
++                *palive = true;
++            }
++            break;
++        }
++        default:
++            break;
++    }
++
++    return 0;
++}
++
++int check_mqtt_host_reachability(mqtt_client_t *client)
++{
++    CURL *curl;
++    mqtt_conn_params_t *cparam = &client->conn_params;
++    char buffer[128] = {0};
++    int ret = USP_ERR_INTERNAL_ERROR;
++    bool is_alive = false;
++
++    curl = curl_easy_init();
++    if(curl) {
++        USP_SNPRINTF(buffer, 128, "mqtt://%s:%d", cparam->host, cparam->port);
++        curl_easy_setopt(curl, CURLOPT_URL, buffer);
++
++        if (strlen(cparam->username) > 0) {
++            curl_easy_setopt(curl, CURLOPT_USERNAME, cparam->username);
++        }
++
++        if (strlen(cparam->password) > 0) {
++            curl_easy_setopt(curl, CURLOPT_PASSWORD, cparam->password);
++        }
++
++        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
++        curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &is_alive);
++        curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, _check_host_rechability);
++
++        /* complete within 2 seconds */
++        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 2L);
++
++        ret = curl_easy_perform(curl);
++        /* Check for errors */
++        if(ret == CURLE_OK || ret == CURLE_URL_MALFORMAT || is_alive == true) {
++            USP_LOG_Debug("CURL MQTT host %s, ret %d, alive %d ...", buffer, ret, is_alive);
++            ret = USP_ERR_OK;
++        } else {
++            USP_LOG_Info("# CURL MQTT host %s unreachable: %d=>%s ...", buffer, ret, curl_easy_strerror(ret));
++        }
++
++        /* always cleanup */
++        curl_easy_cleanup(curl);
++    }
++
++    return ret;
++}
++
+ /*********************************************************************//**
+ **
+ ** PerformMqttClientConnect
+@@ -2261,6 +2332,14 @@ int PerformMqttClientConnect(mqtt_client
+         keep_alive = 5;
+     }
+ 
++    // Below function is a workaround to check the host reachability with a timeout
++    // mosquitto_connect_* API block the thread for 2 mins if host is not reachable,
++    // which halts other clients connectivity
++    err = check_mqtt_host_reachability(client);
++    if (err != USP_ERR_OK) {
++        err = USP_ERR_INTERNAL_ERROR;
++        goto exit;
++    }
+     // Release the access mutex temporarily whilst performing the connect call
+     // We do this to prevent the data model thread from potentially being blocked, whilst the connect call is taking place
+     OS_UTILS_UnlockMutex(&mqtt_access_mutex);

obuspa/patches/0013-mqtt-retry-param-change.patch

@@ -0,0 +1,76 @@
+diff --git a/src/core/device_mqtt.c b/src/core/device_mqtt.c
+index 7438e59..231d941 100755
+--- a/src/core/device_mqtt.c
++++ b/src/core/device_mqtt.c
+@@ -1612,14 +1612,23 @@ int NotifyChange_MQTTRequestProblemInfo(dm_req_t *req, char *value)
+ int NotifyChange_MQTTConnectRetryTime(dm_req_t *req, char *value)
+ {
+     mqtt_conn_params_t *mp;
++    bool schedule_reconnect = false;
+ 
+     // Determine mqtt client to be updated
+     mp = FindMqttParamsByInstance(inst1);
+     USP_ASSERT(mp != NULL);
+ 
+     // Set the new value.
++    if ((mp->retry.connect_retrytime != val_uint) && (mp->enable)) {
++        schedule_reconnect = true;
++    }
++
+     mp->retry.connect_retrytime = val_uint;
+ 
++    if (schedule_reconnect) {
++        ScheduleMqttReconnect(mp);
++    }
++
+     return USP_ERR_OK;
+ }
+ 
+@@ -1638,14 +1647,23 @@ int NotifyChange_MQTTConnectRetryTime(dm_req_t *req, char *value)
+ int NotifyChange_MQTTConnectRetryIntervalMultiplier(dm_req_t *req, char *value)
+ {
+     mqtt_conn_params_t *mp;
++    bool schedule_reconnect = false;
+ 
+     // Determine mqtt client to be updated
+     mp = FindMqttParamsByInstance(inst1);
+     USP_ASSERT(mp != NULL);
+ 
++    if ((mp->retry.interval_multiplier != val_int) && (mp->enable)) {
++        schedule_reconnect = true;
++    }
++
+     // Set the new value.
+     mp->retry.interval_multiplier = val_int;
+ 
++    if (schedule_reconnect) {
++        ScheduleMqttReconnect(mp);
++    }
++
+     return USP_ERR_OK;
+ }
+ 
+@@ -1664,14 +1682,23 @@ int NotifyChange_MQTTConnectRetryIntervalMultiplier(dm_req_t *req, char *value)
+ int NotifyChange_MQTTConnectRetryMaxInterval(dm_req_t *req, char *value)
+ {
+     mqtt_conn_params_t *mp;
++    bool schedule_reconnect = false;
+ 
+     // Determine mqtt client to be updated
+     mp = FindMqttParamsByInstance(inst1);
+     USP_ASSERT(mp != NULL);
+ 
++    if ((mp->retry.max_interval != val_uint) && (mp->enable)) {
++        schedule_reconnect = true;
++    }
++
+     // Set the new value.
+     mp->retry.max_interval = val_uint;
+ 
++    if (schedule_reconnect) {
++        ScheduleMqttReconnect(mp);
++    }
++
+     return USP_ERR_OK;
+ }
+ 

obuspa/patches/0014-persist-connack-clientid.patch

@@ -1,82 +0,0 @@
---- a/src/core/mqtt.c
-+++ b/src/core/mqtt.c
-@@ -63,6 +63,8 @@
- #include "retry_wait.h"
- #include "text_utils.h"
- #include "msg_handler.h"
-+#include "data_model.h"
-+#include "usp_api.h"
- 
- // Defines for MQTT Property Values
- #define PUBLISH 0x30
-@@ -2613,6 +2615,37 @@ exit:
- 
- /*********************************************************************//**
- **
-+** handle_db_set_client_id
-+**
-+** Allows the caller to set client Id in DB from the data model thread
-+**
-+** \param   arg1 - pointer to the client id path
-+** \param   arg2 - pointer to the client id value
-+**
-+** \return  None
-+**
-+**************************************************************************/
-+void handle_db_set_client_id(void *arg1, void *arg2)
-+{
-+    if ((arg1 == NULL) || (arg2 == NULL)) {
-+        USP_SAFE_FREE(arg1);
-+        USP_SAFE_FREE(arg2);
-+        return;
-+    }
-+
-+    char *param_path = (char *)arg1;
-+    char *param_val = (char *)arg2;
-+
-+    if (USP_ERR_OK != DATA_MODEL_SetParameterInDatabase(param_path, param_val)) {
-+        USP_LOG_Debug("%s: Failed to set %s=>%s from CONNACK", __FUNCTION__, param_path, param_val);
-+    }
-+
-+    USP_SAFE_FREE(param_path);
-+    USP_SAFE_FREE(param_val);
-+}
-+
-+/*********************************************************************//**
-+**
- ** ConnectV5Callback
- **
- ** Called by Libmosquitto when the CONNACK packet is received on an MQTTv5 connection
-@@ -2685,10 +2718,28 @@ void ConnectV5Callback(struct mosquitto
-               &client_id_ptr, false /* skip first */) != NULL)
-         {
-             USP_LOG_Debug("%s: Received client_id: \"%s\"", __FUNCTION__, client_id_ptr);
--            USP_SAFE_FREE(client->conn_params.client_id);
--            client->conn_params.client_id = USP_STRDUP(client_id_ptr);
--            USP_SAFE_FREE(client->next_params.client_id);
--            client->next_params.client_id = USP_STRDUP(client_id_ptr);
-+
-+            if (client->conn_params.client_id == NULL || strcmp(client->conn_params.client_id, client_id_ptr) != 0) {
-+                USP_SAFE_FREE(client->conn_params.client_id);
-+                client->conn_params.client_id = USP_STRDUP(client_id_ptr);
-+                USP_SAFE_FREE(client->next_params.client_id);
-+                client->next_params.client_id = USP_STRDUP(client_id_ptr);
-+
-+                // Persist client id from CONNACK in DB
-+                char buf[128] = {0}, *param_path = NULL, *param_val = NULL;
-+
-+                snprintf(buf, 128, "Device.MQTT.Client.%d.ClientID", instance);
-+
-+                param_path = USP_STRDUP(buf);
-+                param_val = USP_STRDUP(client_id_ptr);
-+
-+                if (USP_ERR_OK != USP_PROCESS_DoWork(handle_db_set_client_id, param_path, param_val)) {
-+                    USP_LOG_Debug("%s: Failed to schedule set in data model thread for client id from CONNACK", __FUNCTION__);
-+                    USP_SAFE_FREE(param_path);
-+                    USP_SAFE_FREE(param_val);
-+                }
-+            }
-+
-             free(client_id_ptr);
-         }
- 

packet-capture-diagnostics/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=packet-capture-diagnostics
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/packet-capture-diagnostics.git
-PKG_SOURCE_VERSION:=6c64e11d78b3be9990714bf5fcd97752cc15c4a8
+PKG_SOURCE_VERSION:=a47189b5faa9f678f1a27475c474cc1524d777f4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

periodicstats/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.5.12
+PKG_VERSION:=1.5.11
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=e59f980306e9ef4c1e3e56839906b8c5cba18338
+PKG_SOURCE_VERSION:=0bfe78ce9daf1cfbe9453e2cb08327dc7885cea2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

qosmngr/Makefile

@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.15
+PKG_VERSION:=1.0.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f6b77d16d2103b7336a476e710a10f1dd28274f6
+PKG_SOURCE_VERSION:=c4db530aae2392f94494814eefc977118519089b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

qosmngr/files/airoha/lib/qos/airoha.sh

@@ -26,7 +26,17 @@ hw_intf_init() {
 
 # Initialize the hardware setup library
 hw_init_all() {
+    local tc=0
+
     export TMP_HW_QUEUE_LIST=""
+    echo clear > /proc/ifc_debug
+    echo reinit > /proc/ifc_debug
+
+    for tc in $(seq 0 7); do
+        rm -rf "/tmp/qos/dscp_values_${tc}_4"
+        rm -rf "/tmp/qos/dscp_values_${tc}_6"
+    done
+
     return 0
 }
 
@@ -150,6 +160,8 @@ hw_commit_all() {
     local shape_rate="$TMP_HW_SHAPE_RATE"
     local q_count="0"
     local mac_qos_flag=""
+    local pbit=0
+    local tc=0
 
     # Reorder queues
     for q in ${sorted_list} ; do
@@ -205,4 +217,33 @@ hw_commit_all() {
     else
         /userfs/bin/qosrule discpline Enable 0
     fi
+
+    if [ -x /userfs/bin/blapi_cmd ]; then
+        echo 1 > /proc/ifc_send_to_ppe
+        for tc in $(seq 0 7); do
+            if [ -s "/tmp/qos/dscp_values_${tc}_4" ]; then
+                sort -un "/tmp/qos/dscp_values_${tc}_4" | awk 'NR==1{first=$1;last=$1;next}
+                                                               $1 == last+1 {last=$1;next}
+                                                               {system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 1");first=$1;last=first}
+                                                               END{system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 1")}'
+            fi
+            if [ -s "/tmp/qos/dscp_values_${tc}_6" ]; then
+                [ -s "/tmp/qos/dscp_values_${tc}_4" ] && sort -un "/tmp/qos/dscp_values_${tc}_6" | awk 'NR==1{first=$1;last=$1;next}
+                                                                                                        $1 == last+1 {last=$1;next}
+                                                                                                        {system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 0");first=$1;last=first}
+                                                                                                        END{system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 0")}'
+                sort -un "/tmp/qos/dscp_values_${tc}_6" | awk 'NR==1{first=$1;last=$1;next}
+                                                               $1 == last+1 {last=$1;next}
+                                                               {system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 1");first=$1;last=first}
+                                                               END{system("/userfs/bin/blapi_cmd traffic set_traffic_class DSCP " first*4 " " or(last*4, 0x3) " 1")}'
+            fi
+        done
+    fi
+
+    if [ -x /userfs/bin/ifc ]; then
+        echo 1 > /proc/ifc_send_to_ppe
+        for pbit in $(seq 0 7); do
+            /userfs/bin/ifc add vip pbit $pbit
+        done
+    fi
 }

qosmngr/files/airoha/lib/qos/chains.ebtables.sh

@@ -26,6 +26,7 @@ broute_ipv4_rule_options()
     config_get protocol "$cid" "proto"
     config_get dscp_filter "$cid" "dscp_filter"
     config_get icmp_type "$cid" "icmp_type"
+    config_get traffic_class "$cid" "traffic_class"
 
     set_ip_addr "$cid" ebt_match_src_ip ebt_match_dst_ip
 
@@ -36,6 +37,7 @@ broute_ipv4_rule_options()
         tos_val=$((dscp_filter<<2))
         tos_hex=$(printf "%x" $tos_val)
         broute_filter_on_dscp "$tos_hex"
+        [ -n "$traffic_class" -a "$dscp_filter" != "0" ] && echo "$((dscp_filter))" >> "/tmp/qos/dscp_values_${traffic_class}_4"
     fi
 
     if [ -n "$protocol" ]; then
@@ -57,6 +59,7 @@ broute_ipv6_rule_options()
     config_get protocol "$cid" "proto"
     config_get dscp_filter "$cid" "dscp_filter"
     config_get icmp_type "$cid" "icmp_type"
+    config_get traffic_class "$cid" "traffic_class"
 
     set_ip_addr "$cid" ebt_match_ipv6_src_ip ebt_match_ipv6_dst_ip
 
@@ -67,6 +70,7 @@ broute_ipv6_rule_options()
         tos_val=$((dscp_filter<<2))
         tos_hex=$(printf "%x" $tos_val)
         ebt_match_ipv6_dscp "$tos_hex"
+        [ -n "$traffic_class" -a "$dscp_filter" != "0" ] && echo "$((dscp_filter))" >> "/tmp/qos/dscp_values_${traffic_class}_6"
     fi
 
     if [ -n "$protocol" ]; then

qosmngr/files/common/lib/qos/ebtables.sh

@@ -150,15 +150,6 @@ broute_filter_on_vid() {
 }
 
 broute_append_rule() {
-    # if src_if is loopback, then add the rule to OUTPUT(qos_output) chain of nat table
-    if [ "$src_if" = "lo" ]; then
-        echo "ebtables --concurrent -t nat -A qos_output $BR_RULE" >> /tmp/qos/classify.ebtables
-        if [ -n "$BR6_RULE" ]; then
-            echo "ebtables --concurrent -t nat -A qos_output $BR6_RULE" >> /tmp/qos/classify.ebtables
-        fi
-	return
-    fi
-
     local broute_chain="$1"
     #when ethertype is not configured by user then both proto rules of ipv4
     #and ipv6 to be installed otherwise install ipv6 proto rule only.
@@ -458,9 +449,9 @@ handle_ebtables_rules() {
 
     if [ -n "$BR_RULE" ]; then
         if [ -n "$vid_mark" ] || [ -n "$pcp_mark" ]; then
-            broute_append_rule "prevlanxlate" "$src_if"
+            broute_append_rule "prevlanxlate"
         else
-            broute_append_rule "qos" "$src_if"
+            broute_append_rule "qos"
         fi
     fi
 }
@@ -510,15 +501,6 @@ handle_ebtables_dscp2pbit() {
 
 create_ebtables_chains() {
 
-    ebtables --concurrent -t nat -N qos_output -P RETURN 2> /dev/null
-    ret=$?
-    if [ $ret -eq 0 ]; then
-        ebtables --concurrent -t nat -A OUTPUT -j qos_output
-    else
-        ebtables --concurrent -t nat -D OUTPUT -j qos_output
-        ebtables --concurrent -t nat -A OUTPUT -j qos_output
-    fi
-
     ebtables --concurrent -t broute -N dscp2pbits -P RETURN 2> /dev/null
     ret=$?
     if [ $ret -eq 0 ]; then
@@ -549,9 +531,8 @@ create_ebtables_chains() {
 }
 
 flush_ebtables_chains() {
-    echo "ebtables --concurrent -t nat -F qos_output" > /tmp/qos/classify.ebtables
-    echo "ebtables --concurrent -t broute -F qos" > /tmp/qos/classify.ebtables
-    echo "ebtables --concurrent -t broute -F dscp2pbits" >> /tmp/qos/classify.ebtables
-    echo "ebtables --concurrent -t broute -F prevlanxlate" >> /tmp/qos/classify.ebtables
+    echo "ebtables -t broute -F qos" > /tmp/qos/classify.ebtables
+    echo "ebtables -t broute -F dscp2pbits" >> /tmp/qos/classify.ebtables
+    echo "ebtables -t broute -F prevlanxlate" >> /tmp/qos/classify.ebtables
 }
 

self-diagnostics/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0-only

self-diagnostics/files/usr/share/self-diagnostics/spec/network.json

@@ -62,8 +62,12 @@
 			"cmd": "bridge fdb"
 		},
 		{
-			"description": "TCP/UDP/Raw ports/Sockets",
-			"cmd": "netstat -anp"
+			"description": "TCP listened ports",
+			"cmd": "netstat -tlnp"
+		},
+		{
+			"description": "UDP listened ports",
+			"cmd": "netstat -ulnp"
 		},
 		{
 			"description": "MAC layer firewall status list",

self-diagnostics/src/selftest.c

@@ -78,8 +78,8 @@ int operate_Device_SelfTest(char *refparam, struct dmctx *ctx, void *data, char
 	/* Get self test log instance */
 	char *result = get_selftest_log_instance(ctx);
 
-	fill_blob_param(&ctx->bb, "Status", "Complete", DMT_TYPE[DMT_STRING], 0);
-	fill_blob_param(&ctx->bb, "Results", result, DMT_TYPE[DMT_STRING], 0);
+	add_list_parameter(ctx, dmstrdup("Status"), dmstrdup("Complete"), DMT_TYPE[DMT_STRING], NULL);
+	add_list_parameter(ctx, dmstrdup("Results"), result, DMT_TYPE[DMT_STRING], NULL);
 
 	if (ctx->dm_type != BBFDM_USP) {
 		diagnostics_set_option("selftest", "DiagnosticState", "Complete");
@@ -89,7 +89,7 @@ int operate_Device_SelfTest(char *refparam, struct dmctx *ctx, void *data, char
 	return 0;
 
 err:
-	fill_blob_param(&ctx->bb, "Status", "Error_Internal", DMT_TYPE[DMT_STRING], 0);
+	add_list_parameter(ctx, dmstrdup("Status"), dmstrdup("Error_Internal"), DMT_TYPE[DMT_STRING], NULL);
 	if (ctx->dm_type != BBFDM_USP) {
 		diagnostics_set_option("selftest", "DiagnosticState", "Error");
 		dmuci_commit_package_bbfdm(DMMAP_DIAGNOSTIGS);

sulu/Readme.md

@@ -101,81 +101,3 @@ CONFIG_SULU_PWA_KEYS_PATH="/somepath_with_pwa.{crt,key}"
 ```
 
 >Note: Replacing/changing the keys might requires uninstall/install of PWA App and CTRL+Shift+R in browser to drop the cached site and load the new site with new keys.
-
-# How to create a new Sulu user with Role Based Access Controller
-Sulu has a predefined set of users, but if it is required to add user with more/less datamodel access rights, that can be done from a USP Controller(sulu etc) or by using the command line tool.
-
-In the below example, I use command line tool, but same operations can be done from controller as well to configure it, so we need
-- New user
-- New user role
-- Changes in UserInterface Instance to use the new user role
-- A ControllerTrust role to define datamodel access aligned with user role
-- Update the sulu controller to use the above role
-
-Some global variables before proceeding further
-
-```bash
-export UNAME=testuser
-export UPASS=testuser123
-```
-## Create an User Role
-
-```bash
-ROLE="$(obuspa -c add Device.Users.Role. |cut -d " " -f 2)"
-
-obuspa -c set ${ROLE}.RoleName ${UNAME}
-obuspa -c set ${ROLE}.Enable 1
-```
-
-## Create an User
-
-```bash
-USER="$(obuspa -c add Device.Users.User. |cut -d " " -f 2)"
-
-obuspa -c set ${USER}.Username ${UNAME}
-obuspa -c set ${USER}.Password ${UPASS}
-obuspa -c set ${USER}.RoleParticipation ${ROLE}
-obuspa -c set ${USER}.Enable 1
-```
-
-## Update UserInterface to use the new UserRole
-
-Sulu has a reload hook to setup the necessary obuspa/mosquitto configuration, so no need to do LocalAgent Controller/MTP setup, this will reload obuspa service after uci update, so we have to wait for service to come up.
-
-```bash
-bbfdmd -c set Device.UserInterface.HTTPAccess.1.AllowedRoles "Device.Users.Role.1,${ROLE}"
-
-sleep 30
-```
-
-## Create a ControllerTrust role aligned with user role
-
-In this example, full access of 'Device.' added for the new user
-
-```bash
-CTROLE="$(obuspa -c add Device.LocalAgent.ControllerTrust.Role. | cut -d " " -f 2)"
-
-PERM="$(obuspa -c add ${CTROLE}.Permission. |cut -d " " -f 2)"
-
-obuspa -c set ${PERM}.Targets Device.
-obuspa -c set ${PERM}.Param rw-n
-obuspa -c set ${PERM}.Obj rw-n
-obuspa -c set ${PERM}.InstantiatedObj rw-n
-obuspa -c set ${PERM}.CommandEvent r-xn
-obuspa -c set ${PERM}.Enable 1
-obuspa -c set ${CTROLE}.Enable 1
-```
-
-## Set new role to Controller
-
-```bash
-obuspa -c set Device.LocalAgent.Controller.[EndpointID==self::sulu-${UNAME}].AssignedRole "${CTROLE}"
-```
-
-After these configuration reboot the device
-
-```bash
-reboot
-```
-
-After device boots sulu should be able to login with newly added user.

sulu/sulu-builder/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=3.1.62
+PKG_VERSION:=3.1.61
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

sulu/sulu-builder/files/etc/sulu/sulu.sh

@@ -45,7 +45,9 @@ function _get_sulu_user_roles() {
 	roles=$(uci -q get userinterface._sulu_s.role)
 
 	for role in ${roles}; do
-		sulu_user_roles="${sulu_user_roles} ${role}"
+		if [ -f "/etc/users/roles/$role.json" ]; then
+			sulu_user_roles="${sulu_user_roles} ${role}"
+		fi
 	done
 
 	if [ -n "${sulu_user_roles}" ]; then
@@ -282,9 +284,9 @@ function update_obuspa_config() {
 }
 
 function configure_sulu() {
-	generate_sulu_conn_config
-	_create_acl
 	update_obuspa_config
+	_create_acl
+	generate_sulu_conn_config
 }
 
 while getopts ":r" opt; do

swmodd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.5.16
+PKG_VERSION:=2.5.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/swmodd.git
-PKG_SOURCE_VERSION:=c36ff3594ed20d9bbc90d52adbdf7d6c186c4ce1
+PKG_SOURCE_VERSION:=088ac916a87b4faf1aaafadc6ee77ae56674fd1c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

timemngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=timemngr
-PKG_VERSION:=1.0.22
+PKG_VERSION:=1.0.20
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=d0dedf229e24535b5b6a284662f1560868fdcd7c
+PKG_SOURCE_VERSION:=f0b026bb5fffbd1c9a18b6814251b4c724aabad6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

tr104/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.32
+PKG_VERSION:=1.0.31
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=5632a71e0da8d498c214469dec76d2774f3a8a15
+PKG_SOURCE_VERSION:=57a713d6dbb4a39b41f0f0fd4674e7bcd3562852
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

tr143/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr143
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr143d.git
-PKG_SOURCE_VERSION:=54302dec291726b0e765e56b4d72ac53655e0f29
+PKG_SOURCE_VERSION:=6762d1efbb995be685af32af5f4b67cc4d737bcd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

tr471/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr471
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr471d.git
-PKG_SOURCE_VERSION:=69b4d324f2b2c78d858b0446dcb90dba9d5f60c3
+PKG_SOURCE_VERSION:=036c87b237f266cf7f9fae170c37c863a5f4af2e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

urlfilter/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.15
+PKG_VERSION:=1.1.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/urlfilter.git
-PKG_SOURCE_VERSION:=b68c9bb94c24a7394997522e982e37d85e172e0c
+PKG_SOURCE_VERSION:=ebf8afb44ff808d3b99c45a7c636fb12a774f357
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

urlfilter/files/etc/init.d/urlfilter

@@ -17,17 +17,11 @@ configure_firewall()
 		iptables -w -I FORWARD 2 -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -I FORWARD 3 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -I FORWARD 4 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 5 -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 6 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -I INPUT 1 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -I INPUT 2 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I INPUT 3 -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I INPUT 4 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 
 		# disable acceleration for https packet so that they can be read by urlfilter
 		ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
 	fi
 	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
 	if [ "$?" -ne 0 ]; then
@@ -36,17 +30,11 @@ configure_firewall()
 		ip6tables -w -I FORWARD 2 -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
 		ip6tables -w -I FORWARD 3 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		ip6tables -w -I FORWARD 4 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 5 -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 6 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		ip6tables -w -I INPUT 1 -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		ip6tables -w -I INPUT 2 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I INPUT 3 -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I INPUT 4 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 
 		# disable acceleration for https packet so that they can be read by urlfilter
 		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
 	fi
 
 }
@@ -76,15 +64,9 @@ stop_service() {
 		iptables -w -D FORWARD -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -D FORWARD -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -D INPUT -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		iptables -w -D INPUT -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D INPUT -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D INPUT -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		ebtables --concurrent -D FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
 	fi
 	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
 	if [ "$?" -eq 0 ]; then
@@ -93,15 +75,9 @@ stop_service() {
 		ip6tables -w -D FORWARD -p tcp --dport 443 -j NFQUEUE --queue-num 0 --queue-bypass
 		ip6tables -w -D FORWARD -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		ip6tables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		ip6tables -w -D INPUT -p udp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		ip6tables -w -D INPUT -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D INPUT -p tcp --dport 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D INPUT -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
 	fi
 }
 reload_service() {

usbmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbmngr
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/usbmngr.git
-PKG_SOURCE_VERSION:=8854939163cc60154a52834fa70677b3d1a53d46
+PKG_SOURCE_VERSION:=4f5f5dd701d40cdb134b98734db75446e5736a2e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.18
+PKG_VERSION:=1.2.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=3756e698d6debe4b5038a942e7332dc733f6f816
+PKG_SOURCE_VERSION:=4ea2dfc2843b4cdf87e48deff512ee358c93298f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifidmd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=6523c92cc2880ec5eebfc60d09bb5084ec504b6e
+PKG_SOURCE_VERSION:=eb3a21f1baec749cfd2d53fd3e38fdab3a6d7a4c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=17.3.3
+PKG_VERSION:=17.2.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fe089207eb9050dbee7dd1e214e4ce1eeeb97851
+PKG_SOURCE_VERSION:=780c224342a3aa238504eebef1e816fac8bd4498
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

xmppc/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.10
+PKG_VERSION:=2.2.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=a2945d99b916ddbe3b5270446e9b8d310a104052
+PKG_SOURCE_VERSION:=ff76b296e767a5732d7b07ad94c141a4a6e50ed5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

xmppc/files/etc/init.d/xmppc

@@ -11,25 +11,12 @@ stop_service() {
 	if [ "${xmpp_running}" = "true" ]; then
 		procd_send_signal xmppc '*' SIGKILL
 	fi
-
-	if [ -f "/var/state/xmppc" ]; then
-		uci -q -c /var/state delete xmppc.conn_status
-		uci -q -c /var/state commit xmppc
-	fi
 }
 
 start_service() {
 	local con_name=$(uci -q get xmpp.xmpp.conn_req_connection)
 	local con_enable=$(uci -q get xmpp."${con_name}".enable)
 
-	if [ ! -f "/var/state/xmppc" ]; then
-		touch "/var/state/xmppc"
-	fi
-
-	uci -q -c /var/state set xmppc.global='global'
-	uci -q -c /var/state set xmppc.global.last_change="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
-	uci -q -c /var/state commit xmppc
-
 	procd_open_instance
 	if [ "$con_enable" = "1" ]; then
 		procd_set_param command "$PROG"