commit 9a65ac6a69575ed7c20d30faa2f74839c4ec2aed
author Lorenzo Colitti <lorenzo@google.com> Mon Sep 04 18:07:56 2017 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Sep 05 12:50:42 2017 +0900
tree 5a6bc13365e312553f7a92d845088ad213e641e9
parent 5192bf770acad258e24bfcf8984e16734a2839dd

Swap TX and RX in addForwardChainStats for clarity.

Bug: 32163131
Bug: 64995262
Test: netd_{unit,integration}_test pass
Test: tethering data usage UI reflects actual data usage
Change-Id: Icf5b66972d91e9e45e40d7b4989a15f970a78461

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index ec4360a..e541bd5 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -296,24 +296,10 @@
         for (int i = 0; i < INetd::TETHER_STATS_ARRAY_SIZE; i++) statsVector.push_back(0);
     }
 
-    // Note: currently, TetherController::addForwardChainStats swaps TX and RX counters.
-    // Specifically, when parsing iptables counters like this:
-    //
-    // Chain tetherctrl_counters (0 references)
-    //     pkts      bytes target     prot opt in     out     source               destination
-    //     4107   214602 RETURN     all  --  rndis0 rmnet_data0  0.0.0.0/0            0.0.0.0/0
-    //     6937 10361624 RETURN     all  --  rmnet_data0 rndis0  0.0.0.0/0            0.0.0.0/0
-    //
-    // it will return a TetherStatsList with one element that has intIface rndis0 and extIface
-    // rmnet_data0 (correct) but with rxBytes=214602 and txBytes=10361624 (swapped). Because the
-    // code in getTetherStats and the corresponding code in NetworkManagementService swaps the
-    // counters again, this all works.
-    //
-    // TODO: once "bandwidth gettetherstats" is gone, swap the counters in addForwardChainStats.
-    statsVector[INetd::TETHER_STATS_RX_BYTES]   += stats.txBytes;
-    statsVector[INetd::TETHER_STATS_RX_PACKETS] += stats.txPackets;
-    statsVector[INetd::TETHER_STATS_TX_BYTES]   += stats.rxBytes;
-    statsVector[INetd::TETHER_STATS_TX_PACKETS] += stats.rxPackets;
+    statsVector[INetd::TETHER_STATS_RX_BYTES]   += stats.rxBytes;
+    statsVector[INetd::TETHER_STATS_RX_PACKETS] += stats.rxPackets;
+    statsVector[INetd::TETHER_STATS_TX_BYTES]   += stats.txBytes;
+    statsVector[INetd::TETHER_STATS_TX_PACKETS] += stats.txPackets;
 
     bundle->putLongVector(iface, statsVector);
 }