openvpn: Support '--tls-auth <file>' with optional '<direction>' argument
authorEmil Renner Berthing <esmil@mailme.dk>
Tue, 23 Oct 2012 10:29:24 +0000 (13:29 +0300)
committerPatrik Flykt <patrik.flykt@linux.intel.com>
Mon, 29 Oct 2012 10:38:08 +0000 (12:38 +0200)
Connman              OpenVPN

OpenVPN.TLSAuth      --tls-auth <file> [<direction>]
OpenVPN.TLSAuthDir   optional <direction> argument to '--tls-auth'

Since 'OpenVPN.TLSAuthDir' contains the optional <direction> argument for
'OpenVPN.TLSAuth', handle them separately. The special handling is
identified by setting openvpn command line argument to NULL.

plugins/openvpn.c

index c3e7bcd..bac1671 100644 (file)
@@ -62,6 +62,8 @@ struct {
        { "OpenVPN.AskPass", "--askpass", 1 },
        { "OpenVPN.AuthNoCache", "--auth-nocache", 0 },
        { "OpenVPN.TLSRemote", "--tls-remote", 1 },
+       { "OpenVPN.TLSAuth", NULL, 1 },
+       { "OpenVPN.TLSAuthDir", NULL, 1 },
        { "OpenVPN.Cipher", "--cipher", 1 },
        { "OpenVPN.Auth", "--auth", 1 },
        { "OpenVPN.CompLZO", "--comp-lzo", 0 },
@@ -206,6 +208,9 @@ static int task_append_config_data(struct connman_provider *provider,
        int i;
 
        for (i = 0; i < (int)ARRAY_SIZE(ov_options); i++) {
+               if (ov_options[i].ov_opt == NULL)
+                       continue;
+
                option = connman_provider_get_string(provider,
                                        ov_options[i].cm_opt);
                if (option == NULL)
@@ -235,6 +240,15 @@ static int ov_connect(struct connman_provider *provider,
 
        task_append_config_data(provider, task);
 
+       option = connman_provider_get_string(provider, "OpenVPN.TLSAuth");
+       if (option != NULL) {
+               connman_task_add_argument(task, "--tls-auth", option);
+               option = connman_provider_get_string(provider,
+                               "OpenVPN.TLSAuthDir");
+               if (option != NULL)
+                       connman_task_add_argument(task, option, NULL);
+       }
+
        connman_task_add_argument(task, "--syslog", NULL);
 
        connman_task_add_argument(task, "--script-security", "2");