Refactor getTetherStats in preparation for IPv6 tether counters.

[android-x86/system-netd.git] / server / TetherController.h

diff --git a/server/TetherController.h b/server/TetherController.h
index fa9af07..6035c25 100644 (file)
--- a/server/TetherController.h
+++ b/server/TetherController.h
@@ -18,23 +18,22 @@
 #define _TETHER_CONTROLLER_H
 
 #include <netinet/in.h>
+
+#include <list>
 #include <set>
 #include <string>
 
-#include "List.h"
-
-typedef android::netd::List<char *> InterfaceCollection;
-typedef android::netd::List<std::string> NetAddressCollection;
 
 class TetherController {
-    InterfaceCollection  *mInterfaces;
+private:
+    std::list<std::string> mInterfaces;
     // NetId to use for forwarded DNS queries. This may not be the default
     // network, e.g., in the case where we are tethering to a DUN APN.
-    unsigned              mDnsNetId;
-    NetAddressCollection *mDnsForwarders;
-    pid_t                 mDaemonPid;
-    int                   mDaemonFd;
-    std::set<std::string> mForwardingRequests;
+    unsigned               mDnsNetId;
+    std::list<std::string> mDnsForwarders;
+    pid_t                  mDaemonPid;
+    int                    mDaemonFd;
+    std::set<std::string>  mForwardingRequests;
 
 public:
     TetherController();
@@ -50,14 +49,14 @@ public:
 
     unsigned getDnsNetId();
     int setDnsForwarders(unsigned netId, char **servers, int numServers);
-    NetAddressCollection *getDnsForwarders();
+    const std::list<std::string> &getDnsForwarders() const;
 
     int tetherInterface(const char *interface);
     int untetherInterface(const char *interface);
-    InterfaceCollection *getTetheredInterfaceList();
+    const std::list<std::string> &getTetheredInterfaceList() const;
 
 private:
-    int applyDnsInterfaces();
+    bool applyDnsInterfaces();
     bool setIpFwdEnabled();
 };