*
* Connection Manager
*
- * Copyright (C) 2007-2010 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>
#endif
#include <gdbus.h>
+#include <connman/ipaddress.h>
#include "connman.h"
struct connman_ipconfig {
- gint refcount;
+ int refcount;
int index;
enum connman_ipconfig_type type;
- struct connman_ipconfig *origin;
-
const struct connman_ipconfig_ops *ops;
void *ops_data;
struct connman_ipaddress *address;
struct connman_ipaddress *system;
+#if defined TIZEN_EXT
+ int dhcp_lease_duration;
+#endif
+
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;
struct connman_ipconfig *config_ipv4;
struct connman_ipconfig *config_ipv6;
- gboolean ipv6_enabled;
+ 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(int family)
-{
- struct connman_ipaddress *ipaddress;
-
- ipaddress = g_try_new0(struct connman_ipaddress, 1);
- if (ipaddress == NULL)
- return NULL;
-
- ipaddress->family = family;
- ipaddress->prefixlen = 0;
- ipaddress->local = NULL;
- ipaddress->peer = NULL;
- ipaddress->broadcast = NULL;
- ipaddress->gateway = NULL;
-
- return ipaddress;
-}
-
-void connman_ipaddress_free(struct connman_ipaddress *ipaddress)
-{
- if (ipaddress == NULL)
- return;
-
- g_free(ipaddress->broadcast);
- g_free(ipaddress->peer);
- g_free(ipaddress->local);
- g_free(ipaddress->gateway);
- g_free(ipaddress);
-}
+static void store_set_str(struct ipconfig_store *store,
+ const char *key, const char *val)
-unsigned char __connman_ipconfig_netmask_prefix_len(const char *netmask)
{
- 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;
+ char *pk;
- bits = 0;
- for (; mask; mask <<= 1)
- ++bits;
+ if (!val || strlen(val) == 0)
+ return;
- return bits;
+ pk = g_strdup_printf("%s%s", store->prefix, key);
+ g_key_file_set_string(store->file, store->group, pk, val);
+ g_free(pk);
}
-static gboolean check_ipv6_address(const char *address)
+static char *store_get_str(struct ipconfig_store *store, const char *key)
{
- unsigned char buf[sizeof(struct in6_addr)];
- int err;
+ char *pk, *val;
- err = inet_pton(AF_INET6, address, buf);
- if (err > 0)
- return TRUE;
+ 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 FALSE;
+ return val;
}
-int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress,
- const char *address, const char *gateway,
- unsigned char prefix_length)
+static void store_set_strs(struct ipconfig_store *store,
+ const char *key, char **val)
{
- if (ipaddress == NULL)
- return -EINVAL;
-
- if (check_ipv6_address(address) == FALSE)
- return -EINVAL;
-
- if (check_ipv6_address(gateway) == FALSE)
- return -EINVAL;
+ guint len;
+ char *pk;
- DBG("prefix_len %d address %s gateway %s",
- prefix_length, address, gateway);
-
- ipaddress->family = AF_INET6;
-
- ipaddress->prefixlen = prefix_length;
-
- g_free(ipaddress->local);
- ipaddress->local = g_strdup(address);
+ if (!val)
+ return;
- g_free(ipaddress->gateway);
- ipaddress->gateway = g_strdup(gateway);
+ len = g_strv_length(val);
+ if (len == 0)
+ return;
- return 0;
+ 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);
}
-int connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress,
- const char *address, const char *netmask, const char *gateway)
+static char **store_get_strs(struct ipconfig_store *store, const char *key)
{
- if (ipaddress == NULL)
- return -EINVAL;
+ gsize len;
+ char *pk, **val;
- ipaddress->family = AF_INET;
+ 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);
- ipaddress->prefixlen = __connman_ipconfig_netmask_prefix_len(netmask);
-
- g_free(ipaddress->local);
- ipaddress->local = g_strdup(address);
-
- g_free(ipaddress->gateway);
- ipaddress->gateway = g_strdup(gateway);
+ if (val && len == 0) {
+ g_free(val);
+ return NULL;
+ }
- return 0;
+ return val;
}
-void connman_ipaddress_set_peer(struct connman_ipaddress *ipaddress,
- const char *peer)
+static void store_set_int(struct ipconfig_store *store,
+ const char *key, int val)
{
- if (ipaddress == NULL)
- return;
+ char *pk;
- g_free(ipaddress->peer);
- ipaddress->peer = g_strdup(peer);
-}
-
-void connman_ipaddress_clear(struct connman_ipaddress *ipaddress)
-{
- if (ipaddress == NULL)
+ if (val == 0)
return;
- ipaddress->prefixlen = 0;
-
- g_free(ipaddress->local);
- ipaddress->local = NULL;
-
- g_free(ipaddress->peer);
- ipaddress->peer = NULL;
-
- g_free(ipaddress->broadcast);
- ipaddress->broadcast = NULL;
-
- g_free(ipaddress->gateway);
- ipaddress->gateway = NULL;
+ pk = g_strdup_printf("%s%s", store->prefix, key);
+ g_key_file_set_integer(store->file, store->group, pk, val);
+ g_free(pk);
}
-void connman_ipaddress_copy(struct connman_ipaddress *ipaddress,
- struct connman_ipaddress *source)
+static int store_get_int(struct ipconfig_store *store, const char *key)
{
- if (ipaddress == NULL || source == NULL)
- return;
-
- ipaddress->family = source->family;
- ipaddress->prefixlen = source->prefixlen;
-
- g_free(ipaddress->local);
- ipaddress->local = g_strdup(source->local);
-
- g_free(ipaddress->peer);
- ipaddress->peer = g_strdup(source->peer);
+ int val;
+ char *pk;
- g_free(ipaddress->broadcast);
- ipaddress->broadcast = g_strdup(source->broadcast);
+ 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->gateway);
- ipaddress->gateway = g_strdup(source->gateway);
+ 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 gboolean get_ipv6_state(gchar *ifname)
+static bool get_ipv6_state(gchar *ifname)
{
int disabled;
gchar *path;
FILE *f;
- gboolean enabled = FALSE;
+ bool enabled = false;
- if (ifname == NULL)
+ 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 == NULL)
+ if (!path)
return enabled;
f = fopen(path, "r");
g_free(path);
- if (f != NULL) {
+ if (f) {
if (fscanf(f, "%d", &disabled) > 0)
enabled = !disabled;
fclose(f);
return enabled;
}
-static void set_ipv6_state(gchar *ifname, gboolean enable)
+static void set_ipv6_state(gchar *ifname, bool enable)
{
gchar *path;
FILE *f;
- if (ifname == NULL)
+ 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 == NULL)
+ if (!path)
return;
f = fopen(path, "r+");
g_free(path);
- if (f == NULL)
+ if (!f)
return;
- if (enable == FALSE)
+ if (!enable)
fprintf(f, "1");
else
fprintf(f, "0");
FILE *f;
int value;
- if (ifname == NULL)
+ if (!ifname)
return 0;
path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr",
ifname);
- if (path == NULL)
+ if (!path)
return 0;
f = fopen(path, "r");
g_free(path);
- if (f == NULL)
+ if (!f)
return 0;
if (fscanf(f, "%d", &value) <= 0)
gchar *path;
FILE *f;
- if (ifname == NULL)
+ if (!ifname)
return;
path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr",
ifname);
- if (path == NULL)
+ if (!path)
return;
if (value < 0)
g_free(path);
- if (f == NULL)
+ if (!f)
+ return;
+
+ fprintf(f, "%d", value);
+ fclose(f);
+}
+
+static int get_rp_filter(void)
+{
+ FILE *f;
+ int value = -EINVAL, tmp;
+
+ f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r");
+
+ if (f) {
+ 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)
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);
+}
+
+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", ipdevice->ifname,
- ipdevice->index);
+ connman_info("%s {remove} index %d", ifname, ipdevice->index);
- if (ipdevice->config_ipv4 != NULL) {
- connman_ipconfig_unref(ipdevice->config_ipv4);
+ if (ipdevice->config_ipv4) {
+ __connman_ipconfig_unref(ipdevice->config_ipv4);
ipdevice->config_ipv4 = NULL;
}
- if (ipdevice->config_ipv6 != NULL) {
- connman_ipconfig_unref(ipdevice->config_ipv6);
+ if (ipdevice->config_ipv6) {
+ __connman_ipconfig_unref(ipdevice->config_ipv6);
ipdevice->config_ipv6 = NULL;
}
g_free(ipdevice->address);
- set_ipv6_state(ipdevice->ifname, ipdevice->ipv6_enabled);
- set_ipv6_privacy(ipdevice->ifname, ipdevice->ipv6_privacy);
+ if (ifname) {
+ set_ipv6_state(ifname, ipdevice->ipv6_enabled);
+ set_ipv6_privacy(ifname, ipdevice->ipv6_privacy);
+ }
- g_free(ipdevice->ifname);
+ g_free(ifname);
g_free(ipdevice);
}
-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 ipv4 %p ipv6 %p", ipdevice->config_ipv4,
- ipdevice->config_ipv6);
-
- if (ipdevice->config_ipv4)
- connman_inet_clear_address(ipdevice->index,
- ipdevice->config_ipv4->address);
-
- 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)
+ const char *ifname, struct rtnl_link_stats *stats)
{
struct connman_service *service;
if (stats->rx_packets == 0 && stats->tx_packets == 0)
return;
- connman_info("%s {RX} %u packets %u bytes", ipdevice->ifname,
+ connman_info("%s {RX} %u packets %u bytes", ifname,
stats->rx_packets, stats->rx_bytes);
- connman_info("%s {TX} %u packets %u bytes", ipdevice->ifname,
+ connman_info("%s {TX} %u packets %u bytes", ifname,
stats->tx_packets, stats->tx_bytes);
- if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
+ if (!ipdevice->config_ipv4 && !ipdevice->config_ipv6)
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;
+ service = __connman_service_lookup_from_index(ipdevice->index);
- if (service == NULL)
+ DBG("service %p", service);
+
+ if (!service)
return;
ipdevice->rx_packets = stats->rx_packets;
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;
+ ifname = connman_inet_ifname(index);
+
ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
- if (ipdevice != NULL)
+ if (ipdevice)
goto update;
ipdevice = g_try_new0(struct connman_ipdevice, 1);
- if (ipdevice == NULL)
- return;
+ if (!ipdevice)
+ goto out;
ipdevice->index = index;
- ipdevice->ifname = connman_inet_ifname(index);
ipdevice->type = type;
- ipdevice->ipv6_enabled = get_ipv6_state(ipdevice->ifname);
- ipdevice->ipv6_privacy = get_ipv6_privacy(ipdevice->ifname);
+ 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 defined TIZEN_EXT
+ if (g_strcmp0(ipdevice->address, address) != 0) {
+ /* If an original address is built-in physical device,
+ * it's hardly get an address at a initial creation
+ */
+ g_free(ipdevice->address);
+ ipdevice->address = g_strdup(address);
+ }
+#endif
+
ipdevice->mtu = mtu;
- update_stats(ipdevice, stats);
+ 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 (ipconfig->ops == NULL)
+ if (!ipconfig->ops)
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 (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, 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;
- update_stats(ipdevice, stats);
+ ifname = connman_inet_ifname(index);
+
+ update_stats(ipdevice, ifname, stats);
for (list = g_list_first(ipconfig_list); list;
list = g_list_next(list)) {
ipconfig->index = -1;
- if (ipconfig->ops == NULL)
+ 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));
}
return g_strcmp0(addr1->local, addr2->local);
}
-void __connman_ipconfig_newaddr(int index, int family, const char *label,
+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(family);
- if (ipaddress == NULL)
- return;
+ if (!ipaddress)
+ return -ENOMEM;
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;
+ return -EALREADY;
}
- ipdevice->address_list = g_slist_append(ipdevice->address_list,
+ 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);
+ ifname = connman_inet_ifname(index);
connman_info("%s {add} address %s/%u label %s family %d",
- ipdevice->ifname, address, prefixlen, label, family);
+ ifname, address, prefixlen, label, family);
- if (ipdevice->config_ipv4 != NULL && family == AF_INET)
- connman_ipaddress_copy(ipdevice->config_ipv4->system,
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ __connman_ippool_newaddr(index, address, prefixlen);
+
+ if (ipdevice->config_ipv4 && family == AF_INET)
+ connman_ipaddress_copy_address(ipdevice->config_ipv4->system,
ipaddress);
- else if (ipdevice->config_ipv6 != NULL && family == AF_INET6)
- connman_ipaddress_copy(ipdevice->config_ipv6->system,
+ else if (ipdevice->config_ipv6 && family == AF_INET6)
+ connman_ipaddress_copy_address(ipdevice->config_ipv6->system,
ipaddress);
else
- return;
+ goto out;
if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
- return;
+ goto out;
for (list = g_list_first(ipconfig_list); list;
list = g_list_next(list)) {
if (index != ipconfig->index)
continue;
- if (ipconfig->ops == NULL)
+ 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);
}
+
+#if defined TIZEN_EXT
+ const char *local;
+ struct connman_service *service;
+ struct connman_ipconfig *local_ipconfig;
+
+ service = connman_service_get_default();
+ if (!service)
+ goto out;
+
+ local_ipconfig = __connman_service_get_ip4config(service);
+ if (!local_ipconfig)
+ goto out;
+
+ local = __connman_ipconfig_get_local(local_ipconfig);
+ if (!local)
+ goto out;
+
+ DBG("local %s", local);
+
+ if (g_strcmp0(local, address) != 0)
+ goto out;
+
+ __connman_connection_update_default_gateway();
+#endif
+out:
+ g_free(ifname);
+ return 0;
}
void __connman_ipconfig_deladdr(int index, int family, const char *label,
{
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);
+ 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 (ipconfig->ops == NULL)
+ 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, 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) {
- GSList *list;
+ 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 != NULL &&
- ipdevice->config_ipv6->system != NULL) {
+ if (ipdevice->config_ipv6 &&
+ ipdevice->config_ipv6->system) {
g_free(ipdevice->config_ipv6->system->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);
- if (ipdevice->config_ipv4 != NULL &&
- ipdevice->config_ipv4->system != NULL) {
+ if (ipdevice->config_ipv4 &&
+ ipdevice->config_ipv4->system) {
g_free(ipdevice->config_ipv4->system->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
+ goto out;
for (config_list = g_list_first(ipconfig_list); config_list;
config_list = g_list_next(config_list)) {
if (index != ipconfig->index)
continue;
- if (ipconfig->ops == NULL)
+ if (type != ipconfig->type)
continue;
- if (ipconfig->ops->ip_bound)
- ipconfig->ops->ip_bound(ipconfig);
+ 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, 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) {
- GSList *list;
+ 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 != NULL &&
- ipdevice->config_ipv6->system != NULL) {
+ if (ipdevice->config_ipv6 &&
+ ipdevice->config_ipv6->system) {
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;
- if (ipdevice->config_ipv4 != NULL &&
- ipdevice->config_ipv4->system != NULL) {
+ if (ipdevice->config_ipv4 &&
+ ipdevice->config_ipv4->system) {
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
+ goto out;
for (config_list = g_list_first(ipconfig_list); config_list;
config_list = g_list_next(config_list)) {
if (index != ipconfig->index)
continue;
- if (ipconfig->ops == NULL)
+ if (type != ipconfig->type)
+ continue;
+
+ if (!ipconfig->ops)
continue;
- if (ipconfig->ops->ip_release)
- ipconfig->ops->ip_release(ipconfig);
+ 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)) {
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;
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_from_index(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;
- if (ipdevice->ipv4_gateway != NULL)
- return ipdevice->ipv4_gateway;
+ if (type != CONNMAN_IPCONFIG_TYPE_IPV6) {
+ if (ipdevice->ipv4_gateway)
+ return ipdevice->ipv4_gateway;
- if (ipdevice->config_ipv4 != NULL &&
- ipdevice->config_ipv4->address != NULL)
- return ipdevice->config_ipv4->address->gateway;
+ if (ipdevice->config_ipv4 &&
+ ipdevice->config_ipv4->address)
+ 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)
+ return ipdevice->ipv6_gateway;
- if (ipdevice->config_ipv6 != NULL &&
- ipdevice->config_ipv6->address != NULL)
- return ipdevice->config_ipv6->address->gateway;
+ if (ipdevice->config_ipv6 &&
+ ipdevice->config_ipv6->address)
+ return ipdevice->config_ipv6->address->gateway;
+ }
return NULL;
}
const char *__connman_ipconfig_get_local(struct connman_ipconfig *ipconfig)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return NULL;
return ipconfig->address->local;
}
-void __connman_ipconfig_set_local(struct connman_ipconfig *ipconfig, const char *address)
+void __connman_ipconfig_set_local(struct connman_ipconfig *ipconfig,
+ const char *address)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return;
g_free(ipconfig->address->local);
const char *__connman_ipconfig_get_peer(struct connman_ipconfig *ipconfig)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return NULL;
return ipconfig->address->peer;
}
-void __connman_ipconfig_set_peer(struct connman_ipconfig *ipconfig, const char *address)
+void __connman_ipconfig_set_peer(struct connman_ipconfig *ipconfig,
+ const char *address)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return;
g_free(ipconfig->address->peer);
const char *__connman_ipconfig_get_broadcast(struct connman_ipconfig *ipconfig)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return NULL;
return ipconfig->address->broadcast;
}
-void __connman_ipconfig_set_broadcast(struct connman_ipconfig *ipconfig, const char *broadcast)
+void __connman_ipconfig_set_broadcast(struct connman_ipconfig *ipconfig,
+ const char *broadcast)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return;
g_free(ipconfig->address->broadcast);
const char *__connman_ipconfig_get_gateway(struct connman_ipconfig *ipconfig)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return NULL;
return ipconfig->address->gateway;
}
-void __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig, const char *gateway)
+void __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig,
+ const char *gateway)
{
DBG("");
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return;
g_free(ipconfig->address->gateway);
ipconfig->address->gateway = g_strdup(gateway);
}
+#if defined TIZEN_EXT
+void __connman_ipconfig_set_dhcp_lease_duration(struct connman_ipconfig *ipconfig,
+ int dhcp_lease_duration)
+{
+ ipconfig->dhcp_lease_duration = dhcp_lease_duration;
+}
+#endif
+
+#if defined TIZEN_EXT
+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)
+ if (!ipconfig->address)
return -EINVAL;
+#if !defined TIZEN_EXT
service = __connman_service_lookup_from_index(ipconfig->index);
- if (service == NULL)
+#endif
+ if (!service)
return -EINVAL;
- __connman_connection_gateway_remove(service);
+ DBG("type %d gw %s peer %s", ipconfig->type,
+ ipconfig->address->gateway, ipconfig->address->peer);
- 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) {
+ 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;
}
DBG("");
service = __connman_service_lookup_from_index(ipconfig->index);
- if (service != NULL)
- __connman_connection_gateway_remove(service);
+ if (service)
+ __connman_connection_gateway_remove(service, ipconfig->type);
}
unsigned char __connman_ipconfig_get_prefixlen(struct connman_ipconfig *ipconfig)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return 0;
return ipconfig->address->prefixlen;
}
-void __connman_ipconfig_set_prefixlen(struct connman_ipconfig *ipconfig, unsigned char prefixlen)
+void __connman_ipconfig_set_prefixlen(struct connman_ipconfig *ipconfig,
+ unsigned char prefixlen)
{
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return;
ipconfig->address->prefixlen = prefixlen;
static struct connman_ipconfig *create_ipv6config(int index)
{
struct connman_ipconfig *ipv6config;
-
- DBG("index %d", index);
+ struct connman_ipdevice *ipdevice;
ipv6config = g_try_new0(struct connman_ipconfig, 1);
- if (ipv6config == NULL)
+ if (!ipv6config)
return NULL;
ipv6config->refcount = 1;
ipv6config->index = index;
ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
- ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
- ipv6config->ipv6_privacy_config = 0;
+
+ 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)
+#if !defined TIZEN_EXT
+ ipv6config->ipv6_privacy_config = ipdevice->ipv6_privacy;
+#else
+ ipv6config->ipv6_privacy_config = ipdevice->ipv6_privacy = 2;
+#endif
ipv6config->address = connman_ipaddress_alloc(AF_INET6);
- if (ipv6config->address == NULL) {
+ if (!ipv6config->address) {
g_free(ipv6config);
return NULL;
}
ipv6config->system = connman_ipaddress_alloc(AF_INET6);
- DBG("ipconfig %p", ipv6config);
+ DBG("ipconfig %p index %d method %s", ipv6config, index,
+ __connman_ipconfig_method2string(ipv6config->method));
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);
- if (ipconfig == NULL)
+ if (!ipconfig)
return NULL;
ipconfig->refcount = 1;
ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4;
ipconfig->address = connman_ipaddress_alloc(AF_INET);
- if (ipconfig->address == NULL) {
+ if (!ipconfig->address) {
g_free(ipconfig);
return NULL;
}
ipconfig->system = connman_ipaddress_alloc(AF_INET);
-
- DBG("ipconfig %p", ipconfig);
+#if defined TIZEN_EXT
+ if (!simplified_log)
+#endif
+ DBG("ipconfig %p index %d", ipconfig, index);
return ipconfig;
}
*
* 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)
+ if (!ipconfig)
return;
+#if defined TIZEN_EXT
+ if (!simplified_log)
+#endif
+ DBG("%p ref %d by %s:%d:%s()", ipconfig, ipconfig->refcount - 1,
+ file, line, caller);
- 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);
+ 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);
- }
+ 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 == NULL)
+ 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 == NULL)
+ if (!ipconfig)
return -1;
- if (ipconfig->origin != NULL)
- return ipconfig->origin->index;
-
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 == NULL)
- return NULL;
-
- 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)
{
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 0;
}
-enum connman_ipconfig_method __connman_ipconfig_get_method(struct connman_ipconfig *ipconfig)
+enum connman_ipconfig_method __connman_ipconfig_get_method(
+ struct connman_ipconfig *ipconfig)
{
- if (ipconfig == NULL)
+ if (!ipconfig)
return CONNMAN_IPCONFIG_METHOD_UNKNOWN;
return ipconfig->method;
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)
{
- DBG("");
+ int err;
- if (ipconfig == NULL)
+ 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_DHCP:
+ err = __connman_ipconfig_address_unset(ipconfig);
+ connman_ipaddress_clear(ipconfig->address);
+
+ return err;
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ return __connman_ipconfig_address_unset(ipconfig);
+ }
+
+ return 0;
+}
+
+int __connman_ipconfig_address_unset(struct connman_ipconfig *ipconfig)
+{
+ int err;
+
+ if (!ipconfig)
+ return 0;
+
+#if defined TIZEN_EXT
+ DBG("ipconfig method %d type %d", ipconfig->method, ipconfig->type);
+#else
DBG("method %d", ipconfig->method);
+#endif
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:
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;
{
struct connman_ipdevice *ipdevice;
- 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;
g_free(ipdevice->pac);
{
struct connman_ipdevice *ipdevice;
- DBG("ipconfig %p", ipconfig);
-
- if (ipconfig == NULL || ipconfig->index < 0)
+ if (!ipconfig || ipconfig->index < 0)
return NULL;
ipdevice = g_hash_table_lookup(ipdevice_hash,
GINT_TO_POINTER(ipconfig->index));
- if (ipdevice == NULL)
+ 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 == NULL)
+ if (!ipdevice)
return;
- set_ipv6_state(ipdevice->ifname, FALSE);
+ 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 == NULL)
+ if (!ipdevice)
return;
+ ifname = connman_inet_ifname(ipconfig->index);
+
if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO)
- set_ipv6_privacy(ipdevice->ifname,
- ipconfig->ipv6_privacy_config);
+ set_ipv6_privacy(ifname, ipconfig->ipv6_privacy_config);
- set_ipv6_state(ipdevice->ifname, TRUE);
+ 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 == NULL || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ 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;
- gboolean up = FALSE, down = FALSE;
- gboolean lower_up = FALSE, lower_down = FALSE;
+ 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 (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) {
if (ipdevice->config_ipv6 == ipconfig)
return -EALREADY;
type = CONNMAN_IPCONFIG_TYPE_IPV6;
- enable_ipv6(ipconfig);
} else
return -EINVAL;
if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
- ipdevice->config_ipv4 != NULL) {
+ 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);
+ __connman_ipconfig_unref(ipdevice->config_ipv4);
}
if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
- ipdevice->config_ipv6 != NULL) {
+ 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);
+ __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);
+ ipdevice->config_ipv4 = __connman_ipconfig_ref(ipconfig);
+ else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ ipdevice->config_ipv6 = __connman_ipconfig_ref(ipconfig);
+ enable_ipv6(ipdevice->config_ipv6);
+ }
ipconfig_list = g_list_append(ipconfig_list, ipconfig);
if (ipdevice->flags & IFF_UP)
- up = TRUE;
+ up = true;
else
- down = TRUE;
+ down = true;
if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) ==
(IFF_RUNNING | IFF_LOWER_UP))
- lower_up = TRUE;
+ lower_up = true;
else if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) == 0)
- lower_down = TRUE;
+ lower_down = true;
+
+ ifname = connman_inet_ifname(ipconfig->index);
- if (up == TRUE && ipconfig->ops->up)
- ipconfig->ops->up(ipconfig);
- if (lower_up == TRUE && ipconfig->ops->lower_up)
- ipconfig->ops->lower_up(ipconfig);
+ 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);
+
+ g_free(ifname);
return 0;
}
int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig)
{
struct connman_ipdevice *ipdevice;
-
+#if defined TIZEN_EXT
+ if (!simplified_log)
+#endif
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_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
+ if (!ipdevice->config_ipv4 && !ipdevice->config_ipv6)
return -EINVAL;
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;
}
if (ipdevice->config_ipv6 == ipconfig) {
ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+#if defined TIZEN_EXT
if (ipdevice->config_ipv6->method ==
- CONNMAN_IPCONFIG_METHOD_AUTO)
+ CONNMAN_IPCONFIG_METHOD_AUTO)
disable_ipv6(ipdevice->config_ipv6);
-
+#endif
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;
}
return "disabled";
else if (privacy == 1)
return "enabled";
- else if (privacy > 1)
+ else
return "prefered";
-
- return "disabled";
}
static int string2privacy(const char *privacy)
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;
- DBG("");
-
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;
+
+ 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;
+#if defined TIZEN_EXT
+ /* TIZEN enables get_properties before __connman_ipconfig_newaddr */
+ if (append_addr && append_addr->local == NULL)
+ append_addr = ipconfig->address;
+#endif
+ break;
+ }
+
+ if (!append_addr)
return;
- if (ipconfig->system->local != NULL) {
+ 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 (ipconfig->system->gateway != NULL)
+ if (append_addr->gateway)
connman_dbus_dict_append_basic(iter, "Gateway",
- DBUS_TYPE_STRING, &ipconfig->system->gateway);
+ DBUS_TYPE_STRING, &append_addr->gateway);
+
+#if defined TIZEN_EXT
+ if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_DHCP) {
+ char *server_ip;
+ server_ip = __connman_dhcp_get_server_address(ipconfig);
+ if (server_ip) {
+ connman_dbus_dict_append_basic(iter, "DHCPServerIP",
+ DBUS_TYPE_STRING, &server_ip);
+ g_free(server_ip);
+ }
+ connman_dbus_dict_append_basic(iter, "DHCPLeaseDuration",
+ DBUS_TYPE_INT32, &ipconfig->dhcp_lease_duration);
+ }
+#endif
}
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 (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
return;
str = __connman_ipconfig_method2string(ipconfig->method);
- if (str == NULL)
+ 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);
- 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_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ append_addr = ipconfig->system;
+#if defined TIZEN_EXT
+ /* TIZEN enables get_properties before __connman_ipconfig_newaddr */
+ if (append_addr && append_addr->local == NULL)
+ append_addr = ipconfig->address;
+#endif
+ break;
+ }
+
+ if (!append_addr)
+ return;
+
+ if (append_addr->local) {
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)
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",
{
const char *str, *privacy;
- DBG("");
-
str = __connman_ipconfig_method2string(ipconfig->method);
- if (str == NULL)
+ if (!str)
return;
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
break;
}
- if (ipconfig->address == NULL)
+ if (!ipconfig->address)
return;
- if (ipconfig->address->local != NULL) {
+ if (ipconfig->address->local) {
connman_dbus_dict_append_basic(iter, "Address",
DBUS_TYPE_STRING, &ipconfig->address->local);
connman_dbus_dict_append_basic(iter, "PrefixLength",
&ipconfig->address->prefixlen);
}
- if (ipconfig->address->gateway != NULL)
+ if (ipconfig->address->gateway)
connman_dbus_dict_append_basic(iter, "Gateway",
DBUS_TYPE_STRING, &ipconfig->address->gateway);
{
const char *str;
- DBG("");
-
str = __connman_ipconfig_method2string(ipconfig->method);
- if (str == NULL)
+ 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_FIXED:
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;
DBUS_TYPE_STRING, &mask);
}
- if (ipconfig->address->gateway != NULL)
+ if (ipconfig->address->gateway)
connman_dbus_dict_append_basic(iter, "Gateway",
DBUS_TYPE_STRING, &ipconfig->address->gateway);
}
{
enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
const char *address = NULL, *netmask = NULL, *gateway = NULL,
- *prefix_length_string = NULL, *privacy_string = 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(&entry, &address);
- } else if (g_str_equal(key, "PrefixLength") == TRUE) {
- if (type != DBUS_TYPE_STRING)
+ 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(&entry,
- &prefix_length_string);
+ dbus_message_iter_get_basic(&value, &prefix_length);
- prefix_length = atoi(prefix_length_string);
if (prefix_length < 0 || prefix_length > 128)
return -EINVAL;
-
- } else if (g_str_equal(key, "Netmask") == TRUE) {
+ } else if (g_str_equal(key, "Netmask")) {
if (type != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&entry, &netmask);
- } else if (g_str_equal(key, "Gateway") == TRUE) {
+ 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, &gateway);
- } else if (g_str_equal(key, "Privacy") == 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, &privacy_string);
+ dbus_message_iter_get_basic(&value, &privacy_string);
privacy = string2privacy(privacy_string);
}
+
dbus_message_iter_next(&dict);
}
case CONNMAN_IPCONFIG_METHOD_OFF:
ipconfig->method = method;
+#if defined TIZEN_EXT
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
disable_ipv6(ipconfig);
+#endif
+
break;
case CONNMAN_IPCONFIG_METHOD_AUTO:
if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
- return -EINVAL;
+ return -EOPNOTSUPP;
ipconfig->method = method;
- if (privacy_string != NULL)
+ if (privacy_string)
ipconfig->ipv6_privacy_config = privacy;
+#if defined TIZEN_EXT
enable_ipv6(ipconfig);
+#endif
+
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;
else
return connman_ipaddress_set_ipv6(
ipconfig->address, address,
- gateway, prefix_length);
+ prefix_length, gateway);
+
break;
case CONNMAN_IPCONFIG_METHOD_DHCP:
- if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
return -EOPNOTSUPP;
ipconfig->method = method;
ipdevice = g_hash_table_lookup(ipdevice_hash,
GINT_TO_POINTER(ipconfig->index));
- if (ipdevice == NULL)
+ if (!ipdevice)
return;
- if (ipdevice->ifname != NULL)
- connman_dbus_dict_append_basic(iter, "Interface",
- DBUS_TYPE_STRING, &ipdevice->ifname);
+ 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 != NULL)
+ if (ipdevice->address)
connman_dbus_dict_append_basic(iter, "Address",
DBUS_TYPE_STRING, &ipdevice->address);
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 *key;
+ char *str;
+ struct ipconfig_store is = { .file = keyfile,
+ .group = identifier,
+ .prefix = prefix };
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)
+ method = store_get_str(&is, "method");
+ if (!method) {
+ 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:
+ case CONNMAN_IPCONFIG_TYPE_ALL:
ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
- } else
+ 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) {
+ ipconfig->method == CONNMAN_IPCONFIG_METHOD_MANUAL) {
char *privacy;
- char *pprefix = g_strdup_printf("%sprivacy", prefix);
- privacy = g_key_file_get_string(keyfile, identifier,
- pprefix, NULL);
+
+ privacy = store_get_str(&is, "privacy");
ipconfig->ipv6_privacy_config = string2privacy(privacy);
- g_free(pprefix);
g_free(privacy);
-
- __connman_ipconfig_enable(ipconfig);
- enable_ipv6(ipconfig);
}
+
+ g_strfreev(ipconfig->last_dhcpv6_prefixes);
+ ipconfig->last_dhcpv6_prefixes =
+ store_get_strs(&is, "DHCP.LastPrefixes");
}
- g_free(method);
- g_free(key);
- key = g_strdup_printf("%snetmask_prefixlen", prefix);
- ipconfig->address->prefixlen = g_key_file_get_integer(
- keyfile, identifier, key, NULL);
- g_free(key);
+ 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");
- key = g_strdup_printf("%slocal_address", prefix);
- ipconfig->address->local = g_key_file_get_string(
- keyfile, identifier, key, NULL);
- g_free(key);
+ g_free(ipconfig->address->local);
+ ipconfig->address->local =
+ store_get_str(&is, "local_address");
- key = g_strdup_printf("%speer_address", prefix);
- ipconfig->address->peer = g_key_file_get_string(
- keyfile, identifier, key, NULL);
- g_free(key);
+ g_free(ipconfig->address->peer);
+ ipconfig->address->peer =
+ store_get_str(&is, "peer_address");
- key = g_strdup_printf("%sbroadcast_address", prefix);
- ipconfig->address->broadcast = g_key_file_get_string(
- keyfile, identifier, key, NULL);
- g_free(key);
+ g_free(ipconfig->address->broadcast);
+ ipconfig->address->broadcast =
+ store_get_str(&is, "broadcast_address");
- key = g_strdup_printf("%sgateway", prefix);
- ipconfig->address->gateway = g_key_file_get_string(
- keyfile, identifier, key, NULL);
- g_free(key);
+ g_free(ipconfig->address->gateway);
+ ipconfig->address->gateway =
+ store_get_str(&is, "gateway");
+ break;
- return 0;
+ 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)
{
const char *method;
- char *key;
-
- DBG("ipconfig %p identifier %s", ipconfig, identifier);
+ struct ipconfig_store is = { .file = keyfile,
+ .group = identifier,
+ .prefix = prefix };
method = __connman_ipconfig_method2string(ipconfig->method);
-
- key = g_strdup_printf("%smethod", prefix);
- g_key_file_set_string(keyfile, identifier, key, method);
- g_free(key);
+ DBG("ipconfig %p identifier %s method %s", ipconfig, identifier,
+ method);
+ store_set_str(&is, "method", method);
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
- const char *privacy;
- privacy = privacy2string(ipconfig->ipv6_privacy_config);
- key = g_strdup_printf("%sprivacy", prefix);
- g_key_file_set_string(keyfile, identifier, key, privacy);
- g_free(key);
+ 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_DHCP:
case CONNMAN_IPCONFIG_METHOD_AUTO:
- return 0;
+ return;
}
- key = g_strdup_printf("%snetmask_prefixlen", prefix);
- g_key_file_set_integer(keyfile, identifier,
- key, ipconfig->address->prefixlen);
- g_free(key);
-
- key = g_strdup_printf("%slocal_address", prefix);
- if (ipconfig->address->local != NULL)
- g_key_file_set_string(keyfile, identifier,
- key, ipconfig->address->local);
- g_free(key);
-
- key = g_strdup_printf("%speer_address", prefix);
- if (ipconfig->address->peer != NULL)
- g_key_file_set_string(keyfile, identifier,
- key, ipconfig->address->peer);
- g_free(key);
-
- key = g_strdup_printf("%sbroadcast_address", prefix);
- if (ipconfig->address->broadcast != NULL)
- g_key_file_set_string(keyfile, identifier,
- key, ipconfig->address->broadcast);
- g_free(key);
-
- key = g_strdup_printf("%sgateway", prefix);
- if (ipconfig->address->gateway != NULL)
- g_key_file_set_string(keyfile, identifier,
- key, ipconfig->address->gateway);
- g_free(key);
-
- return 0;
+ 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;
}
projects / platform / upstream / connman.git / blobdiff