commit 15bb55c11df22b4752297f38b10afd9e48806d87
author Bernie Innocenti <codewiz@google.com> Sun Jun 03 16:19:51 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Thu Jun 07 16:31:04 2018 +0900
tree 6a89c1b621b2a642bb9d08865847ee263ea1e693
parent 992d7476b63b736b5f41e8b548d88a79db999fc4

netd: Enable clang-tidy and fix all warnings

Bug: 65246407
Test: m netd && system/netd/tests/runtests.sh
Change-Id: I1d22b2bc317fe7218ccde78859ed0623d6a1f8df

server/SockDiagTest.cpp

diff --git a/server/SockDiagTest.cpp b/server/SockDiagTest.cpp
index a7b911d..a263fea 100644
--- a/server/SockDiagTest.cpp
+++ b/server/SockDiagTest.cpp
@@ -73,11 +73,11 @@
 }
 
 TEST_F(SockDiagTest, TestDump) {
-    int v4socket = socket(AF_INET, SOCK_STREAM, 0);
+    int v4socket = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
     ASSERT_NE(-1, v4socket) << "Failed to open IPv4 socket: " << strerror(errno);
-    int v6socket = socket(AF_INET6, SOCK_STREAM, 0);
+    int v6socket = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
     ASSERT_NE(-1, v6socket) << "Failed to open IPv6 socket: " << strerror(errno);
-    int listensocket = socket(AF_INET6, SOCK_STREAM, 0);
+    int listensocket = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
     ASSERT_NE(-1, listensocket) << "Failed to open listen socket: " << strerror(errno);
 
     uint16_t port = bindAndListen(listensocket);
@@ -93,8 +93,10 @@
 
     sockaddr_in6 client46, client6;
     socklen_t clientlen = std::max(sizeof(client46), sizeof(client6));
-    int accepted4 = accept(listensocket, (sockaddr *) &client46, &clientlen);
-    int accepted6 = accept(listensocket, (sockaddr *) &client6, &clientlen);
+    int accepted4 = accept4(
+            listensocket, (sockaddr *) &client46, &clientlen, SOCK_CLOEXEC);
+    int accepted6 = accept4(
+            listensocket, (sockaddr *) &client6, &clientlen, SOCK_CLOEXEC);
     ASSERT_NE(-1, accepted4);
     ASSERT_NE(-1, accepted6);
 
@@ -457,7 +459,7 @@
     fprintf(stderr, "Benchmarking closing %d sockets based on %s\n",
             numSockets, testTypeName(mode));
 
-    int listensocket = socket(AF_INET6, SOCK_STREAM, 0);
+    int listensocket = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
     ASSERT_NE(-1, listensocket) << "Failed to open listen socket";
 
     uint16_t port = bindAndListen(listensocket);
@@ -473,12 +475,13 @@
 
     auto start = std::chrono::steady_clock::now();
     for (int i = 0; i < numSockets; i++) {
-        int s = socket(AF_INET6, SOCK_STREAM, 0);
+        int s = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
         clientlen = sizeof(client);
         ASSERT_EQ(0, connect(s, (sockaddr *) &server, sizeof(server)))
             << "Connecting socket " << i << " failed " << strerror(errno);
         ASSERT_EQ(0, modifySocketForTest(s, i));
-        serversockets[i] = accept(listensocket, (sockaddr *) &client, &clientlen);
+        serversockets[i] = accept4(
+                listensocket, (sockaddr *) &client, &clientlen, SOCK_CLOEXEC);
         ASSERT_NE(-1, serversockets[i])
             << "Accepting socket " << i << " failed " << strerror(errno);
         clientports[i] = client.sin6_port;