X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fipconfig.c;h=fb39f64d2de0ea48030bea9ad11fe13bf4d31939;hb=refs%2Fheads%2Faccepted%2Ftizen_5.5_unified_wearable_hotfix;hp=12e297ac8a16cedb29e888b26edd427aa62bc376;hpb=1d57f11bf173252ab2404a441cc7c5e6d434dd60;p=platform%2Fupstream%2Fconnman.git diff --git a/src/ipconfig.c b/src/ipconfig.c old mode 100644 new mode 100755 index 12e297a..fb39f64 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -2,7 +2,7 @@ * * 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 @@ -23,6 +23,7 @@ #include #endif +#include #include #include #include @@ -35,16 +36,15 @@ #endif #include +#include #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; @@ -52,12 +52,17 @@ struct connman_ipconfig { 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; @@ -80,176 +85,20 @@ struct connman_ipdevice { struct connman_ipconfig *config_ipv4; struct connman_ipconfig *config_ipv6; - gboolean ipv6_enabled; + bool ipv6_enabled; int ipv6_privacy; }; 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) +void __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig) { - if (ipaddress == NULL) + if (!ipconfig) return; - g_free(ipaddress->broadcast); - g_free(ipaddress->peer); - g_free(ipaddress->local); - g_free(ipaddress->gateway); - g_free(ipaddress); -} - -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; - - bits = 0; - for (; mask; mask <<= 1) - ++bits; - - return bits; -} - -static gboolean check_ipv6_address(const char *address) -{ - unsigned char buf[sizeof(struct in6_addr)]; - int err; - - err = inet_pton(AF_INET6, address, buf); - if (err > 0) - return TRUE; - - return FALSE; -} - -int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress, - const char *address, const char *gateway, - unsigned char prefix_length) -{ - if (ipaddress == NULL) - return -EINVAL; - - if (check_ipv6_address(address) == FALSE) - return -EINVAL; - - if (check_ipv6_address(gateway) == FALSE) - return -EINVAL; - - DBG("prefix_len %d address %s gateway %s", - prefix_length, address, gateway); - - ipaddress->family = CONNMAN_IPCONFIG_TYPE_IPV6; - - ipaddress->prefixlen = prefix_length; - - g_free(ipaddress->local); - ipaddress->local = g_strdup(address); - - g_free(ipaddress->gateway); - ipaddress->gateway = g_strdup(gateway); - - return 0; -} - -int connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress, - const char *address, const char *netmask, const char *gateway) -{ - if (ipaddress == NULL) - return -EINVAL; - - ipaddress->family = CONNMAN_IPCONFIG_TYPE_IPV4; - - 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); - - return 0; -} - -void connman_ipaddress_set_peer(struct connman_ipaddress *ipaddress, - const char *peer) -{ - if (ipaddress == NULL) - return; - - g_free(ipaddress->peer); - ipaddress->peer = g_strdup(peer); -} - -void connman_ipaddress_clear(struct connman_ipaddress *ipaddress) -{ - if (ipaddress == NULL) - 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; -} - -void connman_ipaddress_copy(struct connman_ipaddress *ipaddress, - struct connman_ipaddress *source) -{ - 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); - - g_free(ipaddress->broadcast); - ipaddress->broadcast = g_strdup(source->broadcast); - - g_free(ipaddress->gateway); - ipaddress->gateway = g_strdup(source->gateway); + connman_ipaddress_clear(ipconfig->address); } static void free_address_list(struct connman_ipdevice *ipdevice) @@ -283,6 +132,21 @@ static struct connman_ipaddress *find_ipaddress(struct connman_ipdevice *ipdevic 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) { @@ -313,27 +177,27 @@ static const char *scope2str(unsigned char scope) 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); @@ -342,28 +206,28 @@ static gboolean get_ipv6_state(gchar *ifname) 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"); @@ -377,20 +241,20 @@ static int get_ipv6_privacy(gchar *ifname) 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) @@ -409,13 +273,13 @@ static void set_ipv6_privacy(gchar *ifname, int value) 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) @@ -425,27 +289,110 @@ static void set_ipv6_privacy(gchar *ifname, int value) 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; } @@ -456,58 +403,36 @@ static void free_ipdevice(gpointer data) 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); + + DBG("service %p", service); - if (service == NULL) + if (!service) return; ipdevice->rx_packets = stats->rx_packets; @@ -532,67 +457,79 @@ void __connman_ipconfig_newlink(int index, unsigned short type, 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"); @@ -605,50 +542,54 @@ update: 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)) { @@ -659,16 +600,16 @@ void __connman_ipconfig_dellink(int index, struct rtnl_link_stats *stats) 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)); } @@ -684,22 +625,24 @@ static inline gint check_duplicate_address(gconstpointer a, gconstpointer b) 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); @@ -707,27 +650,38 @@ void __connman_ipconfig_newaddr(int index, int family, const char *label, 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 (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, + 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)) { @@ -736,12 +690,19 @@ void __connman_ipconfig_newaddr(int index, int family, const char *label, 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); } + +out: + g_free(ifname); + return 0; } void __connman_ipconfig_deladdr(int index, int family, const char *label, @@ -749,32 +710,45 @@ 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)) { @@ -783,57 +757,63 @@ void __connman_ipconfig_deladdr(int index, int family, const char *label, 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)) { @@ -842,60 +822,65 @@ void __connman_ipconfig_newroute(int index, int family, unsigned char scope, 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); + 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)) { @@ -904,17 +889,22 @@ void __connman_ipconfig_delroute(int index, int family, unsigned char scope, if (index != ipconfig->index) continue; - if (ipconfig->ops == NULL) + if (type != ipconfig->type) continue; - if (ipconfig->ops->ip_release) - ipconfig->ops->ip_release(ipconfig); + if (!ipconfig->ops) + continue; + + if (ipconfig->ops->route_unset) + ipconfig->ops->route_unset(ipconfig, ifname); } } connman_info("%s {del} route %s gw %s scope %u <%s>", - ipdevice->ifname, dst, gateway, - scope, scope2str(scope)); + ifname, dst, gateway, scope, scope2str(scope)); + +out: + g_free(ifname); } void __connman_ipconfig_foreach(void (*function) (int index, void *user_data), @@ -923,7 +913,7 @@ 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)) { @@ -946,7 +936,7 @@ unsigned short __connman_ipconfig_get_type_from_index(int index) struct connman_ipdevice *ipdevice; ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index)); - if (ipdevice == NULL) + if (!ipdevice) return ARPHRD_VOID; return ipdevice->type; @@ -957,33 +947,38 @@ unsigned int __connman_ipconfig_get_flags_from_index(int index) struct connman_ipdevice *ipdevice; ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index)); - if (ipdevice == NULL) + if (!ipdevice) return 0; return ipdevice->flags; } -const char *__connman_ipconfig_get_gateway_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; } @@ -995,15 +990,16 @@ void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int index) 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); @@ -1012,15 +1008,16 @@ void __connman_ipconfig_set_local(struct connman_ipconfig *ipconfig, const char 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); @@ -1029,15 +1026,16 @@ void __connman_ipconfig_set_peer(struct connman_ipconfig *ipconfig, const char * 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); @@ -1046,46 +1044,61 @@ void __connman_ipconfig_set_broadcast(struct connman_ipconfig *ipconfig, const c 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; } @@ -1097,21 +1110,22 @@ void __connman_ipconfig_gateway_remove(struct connman_ipconfig *ipconfig) 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; @@ -1120,29 +1134,40 @@ void __connman_ipconfig_set_prefixlen(struct connman_ipconfig *ipconfig, unsigne 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; } @@ -1154,7 +1179,7 @@ static struct connman_ipconfig *create_ipv6config(int index) * * 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; @@ -1162,10 +1187,8 @@ struct connman_ipconfig *connman_ipconfig_create(int index, 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; @@ -1174,14 +1197,14 @@ struct connman_ipconfig *connman_ipconfig_create(int index, 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); + DBG("ipconfig %p index %d", ipconfig, index); return ipconfig; } @@ -1193,12 +1216,14 @@ struct connman_ipconfig *connman_ipconfig_create(int index, * * 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; } @@ -1209,28 +1234,28 @@ struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *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; - 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); - } + 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); } /** @@ -1239,9 +1264,9 @@ void connman_ipconfig_unref(struct connman_ipconfig *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; @@ -1254,7 +1279,7 @@ void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig) * * 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; } @@ -1265,49 +1290,22 @@ void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *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; @@ -1320,7 +1318,7 @@ void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, * * Set the configuration method */ -int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, +int __connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, enum connman_ipconfig_method method) { ipconfig->method = method; @@ -1328,31 +1326,22 @@ int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, 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; } -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: @@ -1369,29 +1358,61 @@ int __connman_ipconfig_address_add(struct connman_ipconfig *ipconfig) 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_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; + + 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; @@ -1402,14 +1423,12 @@ int __connman_ipconfig_set_proxy_autoconfig(struct connman_ipconfig *ipconfig, { 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); @@ -1422,74 +1441,145 @@ const char *__connman_ipconfig_get_proxy_autoconfig(struct connman_ipconfig *ipc { 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(ifname, true); + + g_free(ifname); +} - set_ipv6_state(ipdevice->ifname, TRUE); +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) { @@ -1500,57 +1590,62 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig) 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; } @@ -1561,22 +1656,22 @@ int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig) 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; } @@ -1584,12 +1679,13 @@ int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig) 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; } @@ -1639,10 +1735,8 @@ static const char *privacy2string(int privacy) return "disabled"; else if (privacy == 1) return "enabled"; - else if (privacy > 1) + else return "prefered"; - - return "disabled"; } static int string2privacy(const char *privacy) @@ -1651,81 +1745,180 @@ 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; + + 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 (ipconfig->system->local != NULL) { + 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", @@ -1737,10 +1930,8 @@ void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig, { 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); @@ -1756,10 +1947,10 @@ void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig, 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", @@ -1767,7 +1958,7 @@ void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig, &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); @@ -1781,10 +1972,8 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, { 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); @@ -1792,18 +1981,18 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, 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; @@ -1818,7 +2007,7 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, 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); } @@ -1828,11 +2017,10 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, { 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; @@ -1840,7 +2028,7 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, 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; @@ -1852,49 +2040,52 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, 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); } @@ -1910,22 +2101,48 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, 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; @@ -1936,11 +2153,12 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, 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; @@ -1961,14 +2179,19 @@ void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig, 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); @@ -1982,16 +2205,25 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, { 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) + 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; + break; + } } else ipconfig->method = __connman_ipconfig_string2method(method); @@ -1999,48 +2231,99 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF; if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) { + gsize length; + char *pprefix; + if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO || ipconfig->method == CONNMAN_IPCONFIG_METHOD_MANUAL) { char *privacy; - char *pprefix = g_strdup_printf("%sprivacy", prefix); + + pprefix = g_strdup_printf("%sprivacy", prefix); privacy = g_key_file_get_string(keyfile, identifier, pprefix, NULL); ipconfig->ipv6_privacy_config = string2privacy(privacy); g_free(pprefix); g_free(privacy); + } - __connman_ipconfig_enable(ipconfig); - enable_ipv6(ipconfig); + pprefix = g_strdup_printf("%sDHCP.LastPrefixes", prefix); + ipconfig->last_dhcpv6_prefixes = + g_key_file_get_string_list(keyfile, identifier, pprefix, + &length, NULL); + if (ipconfig->last_dhcpv6_prefixes && length == 0) { + g_free(ipconfig->last_dhcpv6_prefixes); + ipconfig->last_dhcpv6_prefixes = NULL; } + g_free(pprefix); } g_free(method); g_free(key); - key = g_strdup_printf("%snetmask_prefixlen", prefix); - ipconfig->address->prefixlen = g_key_file_get_integer( + switch (ipconfig->method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + break; + + case CONNMAN_IPCONFIG_METHOD_FIXED: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + + key = g_strdup_printf("%snetmask_prefixlen", prefix); + ipconfig->address->prefixlen = g_key_file_get_integer( keyfile, identifier, key, NULL); - g_free(key); + g_free(key); - key = g_strdup_printf("%slocal_address", prefix); - ipconfig->address->local = g_key_file_get_string( + key = g_strdup_printf("%slocal_address", prefix); + g_free(ipconfig->address->local); + ipconfig->address->local = g_key_file_get_string( keyfile, identifier, key, NULL); - g_free(key); + g_free(key); - key = g_strdup_printf("%speer_address", prefix); - ipconfig->address->peer = g_key_file_get_string( + key = g_strdup_printf("%speer_address", prefix); + g_free(ipconfig->address->peer); + ipconfig->address->peer = g_key_file_get_string( keyfile, identifier, key, NULL); - g_free(key); + g_free(key); - key = g_strdup_printf("%sbroadcast_address", prefix); - ipconfig->address->broadcast = g_key_file_get_string( + key = g_strdup_printf("%sbroadcast_address", prefix); + g_free(ipconfig->address->broadcast); + ipconfig->address->broadcast = g_key_file_get_string( keyfile, identifier, key, NULL); - g_free(key); + g_free(key); - key = g_strdup_printf("%sgateway", prefix); - ipconfig->address->gateway = g_key_file_get_string( + key = g_strdup_printf("%sgateway", prefix); + g_free(ipconfig->address->gateway); + ipconfig->address->gateway = g_key_file_get_string( keyfile, identifier, key, NULL); - g_free(key); + g_free(key); + break; + + case CONNMAN_IPCONFIG_METHOD_AUTO: + + if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4) + break; + + /* + * If the last used method for IPv4 was AUTO then we + * try first DHCP. We will try also to use the last + * used DHCP address, if exits. + */ + __connman_ipconfig_set_method(ipconfig, + CONNMAN_IPCONFIG_METHOD_DHCP); + /* fall through */ + + case CONNMAN_IPCONFIG_METHOD_DHCP: + + key = g_strdup_printf("%sDHCP.LastAddress", prefix); + str = g_key_file_get_string(keyfile, identifier, key, NULL); + if (str) { + g_free(ipconfig->last_dhcp_address); + ipconfig->last_dhcp_address = str; + } + g_free(key); + + break; + } return 0; } @@ -2051,13 +2334,15 @@ int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, const char *method; char *key; - DBG("ipconfig %p identifier %s", ipconfig, identifier); - 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); + if (method) { + key = g_strdup_printf("%smethod", prefix); + g_key_file_set_string(keyfile, identifier, key, method); + g_free(key); + } if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) { const char *privacy; @@ -2065,46 +2350,80 @@ int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, key = g_strdup_printf("%sprivacy", prefix); g_key_file_set_string(keyfile, identifier, key, privacy); g_free(key); + + key = g_strdup_printf("%sDHCP.LastAddress", prefix); + if (ipconfig->last_dhcp_address && + 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); + + key = g_strdup_printf("%sDHCP.LastPrefixes", prefix); + if (ipconfig->last_dhcpv6_prefixes && + ipconfig->last_dhcpv6_prefixes[0]) { + guint len = + g_strv_length(ipconfig->last_dhcpv6_prefixes); + + g_key_file_set_string_list(keyfile, identifier, key, + (const gchar **)ipconfig->last_dhcpv6_prefixes, + len); + } else + g_key_file_remove_key(keyfile, identifier, key, NULL); + g_free(key); } switch (ipconfig->method) { 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 && + 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; } key = g_strdup_printf("%snetmask_prefixlen", prefix); - g_key_file_set_integer(keyfile, identifier, - key, ipconfig->address->prefixlen); + if (ipconfig->address->prefixlen != 0) + 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) + if (ipconfig->address->local) 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) + if (ipconfig->address->peer) 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) + if (ipconfig->address->broadcast) 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) + if (ipconfig->address->gateway) g_key_file_set_string(keyfile, identifier, key, ipconfig->address->gateway); + else + g_key_file_remove_key(keyfile, identifier, key, NULL); g_free(key); return 0; @@ -2117,6 +2436,8 @@ 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; }