commit bc775ed3aca7f14fb5e2b66dfdcb5da87ce9b4d5
author Dmitry Shmidt <dimitrysh@google.com> Thu Dec 12 16:41:16 2013 -0800
committer Robert Greenwalt <rgreenwalt@google.com> Wed Dec 18 11:48:04 2013 -0800
tree e99fb741d9f360414707c0a2adaa65237506d241
parent 57c2b4c8aa5d66cb3198770d1a71f299b8b14470

tethering: Add --dhcp-authoritative to dnsmasq daemon

Bug: 12114185

Change-Id: I91e83c78de251ebe88bed30174f1422b62edca07
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

TetherController.cpp

diff --git a/TetherController.cpp b/TetherController.cpp
index 743742c..32a0b43 100644
--- a/TetherController.cpp
+++ b/TetherController.cpp
@@ -96,6 +96,8 @@
     return (enabled  == '1' ? true : false);
 }
 
+#define TETHER_START_CONST_ARG        8
+
 int TetherController::startTethering(int num_addrs, struct in_addr* addrs) {
     if (mDaemonPid != 0) {
         ALOGE("Tethering already started");
@@ -134,19 +136,20 @@
             close(pipefd[0]);
         }
 
-        int num_processed_args = 7 + (num_addrs/2) + 1; // 1 null for termination
+        int num_processed_args = TETHER_START_CONST_ARG + (num_addrs/2) + 1;
         char **args = (char **)malloc(sizeof(char *) * num_processed_args);
         args[num_processed_args - 1] = NULL;
         args[0] = (char *)"/system/bin/dnsmasq";
         args[1] = (char *)"--keep-in-foreground";
         args[2] = (char *)"--no-resolv";
         args[3] = (char *)"--no-poll";
+        args[4] = (char *)"--dhcp-authoritative";
         // TODO: pipe through metered status from ConnService
-        args[4] = (char *)"--dhcp-option-force=43,ANDROID_METERED";
-        args[5] = (char *)"--pid-file";
-        args[6] = (char *)"";
+        args[5] = (char *)"--dhcp-option-force=43,ANDROID_METERED";
+        args[6] = (char *)"--pid-file";
+        args[7] = (char *)"";
 
-        int nextArg = 7;
+        int nextArg = TETHER_START_CONST_ARG;
         for (int addrIndex=0; addrIndex < num_addrs;) {
             char *start = strdup(inet_ntoa(addrs[addrIndex++]));
             char *end = strdup(inet_ntoa(addrs[addrIndex++]));