commit 94447ca34b2abf9b0d9d9cb52a18bf8ba0f01b61
author San Mehat <san@google.com> Wed May 13 11:54:16 2009 -0700
committer San Mehat <san@google.com> Wed May 13 11:54:16 2009 -0700
tree f64de759b975360cc7cae2be0113274a77fa6ef2
parent fa49e2860bebe6bb2a26194c58992e5d5aed0b0d

nexus: Introduce skelaton OpenVpnController class + remove some debug messages

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

nexus/main.cpp

diff --git a/nexus/main.cpp b/nexus/main.cpp
index 9945034..0aec3e5 100644
--- a/nexus/main.cpp
+++ b/nexus/main.cpp
@@ -23,7 +23,7 @@
 #include "CommandListener.h"
 
 #include "LoopController.h"
-#include "VpnController.h"
+#include "OpenVpnController.h"
 #include "TiwlanWifiController.h"
 
 int main() {
@@ -41,7 +41,8 @@
 
     nm->attachController(new LoopController());
     nm->attachController(new TiwlanWifiController("/system/lib/modules/wlan.ko", "wlan", ""));
-    nm->attachController(new VpnController());
+//    nm->attachController(new AndroidL2TPVpnController());
+    nm->attachController(new OpenVpnController());
 
 
     if (NetworkManager::Instance()->run()) {
@@ -50,11 +51,11 @@
     }
 
     if (cl->startListener()) {
-        LOGE("Unable to start  CommandListener (%s)", strerror(errno));
+        LOGE("Unable to start CommandListener (%s)", strerror(errno));
         exit (1);
     }
 
-    // XXX: we'll use the main thread for the NetworkManager eventuall
+    // XXX: we'll use the main thread for the NetworkManager eventually
     
     while(1) {
         sleep(1000);