commit b257d61cd55c00a50d1eaaf4e7fcf436185c9a2c
author Luke Huang <huangluke@google.com> Thu Mar 14 21:19:13 2019 +0800
committer Luke Huang <huangluke@google.com> Fri Mar 15 05:39:32 2019 +0000
tree 64d7506a60930613bd01650636c7525b09435b5f
parent 2142a2b0554c9e06e2be272020d02819e046c0b3

Move DumpWriter to libnetdutils

resolver related component in libnetd_resolv
needs it to easily print dump log.

Bug: 122564854
Test: built, flashed, booted
      system/netd/tests/runtests.sh pass
      adb shell dumpsys netd, worked fine

Change-Id: Ic97d5f21b738fc3074e9308f4846191e744ed479

server/TrafficController.h

diff --git a/server/TrafficController.h b/server/TrafficController.h
index 1576882..e0a4017 100644
--- a/server/TrafficController.h
+++ b/server/TrafficController.h
@@ -27,6 +27,7 @@
 #include "android-base/unique_fd.h"
 #include "bpf/BpfMap.h"
 #include "netdbpf/bpf_shared.h"
+#include "netdutils/DumpWriter.h"
 #include "netdutils/StatusOr.h"
 #include "utils/String16.h"
 
@@ -39,8 +40,6 @@
 namespace android {
 namespace net {
 
-class DumpWriter;
-
 class TrafficController {
   public:
     TrafficController();
@@ -103,7 +102,7 @@
     netdutils::Status updateOwnerMapEntry(UidOwnerMatchType match, uid_t uid, FirewallRule rule,
                                           FirewallType type);
 
-    void dump(DumpWriter& dw, bool verbose);
+    void dump(netdutils::DumpWriter& dw, bool verbose);
 
     netdutils::Status replaceUidsInMap(UidOwnerMatchType match, const std::vector<int32_t>& uids);