Browse Source

Merge pull request #45659 from corhere/backport-24.0/libn/setup-resolver-with-verbose-iptables

[24.0 backport] libnetwork: fix resolver restore w/ chatty 'iptables -C'
Bjorn Neergaard 2 years ago
parent
commit
7861aa7e80
1 changed files with 2 additions and 4 deletions
  1. 2 4
      libnetwork/resolver_unix.go

+ 2 - 4
libnetwork/resolver_unix.go

@@ -38,8 +38,7 @@ func (r *Resolver) setupIPTable() error {
 		iptable := iptables.GetIptable(iptables.IPv4)
 		iptable := iptables.GetIptable(iptables.IPv4)
 
 
 		// insert outputChain and postroutingchain
 		// insert outputChain and postroutingchain
-		err := iptable.RawCombinedOutputNative("-t", "nat", "-C", "OUTPUT", "-d", resolverIP, "-j", outputChain)
-		if err == nil {
+		if iptable.ExistsNative("nat", "OUTPUT", "-d", resolverIP, "-j", outputChain) {
 			if err := iptable.RawCombinedOutputNative("-t", "nat", "-F", outputChain); err != nil {
 			if err := iptable.RawCombinedOutputNative("-t", "nat", "-F", outputChain); err != nil {
 				setupErr = err
 				setupErr = err
 				return
 				return
@@ -55,8 +54,7 @@ func (r *Resolver) setupIPTable() error {
 			}
 			}
 		}
 		}
 
 
-		err = iptable.RawCombinedOutputNative("-t", "nat", "-C", "POSTROUTING", "-d", resolverIP, "-j", postroutingChain)
-		if err == nil {
+		if iptable.ExistsNative("nat", "POSTROUTING", "-d", resolverIP, "-j", postroutingChain) {
 			if err := iptable.RawCombinedOutputNative("-t", "nat", "-F", postroutingChain); err != nil {
 			if err := iptable.RawCombinedOutputNative("-t", "nat", "-F", postroutingChain); err != nil {
 				setupErr = err
 				setupErr = err
 				return
 				return