diff options
| author | Erik Kline <ek@google.com> | 2016-01-05 05:14:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-05 05:14:40 +0000 |
| commit | 33fe73272684d9be6c124d67662e04d16045f8ff (patch) | |
| tree | 4b849d7bea42f6b8d29d9a30292b905511a6643a /server/TetherController.cpp | |
| parent | c6fb016348095e9f5e062ed06877d29534658b95 (diff) | |
| parent | a3ec3703ab1377d0c82381c61566701ae21fcfc7 (diff) | |
Merge "Revert "Tell dnsmasq not to start wildcard sockets""
Diffstat (limited to 'server/TetherController.cpp')
| -rw-r--r-- | server/TetherController.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/TetherController.cpp b/server/TetherController.cpp index 697bbe46..dbbd933b 100644 --- a/server/TetherController.cpp +++ b/server/TetherController.cpp @@ -121,7 +121,7 @@ size_t TetherController::forwardingRequestCount() { return mForwardingRequests.size(); } -#define TETHER_START_CONST_ARG 9 +#define TETHER_START_CONST_ARG 8 int TetherController::startTethering(int num_addrs, char **dhcp_ranges) { if (mDaemonPid != 0) { @@ -173,7 +173,6 @@ int TetherController::startTethering(int num_addrs, char **dhcp_ranges) { args[5] = (char *)"--dhcp-option-force=43,ANDROID_METERED"; args[6] = (char *)"--pid-file"; args[7] = (char *)""; - args[8] = (char *)"-z"; // OPT_NOWILD int nextArg = TETHER_START_CONST_ARG; for (int addrIndex = 0; addrIndex < num_addrs; addrIndex += 2) { |