[network-manager-openvpn/dcbw/config-parsing: 2/2] core: port openvpn config parsing over to helpers
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn/dcbw/config-parsing: 2/2] core: port openvpn config parsing over to helpers
- Date: Fri, 5 Dec 2014 17:57:37 +0000 (UTC)
commit 1352cb6bf8716f5b6095bf37570d212364b2264e
Author: Dan Williams <dcbw redhat com>
Date: Fri Dec 5 11:56:42 2014 -0600
core: port openvpn config parsing over to helpers
src/nm-openvpn-service-openvpn-helper.c | 668 ++-----------------------------
1 files changed, 29 insertions(+), 639 deletions(-)
---
diff --git a/src/nm-openvpn-service-openvpn-helper.c b/src/nm-openvpn-service-openvpn-helper.c
index 2c07cff..7c3fbd1 100644
--- a/src/nm-openvpn-service-openvpn-helper.c
+++ b/src/nm-openvpn-service-openvpn-helper.c
@@ -26,36 +26,19 @@
*
*/
-#include <glib.h>
+#include "config.h"
#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
#include <string.h>
-#include <errno.h>
-#include <regex.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-#include <netdb.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <glib.h>
#include <dbus/dbus-glib.h>
#include <NetworkManager.h>
#include "nm-openvpn-service.h"
-#include "nm-utils.h"
+#include "helper-config.h"
-extern char **environ;
+#define DBUS_TYPE_G_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
-/* These are here because nm-dbus-glib-types.h isn't exported */
-#define DBUS_TYPE_G_ARRAY_OF_UINT (dbus_g_type_get_collection ("GArray", G_TYPE_UINT))
-#define DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT (dbus_g_type_get_collection ("GPtrArray",
DBUS_TYPE_G_ARRAY_OF_UINT))
-#define DBUS_TYPE_G_PTR_ARRAY_OF_STRING (dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRING))
-#define DBUS_TYPE_G_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
-#define DBUS_TYPE_G_IP6_ROUTE (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY,
G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, G_TYPE_INVALID))
-#define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE))
+extern char **environ;
static gboolean helper_debug = FALSE;
@@ -63,26 +46,22 @@ static void
helper_failed (DBusGConnection *connection, const char *reason)
{
DBusGProxy *proxy;
- GError *err = NULL;
+ GError *error = NULL;
- g_warning ("nm-openvpn-service-openvpn-helper did not receive a valid %s from openvpn", reason);
+ g_warning ("nm-openvpn-service-openvpn-helper failed: %s", reason);
proxy = dbus_g_proxy_new_for_name (connection,
- NM_DBUS_SERVICE_OPENVPN,
- NM_VPN_DBUS_PLUGIN_PATH,
- NM_VPN_DBUS_PLUGIN_INTERFACE);
-
- dbus_g_proxy_call (proxy, "SetFailure", &err,
- G_TYPE_STRING, reason,
- G_TYPE_INVALID,
- G_TYPE_INVALID);
+ NM_DBUS_SERVICE_OPENVPN,
+ NM_VPN_DBUS_PLUGIN_PATH,
+ NM_VPN_DBUS_PLUGIN_INTERFACE);
- if (err) {
- g_warning ("Could not send failure information: %s", err->message);
- g_error_free (err);
- }
+ if (!dbus_g_proxy_call (proxy, "SetFailure", &error,
+ G_TYPE_STRING, reason, G_TYPE_INVALID,
+ G_TYPE_INVALID))
+ g_warning ("Could not send failure information: %s", error->message);
g_object_unref (proxy);
+ g_clear_error (&error);
exit (1);
}
@@ -105,8 +84,7 @@ send_config (DBusGConnection *connection, GHashTable *config,
G_TYPE_INVALID,
G_TYPE_INVALID) && err) {
g_warning ("Could not send configuration information: %s", err->message);
- g_error_free (err);
- err = NULL;
+ g_clear_error (&err);
}
if (ip4config) {
@@ -116,8 +94,7 @@ send_config (DBusGConnection *connection, GHashTable *config,
G_TYPE_INVALID,
G_TYPE_INVALID) && err) {
g_warning ("Could not send IPv4 configuration information: %s", err->message);
- g_error_free (err);
- err = NULL;
+ g_clear_error (&err);
}
}
@@ -128,415 +105,22 @@ send_config (DBusGConnection *connection, GHashTable *config,
G_TYPE_INVALID,
G_TYPE_INVALID) && err) {
g_warning ("Could not send IPv6 configuration information: %s", err->message);
- g_error_free (err);
- err = NULL;
+ g_clear_error (&err);
}
}
g_object_unref (proxy);
}
-static GValue *
-str_to_gvalue (const char *str, gboolean try_convert)
-{
- GValue *val;
-
- /* Empty */
- if (!str || strlen (str) < 1)
- return NULL;
-
- if (!g_utf8_validate (str, -1, NULL)) {
- if (try_convert && !(str = g_convert (str, -1, "ISO-8859-1", "UTF-8", NULL, NULL, NULL)))
- str = g_convert (str, -1, "C", "UTF-8", NULL, NULL, NULL);
-
- if (!str)
- /* Invalid */
- return NULL;
- }
-
- val = g_slice_new0 (GValue);
- g_value_init (val, G_TYPE_STRING);
- g_value_set_string (val, str);
-
- return val;
-}
-
-static GValue *
-uint_to_gvalue (guint32 num)
-{
- GValue *val;
-
- if (num == 0)
- return NULL;
-
- val = g_slice_new0 (GValue);
- g_value_init (val, G_TYPE_UINT);
- g_value_set_uint (val, num);
-
- return val;
-}
-
-static GValue *
-bool_to_gvalue (gboolean b)
-{
- GValue *val;
-
- val = g_slice_new0 (GValue);
- g_value_init (val, G_TYPE_BOOLEAN);
- g_value_set_boolean (val, b);
- return val;
-}
-
-static GValue *
-addr4_to_gvalue (const char *str)
-{
- struct in_addr temp_addr;
- GValue *val;
-
- /* Empty */
- if (!str || strlen (str) < 1)
- return NULL;
-
- if (inet_pton (AF_INET, str, &temp_addr) <= 0)
- return NULL;
-
- val = g_slice_new0 (GValue);
- g_value_init (val, G_TYPE_UINT);
- g_value_set_uint (val, temp_addr.s_addr);
-
- return val;
-}
-
-static GValue *
-parse_addr4_list (GValue *value_array, const char *str)
-{
- char **split;
- int i;
- struct in_addr temp_addr;
- GArray *array;
-
- /* Empty */
- if (!str || strlen (str) < 1)
- return value_array;
-
- if (value_array)
- array = (GArray *) g_value_get_boxed (value_array);
- else
- array = g_array_new (FALSE, FALSE, sizeof (guint));
-
- split = g_strsplit (str, " ", -1);
- for (i = 0; split[i]; i++) {
- if (inet_pton (AF_INET, split[i], &temp_addr) > 0)
- g_array_append_val (array, temp_addr.s_addr);
- }
-
- g_strfreev (split);
-
- if (!value_array && array->len > 0) {
- value_array = g_slice_new0 (GValue);
- g_value_init (value_array, DBUS_TYPE_G_UINT_ARRAY);
- g_value_set_boxed (value_array, array);
- }
- if (!value_array)
- g_array_free (array, TRUE);
-
- return value_array;
-}
-
-static GValue *
-addr6_to_gvalue (const char *str)
-{
- struct in6_addr temp_addr;
- GValue *val;
- GByteArray *ba;
-
- /* Empty */
- if (!str || strlen (str) < 1)
- return NULL;
-
- if (inet_pton (AF_INET6, str, &temp_addr) <= 0)
- return NULL;
-
- val = g_slice_new0 (GValue);
- g_value_init (val, DBUS_TYPE_G_UCHAR_ARRAY);
- ba = g_byte_array_new ();
- g_byte_array_append (ba, (guint8 *) &temp_addr, sizeof (temp_addr));
- g_value_take_boxed (val, ba);
- return val;
-}
-
-static inline gboolean
-is_domain_valid (const char *str)
-{
- return (str && (strlen(str) >= 1) && (strlen(str) <= 255));
-}
-
-#define BUFLEN 256
-
-static GValue *
-get_ip4_routes (void)
-{
- GValue *value = NULL;
- GPtrArray *routes;
- char *tmp;
- int i;
-
- routes = g_ptr_array_new ();
-
- for (i = 1; i < 256; i++) {
- GArray *array;
- char buf[BUFLEN];
- struct in_addr network;
- struct in_addr netmask;
- struct in_addr gateway = { 0, };
- guint32 prefix, metric = 0;
-
- snprintf (buf, BUFLEN, "route_network_%d", i);
- tmp = getenv (buf);
- if (!tmp || strlen (tmp) < 1)
- break;
-
- if (inet_pton (AF_INET, tmp, &network) <= 0) {
- g_warning ("Ignoring invalid static route address '%s'", tmp ? tmp : "NULL");
- continue;
- }
-
- snprintf (buf, BUFLEN, "route_netmask_%d", i);
- tmp = getenv (buf);
- if (!tmp || inet_pton (AF_INET, tmp, &netmask) <= 0) {
- g_warning ("Ignoring invalid static route netmask '%s'", tmp ? tmp : "NULL");
- continue;
- }
-
- snprintf (buf, BUFLEN, "route_gateway_%d", i);
- tmp = getenv (buf);
- /* gateway can be missing */
- if (tmp && (inet_pton (AF_INET, tmp, &gateway) <= 0)) {
- g_warning ("Ignoring invalid static route gateway '%s'", tmp ? tmp : "NULL");
- continue;
- }
-
- snprintf (buf, BUFLEN, "route_metric_%d", i);
- tmp = getenv (buf);
- /* metric can be missing */
- if (tmp && strlen (tmp)) {
- long int tmp_metric;
-
- errno = 0;
- tmp_metric = strtol (tmp, NULL, 10);
- if (errno || tmp_metric < 0 || tmp_metric > G_MAXUINT32) {
- g_warning ("Ignoring invalid static route metric '%s'", tmp);
- continue;
- }
- metric = (guint32) tmp_metric;
- }
-
- array = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 4);
- g_array_append_val (array, network.s_addr);
- prefix = nm_utils_ip4_netmask_to_prefix (netmask.s_addr);
- g_array_append_val (array, prefix);
- g_array_append_val (array, gateway.s_addr);
- g_array_append_val (array, metric);
- g_ptr_array_add (routes, array);
- }
-
- if (routes->len > 0) {
- value = g_new0 (GValue, 1);
- g_value_init (value, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT);
- g_value_take_boxed (value, routes);
- } else
- g_ptr_array_free (routes, TRUE);
-
- return value;
-}
-
-static GValue *
-get_ip6_routes (void)
-{
- GValue *value = NULL;
- GSList *routes;
- char *tmp;
- int i;
-
- routes = NULL;
-
- for (i = 1; i < 256; i++) {
- NMIP6Route *route;
- char buf[BUFLEN];
- struct in6_addr network, gateway;
- guint32 prefix;
- gchar **dest_prefix;
-
- snprintf (buf, BUFLEN, "route_ipv6_network_%d", i);
- tmp = getenv (buf);
- if (!tmp || strlen (tmp) < 1)
- break;
-
- /* Split network string in "dest/prefix" format */
- dest_prefix = g_strsplit (tmp, "/", 2);
-
- tmp = dest_prefix[0];
- if (inet_pton (AF_INET6, tmp, &network) <= 0) {
- g_warning ("Ignoring invalid static route address '%s'", tmp ? tmp : "NULL");
- g_strfreev (dest_prefix);
- continue;
- }
-
- tmp = dest_prefix[1];
- if (tmp) {
- long int tmp_prefix;
-
- errno = 0;
- tmp_prefix = strtol (tmp, NULL, 10);
- if (errno || tmp_prefix <= 0 || tmp_prefix > 128) {
- g_warning ("Ignoring invalid static route prefix '%s'", tmp ? tmp : "NULL");
- g_strfreev (dest_prefix);
- continue;
- }
- prefix = (guint32) tmp_prefix;
- } else {
- g_warning ("Ignoring static route %d with no prefix length", i);
- g_strfreev (dest_prefix);
- continue;
- }
- g_strfreev (dest_prefix);
-
- snprintf (buf, BUFLEN, "route_ipv6_gateway_%d", i);
- tmp = getenv (buf);
- /* gateway can be missing */
- if (tmp && (inet_pton (AF_INET6, tmp, &gateway) <= 0)) {
- g_warning ("Ignoring invalid static route gateway '%s'", tmp ? tmp : "NULL");
- continue;
- }
-
- route = nm_ip6_route_new ();
- nm_ip6_route_set_dest (route, &network);
- nm_ip6_route_set_prefix (route, prefix);
- nm_ip6_route_set_next_hop (route, &gateway);
-
- routes = g_slist_append (routes, route);
- }
-
- if (routes) {
- GSList *iter;
-
- value = g_slice_new0 (GValue);
- g_value_init (value, DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE);
- nm_utils_ip6_routes_to_gvalue (routes, value);
-
- for (iter = routes; iter; iter = iter->next)
- nm_ip6_route_unref (iter->data);
- g_slist_free (routes);
- }
-
- return value;
-}
-
-static GValue *
-trusted_remote_to_gvalue (void)
-{
- char *tmp;
- GValue *val = NULL;
- const char *p;
- gboolean is_name = FALSE;
-
- tmp = getenv ("trusted_ip6");
- if (tmp) {
- val = addr6_to_gvalue(tmp);
- if (val == NULL) {
- g_warning ("%s: failed to convert VPN gateway address '%s' (%d)",
- __func__, tmp, errno);
- return NULL;
- }
- return val;
- }
-
- tmp = getenv ("trusted_ip");
- if (!tmp)
- tmp = getenv ("remote_1");
- if (!tmp) {
- g_warning ("%s: did not receive remote gateway address", __func__);
- return NULL;
- }
-
- /* Check if it seems to be a hostname */
- p = tmp;
- while (*p) {
- if (*p != '.' && !isdigit (*p)) {
- is_name = TRUE;
- break;
- }
- p++;
- }
-
- /* Resolve a hostname if required. Only look for IPv4 addresses */
- if (is_name) {
- struct in_addr addr;
- struct addrinfo hints;
- struct addrinfo *result = NULL, *rp;
- int err;
-
- addr.s_addr = 0;
- memset (&hints, 0, sizeof (hints));
-
- hints.ai_family = AF_INET;
- hints.ai_flags = AI_ADDRCONFIG;
- err = getaddrinfo (tmp, NULL, &hints, &result);
- if (err != 0) {
- g_warning ("%s: failed to look up VPN gateway address '%s' (%d)",
- __func__, tmp, err);
- return NULL;
- }
-
- /* FIXME: so what if the name resolves to multiple IP addresses? We
- * don't know which one pptp decided to use so we could end up using a
- * different one here, and the VPN just won't work.
- */
- for (rp = result; rp; rp = rp->ai_next) {
- if ( (rp->ai_family == AF_INET)
- && (rp->ai_addrlen == sizeof (struct sockaddr_in))) {
- struct sockaddr_in *inptr = (struct sockaddr_in *) rp->ai_addr;
-
- memcpy (&addr, &(inptr->sin_addr), sizeof (struct in_addr));
- break;
- }
- }
-
- freeaddrinfo (result);
- if (addr.s_addr != 0)
- return uint_to_gvalue (addr.s_addr);
- else {
- g_warning ("%s: failed to convert or look up VPN gateway address '%s'",
- __func__, tmp);
- return NULL;
- }
- } else {
- val = addr4_to_gvalue (tmp);
- if (val == NULL) {
- g_warning ("%s: failed to convert VPN gateway address '%s' (%d)",
- __func__, tmp, errno);
- return NULL;
- }
- }
-
- return val;
-}
-
int
main (int argc, char *argv[])
{
DBusGConnection *connection;
- GHashTable *config, *ip4config, *ip6config;
- char *tmp;
- GValue *val;
+ GHashTable *config = NULL, *ip4_config = NULL, *ip6_config = NULL;
+ char *tmp, **iter;
int i;
- GError *err = NULL;
- GValue *dns_list = NULL;
- GValue *nbns_list = NULL;
- GPtrArray *dns_domains = NULL;
- struct in_addr temp_addr;
+ GError *error = NULL;
int tapdev = -1;
- char **iter;
int shift = 0;
gboolean is_restart;
@@ -590,214 +174,20 @@ main (int argc, char *argv[])
is_restart = argc >= 7 && !g_strcmp0 (argv[6], "restart");
- connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err);
+ connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if (!connection) {
- g_warning ("Could not get the system bus: %s", err->message);
+ g_warning ("Could not get the system bus: %s", error->message);
exit (1);
}
- config = g_hash_table_new (g_str_hash, g_str_equal);
- ip4config = g_hash_table_new (g_str_hash, g_str_equal);
- ip6config = g_hash_table_new (g_str_hash, g_str_equal);
-
- /* External world-visible VPN gateway */
- val = trusted_remote_to_gvalue ();
- if (val)
- g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, val);
- else
- helper_failed (connection, "VPN Gateway");
-
- /* Internal VPN subnet gateway */
- tmp = getenv ("route_vpn_gateway");
- val = addr4_to_gvalue (tmp);
- if (val)
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, val);
- else {
- val = addr6_to_gvalue (tmp);
- if (val)
- g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, val);
- }
-
- /* VPN device */
- tmp = getenv ("dev");
- val = str_to_gvalue (tmp, FALSE);
- if (val)
- g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_TUNDEV, val);
+ if (helper_generate_config ((const char **) argv, FALSE, is_restart, &config, &ip4_config,
&ip6_config, &error))
+ send_config (connection, config, ip4_config, ip6_config);
else
- helper_failed (connection, "Tunnel Device");
-
- if (tapdev == -1)
- tapdev = strncmp (tmp, "tap", 3) == 0;
-
- /* IPv4 address */
- tmp = getenv ("ifconfig_local");
- if (!tmp && is_restart)
- tmp = argv[4];
- if (tmp && strlen (tmp)) {
- val = addr4_to_gvalue (tmp);
- if (val)
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, val);
- else
- helper_failed (connection, "IP4 Address");
- }
-
- /* PTP address; for vpnc PTP address == internal IP4 address */
- tmp = getenv ("ifconfig_remote");
- if (!tmp && is_restart)
- tmp = argv[5];
- val = addr4_to_gvalue (tmp);
- if (val) {
- /* Sigh. Openvpn added 'topology' stuff in 2.1 that changes the meaning
- * of the ifconfig bits without actually telling you what they are
- * supposed to mean; basically relying on specific 'ifconfig' behavior.
- */
- if (tmp && !strncmp (tmp, "255.", 4)) {
- guint32 addr;
-
- /* probably a netmask, not a PTP address; topology == subnet */
- addr = g_value_get_uint (val);
- g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (addr));
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
- } else
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_PTP, val);
- }
-
- /* Netmask
- *
- * Either TAP or TUN modes can have an arbitrary netmask in newer versions
- * of openvpn, while in older versions only TAP mode would. So accept a
- * netmask if passed, otherwise default to /32 for TUN devices since they
- * are usually point-to-point.
- */
- tmp = getenv ("ifconfig_netmask");
- if (tmp && inet_pton (AF_INET, tmp, &temp_addr) > 0) {
- val = g_slice_new0 (GValue);
- g_value_init (val, G_TYPE_UINT);
- g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr));
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
- } else if (!tapdev) {
- if (!g_hash_table_lookup (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX)) {
- val = g_slice_new0 (GValue);
- g_value_init (val, G_TYPE_UINT);
- g_value_set_uint (val, 32);
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
- }
- } else
- g_warning ("No IP4 netmask/prefix (missing or invalid 'ifconfig_netmask')");
-
- val = get_ip4_routes ();
- if (val)
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, val);
-
- /* IPv6 address */
- tmp = getenv ("ifconfig_ipv6_local");
- if (tmp && strlen (tmp)) {
- val = addr6_to_gvalue (tmp);
- if (val)
- g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, val);
- else
- helper_failed (connection, "IP6 Address");
- }
-
- /* IPv6 remote address */
- tmp = getenv ("ifconfig_ipv6_remote");
- if (tmp && strlen (tmp)) {
- val = addr6_to_gvalue (tmp);
- if (val)
- g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_PTP, val);
- else
- helper_failed (connection, "IP6 PTP Address");
- }
-
- /* IPv6 netbits */
- tmp = getenv ("ifconfig_ipv6_netbits");
- if (tmp && strlen (tmp)) {
- long int netbits;
-
- errno = 0;
- netbits = strtol (tmp, NULL, 10);
- if (errno || netbits < 0 || netbits > 128) {
- g_warning ("Ignoring invalid prefix '%s'", tmp);
- } else {
- val = uint_to_gvalue ((guint32) netbits);
- g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, val);
- }
- }
-
- val = get_ip6_routes ();
- if (val)
- g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, val);
-
- /* DNS and WINS servers */
- dns_domains = g_ptr_array_sized_new (3);
- for (i = 1; i < 256; i++) {
- char *env_name;
-
- env_name = g_strdup_printf ("foreign_option_%d", i);
- tmp = getenv (env_name);
- g_free (env_name);
-
- if (!tmp || strlen (tmp) < 1)
- break;
-
- if (!g_str_has_prefix (tmp, "dhcp-option "))
- continue;
-
- tmp += 12; /* strlen ("dhcp-option ") */
-
- if (g_str_has_prefix (tmp, "DNS "))
- dns_list = parse_addr4_list (dns_list, tmp + 4);
- else if (g_str_has_prefix (tmp, "WINS "))
- nbns_list = parse_addr4_list (nbns_list, tmp + 5);
- else if (g_str_has_prefix (tmp, "DOMAIN ") && is_domain_valid (tmp + 7))
- g_ptr_array_add (dns_domains, tmp + 7);
- }
-
- if (dns_list)
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_DNS, dns_list);
- if (nbns_list)
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_NBNS, nbns_list);
- if (dns_domains->len) {
- val = g_slice_new0 (GValue);
- g_value_init (val, DBUS_TYPE_G_PTR_ARRAY_OF_STRING);
- g_value_take_boxed (val, dns_domains);
- g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, val);
- } else
- g_ptr_array_free (dns_domains, TRUE);
-
- /* Tunnel MTU */
- tmp = getenv ("tun_mtu");
- if (tmp && strlen (tmp)) {
- long int mtu;
-
- errno = 0;
- mtu = strtol (tmp, NULL, 10);
- if (errno || mtu < 0 || mtu > 20000) {
- g_warning ("Ignoring invalid tunnel MTU '%s'", tmp);
- } else {
- val = uint_to_gvalue ((guint32) mtu);
- g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_MTU, val);
- }
- }
-
- if (g_hash_table_size (ip4config)) {
- g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_HAS_IP4,
- bool_to_gvalue (TRUE));
- } else {
- g_hash_table_destroy (ip4config);
- ip4config = NULL;
- }
-
- if (g_hash_table_size (ip6config)) {
- g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_HAS_IP6,
- bool_to_gvalue (TRUE));
- } else {
- g_hash_table_destroy (ip6config);
- ip6config = NULL;
- }
+ helper_failed (connection, error ? error->message : "(unknown)");
- /* Send the config info to nm-openvpn-service */
- send_config (connection, config, ip4config, ip6config);
+ g_clear_pointer (&config, g_hash_table_destroy);
+ g_clear_pointer (&ip4_config, g_hash_table_destroy);
+ g_clear_pointer (&ip6_config, g_hash_table_destroy);
return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
