commit 6b858eb3b9b94b19c5153311e10b6e832722fb8e
author Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fri Jun 24 20:31:03 2011 -0500
committer Wink Saville <wink@google.com> Mon Jun 27 15:01:47 2011 -0700
tree 57104c9ee0e86e675913324360571eee1114c465
parent ac208608c9e10ef199fdd11c38a31675ee9290c0

Keep IP forwarding enabled in tools mode.

Do not disable IP forwarding after Tethering session is over
in tools mode so that modem logging tools are functional across
tethering sessions.

Change-Id: Id6eb91ded458c57822e6a96006778e11f4038d52

TetherController.cpp

diff --git a/TetherController.cpp b/TetherController.cpp
index 8b8a294..2059cce 100644
--- a/TetherController.cpp
+++ b/TetherController.cpp
@@ -29,7 +29,7 @@
 
 #define LOG_TAG "TetherController"
 #include <cutils/log.h>
-
+#include <cutils/properties.h>
 
 #include "TetherController.h"
 
@@ -54,6 +54,14 @@
 int TetherController::setIpFwdEnabled(bool enable) {
 
     LOGD("Setting IP forward enable = %d", enable);
+
+    // In BP tools mode, do not disable IP forwarding
+    char bootmode[PROPERTY_VALUE_MAX] = {0};
+    property_get("ro.bootmode", bootmode, "unknown");
+    if ((enable == false) && (0 == strcmp("bp-tools", bootmode))) {
+        return 0;
+    }
+
     int fd = open("/proc/sys/net/ipv4/ip_forward", O_WRONLY);
     if (fd < 0) {
         LOGE("Failed to open ip_forward (%s)", strerror(errno));