Fix tethering in the case of a regular upstream connection.
Fixes tethering via Ethernet, Bluetooth and WiFi (hotspot).
Tethering when the upstream has a DUN-specific APN is likely still broken
(untested).
For now, assign a fixed NetId (a hack) until we can change the framework to
create a valid NetworkAgent and all that jazz.
Bug: 15968336
Bug: 14988803
Change-Id: Idcf4d492d9329a9c87913e27be6dd835a792bea2
diff --git a/server/NatController.h b/server/NatController.h
index afddb27..e3cc394 100644
--- a/server/NatController.h
+++ b/server/NatController.h
@@ -22,12 +22,11 @@
#include <string>
class NetworkController;
-class SecondaryTableController;
class NatController {
public:
- NatController(SecondaryTableController *table_ctrl, NetworkController* net_ctrl);
+ explicit NatController(NetworkController* net_ctrl);
virtual ~NatController();
int enableNat(const int argc, char **argv);
@@ -43,7 +42,6 @@
private:
int natCount;
- SecondaryTableController *mSecondaryTableCtrl;
NetworkController *mNetCtrl;
bool checkTetherCountingRuleExist(const char *pair_name);
@@ -52,7 +50,7 @@
int runCmd(int argc, const char **argv);
int setForwardRules(bool set, const char *intIface, const char *extIface);
int setTetherCountingRules(bool add, const char *intIface, const char *extIface);
- int routesOp(bool add, const char *intIface, const char *extIface, char **argv, int addrCount);
+ int routesOp(bool add, const char *intIface, char **argv, int addrCount);
};
#endif