Merge "Remove Broadcom hack for BT reverse Tether" into jb-mr2-dev
diff --git a/CommandListener.cpp b/CommandListener.cpp
index 8de0c68..e8876b5 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -541,12 +541,6 @@
if (!strcmp(argv[1], "stop")) {
rc = sTetherCtrl->stopTethering();
- } else if(!strcmp(argv[1], "start-reverse")) {
- ALOGD("CommandListener::TetherCmd::run, call startReverseTethering, iface:%s", argv[2]);
- sTetherCtrl->startReverseTethering(argv[2]);
- } else if (!strcmp(argv[1], "stop-reverse")) {
- ALOGD("CommandListener::TetherCmd::run, call stopReverseTethering");
- rc = sTetherCtrl->stopReverseTethering();
} else if (!strcmp(argv[1], "status")) {
char *tmp = NULL;
diff --git a/TetherController.cpp b/TetherController.cpp
index d067f11..743742c 100644
--- a/TetherController.cpp
+++ b/TetherController.cpp
@@ -38,7 +38,6 @@
mDnsForwarders = new NetAddressCollection();
mDaemonFd = -1;
mDaemonPid = 0;
- mDhcpcdPid = 0;
}
TetherController::~TetherController() {
@@ -188,75 +187,6 @@
return 0;
}
-// TODO(BT) remove
-int TetherController::startReverseTethering(const char* iface) {
- if (mDhcpcdPid != 0) {
- ALOGE("Reverse tethering already started");
- errno = EBUSY;
- return -1;
- }
-
- ALOGD("TetherController::startReverseTethering, Starting reverse tethering");
-
- /*
- * TODO: Create a monitoring thread to handle and restart
- * the daemon if it exits prematurely
- */
- //cleanup the dhcp result
- char dhcp_result_name[64];
- snprintf(dhcp_result_name, sizeof(dhcp_result_name) - 1, "dhcp.%s.result", iface);
- property_set(dhcp_result_name, "");
-
- pid_t pid;
- if ((pid = fork()) < 0) {
- ALOGE("fork failed (%s)", strerror(errno));
- return -1;
- }
-
- if (!pid) {
-
- char *args[10];
- int argc = 0;
- args[argc++] = (char *)"/system/bin/dhcpcd";
- char host_name[128];
- if (property_get("net.hostname", host_name, NULL) && (host_name[0] != '\0'))
- {
- args[argc++] = (char *)"-h";
- args[argc++] = host_name;
- }
- args[argc++] = (char*)iface;
- args[argc] = NULL;
- if (execv(args[0], args)) {
- ALOGE("startReverseTethering, execv failed (%s)", strerror(errno));
- }
- ALOGE("startReverseTethering, Should never get here!");
- // TODO(BT) inform parent of the failure.
- // Parent process need wait for child to report error status
- // before it set mDhcpcdPid and return 0.
- _exit(-1);
- } else {
- mDhcpcdPid = pid;
- ALOGD("Reverse Tethering running, pid:%d", pid);
- }
- return 0;
-}
-
-// TODO(BT) remove
-int TetherController::stopReverseTethering() {
-
- if (mDhcpcdPid == 0) {
- ALOGE("Tethering already stopped");
- return 0;
- }
-
- ALOGD("Stopping tethering services");
-
- kill(mDhcpcdPid, SIGTERM);
- waitpid(mDhcpcdPid, NULL, 0);
- mDhcpcdPid = 0;
- ALOGD("Tethering services stopped");
- return 0;
-}
bool TetherController::isTetheringStarted() {
return (mDaemonPid == 0 ? false : true);
}
diff --git a/TetherController.h b/TetherController.h
index 02cd412..4da10b0 100644
--- a/TetherController.h
+++ b/TetherController.h
@@ -28,7 +28,6 @@
InterfaceCollection *mInterfaces;
NetAddressCollection *mDnsForwarders;
pid_t mDaemonPid;
- pid_t mDhcpcdPid;
int mDaemonFd;
public:
@@ -43,9 +42,6 @@
int stopTethering();
bool isTetheringStarted();
- int startReverseTethering(const char* iface);
- int stopReverseTethering();
-
int setDnsForwarders(char **servers, int numServers);
NetAddressCollection *getDnsForwarders();
