commit 1881762f345d011d079ee318d31f0a8d8ee5891e
author San Mehat <san@google.com> Thu Jan 21 09:23:06 2010 -0800
committer San Mehat <san@google.com> Thu Jan 21 09:23:06 2010 -0800
tree f0ca3124aa738a92ea809d93d5b13d751bcb4381
parent 18737845d3c6a60edd6f75ac441a1b3fed6d66a7

netd: Implement tty lists and tty validation

Signed-off-by: San Mehat <san@google.com>

PppController.cpp

diff --git a/PppController.cpp b/PppController.cpp
index 93789a9..8b32d06 100644
--- a/PppController.cpp
+++ b/PppController.cpp
@@ -16,9 +16,15 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <fcntl.h>
+
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <dirent.h>
+
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
@@ -29,8 +35,6 @@
 
 extern "C" int logwrap(int argc, const char **argv, int background);
 
-static char IPTABLES_PATH[] = "/system/bin/iptables";
-
 PppController::PppController() {
     mTtys = new TtyCollection();
     mPid = 0;
@@ -55,6 +59,18 @@
         return -1;
     }
 
+    TtyCollection::iterator it;
+    for (it = mTtys->begin(); it != mTtys->end(); ++it) {
+        if (!strcmp(tty, *it)) {
+            break;
+        }
+    }
+    if (it == mTtys->end()) {
+        LOGE("Invalid tty '%s' specified", tty);
+        errno = -EINVAL;
+        return -1;
+    }
+
     if ((pid = fork()) < 0) {
         LOGE("fork failed (%s)", strerror(errno));
         return -1;
@@ -68,7 +84,7 @@
 
         asprintf(&lr, "%s:%s", l, r);
 
-        snprintf(dev, sizeof(dev), "/dev/%s", tty); // TODO: STOPSHIP Validate this
+        snprintf(dev, sizeof(dev), "/dev/%s", tty);
 
         // TODO: Deal with pppd bailing out after 99999 seconds of being started
         // but not getting a connection
@@ -92,13 +108,41 @@
     }
 
     LOGD("Stopping PPPD services on port %s", tty);
-
     kill(mPid, SIGTERM);
+    waitpid(mPid, NULL, 0);
     mPid = 0;
+    LOGD("PPPD services on port %s stopped", tty);
     return 0;
 }
 
 TtyCollection *PppController::getTtyList() {
+    updateTtyList();
     return mTtys;
 }
 
+int PppController::updateTtyList() {
+    TtyCollection::iterator it;
+
+    for (it = mTtys->begin(); it != mTtys->end(); ++it) {
+        free(*it);
+    }
+    mTtys->clear();
+
+    DIR *d = opendir("/sys/class/tty");
+    if (!d) {
+        LOGE("Error opening /sys/class/tty (%s)", strerror(errno));
+        return -1;
+    }
+
+    struct dirent *de;
+    while ((de = readdir(d))) {
+        if (de->d_name[0] == '.')
+            continue;
+        if ((!strncmp(de->d_name, "tty", 3)) && (strlen(de->d_name) > 3)) {
+            mTtys->push_back(strdup(de->d_name));
+        }
+    }
+    closedir(d);
+    return 0;
+}
+