From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 15 Apr 2024 09:19:44 +0000 (+0200)
Subject: bridger: update to Git HEAD (2024-04-15)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=93d75f8401c9aec2fcfb15775243d295e230b2a8;p=openwrt%2Fstaging%2Fblocktrron.git

bridger: update to Git HEAD (2024-04-15)

3159bbe0a2eb improve isolation when selecting a fixed output port
c77a7a1ff74d nl: fix getting flow offload stats
a08e51e679dd add support for disabling bridge-local flows via config

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/services/bridger/Makefile b/package/network/services/bridger/Makefile
index fa98220f68..b38c2ddbc5 100644
--- a/package/network/services/bridger/Makefile
+++ b/package/network/services/bridger/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bridger
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/nbd168/bridger
-PKG_SOURCE_DATE:=2023-05-12
-PKG_SOURCE_VERSION:=d0f79a16c749ad310d79e1c31f593860619f99eb
-PKG_MIRROR_HASH:=dde6613662ad53ba6622e669400560a534426edfa4f42c91d156fbd7ccafd15c
+PKG_SOURCE_DATE:=2024-04-15
+PKG_SOURCE_VERSION:=a08e51e679dd7e1eaf70ea7fd6b6433e167d4c2d
+PKG_MIRROR_HASH:=e80ac0cc3c5b27afb233c03fed3fbcef34a1b3fdbe0d48532ad1d5c3aac4088d
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
diff --git a/package/network/services/bridger/files/bridger.conf b/package/network/services/bridger/files/bridger.conf
index cb43deff79..2ff6b5b787 100644
--- a/package/network/services/bridger/files/bridger.conf
+++ b/package/network/services/bridger/files/bridger.conf
@@ -1,3 +1,6 @@
 config defaults
+	# handle bridge local rx/tx
+	option bridge_local 0
+
 	# example for blacklisting individual devices or bridges
 	# list blacklist eth0
diff --git a/package/network/services/bridger/files/bridger.init b/package/network/services/bridger/files/bridger.init
index 2ba9f06b65..c9983ae9cc 100644
--- a/package/network/services/bridger/files/bridger.init
+++ b/package/network/services/bridger/files/bridger.init
@@ -6,25 +6,27 @@ START=19
 USE_PROCD=1
 PROG=/usr/sbin/bridger
 
-add_blacklist() {
+get_defaults() {
 	cfg="$1"
 
 	config_get blacklist "$cfg" blacklist
+	json_add_array blacklist
 	for i in $blacklist; do
 		json_add_string "" "$i"
 	done
+	json_close_array
+
+	config_get_bool bridge_local "$cfg" bridge_local 0
+	json_add_boolean bridge_local "$bridge_local"
 }
 
 reload_service() {
 	config_load bridger
 
 	json_init
-	json_add_string name "config"
-	json_add_array devices
-	config_foreach add_blacklist defaults
-	json_close_array
+	config_foreach get_defaults defaults
 
-	ubus call bridger set_blacklist "$(json_dump)"
+	ubus call bridger set_config "$(json_dump)"
 }
 
 service_triggers() {