netd: Replace iface with opaque netid in resolver.
Also ensure that UID mapping (for VPN) cannot be overridden by
android_getaddrinfofornet or per-PID preference.
Change-Id: I9ccfda2902cc0943e87c9bc346ad9a2578accdab
diff --git a/NatController.h b/NatController.h
index 525ca02..5f45376 100644
--- a/NatController.h
+++ b/NatController.h
@@ -19,12 +19,13 @@
#include <linux/in.h>
-#include "SecondaryTableController.h"
+class NetworkController;
+class SecondaryTableController;
class NatController {
public:
- NatController(SecondaryTableController *ctrl);
+ NatController(SecondaryTableController *table_ctrl, NetworkController* net_ctrl);
virtual ~NatController();
int enableNat(const int argc, char **argv);
@@ -37,7 +38,8 @@
private:
int natCount;
- SecondaryTableController *secondaryTableCtrl;
+ SecondaryTableController *mSecondaryTableCtrl;
+ NetworkController *mNetCtrl;
int setDefaults();
int runCmd(int argc, const char **argv);