diff options
Diffstat (limited to 'src/nm-ip6-config.c')
| -rw-r--r-- | src/nm-ip6-config.c | 1772 |
1 files changed, 1311 insertions, 461 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 511cbf46..aaf5e701 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -15,27 +15,22 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2005 - 2010 Red Hat, Inc. + * Copyright (C) 2005 - 2013 Red Hat, Inc. * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include <glib.h> -#include <stdio.h> #include <string.h> -#include "nm-ip6-config.h" -#include "nm-dbus-manager.h" -#include "NetworkManager.h" -#include "NetworkManagerUtils.h" -#include "nm-setting-ip6-config.h" -#include "nm-utils.h" -#include <netlink/route/addr.h> -#include <netlink/utils.h> -#include <netinet/in.h> +#include "nm-ip6-config.h" -#include "nm-ip6-config-glue.h" +#include "nm-glib-compat.h" +#include "libgsystem.h" +#include "nm-platform.h" +#include "nm-utils.h" +#include "nm-dbus-manager.h" #include "nm-dbus-glib-types.h" - +#include "nm-ip6-config-glue.h" +#include "NetworkManagerUtils.h" G_DEFINE_TYPE (NMIP6Config, nm_ip6_config, G_TYPE_OBJECT) @@ -44,48 +39,30 @@ G_DEFINE_TYPE (NMIP6Config, nm_ip6_config, G_TYPE_OBJECT) typedef struct { char *path; - GSList *addresses; - struct in6_addr ptp_address; - - guint32 mss; /* Maximum Segment Size of the route */ - + gboolean never_default; + struct in6_addr gateway; + GArray *addresses; + GArray *routes; GArray *nameservers; GPtrArray *domains; GPtrArray *searches; - - gboolean gateway_set; - struct in6_addr gateway; - GSList *routes; - - gboolean never_default; + guint32 mss; } NMIP6ConfigPrivate; enum { PROP_0, + PROP_GATEWAY, PROP_ADDRESSES, + PROP_ROUTES, PROP_NAMESERVERS, PROP_DOMAINS, - PROP_ROUTES, + PROP_SEARCHES, LAST_PROP }; - - -static struct nl_addr * -nm_utils_ip6_addr_to_nl_addr (const struct in6_addr *ip6_addr, guint prefix) -{ - struct nl_addr * nla = NULL; - - if (!(nla = nl_addr_alloc (sizeof (struct in6_addr)))) - return NULL; - nl_addr_set_family (nla, AF_INET6); - nl_addr_set_binary_addr (nla, (struct in6_addr *)ip6_addr, sizeof (struct in6_addr)); - if (prefix) - nl_addr_set_prefixlen (nla, prefix); - - return nla; -} +static GParamSpec *obj_properties[LAST_PROP] = { NULL, }; +#define _NOTIFY(config, prop) G_STMT_START { g_object_notify_by_pspec (G_OBJECT (config), obj_properties[prop]); } G_STMT_END NMIP6Config * @@ -97,586 +74,1316 @@ nm_ip6_config_new (void) void nm_ip6_config_export (NMIP6Config *config) { - NMIP6ConfigPrivate *priv; - NMDBusManager *dbus_mgr; - DBusGConnection *connection; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); static guint32 counter = 0; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); - - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - g_return_if_fail (priv->path == NULL); - - dbus_mgr = nm_dbus_manager_get (); - connection = nm_dbus_manager_get_connection (dbus_mgr); - priv->path = g_strdup_printf (NM_DBUS_PATH "/IP6Config/%d", counter++); - - dbus_g_connection_register_g_object (connection, priv->path, G_OBJECT (config)); - g_object_unref (dbus_mgr); + if (!priv->path) { + priv->path = g_strdup_printf (NM_DBUS_PATH "/IP6Config/%d", counter++); + nm_dbus_manager_register_object (nm_dbus_manager_get (), priv->path, config); + } } const char * -nm_ip6_config_get_dbus_path (NMIP6Config *config) +nm_ip6_config_get_dbus_path (const NMIP6Config *config) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return NM_IP6_CONFIG_GET_PRIVATE (config)->path; + return priv->path; } -void -nm_ip6_config_take_address (NMIP6Config *config, NMIP6Address *address) +/******************************************************************/ + +static gboolean +same_prefix (const struct in6_addr *address1, const struct in6_addr *address2, int plen) { - NMIP6ConfigPrivate *priv; + const guint8 *bytes1 = (const guint8 *) address1; + const guint8 *bytes2 = (const guint8 *) address2; + int nbytes = plen / 8; + int nbits = plen % 8; + int masked1 = bytes1[nbytes] >> (8 - nbits); + int masked2 = bytes2[nbytes] >> (8 - nbits); - g_return_if_fail (NM_IS_IP6_CONFIG (config)); - g_return_if_fail (address != NULL); + if (nbytes && memcmp (bytes1, bytes2, nbytes)) + return FALSE; - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - priv->addresses = g_slist_append (priv->addresses, address); + return masked1 == masked2; } -void -nm_ip6_config_add_address (NMIP6Config *config, - NMIP6Address *address) +/******************************************************************/ + +/** + * nm_ip6_config_capture_resolv_conf(): + * @nameservers: array of struct in6_addr + * @rc_contents: the contents of a resolv.conf or %NULL to read /etc/resolv.conf + * + * Reads all resolv.conf IPv6 nameservers and adds them to @nameservers. + * + * Returns: %TRUE if nameservers were added, %FALSE if @nameservers is unchanged + */ +gboolean +nm_ip6_config_capture_resolv_conf (GArray *nameservers, + const char *rc_contents) { - NMIP6ConfigPrivate *priv; - GSList *iter; + GPtrArray *read_ns; + guint i, j; + gboolean changed = FALSE; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); - g_return_if_fail (address != NULL); + g_return_val_if_fail (nameservers != NULL, FALSE); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - for (iter = priv->addresses; iter; iter = g_slist_next (iter)) { - if (nm_ip6_address_compare ((NMIP6Address *) iter->data, address)) - return; - } + read_ns = nm_utils_read_resolv_conf_nameservers (rc_contents); + if (!read_ns) + return FALSE; - priv->addresses = g_slist_append (priv->addresses, nm_ip6_address_dup (address)); -} + for (i = 0; i < read_ns->len; i++) { + const char *s = g_ptr_array_index (read_ns, i); + struct in6_addr ns = IN6ADDR_ANY_INIT; -void -nm_ip6_config_replace_address (NMIP6Config *config, - guint i, - NMIP6Address *new_address) -{ - NMIP6ConfigPrivate *priv; - GSList *old; + if (!inet_pton (AF_INET6, s, (void *) &ns) || IN6_IS_ADDR_UNSPECIFIED (&ns)) + continue; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + /* Ignore duplicates */ + for (j = 0; j < nameservers->len; j++) { + struct in6_addr *t = &g_array_index (nameservers, struct in6_addr, j); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - old = g_slist_nth (priv->addresses, i); - g_return_if_fail (old != NULL); - nm_ip6_address_unref ((NMIP6Address *) old->data); + if (IN6_ARE_ADDR_EQUAL (t, &ns)) + break; + } + + if (j == nameservers->len) { + g_array_append_val (nameservers, ns); + changed = TRUE; + } + } - old->data = nm_ip6_address_dup (new_address); + g_ptr_array_unref (read_ns); + return changed; } -NMIP6Address *nm_ip6_config_get_address (NMIP6Config *config, guint i) +static gboolean +addresses_are_duplicate (const NMPlatformIP6Address *a, const NMPlatformIP6Address *b, gboolean consider_plen) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); - - return (NMIP6Address *) g_slist_nth_data (NM_IP6_CONFIG_GET_PRIVATE (config)->addresses, i); + return IN6_ARE_ADDR_EQUAL (&a->address, &b->address) && (!consider_plen || a->plen == b->plen); } -guint32 nm_ip6_config_get_num_addresses (NMIP6Config *config) +static gboolean +routes_are_duplicate (const NMPlatformIP6Route *a, const NMPlatformIP6Route *b, gboolean consider_gateway_and_metric) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + return IN6_ARE_ADDR_EQUAL (&a->network, &b->network) && a->plen == b->plen && + (!consider_gateway_and_metric || (IN6_ARE_ADDR_EQUAL (&a->gateway, &b->gateway) && a->metric == b->metric)); +} - return g_slist_length (NM_IP6_CONFIG_GET_PRIVATE (config)->addresses); +static gint +_addresses_sort_cmp_get_prio (const struct in6_addr *addr) +{ + if (IN6_IS_ADDR_V4MAPPED (addr)) + return 0; + if (IN6_IS_ADDR_V4COMPAT (addr)) + return 1; + if (IN6_IS_ADDR_UNSPECIFIED (addr)) + return 2; + if (IN6_IS_ADDR_LOOPBACK (addr)) + return 3; + if (IN6_IS_ADDR_LINKLOCAL (addr)) + return 4; + if (IN6_IS_ADDR_SITELOCAL (addr)) + return 5; + return 6; } -const struct in6_addr *nm_ip6_config_get_ptp_address (NMIP6Config *config) +static gint +_addresses_sort_cmp (gconstpointer a, gconstpointer b, gpointer user_data) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + gint p1, p2, c; + gboolean perm1, perm2, tent1, tent2; + gboolean ipv6_privacy1, ipv6_privacy2; + const NMPlatformIP6Address *a1 = a, *a2 = b; + + /* tentative addresses are always sorted back... */ + /* sort tentative addresses after non-tentative. */ + tent1 = (a1->flags & IFA_F_TENTATIVE); + tent2 = (a2->flags & IFA_F_TENTATIVE); + if (tent1 != tent2) + return tent1 ? 1 : -1; + + /* Sort by address type. For example link local will + * be sorted *after* site local or global. */ + p1 = _addresses_sort_cmp_get_prio (&a1->address); + p2 = _addresses_sort_cmp_get_prio (&a2->address); + if (p1 != p2) + return p1 > p2 ? -1 : 1; + + ipv6_privacy1 = !!(a1->flags & (IFA_F_MANAGETEMPADDR | IFA_F_TEMPORARY)); + ipv6_privacy2 = !!(a2->flags & (IFA_F_MANAGETEMPADDR | IFA_F_TEMPORARY)); + if (ipv6_privacy1 || ipv6_privacy2) { + gboolean prefer_temp = ((NMSettingIP6ConfigPrivacy) GPOINTER_TO_INT (user_data)) == NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR; + gboolean public1 = TRUE, public2 = TRUE; + + if (ipv6_privacy1) { + if (a1->flags & IFA_F_TEMPORARY) + public1 = prefer_temp; + else + public1 = !prefer_temp; + } + if (ipv6_privacy2) { + if (a2->flags & IFA_F_TEMPORARY) + public2 = prefer_temp; + else + public2 = !prefer_temp; + } + + if (public1 != public2) + return public1 ? -1 : 1; + } + + /* Sort the addresses based on their source. */ + if (a1->source != a2->source) + return a1->source > a2->source ? -1 : 1; - return &NM_IP6_CONFIG_GET_PRIVATE (config)->ptp_address; + /* sort permanent addresses before non-permanent. */ + perm1 = (a1->flags & IFA_F_PERMANENT); + perm2 = (a2->flags & IFA_F_PERMANENT); + if (perm1 != perm2) + return perm1 ? -1 : 1; + + /* finally sort addresses lexically */ + c = memcmp (&a1->address, &a2->address, sizeof (a2->address)); + return c != 0 ? c : memcmp (a1, a2, sizeof (*a1)); } -void nm_ip6_config_set_ptp_address (NMIP6Config *config, const struct in6_addr *ptp_addr) +gboolean +nm_ip6_config_addresses_sort (NMIP6Config *self, NMSettingIP6ConfigPrivacy use_temporary) { - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + NMIP6ConfigPrivate *priv; + size_t data_len = 0; + char *data_pre = NULL; + gboolean changed; + + g_return_val_if_fail (NM_IS_IP6_CONFIG (self), FALSE); + + priv = NM_IP6_CONFIG_GET_PRIVATE (self); + if (priv->addresses->len > 1) { + data_len = priv->addresses->len * g_array_get_element_size (priv->addresses); + data_pre = g_new (char, data_len); + memcpy (data_pre, priv->addresses->data, data_len); + + g_array_sort_with_data (priv->addresses, _addresses_sort_cmp, GINT_TO_POINTER (use_temporary)); + + changed = memcmp (data_pre, priv->addresses->data, data_len) != 0; + g_free (data_pre); - NM_IP6_CONFIG_GET_PRIVATE (config)->ptp_address = *ptp_addr; + if (changed) { + _NOTIFY (self, PROP_ADDRESSES); + return TRUE; + } + } + return FALSE; } -void nm_ip6_config_add_nameserver (NMIP6Config *config, const struct in6_addr *nameserver) +NMIP6Config * +nm_ip6_config_capture (int ifindex, gboolean capture_resolv_conf, NMSettingIP6ConfigPrivacy use_temporary) { + NMIP6Config *config; NMIP6ConfigPrivate *priv; - struct in6_addr *nameservers; - int i; - - g_return_if_fail (NM_IS_IP6_CONFIG (config)); - g_return_if_fail (nameserver != NULL); + guint i; + guint lowest_metric = G_MAXUINT; + struct in6_addr old_gateway = IN6ADDR_ANY_INIT; + gboolean has_gateway = FALSE; + gboolean notify_nameservers = FALSE; + + /* Slaves have no IP configuration */ + if (nm_platform_link_get_master (ifindex) > 0) + return NULL; + config = nm_ip6_config_new (); priv = NM_IP6_CONFIG_GET_PRIVATE (config); - /* No dupes */ - nameservers = (struct in6_addr *)priv->nameservers->data; - for (i = 0; i < priv->nameservers->len; i++) { - if (IN6_ARE_ADDR_EQUAL (nameserver, &nameservers[i])) - return; + g_array_unref (priv->addresses); + g_array_unref (priv->routes); + + priv->addresses = nm_platform_ip6_address_get_all (ifindex); + priv->routes = nm_platform_ip6_route_get_all (ifindex, TRUE); + + /* Extract gateway from default route */ + old_gateway = priv->gateway; + for (i = 0; i < priv->routes->len; i++) { + const NMPlatformIP6Route *route = &g_array_index (priv->routes, NMPlatformIP6Route, i); + + if (IN6_IS_ADDR_UNSPECIFIED (&route->network)) { + if (route->metric < lowest_metric) { + priv->gateway = route->gateway; + lowest_metric = route->metric; + } + has_gateway = TRUE; + /* Remove the default route from the list */ + g_array_remove_index (priv->routes, i); + i--; + } } - g_array_append_val (priv->nameservers, *nameserver); -} + /* If there is a host route to the gateway, ignore that route. It is + * automatically added by NetworkManager when needed. + */ + if (has_gateway) { + for (i = 0; i < priv->routes->len; i++) { + const NMPlatformIP6Route *route = &g_array_index (priv->routes, NMPlatformIP6Route, i); + + if ( route->plen == 128 + && IN6_ARE_ADDR_EQUAL (&route->network, &priv->gateway) + && IN6_IS_ADDR_UNSPECIFIED (&route->gateway)) { + g_array_remove_index (priv->routes, i); + i--; + } + } + } -const struct in6_addr *nm_ip6_config_get_nameserver (NMIP6Config *config, guint i) -{ - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + /* If the interface has the default route, and has IPv6 addresses, capture + * nameservers from /etc/resolv.conf. + */ + if (priv->addresses->len && has_gateway && capture_resolv_conf) + notify_nameservers = nm_ip6_config_capture_resolv_conf (priv->nameservers, NULL); - return &g_array_index (NM_IP6_CONFIG_GET_PRIVATE (config)->nameservers, struct in6_addr, i); -} + g_array_sort_with_data (priv->addresses, _addresses_sort_cmp, GINT_TO_POINTER (use_temporary)); -guint32 nm_ip6_config_get_num_nameservers (NMIP6Config *config) -{ - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + /* actually, nobody should be connected to the signal, just to be sure, notify */ + if (notify_nameservers) + _NOTIFY (config, PROP_NAMESERVERS); + _NOTIFY (config, PROP_ADDRESSES); + _NOTIFY (config, PROP_ROUTES); + if (!IN6_ARE_ADDR_EQUAL (&priv->gateway, &old_gateway)) + _NOTIFY (config, PROP_GATEWAY); - return NM_IP6_CONFIG_GET_PRIVATE (config)->nameservers->len; + return config; } -void nm_ip6_config_reset_nameservers (NMIP6Config *config) +gboolean +nm_ip6_config_commit (const NMIP6Config *config, int ifindex) { - NMIP6ConfigPrivate *priv; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + int i; + gboolean success; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + g_return_val_if_fail (ifindex > 0, FALSE); + g_return_val_if_fail (config != NULL, FALSE); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if (priv->nameservers->len) - g_array_remove_range (priv->nameservers, 0, priv->nameservers->len); + /* Addresses */ + nm_platform_ip6_address_sync (ifindex, priv->addresses); + + /* Routes */ + { + int count = nm_ip6_config_get_num_routes (config); + GArray *routes = g_array_sized_new (FALSE, FALSE, sizeof (NMPlatformIP6Route), count); + NMPlatformIP6Route route; + + for (i = 0; i < count; i++) { + memcpy (&route, nm_ip6_config_get_route (config, i), sizeof (route)); + + /* Don't add the route if it's more specific than one of the subnets + * the device already has an IP address on. + */ + if ( IN6_IS_ADDR_UNSPECIFIED (&route.gateway) + && nm_ip6_config_destination_is_direct (config, &route.network, route.plen)) + continue; + + /* Don't add the default route if the connection + * is never supposed to be the default connection. + */ + if (nm_ip6_config_get_never_default (config) && IN6_IS_ADDR_UNSPECIFIED (&route.network)) + continue; + + g_array_append_val (routes, route); + } + + success = nm_platform_ip6_route_sync (ifindex, routes); + g_array_unref (routes); + } + + return success; } void -nm_ip6_config_set_gateway (NMIP6Config *config, const struct in6_addr *gateway) +nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIP6Config *setting, int default_route_metric) { - NMIP6ConfigPrivate *priv; + guint naddresses, nroutes, nnameservers, nsearches; + int i; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + if (!setting) + return; - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if (gateway) - memcpy (&priv->gateway, gateway, sizeof (priv->gateway)); - priv->gateway_set = !!gateway; + naddresses = nm_setting_ip6_config_get_num_addresses (setting); + nroutes = nm_setting_ip6_config_get_num_routes (setting); + nnameservers = nm_setting_ip6_config_get_num_dns (setting); + nsearches = nm_setting_ip6_config_get_num_dns_searches (setting); + + g_object_freeze_notify (G_OBJECT (config)); + + /* Gateway */ + if (nm_setting_ip6_config_get_never_default (setting)) + nm_ip6_config_set_never_default (config, TRUE); + else if (nm_setting_ip6_config_get_ignore_auto_routes (setting)) + nm_ip6_config_set_never_default (config, FALSE); + for (i = 0; i < naddresses; i++) { + const struct in6_addr *gateway = nm_ip6_address_get_gateway (nm_setting_ip6_config_get_address (setting, i)); + + if (gateway && !IN6_IS_ADDR_UNSPECIFIED (gateway)) { + nm_ip6_config_set_gateway (config, gateway); + break; + } + } + + /* Addresses */ + for (i = 0; i < naddresses; i++) { + NMIP6Address *s_addr = nm_setting_ip6_config_get_address (setting, i); + NMPlatformIP6Address address; + + memset (&address, 0, sizeof (address)); + address.address = *nm_ip6_address_get_address (s_addr); + address.plen = nm_ip6_address_get_prefix (s_addr); + address.lifetime = NM_PLATFORM_LIFETIME_PERMANENT; + address.preferred = NM_PLATFORM_LIFETIME_PERMANENT; + address.source = NM_PLATFORM_SOURCE_USER; + + nm_ip6_config_add_address (config, &address); + } + + /* Routes */ + if (nm_setting_ip6_config_get_ignore_auto_routes (setting)) + nm_ip6_config_reset_routes (config); + for (i = 0; i < nroutes; i++) { + NMIP6Route *s_route = nm_setting_ip6_config_get_route (setting, i); + NMPlatformIP6Route route; + + memset (&route, 0, sizeof (route)); + route.network = *nm_ip6_route_get_dest (s_route); + route.plen = nm_ip6_route_get_prefix (s_route); + route.gateway = *nm_ip6_route_get_next_hop (s_route); + route.metric = nm_ip6_route_get_metric (s_route); + if (!route.metric) + route.metric = default_route_metric; + route.source = NM_PLATFORM_SOURCE_USER; + + nm_ip6_config_add_route (config, &route); + } + + /* DNS */ + if (nm_setting_ip6_config_get_ignore_auto_dns (setting)) { + nm_ip6_config_reset_nameservers (config); + nm_ip6_config_reset_domains (config); + nm_ip6_config_reset_searches (config); + } + for (i = 0; i < nnameservers; i++) + nm_ip6_config_add_nameserver (config, nm_setting_ip6_config_get_dns (setting, i)); + for (i = 0; i < nsearches; i++) + nm_ip6_config_add_search (config, nm_setting_ip6_config_get_dns_search (setting, i)); + + g_object_thaw_notify (G_OBJECT (config)); } -const struct in6_addr * -nm_ip6_config_get_gateway (NMIP6Config *config) +NMSetting * +nm_ip6_config_create_setting (const NMIP6Config *config) { - NMIP6ConfigPrivate *priv; + NMSettingIP6Config *s_ip6; + const struct in6_addr *gateway; + guint naddresses, nroutes, nnameservers, nsearches; + const char *method = NULL; + int i; - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); + s_ip6 = NM_SETTING_IP6_CONFIG (nm_setting_ip6_config_new ()); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return priv->gateway_set ? &priv->gateway : NULL; + if (!config) { + g_object_set (s_ip6, + NM_SETTING_IP6_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE, + NULL); + return NM_SETTING (s_ip6); + } + + gateway = nm_ip6_config_get_gateway (config); + naddresses = nm_ip6_config_get_num_addresses (config); + nroutes = nm_ip6_config_get_num_routes (config); + nnameservers = nm_ip6_config_get_num_nameservers (config); + nsearches = nm_ip6_config_get_num_searches (config); + + /* Addresses */ + for (i = 0; i < naddresses; i++) { + const NMPlatformIP6Address *address = nm_ip6_config_get_address (config, i); + NMIP6Address *s_addr; + + /* Ignore link-local address. */ + if (IN6_IS_ADDR_LINKLOCAL (&address->address)) { + if (!method) + method = NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL; + continue; + } + + /* Detect dynamic address */ + if (address->lifetime != NM_PLATFORM_LIFETIME_PERMANENT) { + method = NM_SETTING_IP6_CONFIG_METHOD_AUTO; + continue; + } + + /* Static address found. */ + if (!method || strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0) + method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL; + + s_addr = nm_ip6_address_new (); + + nm_ip6_address_set_address (s_addr, &address->address); + nm_ip6_address_set_prefix (s_addr, address->plen); + if (gateway) + nm_ip6_address_set_gateway (s_addr, gateway); + + nm_setting_ip6_config_add_address (s_ip6, s_addr); + nm_ip6_address_unref (s_addr); + } + + /* Use 'ignore' if the method wasn't previously set */ + if (!method) + method = NM_SETTING_IP6_CONFIG_METHOD_IGNORE; + g_object_set (s_ip6, NM_SETTING_IP6_CONFIG_METHOD, method, NULL); + + /* Routes */ + for (i = 0; i < nroutes; i++) { + const NMPlatformIP6Route *route = nm_ip6_config_get_route (config, i); + NMIP6Route *s_route; + + /* Ignore link-local route. */ + if (IN6_IS_ADDR_LINKLOCAL (&route->network)) + continue; + + /* Ignore default route. */ + if (!route->plen) + continue; + + /* Ignore routes provided by external sources */ + if (route->source != NM_PLATFORM_SOURCE_USER) + continue; + + s_route = nm_ip6_route_new (); + nm_ip6_route_set_dest (s_route, &route->network); + nm_ip6_route_set_prefix (s_route, route->plen); + if (!IN6_IS_ADDR_UNSPECIFIED (&route->network)) + nm_ip6_route_set_next_hop (s_route, &route->gateway); + nm_ip6_route_set_metric (s_route, route->metric); + + nm_setting_ip6_config_add_route (s_ip6, s_route); + nm_ip6_route_unref (s_route); + } + + /* DNS */ + for (i = 0; i < nnameservers; i++) { + const struct in6_addr *nameserver = nm_ip6_config_get_nameserver (config, i); + + nm_setting_ip6_config_add_dns (s_ip6, nameserver); + } + for (i = 0; i < nsearches; i++) { + const char *search = nm_ip6_config_get_search (config, i); + + nm_setting_ip6_config_add_dns_search (s_ip6, search); + } + + return NM_SETTING (s_ip6); } +/******************************************************************/ + void -nm_ip6_config_take_route (NMIP6Config *config, NMIP6Route *route) +nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src) { - NMIP6ConfigPrivate *priv; + guint32 i; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); - g_return_if_fail (route != NULL); + g_return_if_fail (src != NULL); + g_return_if_fail (dst != NULL); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - priv->routes = g_slist_append (priv->routes, route); + g_object_freeze_notify (G_OBJECT (dst)); + + /* addresses */ + for (i = 0; i < nm_ip6_config_get_num_addresses (src); i++) + nm_ip6_config_add_address (dst, nm_ip6_config_get_address (src, i)); + + /* nameservers */ + for (i = 0; i < nm_ip6_config_get_num_nameservers (src); i++) + nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i)); + + /* default gateway */ + if (!nm_ip6_config_get_gateway (dst)) + nm_ip6_config_set_gateway (dst, nm_ip6_config_get_gateway (src)); + + /* routes */ + for (i = 0; i < nm_ip6_config_get_num_routes (src); i++) + nm_ip6_config_add_route (dst, nm_ip6_config_get_route (src, i)); + + /* domains */ + for (i = 0; i < nm_ip6_config_get_num_domains (src); i++) + nm_ip6_config_add_domain (dst, nm_ip6_config_get_domain (src, i)); + + /* dns searches */ + for (i = 0; i < nm_ip6_config_get_num_searches (src); i++) + nm_ip6_config_add_search (dst, nm_ip6_config_get_search (src, i)); + + if (!nm_ip6_config_get_mss (dst)) + nm_ip6_config_set_mss (dst, nm_ip6_config_get_mss (src)); + + g_object_thaw_notify (G_OBJECT (dst)); } -void -nm_ip6_config_add_route (NMIP6Config *config, NMIP6Route *route) +gboolean +nm_ip6_config_destination_is_direct (const NMIP6Config *config, const struct in6_addr *network, int plen) { - NMIP6ConfigPrivate *priv; - GSList *iter; + int num = nm_ip6_config_get_num_addresses (config); + int i; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); - g_return_if_fail (route != NULL); + for (i = 0; i < num; i++) { + const NMPlatformIP6Address *item = nm_ip6_config_get_address (config, i); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - for (iter = priv->routes; iter; iter = g_slist_next (iter)) { - if (nm_ip6_route_compare ((NMIP6Route *) iter->data, route)) - return; + if (item->plen <= plen && same_prefix (&item->address, network, item->plen) && + !(item->flags & IFA_F_NOPREFIXROUTE)) + return TRUE; } - priv->routes = g_slist_append (priv->routes, nm_ip6_route_dup (route)); + return FALSE; } +/** + * nm_ip6_config_subtract: + * @dst: config from which to remove everything in @src + * @src: config to remove from @dst + * + * Removes everything in @src from @dst. + */ void -nm_ip6_config_replace_route (NMIP6Config *config, - guint i, - NMIP6Route *new_route) +nm_ip6_config_subtract (NMIP6Config *dst, const NMIP6Config *src) { - NMIP6ConfigPrivate *priv; - GSList *old; + guint32 i, j; + const struct in6_addr *dst_tmp, *src_tmp; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + g_return_if_fail (src != NULL); + g_return_if_fail (dst != NULL); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - old = g_slist_nth (priv->routes, i); - g_return_if_fail (old != NULL); - nm_ip6_route_unref ((NMIP6Route *) old->data); + g_object_freeze_notify (G_OBJECT (dst)); + + /* addresses */ + for (i = 0; i < nm_ip6_config_get_num_addresses (src); i++) { + const NMPlatformIP6Address *src_addr = nm_ip6_config_get_address (src, i); + + for (j = 0; j < nm_ip6_config_get_num_addresses (dst); j++) { + const NMPlatformIP6Address *dst_addr = nm_ip6_config_get_address (dst, j); + + if (IN6_ARE_ADDR_EQUAL (&src_addr->address, &dst_addr->address)) { + nm_ip6_config_del_address (dst, j); + break; + } + } + } + + /* nameservers */ + for (i = 0; i < nm_ip6_config_get_num_nameservers (src); i++) { + const struct in6_addr *src_ns = nm_ip6_config_get_nameserver (src, i); + + for (j = 0; j < nm_ip6_config_get_num_nameservers (dst); j++) { + const struct in6_addr *dst_ns = nm_ip6_config_get_nameserver (dst, j); + + if (IN6_ARE_ADDR_EQUAL (src_ns, dst_ns)) { + nm_ip6_config_del_nameserver (dst, j); + break; + } + } + } + + /* default gateway */ + src_tmp = nm_ip6_config_get_gateway (src); + dst_tmp = nm_ip6_config_get_gateway (dst); + if (src_tmp && dst_tmp && IN6_ARE_ADDR_EQUAL (src_tmp, dst_tmp)) + nm_ip6_config_set_gateway (dst, NULL); + + /* routes */ + for (i = 0; i < nm_ip6_config_get_num_routes (src); i++) { + const NMPlatformIP6Route *src_route = nm_ip6_config_get_route (src, i); + + for (j = 0; j < nm_ip6_config_get_num_routes (dst); j++) { + const NMPlatformIP6Route *dst_route = nm_ip6_config_get_route (dst, j); + + if (routes_are_duplicate (src_route, dst_route, FALSE)) { + nm_ip6_config_del_route (dst, j); + break; + } + } + } + + /* domains */ + for (i = 0; i < nm_ip6_config_get_num_domains (src); i++) { + const char *src_domain = nm_ip6_config_get_domain (src, i); + + for (j = 0; j < nm_ip6_config_get_num_domains (dst); j++) { + const char *dst_domain = nm_ip6_config_get_domain (dst, j); - old->data = nm_ip6_route_dup (new_route); + if (g_strcmp0 (src_domain, dst_domain) == 0) { + nm_ip6_config_del_domain (dst, j); + break; + } + } + } + + /* dns searches */ + for (i = 0; i < nm_ip6_config_get_num_searches (src); i++) { + const char *src_search = nm_ip6_config_get_search (src, i); + + for (j = 0; j < nm_ip6_config_get_num_searches (dst); j++) { + const char *dst_search = nm_ip6_config_get_search (dst, j); + + if (g_strcmp0 (src_search, dst_search) == 0) { + nm_ip6_config_del_search (dst, j); + break; + } + } + } + + if (nm_ip6_config_get_mss (src) == nm_ip6_config_get_mss (dst)) + nm_ip6_config_set_mss (dst, 0); + + g_object_thaw_notify (G_OBJECT (dst)); } -NMIP6Route * -nm_ip6_config_get_route (NMIP6Config *config, guint i) +/** + * nm_ip6_config_replace: + * @dst: config which will be replaced with everything in @src + * @src: config to copy over to @dst + * @relevant_changes: return whether there are changes to the + * destination object that are relevant. This is equal to + * nm_ip6_config_equal() showing any difference. + * + * Replaces everything in @dst with @src so that the two configurations + * contain the same content -- with the exception of the dbus path. + * + * Returns: whether the @dst instance changed in any way (including minor changes, + * that are not signaled by the output parameter @relevant_changes). + */ +gboolean +nm_ip6_config_replace (NMIP6Config *dst, const NMIP6Config *src, gboolean *relevant_changes) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); +#ifndef G_DISABLE_ASSERT + gboolean config_equal; +#endif + gboolean has_minor_changes = FALSE, has_relevant_changes = FALSE, are_equal; + guint i, num; + NMIP6ConfigPrivate *dst_priv, *src_priv; + const NMPlatformIP6Address *dst_addr, *src_addr; + const NMPlatformIP6Route *dst_route, *src_route; + + g_return_val_if_fail (src != NULL, FALSE); + g_return_val_if_fail (dst != NULL, FALSE); + g_return_val_if_fail (src != dst, FALSE); + +#ifndef G_DISABLE_ASSERT + config_equal = nm_ip6_config_equal (dst, src); +#endif + + dst_priv = NM_IP6_CONFIG_GET_PRIVATE (dst); + src_priv = NM_IP6_CONFIG_GET_PRIVATE (src); + + g_object_freeze_notify (G_OBJECT (dst)); + + /* never_default */ + if (src_priv->never_default != dst_priv->never_default) { + dst_priv->never_default = src_priv->never_default; + has_minor_changes = TRUE; + } + + /* default gateway */ + if (!IN6_ARE_ADDR_EQUAL (&src_priv->gateway, &dst_priv->gateway)) { + nm_ip6_config_set_gateway (dst, &src_priv->gateway); + has_relevant_changes = TRUE; + } + + /* addresses */ + num = nm_ip6_config_get_num_addresses (src); + are_equal = num == nm_ip6_config_get_num_addresses (dst); + if (are_equal) { + for (i = 0; i < num; i++ ) { + if (nm_platform_ip6_address_cmp (src_addr = nm_ip6_config_get_address (src, i), + dst_addr = nm_ip6_config_get_address (dst, i))) { + are_equal = FALSE; + if (!addresses_are_duplicate (src_addr, dst_addr, TRUE)) { + has_relevant_changes = TRUE; + break; + } + } + } + } else + has_relevant_changes = TRUE; + if (!are_equal) { + nm_ip6_config_reset_addresses (dst); + for (i = 0; i < num; i++) + nm_ip6_config_add_address (dst, nm_ip6_config_get_address (src, i)); + has_minor_changes = TRUE; + } + + /* routes */ + num = nm_ip6_config_get_num_routes (src); + are_equal = num == nm_ip6_config_get_num_routes (dst); + if (are_equal) { + for (i = 0; i < num; i++ ) { + if (nm_platform_ip6_route_cmp (src_route = nm_ip6_config_get_route (src, i), + dst_route = nm_ip6_config_get_route (dst, i))) { + are_equal = FALSE; + if (!routes_are_duplicate (src_route, dst_route, TRUE)) { + has_relevant_changes = TRUE; + break; + } + } + } + } else + has_relevant_changes = TRUE; + if (!are_equal) { + nm_ip6_config_reset_routes (dst); + for (i = 0; i < num; i++) + nm_ip6_config_add_route (dst, nm_ip6_config_get_route (src, i)); + has_minor_changes = TRUE; + } - return (NMIP6Route *) g_slist_nth_data (NM_IP6_CONFIG_GET_PRIVATE (config)->routes, i); + /* nameservers */ + num = nm_ip6_config_get_num_nameservers (src); + are_equal = num == nm_ip6_config_get_num_nameservers (dst); + if (are_equal) { + for (i = 0; i < num; i++ ) { + if (!IN6_ARE_ADDR_EQUAL (nm_ip6_config_get_nameserver (src, i), + nm_ip6_config_get_nameserver (dst, i))) { + are_equal = FALSE; + break; + } + } + } + if (!are_equal) { + nm_ip6_config_reset_nameservers (dst); + for (i = 0; i < num; i++) + nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i)); + has_relevant_changes = TRUE; + } + + /* domains */ + num = nm_ip6_config_get_num_domains (src); + are_equal = num == nm_ip6_config_get_num_domains (dst); + if (are_equal) { + for (i = 0; i < num; i++ ) { + if (g_strcmp0 (nm_ip6_config_get_domain (src, i), + nm_ip6_config_get_domain (dst, i))) { + are_equal = FALSE; + break; + } + } + } + if (!are_equal) { + nm_ip6_config_reset_domains (dst); + for (i = 0; i < num; i++) + nm_ip6_config_add_domain (dst, nm_ip6_config_get_domain (src, i)); + has_relevant_changes = TRUE; + } + + /* dns searches */ + num = nm_ip6_config_get_num_searches (src); + are_equal = num == nm_ip6_config_get_num_searches (dst); + if (are_equal) { + for (i = 0; i < num; i++ ) { + if (g_strcmp0 (nm_ip6_config_get_search (src, i), + nm_ip6_config_get_search (dst, i))) { + are_equal = FALSE; + break; + } + } + } + if (!are_equal) { + nm_ip6_config_reset_searches (dst); + for (i = 0; i < num; i++) + nm_ip6_config_add_search (dst, nm_ip6_config_get_search (src, i)); + has_relevant_changes = TRUE; + } + + /* mss */ + if (src_priv->mss != dst_priv->mss) { + nm_ip6_config_set_mss (dst, src_priv->mss); + has_minor_changes = TRUE; + } + + /* config_equal does not compare *all* the fields, therefore, we might have has_minor_changes + * regardless of config_equal. But config_equal must correspond to has_relevant_changes. */ + g_assert (config_equal == !has_relevant_changes); + + g_object_thaw_notify (G_OBJECT (dst)); + + if (relevant_changes) + *relevant_changes = has_relevant_changes; + + return has_relevant_changes || has_minor_changes; } -guint32 nm_ip6_config_get_num_routes (NMIP6Config *config) +void +nm_ip6_config_dump (const NMIP6Config *config, const char *detail) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + const struct in6_addr *tmp; + guint32 i; + const char *str; + + g_return_if_fail (config != NULL); + + g_message ("--------- NMIP6Config %p (%s)", config, detail); + + str = nm_ip6_config_get_dbus_path (config); + if (str) + g_message (" path: %s", str); - return g_slist_length (NM_IP6_CONFIG_GET_PRIVATE (config)->routes); + /* addresses */ + for (i = 0; i < nm_ip6_config_get_num_addresses (config); i++) + g_message (" a: %s", nm_platform_ip6_address_to_string (nm_ip6_config_get_address (config, i))); + + /* default gateway */ + tmp = nm_ip6_config_get_gateway (config); + if (tmp) + g_message (" gw: %s", nm_utils_inet6_ntop (tmp, NULL)); + + /* nameservers */ + for (i = 0; i < nm_ip6_config_get_num_nameservers (config); i++) { + tmp = nm_ip6_config_get_nameserver (config, i); + g_message (" ns: %s", nm_utils_inet6_ntop (tmp, NULL)); + } + + /* routes */ + for (i = 0; i < nm_ip6_config_get_num_routes (config); i++) + g_message (" rt: %s", nm_platform_ip6_route_to_string (nm_ip6_config_get_route (config, i))); + + /* domains */ + for (i = 0; i < nm_ip6_config_get_num_domains (config); i++) + g_message (" domain: %s", nm_ip6_config_get_domain (config, i)); + + /* dns searches */ + for (i = 0; i < nm_ip6_config_get_num_searches (config); i++) + g_message (" search: %s", nm_ip6_config_get_search (config, i)); + + g_message (" mss: %u", nm_ip6_config_get_mss (config)); + g_message (" n-dflt: %d", nm_ip6_config_get_never_default (config)); } -void nm_ip6_config_reset_routes (NMIP6Config *config) -{ - NMIP6ConfigPrivate *priv; +/******************************************************************/ - g_return_if_fail (NM_IS_IP6_CONFIG (config)); +void +nm_ip6_config_set_never_default (NMIP6Config *config, gboolean never_default) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - g_slist_foreach (priv->routes, (GFunc) g_free, NULL); - priv->routes = NULL; + priv->never_default = !!never_default; } -void nm_ip6_config_add_domain (NMIP6Config *config, const char *domain) +gboolean +nm_ip6_config_get_never_default (const NMIP6Config *config) { - NMIP6ConfigPrivate *priv; - int i; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - g_return_if_fail (NM_IS_IP6_CONFIG (config)); - g_return_if_fail (domain != NULL); - g_return_if_fail (strlen (domain) > 0); + return priv->never_default; +} - priv = NM_IP6_CONFIG_GET_PRIVATE (config); +void +nm_ip6_config_set_gateway (NMIP6Config *config, const struct in6_addr *gateway) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - for (i = 0; i < priv->domains->len; i++) { - if (!strcmp (g_ptr_array_index (priv->domains, i), domain)) + if (gateway) { + if (IN6_ARE_ADDR_EQUAL (&priv->gateway, gateway)) return; + priv->gateway = *gateway; + } else { + if (IN6_IS_ADDR_UNSPECIFIED (&priv->gateway)) + return; + memset (&priv->gateway, 0, sizeof (priv->gateway)); } - - g_ptr_array_add (priv->domains, g_strdup (domain)); + _NOTIFY (config, PROP_GATEWAY); } -const char *nm_ip6_config_get_domain (NMIP6Config *config, guint i) +const struct in6_addr * +nm_ip6_config_get_gateway (const NMIP6Config *config) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return (const char *) g_ptr_array_index (NM_IP6_CONFIG_GET_PRIVATE (config)->domains, i); + return IN6_IS_ADDR_UNSPECIFIED (&priv->gateway) ? NULL : &priv->gateway; } -guint32 nm_ip6_config_get_num_domains (NMIP6Config *config) +/******************************************************************/ + +void +nm_ip6_config_reset_addresses (NMIP6Config *config) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return NM_IP6_CONFIG_GET_PRIVATE (config)->domains->len; + if (priv->addresses->len != 0) { + g_array_set_size (priv->addresses, 0); + _NOTIFY (config, PROP_ADDRESSES); + } } -void nm_ip6_config_reset_domains (NMIP6Config *config) +/** + * nm_ip6_config_add_address: + * @config: the #NMIP6Config + * @new: the new address to add to @config + * + * Adds the new address to @config. If an address with the same basic properties + * (address, prefix) already exists in @config, it is overwritten with the + * lifetime and preferred of @new. The source is also overwritten by the source + * from @new if that source is higher priority. + */ +void +nm_ip6_config_add_address (NMIP6Config *config, const NMPlatformIP6Address *new) { - NMIP6ConfigPrivate *priv; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + NMPlatformIP6Address item_old; int i; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + g_return_if_fail (new != NULL); + + for (i = 0; i < priv->addresses->len; i++ ) { + NMPlatformIP6Address *item = &g_array_index (priv->addresses, NMPlatformIP6Address, i); + + if (IN6_ARE_ADDR_EQUAL (&item->address, &new->address)) { + if (nm_platform_ip6_address_cmp (item, new) == 0) + return; + + /* remember the old values. */ + item_old = *item; + /* Copy over old item to get new lifetime, timestamp, preferred */ + *item = *new; + + /* But restore highest priority source */ + item->source = MAX (item_old.source, new->source); + + /* for addresses that we read from the kernel, we keep the timestamps as defined + * by the previous source (item_old). The reason is, that the other source configured the lifetimes + * with "what should be" and the kernel values are "what turned out after configuring it". + * + * For other sources, the longer lifetime wins. */ + if ( (new->source == NM_PLATFORM_SOURCE_KERNEL && new->source != item_old.source) + || nm_platform_ip_address_cmp_expiry ((const NMPlatformIPAddress *) &item_old, (const NMPlatformIPAddress *) new) > 0) { + item->timestamp = item_old.timestamp; + item->lifetime = item_old.lifetime; + item->preferred = item_old.preferred; + } + if (nm_platform_ip6_address_cmp (&item_old, item) == 0) + return; + goto NOTIFY; + } + } - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - for (i = 0; i < priv->domains->len; i++) - g_free (g_ptr_array_index (priv->domains, i)); - g_ptr_array_free (priv->domains, TRUE); - priv->domains = g_ptr_array_sized_new (3); + g_array_append_val (priv->addresses, *new); +NOTIFY: + _NOTIFY (config, PROP_ADDRESSES); } -void nm_ip6_config_add_search (NMIP6Config *config, const char *search) +void +nm_ip6_config_del_address (NMIP6Config *config, guint i) { - NMIP6ConfigPrivate *priv; - int i; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - g_return_if_fail (config != NULL); - g_return_if_fail (search != NULL); - g_return_if_fail (strlen (search) > 0); + g_return_if_fail (i < priv->addresses->len); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); + g_array_remove_index (priv->addresses, i); + _NOTIFY (config, PROP_ADDRESSES); +} - for (i = 0; i < priv->searches->len; i++) { - if (!strcmp (g_ptr_array_index (priv->searches, i), search)) - return; - } +guint +nm_ip6_config_get_num_addresses (const NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + + return priv->addresses->len; +} + +const NMPlatformIP6Address * +nm_ip6_config_get_address (const NMIP6Config *config, guint i) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - g_ptr_array_add (priv->searches, g_strdup (search)); + return &g_array_index (priv->addresses, NMPlatformIP6Address, i); } -const char *nm_ip6_config_get_search (NMIP6Config *config, guint i) +gboolean +nm_ip6_config_address_exists (const NMIP6Config *config, + const NMPlatformIP6Address *needle) { - g_return_val_if_fail (config != NULL, NULL); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + guint i; + + for (i = 0; i < priv->addresses->len; i++) { + const NMPlatformIP6Address *haystack = &g_array_index (priv->addresses, NMPlatformIP6Address, i); - return (const char *) g_ptr_array_index (NM_IP6_CONFIG_GET_PRIVATE (config)->searches, i); + if ( IN6_ARE_ADDR_EQUAL (&needle->address, &haystack->address) + && needle->plen == haystack->plen) + return TRUE; + } + return FALSE; } -guint32 nm_ip6_config_get_num_searches (NMIP6Config *config) +/******************************************************************/ + +void +nm_ip6_config_reset_routes (NMIP6Config *config) { - g_return_val_if_fail (config != NULL, 0); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return NM_IP6_CONFIG_GET_PRIVATE (config)->searches->len; + if (priv->routes->len != 0) { + g_array_set_size (priv->routes, 0); + _NOTIFY (config, PROP_ROUTES); + } } -void nm_ip6_config_reset_searches (NMIP6Config *config) +/** + * nm_ip6_config_add_route: + * @config: the #NMIP6Config + * @new: the new route to add to @config + * + * Adds the new route to @config. If a route with the same basic properties + * (network, prefix) already exists in @config, it is overwritten including the + * gateway and metric of @new. The source is also overwritten by the source + * from @new if that source is higher priority. + */ +void +nm_ip6_config_add_route (NMIP6Config *config, const NMPlatformIP6Route *new) { - NMIP6ConfigPrivate *priv; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + NMPlatformSource old_source; int i; - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + g_return_if_fail (new != NULL); - priv = NM_IP6_CONFIG_GET_PRIVATE (config); - for (i = 0; i < priv->searches->len; i++) - g_free (g_ptr_array_index (priv->searches, i)); - g_ptr_array_free (priv->searches, TRUE); - priv->searches = g_ptr_array_sized_new (3); + for (i = 0; i < priv->routes->len; i++ ) { + NMPlatformIP6Route *item = &g_array_index (priv->routes, NMPlatformIP6Route, i); + + if (routes_are_duplicate (item, new, FALSE)) { + if (nm_platform_ip6_route_cmp (item, new) == 0) + return; + old_source = item->source; + *item = *new; + /* Restore highest priority source */ + item->source = MAX (old_source, new->source); + goto NOTIFY; + } + } + + g_array_append_val (priv->routes, *new); +NOTIFY: + _NOTIFY (config, PROP_ROUTES); } -guint32 nm_ip6_config_get_mss (NMIP6Config *config) +void +nm_ip6_config_del_route (NMIP6Config *config, guint i) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return NM_IP6_CONFIG_GET_PRIVATE (config)->mss; + g_return_if_fail (i < priv->routes->len); + + g_array_remove_index (priv->routes, i); + _NOTIFY (config, PROP_ROUTES); } -void nm_ip6_config_set_mss (NMIP6Config *config, guint32 mss) +guint +nm_ip6_config_get_num_routes (const NMIP6Config *config) { - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - NM_IP6_CONFIG_GET_PRIVATE (config)->mss = mss; + return priv->routes->len; } -gboolean -nm_ip6_config_get_never_default (NMIP6Config *config) +const NMPlatformIP6Route * +nm_ip6_config_get_route (const NMIP6Config *config, guint i) { - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), FALSE); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return NM_IP6_CONFIG_GET_PRIVATE (config)->never_default; + return &g_array_index (priv->routes, NMPlatformIP6Route, i); } +/******************************************************************/ + void -nm_ip6_config_set_never_default (NMIP6Config *config, gboolean never_default) +nm_ip6_config_reset_nameservers (NMIP6Config *config) { - g_return_if_fail (NM_IS_IP6_CONFIG (config)); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - NM_IP6_CONFIG_GET_PRIVATE (config)->never_default = never_default; + if (priv->nameservers->len != 0) { + g_array_set_size (priv->nameservers, 0); + _NOTIFY (config, PROP_NAMESERVERS); + } } -/* libnl convenience/conversion functions */ - -static int ip6_addr_to_rtnl_local (const struct in6_addr *ip6_address, - struct rtnl_addr *addr, - guint prefix) +void +nm_ip6_config_add_nameserver (NMIP6Config *config, const struct in6_addr *new) { - struct nl_addr * local = NULL; - int err = 0; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + int i; - g_return_val_if_fail (addr != NULL, -1); + g_return_if_fail (new != NULL); - local = nm_utils_ip6_addr_to_nl_addr (ip6_address, prefix); - err = rtnl_addr_set_local (addr, local); - nl_addr_put (local); + for (i = 0; i < priv->nameservers->len; i++) + if (IN6_ARE_ADDR_EQUAL (new, &g_array_index (priv->nameservers, struct in6_addr, i))) + return; - return err; + g_array_append_val (priv->nameservers, *new); + _NOTIFY (config, PROP_NAMESERVERS); } -static int ip6_addr_to_rtnl_peer (const struct in6_addr *ip6_address, struct rtnl_addr *addr) +void +nm_ip6_config_del_nameserver (NMIP6Config *config, guint i) { - struct nl_addr * peer = NULL; - int err = 0; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + + g_return_if_fail (i < priv->nameservers->len); - g_return_val_if_fail (addr != NULL, -1); + g_array_remove_index (priv->nameservers, i); + _NOTIFY (config, PROP_NAMESERVERS); +} - peer = nm_utils_ip6_addr_to_nl_addr (ip6_address, 0); - err = rtnl_addr_set_peer (addr, peer); - nl_addr_put (peer); +guint32 +nm_ip6_config_get_num_nameservers (const NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return err; + return priv->nameservers->len; } -struct rtnl_addr * -nm_ip6_config_to_rtnl_addr (NMIP6Config *config, guint32 i, guint32 flags) +const struct in6_addr * +nm_ip6_config_get_nameserver (const NMIP6Config *config, guint i) { NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - NMIP6Address *config_addr; - struct rtnl_addr *addr; - gboolean success = TRUE; - g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); + return &g_array_index (priv->nameservers, struct in6_addr, i); +} - config_addr = nm_ip6_config_get_address (config, i); - g_return_val_if_fail (config_addr != NULL, NULL); +/******************************************************************/ - if (!(addr = rtnl_addr_alloc())) - return NULL; +void +nm_ip6_config_reset_domains (NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if (flags & NM_RTNL_ADDR_ADDR) { - success = (ip6_addr_to_rtnl_local (nm_ip6_address_get_address (config_addr), - addr, - nm_ip6_address_get_prefix (config_addr)) >= 0); + if (priv->domains->len != 0) { + g_ptr_array_set_size (priv->domains, 0); + _NOTIFY (config, PROP_DOMAINS); } +} - if (flags & NM_RTNL_ADDR_PTP_ADDR) - success = (ip6_addr_to_rtnl_peer (&priv->ptp_address, addr) >= 0); +void +nm_ip6_config_add_domain (NMIP6Config *config, const char *domain) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + int i; - if (flags & NM_RTNL_ADDR_PREFIX) - rtnl_addr_set_prefixlen (addr, nm_ip6_address_get_prefix (config_addr)); + g_return_if_fail (domain != NULL); + g_return_if_fail (domain[0] != '\0'); - if (!success) { - rtnl_addr_put (addr); - addr = NULL; - } + for (i = 0; i < priv->domains->len; i++) + if (!g_strcmp0 (g_ptr_array_index (priv->domains, i), domain)) + return; - return addr; + g_ptr_array_add (priv->domains, g_strdup (domain)); + _NOTIFY (config, PROP_DOMAINS); } -static gboolean -addr_slist_compare (GSList *a, GSList *b) +void +nm_ip6_config_del_domain (NMIP6Config *config, guint i) { - GSList *iter_a, *iter_b; - gboolean found = FALSE; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - for (iter_a = a; iter_a; iter_a = g_slist_next (iter_a)) { - NMIP6Address *addr_a = (NMIP6Address *) iter_a->data; + g_return_if_fail (i < priv->domains->len); - for (iter_b = b, found = FALSE; iter_b; iter_b = g_slist_next (iter_b)) { - NMIP6Address *addr_b = (NMIP6Address *) iter_b->data; + g_ptr_array_remove_index (priv->domains, i); + _NOTIFY (config, PROP_DOMAINS); +} - if (nm_ip6_address_compare (addr_a, addr_b)) { - found = TRUE; - break; - } - } +guint32 +nm_ip6_config_get_num_domains (const NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if (!found) - return FALSE; - } - return TRUE; + return priv->domains->len; } -static gboolean -route_slist_compare (GSList *a, GSList *b) +const char * +nm_ip6_config_get_domain (const NMIP6Config *config, guint i) { - GSList *iter_a, *iter_b; - gboolean found = FALSE; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - for (iter_a = a; iter_a; iter_a = g_slist_next (iter_a)) { - NMIP6Route *route_a = (NMIP6Route *) iter_a->data; + return g_ptr_array_index (priv->domains, i); +} - for (iter_b = b, found = FALSE; iter_b; iter_b = g_slist_next (iter_b)) { - NMIP6Route *route_b = (NMIP6Route *) iter_b->data; +/******************************************************************/ - if (nm_ip6_route_compare (route_a, route_b)) { - found = TRUE; - break; - } - } +void +nm_ip6_config_reset_searches (NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if (!found) - return FALSE; + if (priv->searches->len != 0) { + g_ptr_array_set_size (priv->searches, 0); + _NOTIFY (config, PROP_SEARCHES); } - return TRUE; } -static gboolean -string_array_compare (GPtrArray *a, GPtrArray *b) +void +nm_ip6_config_add_search (NMIP6Config *config, const char *new) { - int i, j; - gboolean found = FALSE; + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + int i; - for (i = 0; i < a->len; i++) { - for (j = 0, found = FALSE; j < b->len; j++) { - const char *item_a = g_ptr_array_index (a, i); - const char *item_b = g_ptr_array_index (b, j); + g_return_if_fail (new != NULL); + g_return_if_fail (new[0] != '\0'); - if ((!item_a && !item_b) || (item_a && item_b && !strcmp (item_a, item_b))) { - found = TRUE; - break; - } - } + for (i = 0; i < priv->searches->len; i++) + if (!g_strcmp0 (g_ptr_array_index (priv->searches, i), new)) + return; - if (!found) - return FALSE; - } - return TRUE; + g_ptr_array_add (priv->searches, g_strdup (new)); + _NOTIFY (config, PROP_SEARCHES); } -static gboolean -addr_array_compare (GArray *a, GArray *b) -{ - struct in6_addr *addrs_a, *addrs_b; - int i, j; - gboolean found = FALSE; - - addrs_a = (struct in6_addr *)a->data; - addrs_b = (struct in6_addr *)b->data; - for (i = 0; i < a->len; i++) { - for (j = 0, found = FALSE; j < b->len; j++) { - if (IN6_ARE_ADDR_EQUAL (&addrs_a[i], &addrs_b[j])) { - found = TRUE; - break; - } - } +void +nm_ip6_config_del_search (NMIP6Config *config, guint i) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if (!found) - return FALSE; - } - return TRUE; + g_return_if_fail (i < priv->searches->len); + + g_ptr_array_remove_index (priv->searches, i); + _NOTIFY (config, PROP_SEARCHES); } -NMIP6ConfigCompareFlags -nm_ip6_config_diff (NMIP6Config *a, NMIP6Config *b) +guint32 +nm_ip6_config_get_num_searches (const NMIP6Config *config) { - NMIP6ConfigPrivate *a_priv; - NMIP6ConfigPrivate *b_priv; - NMIP6ConfigCompareFlags flags = NM_IP6_COMPARE_FLAG_NONE; - - if ((a && !b) || (b && !a)) - return NM_IP6_COMPARE_FLAG_ALL; - if (!a && !b) - return NM_IP6_COMPARE_FLAG_NONE; - - a_priv = NM_IP6_CONFIG_GET_PRIVATE (a); - b_priv = NM_IP6_CONFIG_GET_PRIVATE (b); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if ( !addr_slist_compare (a_priv->addresses, b_priv->addresses) - || !addr_slist_compare (b_priv->addresses, a_priv->addresses)) - flags |= NM_IP6_COMPARE_FLAG_ADDRESSES; + return priv->searches->len; +} - if (memcmp (&a_priv->ptp_address, &b_priv->ptp_address, sizeof (struct in6_addr)) != 0) - flags |= NM_IP6_COMPARE_FLAG_PTP_ADDRESS; +const char * +nm_ip6_config_get_search (const NMIP6Config *config, guint i) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if ( (a_priv->nameservers->len != b_priv->nameservers->len) - || !addr_array_compare (a_priv->nameservers, b_priv->nameservers) - || !addr_array_compare (b_priv->nameservers, a_priv->nameservers)) - flags |= NM_IP6_COMPARE_FLAG_NAMESERVERS; + return g_ptr_array_index (priv->searches, i); +} - if ( !route_slist_compare (a_priv->routes, b_priv->routes) - || !route_slist_compare (b_priv->routes, a_priv->routes)) - flags |= NM_IP6_COMPARE_FLAG_ROUTES; +/******************************************************************/ - if ( (a_priv->domains->len != b_priv->domains->len) - || !string_array_compare (a_priv->domains, b_priv->domains) - || !string_array_compare (b_priv->domains, a_priv->domains)) - flags |= NM_IP6_COMPARE_FLAG_DOMAINS; +void +nm_ip6_config_set_mss (NMIP6Config *config, guint32 mss) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - if ( (a_priv->searches->len != b_priv->searches->len) - || !string_array_compare (a_priv->searches, b_priv->searches) - || !string_array_compare (b_priv->searches, a_priv->searches)) - flags |= NM_IP6_COMPARE_FLAG_SEARCHES; + priv->mss = mss; +} - if (a_priv->mss != b_priv->mss) - flags |= NM_IP6_COMPARE_FLAG_MSS; +guint32 +nm_ip6_config_get_mss (const NMIP6Config *config) +{ + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); - return flags; + return priv->mss; } +/******************************************************************/ + static inline void hash_u32 (GChecksum *sum, guint32 n) { @@ -686,40 +1393,39 @@ hash_u32 (GChecksum *sum, guint32 n) static inline void hash_in6addr (GChecksum *sum, const struct in6_addr *a) { - g_checksum_update (sum, (const guint8 *) a, sizeof (*a)); + if (a) + g_checksum_update (sum, (const guint8 *) a, sizeof (*a)); + else + g_checksum_update (sum, (const guint8 *) &in6addr_any, sizeof (in6addr_any)); } void -nm_ip6_config_hash (NMIP6Config *config, GChecksum *sum, gboolean dns_only) +nm_ip6_config_hash (const NMIP6Config *config, GChecksum *sum, gboolean dns_only) { guint32 i; - const struct in6_addr *in6a; const char *s; - g_return_if_fail (config != NULL); - g_return_if_fail (sum != NULL); + g_return_if_fail (config); + g_return_if_fail (sum); if (dns_only == FALSE) { + hash_in6addr (sum, nm_ip6_config_get_gateway (config)); + for (i = 0; i < nm_ip6_config_get_num_addresses (config); i++) { - NMIP6Address *a = nm_ip6_config_get_address (config, i); + const NMPlatformIP6Address *address = nm_ip6_config_get_address (config, i); - hash_in6addr (sum, nm_ip6_address_get_address (a)); - hash_u32 (sum, nm_ip6_address_get_prefix (a)); - hash_in6addr (sum, nm_ip6_address_get_gateway (a)); + hash_in6addr (sum, &address->address); + hash_u32 (sum, address->plen); } for (i = 0; i < nm_ip6_config_get_num_routes (config); i++) { - NMIP6Route *r = nm_ip6_config_get_route (config, i); + const NMPlatformIP6Route *route = nm_ip6_config_get_route (config, i); - hash_in6addr (sum, nm_ip6_route_get_dest (r)); - hash_u32 (sum, nm_ip6_route_get_prefix (r)); - hash_in6addr (sum, nm_ip6_route_get_next_hop (r)); - hash_u32 (sum, nm_ip6_route_get_metric (r)); + hash_in6addr (sum, &route->network); + hash_u32 (sum, route->plen); + hash_in6addr (sum, &route->gateway); + hash_u32 (sum, route->metric); } - - in6a = nm_ip6_config_get_ptp_address (config); - if (in6a) - hash_in6addr (sum, in6a); } for (i = 0; i < nm_ip6_config_get_num_nameservers (config); i++) @@ -736,15 +1442,58 @@ nm_ip6_config_hash (NMIP6Config *config, GChecksum *sum, gboolean dns_only) } } +/** + * nm_ip6_config_equal: + * @a: first config to compare + * @b: second config to compare + * + * Compares two #NMIP6Configs for basic equality. This means that all + * attributes must exist in the same order in both configs (addresses, routes, + * domains, DNS servers, etc) but some attributes (address lifetimes, and address + * and route sources) are ignored. + * + * Returns: %TRUE if the configurations are basically equal to each other, + * %FALSE if not + */ +gboolean +nm_ip6_config_equal (const NMIP6Config *a, const NMIP6Config *b) +{ + GChecksum *a_checksum = g_checksum_new (G_CHECKSUM_SHA1); + GChecksum *b_checksum = g_checksum_new (G_CHECKSUM_SHA1); + gsize a_len = g_checksum_type_get_length (G_CHECKSUM_SHA1); + gsize b_len = g_checksum_type_get_length (G_CHECKSUM_SHA1); + guchar a_data[a_len], b_data[b_len]; + gboolean equal; + + if (a) + nm_ip6_config_hash (a, a_checksum, FALSE); + if (b) + nm_ip6_config_hash (b, b_checksum, FALSE); + + g_checksum_get_digest (a_checksum, a_data, &a_len); + g_checksum_get_digest (b_checksum, b_data, &b_len); + + g_assert (a_len == b_len); + equal = !memcmp (a_data, b_data, a_len); + + g_checksum_free (a_checksum); + g_checksum_free (b_checksum); + + return equal; +} + +/******************************************************************/ + static void nm_ip6_config_init (NMIP6Config *config) { NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); + priv->addresses = g_array_new (FALSE, TRUE, sizeof (NMPlatformIP6Address)); + priv->routes = g_array_new (FALSE, TRUE, sizeof (NMPlatformIP6Route)); priv->nameservers = g_array_new (FALSE, TRUE, sizeof (struct in6_addr)); - priv->domains = g_ptr_array_sized_new (3); - priv->searches = g_ptr_array_sized_new (3); - priv->gateway_set = FALSE; + priv->domains = g_ptr_array_new_with_free_func (g_free); + priv->searches = g_ptr_array_new_with_free_func (g_free); } static void @@ -752,11 +1501,11 @@ finalize (GObject *object) { NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (object); - nm_utils_slist_free (priv->addresses, (GDestroyNotify) nm_ip6_address_unref); - nm_utils_slist_free (priv->routes, (GDestroyNotify) nm_ip6_route_unref); - g_array_free (priv->nameservers, TRUE); - g_ptr_array_free (priv->domains, TRUE); - g_ptr_array_free (priv->searches, TRUE); + g_array_unref (priv->addresses); + g_array_unref (priv->routes); + g_array_unref (priv->nameservers); + g_ptr_array_unref (priv->domains); + g_ptr_array_unref (priv->searches); G_OBJECT_CLASS (nm_ip6_config_parent_class)->finalize (object); } @@ -786,11 +1535,100 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { + NMIP6Config *config = NM_IP6_CONFIG (object); NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (object); switch (prop_id) { + case PROP_GATEWAY: + if (!IN6_IS_ADDR_UNSPECIFIED (&priv->gateway)) + g_value_set_string (value, nm_utils_inet6_ntop (&priv->gateway, NULL)); + else + g_value_set_string (value, NULL); + break; case PROP_ADDRESSES: - nm_utils_ip6_addresses_to_gvalue (priv->addresses, value); + { + GPtrArray *addresses = g_ptr_array_new (); + const struct in6_addr *gateway = nm_ip6_config_get_gateway (config); + int naddr = nm_ip6_config_get_num_addresses (config); + int i; + + for (i = 0; i < naddr; i++) { + const NMPlatformIP6Address *address = nm_ip6_config_get_address (config, i); + + GValueArray *array = g_value_array_new (3); + GValue element = G_VALUE_INIT; + GByteArray *ba; + + /* IP address */ + g_value_init (&element, DBUS_TYPE_G_UCHAR_ARRAY); + ba = g_byte_array_new (); + g_byte_array_append (ba, (guint8 *) &address->address, 16); + g_value_take_boxed (&element, ba); + g_value_array_append (array, &element); + g_value_unset (&element); + + /* Prefix */ + g_value_init (&element, G_TYPE_UINT); + g_value_set_uint (&element, address->plen); + g_value_array_append (array, &element); + g_value_unset (&element); + + /* Gateway */ + g_value_init (&element, DBUS_TYPE_G_UCHAR_ARRAY); + ba = g_byte_array_new (); + g_byte_array_append (ba, (guint8 *) (gateway ? gateway : &in6addr_any), sizeof (*gateway)); + g_value_take_boxed (&element, ba); + g_value_array_append (array, &element); + g_value_unset (&element); + + g_ptr_array_add (addresses, array); + } + + g_value_take_boxed (value, addresses); + } + break; + case PROP_ROUTES: + { + GPtrArray *routes = g_ptr_array_new (); + int nroutes = nm_ip6_config_get_num_routes (config); + int i; + + for (i = 0; i < nroutes; i++) { + const NMPlatformIP6Route *route = nm_ip6_config_get_route (config, i); + + GValueArray *array = g_value_array_new (4); + GByteArray *ba; + GValue element = G_VALUE_INIT; + + g_value_init (&element, DBUS_TYPE_G_UCHAR_ARRAY); + ba = g_byte_array_new (); + g_byte_array_append (ba, (guint8 *) &route->network, sizeof (route->network)); + g_value_take_boxed (&element, ba); + g_value_array_append (array, &element); + g_value_unset (&element); + + g_value_init (&element, G_TYPE_UINT); + g_value_set_uint (&element, route->plen); + g_value_array_append (array, &element); + g_value_unset (&element); + + g_value_init (&element, DBUS_TYPE_G_UCHAR_ARRAY); + ba = g_byte_array_new (); + g_byte_array_append (ba, (guint8 *) &route->gateway, sizeof (route->gateway)); + g_value_take_boxed (&element, ba); + g_value_array_append (array, &element); + g_value_unset (&element); + + g_value_init (&element, G_TYPE_UINT); + g_value_set_uint (&element, route->metric); + g_value_array_append (array, &element); + g_value_unset (&element); + + g_ptr_array_add (routes, array); + } + + g_value_take_boxed (value, routes); + } break; case PROP_NAMESERVERS: nameservers_to_gvalue (priv->nameservers, value); @@ -798,8 +1636,8 @@ get_property (GObject *object, guint prop_id, case PROP_DOMAINS: g_value_set_boxed (value, priv->domains); break; - case PROP_ROUTES: - nm_utils_ip6_routes_to_gvalue (priv->routes, value); + case PROP_SEARCHES: + g_value_set_boxed (value, priv->searches); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -819,34 +1657,46 @@ nm_ip6_config_class_init (NMIP6ConfigClass *config_class) object_class->finalize = finalize; /* properties */ - g_object_class_install_property (object_class, PROP_ADDRESSES, - g_param_spec_boxed (NM_IP6_CONFIG_ADDRESSES, - "Addresses", - "IP6 addresses", - DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, - G_PARAM_READABLE)); - - g_object_class_install_property (object_class, PROP_NAMESERVERS, - g_param_spec_boxed (NM_IP6_CONFIG_NAMESERVERS, - "Nameservers", - "DNS list", - DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, - G_PARAM_READABLE)); - - g_object_class_install_property (object_class, PROP_DOMAINS, - g_param_spec_boxed (NM_IP6_CONFIG_DOMAINS, - "Domains", - "Domains", - DBUS_TYPE_G_ARRAY_OF_STRING, - G_PARAM_READABLE)); - - g_object_class_install_property (object_class, PROP_ROUTES, - g_param_spec_boxed (NM_IP6_CONFIG_ROUTES, - "Routes", - "Routes", - DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, - G_PARAM_READABLE)); - - dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (config_class), - &dbus_glib_nm_ip6_config_object_info); + obj_properties[PROP_GATEWAY] = + g_param_spec_string (NM_IP6_CONFIG_GATEWAY, + "Gateway", + "IP6 Gateway", + NULL, + G_PARAM_READABLE); + obj_properties[PROP_ADDRESSES] = + g_param_spec_boxed (NM_IP6_CONFIG_ADDRESSES, + "Addresses", + "IP6 addresses", + DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, + G_PARAM_READABLE); + obj_properties[PROP_ROUTES] = + g_param_spec_boxed (NM_IP6_CONFIG_ROUTES, + "Routes", + "Routes", + DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, + G_PARAM_READABLE); + obj_properties[PROP_NAMESERVERS] = + g_param_spec_boxed (NM_IP6_CONFIG_NAMESERVERS, + "Nameservers", + "DNS list", + DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, + G_PARAM_READABLE); + obj_properties[PROP_DOMAINS] = + g_param_spec_boxed (NM_IP6_CONFIG_DOMAINS, + "Domains", + "Domains", + DBUS_TYPE_G_ARRAY_OF_STRING, + G_PARAM_READABLE); + obj_properties[PROP_SEARCHES] = + g_param_spec_boxed (NM_IP6_CONFIG_SEARCHES, + "Searches", + "Searches", + DBUS_TYPE_G_ARRAY_OF_STRING, + G_PARAM_READABLE); + + g_object_class_install_properties (object_class, LAST_PROP, obj_properties); + + nm_dbus_manager_register_exported_type (nm_dbus_manager_get (), + G_TYPE_FROM_CLASS (config_class), + &dbus_glib_nm_ip6_config_object_info); } |