Commit: 80c3b189d7e81a895524ad627841222b9c17da04 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revisão: 80c3b189d7e81a895524ad627841222b9c17da04 (tree)
• Hora: 2009-05-14 04:52:53
• Autor: San Mehat <san@goog...>
• Commiter: The Android Open Source Project

Mensagem de Log

am 94447ca: nexus: Introduce skelaton OpenVpnController class + remove s

Merge commit '94447ca34b2abf9b0d9d9cb52a18bf8ba0f01b61'

* commit '94447ca34b2abf9b0d9d9cb52a18bf8ba0f01b61':

nexus: Introduce skelaton OpenVpnController class + remove some debug messages

Mudança Sumário

• modified: nexus/Android.mk
• add: nexus/OpenVpnController.cpp
• add: nexus/OpenVpnController.h
• modified: nexus/TiwlanWifiController.cpp
• modified: nexus/VpnController.cpp
• modified: nexus/VpnController.h
• modified: nexus/main.cpp

Diff

--- a/nexus/Android.mk
+++ b/nexus/Android.mk
@@ -21,6 +21,7 @@ LOCAL_SRC_FILES:=                          \
                   ScanResult.cpp           \
                   WifiScanner.cpp          \
                   WifiNetwork.cpp          \
+                  OpenVpnController.cpp    \
 
 LOCAL_MODULE:= nexus
 

--- /dev/null
+++ b/nexus/OpenVpnController.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <errno.h>
+
+#define LOG_TAG "OpenVpnController"
+#include <cutils/log.h>
+#include <cutils/properties.h>
+
+#include "OpenVpnController.h"
+
+#define DAEMON_PROP_NAME "vpn.openvpn.status"
+
+OpenVpnController::OpenVpnController() :
+                   VpnController() {
+}
+
+int OpenVpnController::start() {
+    return 0;
+}
+
+int OpenVpnController::stop() {
+    return 0;
+}
+
+int OpenVpnController::enable() {
+
+    // Validate configuration file
+   
+    // Validate key file
+
+    if (startServiceDaemon())
+        return -1;
+
+    errno = -ENOSYS;
+    return -1;
+}
+
+int OpenVpnController::startServiceDaemon() {
+    char status[PROPERTY_VALUE_MAX];
+    int count = 100;
+
+    property_set("ctl.start", "openvpn");
+    sched_yield();
+
+    while (count-- > 0) {
+        if (property_get(DAEMON_PROP_NAME, status, NULL)) {
+            if (strcmp(status, "ok") == 0)
+                return 0;
+            else if (strcmp(DAEMON_PROP_NAME, "failed") == 0)
+                return -1;
+        }
+        usleep(200000);
+    }
+    property_set(DAEMON_PROP_NAME, "timeout");
+    return -1;
+}
+
+int OpenVpnController::stopServiceDaemon() {
+    char status[PROPERTY_VALUE_MAX] = {'\0'};
+    int count = 50;
+
+    if (property_get(DAEMON_PROP_NAME, status, NULL) &&
+        !strcmp(status, "stopped")) {
+        LOGD("Service already stopped");
+        return 0;
+    }
+
+    property_set("ctl.stop", "openvpn");
+    sched_yield();
+
+    while (count-- > 0) {
+        if (property_get(DAEMON_PROP_NAME, status, NULL)) {
+            if (!strcmp(status, "stopped"))
+                break;
+        }
+        usleep(100000);
+    }
+
+    if (!count) {
+        LOGD("Timed out waiting for openvpn to stop");
+        errno = ETIMEDOUT;
+        return -1;
+    }
+
+    return 0;
+}
+
+int OpenVpnController::disable() {
+    errno = -ENOSYS;
+    return -1;
+}

--- /dev/null
+++ b/nexus/OpenVpnController.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _OPEN_VPN_CONTROLLER_H
+#define _OPEN_VPN_CONTROLLER_H
+
+#include "VpnController.h"
+
+class OpenVpnController : public VpnController {
+
+public:
+    OpenVpnController();
+    virtual ~OpenVpnController() {}
+
+    int start();
+    int stop();
+    int enable();
+    int disable();
+
+protected:
+
+private:
+    int startServiceDaemon();
+    int stopServiceDaemon();
+};
+
+#endif

--- a/nexus/TiwlanWifiController.cpp
+++ b/nexus/TiwlanWifiController.cpp
@@ -48,7 +48,6 @@ int TiwlanWifiController::loadFirmware() {
     char driver_status[PROPERTY_VALUE_MAX];
     int count = 100;
 
-    LOGD("loadFirmware()");
     property_set("ctl.start", "wlan_loader");
     sched_yield();
 

--- a/nexus/VpnController.cpp
+++ b/nexus/VpnController.cpp
@@ -31,9 +31,6 @@ int VpnController::stop() {
 }
 
 int VpnController::enable() {
-
-    // Load modules
-    // Start daemons
     errno = -ENOSYS;
     return -1;
 }

--- a/nexus/VpnController.h
+++ b/nexus/VpnController.h
@@ -31,8 +31,6 @@ public:
     virtual int disable();
 
 protected:
-
-private:
 };
 
 #endif

--- 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 @@ int main() {
 
     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 @@ int main() {
     }
 
     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);