map-agent: bsta mlo one netdev

For MLO one netdev and multiple links
will be used and managed by wpa_supplicant.

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

iopsys-analytics/Makefile

@@ -29,6 +29,11 @@ define Package/$(PKG_NAME)
     +collectd-mod-processes                             \
     +collectd-mod-write-http                            \
     +@PACKAGE_COLLECTD_ENCRYPTED_NETWORK                \
+  # remote syslog
+  DEPENDS+=                                             \
+    +syslog-ng                                          \
+    +@SYSLOGNG_LOGROTATE                                \
+
 endef
 
 define Package/$(PKG_NAME)/description

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

logmngr/Config.in

@@ -9,18 +9,12 @@ choice
 config LOGMNGR_BACKEND_FLUENTBIT
 	bool "Use fluent-bit for log management"
 	help
-		Enable this option to use fluent-bit for log management.
+	   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.
+	   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

@@ -3,14 +3,15 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=logmngr
-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/system/logmngr.git
-PKG_SOURCE_VERSION:=ec10abb3cc0f3b96eb806c9c67e18d9d134287e9
+PKG_SOURCE_VERSION:=03e01c71e7ab7d177755228fa42c860e970e5307
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -24,10 +25,9 @@ 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:=+libbbfdm-api +LOGMNGR_BACKEND_FLUENTBIT:fluent-bit
  DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng
 endef
 
@@ -63,12 +63,7 @@ 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
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libsyslog.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,logmngr))

logmngr/files/10-logmngr_config_generate

@@ -20,4 +20,3 @@ 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,7 +1,6 @@
 #!/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
@@ -307,10 +306,6 @@ logmngr_init() {
 	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

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,7 +1,6 @@
 #!/bin/sh
 
 . /lib/functions.sh
-. /lib/logmngr/logrotate.sh
 
 CONF_FILE=/etc/syslog-ng.conf
 TMP_CONF_FILE=/tmp/syslog-ng/syslog-ng.conf
@@ -335,10 +334,6 @@ logmngr_init() {
 	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

map-agent/files/lib/multiap/map_genconfig

@@ -8,6 +8,7 @@ generate_wireless_sta_config=0
 network_mode="$(fw_printenv -n netmode)" # default is layer3
 multiap_mode="$(fw_printenv -n multiap_mode)" # default is full
 disable_mlo="$(fw_printenv -n disable_mlo)"
+disable_mlo="${disable_mlo:-0}"
 
 is_airoha() {
 	[ -f /proc/device-tree/compatible ] || return
@@ -26,6 +27,8 @@ is_qualcomm() {
 
 generate_multiap_config() {
 	devidx=0
+	sta_num=0
+	mlo_one_sta=0
 
 	generate_config() {
 		dev="$1"
@@ -113,6 +116,14 @@ generate_multiap_config() {
 			uci set mapagent.@radio[-1].band="$mode_band"
 
 			if [ "$network_mode" == "extender" ]; then
+				[ "$disable_mlo" == "1" ] || [ "$disable_mlo" == "0" -a "$sta_num" == "0" ] && {
+
+				# Do it when agent will be ready
+				#[ is_qualcomm -a "$disable_mlo" == "0" -a "$sta_num" == "0" ] && {
+				#	ifname="wlan0"
+				#	mode_band="any"
+				#}
+
 				uci add mapagent bsta
 				uci set mapagent.@bsta[-1].device="$device"
 				uci set mapagent.@bsta[-1].ifname="$ifname"
@@ -141,6 +152,8 @@ generate_multiap_config() {
 					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
 						\"match\":{\"mode\":\"sta\", \"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
 				fi
+				sta_num=$((sta_num+1))
+				}
 			else
 				uci add mapagent ap
 				uci set mapagent.@ap[-1].type="fronthaul"

sulu/Readme.md

@@ -114,10 +114,8 @@ In the below example, I use command line tool, but same operations can be done f
 
 Some global variables before proceeding further
 
-```bash
-export UNAME=testuser
-export UPASS=testuser123
-```
+UNAME=osync
+
 ## Create an User Role
 
 ```bash
@@ -133,14 +131,14 @@ obuspa -c set ${ROLE}.Enable 1
 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}.Password osync123
 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.
+Sulu has a reload hook to setup the necessary obuspa/mosquitto configuration
 
 ```bash
 bbfdmd -c set Device.UserInterface.HTTPAccess.1.AllowedRoles "Device.Users.Role.1,${ROLE}"
@@ -150,7 +148,7 @@ sleep 30
 
 ## Create a ControllerTrust role aligned with user role
 
-In this example, full access of 'Device.' added for the new user
+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)"
@@ -172,10 +170,4 @@ obuspa -c set ${CTROLE}.Enable 1
 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.
+After these configuration, sulu should be able to login with newly added user