*
* Connection Manager
*
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2012 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 "connman.h"
struct connman_ipconfig {
- gint refcount;
+ int refcount;
int index;
enum connman_ipconfig_type type;
const struct connman_ipconfig_ops *ops;
void *ops_data;
+ connman_bool_t enabled;
enum connman_ipconfig_method method;
struct connman_ipaddress *address;
struct connman_ipaddress *system;
int ipv6_privacy_config;
+ char *last_dhcp_address;
};
struct connman_ipdevice {
unsigned char buf[sizeof(struct in6_addr)];
int err;
+ if (address == NULL)
+ return FALSE;
+
err = inet_pton(AF_INET6, address, buf);
if (err > 0)
return TRUE;
}
int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress,
- const char *address, const char *gateway,
- unsigned char prefix_length)
+ const char *address,
+ unsigned char prefix_length,
+ const char *gateway)
{
if (ipaddress == NULL)
return -EINVAL;
DBG("prefix_len %d address %s gateway %s",
prefix_length, address, gateway);
- ipaddress->family = CONNMAN_IPCONFIG_TYPE_IPV6;
+ ipaddress->family = AF_INET6;
ipaddress->prefixlen = prefix_length;
if (ipaddress == NULL)
return -EINVAL;
- ipaddress->family = CONNMAN_IPCONFIG_TYPE_IPV4;
+ ipaddress->family = AF_INET;
ipaddress->prefixlen = __connman_ipconfig_netmask_prefix_len(netmask);
return NULL;
}
+const char *__connman_ipconfig_type2string(enum connman_ipconfig_type type)
+{
+ switch (type) {
+ case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+ 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) {
fclose(f);
}
+static int get_rp_filter()
+{
+ FILE *f;
+ int value = -EINVAL, tmp;
+
+ f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r");
+
+ if (f != NULL) {
+ if (fscanf(f, "%d", &tmp) == 1)
+ value = tmp;
+ fclose(f);
+ }
+
+ return value;
+}
+
+static void set_rp_filter(int value)
+{
+ FILE *f;
+
+ f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r+");
+
+ if (f == NULL)
+ return;
+
+ fprintf(f, "%d", value);
+
+ fclose(f);
+}
+
+int __connman_ipconfig_set_rp_filter()
+{
+ int value;
+
+ value = get_rp_filter();
+
+ 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);
+}
+
+gboolean __connman_ipconfig_ipv6_privacy_enabled(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig == NULL)
+ return FALSE;
+
+ return ipconfig->ipv6_privacy_config == 0 ? FALSE : TRUE;
+}
+
static void free_ipdevice(gpointer data)
{
struct connman_ipdevice *ipdevice = data;
ipdevice->index);
if (ipdevice->config_ipv4 != NULL) {
- connman_ipconfig_unref(ipdevice->config_ipv4);
+ __connman_ipconfig_unref(ipdevice->config_ipv4);
ipdevice->config_ipv4 = NULL;
}
if (ipdevice->config_ipv6 != NULL) {
- connman_ipconfig_unref(ipdevice->config_ipv6);
+ __connman_ipconfig_unref(ipdevice->config_ipv6);
ipdevice->config_ipv6 = NULL;
}
{
DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
ipdevice->config_ipv6);
+
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->enabled == TRUE)
+ return;
+
+ if (__connman_device_isfiltered(ipdevice->ifname) == FALSE) {
+ ipdevice->ipv6_enabled = get_ipv6_state(ipdevice->ifname);
+ set_ipv6_state(ipdevice->ifname, FALSE);
+ }
}
static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice)
return;
if (ipdevice->config_ipv4)
- service = connman_ipconfig_get_data(ipdevice->config_ipv4);
+ service = __connman_ipconfig_get_data(ipdevice->config_ipv4);
else if (ipdevice->config_ipv6)
- service = connman_ipconfig_get_data(ipdevice->config_ipv6);
+ service = __connman_ipconfig_get_data(ipdevice->config_ipv6);
else
return;
{
struct connman_ipdevice *ipdevice;
struct connman_ipaddress *ipaddress;
+ enum connman_ipconfig_type type;
GList *list;
DBG("index %d", index);
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_append(ipdevice->address_list,
ipaddress);
connman_info("%s {add} address %s/%u label %s family %d",
ipdevice->ifname, address, prefixlen, label, family);
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ __connman_ippool_newaddr(index, address, prefixlen);
+
if (ipdevice->config_ipv4 != NULL && family == AF_INET)
connman_ipaddress_copy(ipdevice->config_ipv4->system,
ipaddress);
if (index != ipconfig->index)
continue;
+ if (type != ipconfig->type)
+ continue;
+
if (ipconfig->ops == NULL)
continue;
{
struct connman_ipdevice *ipdevice;
struct connman_ipaddress *ipaddress;
+ enum connman_ipconfig_type type;
GList *list;
DBG("index %d", index);
if (ipaddress == NULL)
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);
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ __connman_ippool_deladdr(index, address, prefixlen);
+
connman_ipaddress_clear(ipaddress);
g_free(ipaddress);
if (index != ipconfig->index)
continue;
+ if (type != ipconfig->type)
+ continue;
+
if (ipconfig->ops == NULL)
continue;
if (ipdevice == NULL)
return;
- if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
- GSList *list;
+ 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);
ipdevice->config_ipv6->system->gateway =
g_strdup(gateway);
}
- } else {
+ } else if (family == AF_INET) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
g_free(ipdevice->ipv4_gateway);
ipdevice->ipv4_gateway = g_strdup(gateway);
ipdevice->config_ipv4->system->gateway =
g_strdup(gateway);
}
- }
-
- for (list = ipdevice->address_list; list; list = list->next) {
- struct connman_ipaddress *ipaddress = list->data;
-
- g_free(ipaddress->gateway);
- ipaddress->gateway = g_strdup(gateway);
- }
+ } else
+ return;
for (config_list = g_list_first(ipconfig_list); config_list;
config_list = g_list_next(config_list)) {
if (index != ipconfig->index)
continue;
+ if (type != ipconfig->type)
+ continue;
+
if (ipconfig->ops == NULL)
continue;
- if (ipconfig->ops->ip_bound)
- ipconfig->ops->ip_bound(ipconfig);
+ if (ipconfig->ops->route_set)
+ ipconfig->ops->route_set(ipconfig);
}
}
if (ipdevice == NULL)
return;
- if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
- GSList *list;
+ 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;
g_free(ipdevice->config_ipv6->system->gateway);
ipdevice->config_ipv6->system->gateway = NULL;
}
- } else {
+ } else if (family == AF_INET) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
g_free(ipdevice->ipv4_gateway);
ipdevice->ipv4_gateway = NULL;
g_free(ipdevice->config_ipv4->system->gateway);
ipdevice->config_ipv4->system->gateway = NULL;
}
- }
-
- for (list = ipdevice->address_list; list; list = list->next) {
- struct connman_ipaddress *ipaddress = list->data;
-
- g_free(ipaddress->gateway);
- ipaddress->gateway = NULL;
- }
+ } else
+ return;
for (config_list = g_list_first(ipconfig_list); config_list;
config_list = g_list_next(config_list)) {
if (index != ipconfig->index)
continue;
+ if (type != ipconfig->type)
+ continue;
+
if (ipconfig->ops == NULL)
continue;
- if (ipconfig->ops->ip_release)
- ipconfig->ops->ip_release(ipconfig);
+ if (ipconfig->ops->route_unset)
+ ipconfig->ops->route_unset(ipconfig);
}
}
return ipdevice->flags;
}
-const char *__connman_ipconfig_get_gateway_from_index(int index)
+const char *__connman_ipconfig_get_gateway_from_index(int index,
+ enum connman_ipconfig_type type)
{
struct connman_ipdevice *ipdevice;
if (ipdevice == NULL)
return NULL;
- if (ipdevice->ipv4_gateway != NULL)
- return ipdevice->ipv4_gateway;
+ if (type != CONNMAN_IPCONFIG_TYPE_IPV6) {
+ if (ipdevice->ipv4_gateway != NULL)
+ return ipdevice->ipv4_gateway;
- if (ipdevice->config_ipv4 != NULL &&
- ipdevice->config_ipv4->address != NULL)
- return ipdevice->config_ipv4->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 (type != CONNMAN_IPCONFIG_TYPE_IPV4) {
+ 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;
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->address != NULL)
+ return ipdevice->config_ipv6->address->gateway;
+ }
return NULL;
}
if (service == NULL)
return -EINVAL;
- __connman_connection_gateway_remove(service);
+ __connman_connection_gateway_remove(service, ipconfig->type);
- if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
- return __connman_connection_gateway_add(service, NULL,
- ipconfig->address->gateway,
- ipconfig->address->peer);
- } else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+ 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,
- NULL, ipconfig->address->peer);
- }
+ ipconfig->type,
+ ipconfig->address->peer);
return 0;
}
service = __connman_service_lookup_from_index(ipconfig->index);
if (service != NULL)
- __connman_connection_gateway_remove(service);
+ __connman_connection_gateway_remove(service, ipconfig->type);
}
unsigned char __connman_ipconfig_get_prefixlen(struct connman_ipconfig *ipconfig)
static struct connman_ipconfig *create_ipv6config(int index)
{
struct connman_ipconfig *ipv6config;
+ struct connman_ipdevice *ipdevice;
DBG("index %d", index);
ipv6config->refcount = 1;
ipv6config->index = index;
+ ipv6config->enabled = FALSE;
ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
- ipv6config->ipv6_privacy_config = 0;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ if (ipdevice != NULL)
+ ipv6config->ipv6_privacy_config = ipdevice->ipv6_privacy;
ipv6config->address = connman_ipaddress_alloc(AF_INET6);
if (ipv6config->address == NULL) {
*
* 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;
ipconfig->refcount = 1;
ipconfig->index = index;
+ ipconfig->enabled = FALSE;
ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4;
ipconfig->address = connman_ipaddress_alloc(AF_INET);
*
* 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)
{
- DBG("ipconfig %p refcount %d", ipconfig,
- g_atomic_int_get(&ipconfig->refcount) + 1);
+ DBG("%p ref %d by %s:%d:%s()", ipconfig, ipconfig->refcount + 1,
+ file, line, caller);
- g_atomic_int_inc(&ipconfig->refcount);
+ __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 (ipconfig == NULL)
return;
- DBG("ipconfig %p refcount %d", ipconfig,
- g_atomic_int_get(&ipconfig->refcount) - 1);
+ DBG("%p ref %d by %s:%d:%s()", ipconfig, ipconfig->refcount - 1,
+ file, line, caller);
- if (g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) {
- __connman_ipconfig_disable(ipconfig);
+ if (__sync_fetch_and_sub(&ipconfig->refcount, 1) != 1)
+ return;
- connman_ipconfig_set_ops(ipconfig, NULL);
+ if (__connman_ipconfig_disable(ipconfig) < 0)
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
- if (ipconfig->origin != NULL) {
- connman_ipconfig_unref(ipconfig->origin);
- ipconfig->origin = NULL;
- }
+ __connman_ipconfig_set_ops(ipconfig, NULL);
- connman_ipaddress_free(ipconfig->system);
- connman_ipaddress_free(ipconfig->address);
- g_free(ipconfig);
+ if (ipconfig->origin != NULL && ipconfig->origin != ipconfig) {
+ __connman_ipconfig_unref(ipconfig->origin);
+ ipconfig->origin = NULL;
}
+
+ connman_ipaddress_free(ipconfig->system);
+ connman_ipaddress_free(ipconfig->address);
+ g_free(ipconfig->last_dhcp_address);
+ 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 == NULL)
return NULL;
*
* 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 == NULL)
return -1;
*
* Get interface name
*/
-const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig)
+const char *__connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig)
{
struct connman_ipdevice *ipdevice;
*
* 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)
{
ipconfig->ops = ops;
*
* 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 ipconfig->method;
}
-/**
- * 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)
-{
- struct connman_ipconfig *origin;
-
- origin = ipconfig->origin ? ipconfig->origin : ipconfig;
-
- connman_ipaddress_copy(origin->address, ipaddress);
-
- connman_inet_set_address(origin->index, origin->address);
-}
-
-void __connman_ipconfig_set_element_ipv6_gateway(
- struct connman_ipconfig *ipconfig,
- struct connman_element *element)
-{
- if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
- element->ipv6.gateway = ipconfig->address->gateway;
-}
-
int __connman_ipconfig_address_add(struct connman_ipconfig *ipconfig)
{
DBG("");
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
- case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
int __connman_ipconfig_address_remove(struct connman_ipconfig *ipconfig)
{
+ int err;
+
DBG("");
if (ipconfig == NULL)
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:
+ err = __connman_ipconfig_address_unset(ipconfig);
+ connman_ipaddress_clear(ipconfig->address);
+
+ return err;
+ }
+
+ return 0;
+}
+
+int __connman_ipconfig_address_unset(struct connman_ipconfig *ipconfig)
+{
+ int err;
+
+ DBG("");
+
+ if (ipconfig == NULL)
+ return 0;
+
+ DBG("method %d", ipconfig->method);
+
+ 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_clear_address(ipconfig->index,
+ err = connman_inet_clear_address(ipconfig->index,
ipconfig->address);
else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
- return connman_inet_clear_ipv6_address(
+ err = connman_inet_clear_ipv6_address(
ipconfig->index,
ipconfig->address->local,
ipconfig->address->prefixlen);
+ else
+ err = -EINVAL;
+
+ return err;
}
return 0;
return ipdevice->pac;
}
+void __connman_ipconfig_set_dhcp_address(struct connman_ipconfig *ipconfig,
+ const char *address)
+{
+ if (ipconfig == NULL)
+ 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 == NULL)
+ return NULL;
+
+ return ipconfig->last_dhcp_address;
+}
+
static void disable_ipv6(struct connman_ipconfig *ipconfig)
{
struct connman_ipdevice *ipdevice;
set_ipv6_state(ipdevice->ifname, TRUE);
}
+void __connman_ipconfig_enable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig == NULL || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
+ enable_ipv6(ipconfig);
+}
+
void __connman_ipconfig_disable_ipv6(struct connman_ipconfig *ipconfig)
{
if (ipconfig == NULL || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
} else
return -EINVAL;
+ ipconfig->enabled = TRUE;
+
if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
ipdevice->config_ipv4 != NULL) {
ipconfig_list = g_list_remove(ipconfig_list,
connman_ipaddress_clear(ipdevice->config_ipv4->system);
- connman_ipconfig_unref(ipdevice->config_ipv4);
+ __connman_ipconfig_unref(ipdevice->config_ipv4);
}
if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
connman_ipaddress_clear(ipdevice->config_ipv6->system);
- connman_ipconfig_unref(ipdevice->config_ipv6);
+ __connman_ipconfig_unref(ipdevice->config_ipv6);
}
if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
- ipdevice->config_ipv4 = connman_ipconfig_ref(ipconfig);
+ ipdevice->config_ipv4 = __connman_ipconfig_ref(ipconfig);
else if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
- ipdevice->config_ipv6 = connman_ipconfig_ref(ipconfig);
+ ipdevice->config_ipv6 = __connman_ipconfig_ref(ipconfig);
ipconfig_list = g_list_append(ipconfig_list, ipconfig);
if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
return -EINVAL;
+ ipconfig->enabled = FALSE;
+
if (ipdevice->config_ipv4 == ipconfig) {
ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
connman_ipaddress_clear(ipdevice->config_ipv4->system);
- connman_ipconfig_unref(ipdevice->config_ipv4);
+ __connman_ipconfig_unref(ipdevice->config_ipv4);
ipdevice->config_ipv4 = NULL;
return 0;
}
disable_ipv6(ipdevice->config_ipv6);
connman_ipaddress_clear(ipdevice->config_ipv6->system);
- connman_ipconfig_unref(ipdevice->config_ipv6);
+ __connman_ipconfig_unref(ipdevice->config_ipv6);
ipdevice->config_ipv6 = NULL;
return 0;
}
void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig,
DBusMessageIter *iter)
{
+ struct connman_ipaddress *append_addr = NULL;
const char *str;
DBG("");
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
- if (ipconfig->system == NULL)
+ append_addr = ipconfig->system;
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
return;
- if (ipconfig->system->local != NULL) {
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ if (append_addr == NULL)
+ append_addr = ipconfig->address;
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
+ }
+
+ if (append_addr == NULL)
+ return;
+
+ if (append_addr->local != NULL) {
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 (ipconfig->system->gateway != NULL)
+ if (append_addr->gateway != NULL)
connman_dbus_dict_append_basic(iter, "Gateway",
- DBUS_TYPE_STRING, &ipconfig->system->gateway);
+ DBUS_TYPE_STRING, &append_addr->gateway);
}
void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig,
- DBusMessageIter *iter)
+ DBusMessageIter *iter,
+ struct connman_ipconfig *ipconfig_ipv4)
{
+ struct connman_ipaddress *append_addr = NULL;
const char *str, *privacy;
DBG("");
if (str == NULL)
return;
+ if (ipconfig_ipv4 != NULL &&
+ 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);
- if (ipconfig->system == NULL)
+ append_addr = ipconfig->system;
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ return;
+
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ if (append_addr == NULL)
+ append_addr = ipconfig->address;
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
+ }
+
+ if (append_addr == NULL)
return;
- if (ipconfig->system->local != NULL) {
+ if (append_addr->local != NULL) {
connman_dbus_dict_append_basic(iter, "Address",
- DBUS_TYPE_STRING, &ipconfig->system->local);
+ DBUS_TYPE_STRING, &append_addr->local);
connman_dbus_dict_append_basic(iter, "PrefixLength",
DBUS_TYPE_BYTE,
- &ipconfig->system->prefixlen);
+ &append_addr->prefixlen);
}
- if (ipconfig->system->gateway != NULL)
+ if (append_addr->gateway != NULL)
connman_dbus_dict_append_basic(iter, "Gateway",
- DBUS_TYPE_STRING, &ipconfig->system->gateway);
+ DBUS_TYPE_STRING, &append_addr->gateway);
privacy = privacy2string(ipconfig->ipv6_privacy_config);
connman_dbus_dict_append_basic(iter, "Privacy",
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
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_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
break;
}
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);
+
+ type = dbus_message_iter_get_arg_type(&value);
if (g_str_equal(key, "Method") == TRUE) {
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) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry, &address);
+ dbus_message_iter_get_basic(&value, &address);
} else if (g_str_equal(key, "PrefixLength") == TRUE) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry,
+ dbus_message_iter_get_basic(&value,
&prefix_length_string);
prefix_length = atoi(prefix_length_string);
if (prefix_length < 0 || prefix_length > 128)
return -EINVAL;
-
} else if (g_str_equal(key, "Netmask") == TRUE) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry, &netmask);
+ dbus_message_iter_get_basic(&value, &netmask);
} else if (g_str_equal(key, "Gateway") == TRUE) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry, &gateway);
+ dbus_message_iter_get_basic(&value, &gateway);
} else if (g_str_equal(key, "Privacy") == TRUE) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry, &privacy_string);
+ dbus_message_iter_get_basic(&value, &privacy_string);
privacy = string2privacy(privacy_string);
}
+
dbus_message_iter_next(&dict);
}
else
return connman_ipaddress_set_ipv6(
ipconfig->address, address,
- gateway, prefix_length);
+ prefix_length, gateway);
break;
case CONNMAN_IPCONFIG_METHOD_DHCP:
{
char *method;
char *key;
+ char *str;
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) {
- if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ switch (ipconfig->type) {
+ case CONNMAN_IPCONFIG_TYPE_IPV4:
ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
- else
+ break;
+ case CONNMAN_IPCONFIG_TYPE_IPV6:
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_AUTO;
+ break;
+ case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
+ break;
+ }
} else
ipconfig->method = __connman_ipconfig_string2method(method);
ipconfig->ipv6_privacy_config = string2privacy(privacy);
g_free(pprefix);
g_free(privacy);
-
- __connman_ipconfig_enable(ipconfig);
- enable_ipv6(ipconfig);
}
}
keyfile, identifier, key, NULL);
g_free(key);
+ key = g_strdup_printf("%sDHCP.LastAddress", prefix);
+ str = g_key_file_get_string(keyfile, identifier, key, NULL);
+ if (str != NULL) {
+ g_free(ipconfig->last_dhcp_address);
+ ipconfig->last_dhcp_address = str;
+ }
+ g_free(key);
+
return 0;
}
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
break;
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ key = g_strdup_printf("%sDHCP.LastAddress", prefix);
+ if (ipconfig->last_dhcp_address != NULL &&
+ strlen(ipconfig->last_dhcp_address) > 0)
+ g_key_file_set_string(keyfile, identifier, key,
+ ipconfig->last_dhcp_address);
+ else
+ g_key_file_remove_key(keyfile, identifier, key, NULL);
+ g_free(key);
+ /* fall through */
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
- case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_AUTO:
return 0;
}
projects / framework / connectivity / connman.git / blobdiff