commit a9e3c5da83c83063a50a50e3ed9ca7ee7a3bbb87
author Hugo Benichi <hugobenichi@google.com> Thu Jan 18 10:33:22 2018 +0900
committer Hugo Benichi <hugobenichi@google.com> Fri Jan 19 14:37:12 2018 +0900
tree 155c182e808fd024e8eb848bee78c921c1f7cad0
parent fa8616c1cc1d6972da1fbd5745c1e0c86ec5daea

TcpSocketMonitor: add polling loop

TcpSocketMonitor starts a sock_diag polling thread in its ctor whose
polling interval can be controlled with setPollingInterval() and
suspendPolling().

Initially the polling thread will immediately be suspended. The polling
thread is automatically started when 1 or more physical network exists,
and automatically stopped when there is 0 physical networks.

By default the polling interval is set to 30 secs.

Also fix some code indentation issues.

Bug: 64147860
Test: tested manually, watching the result of
      $ adb shell dumpsys netd tcp_socket_info
Change-Id: I7fe356a0a073ebc83486bc774a3002648e9dd457

server/NetworkController.cpp

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index 43a55bd..5b2cd89 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -355,6 +355,9 @@
     }
 
     mNetworks[netId] = physicalNetwork;
+
+    updateTcpSocketMonitorPolling();
+
     return 0;
 }
 
@@ -448,6 +451,9 @@
     mNetworks.erase(netId);
     delete network;
     _resolv_delete_cache_for_net(netId);
+
+    updateTcpSocketMonitorPolling();
+
     return ret;
 }
 
@@ -730,5 +736,22 @@
     return 0;
 }
 
+void NetworkController::updateTcpSocketMonitorPolling() {
+    bool physicalNetworkExists = false;
+    for (const auto& entry : mNetworks) {
+        const auto& network = entry.second;
+        if (network->getType() == Network::PHYSICAL && network->getNetId() >= MIN_NET_ID) {
+            physicalNetworkExists = true;
+            break;
+        }
+    }
+
+    if (physicalNetworkExists) {
+        android::net::gCtls->tcpSocketMonitor.resumePolling();
+    } else {
+        android::net::gCtls->tcpSocketMonitor.suspendPolling();
+    }
+}
+
 }  // namespace net
 }  // namespace android