Merge remote-tracking branch 'origin/main' into peer-acl-multi-source

# Conflicts:
#	client/firewall/nftables/router_linux.go
This commit is contained in:
Viktor Liu
2026-08-31 12:11:05 +02:00
599 changed files with 44311 additions and 8044 deletions
+1 -1
View File
@@ -129,7 +129,7 @@ func (r *family) natRuleExprs(pair firewall.RouterPair) ([]expr.Any, error) {
exprs = append(exprs, sourceExp...)
exprs = append(exprs, destExp...)
var markValue uint32 = nbnet.PreroutingFwmarkMasquerade
markValue := nbnet.PreroutingFwmarkMasquerade
if pair.Inverse {
markValue = nbnet.PreroutingFwmarkMasqueradeReturn
}