commit 4b9b78aa02336de9291e5085401cef44c03c3bba
author Michal Karpinski <mkarpinski@google.com> Thu Oct 06 19:33:55 2016 +0100
committer Michal Karpinski <mkarpinski@google.com> Thu Oct 13 13:29:15 2016 +0100
tree 4f6e3677faa8867472f6e7536f3020e274802785
parent fe7f72b4709c2b735287d817b6f1277e2f40b11c

Add connect event reporting

Adds reporting of connect events including netId, destination IP address,
destination port, uid and connect latency.

Also enables the relevant tests in the connect_benchmark.

Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future CTS

Bug: 29748723
Change-Id: Id9819552a6d9ad5efc1aff5262d44caa994952aa

client/NetdClient.cpp

diff --git a/client/NetdClient.cpp b/client/NetdClient.cpp
index 91d630d..f025228 100644
--- a/client/NetdClient.cpp
+++ b/client/NetdClient.cpp
@@ -16,7 +16,9 @@
 
 #include "NetdClient.h"
 
+#include <arpa/inet.h>
 #include <errno.h>
+#include <math.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
@@ -66,7 +68,7 @@
     }
     if (FwmarkClient::shouldSetFwmark(family)) {
         FwmarkCommand command = {FwmarkCommand::ON_ACCEPT, 0, 0};
-        if (int error = FwmarkClient().send(&command, acceptedSocket)) {
+        if (int error = FwmarkClient().send(&command, acceptedSocket, nullptr)) {
             return closeFdAndSetErrno(acceptedSocket, error);
         }
     }
@@ -74,14 +76,32 @@
 }
 
 int netdClientConnect(int sockfd, const sockaddr* addr, socklen_t addrlen) {
-    if (sockfd >= 0 && addr && FwmarkClient::shouldSetFwmark(addr->sa_family)) {
+    const bool shouldSetFwmark = (sockfd >= 0) && addr
+            && FwmarkClient::shouldSetFwmark(addr->sa_family);
+    if (shouldSetFwmark) {
         FwmarkCommand command = {FwmarkCommand::ON_CONNECT, 0, 0};
-        if (int error = FwmarkClient().send(&command, sockfd)) {
+        if (int error = FwmarkClient().send(&command, sockfd, nullptr)) {
             errno = -error;
             return -1;
         }
     }
-    return libcConnect(sockfd, addr, addrlen);
+    // Latency measurement does not include time of sending commands to Fwmark
+    Stopwatch s;
+    int ret = libcConnect(sockfd, addr, addrlen);
+    // Save errno so it isn't clobbered by sending ON_CONNECT_COMPLETE
+    const int connectErrno = errno;
+    const unsigned latencyMs = lround(s.timeTaken());
+    // Send an ON_CONNECT_COMPLETE command that includes sockaddr and connect latency for reporting
+    if (shouldSetFwmark && FwmarkClient::shouldReportConnectComplete(addr->sa_family)) {
+        FwmarkConnectInfo connectInfo(latencyMs, addr);
+        // TODO: get the netId from the socket mark once we have continuous benchmark runs
+        FwmarkCommand command = {FwmarkCommand::ON_CONNECT_COMPLETE, /* netId (ignored) */ 0,
+                /* uid (filled in by the server) */ 0};
+        // Ignore return value since it's only used for logging
+        FwmarkClient().send(&command, sockfd, &connectInfo);
+    }
+    errno = connectErrno;
+    return ret;
 }
 
 int netdClientSocket(int domain, int type, int protocol) {
@@ -186,7 +206,7 @@
         return -EBADF;
     }
     FwmarkCommand command = {FwmarkCommand::SELECT_NETWORK, netId, 0};
-    return FwmarkClient().send(&command, socketFd);
+    return FwmarkClient().send(&command, socketFd, nullptr);
 }
 
 extern "C" int setNetworkForProcess(unsigned netId) {
@@ -202,7 +222,7 @@
         return -EBADF;
     }
     FwmarkCommand command = {FwmarkCommand::PROTECT_FROM_VPN, 0, 0};
-    return FwmarkClient().send(&command, socketFd);
+    return FwmarkClient().send(&command, socketFd, nullptr);
 }
 
 extern "C" int setNetworkForUser(uid_t uid, int socketFd) {
@@ -210,10 +230,10 @@
         return -EBADF;
     }
     FwmarkCommand command = {FwmarkCommand::SELECT_FOR_USER, 0, uid};
-    return FwmarkClient().send(&command, socketFd);
+    return FwmarkClient().send(&command, socketFd, nullptr);
 }
 
 extern "C" int queryUserAccess(uid_t uid, unsigned netId) {
     FwmarkCommand command = {FwmarkCommand::QUERY_USER_ACCESS, netId, uid};
-    return FwmarkClient().send(&command, -1);
+    return FwmarkClient().send(&command, -1, nullptr);
 }