Merge remote-tracking branch 'origin/main' into benvin/ct-helpers
ci/woodpecker/pr/test Pipeline was successful
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/pr/pre-commit Pipeline was successful

# Conflicts:
#	internal/nftables/compiler.go
#	internal/nftables/compiler_test.go
#	internal/nftables/engine.go
This commit is contained in:
2026-10-04 13:58:25 +11:00
9 changed files with 598 additions and 130 deletions
+1 -2
View File
@@ -191,13 +191,12 @@ snat:
# conntrack:
# - action: notrack
# source: net
# dest: fw
# dest: fw:203.0.113.1
# proto: udp
# dport: [53]
# comment: "Skip conntrack for DNS"
# - action: helper
# source: loc
# dest: net
# proto: tcp
# dport: [21]
# helper: ftp