net/v2raya/patches/010-fixed-for-Docker-Compose.patch

   1 From 78336e55a31db578c139a5bb472aa0fc219c169d Mon Sep 17 00:00:00 2001
   2 From: Xiaoxu Guo <ftiasch0@gmail.com>
   3 Date: Thu, 4 Aug 2022 16:24:04 +0800
   4 Subject: [PATCH] fixed for Docker Compose
   5
   6 ---
   7  service/core/iptables/tproxy.go | 7 +++++--
   8  1 file changed, 5 insertions(+), 2 deletions(-)
   9
  10 --- a/core/iptables/tproxy.go
  11 +++ b/core/iptables/tproxy.go
  12 @@ -65,6 +65,7 @@ iptables -w 2 -t mangle -A TP_PRE -p udp
  13
  14  iptables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark
  15  iptables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
  16 +iptables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN
  17  iptables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
  18  iptables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
  19  `
  20 @@ -123,6 +124,8 @@ ip6tables -w 2 -t mangle -A TP_PRE -p ud
  21
  22  ip6tables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark
  23  ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
  24 +ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
  25 +ip6tables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN
  26  ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
  27  ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
  28  `
  29 @@ -156,7 +159,7 @@ ip6tables -w 2 -t mangle -A TP_MARK -j C
  30
  31  func (t *tproxy) GetCleanCommands() Setter {
  32         commands := `
  33 -ip rule del fwmark 0x40/0xc0 table 100
  34 +ip rule del fwmark 0x40/0xc0 table 100
  35  ip route del local 0.0.0.0/0 dev lo table 100
  36
  37  iptables -w 2 -t mangle -F TP_OUT
  38 @@ -172,7 +175,7 @@ iptables -w 2 -t mangle -X TP_MARK
  39  `
  40         if IsIPv6Supported() {
  41                 commands += `
  42 -ip -6 rule del fwmark 0x40/0xc0 table 100
  43 +ip -6 rule del fwmark 0x40/0xc0 table 100
  44  ip -6 route del local ::/0 dev lo table 100
  45
  46  ip6tables -w 2 -t mangle -F TP_OUT