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

Pass into the OpenVPN plugin the port, protocol and auth_user_pass
argument.
---
 plugins/openvpn.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/plugins/openvpn.c b/plugins/openvpn.c
index 0da6c74..a0f2bdd 100644
--- a/plugins/openvpn.c
+++ b/plugins/openvpn.c
@@ -130,6 +130,7 @@ static int ov_connect(struct connman_provider *provider,
                struct connman_task *task, const char *if_name)
 {
        const char *vpnhost, *cafile, *mtu, *certfile, *keyfile;
+       const char *proto, *port, *auth_user_pass;
        int err, fd;
 
        vpnhost = connman_provider_get_string(provider, "Host");
@@ -141,11 +142,26 @@ static int ov_connect(struct connman_provider *provider,
        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)
+       mtu = connman_provider_get_string(provider, "VPN.MTU");
+       if (mtu != NULL)
                connman_task_add_argument(task, "--mtu", (char *)mtu);
 
+       proto = connman_provider_get_string(provider, "OpenVPN.Proto");
+       if (proto != NULL)
+               connman_task_add_argument(task, "--proto", (char *)proto);
+
+       port = connman_provider_get_string(provider, "OpenVPN.Port");
+       if (port != NULL)
+               connman_task_add_argument(task, "--port", (char *)port);
+
+       auth_user_pass = connman_provider_get_string(provider,
+                                                       "OpenVPN.AuthUserPass");
+       if (auth_user_pass != NULL) {
+               connman_task_add_argument(task, "--auth-user-pass",
+                                               (char *)auth_user_pass);
+       }
+
        connman_task_add_argument(task, "--syslog", NULL);
 
        connman_task_add_argument(task, "--script-security", "2");
-- 
1.7.3.2

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

Reply via email to