*
* Connection Manager
*
- * Copyright (C) 2007-2009 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2013 Intel Corporation. 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
#include <config.h>
#endif
+#include <errno.h>
+#include <stdio.h>
#include <net/if.h>
#include <net/if_arp.h>
+#include <linux/if_link.h>
+#include <string.h>
+#include <stdlib.h>
#ifndef IFF_LOWER_UP
#define IFF_LOWER_UP 0x10000
#endif
#include <gdbus.h>
+#include <connman/ipaddress.h>
#include "connman.h"
struct connman_ipconfig {
- gint refcount;
+ int refcount;
int index;
-
- struct connman_ipconfig *origin;
+ enum connman_ipconfig_type type;
const struct connman_ipconfig_ops *ops;
void *ops_data;
struct connman_ipaddress *address;
struct connman_ipaddress *system;
- char *eth;
- uint16_t mtu;
+ int ipv6_privacy_config;
+ char *last_dhcp_address;
+ char **last_dhcpv6_prefixes;
};
struct connman_ipdevice {
int index;
- char *ifname;
unsigned short type;
unsigned int flags;
+ char *address;
+ uint16_t mtu;
+ uint32_t rx_packets;
+ uint32_t tx_packets;
+ uint32_t rx_bytes;
+ uint32_t tx_bytes;
+ uint32_t rx_errors;
+ uint32_t tx_errors;
+ uint32_t rx_dropped;
+ uint32_t tx_dropped;
GSList *address_list;
- char *gateway;
+ char *ipv4_gateway;
+ char *ipv6_gateway;
- struct connman_ipconfig *config;
+ char *pac;
- struct connman_ipconfig_driver *driver;
- struct connman_ipconfig *driver_config;
+ struct connman_ipconfig *config_ipv4;
+ struct connman_ipconfig *config_ipv6;
+
+ bool ipv6_enabled;
+ int ipv6_privacy;
+};
+
+struct ipconfig_store {
+ GKeyFile *file;
+ const char *group;
+ const char *prefix;
};
static GHashTable *ipdevice_hash = NULL;
static GList *ipconfig_list = NULL;
+static bool is_ipv6_supported = false;
-struct connman_ipaddress *connman_ipaddress_alloc(void)
-{
- struct connman_ipaddress *ipaddress;
-
- ipaddress = g_try_new0(struct connman_ipaddress, 1);
- if (ipaddress == NULL)
- return NULL;
-
- return ipaddress;
-}
+static void store_set_str(struct ipconfig_store *store,
+ const char *key, const char *val)
-void connman_ipaddress_free(struct connman_ipaddress *ipaddress)
{
- if (ipaddress == NULL)
+ char *pk;
+
+ if (!val || strlen(val) == 0)
return;
- g_free(ipaddress->broadcast);
- g_free(ipaddress->peer);
- g_free(ipaddress->local);
- g_free(ipaddress);
+ pk = g_strdup_printf("%s%s", store->prefix, key);
+ g_key_file_set_string(store->file, store->group, pk, val);
+ g_free(pk);
}
-static unsigned char netmask2prefixlen(const char *netmask)
+static char *store_get_str(struct ipconfig_store *store, const char *key)
{
- unsigned char bits = 0;
- in_addr_t mask = inet_network(netmask);
- in_addr_t host = ~mask;
-
- /* a valid netmask must be 2^n - 1 */
- if ((host & (host + 1)) != 0)
- return -1;
+ char *pk, *val;
- for (; mask; mask <<= 1)
- ++bits;
+ pk = g_strdup_printf("%s%s", store->prefix, key);
+ val = g_key_file_get_string(store->file, store->group, pk, NULL);
+ g_free(pk);
- return bits;
+ return val;
}
-void connman_ipaddress_set(struct connman_ipaddress *ipaddress,
- const char *address, const char *netmask)
+static void store_set_strs(struct ipconfig_store *store,
+ const char *key, char **val)
{
- if (ipaddress == NULL)
+ guint len;
+ char *pk;
+
+ if (!val)
return;
- if (netmask != NULL)
- ipaddress->prefixlen = netmask2prefixlen(netmask);
- else
- ipaddress->prefixlen = 32;
+ len = g_strv_length(val);
+ if (len == 0)
+ return;
- g_free(ipaddress->local);
- ipaddress->local = g_strdup(address);
+ pk = g_strdup_printf("%s%s", store->prefix, key);
+ g_key_file_set_string_list(store->file, store->group,
+ pk, (const gchar **)val, len);
+ g_free(pk);
}
-void connman_ipaddress_clear(struct connman_ipaddress *ipaddress)
+static char **store_get_strs(struct ipconfig_store *store, const char *key)
{
- if (ipaddress == NULL)
- return;
+ gsize len;
+ char *pk, **val;
- ipaddress->prefixlen = 0;
+ pk = g_strdup_printf("%s%s", store->prefix, key);
+ val = g_key_file_get_string_list(store->file, store->group,
+ pk, &len, NULL);
+ g_free(pk);
- g_free(ipaddress->local);
- ipaddress->local = NULL;
-
- g_free(ipaddress->peer);
- ipaddress->peer = NULL;
+ if (val && len == 0) {
+ g_free(val);
+ return NULL;
+ }
- g_free(ipaddress->broadcast);
- ipaddress->broadcast = NULL;
+ return val;
}
-void connman_ipaddress_copy(struct connman_ipaddress *ipaddress,
- struct connman_ipaddress *source)
+static void store_set_int(struct ipconfig_store *store,
+ const char *key, int val)
{
- if (ipaddress == NULL || source == NULL)
+ char *pk;
+
+ if (val == 0)
return;
- ipaddress->prefixlen = source->prefixlen;
+ pk = g_strdup_printf("%s%s", store->prefix, key);
+ g_key_file_set_integer(store->file, store->group, pk, val);
+ g_free(pk);
+}
- g_free(ipaddress->local);
- ipaddress->local = g_strdup(source->local);
+static int store_get_int(struct ipconfig_store *store, const char *key)
+{
+ int val;
+ char *pk;
- g_free(ipaddress->peer);
- ipaddress->peer = g_strdup(source->peer);
+ pk = g_strdup_printf("%s%s", store->prefix, key);
+ val = g_key_file_get_integer(store->file, store->group, pk, 0);
+ g_free(pk);
- g_free(ipaddress->broadcast);
- ipaddress->broadcast = g_strdup(source->broadcast);
+ return val;
}
static void free_address_list(struct connman_ipdevice *ipdevice)
return NULL;
}
+const char *__connman_ipconfig_type2string(enum connman_ipconfig_type type)
+{
+ switch (type) {
+ case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+ case CONNMAN_IPCONFIG_TYPE_ALL:
+ return "unknown";
+ case CONNMAN_IPCONFIG_TYPE_IPV4:
+ return "IPv4";
+ case CONNMAN_IPCONFIG_TYPE_IPV6:
+ return "IPv6";
+ }
+
+ return NULL;
+}
+
static const char *type2str(unsigned short type)
{
switch (type) {
return "";
}
-static void free_ipdevice(gpointer data)
+static bool get_ipv6_state(gchar *ifname)
{
- struct connman_ipdevice *ipdevice = data;
+ int disabled;
+ gchar *path;
+ FILE *f;
+ bool enabled = false;
- connman_info("%s {remove} index %d", ipdevice->ifname,
- ipdevice->index);
+ if (!ifname)
+ path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6");
+ else
+ path = g_strdup_printf(
+ "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
- if (ipdevice->config != NULL)
- connman_ipconfig_unref(ipdevice->config);
+ if (!path)
+ return enabled;
- free_address_list(ipdevice);
- g_free(ipdevice->gateway);
+ f = fopen(path, "r");
- g_free(ipdevice->ifname);
- g_free(ipdevice);
+ g_free(path);
+
+ if (f) {
+ if (fscanf(f, "%d", &disabled) > 0)
+ enabled = !disabled;
+ fclose(f);
+ }
+
+ return enabled;
}
-static GSList *driver_list = NULL;
+static void set_ipv6_state(gchar *ifname, bool enable)
+{
+ gchar *path;
+ FILE *f;
+
+ if (!ifname)
+ path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6");
+ else
+ path = g_strdup_printf(
+ "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
+
+ if (!path)
+ return;
+
+ f = fopen(path, "r+");
+
+ g_free(path);
+
+ if (!f)
+ return;
+
+ if (!enable)
+ fprintf(f, "1");
+ else
+ fprintf(f, "0");
+
+ fclose(f);
+}
-static gint compare_priority(gconstpointer a, gconstpointer b)
+static int get_ipv6_privacy(gchar *ifname)
{
- const struct connman_ipconfig_driver *driver1 = a;
- const struct connman_ipconfig_driver *driver2 = b;
+ gchar *path;
+ FILE *f;
+ int value;
+
+ if (!ifname)
+ return 0;
+
+ path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr",
+ ifname);
+
+ if (!path)
+ return 0;
+
+ f = fopen(path, "r");
+
+ g_free(path);
+
+ if (!f)
+ return 0;
+
+ if (fscanf(f, "%d", &value) <= 0)
+ value = 0;
- return driver2->priority - driver1->priority;
+ fclose(f);
+
+ return value;
}
-/**
- * connman_ipconfig_driver_register:
- * @driver: IP configuration driver
- *
- * Register a new IP configuration driver
- *
- * Returns: %0 on success
+/* Enable the IPv6 privacy extension for stateless address autoconfiguration.
+ * The privacy extension is described in RFC 3041 and RFC 4941
*/
-int connman_ipconfig_driver_register(struct connman_ipconfig_driver *driver)
+static void set_ipv6_privacy(gchar *ifname, int value)
{
- DBG("driver %p name %s", driver, driver->name);
+ gchar *path;
+ FILE *f;
- driver_list = g_slist_insert_sorted(driver_list, driver,
- compare_priority);
+ if (!ifname)
+ return;
- return 0;
+ path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr",
+ ifname);
+
+ if (!path)
+ return;
+
+ if (value < 0)
+ value = 0;
+
+ f = fopen(path, "r+");
+
+ g_free(path);
+
+ if (!f)
+ return;
+
+ fprintf(f, "%d", value);
+ fclose(f);
}
-/**
- * connman_ipconfig_driver_unregister:
- * @driver: IP configuration driver
- *
- * Remove a previously registered IP configuration driver.
- */
-void connman_ipconfig_driver_unregister(struct connman_ipconfig_driver *driver)
+static int get_rp_filter(void)
{
- DBG("driver %p name %s", driver, driver->name);
+ FILE *f;
+ int value = -EINVAL, tmp;
+
+ f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r");
- driver_list = g_slist_remove(driver_list, driver);
+ if (f) {
+ if (fscanf(f, "%d", &tmp) == 1)
+ value = tmp;
+ fclose(f);
+ }
+
+ return value;
}
-static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
+static void set_rp_filter(int value)
{
- GSList *list;
+ FILE *f;
- DBG("ipconfig %p", ipdevice->config);
+ f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r+");
- if (ipdevice->config == NULL)
+ if (!f)
return;
- switch (ipdevice->config->method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
- case CONNMAN_IPCONFIG_METHOD_MANUAL:
- return;
- case CONNMAN_IPCONFIG_METHOD_DHCP:
- break;
- }
+ fprintf(f, "%d", value);
- if (ipdevice->driver != NULL)
- return;
+ fclose(f);
+}
- ipdevice->driver_config = connman_ipconfig_clone(ipdevice->config);
- if (ipdevice->driver_config == NULL)
- return;
+int __connman_ipconfig_set_rp_filter()
+{
+ int value;
- for (list = driver_list; list; list = list->next) {
- struct connman_ipconfig_driver *driver = list->data;
+ value = get_rp_filter();
- if (driver->request(ipdevice->driver_config) == 0) {
- ipdevice->driver = driver;
- break;
- }
+ if (value < 0)
+ return value;
+
+ set_rp_filter(2);
+
+ connman_info("rp_filter set to 2 (loose mode routing), "
+ "old value was %d", value);
+
+ return value;
+}
+
+void __connman_ipconfig_unset_rp_filter(int old_value)
+{
+ set_rp_filter(old_value);
+
+ connman_info("rp_filter restored to %d", old_value);
+}
+
+bool __connman_ipconfig_ipv6_privacy_enabled(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig)
+ return false;
+
+ return ipconfig->ipv6_privacy_config == 0 ? FALSE : TRUE;
+}
+
+bool __connman_ipconfig_ipv6_is_enabled(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+ char *ifname;
+ bool ret;
+
+ if (!ipconfig)
+ return false;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (!ipdevice)
+ return false;
+
+ ifname = connman_inet_ifname(ipconfig->index);
+ ret = get_ipv6_state(ifname);
+ g_free(ifname);
+
+ return ret;
+}
+
+static void free_ipdevice(gpointer data)
+{
+ struct connman_ipdevice *ipdevice = data;
+ char *ifname = connman_inet_ifname(ipdevice->index);
+
+ connman_info("%s {remove} index %d", ifname, ipdevice->index);
+
+ if (ipdevice->config_ipv4) {
+ __connman_ipconfig_unref(ipdevice->config_ipv4);
+ ipdevice->config_ipv4 = NULL;
+ }
+
+ if (ipdevice->config_ipv6) {
+ __connman_ipconfig_unref(ipdevice->config_ipv6);
+ ipdevice->config_ipv6 = NULL;
}
- if (ipdevice->driver == NULL) {
- connman_ipconfig_unref(ipdevice->driver_config);
- ipdevice->driver_config = NULL;
+ free_address_list(ipdevice);
+ g_free(ipdevice->ipv4_gateway);
+ g_free(ipdevice->ipv6_gateway);
+ g_free(ipdevice->pac);
+
+ g_free(ipdevice->address);
+
+ if (ifname) {
+ set_ipv6_state(ifname, ipdevice->ipv6_enabled);
+ set_ipv6_privacy(ifname, ipdevice->ipv6_privacy);
}
+
+ g_free(ifname);
+ g_free(ipdevice);
}
-static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice)
+static void update_stats(struct connman_ipdevice *ipdevice,
+ const char *ifname, struct rtnl_link_stats *stats)
{
- DBG("ipconfig %p", ipdevice->config);
+ struct connman_service *service;
- if (ipdevice->config == NULL)
+ if (stats->rx_packets == 0 && stats->tx_packets == 0)
return;
- if (ipdevice->driver == NULL)
+ connman_info("%s {RX} %u packets %u bytes", ifname,
+ stats->rx_packets, stats->rx_bytes);
+ connman_info("%s {TX} %u packets %u bytes", ifname,
+ stats->tx_packets, stats->tx_bytes);
+
+ if (!ipdevice->config_ipv4 && !ipdevice->config_ipv6)
return;
- ipdevice->driver->release(ipdevice->driver_config);
+ service = __connman_service_lookup_from_index(ipdevice->index);
- ipdevice->driver = NULL;
+ DBG("service %p", service);
- connman_ipconfig_unref(ipdevice->driver_config);
- ipdevice->driver_config = NULL;
+ if (!service)
+ return;
- connman_inet_clear_address(ipdevice->index);
+ ipdevice->rx_packets = stats->rx_packets;
+ ipdevice->tx_packets = stats->tx_packets;
+ ipdevice->rx_bytes = stats->rx_bytes;
+ ipdevice->tx_bytes = stats->tx_bytes;
+ ipdevice->rx_errors = stats->rx_errors;
+ ipdevice->tx_errors = stats->tx_errors;
+ ipdevice->rx_dropped = stats->rx_dropped;
+ ipdevice->tx_dropped = stats->tx_dropped;
+
+ __connman_service_notify(service,
+ ipdevice->rx_packets, ipdevice->tx_packets,
+ ipdevice->rx_bytes, ipdevice->tx_bytes,
+ ipdevice->rx_errors, ipdevice->tx_errors,
+ ipdevice->rx_dropped, ipdevice->tx_dropped);
}
void __connman_ipconfig_newlink(int index, unsigned short type,
unsigned int flags, const char *address,
- unsigned short mtu)
+ unsigned short mtu,
+ struct rtnl_link_stats *stats)
{
struct connman_ipdevice *ipdevice;
- GList *list;
+ GList *list, *ipconfig_copy;
GString *str;
- gboolean up = FALSE, down = FALSE;
- gboolean lower_up = FALSE, lower_down = FALSE;
+ bool up = false, down = false;
+ bool lower_up = false, lower_down = false;
char *ifname;
DBG("index %d", index);
if (type == ARPHRD_LOOPBACK)
return;
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice != NULL)
- goto update;
-
ifname = connman_inet_ifname(index);
- if (__connman_element_device_isfiltered(ifname) == TRUE) {
- connman_info("Ignoring interface %s (filtered)", ifname);
- g_free(ifname);
- return;
- }
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ if (ipdevice)
+ goto update;
ipdevice = g_try_new0(struct connman_ipdevice, 1);
- if (ipdevice == NULL) {
- g_free(ifname);
- return;
- }
+ if (!ipdevice)
+ goto out;
ipdevice->index = index;
- ipdevice->ifname = ifname;
ipdevice->type = type;
+ ipdevice->ipv6_enabled = get_ipv6_state(ifname);
+ ipdevice->ipv6_privacy = get_ipv6_privacy(ifname);
+
+ ipdevice->address = g_strdup(address);
+
g_hash_table_insert(ipdevice_hash, GINT_TO_POINTER(index), ipdevice);
- connman_info("%s {create} index %d type %d <%s>", ipdevice->ifname,
+ connman_info("%s {create} index %d type %d <%s>", ifname,
index, type, type2str(type));
update:
- if (ipdevice->config != NULL) {
- g_free(ipdevice->config->eth);
- ipdevice->config->eth = g_strdup(address);
- ipdevice->config->mtu = mtu;
- }
+ ipdevice->mtu = mtu;
+
+ update_stats(ipdevice, ifname, stats);
if (flags == ipdevice->flags)
- return;
+ goto out;
if ((ipdevice->flags & IFF_UP) != (flags & IFF_UP)) {
if (flags & IFF_UP)
- up = TRUE;
+ up = true;
else
- down = TRUE;
+ down = true;
}
if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) !=
(flags & (IFF_RUNNING | IFF_LOWER_UP))) {
if ((flags & (IFF_RUNNING | IFF_LOWER_UP)) ==
(IFF_RUNNING | IFF_LOWER_UP))
- lower_up = TRUE;
+ lower_up = true;
else if ((flags & (IFF_RUNNING | IFF_LOWER_UP)) == 0)
- lower_down = TRUE;
+ lower_down = true;
}
ipdevice->flags = flags;
str = g_string_new(NULL);
- if (str == NULL)
- return;
+ if (!str)
+ goto out;
if (flags & IFF_UP)
g_string_append(str, "UP");
if (flags & IFF_LOWER_UP)
g_string_append(str, ",LOWER_UP");
- connman_info("%s {update} flags %u <%s>", ipdevice->ifname,
- flags, str->str);
+ connman_info("%s {update} flags %u <%s>", ifname, flags, str->str);
g_string_free(str, TRUE);
- for (list = g_list_first(ipconfig_list); list;
+ ipconfig_copy = g_list_copy(ipconfig_list);
+
+ for (list = g_list_first(ipconfig_copy); list;
list = g_list_next(list)) {
struct connman_ipconfig *ipconfig = list->data;
if (index != ipconfig->index)
continue;
- if (up == TRUE && ipconfig->ops->up)
- ipconfig->ops->up(ipconfig);
- if (lower_up == TRUE && ipconfig->ops->lower_up)
- ipconfig->ops->lower_up(ipconfig);
+ if (!ipconfig->ops)
+ continue;
+
+ if (up && ipconfig->ops->up)
+ ipconfig->ops->up(ipconfig, ifname);
+ if (lower_up && ipconfig->ops->lower_up)
+ ipconfig->ops->lower_up(ipconfig, ifname);
- if (lower_down == TRUE && ipconfig->ops->lower_down)
- ipconfig->ops->lower_down(ipconfig);
- if (down == TRUE && ipconfig->ops->down)
- ipconfig->ops->down(ipconfig);
+ if (lower_down && ipconfig->ops->lower_down)
+ ipconfig->ops->lower_down(ipconfig, ifname);
+ if (down && ipconfig->ops->down)
+ ipconfig->ops->down(ipconfig, ifname);
}
- if (lower_up)
- __connman_ipconfig_lower_up(ipdevice);
- if (lower_down)
- __connman_ipconfig_lower_down(ipdevice);
+ g_list_free(ipconfig_copy);
+
+out:
+ g_free(ifname);
}
-void __connman_ipconfig_dellink(int index)
+void __connman_ipconfig_dellink(int index, struct rtnl_link_stats *stats)
{
struct connman_ipdevice *ipdevice;
GList *list;
+ char *ifname;
DBG("index %d", index);
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return;
+ ifname = connman_inet_ifname(index);
+
+ update_stats(ipdevice, ifname, stats);
+
for (list = g_list_first(ipconfig_list); list;
list = g_list_next(list)) {
struct connman_ipconfig *ipconfig = list->data;
ipconfig->index = -1;
+ if (!ipconfig->ops)
+ continue;
+
if (ipconfig->ops->lower_down)
- ipconfig->ops->lower_down(ipconfig);
+ ipconfig->ops->lower_down(ipconfig, ifname);
if (ipconfig->ops->down)
- ipconfig->ops->down(ipconfig);
+ ipconfig->ops->down(ipconfig, ifname);
}
- __connman_ipconfig_lower_down(ipdevice);
+ g_free(ifname);
g_hash_table_remove(ipdevice_hash, GINT_TO_POINTER(index));
}
-void __connman_ipconfig_newaddr(int index, const char *label,
+static inline gint check_duplicate_address(gconstpointer a, gconstpointer b)
+{
+ const struct connman_ipaddress *addr1 = a;
+ const struct connman_ipaddress *addr2 = b;
+
+ if (addr1->prefixlen != addr2->prefixlen)
+ return addr2->prefixlen - addr1->prefixlen;
+
+ return g_strcmp0(addr1->local, addr2->local);
+}
+
+int __connman_ipconfig_newaddr(int index, int family, const char *label,
unsigned char prefixlen, const char *address)
{
struct connman_ipdevice *ipdevice;
struct connman_ipaddress *ipaddress;
+ enum connman_ipconfig_type type;
GList *list;
+ char *ifname;
DBG("index %d", index);
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice == NULL)
- return;
+ if (!ipdevice)
+ return -ENXIO;
- ipaddress = connman_ipaddress_alloc();
- if (ipaddress == NULL)
- return;
+ ipaddress = connman_ipaddress_alloc(family);
+ if (!ipaddress)
+ return -ENOMEM;
ipaddress->prefixlen = prefixlen;
ipaddress->local = g_strdup(address);
- ipdevice->address_list = g_slist_append(ipdevice->address_list,
+ if (g_slist_find_custom(ipdevice->address_list, ipaddress,
+ check_duplicate_address)) {
+ connman_ipaddress_free(ipaddress);
+ return -EALREADY;
+ }
+
+ if (family == AF_INET)
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ else if (family == AF_INET6)
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ else
+ return -EINVAL;
+
+ ipdevice->address_list = g_slist_prepend(ipdevice->address_list,
ipaddress);
- connman_info("%s {add} address %s/%u label %s", ipdevice->ifname,
- address, prefixlen, label);
+ ifname = connman_inet_ifname(index);
+ connman_info("%s {add} address %s/%u label %s family %d",
+ ifname, address, prefixlen, label, family);
- if (ipdevice->config != NULL)
- connman_ipaddress_copy(ipdevice->config->system, ipaddress);
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ __connman_ippool_newaddr(index, address, prefixlen);
- if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
- return;
+ if (ipdevice->config_ipv4 && family == AF_INET)
+ connman_ipaddress_copy_address(ipdevice->config_ipv4->system,
+ ipaddress);
- if (g_slist_length(ipdevice->address_list) > 1)
- return;
+ else if (ipdevice->config_ipv6 && family == AF_INET6)
+ connman_ipaddress_copy_address(ipdevice->config_ipv6->system,
+ ipaddress);
+ else
+ goto out;
+
+ if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
+ goto out;
for (list = g_list_first(ipconfig_list); list;
list = g_list_next(list)) {
if (index != ipconfig->index)
continue;
+ if (type != ipconfig->type)
+ continue;
+
+ if (!ipconfig->ops)
+ continue;
+
if (ipconfig->ops->ip_bound)
- ipconfig->ops->ip_bound(ipconfig);
+ ipconfig->ops->ip_bound(ipconfig, ifname);
}
+
+out:
+ g_free(ifname);
+ return 0;
}
-void __connman_ipconfig_deladdr(int index, const char *label,
+void __connman_ipconfig_deladdr(int index, int family, const char *label,
unsigned char prefixlen, const char *address)
{
struct connman_ipdevice *ipdevice;
struct connman_ipaddress *ipaddress;
+ enum connman_ipconfig_type type;
GList *list;
+ char *ifname;
DBG("index %d", index);
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return;
ipaddress = find_ipaddress(ipdevice, prefixlen, address);
- if (ipaddress == NULL)
+ if (!ipaddress)
+ return;
+
+ if (family == AF_INET)
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ else if (family == AF_INET6)
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ else
return;
ipdevice->address_list = g_slist_remove(ipdevice->address_list,
ipaddress);
- connman_ipaddress_free(ipaddress);
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ __connman_ippool_deladdr(index, address, prefixlen);
+
+ connman_ipaddress_clear(ipaddress);
+ g_free(ipaddress);
- connman_info("%s {del} address %s/%u label %s", ipdevice->ifname,
+ ifname = connman_inet_ifname(index);
+ connman_info("%s {del} address %s/%u label %s", ifname,
address, prefixlen, label);
if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
- return;
+ goto out;
if (g_slist_length(ipdevice->address_list) > 0)
- return;
+ goto out;
for (list = g_list_first(ipconfig_list); list;
list = g_list_next(list)) {
if (index != ipconfig->index)
continue;
+ if (type != ipconfig->type)
+ continue;
+
+ if (!ipconfig->ops)
+ continue;
+
if (ipconfig->ops->ip_release)
- ipconfig->ops->ip_release(ipconfig);
+ ipconfig->ops->ip_release(ipconfig, ifname);
}
+
+out:
+ g_free(ifname);
}
-void __connman_ipconfig_newroute(int index, unsigned char scope,
+void __connman_ipconfig_newroute(int index, int family, unsigned char scope,
const char *dst, const char *gateway)
{
struct connman_ipdevice *ipdevice;
+ char *ifname;
DBG("index %d", index);
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return;
- if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
- g_free(ipdevice->gateway);
- ipdevice->gateway = g_strdup(gateway);
+ ifname = connman_inet_ifname(index);
+
+ if (scope == 0 && (g_strcmp0(dst, "0.0.0.0") == 0 ||
+ g_strcmp0(dst, "::") == 0)) {
+ GList *config_list;
+ enum connman_ipconfig_type type;
+
+ if (family == AF_INET6) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ g_free(ipdevice->ipv6_gateway);
+ ipdevice->ipv6_gateway = g_strdup(gateway);
+
+ if (ipdevice->config_ipv6 &&
+ ipdevice->config_ipv6->system) {
+ g_free(ipdevice->config_ipv6->system->gateway);
+ ipdevice->config_ipv6->system->gateway =
+ g_strdup(gateway);
+ }
+ } else if (family == AF_INET) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ g_free(ipdevice->ipv4_gateway);
+ ipdevice->ipv4_gateway = g_strdup(gateway);
+
+ if (ipdevice->config_ipv4 &&
+ ipdevice->config_ipv4->system) {
+ g_free(ipdevice->config_ipv4->system->gateway);
+ ipdevice->config_ipv4->system->gateway =
+ g_strdup(gateway);
+ }
+ } else
+ goto out;
+
+ for (config_list = g_list_first(ipconfig_list); config_list;
+ config_list = g_list_next(config_list)) {
+ struct connman_ipconfig *ipconfig = config_list->data;
+
+ if (index != ipconfig->index)
+ continue;
+
+ if (type != ipconfig->type)
+ continue;
+
+ if (!ipconfig->ops)
+ continue;
+
+ if (ipconfig->ops->route_set)
+ ipconfig->ops->route_set(ipconfig, ifname);
+ }
}
connman_info("%s {add} route %s gw %s scope %u <%s>",
- ipdevice->ifname, dst, gateway,
- scope, scope2str(scope));
+ ifname, dst, gateway, scope, scope2str(scope));
+
+out:
+ g_free(ifname);
}
-void __connman_ipconfig_delroute(int index, unsigned char scope,
+void __connman_ipconfig_delroute(int index, int family, unsigned char scope,
const char *dst, const char *gateway)
{
struct connman_ipdevice *ipdevice;
+ char *ifname;
DBG("index %d", index);
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return;
- if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
- g_free(ipdevice->gateway);
- ipdevice->gateway = NULL;
+ ifname = connman_inet_ifname(index);
+
+ if (scope == 0 && (g_strcmp0(dst, "0.0.0.0") == 0 ||
+ g_strcmp0(dst, "::") == 0)) {
+ GList *config_list;
+ enum connman_ipconfig_type type;
+
+ if (family == AF_INET6) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ g_free(ipdevice->ipv6_gateway);
+ ipdevice->ipv6_gateway = NULL;
+
+ if (ipdevice->config_ipv6 &&
+ ipdevice->config_ipv6->system) {
+ g_free(ipdevice->config_ipv6->system->gateway);
+ ipdevice->config_ipv6->system->gateway = NULL;
+ }
+ } else if (family == AF_INET) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ g_free(ipdevice->ipv4_gateway);
+ ipdevice->ipv4_gateway = NULL;
+
+ if (ipdevice->config_ipv4 &&
+ ipdevice->config_ipv4->system) {
+ g_free(ipdevice->config_ipv4->system->gateway);
+ ipdevice->config_ipv4->system->gateway = NULL;
+ }
+ } else
+ goto out;
+
+ for (config_list = g_list_first(ipconfig_list); config_list;
+ config_list = g_list_next(config_list)) {
+ struct connman_ipconfig *ipconfig = config_list->data;
+
+ if (index != ipconfig->index)
+ continue;
+
+ if (type != ipconfig->type)
+ continue;
+
+ if (!ipconfig->ops)
+ continue;
+
+ if (ipconfig->ops->route_unset)
+ ipconfig->ops->route_unset(ipconfig, ifname);
+ }
}
connman_info("%s {del} route %s gw %s scope %u <%s>",
- ipdevice->ifname, dst, gateway,
- scope, scope2str(scope));
+ ifname, dst, gateway, scope, scope2str(scope));
+
+out:
+ g_free(ifname);
}
void __connman_ipconfig_foreach(void (*function) (int index, void *user_data),
GList *list, *keys;
keys = g_hash_table_get_keys(ipdevice_hash);
- if (keys == NULL)
+ if (!keys)
return;
for (list = g_list_first(keys); list; list = g_list_next(list)) {
g_list_free(keys);
}
-unsigned short __connman_ipconfig_get_type(int index)
+enum connman_ipconfig_type __connman_ipconfig_get_config_type(
+ struct connman_ipconfig *ipconfig)
+{
+ return ipconfig ? ipconfig->type : CONNMAN_IPCONFIG_TYPE_UNKNOWN;
+}
+
+unsigned short __connman_ipconfig_get_type_from_index(int index)
{
struct connman_ipdevice *ipdevice;
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return ARPHRD_VOID;
return ipdevice->type;
}
-unsigned int __connman_ipconfig_get_flags(int index)
+unsigned int __connman_ipconfig_get_flags_from_index(int index)
{
struct connman_ipdevice *ipdevice;
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return 0;
return ipdevice->flags;
}
-const char *__connman_ipconfig_get_gateway(int index)
+const char *__connman_ipconfig_get_gateway_from_index(int index,
+ enum connman_ipconfig_type type)
{
struct connman_ipdevice *ipdevice;
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return NULL;
- return ipdevice->gateway;
-}
+ if (type != CONNMAN_IPCONFIG_TYPE_IPV6) {
+ if (ipdevice->ipv4_gateway)
+ return ipdevice->ipv4_gateway;
-/**
- * connman_ipconfig_create:
- *
- * Allocate a new ipconfig structure.
- *
- * Returns: a newly-allocated #connman_ipconfig structure
- */
-struct connman_ipconfig *connman_ipconfig_create(int index)
-{
- struct connman_ipconfig *ipconfig;
+ if (ipdevice->config_ipv4 &&
+ ipdevice->config_ipv4->address)
+ return ipdevice->config_ipv4->address->gateway;
+ }
- DBG("index %d", index);
+ if (type != CONNMAN_IPCONFIG_TYPE_IPV4) {
+ if (ipdevice->ipv6_gateway)
+ return ipdevice->ipv6_gateway;
- ipconfig = g_try_new0(struct connman_ipconfig, 1);
- if (ipconfig == NULL)
- return NULL;
+ if (ipdevice->config_ipv6 &&
+ ipdevice->config_ipv6->address)
+ return ipdevice->config_ipv6->address->gateway;
+ }
- ipconfig->refcount = 1;
+ return NULL;
+}
+void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int index)
+{
ipconfig->index = index;
+}
- ipconfig->address = connman_ipaddress_alloc();
- if (ipconfig->address == NULL) {
- g_free(ipconfig);
+const char *__connman_ipconfig_get_local(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig->address)
return NULL;
- }
- ipconfig->system = connman_ipaddress_alloc();
+ return ipconfig->address->local;
+}
- DBG("ipconfig %p", ipconfig);
+void __connman_ipconfig_set_local(struct connman_ipconfig *ipconfig,
+ const char *address)
+{
+ if (!ipconfig->address)
+ return;
- return ipconfig;
+ g_free(ipconfig->address->local);
+ ipconfig->address->local = g_strdup(address);
}
-/**
- * connman_ipconfig_clone:
- *
- * Clone an ipconfig structure and create new reference.
- *
- * Returns: a newly-allocated #connman_ipconfig structure
- */
-struct connman_ipconfig *connman_ipconfig_clone(struct connman_ipconfig *ipconfig)
+const char *__connman_ipconfig_get_peer(struct connman_ipconfig *ipconfig)
{
- struct connman_ipconfig *ipconfig_clone;
+ if (!ipconfig->address)
+ return NULL;
- DBG("ipconfig %p", ipconfig);
+ return ipconfig->address->peer;
+}
+
+void __connman_ipconfig_set_peer(struct connman_ipconfig *ipconfig,
+ const char *address)
+{
+ if (!ipconfig->address)
+ return;
- ipconfig_clone = g_try_new0(struct connman_ipconfig, 1);
- if (ipconfig_clone == NULL)
+ g_free(ipconfig->address->peer);
+ ipconfig->address->peer = g_strdup(address);
+}
+
+const char *__connman_ipconfig_get_broadcast(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig->address)
return NULL;
- ipconfig_clone->refcount = 1;
+ return ipconfig->address->broadcast;
+}
+
+void __connman_ipconfig_set_broadcast(struct connman_ipconfig *ipconfig,
+ const char *broadcast)
+{
+ if (!ipconfig->address)
+ return;
+
+ g_free(ipconfig->address->broadcast);
+ ipconfig->address->broadcast = g_strdup(broadcast);
+}
+
+const char *__connman_ipconfig_get_gateway(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig->address)
+ return NULL;
- ipconfig_clone->origin = connman_ipconfig_ref(ipconfig);
+ return ipconfig->address->gateway;
+}
- ipconfig_clone->index = -1;
+void __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig,
+ const char *gateway)
+{
+ DBG("");
- return ipconfig_clone;
+ if (!ipconfig->address)
+ return;
+ g_free(ipconfig->address->gateway);
+ ipconfig->address->gateway = g_strdup(gateway);
}
+int __connman_ipconfig_gateway_add(struct connman_ipconfig *ipconfig)
+{
+ struct connman_service *service;
+
+ DBG("");
+
+ if (!ipconfig->address)
+ return -EINVAL;
+
+ service = __connman_service_lookup_from_index(ipconfig->index);
+ if (!service)
+ return -EINVAL;
+
+ DBG("type %d gw %s peer %s", ipconfig->type,
+ ipconfig->address->gateway, ipconfig->address->peer);
+
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6 ||
+ ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ return __connman_connection_gateway_add(service,
+ ipconfig->address->gateway,
+ ipconfig->type,
+ ipconfig->address->peer);
+
+ return 0;
+}
+
+void __connman_ipconfig_gateway_remove(struct connman_ipconfig *ipconfig)
+{
+ struct connman_service *service;
+
+ DBG("");
+
+ service = __connman_service_lookup_from_index(ipconfig->index);
+ if (service)
+ __connman_connection_gateway_remove(service, ipconfig->type);
+}
+
+unsigned char __connman_ipconfig_get_prefixlen(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig->address)
+ return 0;
+
+ return ipconfig->address->prefixlen;
+}
+
+void __connman_ipconfig_set_prefixlen(struct connman_ipconfig *ipconfig,
+ unsigned char prefixlen)
+{
+ if (!ipconfig->address)
+ return;
+
+ ipconfig->address->prefixlen = prefixlen;
+}
+
+static struct connman_ipconfig *create_ipv6config(int index)
+{
+ struct connman_ipconfig *ipv6config;
+ struct connman_ipdevice *ipdevice;
+
+ ipv6config = g_try_new0(struct connman_ipconfig, 1);
+ if (!ipv6config)
+ return NULL;
+
+ ipv6config->refcount = 1;
+
+ ipv6config->index = index;
+ ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
+
+ if (!is_ipv6_supported)
+ ipv6config->method = CONNMAN_IPCONFIG_METHOD_OFF;
+ else
+ ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ if (ipdevice)
+ ipv6config->ipv6_privacy_config = ipdevice->ipv6_privacy;
+
+ ipv6config->address = connman_ipaddress_alloc(AF_INET6);
+ if (!ipv6config->address) {
+ g_free(ipv6config);
+ return NULL;
+ }
+
+ ipv6config->system = connman_ipaddress_alloc(AF_INET6);
+
+ DBG("ipconfig %p index %d method %s", ipv6config, index,
+ __connman_ipconfig_method2string(ipv6config->method));
+
+ return ipv6config;
+}
+
+/**
+ * connman_ipconfig_create:
+ *
+ * Allocate a new ipconfig structure.
+ *
+ * Returns: a newly-allocated #connman_ipconfig structure
+ */
+struct connman_ipconfig *__connman_ipconfig_create(int index,
+ enum connman_ipconfig_type type)
+{
+ struct connman_ipconfig *ipconfig;
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ return create_ipv6config(index);
+
+ ipconfig = g_try_new0(struct connman_ipconfig, 1);
+ if (!ipconfig)
+ return NULL;
+
+ ipconfig->refcount = 1;
+
+ ipconfig->index = index;
+ ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4;
+
+ ipconfig->address = connman_ipaddress_alloc(AF_INET);
+ if (!ipconfig->address) {
+ g_free(ipconfig);
+ return NULL;
+ }
+
+ ipconfig->system = connman_ipaddress_alloc(AF_INET);
+
+ DBG("ipconfig %p index %d", ipconfig, index);
+
+ return ipconfig;
+}
+
+
/**
* connman_ipconfig_ref:
* @ipconfig: ipconfig structure
*
* Increase reference counter of ipconfig
*/
-struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig)
+struct connman_ipconfig *
+__connman_ipconfig_ref_debug(struct connman_ipconfig *ipconfig,
+ const char *file, int line, const char *caller)
{
- g_atomic_int_inc(&ipconfig->refcount);
+ DBG("%p ref %d by %s:%d:%s()", ipconfig, ipconfig->refcount + 1,
+ file, line, caller);
+
+ __sync_fetch_and_add(&ipconfig->refcount, 1);
return ipconfig;
}
*
* Decrease reference counter of ipconfig
*/
-void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
+void __connman_ipconfig_unref_debug(struct connman_ipconfig *ipconfig,
+ const char *file, int line, const char *caller)
{
- if (g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) {
- connman_ipconfig_set_ops(ipconfig, NULL);
+ if (!ipconfig)
+ return;
- if (ipconfig->origin != NULL) {
- connman_ipconfig_unref(ipconfig->origin);
- ipconfig->origin = NULL;
- }
+ DBG("%p ref %d by %s:%d:%s()", ipconfig, ipconfig->refcount - 1,
+ file, line, caller);
- connman_ipaddress_free(ipconfig->system);
- connman_ipaddress_free(ipconfig->address);
- g_free(ipconfig->eth);
- g_free(ipconfig);
- }
+ if (__sync_fetch_and_sub(&ipconfig->refcount, 1) != 1)
+ return;
+
+ if (__connman_ipconfig_disable(ipconfig) < 0)
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+
+ __connman_ipconfig_set_ops(ipconfig, NULL);
+
+ connman_ipaddress_free(ipconfig->system);
+ connman_ipaddress_free(ipconfig->address);
+ g_free(ipconfig->last_dhcp_address);
+ g_strfreev(ipconfig->last_dhcpv6_prefixes);
+ g_free(ipconfig);
}
/**
*
* Get private data pointer
*/
-void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig)
+void *__connman_ipconfig_get_data(struct connman_ipconfig *ipconfig)
{
+ if (!ipconfig)
+ return NULL;
+
return ipconfig->ops_data;
}
*
* Set private data pointer
*/
-void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data)
+void __connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data)
{
ipconfig->ops_data = data;
}
*
* Get interface index
*/
-int connman_ipconfig_get_index(struct connman_ipconfig *ipconfig)
+int __connman_ipconfig_get_index(struct connman_ipconfig *ipconfig)
{
- if (ipconfig->origin != NULL)
- return ipconfig->origin->index;
+ if (!ipconfig)
+ return -1;
return ipconfig->index;
}
/**
- * connman_ipconfig_get_ifname:
- * @ipconfig: ipconfig structure
- *
- * Get interface name
- */
-const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig)
-{
- struct connman_ipdevice *ipdevice;
-
- if (ipconfig->index < 0)
- return NULL;
-
- ipdevice = g_hash_table_lookup(ipdevice_hash,
- GINT_TO_POINTER(ipconfig->index));
- if (ipdevice == NULL)
- return NULL;
-
- return ipdevice->ifname;
-}
-
-/**
* connman_ipconfig_set_ops:
* @ipconfig: ipconfig structure
* @ops: operation callbacks
*
* Set the operation callbacks
*/
-void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig,
+void __connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig,
const struct connman_ipconfig_ops *ops)
{
- if (ipconfig->ops != NULL)
- ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
-
ipconfig->ops = ops;
-
- if (ops != NULL)
- ipconfig_list = g_list_append(ipconfig_list, ipconfig);
}
/**
*
* Set the configuration method
*/
-int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig,
+int __connman_ipconfig_set_method(struct connman_ipconfig *ipconfig,
enum connman_ipconfig_method method)
{
ipconfig->method = method;
return 0;
}
-/**
- * connman_ipconfig_bind:
- * @ipconfig: ipconfig structure
- * @ipaddress: ipaddress structure
- *
- * Bind IP address details to configuration
- */
-void connman_ipconfig_bind(struct connman_ipconfig *ipconfig,
- struct connman_ipaddress *ipaddress)
+enum connman_ipconfig_method __connman_ipconfig_get_method(
+ struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig)
+ return CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+
+ return ipconfig->method;
+}
+
+int __connman_ipconfig_address_add(struct connman_ipconfig *ipconfig)
+{
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ break;
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ return connman_inet_set_address(ipconfig->index,
+ ipconfig->address);
+ else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ return connman_inet_set_ipv6_address(
+ ipconfig->index, ipconfig->address);
+ }
+
+ return 0;
+}
+
+int __connman_ipconfig_address_remove(struct connman_ipconfig *ipconfig)
{
- struct connman_ipconfig *origin;
+ int err;
+
+ if (!ipconfig)
+ return 0;
- origin = ipconfig->origin ? ipconfig->origin : ipconfig;
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ break;
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ err = __connman_ipconfig_address_unset(ipconfig);
+ connman_ipaddress_clear(ipconfig->address);
- connman_ipaddress_copy(origin->address, ipaddress);
+ return err;
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ return __connman_ipconfig_address_unset(ipconfig);
+ }
- connman_inet_set_address(origin->index, origin->address);
+ return 0;
+}
+
+int __connman_ipconfig_address_unset(struct connman_ipconfig *ipconfig)
+{
+ int err;
+
+ if (!ipconfig)
+ return 0;
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ break;
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ err = connman_inet_clear_address(ipconfig->index,
+ ipconfig->address);
+ else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ err = connman_inet_clear_ipv6_address(
+ ipconfig->index,
+ ipconfig->address->local,
+ ipconfig->address->prefixlen);
+ else
+ err = -EINVAL;
+
+ return err;
+ }
+
+ return 0;
+}
+
+int __connman_ipconfig_set_proxy_autoconfig(struct connman_ipconfig *ipconfig,
+ const char *url)
+{
+ struct connman_ipdevice *ipdevice;
+
+ if (!ipconfig || ipconfig->index < 0)
+ return -ENODEV;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (!ipdevice)
+ return -ENXIO;
+
+ g_free(ipdevice->pac);
+ ipdevice->pac = g_strdup(url);
+
+ return 0;
+}
+
+const char *__connman_ipconfig_get_proxy_autoconfig(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+
+ if (!ipconfig || ipconfig->index < 0)
+ return NULL;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (!ipdevice)
+ return NULL;
+
+ return ipdevice->pac;
+}
+
+void __connman_ipconfig_set_dhcp_address(struct connman_ipconfig *ipconfig,
+ const char *address)
+{
+ if (!ipconfig)
+ return;
+
+ g_free(ipconfig->last_dhcp_address);
+ ipconfig->last_dhcp_address = g_strdup(address);
+}
+
+char *__connman_ipconfig_get_dhcp_address(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig)
+ return NULL;
+
+ return ipconfig->last_dhcp_address;
+}
+
+void __connman_ipconfig_set_dhcpv6_prefixes(struct connman_ipconfig *ipconfig,
+ char **prefixes)
+{
+ if (!ipconfig)
+ return;
+
+ g_strfreev(ipconfig->last_dhcpv6_prefixes);
+ ipconfig->last_dhcpv6_prefixes = prefixes;
+}
+
+char **__connman_ipconfig_get_dhcpv6_prefixes(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig)
+ return NULL;
+
+ return ipconfig->last_dhcpv6_prefixes;
+}
+
+static void disable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+ char *ifname;
+
+ DBG("");
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (!ipdevice)
+ return;
+
+ ifname = connman_inet_ifname(ipconfig->index);
+
+ set_ipv6_state(ifname, false);
+
+ g_free(ifname);
+}
+
+static void enable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+ char *ifname;
+
+ DBG("");
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (!ipdevice)
+ return;
+
+ ifname = connman_inet_ifname(ipconfig->index);
+
+ if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO)
+ set_ipv6_privacy(ifname, ipconfig->ipv6_privacy_config);
+
+ set_ipv6_state(ifname, true);
+
+ g_free(ifname);
+}
+
+void __connman_ipconfig_enable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
+ enable_ipv6(ipconfig);
+}
+
+void __connman_ipconfig_disable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
+ disable_ipv6(ipconfig);
+}
+
+bool __connman_ipconfig_is_usable(struct connman_ipconfig *ipconfig)
+{
+ if (!ipconfig)
+ return false;
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ return false;
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ break;
+ }
+
+ return true;
}
int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig)
{
struct connman_ipdevice *ipdevice;
+ bool up = false, down = false;
+ bool lower_up = false, lower_down = false;
+ enum connman_ipconfig_type type;
+ char *ifname;
DBG("ipconfig %p", ipconfig);
- if (ipconfig == NULL || ipconfig->index < 0)
+ if (!ipconfig || ipconfig->index < 0)
return -ENODEV;
ipdevice = g_hash_table_lookup(ipdevice_hash,
GINT_TO_POINTER(ipconfig->index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return -ENXIO;
- if (ipdevice->config != NULL) {
- connman_ipaddress_clear(ipdevice->config->system);
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+ if (ipdevice->config_ipv4 == ipconfig)
+ return -EALREADY;
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ } else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ if (ipdevice->config_ipv6 == ipconfig)
+ return -EALREADY;
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ } else
+ return -EINVAL;
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
+ ipdevice->config_ipv4) {
+ ipconfig_list = g_list_remove(ipconfig_list,
+ ipdevice->config_ipv4);
+
+ connman_ipaddress_clear(ipdevice->config_ipv4->system);
+
+ __connman_ipconfig_unref(ipdevice->config_ipv4);
+ }
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
+ ipdevice->config_ipv6) {
+ ipconfig_list = g_list_remove(ipconfig_list,
+ ipdevice->config_ipv6);
+
+ connman_ipaddress_clear(ipdevice->config_ipv6->system);
+
+ __connman_ipconfig_unref(ipdevice->config_ipv6);
+ }
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ ipdevice->config_ipv4 = __connman_ipconfig_ref(ipconfig);
+ else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ ipdevice->config_ipv6 = __connman_ipconfig_ref(ipconfig);
- connman_ipconfig_unref(ipdevice->config);
+ enable_ipv6(ipdevice->config_ipv6);
}
+ ipconfig_list = g_list_append(ipconfig_list, ipconfig);
+
+ if (ipdevice->flags & IFF_UP)
+ up = true;
+ else
+ down = true;
- ipdevice->config = connman_ipconfig_ref(ipconfig);
+ if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) ==
+ (IFF_RUNNING | IFF_LOWER_UP))
+ lower_up = true;
+ else if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) == 0)
+ lower_down = true;
+
+ ifname = connman_inet_ifname(ipconfig->index);
+
+ if (up && ipconfig->ops->up)
+ ipconfig->ops->up(ipconfig, ifname);
+ if (lower_up && ipconfig->ops->lower_up)
+ ipconfig->ops->lower_up(ipconfig, ifname);
+
+ if (lower_down && ipconfig->ops->lower_down)
+ ipconfig->ops->lower_down(ipconfig, ifname);
+ if (down && ipconfig->ops->down)
+ ipconfig->ops->down(ipconfig, ifname);
+
+ g_free(ifname);
return 0;
}
DBG("ipconfig %p", ipconfig);
- if (ipconfig == NULL || ipconfig->index < 0)
+ if (!ipconfig || ipconfig->index < 0)
return -ENODEV;
ipdevice = g_hash_table_lookup(ipdevice_hash,
GINT_TO_POINTER(ipconfig->index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return -ENXIO;
- if (ipdevice->config == NULL || ipdevice->config != ipconfig)
+ if (!ipdevice->config_ipv4 && !ipdevice->config_ipv6)
return -EINVAL;
- connman_ipaddress_clear(ipdevice->config->system);
+ if (ipdevice->config_ipv4 == ipconfig) {
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
- connman_ipconfig_unref(ipdevice->config);
- ipdevice->config = NULL;
+ connman_ipaddress_clear(ipdevice->config_ipv4->system);
+ __connman_ipconfig_unref(ipdevice->config_ipv4);
+ ipdevice->config_ipv4 = NULL;
+ return 0;
+ }
- return 0;
+ if (ipdevice->config_ipv6 == ipconfig) {
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+
+ connman_ipaddress_clear(ipdevice->config_ipv6->system);
+ __connman_ipconfig_unref(ipdevice->config_ipv6);
+ ipdevice->config_ipv6 = NULL;
+ return 0;
+ }
+
+ return -EINVAL;
}
const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method)
break;
case CONNMAN_IPCONFIG_METHOD_OFF:
return "off";
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ return "fixed";
case CONNMAN_IPCONFIG_METHOD_MANUAL:
return "manual";
case CONNMAN_IPCONFIG_METHOD_DHCP:
return "dhcp";
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ return "auto";
}
return NULL;
{
if (g_strcmp0(method, "off") == 0)
return CONNMAN_IPCONFIG_METHOD_OFF;
+ else if (g_strcmp0(method, "fixed") == 0)
+ return CONNMAN_IPCONFIG_METHOD_FIXED;
else if (g_strcmp0(method, "manual") == 0)
return CONNMAN_IPCONFIG_METHOD_MANUAL;
else if (g_strcmp0(method, "dhcp") == 0)
return CONNMAN_IPCONFIG_METHOD_DHCP;
+ else if (g_strcmp0(method, "auto") == 0)
+ return CONNMAN_IPCONFIG_METHOD_AUTO;
else
return CONNMAN_IPCONFIG_METHOD_UNKNOWN;
}
+static const char *privacy2string(int privacy)
+{
+ if (privacy <= 0)
+ return "disabled";
+ else if (privacy == 1)
+ return "enabled";
+ else
+ return "prefered";
+}
+
+static int string2privacy(const char *privacy)
+{
+ if (g_strcmp0(privacy, "disabled") == 0)
+ return 0;
+ else if (g_strcmp0(privacy, "enabled") == 0)
+ return 1;
+ else if (g_strcmp0(privacy, "preferred") == 0)
+ return 2;
+ else if (g_strcmp0(privacy, "prefered") == 0)
+ return 2;
+ else
+ return 0;
+}
+
+int __connman_ipconfig_ipv6_reset_privacy(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+ int err;
+
+ if (!ipconfig)
+ return -EINVAL;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (!ipdevice)
+ return -ENODEV;
+
+ err = __connman_ipconfig_ipv6_set_privacy(ipconfig, privacy2string(
+ ipdevice->ipv6_privacy));
+
+ return err;
+}
+
+int __connman_ipconfig_ipv6_set_privacy(struct connman_ipconfig *ipconfig,
+ const char *value)
+{
+ int privacy;
+
+ if (!ipconfig)
+ return -EINVAL;
+
+ privacy = string2privacy(value);
+
+ ipconfig->ipv6_privacy_config = privacy;
+
+ enable_ipv6(ipconfig);
+
+ return 0;
+}
+
void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig,
DBusMessageIter *iter)
{
+ struct connman_ipaddress *append_addr = NULL;
const char *str;
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
+ return;
+
str = __connman_ipconfig_method2string(ipconfig->method);
- if (str == NULL)
+ if (!str)
return;
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
- if (ipconfig->system == NULL)
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
return;
- if (ipconfig->system->local != NULL) {
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ append_addr = ipconfig->address;
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ append_addr = ipconfig->system;
+ break;
+ }
+
+ if (!append_addr)
+ return;
+
+ if (append_addr->local) {
in_addr_t addr;
struct in_addr netmask;
char *mask;
connman_dbus_dict_append_basic(iter, "Address",
- DBUS_TYPE_STRING, &ipconfig->system->local);
+ DBUS_TYPE_STRING, &append_addr->local);
- addr = 0xffffffff << (32 - ipconfig->system->prefixlen);
+ addr = 0xffffffff << (32 - append_addr->prefixlen);
netmask.s_addr = htonl(addr);
mask = inet_ntoa(netmask);
connman_dbus_dict_append_basic(iter, "Netmask",
DBUS_TYPE_STRING, &mask);
}
+
+ if (append_addr->gateway)
+ connman_dbus_dict_append_basic(iter, "Gateway",
+ DBUS_TYPE_STRING, &append_addr->gateway);
+}
+
+void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig,
+ DBusMessageIter *iter,
+ struct connman_ipconfig *ipconfig_ipv4)
+{
+ struct connman_ipaddress *append_addr = NULL;
+ const char *str, *privacy;
+
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
+ str = __connman_ipconfig_method2string(ipconfig->method);
+ if (!str)
+ return;
+
+ if (ipconfig_ipv4 &&
+ ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO) {
+ if (__connman_6to4_check(ipconfig_ipv4) == 1)
+ str = "6to4";
+ }
+
+ connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ return;
+
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ append_addr = ipconfig->address;
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ append_addr = ipconfig->system;
+ break;
+ }
+
+ if (!append_addr)
+ return;
+
+ if (append_addr->local) {
+ connman_dbus_dict_append_basic(iter, "Address",
+ DBUS_TYPE_STRING, &append_addr->local);
+ connman_dbus_dict_append_basic(iter, "PrefixLength",
+ DBUS_TYPE_BYTE,
+ &append_addr->prefixlen);
+ }
+
+ if (append_addr->gateway)
+ connman_dbus_dict_append_basic(iter, "Gateway",
+ DBUS_TYPE_STRING, &append_addr->gateway);
+
+ privacy = privacy2string(ipconfig->ipv6_privacy_config);
+ connman_dbus_dict_append_basic(iter, "Privacy",
+ DBUS_TYPE_STRING, &privacy);
+}
+
+void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig,
+ DBusMessageIter *iter)
+{
+ const char *str, *privacy;
+
+ str = __connman_ipconfig_method2string(ipconfig->method);
+ if (!str)
+ return;
+
+ connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ return;
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
+ }
+
+ if (!ipconfig->address)
+ return;
+
+ if (ipconfig->address->local) {
+ connman_dbus_dict_append_basic(iter, "Address",
+ DBUS_TYPE_STRING, &ipconfig->address->local);
+ connman_dbus_dict_append_basic(iter, "PrefixLength",
+ DBUS_TYPE_BYTE,
+ &ipconfig->address->prefixlen);
+ }
+
+ if (ipconfig->address->gateway)
+ connman_dbus_dict_append_basic(iter, "Gateway",
+ DBUS_TYPE_STRING, &ipconfig->address->gateway);
+
+ privacy = privacy2string(ipconfig->ipv6_privacy_config);
+ connman_dbus_dict_append_basic(iter, "Privacy",
+ DBUS_TYPE_STRING, &privacy);
}
void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
const char *str;
str = __connman_ipconfig_method2string(ipconfig->method);
- if (str == NULL)
+ if (!str)
return;
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
return;
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
break;
}
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return;
- if (ipconfig->address->local != NULL) {
+ if (ipconfig->address->local) {
in_addr_t addr;
struct in_addr netmask;
char *mask;
connman_dbus_dict_append_basic(iter, "Netmask",
DBUS_TYPE_STRING, &mask);
}
+
+ if (ipconfig->address->gateway)
+ connman_dbus_dict_append_basic(iter, "Gateway",
+ DBUS_TYPE_STRING, &ipconfig->address->gateway);
}
-int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig,
+int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
DBusMessageIter *array)
{
enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
- const char *address = NULL, *netmask = NULL;
+ const char *address = NULL, *netmask = NULL, *gateway = NULL,
+ *privacy_string = NULL;
+ int prefix_length = 0, privacy = 0;
DBusMessageIter dict;
-
- DBG("ipconfig %p", ipconfig);
+ int type = -1;
if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
return -EINVAL;
dbus_message_iter_recurse(array, &dict);
while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry;
+ DBusMessageIter entry, value;
const char *key;
int type;
dbus_message_iter_get_basic(&entry, &key);
dbus_message_iter_next(&entry);
- type = dbus_message_iter_get_arg_type(&entry);
+ if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_VARIANT)
+ return -EINVAL;
+
+ dbus_message_iter_recurse(&entry, &value);
- if (g_str_equal(key, "Method") == TRUE) {
+ type = dbus_message_iter_get_arg_type(&value);
+
+ if (g_str_equal(key, "Method")) {
const char *str;
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry, &str);
+ dbus_message_iter_get_basic(&value, &str);
method = __connman_ipconfig_string2method(str);
- } else if (g_str_equal(key, "Address") == TRUE) {
+ } else if (g_str_equal(key, "Address")) {
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(&value, &address);
+ } else if (g_str_equal(key, "PrefixLength")) {
+ if (type != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(&value, &prefix_length);
+
+ if (prefix_length < 0 || prefix_length > 128)
+ return -EINVAL;
+ } else if (g_str_equal(key, "Netmask")) {
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(&value, &netmask);
+ } else if (g_str_equal(key, "Gateway")) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry, &address);
- } else if (g_str_equal(key, "Netmask") == TRUE) {
+ dbus_message_iter_get_basic(&value, &gateway);
+ } else if (g_str_equal(key, "Privacy")) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry, &netmask);
+ dbus_message_iter_get_basic(&value, &privacy_string);
+ privacy = string2privacy(privacy_string);
}
dbus_message_iter_next(&dict);
}
- DBG("method %d address %s netmask %s", method, address, netmask);
+ DBG("method %d address %s netmask %s gateway %s prefix_length %d "
+ "privacy %s",
+ method, address, netmask, gateway, prefix_length,
+ privacy_string);
switch (method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
return -EINVAL;
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ ipconfig->method = method;
+
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return -EOPNOTSUPP;
+
+ ipconfig->method = method;
+ if (privacy_string)
+ ipconfig->ipv6_privacy_config = privacy;
+
+ break;
+
case CONNMAN_IPCONFIG_METHOD_MANUAL:
- if (address == NULL)
+ switch (ipconfig->type) {
+ case CONNMAN_IPCONFIG_TYPE_IPV4:
+ type = AF_INET;
+ break;
+ case CONNMAN_IPCONFIG_TYPE_IPV6:
+ type = AF_INET6;
+ break;
+ case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+ case CONNMAN_IPCONFIG_TYPE_ALL:
+ type = -1;
+ break;
+ }
+
+ if ((address && connman_inet_check_ipaddress(address)
+ != type) ||
+ (netmask &&
+ connman_inet_check_ipaddress(netmask)
+ != type) ||
+ (gateway &&
+ connman_inet_check_ipaddress(gateway)
+ != type))
return -EINVAL;
ipconfig->method = method;
- connman_ipaddress_set(ipconfig->address, address, netmask);
+
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ connman_ipaddress_set_ipv4(ipconfig->address,
+ address, netmask, gateway);
+ else
+ return connman_ipaddress_set_ipv6(
+ ipconfig->address, address,
+ prefix_length, gateway);
+
break;
case CONNMAN_IPCONFIG_METHOD_DHCP:
- if (ipconfig->method == method)
- return 0;
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
+ return -EOPNOTSUPP;
ipconfig->method = method;
break;
return 0;
}
-int __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig,
+void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig,
DBusMessageIter *iter)
{
+ struct connman_ipdevice *ipdevice;
const char *method = "auto";
connman_dbus_dict_append_basic(iter, "Method",
DBUS_TYPE_STRING, &method);
- if (ipconfig->eth != NULL)
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (!ipdevice)
+ return;
+
+ if (ipconfig->index >= 0) {
+ char *ifname = connman_inet_ifname(ipconfig->index);
+ if (ifname) {
+ connman_dbus_dict_append_basic(iter, "Interface",
+ DBUS_TYPE_STRING, &ifname);
+ g_free(ifname);
+ }
+ }
+
+ if (ipdevice->address)
connman_dbus_dict_append_basic(iter, "Address",
- DBUS_TYPE_STRING, &ipconfig->eth);
+ DBUS_TYPE_STRING, &ipdevice->address);
- if (ipconfig->mtu > 0)
+ if (ipdevice->mtu > 0)
connman_dbus_dict_append_basic(iter, "MTU",
- DBUS_TYPE_UINT16, &ipconfig->mtu);
-
- return 0;
+ DBUS_TYPE_UINT16, &ipdevice->mtu);
}
-int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
+void __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
GKeyFile *keyfile, const char *identifier, const char *prefix)
{
+ char *method;
+ char *str;
+ struct ipconfig_store is = { .file = keyfile,
+ .group = identifier,
+ .prefix = prefix };
+
DBG("ipconfig %p identifier %s", ipconfig, identifier);
- return 0;
+ method = store_get_str(&is, "method");
+ if (!method) {
+ switch (ipconfig->type) {
+ case CONNMAN_IPCONFIG_TYPE_IPV4:
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
+ break;
+
+ case CONNMAN_IPCONFIG_TYPE_IPV6:
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_AUTO;
+ break;
+
+ case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+ case CONNMAN_IPCONFIG_TYPE_ALL:
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
+ break;
+ }
+ } else {
+ ipconfig->method = __connman_ipconfig_string2method(method);
+ g_free(method);
+ }
+
+ if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_UNKNOWN)
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
+
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO ||
+ ipconfig->method == CONNMAN_IPCONFIG_METHOD_MANUAL) {
+ char *privacy;
+
+ privacy = store_get_str(&is, "privacy");
+ ipconfig->ipv6_privacy_config = string2privacy(privacy);
+ g_free(privacy);
+ }
+
+ g_strfreev(ipconfig->last_dhcpv6_prefixes);
+ ipconfig->last_dhcpv6_prefixes =
+ store_get_strs(&is, "DHCP.LastPrefixes");
+ }
+
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ ipconfig->address->prefixlen =
+ store_get_int(&is, "netmask_prefixlen");
+
+ g_free(ipconfig->address->local);
+ ipconfig->address->local =
+ store_get_str(&is, "local_address");
+
+ g_free(ipconfig->address->peer);
+ ipconfig->address->peer =
+ store_get_str(&is, "peer_address");
+
+ g_free(ipconfig->address->broadcast);
+ ipconfig->address->broadcast =
+ store_get_str(&is, "broadcast_address");
+
+ g_free(ipconfig->address->gateway);
+ ipconfig->address->gateway =
+ store_get_str(&is, "gateway");
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
+ break;
+
+ /*
+ * If the last used method for IPv4 was AUTO then we
+ * try first DHCP. We will try also to use the last
+ * used DHCP address, if exits.
+ */
+ __connman_ipconfig_set_method(ipconfig,
+ CONNMAN_IPCONFIG_METHOD_DHCP);
+ /* fall through */
+
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ str = store_get_str(&is, "DHCP.LastAddress");
+ if (str) {
+ g_free(ipconfig->last_dhcp_address);
+ ipconfig->last_dhcp_address = str;
+ }
+
+ break;
+ }
}
-int __connman_ipconfig_save(struct connman_ipconfig *ipconfig,
+void __connman_ipconfig_save(struct connman_ipconfig *ipconfig,
GKeyFile *keyfile, const char *identifier, const char *prefix)
{
- DBG("ipconfig %p identifier %s", ipconfig, identifier);
+ const char *method;
+ struct ipconfig_store is = { .file = keyfile,
+ .group = identifier,
+ .prefix = prefix };
- return 0;
+ method = __connman_ipconfig_method2string(ipconfig->method);
+ DBG("ipconfig %p identifier %s method %s", ipconfig, identifier,
+ method);
+ store_set_str(&is, "method", method);
+
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ store_set_str(&is, "privacy",
+ privacy2string(ipconfig->ipv6_privacy_config));
+
+ store_set_str(&is, "DHCP.LastAddress",
+ ipconfig->last_dhcp_address);
+
+ store_set_strs(&is, "DHCP.LastPrefixes",
+ ipconfig->last_dhcpv6_prefixes);
+ }
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ store_set_str(&is, "DHCP.LastAddress",
+ ipconfig->last_dhcp_address);
+ /* fall through */
+
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ return;
+ }
+
+ store_set_int(&is, "netmask_prefixlen", ipconfig->address->prefixlen);
+ store_set_str(&is, "local_address", ipconfig->address->local);
+ store_set_str(&is, "peer_address", ipconfig->address->peer);
+ store_set_str(&is, "broadcast_address", ipconfig->address->broadcast);
+ store_set_str(&is, "gateway", ipconfig->address->gateway);
}
int __connman_ipconfig_init(void)
ipdevice_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal,
NULL, free_ipdevice);
+ is_ipv6_supported = connman_inet_is_ipv6_supported();
+
return 0;
}