commit 7dfaa78c00346fdc2818c06bb96e3750b7cc99ee
author Hugo Benichi <hugobenichi@google.com> Mon Oct 31 15:07:23 2016 +0900
committer Lorenzo Colitti <lorenzo@google.com> Fri Dec 09 16:18:57 2016 +0900
tree da97f2c47713928ebfe18a3bfa24c71a5a836709
parent 4d4af4832ef323976ad4f9a09237092e51976c45

DO NOT MERGE: Add success/errno to connect() event reporting

Test: $ runtest -x system/netd/tests/netd_integration_test.cpp
Bug: 32198976

(cherry picked from commit 794c5c714a4d4cf169769ec956845a6fb24e7ebc)

Change-Id: I19701289da9458b723277580992f8bcf45305530

server/FwmarkServer.cpp

diff --git a/server/FwmarkServer.cpp b/server/FwmarkServer.cpp
index de129ab..0fabfc4 100644
--- a/server/FwmarkServer.cpp
+++ b/server/FwmarkServer.cpp
@@ -164,7 +164,7 @@
         case FwmarkCommand::ON_CONNECT_COMPLETE: {
             // Called after a socket connect() completes.
             // This reports connect event including netId, destination IP address, destination port,
-            // uid and connect latency
+            // uid, connect latency, and connect errno if any.
             android::sp<android::net::metrics::INetdEventListener> netdEventListener =
                     mEventReporter->getNetdEventListener();
 
@@ -175,7 +175,8 @@
                         addrstr, sizeof(addrstr), portstr, sizeof(portstr),
                         NI_NUMERICHOST | NI_NUMERICSERV);
 
-                netdEventListener->onConnectEvent(fwmark.netId, connectInfo.latencyMs,
+                netdEventListener->onConnectEvent(fwmark.netId, connectInfo.error,
+                        connectInfo.latencyMs,
                         (ret == 0) ? String16(addrstr) : String16(""),
                         (ret == 0) ? strtoul(portstr, NULL, 10) : 0, client->getUid());
             }