Revert "Tell dnsmasq not to start wildcard sockets"
This reverts commit f1dfabed0a9b6ee9c37b64db3bbcb656281d4771.
The 3.4 kernel does not have SO_REUSEPORT functionality but the
headers #define it, so dnsmasq tries to use it and setsockopt
duly fails.
This is not a problem on 3.10 and later kernels, but reverting anyway.
Bug: 9580643
Bug: 26301652
Change-Id: I2322a80caa76ee4b7bb290f1665081b17d86fd43
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index 999d31d..19d9aa6 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -120,7 +120,7 @@
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) {
@@ -172,7 +172,6 @@
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) {