iop: config: enable ip-bridge

map-topology: 2.4.0.3
ieee1905: 4.9.1
2025-12-27 22:50:19 +08:00 · 2022-05-19 14:42:33 +00:00 · 2022-05-19 14:52:09 +02:00 · 2022-05-19 13:16:15 +02:00 · 2022-05-19 13:13:45 +02:00 · 2022-05-19 13:03:44 +02:00
12 changed files with 47 additions and 27 deletions
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.36
+PKG_VERSION:=6.6.38

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=180119192418dbac64713c3e5efe761a1f8e871e
+PKG_SOURCE_VERSION:=1f9a518babb143c8504a2c1e5b62cba82395c755
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.8
+PKG_VERSION:=8.4.9

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=00d037ce851495aca6365f2189849c6030f305df
+PKG_SOURCE_VERSION:=4d158e13b6a17561fc0306fdbf3c8ca71613da78
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=4.9.0
+PKG_VERSION:=4.9.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=69b27e3e1509b9192c529fbba6a329cc0532cfbb
+PKG_SOURCE_VERSION:=e17f15853bb1da97bd1460cc56e333b1d8a51afb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
--- a/iop/config
+++ b/iop/config
@@ -133,6 +133,7 @@ CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
 CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=7.2.2
+PKG_VERSION:=2.7.2.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8168d68c118d0dde0ff798fd0c8ed1d6a18bc99d
+PKG_SOURCE_VERSION:=01dfa58d507795c13f23799334d43fcb45451eeb
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 PKG_LICENSE:=PROPRIETARY IOPSYS
--- a/map-agent/files/lib/wifi/multiap
+++ b/map-agent/files/lib/wifi/multiap
@@ -774,11 +774,14 @@ set_uplink_backhaul_info() {
 	local ul_1905id=$1
 	local ul_mac=$2

-	json_load "$(cat $MAPFILE)"
-	json_add_string "backhaul_device_id" "$ul_1905id"
-	json_add_string "backhaul_macddr" "$ul_mac"
-	json_dump > "$MAPFILE"
-	json_cleanup
+	(
+		flock -x 200
+		json_load "$(cat $MAPFILE)"
+		json_add_string "backhaul_device_id" "$ul_1905id"
+		json_add_string "backhaul_macddr" "$ul_mac"
+		json_dump > "$MAPFILE"
+		json_cleanup
+	) 200>/var/lock/map.backhaul.lock
 }

 set_uplink() {
@@ -792,7 +795,10 @@ set_uplink() {
 	json_add_string "type" "$type"
 	json_add_string "ifname" "$ifname"
 	json_add_string "macaddr" "$hwaddr"
-	json_dump > "$MAPFILE"
+	(
+		flock -x 200
+		json_dump > "$MAPFILE"
+	) 200>/var/lock/map.backhaul.lock
 	json_cleanup

 	config_load mapagent
@@ -816,7 +822,14 @@ unset_uplink() {
 		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
 	fi

-	rm -f "$MAPFILE" > /dev/null 2>&1
+	(
+		flock -x 200
+		json_load "$(cat $MAPFILE)"
+		json_get_var bk_type type
+		json_cleanup
+
+		[ "$type" = "$bk_type" ] && rm -f "$MAPFILE" > /dev/null 2>&1
+	) 200>/var/lock/map.backhaul.lock
 }

 func=$1
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.21
+PKG_VERSION:=2.6.0.22
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a388472887744d404825ee5602ab906bf1fc225c
+PKG_SOURCE_VERSION:=07b381810b2ce974f1711b72f77f7cce0a2f465e

 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
--- a/map-topology/Makefile
+++ b/map-topology/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=map-topology
-PKG_VERSION:=4.0.1
+PKG_VERSION:=2.4.0.3

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=f0c36d13b19c100639a8f657a6a027bbfd74b802
+PKG_SOURCE_VERSION:=8ec4de3b7a6fd4eb06799a08da4e970e5b2c1001
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
@@ -26,13 +26,14 @@ include $(INCLUDE_DIR)/package.mk
 define Package/map-topology
 	CATEGORY:=Utilities
 	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
-		 +libavahi-nodbus-support
+		 +libavahi-nodbus-support +libnetfilter-conntrack +libnfnetlink +libmnl
 	TITLE:=Utility to build topology of a multi-AP network
 endef

 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
 	-D_GNU_SOURCE

 define Package/map-topology/description
--- a/qosmngr/files/lib/qos/broadcom.sh
+++ b/qosmngr/files/lib/qos/broadcom.sh
@@ -851,11 +851,16 @@ pre_configure_queue() {
 		mkdir -p /tmp/qos/queue_stats/$intf
 		touch /tmp/qos/queue_stats/$intf/q_idx
 		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
+
+#		tm initialization pushing ahead of delcfg as
+#		porttminit bydefault configures all queue as SP configuration.
+#		that was causing WRR queue configuration failure.
+		tmctl porttminit --devtype 0 --if $intf --flag 0 --numqueues 8
+
 		i=0
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
 		done
-		tmctl porttminit --devtype 0 --if $intf --flag 0 --numqueues 8

 		mkdir -p /tmp/qos/$intf
 		touch /tmp/qos/$intf/q_order
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.8
+PKG_VERSION:=1.1.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=2628f2c9e0b99064a703a1ad069f0f298bc36076
+PKG_SOURCE_VERSION:=ed0a4d88f4c42ab452eb8a84705598a297261f49
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/udpecho/Makefile
+++ b/udpecho/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=udpecho
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpecho.git
-PKG_SOURCE_VERSION:=aeaf8f5862fff7133e6299ac30ab02c8fbb1ff61
+PKG_SOURCE_VERSION:=19a555c2d460db6bdfcfa53742011fbb6a4ca6af
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/wfadatad/Makefile
+++ b/wfadatad/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wfadatad
-PKG_VERSION:=7.0.5
+PKG_VERSION:=2.7.0.6

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6548ed2d6aaf957d799188d4ff43894c2dd575cb
+PKG_SOURCE_VERSION:=a9c2ad84b15fd34dab24399ebdd5310b82046c94
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
Author	SHA1	Message	Date
Stanislaw Gruszka	24205bf73f	iop: config: enable ip-bridge	2022-05-19 14:42:33 +00:00
Jakob Olsson	76b1e43b6f	map-topology: 2.4.0.3	2022-05-19 14:52:09 +02:00
Jakob Olsson	4672afb6de	ieee1905: 4.9.1	2022-05-19 13:16:15 +02:00
Jakob Olsson	d2ff5738cd	wfadatad: 2.7.0.6	2022-05-19 13:13:45 +02:00
Jakob Olsson	43246014e1	map-topology: 2.4.0.2	2022-05-19 13:03:44 +02:00
Amin Ben Ramdhane	115b752ade	bbf: 6.6.38 (cherry picked from commit `62935f5016`)	2022-05-19 03:26:06 +00:00
Amin Ben Ramdhane	26b06548f6	udpecho: 2.0.1 (cherry picked from commit `3b7b6fd627`)	2022-05-19 03:25:18 +00:00
vdutta	6c99b9fc72	icwmp: 8.4.9 (cherry picked from commit `d68a6add62`)	2022-05-19 03:24:23 +00:00
vdutta	135ebebd44	stunc: 1.1.9 (cherry picked from commit `12b6a72a48`)	2022-05-19 03:23:13 +00:00
Jakob Olsson	2d188b5c37	map-agent: 2.7.2.4	2022-05-18 14:53:58 +02:00
Amit KUmar	14ce1429a4	map-topology: per host statistics collection included conntrack netfilter library	2022-05-18 10:32:31 +02:00
Jakob Olsson	a6b585cccf	map-agent: multiap: lock operations on backhaul file	2022-05-18 10:29:40 +02:00
Amit KUmar	6db304b6ff	qosmngr: WRR schdeuling configuration sequence corrected in initialization as first tm initialization then delcfg. porttminit bydefault does queue configuration as SP.	2022-05-17 17:07:46 +02:00
Amin Ben Ramdhane	817a7e8301	bbf: 6.6.37	2022-05-17 17:06:49 +02:00
Jakob Olsson	e8790801d0	map: prepend all multiap packages version number with the supported revision	2022-05-17 15:11:03 +02:00
Jakob Olsson	a6790ac523	map-agent: 7.2.3	2022-05-17 15:07:40 +02:00
Jakob Olsson	76656bb043	map-controller: 6.0.22	2022-05-17 13:08:18 +02:00