011-cleaned-up.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 0db405f50fd652d494f2066fc5e47c41666c96db Mon Sep 17 00:00:00 2001
  2. From: Xiaoxu Guo <[email protected]>
  3. Date: Thu, 4 Aug 2022 16:32:42 +0800
  4. Subject: [PATCH] cleaned up
  5. ---
  6. service/core/iptables/tproxy.go | 5 ++---
  7. 1 file changed, 2 insertions(+), 3 deletions(-)
  8. --- a/core/iptables/tproxy.go
  9. +++ b/core/iptables/tproxy.go
  10. @@ -124,7 +124,6 @@ ip6tables -w 2 -t mangle -A TP_PRE -p ud
  11. ip6tables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark
  12. ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
  13. -ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
  14. ip6tables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN
  15. ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
  16. ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
  17. @@ -159,7 +158,7 @@ ip6tables -w 2 -t mangle -A TP_MARK -j C
  18. func (t *tproxy) GetCleanCommands() Setter {
  19. commands := `
  20. -ip rule del fwmark 0x40/0xc0 table 100
  21. +ip rule del fwmark 0x40/0xc0 table 100
  22. ip route del local 0.0.0.0/0 dev lo table 100
  23. iptables -w 2 -t mangle -F TP_OUT
  24. @@ -175,7 +174,7 @@ iptables -w 2 -t mangle -X TP_MARK
  25. `
  26. if IsIPv6Supported() {
  27. commands += `
  28. -ip -6 rule del fwmark 0x40/0xc0 table 100
  29. +ip -6 rule del fwmark 0x40/0xc0 table 100
  30. ip -6 route del local ::/0 dev lo table 100
  31. ip6tables -w 2 -t mangle -F TP_OUT