commit fa97b3b7c0ab701c968bfe85e0f646e83c69c009
author Hugo Benichi <hugobenichi@google.com> Tue Oct 06 22:45:26 2020 +0900
committer Commit Bot <commit-bot@chromium.org> Wed Oct 07 22:49:44 2020 +0000
tree 0497bc25a314e3e368d8ddbc1224a357b183ad17
parent 7e223b9fd722a1e327226c8169d2636d2a075915

patchpanel: datapath: fix spurious iptables error logs

BUG=b:161507671
TEST=Flashed rammus, started a session, checked /var/log/net.log for no
datapath error logs.

Change-Id: I99c7044e563f318ea3089e3080afd2eba94c3d58
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2452332
Tested-by: Hugo Benichi <hugobenichi@google.com>
Auto-Submit: Hugo Benichi <hugobenichi@google.com>
Reviewed-by: Garrick Evans <garrick@chromium.org>
Commit-Queue: Hugo Benichi <hugobenichi@google.com>

patchpanel/datapath.cc

diff --git a/patchpanel/datapath.cc b/patchpanel/datapath.cc
index a1f09e0..b73ca65 100644
--- a/patchpanel/datapath.cc
+++ b/patchpanel/datapath.cc
@@ -344,11 +344,11 @@
     LOG(ERROR) << "Failed to configure ingress traffic rules for " << ext_ifname
                << "->" << int_ifname;
 
-  if (StartIpForwarding(IpFamily::IPv4, ext_ifname, int_ifname))
+  if (!StartIpForwarding(IpFamily::IPv4, ext_ifname, int_ifname))
     LOG(ERROR) << "Failed to enable IP forwarding for " << ext_ifname << "->"
                << int_ifname;
 
-  if (StartIpForwarding(IpFamily::IPv4, int_ifname, ext_ifname))
+  if (!StartIpForwarding(IpFamily::IPv4, int_ifname, ext_ifname))
     LOG(ERROR) << "Failed to enable IP forwarding for " << ext_ifname << "<-"
                << int_ifname;
 
@@ -585,7 +585,7 @@
     success &= process_runner_->iptables("mangle", args, log_failures) == 0;
   if (family & IPv6)
     success &= process_runner_->ip6tables("mangle", args, log_failures) == 0;
-  return false;
+  return success;
 }
 
 bool Datapath::ModifyIpForwarding(IpFamily family,