commit 249adeffb2eb40bcb06c8b99a7c6d7fe0f59ebf7
author Tom Hughes <tomhughes@chromium.org> Mon Aug 24 18:21:52 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Sep 09 21:56:46 2020 +0000
tree 77f120844ebc69530ff939238f29b4e93a3320e0
parent 0f6ba9de8a2c32e76c2f17079e6f4a8cc07a6be5

patchpanel: run clang-format on all files

Also enable the clang_format_presubmit check.

Command used:
clang-format -i -style=file $(find patchpanel -name '*.h' -o -name '*.cc')

BUG=b:166166797
TEST=CQ passes

Change-Id: I344cd4602a68394ba5adc5e5d58d2703eea978dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2399204
Tested-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Hugo Benichi <hugobenichi@google.com>
Commit-Queue: Tom Hughes <tomhughes@chromium.org>
Auto-Submit: Tom Hughes <tomhughes@chromium.org>

patchpanel/firewall.cc

diff --git a/patchpanel/firewall.cc b/patchpanel/firewall.cc
index 89a5934..ea867a7 100644
--- a/patchpanel/firewall.cc
+++ b/patchpanel/firewall.cc
@@ -25,7 +25,8 @@
 // Interface names must be shorter than 'IFNAMSIZ' chars.
 // See http://man7.org/linux/man-pages/man7/netdevice.7.html
 // 'IFNAMSIZ' is 16 in recent kernels.
-// See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/if.h?h=v4.14#n33
+// See
+// https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/if.h?h=v4.14#n33
 constexpr size_t kInterfaceNameSize = 16;
 
 // Interface names are passed directly to the 'iptables' command. Rather than
@@ -106,10 +107,9 @@
     return false;
   }
 
-  bool ip4_success = DeleteAcceptRule(kIpTablesPath, protocol, port,
-                                      interface);
-  bool ip6_success = DeleteAcceptRule(kIp6TablesPath, protocol,
-                                      port, interface);
+  bool ip4_success = DeleteAcceptRule(kIpTablesPath, protocol, port, interface);
+  bool ip6_success =
+      DeleteAcceptRule(kIp6TablesPath, protocol, port, interface);
   return ip4_success && ip6_success;
 }
 
@@ -119,13 +119,15 @@
                                   const std::string& interface,
                                   const std::string& dst_ip,
                                   uint16_t dst_port) {
-  if (!ModifyIpv4DNATRule(protocol, input_ip, port, interface, dst_ip, dst_port, "-I")) {
-      return false;
+  if (!ModifyIpv4DNATRule(protocol, input_ip, port, interface, dst_ip, dst_port,
+                          "-I")) {
+    return false;
   }
 
   if (!ModifyIpv4ForwardChain(protocol, interface, dst_ip, dst_port, "-A")) {
-      ModifyIpv4DNATRule(protocol, input_ip, port, interface, dst_ip, dst_port, "-D");
-      return false;
+    ModifyIpv4DNATRule(protocol, input_ip, port, interface, dst_ip, dst_port,
+                       "-D");
+    return false;
   }
 
   return true;
@@ -138,7 +140,8 @@
                                      const std::string& dst_ip,
                                      uint16_t dst_port) {
   bool success = true;
-  if (!ModifyIpv4DNATRule(protocol, input_ip, port, interface, dst_ip, dst_port, "-D")) {
+  if (!ModifyIpv4DNATRule(protocol, input_ip, port, interface, dst_ip, dst_port,
+                          "-D")) {
     success = false;
   }
   if (!ModifyIpv4ForwardChain(protocol, interface, dst_ip, dst_port, "-D")) {
@@ -187,15 +190,17 @@
     return false;
   }
 
-  std::vector<std::string> argv{kIpTablesPath,
-                                "-t",
-                                "nat",
-                                operation,
-                                "PREROUTING",
-                                "-i",
-                                interface,
-                                "-p",  // protocol
-                                ProtocolName(protocol)};
+  std::vector<std::string> argv{
+      kIpTablesPath,
+      "-t",
+      "nat",
+      operation,
+      "PREROUTING",
+      "-i",
+      interface,
+      "-p",  // protocol
+      ProtocolName(protocol),
+  };
   if (!input_ip.empty()) {
     argv.push_back("-d");  // input destination ip
     argv.push_back(input_ip);
@@ -253,7 +258,8 @@
       std::to_string(dst_port),
       "-j",
       "ACCEPT",
-      "-w"};  // Wait for xtables lock.
+      "-w",
+  };  // Wait for xtables lock.
   return RunInMinijail(argv) == 0;
 }
 
@@ -294,13 +300,15 @@
                              Protocol protocol,
                              uint16_t port,
                              const std::string& interface) {
-  std::vector<std::string> argv{executable_path,
-                                "-I",  // insert
-                                "INPUT",
-                                "-p",  // protocol
-                                ProtocolName(protocol),
-                                "--dport",  // destination port
-                                std::to_string(port)};
+  std::vector<std::string> argv{
+      executable_path,
+      "-I",  // insert
+      "INPUT",
+      "-p",  // protocol
+      ProtocolName(protocol),
+      "--dport",  // destination port
+      std::to_string(port),
+  };
   if (!interface.empty()) {
     argv.push_back("-i");  // interface
     argv.push_back(interface);
@@ -316,13 +324,15 @@
                                 Protocol protocol,
                                 uint16_t port,
                                 const std::string& interface) {
-  std::vector<std::string> argv{executable_path,
-                                "-D",  // delete
-                                "INPUT",
-                                "-p",  // protocol
-                                ProtocolName(protocol),
-                                "--dport",  // destination port
-                                std::to_string(port)};
+  std::vector<std::string> argv{
+      executable_path,
+      "-D",  // delete
+      "INPUT",
+      "-p",  // protocol
+      ProtocolName(protocol),
+      "--dport",  // destination port
+      std::to_string(port),
+  };
   if (!interface.empty()) {
     argv.push_back("-i");  // interface
     argv.push_back(interface);