From: Daniel Wagner <daniel.wag...@bmw-carit.de>

---
 Makefile.plugins         |   32 +++++-
 bootstrap-configure      |    1 +
 configure.ac             |   17 +++
 plugins/openvpn.c        |  294 ++++++++++++++++++++++++++++++++++++++++++++++
 scripts/openvpn-script.c |  123 +++++++++++++++++++
 5 files changed, 466 insertions(+), 1 deletions(-)
 create mode 100644 plugins/openvpn.c
 create mode 100644 scripts/openvpn-script.c

diff --git a/Makefile.plugins b/Makefile.plugins
index f4b4630..3f26be3 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -106,10 +106,19 @@ plugins_dhclient_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
+
+if OPENCONNECT
+builtin_sources += plugins/vpn.c plugins/vpn.h
+else
+if OPENVPN
+builtin_sources += plugins/vpn.c plugins/vpn.h
+endif
+endif
+
 if OPENCONNECT
 if OPENCONNECT_BUILTIN
 builtin_modules += openconnect
-builtin_sources += plugins/vpn.c plugins/openconnect.c plugins/vpn.h
+builtin_sources += plugins/openconnect.c
 builtin_cflags += -DOPENCONNECT=\"@openconn...@\"
 else
 plugin_LTLIBRARIES += plugins/openconnect.la
@@ -123,6 +132,21 @@ plugins_openconnect_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
+if OPENVPN
+if OPENVPN_BUILTIN
+builtin_modules += openvpn
+builtin_sources += plugins/openvpn.c
+builtin_cflags += -DOPENVPN=\"@open...@\"
+else
+plugin_LTLIBRARIES += plugins/openvpn.la
+plugin_objects += $(plugins_openvpn_la_OBJECTS)
+plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@open...@\" \
+                                       -DSTATEDIR=\""$(statedir)"\" \
+                                       -DSCRIPTDIR=\""$(build_scriptdir)"\"
+plugins_openvpn_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
 if PORTAL
 if PORTAL_BUILTIN
 builtin_modules += portal
@@ -231,6 +255,12 @@ script_PROGRAMS += scripts/openconnect-script
 scripts_openconnect_script_LDADD = @DBUS_LIBS@
 endif
 
+if OPENCONNECT
+script_PROGRAMS += scripts/openvpn-script
+
+scripts_openvpn_script_LDADD = @DBUS_LIBS@
+endif
+
 if DHCLIENT
 script_DATA += scripts/dhclient.conf
 script_PROGRAMS += scripts/dhclient-script
diff --git a/bootstrap-configure b/bootstrap-configure
index bda9708..3bce947 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -23,6 +23,7 @@ fi
                --enable-ofono=builtin \
                --enable-dhclient=builtin \
                --enable-openconnect=builtin \
+               --enable-openvpn=builtin \
                --enable-pacrunner=builtin \
                --enable-dnsproxy=builtin \
                --enable-google=builtin \
diff --git a/configure.ac b/configure.ac
index f36a766..ddb37aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,23 @@ AC_ARG_ENABLE(portal,
 AM_CONDITIONAL(PORTAL, test "${enable_portal}" != "no")
 AM_CONDITIONAL(PORTAL_BUILTIN, test "${enable_portal}" = "builtin")
 
+AC_ARG_WITH(openvpn, AC_HELP_STRING([--with-openvpn=PROGRAM],
+        [specify location of openvpn binary]), [path_openvpn=${withval}])
+
+AC_ARG_ENABLE(openvpn,
+       AC_HELP_STRING([--enable-openvpn], [enable openvpn support]),
+                       [enable_openvpn=${enableval}], [enable_openvpn="no"])
+if (test "${enable_openvpn}" != "no"); then
+       if (test -z "${path_openvpn}"); then
+               AC_PATH_PROG(OPENVPN, [openvpn], [], $PATH:/sbin:/usr/sbin)
+       else
+               OPENVPN="${path_openvpn}"
+               AC_SUBST(OPENVPN)
+       fi
+fi
+AM_CONDITIONAL(OPENVPN, test "${enable_openvpn}" != "no")
+AM_CONDITIONAL(OPENVPN_BUILTIN, test "${enable_openvpn}" = "builtin")
+
 AC_ARG_ENABLE(loopback,
        AC_HELP_STRING([--enable-loopback], [enable loopback support]),
                        [enable_loopback=${enableval}], [enable_loopback="no"])
diff --git a/plugins/openvpn.c b/plugins/openvpn.c
new file mode 100644
index 0000000..8716eee
--- /dev/null
+++ b/plugins/openvpn.c
@@ -0,0 +1,294 @@
+/*
+ *
+ *  Connection Manager
+ *
+ *  Copyright (C) 2010  BMW Car IT GmbH. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <net/if.h>
+
+#include <glib/gstrfuncs.h>
+#include <glib/ghash.h>
+
+#define CONNMAN_API_SUBJECT_TO_CHANGE
+#include <connman/plugin.h>
+#include <connman/provider.h>
+#include <connman/log.h>
+#include <connman/task.h>
+#include <connman/dbus.h>
+#include <connman/rtnl.h>
+#include <connman/inet.h>
+
+#include "vpn.h"
+
+#ifndef IFF_LOWER_UP
+#define IFF_LOWER_UP    0x10000
+#endif
+
+static DBusConnection *connection;
+
+struct ov_vpn_data {
+       struct connman_provider *provider;
+       char *gateway;
+};
+
+GHashTable *provider_hash = NULL;
+
+static void ov_vpn_data_free(void *user_data)
+{
+       struct ov_vpn_data *vpn_data = user_data;
+
+       g_free(vpn_data->gateway);
+       g_free(vpn_data);
+}
+
+static void ov_newlink(unsigned flags, unsigned change, void *user_data)
+{
+       struct connman_provider *provider = user_data;
+       struct ov_vpn_data *vpn_data;
+       const char *address;
+       int index;
+
+       vpn_data = g_hash_table_lookup(provider_hash, provider);
+       if (vpn_data == NULL) {
+               DBG("missing vpn_data");
+               return;
+       }
+
+       index = connman_provider_get_index(provider);
+       address = connman_provider_get_string(provider, "Address");
+
+       DBG("index %d flags %d change %d", index, flags, change);
+
+       if ((flags & (IFF_RUNNING | IFF_LOWER_UP)) ==
+                       (IFF_RUNNING | IFF_LOWER_UP)) {
+               DBG("address %s gateway %s", address, vpn_data->gateway);
+               connman_inet_set_gateway_address(index, vpn_data->gateway);
+       }
+}
+
+static int ov_notify(DBusMessage *msg, struct connman_provider *provider)
+{
+       DBusMessageIter iter, dict;
+       const char *reason, *key, *value;
+       const char *domain = NULL;
+       struct ov_vpn_data *vpn_data;
+
+       vpn_data = g_try_new0(struct ov_vpn_data, 1);
+       if (vpn_data == NULL) {
+               connman_error("No memory left");
+               return VPN_STATE_FAILURE;
+       }
+
+       vpn_data->provider = provider;
+
+       dbus_message_iter_init(msg, &iter);
+
+       dbus_message_iter_get_basic(&iter, &reason);
+       dbus_message_iter_next(&iter);
+
+       dbus_message_iter_init(msg, &iter);
+
+       dbus_message_iter_get_basic(&iter, &reason);
+       dbus_message_iter_next(&iter);
+
+       if (!provider) {
+               connman_error("No provider found");
+               return VPN_STATE_FAILURE;
+       }
+
+       if (strcmp(reason, "up"))
+               return VPN_STATE_DISCONNECT;
+
+       domain = connman_provider_get_string(provider, "VPN.Domain");
+
+       dbus_message_iter_recurse(&iter, &dict);
+
+       while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
+               DBusMessageIter entry;
+
+               dbus_message_iter_recurse(&dict, &entry);
+               dbus_message_iter_get_basic(&entry, &key);
+               dbus_message_iter_next(&entry);
+               dbus_message_iter_get_basic(&entry, &value);
+
+               DBG("%s = %s", key, value);
+
+               if (!strcmp(key, "trusted_ip"))
+                       connman_provider_set_string(provider, "Gateway", value);
+
+               if (!strcmp(key, "ifconfig_local"))
+                       connman_provider_set_string(provider, "Address", value);
+
+               if (g_str_has_prefix(key, "foreign_option_")) {
+                       gchar **options;
+
+                       options = g_strsplit(value, " ", 3);
+                       if (options[0] != NULL &&
+                                       !strcmp(options[0], "dhcp-option") &&
+                                       options[1] != NULL &&
+                                       !strcmp(options[1], "DNS") &&
+                                       options[2] != NULL) {
+                               connman_provider_set_string(provider, "DNS",
+                                                               options[2]);
+                       }
+
+                       g_strfreev(options);
+               }
+
+               if (!strcmp(key, "route_vpn_gateway"))
+                       vpn_data->gateway = g_strdup(value);
+
+               dbus_message_iter_next(&dict);
+       }
+
+       g_hash_table_replace(provider_hash, provider, vpn_data);
+
+       return VPN_STATE_CONNECT;
+}
+
+static int ov_connect(struct connman_provider *provider,
+               struct connman_task *task, const char *if_name)
+{
+       const char *vpnhost, *cafile, *mtu, *certfile, *keyfile;
+       int index;
+       int err, fd;
+
+       vpnhost = connman_provider_get_string(provider, "Host");
+       if (!vpnhost) {
+               connman_error("Host not set; cannot enable VPN");
+               return -EINVAL;
+       }
+
+       cafile = connman_provider_get_string(provider, "OpenVPN.CACert");
+       certfile = connman_provider_get_string(provider, "OpenVPN.Cert");
+       keyfile = connman_provider_get_string(provider, "OpenVPN.Key");
+       mtu = connman_provider_get_string(provider, "VPN.MTU");
+
+       if (mtu)
+               connman_task_add_argument(task, "--mtu", (char *)mtu);
+
+       connman_task_add_argument(task, "--syslog", NULL);
+
+       connman_task_add_argument(task, "--script-security", "2");
+
+       connman_task_add_argument(task, "--up",
+                                       SCRIPTDIR "/openvpn-script");
+       connman_task_add_argument(task, "--up-restart", NULL);
+
+       connman_task_add_argument(task, "--setenv", NULL);
+       connman_task_add_argument(task, "CONNMAN_BUSNAME",
+                                       dbus_bus_get_unique_name(connection));
+
+       connman_task_add_argument(task, "--setenv", NULL);
+       connman_task_add_argument(task, "CONNMAN_INTERFACE",
+                                       CONNMAN_TASK_INTERFACE);
+
+       connman_task_add_argument(task, "--setenv", NULL);
+       connman_task_add_argument(task, "CONNMAN_PATH",
+                                       connman_task_get_path(task));
+
+       connman_task_add_argument(task, "--dev", if_name);
+       connman_task_add_argument(task, "--dev-type", "tun");
+
+       connman_task_add_argument(task, "--tls-client", NULL);
+       connman_task_add_argument(task, "--remote", (char *)vpnhost);
+       connman_task_add_argument(task, "--nobind", NULL);
+       connman_task_add_argument(task, "--persist-key", NULL);
+       connman_task_add_argument(task, "--persist-tun", NULL);
+
+       connman_task_add_argument(task, "--route-noexec", NULL);
+       connman_task_add_argument(task, "--ifconfig-noexec", NULL);
+
+       connman_task_add_argument(task, "--client", NULL);
+
+       if (cafile) {
+               connman_task_add_argument(task, "--ca",
+                                               (char *)cafile);
+       }
+
+       if (certfile) {
+               connman_task_add_argument(task, "--cert",
+                                               (char *)certfile);
+       }
+
+       if (keyfile) {
+               connman_task_add_argument(task, "--key",
+                                               (char *)keyfile);
+       }
+
+       index = connman_provider_get_index(provider);
+       connman_rtnl_add_newlink_watch(index, ov_newlink, provider);
+
+       fd = fileno(stderr);
+       err = connman_task_run(task, vpn_died, provider,
+                       NULL, &fd, &fd);
+       if (err < 0) {
+               connman_error("openvpn failed to start");
+               return -EIO;
+       }
+
+       return 0;
+}
+
+static void ov_disconnect(struct connman_provider *provider)
+{
+       int index;
+
+       index = connman_provider_get_index(provider);
+       connman_rtnl_remove_watch(index);
+
+       g_hash_table_remove(provider_hash, provider);
+}
+
+static struct vpn_driver vpn_driver = {
+       .notify = ov_notify,
+       .connect        = ov_connect,
+       .disconnect     = ov_disconnect,
+};
+
+static int openvpn_init(void)
+{
+       connection = connman_dbus_get_connection();
+
+       provider_hash = g_hash_table_new_full(g_direct_hash,
+                                               g_direct_equal,
+                                               NULL, ov_vpn_data_free);
+
+       return vpn_register("openvpn", &vpn_driver, OPENVPN);
+}
+
+static void openvpn_exit(void)
+{
+       vpn_unregister("openvpn");
+
+       g_hash_table_destroy(provider_hash);
+       provider_hash = NULL;
+
+       dbus_connection_unref(connection);
+}
+
+CONNMAN_PLUGIN_DEFINE(openvpn, "OpenVPN plugin", VERSION,
+       CONNMAN_PLUGIN_PRIORITY_DEFAULT, openvpn_init, openvpn_exit)
diff --git a/scripts/openvpn-script.c b/scripts/openvpn-script.c
new file mode 100644
index 0000000..8d2c3ff
--- /dev/null
+++ b/scripts/openvpn-script.c
@@ -0,0 +1,123 @@
+/*
+ *
+ *  Connection Manager
+ *
+ *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2010  BMW Car IT GmbH. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <dbus/dbus.h>
+
+extern char **environ;
+
+static void append(DBusMessageIter *dict, const char *pattern)
+{
+       DBusMessageIter entry;
+       const char *key, *value;
+       char *delim;
+
+       delim = strchr(pattern, '=');
+       *delim = '\0';
+
+       key = pattern;
+       value = delim + 1;
+
+       dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+                                                       NULL, &entry);
+
+       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &value);
+
+       dbus_message_iter_close_container(dict, &entry);
+}
+
+int main(int argc, char *argv[])
+{
+       DBusConnection *conn;
+       DBusError error;
+       DBusMessage *msg;
+       DBusMessageIter iter, dict;
+       char **envp, *busname, *interface, *path, *reason;
+
+       busname = getenv("CONNMAN_BUSNAME");
+       interface = getenv("CONNMAN_INTERFACE");
+       path = getenv("CONNMAN_PATH");
+
+       reason = getenv("script_type");
+
+       if (!busname || !interface || !path || !reason) {
+               fprintf(stderr, "Required environment variables not set\n");
+               return 1;
+       }
+       dbus_error_init(&error);
+
+       conn = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
+       if (conn == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       fprintf(stderr, "%s\n", error.message);
+                       dbus_error_free(&error);
+               } else
+                       fprintf(stderr, "Failed to get on system bus\n");
+               return 0;
+       }
+
+       msg = dbus_message_new_method_call(busname, path,
+                                               interface, "notify");
+       if (msg == NULL) {
+               dbus_connection_unref(conn);
+               fprintf(stderr, "Failed to allocate method call\n");
+               return 0;
+       }
+
+       dbus_message_set_no_reply(msg, TRUE);
+
+       dbus_message_append_args(msg,
+                                DBUS_TYPE_STRING, &reason,
+                                DBUS_TYPE_INVALID);
+
+       dbus_message_iter_init_append(msg, &iter);
+
+       dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+                       DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+                       DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_STRING_AS_STRING
+                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+       for (envp = environ; envp && *envp; envp++)
+               append(&dict, *envp);
+
+       dbus_message_iter_close_container(&iter, &dict);
+
+       if (dbus_connection_send(conn, msg, NULL) == FALSE)
+               fprintf(stderr, "Failed to send message\n");
+
+       dbus_connection_flush(conn);
+
+       dbus_message_unref(msg);
+
+       dbus_connection_unref(conn);
+
+       return 0;
+}
-- 
1.7.2.3

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman

Reply via email to