*
* Connection Manager
*
- * Copyright (C) 2007-2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2010 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
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;
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;
ipconfig->ops->down(ipconfig);
}
+#if defined TIZEN_EXT
+ if (g_strcmp0(ipdevice->address, address) != 0) {
+ g_free(ipdevice->address);
+ ipdevice->address = g_strdup(address);
+ }
+#endif
+
if (lower_up)
__connman_ipconfig_lower_up(ipdevice);
if (lower_down)
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);
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 (scope == 0 && (g_strcmp0(dst, "0.0.0.0") == 0 ||
g_strcmp0(dst, "::") == 0)) {
+ GSList *list;
GList *config_list;
enum connman_ipconfig_type type;
} else
return;
+ for (list = ipdevice->address_list; list; list = list->next) {
+ struct connman_ipaddress *ipaddress = list->data;
+
+ 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 (ipconfig->ops == NULL)
continue;
- if (ipconfig->ops->route_set)
- ipconfig->ops->route_set(ipconfig);
+ if (ipconfig->ops->ip_bound)
+ ipconfig->ops->ip_bound(ipconfig);
}
}
if (scope == 0 && (g_strcmp0(dst, "0.0.0.0") == 0 ||
g_strcmp0(dst, "::") == 0)) {
+ GSList *list;
GList *config_list;
enum connman_ipconfig_type type;
} else
return;
+ for (list = ipdevice->address_list; list; list = list->next) {
+ struct connman_ipaddress *ipaddress = list->data;
+
+ 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 (ipconfig->ops == NULL)
continue;
- if (ipconfig->ops->route_unset)
- ipconfig->ops->route_unset(ipconfig);
+ if (ipconfig->ops->ip_release)
+ ipconfig->ops->ip_release(ipconfig);
}
}
return ipdevice->flags;
}
-const char *__connman_ipconfig_get_gateway_from_index(int index,
- enum connman_ipconfig_type type)
+const char *__connman_ipconfig_get_gateway_from_index(int index)
{
struct connman_ipdevice *ipdevice;
if (ipdevice == NULL)
return NULL;
- if (type != CONNMAN_IPCONFIG_TYPE_IPV6) {
- if (ipdevice->ipv4_gateway != NULL)
- return ipdevice->ipv4_gateway;
+ 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 (type != CONNMAN_IPCONFIG_TYPE_IPV4) {
- if (ipdevice->ipv6_gateway != NULL)
- return ipdevice->ipv6_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;
- }
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->address != NULL)
+ return ipdevice->config_ipv6->address->gateway;
return NULL;
}
ipconfig->address->gateway = g_strdup(gateway);
}
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+int __connman_ipconfig_gateway_add(struct connman_ipconfig *ipconfig, struct connman_service *service)
+#else
int __connman_ipconfig_gateway_add(struct connman_ipconfig *ipconfig)
+#endif
{
+#if !defined TIZEN_EXT
struct connman_service *service;
+#endif
DBG("");
if (ipconfig->address == NULL)
return -EINVAL;
+#if !defined TIZEN_EXT
service = __connman_service_lookup_from_index(ipconfig->index);
+#endif
if (service == NULL)
return -EINVAL;
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;
-
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice != NULL)
- ipv6config->ipv6_privacy_config = ipdevice->ipv6_privacy;
+ ipv6config->ipv6_privacy_config = 0;
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_debug(struct connman_ipconfig *ipconfig,
- const char *file, int line, const char *caller)
+struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig)
{
- DBG("%p ref %d by %s:%d:%s()", ipconfig, ipconfig->refcount + 1,
- file, line, caller);
+ DBG("ipconfig %p refcount %d", ipconfig, ipconfig->refcount + 1);
__sync_fetch_and_add(&ipconfig->refcount, 1);
*
* Decrease reference counter of ipconfig
*/
-void __connman_ipconfig_unref_debug(struct connman_ipconfig *ipconfig,
- const char *file, int line, const char *caller)
+void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
{
if (ipconfig == NULL)
return;
- DBG("%p ref %d by %s:%d:%s()", ipconfig, ipconfig->refcount - 1,
- file, line, caller);
+ DBG("ipconfig %p refcount %d", ipconfig, ipconfig->refcount - 1);
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_ipconfig_set_ops(ipconfig, NULL);
- if (ipconfig->origin != NULL && ipconfig->origin != ipconfig) {
- __connman_ipconfig_unref(ipconfig->origin);
+ if (ipconfig->origin != NULL) {
+ connman_ipconfig_unref(ipconfig->origin);
ipconfig->origin = NULL;
}
*
* 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;
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
- break;
case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
- break;
case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
- break;
case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
} 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);
- append_addr = ipconfig->system;
-
- switch (ipconfig->method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
+ if (ipconfig->system == NULL)
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 (append_addr->local != NULL) {
+ if (ipconfig->system->local != NULL) {
in_addr_t addr;
struct in_addr netmask;
char *mask;
connman_dbus_dict_append_basic(iter, "Address",
- DBUS_TYPE_STRING, &append_addr->local);
+ DBUS_TYPE_STRING, &ipconfig->system->local);
- addr = 0xffffffff << (32 - append_addr->prefixlen);
+ addr = 0xffffffff << (32 - ipconfig->system->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 != NULL)
+ if (ipconfig->system->gateway != NULL)
connman_dbus_dict_append_basic(iter, "Gateway",
- DBUS_TYPE_STRING, &append_addr->gateway);
+ DBUS_TYPE_STRING, &ipconfig->system->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;
DBG("");
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
- append_addr = ipconfig->system;
-
- switch (ipconfig->method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
+ if (ipconfig->system == NULL)
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 (append_addr->local != NULL) {
+ if (ipconfig->system->local != NULL) {
connman_dbus_dict_append_basic(iter, "Address",
- DBUS_TYPE_STRING, &append_addr->local);
+ DBUS_TYPE_STRING, &ipconfig->system->local);
connman_dbus_dict_append_basic(iter, "PrefixLength",
DBUS_TYPE_BYTE,
- &append_addr->prefixlen);
+ &ipconfig->system->prefixlen);
}
- if (append_addr->gateway != NULL)
+ if (ipconfig->system->gateway != NULL)
connman_dbus_dict_append_basic(iter, "Gateway",
- DBUS_TYPE_STRING, &append_addr->gateway);
+ DBUS_TYPE_STRING, &ipconfig->system->gateway);
privacy = privacy2string(ipconfig->ipv6_privacy_config);
connman_dbus_dict_append_basic(iter, "Privacy",
dbus_message_iter_recurse(array, &dict);
while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
+ DBusMessageIter entry;
const char *key;
int type;
dbus_message_iter_get_basic(&entry, &key);
dbus_message_iter_next(&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);
+ type = dbus_message_iter_get_arg_type(&entry);
if (g_str_equal(key, "Method") == TRUE) {
const char *str;
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&value, &str);
+ dbus_message_iter_get_basic(&entry, &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(&value, &address);
+ dbus_message_iter_get_basic(&entry, &address);
} else if (g_str_equal(key, "PrefixLength") == TRUE) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&value,
+ dbus_message_iter_get_basic(&entry,
&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(&value, &netmask);
+ dbus_message_iter_get_basic(&entry, &netmask);
} else if (g_str_equal(key, "Gateway") == TRUE) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&value, &gateway);
+ dbus_message_iter_get_basic(&entry, &gateway);
} else if (g_str_equal(key, "Privacy") == TRUE) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&value, &privacy_string);
+ dbus_message_iter_get_basic(&entry, &privacy_string);
privacy = string2privacy(privacy_string);
}
-
dbus_message_iter_next(&dict);
}
key = g_strdup_printf("%smethod", prefix);
method = g_key_file_get_string(keyfile, identifier, key, NULL);
if (method == NULL) {
- switch (ipconfig->type) {
- case CONNMAN_IPCONFIG_TYPE_IPV4:
+ if (ipconfig->type == 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:
+ else
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);
}
}
}
key = g_strdup_printf("%snetmask_prefixlen", prefix);
- if (ipconfig->address->prefixlen != 0)
- g_key_file_set_integer(keyfile, identifier,
- key, ipconfig->address->prefixlen);
+ g_key_file_set_integer(keyfile, identifier,
+ key, ipconfig->address->prefixlen);
g_free(key);
key = g_strdup_printf("%slocal_address", prefix);
projects / framework / connectivity / connman.git / blobdiff