#include <config.h>
#endif
+#include <stdio.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <linux/if_link.h>
enum connman_ipconfig_method method;
struct connman_ipaddress *address;
struct connman_ipaddress *system;
-
- struct connman_ipconfig *ipv6;
};
struct connman_ipdevice {
char *ipv4_gateway;
char *ipv6_gateway;
- struct connman_ipconfig *config;
+ char *pac;
+
+ struct connman_ipconfig *config_ipv4;
+ struct connman_ipconfig *config_ipv6;
- struct connman_ipconfig_driver *driver;
- struct connman_ipconfig *driver_config;
+ gboolean ipv6_enabled;
};
static GHashTable *ipdevice_hash = NULL;
g_free(ipaddress);
}
-static unsigned char netmask2prefixlen(const char *netmask)
+unsigned char __connman_ipconfig_netmask_prefix_len(const char *netmask)
{
- unsigned char bits = 0;
- in_addr_t mask = inet_network(netmask);
- in_addr_t host = ~mask;
+ unsigned char bits;
+ in_addr_t mask;
+ in_addr_t host;
+
+ if (netmask == NULL)
+ return 32;
+
+ mask = inet_network(netmask);
+ host = ~mask;
/* a valid netmask must be 2^n - 1 */
if ((host & (host + 1)) != 0)
return -1;
+ bits = 0;
for (; mask; mask <<= 1)
++bits;
if (ipaddress == NULL)
return;
- if (netmask != NULL)
- ipaddress->prefixlen = netmask2prefixlen(netmask);
- else
- ipaddress->prefixlen = 32;
+ ipaddress->prefixlen = __connman_ipconfig_netmask_prefix_len(netmask);
g_free(ipaddress->local);
ipaddress->local = g_strdup(address);
return "";
}
-static void free_ipdevice(gpointer data)
+static gboolean get_ipv6_state(gchar *ifname)
{
- struct connman_ipdevice *ipdevice = data;
+ int disabled;
+ gchar *path;
+ FILE *f;
+ gboolean enabled = FALSE;
- connman_info("%s {remove} index %d", ipdevice->ifname,
- ipdevice->index);
+ if (ifname == NULL)
+ 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 == NULL)
+ return enabled;
- free_address_list(ipdevice);
- g_free(ipdevice->ipv4_gateway);
- g_free(ipdevice->ipv6_gateway);
+ f = fopen(path, "r");
- g_free(ipdevice->address);
- g_free(ipdevice->ifname);
- g_free(ipdevice);
-}
+ g_free(path);
-static GSList *driver_list = NULL;
-
-static gint compare_priority(gconstpointer a, gconstpointer b)
-{
- const struct connman_ipconfig_driver *driver1 = a;
- const struct connman_ipconfig_driver *driver2 = b;
+ if (f != NULL) {
+ if (fscanf(f, "%d", &disabled) > 0)
+ enabled = !disabled;
+ fclose(f);
+ }
- return driver2->priority - driver1->priority;
+ return enabled;
}
-/**
- * connman_ipconfig_driver_register:
- * @driver: IP configuration driver
- *
- * Register a new IP configuration driver
- *
- * Returns: %0 on success
- */
-int connman_ipconfig_driver_register(struct connman_ipconfig_driver *driver)
+static void set_ipv6_state(gchar *ifname, gboolean enable)
{
- DBG("driver %p name %s", driver, driver->name);
+ gchar *path;
+ FILE *f;
+
+ if (ifname == NULL)
+ 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);
- driver_list = g_slist_insert_sorted(driver_list, driver,
- compare_priority);
+ if (path == NULL)
+ return;
- return 0;
-}
+ f = fopen(path, "r+");
-/**
- * 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)
-{
- DBG("driver %p name %s", driver, driver->name);
+ g_free(path);
- driver_list = g_slist_remove(driver_list, driver);
+ if (f == NULL)
+ return;
+
+ if (enable == FALSE)
+ fprintf(f, "1");
+ else
+ fprintf(f, "0");
+
+ fclose(f);
}
-static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
+static void free_ipdevice(gpointer data)
{
- GSList *list;
+ struct connman_ipdevice *ipdevice = data;
- DBG("ipconfig %p", ipdevice->config);
+ connman_info("%s {remove} index %d", ipdevice->ifname,
+ ipdevice->index);
- if (ipdevice->config == NULL)
- return;
+ if (ipdevice->config_ipv4 != NULL) {
+ connman_ipconfig_unref(ipdevice->config_ipv4);
+ ipdevice->config_ipv4 = NULL;
+ }
- switch (ipdevice->config->method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
- case CONNMAN_IPCONFIG_METHOD_FIXED:
- case CONNMAN_IPCONFIG_METHOD_MANUAL:
- return;
- case CONNMAN_IPCONFIG_METHOD_DHCP:
- break;
+ if (ipdevice->config_ipv6 != NULL) {
+ connman_ipconfig_unref(ipdevice->config_ipv6);
+ ipdevice->config_ipv6 = NULL;
}
- if (ipdevice->driver != NULL)
- return;
+ free_address_list(ipdevice);
+ g_free(ipdevice->ipv4_gateway);
+ g_free(ipdevice->ipv6_gateway);
+ g_free(ipdevice->pac);
- ipdevice->driver_config = connman_ipconfig_clone(ipdevice->config);
- if (ipdevice->driver_config == NULL)
- return;
+ g_free(ipdevice->address);
- for (list = driver_list; list; list = list->next) {
- struct connman_ipconfig_driver *driver = list->data;
+ set_ipv6_state(ipdevice->ifname, ipdevice->ipv6_enabled);
- if (driver->request(ipdevice->driver_config) == 0) {
- ipdevice->driver = driver;
- break;
- }
- }
+ g_free(ipdevice->ifname);
+ g_free(ipdevice);
+}
- if (ipdevice->driver == NULL) {
- connman_ipconfig_unref(ipdevice->driver_config);
- ipdevice->driver_config = NULL;
- }
+static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
+{
+ DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
+ ipdevice->config_ipv6);
}
static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice)
{
- DBG("ipconfig %p", ipdevice->config);
-
- if (ipdevice->config == NULL)
- return;
-
- if (ipdevice->driver == NULL)
- return;
+ DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
+ ipdevice->config_ipv6);
- ipdevice->driver->release(ipdevice->driver_config);
+ if (ipdevice->config_ipv4)
+ connman_inet_clear_address(ipdevice->index,
+ ipdevice->config_ipv4->address);
- ipdevice->driver = NULL;
-
- connman_ipconfig_unref(ipdevice->driver_config);
- ipdevice->driver_config = NULL;
-
- connman_inet_clear_address(ipdevice->index);
- connman_inet_clear_ipv6_address(ipdevice->index,
- ipdevice->driver_config->address->local,
- ipdevice->driver_config->address->prefixlen);
+ if (ipdevice->config_ipv6)
+ connman_inet_clear_ipv6_address(ipdevice->index,
+ ipdevice->config_ipv6->address->local,
+ ipdevice->config_ipv6->address->prefixlen);
}
static void update_stats(struct connman_ipdevice *ipdevice,
struct rtnl_link_stats *stats)
{
+ struct connman_service *service;
+
if (stats->rx_packets == 0 && stats->tx_packets == 0)
return;
connman_info("%s {TX} %u packets %u bytes", ipdevice->ifname,
stats->tx_packets, stats->tx_bytes);
- if (ipdevice->config == NULL)
+ if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
+ return;
+
+ if (ipdevice->config_ipv4)
+ service = connman_ipconfig_get_data(ipdevice->config_ipv4);
+ else if (ipdevice->config_ipv6)
+ service = connman_ipconfig_get_data(ipdevice->config_ipv6);
+ else
+ return;
+
+ if (service == NULL)
return;
ipdevice->rx_packets = stats->rx_packets;
ipdevice->rx_dropped = stats->rx_dropped;
ipdevice->tx_dropped = stats->tx_dropped;
- __connman_counter_notify(ipdevice->config,
+ __connman_service_notify(service,
ipdevice->rx_packets, ipdevice->tx_packets,
ipdevice->rx_bytes, ipdevice->tx_bytes,
ipdevice->rx_errors, ipdevice->tx_errors,
ipdevice->ifname = connman_inet_ifname(index);
ipdevice->type = type;
+ ipdevice->ipv6_enabled = get_ipv6_state(ipdevice->ifname);
+
ipdevice->address = g_strdup(address);
g_hash_table_insert(ipdevice_hash, GINT_TO_POINTER(index), ipdevice);
g_hash_table_remove(ipdevice_hash, GINT_TO_POINTER(index));
}
+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);
+}
+
void __connman_ipconfig_newaddr(int index, int family, const char *label,
unsigned char prefixlen, const char *address)
{
ipaddress->prefixlen = prefixlen;
ipaddress->local = g_strdup(address);
+ if (g_slist_find_custom(ipdevice->address_list, ipaddress,
+ check_duplicate_address)) {
+ connman_ipaddress_free(ipaddress);
+ return;
+ }
+
ipdevice->address_list = g_slist_append(ipdevice->address_list,
ipaddress);
- connman_info("%s {add} address %s/%u label %s", ipdevice->ifname,
- address, prefixlen, label);
+ connman_info("%s {add} address %s/%u label %s family %d",
+ ipdevice->ifname, address, prefixlen, label, family);
- if (ipdevice->config != NULL) {
- if (family == AF_INET6 && ipdevice->config->ipv6 != NULL)
- connman_ipaddress_copy(ipdevice->config->ipv6->system,
- ipaddress);
- else
- connman_ipaddress_copy(ipdevice->config->system,
- ipaddress);
- }
+ if (ipdevice->config_ipv4 != NULL && family == AF_INET)
+ connman_ipaddress_copy(ipdevice->config_ipv4->system,
+ ipaddress);
- if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
+ else if (ipdevice->config_ipv6 != NULL && family == AF_INET6)
+ connman_ipaddress_copy(ipdevice->config_ipv6->system,
+ ipaddress);
+ else
return;
- if (g_slist_length(ipdevice->address_list) > 1)
+ if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
return;
for (list = g_list_first(ipconfig_list); list;
ipdevice->address_list = g_slist_remove(ipdevice->address_list,
ipaddress);
- connman_ipaddress_free(ipaddress);
+ connman_ipaddress_clear(ipaddress);
+ g_free(ipaddress);
connman_info("%s {del} address %s/%u label %s", ipdevice->ifname,
address, prefixlen, label);
if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
GSList *list;
+ GList *config_list;
if (family == AF_INET6) {
g_free(ipdevice->ipv6_gateway);
ipdevice->ipv6_gateway = g_strdup(gateway);
+
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->system != NULL) {
+ g_free(ipdevice->config_ipv6->system->gateway);
+ ipdevice->config_ipv6->system->gateway =
+ g_strdup(gateway);
+ }
} else {
g_free(ipdevice->ipv4_gateway);
ipdevice->ipv4_gateway = g_strdup(gateway);
- }
- if (ipdevice->config != NULL &&
- ipdevice->config->system != NULL) {
- g_free(ipdevice->config->system->gateway);
- ipdevice->config->system->gateway = g_strdup(gateway);
+ if (ipdevice->config_ipv4 != NULL &&
+ ipdevice->config_ipv4->system != NULL) {
+ g_free(ipdevice->config_ipv4->system->gateway);
+ ipdevice->config_ipv4->system->gateway =
+ g_strdup(gateway);
+ }
}
for (list = ipdevice->address_list; list; list = list->next) {
g_free(ipaddress->gateway);
ipaddress->gateway = g_strdup(gateway);
}
+
+ 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 (ipconfig->ops == NULL)
+ continue;
+
+ if (ipconfig->ops->ip_bound)
+ ipconfig->ops->ip_bound(ipconfig);
+ }
}
connman_info("%s {add} route %s gw %s scope %u <%s>",
if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
GSList *list;
+ GList *config_list;
if (family == AF_INET6) {
g_free(ipdevice->ipv6_gateway);
ipdevice->ipv6_gateway = NULL;
+
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->system != NULL) {
+ g_free(ipdevice->config_ipv6->system->gateway);
+ ipdevice->config_ipv6->system->gateway = NULL;
+ }
} else {
g_free(ipdevice->ipv4_gateway);
ipdevice->ipv4_gateway = NULL;
- }
- if (ipdevice->config != NULL &&
- ipdevice->config->system != NULL) {
- g_free(ipdevice->config->system->gateway);
- ipdevice->config->system->gateway = NULL;
+ if (ipdevice->config_ipv4 != NULL &&
+ ipdevice->config_ipv4->system != NULL) {
+ g_free(ipdevice->config_ipv4->system->gateway);
+ ipdevice->config_ipv4->system->gateway = NULL;
+ }
}
for (list = ipdevice->address_list; list; list = list->next) {
g_free(ipaddress->gateway);
ipaddress->gateway = NULL;
}
+
+ 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 (ipconfig->ops == NULL)
+ continue;
+
+ if (ipconfig->ops->ip_release)
+ ipconfig->ops->ip_release(ipconfig);
+ }
}
connman_info("%s {del} route %s gw %s scope %u <%s>",
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;
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;
return ipdevice->flags;
}
-const char *__connman_ipconfig_get_gateway(int index)
+const char *__connman_ipconfig_get_gateway_from_index(int index)
{
struct connman_ipdevice *ipdevice;
if (ipdevice->ipv4_gateway != NULL)
return ipdevice->ipv4_gateway;
- if (ipdevice->config != NULL &&
- ipdevice->config->address != NULL)
- return ipdevice->config->address->gateway;
+ if (ipdevice->config_ipv4 != NULL &&
+ ipdevice->config_ipv4->address != NULL)
+ return ipdevice->config_ipv4->address->gateway;
+
+ if (ipdevice->ipv6_gateway != NULL)
+ return ipdevice->ipv6_gateway;
+
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->address != NULL)
+ return ipdevice->config_ipv6->address->gateway;
return NULL;
}
void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int index)
{
ipconfig->index = index;
-
- if (ipconfig->ipv6 != NULL)
- ipconfig->ipv6->index = index;
}
static struct connman_ipconfig *create_ipv6config(int index)
if (ipv6config == NULL)
return NULL;
+ ipv6config->refcount = 1;
+
ipv6config->index = index;
ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
ipv6config->address = connman_ipaddress_alloc(AF_INET6);
if (ipv6config->address == NULL) {
ipv6config->system = connman_ipaddress_alloc(AF_INET6);
- ipv6config->ipv6 = NULL;
-
DBG("ipconfig %p", ipv6config);
return ipv6config;
*
* Returns: a newly-allocated #connman_ipconfig structure
*/
-struct connman_ipconfig *connman_ipconfig_create(int index)
+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);
+
DBG("index %d", index);
ipconfig = g_try_new0(struct connman_ipconfig, 1);
ipconfig->system = connman_ipaddress_alloc(AF_INET);
- ipconfig->ipv6 = create_ipv6config(index);
-
DBG("ipconfig %p", ipconfig);
return ipconfig;
}
-/**
- * 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)
-{
- struct connman_ipconfig *ipconfig_clone;
-
- DBG("ipconfig %p", ipconfig);
-
- ipconfig_clone = g_try_new0(struct connman_ipconfig, 1);
- if (ipconfig_clone == NULL)
- return NULL;
-
- ipconfig_clone->refcount = 1;
-
- ipconfig_clone->origin = connman_ipconfig_ref(ipconfig);
-
- ipconfig_clone->index = -1;
-
- return ipconfig_clone;
-}
/**
* connman_ipconfig_ref:
*/
struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig)
{
+ DBG("ipconfig %p refcount %d", ipconfig,
+ g_atomic_int_get(&ipconfig->refcount) + 1);
+
g_atomic_int_inc(&ipconfig->refcount);
return ipconfig;
}
-static void free_ipv6config(struct connman_ipconfig *ipconfig)
-{
- if (ipconfig == NULL)
- return;
-
- connman_ipconfig_set_ops(ipconfig, NULL);
- connman_ipaddress_free(ipconfig->system);
- connman_ipaddress_free(ipconfig->address);
- g_free(ipconfig->ipv6);
-}
-
/**
* connman_ipconfig_unref:
* @ipconfig: ipconfig structure
*/
void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
{
+ if (ipconfig == NULL)
+ return;
+
+ DBG("ipconfig %p refcount %d", ipconfig,
+ g_atomic_int_get(&ipconfig->refcount) - 1);
+
if (g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) {
__connman_ipconfig_disable(ipconfig);
connman_ipaddress_free(ipconfig->system);
connman_ipaddress_free(ipconfig->address);
- free_ipv6config(ipconfig->ipv6);
g_free(ipconfig);
}
}
*/
void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig)
{
+ if (ipconfig == NULL)
+ return NULL;
+
return ipconfig->ops_data;
}
ipconfig->ops = ops;
}
-struct connman_ipconfig *connman_ipconfig_get_ipv6config(
- struct connman_ipconfig *ipconfig)
-{
- if (ipconfig == NULL)
- return NULL;
-
- return ipconfig->ipv6;
-}
-
/**
* connman_ipconfig_set_method:
* @ipconfig: ipconfig structure
struct connman_ipconfig *ipconfig,
struct connman_element *element)
{
- element->ipv6.gateway = ipconfig->ipv6->address->gateway;
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ element->ipv6.gateway = ipconfig->address->gateway;
}
/*
connection->type = CONNMAN_ELEMENT_TYPE_CONNECTION;
connection->index = ipconfig->index;
- connection->ipv4.gateway = ipconfig->address->gateway;
- connection->ipv6.gateway = ipconfig->ipv6->address->gateway;
+
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ connection->ipv4.gateway = ipconfig->address->gateway;
+ else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ connection->ipv6.gateway = ipconfig->address->gateway;
if (connman_element_register(connection, parent) < 0)
connman_element_unref(connection);
case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
- return connman_inet_clear_address(ipconfig->index);
+ return connman_inet_clear_address(ipconfig->index,
+ ipconfig->address);
else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
return connman_inet_clear_ipv6_address(
ipconfig->index,
return 0;
}
+int __connman_ipconfig_set_proxy_autoconfig(struct connman_ipconfig *ipconfig,
+ const char *url)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("ipconfig %p", ipconfig);
+
+ if (ipconfig == NULL || ipconfig->index < 0)
+ return -ENODEV;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ 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;
+
+ DBG("ipconfig %p", ipconfig);
+
+ if (ipconfig == NULL || ipconfig->index < 0)
+ return NULL;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return NULL;
+
+ return ipdevice->pac;
+}
+
int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig)
{
struct connman_ipdevice *ipdevice;
gboolean up = FALSE, down = FALSE;
gboolean lower_up = FALSE, lower_down = FALSE;
+ enum connman_ipconfig_type type;
DBG("ipconfig %p", ipconfig);
if (ipdevice == NULL)
return -ENXIO;
- if (ipdevice->config == ipconfig)
- return -EALREADY;
+ 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 (ipdevice->config != NULL) {
- ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
+ ipdevice->config_ipv4 != NULL) {
+ 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 != NULL) {
+ ipconfig_list = g_list_remove(ipconfig_list,
+ ipdevice->config_ipv6);
- connman_ipaddress_clear(ipdevice->config->system);
+ connman_ipaddress_clear(ipdevice->config_ipv6->system);
- connman_ipconfig_unref(ipdevice->config);
+ connman_ipconfig_unref(ipdevice->config_ipv6);
}
- ipdevice->config = connman_ipconfig_ref(ipconfig);
+ 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);
ipconfig_list = g_list_append(ipconfig_list, ipconfig);
if (ipdevice == NULL)
return -ENXIO;
- if (ipdevice->config == NULL || ipdevice->config != ipconfig)
+ if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
return -EINVAL;
- ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+ if (ipdevice->config_ipv4 == ipconfig) {
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
- connman_ipaddress_clear(ipdevice->config->system);
- connman_ipaddress_clear(ipdevice->config->ipv6->system);
+ connman_ipaddress_clear(ipdevice->config_ipv4->system);
+ connman_ipconfig_unref(ipdevice->config_ipv4);
+ ipdevice->config_ipv4 = NULL;
+ return 0;
+ }
- connman_ipconfig_unref(ipdevice->config);
- ipdevice->config = NULL;
+ if (ipdevice->config_ipv6 == ipconfig) {
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
- return 0;
+ 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)
return "manual";
case CONNMAN_IPCONFIG_METHOD_DHCP:
return "dhcp";
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ return "auto";
}
return NULL;
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;
}
DBG("");
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
+ return;
+
str = __connman_ipconfig_method2string(ipconfig->method);
if (str == NULL)
return;
DBG("");
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
str = __connman_ipconfig_method2string(ipconfig->method);
if (str == NULL)
return;
return;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
}
case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
return;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
break;
DBUS_TYPE_STRING, &ipconfig->address->gateway);
}
+static void disable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("");
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return;
+
+ set_ipv6_state(ipdevice->ifname, FALSE);
+}
+
+static void enable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("");
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return;
+
+ set_ipv6_state(ipdevice->ifname, TRUE);
+}
+
int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
- enum connman_ipconfig_type type, DBusMessageIter *array)
+ DBusMessageIter *array)
{
enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
const char *address = NULL, *netmask = NULL, *gateway = NULL,
int prefix_length = 0;
DBusMessageIter dict;
- DBG("ipconfig %p type %d", ipconfig, type);
-
- if (type != CONNMAN_IPCONFIG_TYPE_IPV4 &&
- type != CONNMAN_IPCONFIG_TYPE_IPV6)
- return -EINVAL;
+ DBG("ipconfig %p", ipconfig);
if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
return -EINVAL;
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;
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ disable_ipv6(ipconfig);
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return -EINVAL;
+
+ ipconfig->method = method;
+ enable_ipv6(ipconfig);
+ break;
+
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (address == NULL)
return -EINVAL;
ipconfig->method = method;
- if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
connman_ipaddress_set_ipv4(ipconfig->address,
address, netmask, gateway);
else
break;
case CONNMAN_IPCONFIG_METHOD_DHCP:
- if (ipconfig->method == method)
- return 0;
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ return -EOPNOTSUPP;
ipconfig->method = method;
break;
return 0;
}
-void __connman_ipconfig_append_proxy(struct connman_ipconfig *ipconfig,
- DBusMessageIter *iter)
-{
- const char *method = "direct";
-
- connman_dbus_dict_append_basic(iter, "Method",
- DBUS_TYPE_STRING, &method);
-}
-
void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig,
DBusMessageIter *iter)
{
int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
GKeyFile *keyfile, const char *identifier, const char *prefix)
{
- const char *method;
+ char *method;
char *key;
DBG("ipconfig %p identifier %s", ipconfig, identifier);
key = g_strdup_printf("%smethod", prefix);
method = g_key_file_get_string(keyfile, identifier, key, NULL);
- if (method == NULL)
- ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
- else
+ if (method == NULL) {
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
+ else
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
+ } else
ipconfig->method = __connman_ipconfig_string2method(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_OFF)
+ disable_ipv6(ipconfig);
+ else if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO ||
+ ipconfig->method == CONNMAN_IPCONFIG_METHOD_MANUAL) {
+ enable_ipv6(ipconfig);
+ __connman_ipconfig_enable(ipconfig);
+
+ if (ipconfig->ops_data) {
+ struct connman_service *service =
+ ipconfig->ops_data;
+ struct connman_network *network;
+ network = __connman_service_get_network(
+ service);
+ if (network)
+ __connman_network_set_ipconfig(network,
+ NULL, ipconfig);
+ }
+ }
+ }
+
+ g_free(method);
g_free(key);
key = g_strdup_printf("%snetmask_prefixlen", prefix);
projects / platform / upstream / connman.git / blobdiff