From b756f69226d86380ea88b9330356c9fd210dbafe Mon Sep 17 00:00:00 2001 From: Peter Nilsson Date: Thu, 8 Sep 2011 09:48:31 -0700 Subject: [PATCH] Run dnsmasq with options --keep-in-foreground and --pid-file. Tell dnsmasq to run with option --keep-in-foreground instead of --no-daemon, which is meant for debug purposes only. Also use option --pid-file to tell dnsmasq not use a pid file. Change-Id: I82858d911e94407b2511d8ce8388be553f2f09f6 --- TetherController.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/TetherController.cpp b/TetherController.cpp index 2059cce..4f54c4d 100644 --- a/TetherController.cpp +++ b/TetherController.cpp @@ -134,15 +134,17 @@ int TetherController::startTethering(int num_addrs, struct in_addr* addrs) { close(pipefd[0]); } - int num_processed_args = 4 + (num_addrs/2) + 1; // 1 null for termination + int num_processed_args = 6 + (num_addrs/2) + 1; // 1 null for termination char **args = (char **)malloc(sizeof(char *) * num_processed_args); args[num_processed_args - 1] = NULL; args[0] = (char *)"/system/bin/dnsmasq"; - args[1] = (char *)"--no-daemon"; + args[1] = (char *)"--keep-in-foreground"; args[2] = (char *)"--no-resolv"; args[3] = (char *)"--no-poll"; + args[4] = (char *)"--pid-file"; + args[5] = (char *)""; - int nextArg = 4; + int nextArg = 6; for (int addrIndex=0; addrIndex < num_addrs;) { char *start = strdup(inet_ntoa(addrs[addrIndex++])); char *end = strdup(inet_ntoa(addrs[addrIndex++])); -- 2.11.0