commit 7b314e1b017de35e7552d452aa5645029b39b199
author Hugo Benichi <hugobenichi@google.com> Mon Jan 15 21:54:00 2018 +0900
committer Hugo Benichi <hugobenichi@google.com> Wed Jan 17 12:56:36 2018 +0900
tree 0f7093224688e3d6d8819cc2ae7691ba8ed33f4a
parent dee9481c70b8203ba8836dd53b947b65b526d3e4

Define TcpSocketMonitor with a single dump method

This patch adds a TcpSocketMonitor registered in Controllers and
implementing a single dump method for pretty printing socket info
dumped with SockDiag for all sockets on the system.

The dump method can be called with
  $ adb shell dumpsys netd tcp_socket_info

Example of output is:

TcpSocketMonitor
  uid=1021 saddr=192.168.2.29 daddr=192.168.2.228 sport=49766 dport=80 state=ESTABLISHED(1) rqueue=0 wqueue=339 rtt=0ms var_rtt=67373.1ms rcv_rtt=1.11372e+06ms unacked=1792 snd_cwnd=0
  uid=0 saddr=192.168.2.29 daddr=8.8.4.4 sport=37050 dport=853 state=SYN-SENT(2) rqueue=0 wqueue=1 rtt=0ms var_rtt=134744ms rcv_rtt=1.11372e+06ms unacked=2816 snd_cwnd=0
  uid=0 saddr=192.168.2.29 daddr=8.8.8.8 sport=38674 dport=853 state=SYN-SENT(2) rqueue=0 wqueue=1 rtt=1.9084e+06ms var_rtt=0.121ms rcv_rtt=1.90841e+06ms unacked=2816 snd_cwnd=0
  uid=0 saddr=2001::0db8:4:fd00:51eb:5323:2a88:7e5a daddr=2001::0db8:4860::8844 sport=42521 dport=853 state=SYN-SENT(2) rqueue=0 wqueue=1 rtt=1.51824e+06ms var_rtt=1.61533e+06ms rcv_rtt=1.34365e+06ms unacked=2816 snd_cwnd=0
  uid=0 saddr=2001::0db8:4:fd00:51eb:5323:2a88:7e5a daddr=2001::0db8:4860::8888 sport=44725 dport=853 state=SYN-SENT(2) rqueue=0 wqueue=1 rtt=0ms var_rtt=134744ms rcv_rtt=1.11372e+06ms unacked=2816 snd_cwnd=0

Bug: 64147860
Test: manual tests with newly introduced commands
Change-Id: Iad68cc141bc517f38c2c0ec3937269cb11fa8aa4

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index 80081ea..43b2091 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -119,7 +119,7 @@
     return android::OK;
 }
 
-status_t NetdNativeService::dump(int fd, const Vector<String16> & /* args */) {
+status_t NetdNativeService::dump(int fd, const Vector<String16> &args) {
     const binder::Status dump_permission = checkPermission(DUMP);
     if (!dump_permission.isOk()) {
         const String8 msg(dump_permission.toString8());
@@ -129,7 +129,16 @@
 
     // This method does not grab any locks. If individual classes need locking
     // their dump() methods MUST handle locking appropriately.
+
     DumpWriter dw(fd);
+
+    if (!args.isEmpty() && args[0] == TcpSocketMonitor::DUMP_KEYWORD) {
+      dw.blankline();
+      gCtls->tcpSocketMonitor.dump(dw);
+      dw.blankline();
+      return NO_ERROR;
+    }
+
     dw.blankline();
     gCtls->netCtrl.dump(dw);
     dw.blankline();