X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fipconfig.c;h=e26f209f131e31e0cec1796f12bd0e805548c6df;hb=5ed7094e4994d03c7606f25881918565c81d1c24;hp=f1533e0a26d2e29ebb6dd9aaf9287d2307a1ccd2;hpb=ad53514287c7f35b80aa3fe3c9fe1b23f257c669;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/ipconfig.c b/src/ipconfig.c index f1533e0..e26f209 100644 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -23,6 +23,8 @@ #include #endif +#include +#include #include #include #include @@ -38,7 +40,7 @@ #include "connman.h" struct connman_ipconfig { - gint refcount; + int refcount; int index; enum connman_ipconfig_type type; @@ -50,6 +52,9 @@ struct connman_ipconfig { enum connman_ipconfig_method method; struct connman_ipaddress *address; struct connman_ipaddress *system; + + int ipv6_privacy_config; + char *last_dhcp_address; }; struct connman_ipdevice { @@ -76,6 +81,9 @@ struct connman_ipdevice { struct connman_ipconfig *config_ipv4; struct connman_ipconfig *config_ipv6; + + gboolean ipv6_enabled; + int ipv6_privacy; }; static GHashTable *ipdevice_hash = NULL; @@ -139,6 +147,9 @@ static gboolean check_ipv6_address(const char *address) unsigned char buf[sizeof(struct in6_addr)]; int err; + if (address == NULL) + return FALSE; + err = inet_pton(AF_INET6, address, buf); if (err > 0) return TRUE; @@ -147,8 +158,9 @@ static gboolean check_ipv6_address(const char *address) } int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress, - const char *address, const char *gateway, - unsigned char prefix_length) + const char *address, + unsigned char prefix_length, + const char *gateway) { if (ipaddress == NULL) return -EINVAL; @@ -162,6 +174,8 @@ int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress, DBG("prefix_len %d address %s gateway %s", prefix_length, address, gateway); + ipaddress->family = AF_INET6; + ipaddress->prefixlen = prefix_length; g_free(ipaddress->local); @@ -173,11 +187,13 @@ int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress, return 0; } -void connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress, +int connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress, const char *address, const char *netmask, const char *gateway) { if (ipaddress == NULL) - return; + return -EINVAL; + + ipaddress->family = AF_INET; ipaddress->prefixlen = __connman_ipconfig_netmask_prefix_len(netmask); @@ -186,6 +202,18 @@ void connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress, 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) @@ -261,6 +289,20 @@ 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: + 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) { @@ -291,6 +333,179 @@ static const char *scope2str(unsigned char scope) return ""; } +static gboolean get_ipv6_state(gchar *ifname) +{ + int disabled; + gchar *path; + FILE *f; + gboolean enabled = FALSE; + + if (ifname == NULL) + path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6"); + else + path = g_strdup_printf( + "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname); + + if (path == NULL) + return enabled; + + f = fopen(path, "r"); + + g_free(path); + + if (f != NULL) { + if (fscanf(f, "%d", &disabled) > 0) + enabled = !disabled; + fclose(f); + } + + return enabled; +} + +static void set_ipv6_state(gchar *ifname, gboolean enable) +{ + gchar *path; + FILE *f; + + if (ifname == NULL) + path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6"); + else + path = g_strdup_printf( + "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname); + + if (path == NULL) + return; + + f = fopen(path, "r+"); + + g_free(path); + + if (f == NULL) + return; + + if (enable == FALSE) + fprintf(f, "1"); + else + fprintf(f, "0"); + + fclose(f); +} + +static int get_ipv6_privacy(gchar *ifname) +{ + gchar *path; + FILE *f; + int value; + + if (ifname == NULL) + return 0; + + path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr", + ifname); + + if (path == NULL) + return 0; + + f = fopen(path, "r"); + + g_free(path); + + if (f == NULL) + return 0; + + if (fscanf(f, "%d", &value) <= 0) + value = 0; + + fclose(f); + + return value; +} + +/* Enable the IPv6 privacy extension for stateless address autoconfiguration. + * The privacy extension is described in RFC 3041 and RFC 4941 + */ +static void set_ipv6_privacy(gchar *ifname, int value) +{ + gchar *path; + FILE *f; + + if (ifname == NULL) + return; + + path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr", + ifname); + + if (path == NULL) + return; + + if (value < 0) + value = 0; + + f = fopen(path, "r+"); + + g_free(path); + + if (f == NULL) + return; + + fprintf(f, "%d", value); + fclose(f); +} + +static int get_rp_filter() +{ + FILE *f; + int value = -EINVAL, tmp; + + f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r"); + + if (f != NULL) { + if (fscanf(f, "%d", &tmp) == 1) + value = tmp; + fclose(f); + } + + return value; +} + +static void set_rp_filter(int value) +{ + FILE *f; + + f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r+"); + + if (f == NULL) + return; + + fprintf(f, "%d", value); + + fclose(f); +} + +int __connman_ipconfig_set_rp_filter() +{ + int value; + + value = get_rp_filter(); + + if (value < 0) + return value; + + set_rp_filter(2); + + connman_info("rp_filter set to 2 (loose mode routing), " + "old value was %d", value); + + return value; +} + +void __connman_ipconfig_unset_rp_filter(int old_value) +{ + set_rp_filter(old_value); + + connman_info("rp_filter restored to %d", old_value); +} + static void free_ipdevice(gpointer data) { struct connman_ipdevice *ipdevice = data; @@ -314,6 +529,10 @@ static void free_ipdevice(gpointer data) g_free(ipdevice->pac); g_free(ipdevice->address); + + set_ipv6_state(ipdevice->ifname, ipdevice->ipv6_enabled); + set_ipv6_privacy(ipdevice->ifname, ipdevice->ipv6_privacy); + g_free(ipdevice->ifname); g_free(ipdevice); } @@ -409,6 +628,9 @@ void __connman_ipconfig_newlink(int index, unsigned short type, 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->address = g_strdup(address); g_hash_table_insert(ipdevice_hash, GINT_TO_POINTER(index), ipdevice); @@ -483,6 +705,13 @@ update: ipconfig->ops->down(ipconfig); } +#if defined TIZEN_EXT + if (g_strcmp0(ipdevice->address, address) != 0) { + g_free(ipdevice->address); + ipdevice->address = g_strdup(address); + } +#endif + if (lower_up) __connman_ipconfig_lower_up(ipdevice); if (lower_down) @@ -541,6 +770,7 @@ void __connman_ipconfig_newaddr(int index, int family, const char *label, { struct connman_ipdevice *ipdevice; struct connman_ipaddress *ipaddress; + enum connman_ipconfig_type type; GList *list; DBG("index %d", index); @@ -562,6 +792,13 @@ void __connman_ipconfig_newaddr(int index, int family, const char *label, return; } + if (family == AF_INET) + type = CONNMAN_IPCONFIG_TYPE_IPV4; + else if (family == AF_INET6) + type = CONNMAN_IPCONFIG_TYPE_IPV6; + else + return; + ipdevice->address_list = g_slist_append(ipdevice->address_list, ipaddress); @@ -588,6 +825,9 @@ void __connman_ipconfig_newaddr(int index, int family, const char *label, if (index != ipconfig->index) continue; + if (type != ipconfig->type) + continue; + if (ipconfig->ops == NULL) continue; @@ -601,6 +841,7 @@ 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; DBG("index %d", index); @@ -613,10 +854,18 @@ void __connman_ipconfig_deladdr(int index, int family, const char *label, if (ipaddress == NULL) return; + if (family == AF_INET) + type = CONNMAN_IPCONFIG_TYPE_IPV4; + else if (family == AF_INET6) + type = CONNMAN_IPCONFIG_TYPE_IPV6; + else + return; + ipdevice->address_list = g_slist_remove(ipdevice->address_list, ipaddress); - connman_ipaddress_free(ipaddress); + connman_ipaddress_clear(ipaddress); + g_free(ipaddress); connman_info("%s {del} address %s/%u label %s", ipdevice->ifname, address, prefixlen, label); @@ -634,6 +883,9 @@ void __connman_ipconfig_deladdr(int index, int family, const char *label, if (index != ipconfig->index) continue; + if (type != ipconfig->type) + continue; + if (ipconfig->ops == NULL) continue; @@ -653,11 +905,14 @@ void __connman_ipconfig_newroute(int index, int family, unsigned char scope, if (ipdevice == NULL) return; - if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) { + if (scope == 0 && (g_strcmp0(dst, "0.0.0.0") == 0 || + g_strcmp0(dst, "::") == 0)) { GSList *list; GList *config_list; + enum connman_ipconfig_type type; if (family == AF_INET6) { + type = CONNMAN_IPCONFIG_TYPE_IPV6; g_free(ipdevice->ipv6_gateway); ipdevice->ipv6_gateway = g_strdup(gateway); @@ -667,7 +922,8 @@ void __connman_ipconfig_newroute(int index, int family, unsigned char scope, 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); @@ -677,7 +933,8 @@ void __connman_ipconfig_newroute(int index, int family, unsigned char scope, ipdevice->config_ipv4->system->gateway = g_strdup(gateway); } - } + } else + return; for (list = ipdevice->address_list; list; list = list->next) { struct connman_ipaddress *ipaddress = list->data; @@ -693,6 +950,9 @@ void __connman_ipconfig_newroute(int index, int family, unsigned char scope, if (index != ipconfig->index) continue; + if (type != ipconfig->type) + continue; + if (ipconfig->ops == NULL) continue; @@ -717,11 +977,14 @@ void __connman_ipconfig_delroute(int index, int family, unsigned char scope, if (ipdevice == NULL) return; - if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) { + if (scope == 0 && (g_strcmp0(dst, "0.0.0.0") == 0 || + g_strcmp0(dst, "::") == 0)) { GSList *list; GList *config_list; + enum connman_ipconfig_type type; if (family == AF_INET6) { + type = CONNMAN_IPCONFIG_TYPE_IPV6; g_free(ipdevice->ipv6_gateway); ipdevice->ipv6_gateway = NULL; @@ -730,7 +993,8 @@ void __connman_ipconfig_delroute(int index, int family, unsigned char scope, 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; @@ -739,7 +1003,8 @@ void __connman_ipconfig_delroute(int index, int family, unsigned char scope, g_free(ipdevice->config_ipv4->system->gateway); ipdevice->config_ipv4->system->gateway = NULL; } - } + } else + return; for (list = ipdevice->address_list; list; list = list->next) { struct connman_ipaddress *ipaddress = list->data; @@ -755,6 +1020,9 @@ void __connman_ipconfig_delroute(int index, int family, unsigned char scope, if (index != ipconfig->index) continue; + if (type != ipconfig->type) + continue; + if (ipconfig->ops == NULL) continue; @@ -786,7 +1054,13 @@ void __connman_ipconfig_foreach(void (*function) (int index, void *user_data), g_list_free(keys); } -unsigned short __connman_ipconfig_get_type(int index) +enum connman_ipconfig_type __connman_ipconfig_get_config_type( + struct connman_ipconfig *ipconfig) +{ + return ipconfig ? ipconfig->type : CONNMAN_IPCONFIG_TYPE_UNKNOWN; +} + +unsigned short __connman_ipconfig_get_type_from_index(int index) { struct connman_ipdevice *ipdevice; @@ -797,7 +1071,7 @@ unsigned short __connman_ipconfig_get_type(int index) return ipdevice->type; } -unsigned int __connman_ipconfig_get_flags(int index) +unsigned int __connman_ipconfig_get_flags_from_index(int index) { struct connman_ipdevice *ipdevice; @@ -808,7 +1082,7 @@ unsigned int __connman_ipconfig_get_flags(int index) return ipdevice->flags; } -const char *__connman_ipconfig_get_gateway(int index) +const char *__connman_ipconfig_get_gateway_from_index(int index) { struct connman_ipdevice *ipdevice; @@ -838,6 +1112,141 @@ void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int index) ipconfig->index = index; } +const char *__connman_ipconfig_get_local(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return NULL; + + return ipconfig->address->local; +} + +void __connman_ipconfig_set_local(struct connman_ipconfig *ipconfig, const char *address) +{ + if (ipconfig->address == NULL) + return; + + g_free(ipconfig->address->local); + ipconfig->address->local = g_strdup(address); +} + +const char *__connman_ipconfig_get_peer(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return NULL; + + return ipconfig->address->peer; +} + +void __connman_ipconfig_set_peer(struct connman_ipconfig *ipconfig, const char *address) +{ + if (ipconfig->address == NULL) + return; + + g_free(ipconfig->address->peer); + ipconfig->address->peer = g_strdup(address); +} + +const char *__connman_ipconfig_get_broadcast(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return NULL; + + return ipconfig->address->broadcast; +} + +void __connman_ipconfig_set_broadcast(struct connman_ipconfig *ipconfig, const char *broadcast) +{ + if (ipconfig->address == NULL) + return; + + g_free(ipconfig->address->broadcast); + ipconfig->address->broadcast = g_strdup(broadcast); +} + +const char *__connman_ipconfig_get_gateway(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return NULL; + + return ipconfig->address->gateway; +} + +void __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig, const char *gateway) +{ + DBG(""); + + if (ipconfig->address == NULL) + return; + g_free(ipconfig->address->gateway); + ipconfig->address->gateway = g_strdup(gateway); +} + +#if defined TIZEN_EXT +/* + * Description: __connman_service_lookup_from_index cannot find correct service + */ +int __connman_ipconfig_gateway_add(struct connman_ipconfig *ipconfig, struct connman_service *service) +#else +int __connman_ipconfig_gateway_add(struct connman_ipconfig *ipconfig) +#endif +{ +#if !defined TIZEN_EXT + struct connman_service *service; +#endif + + DBG(""); + + if (ipconfig->address == NULL) + return -EINVAL; + +#if !defined TIZEN_EXT + service = __connman_service_lookup_from_index(ipconfig->index); +#endif + if (service == NULL) + return -EINVAL; + + __connman_connection_gateway_remove(service, ipconfig->type); + + DBG("type %d gw %s peer %s", ipconfig->type, + ipconfig->address->gateway, ipconfig->address->peer); + + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6 || + ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) + return __connman_connection_gateway_add(service, + ipconfig->address->gateway, + ipconfig->type, + ipconfig->address->peer); + + return 0; +} + +void __connman_ipconfig_gateway_remove(struct connman_ipconfig *ipconfig) +{ + struct connman_service *service; + + DBG(""); + + service = __connman_service_lookup_from_index(ipconfig->index); + if (service != NULL) + __connman_connection_gateway_remove(service, ipconfig->type); +} + +unsigned char __connman_ipconfig_get_prefixlen(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return 0; + + return ipconfig->address->prefixlen; +} + +void __connman_ipconfig_set_prefixlen(struct connman_ipconfig *ipconfig, unsigned char prefixlen) +{ + if (ipconfig->address == NULL) + return; + + ipconfig->address->prefixlen = prefixlen; +} + static struct connman_ipconfig *create_ipv6config(int index) { struct connman_ipconfig *ipv6config; @@ -853,6 +1262,7 @@ static struct connman_ipconfig *create_ipv6config(int index) ipv6config->index = index; ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6; ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO; + ipv6config->ipv6_privacy_config = 0; ipv6config->address = connman_ipaddress_alloc(AF_INET6); if (ipv6config->address == NULL) { @@ -915,10 +1325,9 @@ struct connman_ipconfig *connman_ipconfig_create(int index, */ struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig) { - DBG("ipconfig %p refcount %d", ipconfig, - g_atomic_int_get(&ipconfig->refcount) + 1); + DBG("ipconfig %p refcount %d", ipconfig, ipconfig->refcount + 1); - g_atomic_int_inc(&ipconfig->refcount); + __sync_fetch_and_add(&ipconfig->refcount, 1); return ipconfig; } @@ -934,23 +1343,25 @@ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) if (ipconfig == NULL) return; - DBG("ipconfig %p refcount %d", ipconfig, - g_atomic_int_get(&ipconfig->refcount) - 1); + DBG("ipconfig %p refcount %d", ipconfig, 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); + if (ipconfig->origin != NULL) { + connman_ipconfig_unref(ipconfig->origin); + ipconfig->origin = NULL; } + + connman_ipaddress_free(ipconfig->system); + connman_ipaddress_free(ipconfig->address); + g_free(ipconfig->last_dhcp_address); + g_free(ipconfig); } /** @@ -1056,71 +1467,17 @@ enum connman_ipconfig_method __connman_ipconfig_get_method(struct connman_ipconf return ipconfig->method; } -/** - * connman_ipconfig_bind: - * @ipconfig: ipconfig structure - * @ipaddress: ipaddress structure - * - * Bind IP address details to configuration - */ -void connman_ipconfig_bind(struct connman_ipconfig *ipconfig, - struct connman_ipaddress *ipaddress) -{ - struct connman_ipconfig *origin; - - origin = ipconfig->origin ? ipconfig->origin : ipconfig; - - connman_ipaddress_copy(origin->address, ipaddress); - - connman_inet_set_address(origin->index, origin->address); -} - -void __connman_ipconfig_set_element_ipv6_gateway( - struct connman_ipconfig *ipconfig, - struct connman_element *element) -{ - if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) - element->ipv6.gateway = ipconfig->address->gateway; -} - -/* - * FIXME: The element soulution should be removed in the future - * Set IPv4 and IPv6 gateway - */ -int __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig, - struct connman_element *parent) -{ - struct connman_element *connection; - - connection = connman_element_create(NULL); - - DBG("ipconfig %p", ipconfig); - - connection->type = CONNMAN_ELEMENT_TYPE_CONNECTION; - connection->index = ipconfig->index; - - if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) - connection->ipv4.gateway = ipconfig->address->gateway; - else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) - connection->ipv6.gateway = ipconfig->address->gateway; - - if (connman_element_register(connection, parent) < 0) - connman_element_unref(connection); - - return 0; -} - -int __connman_ipconfig_set_address(struct connman_ipconfig *ipconfig) +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_FIXED: - case CONNMAN_IPCONFIG_METHOD_DHCP: case CONNMAN_IPCONFIG_METHOD_AUTO: break; + 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_set_address(ipconfig->index, @@ -1133,8 +1490,10 @@ int __connman_ipconfig_set_address(struct connman_ipconfig *ipconfig) return 0; } -int __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig) +int __connman_ipconfig_address_remove(struct connman_ipconfig *ipconfig) { + int err; + DBG(""); if (ipconfig == NULL) @@ -1145,19 +1504,51 @@ int __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig) switch (ipconfig->method) { case CONNMAN_IPCONFIG_METHOD_UNKNOWN: case CONNMAN_IPCONFIG_METHOD_OFF: + case CONNMAN_IPCONFIG_METHOD_AUTO: + break; case CONNMAN_IPCONFIG_METHOD_FIXED: case CONNMAN_IPCONFIG_METHOD_DHCP: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + err = __connman_ipconfig_address_unset(ipconfig); + connman_ipaddress_clear(ipconfig->address); + + return err; + } + + return 0; +} + +int __connman_ipconfig_address_unset(struct connman_ipconfig *ipconfig) +{ + int err; + + DBG(""); + + if (ipconfig == NULL) + return 0; + + DBG("method %d", ipconfig->method); + + switch (ipconfig->method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: case CONNMAN_IPCONFIG_METHOD_AUTO: break; + 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; @@ -1201,6 +1592,72 @@ const char *__connman_ipconfig_get_proxy_autoconfig(struct connman_ipconfig *ipc return ipdevice->pac; } +void __connman_ipconfig_set_dhcp_address(struct connman_ipconfig *ipconfig, + const char *address) +{ + if (ipconfig == NULL) + return; + + g_free(ipconfig->last_dhcp_address); + ipconfig->last_dhcp_address = g_strdup(address); +} + +char *__connman_ipconfig_get_dhcp_address(struct connman_ipconfig *ipconfig) +{ + if (ipconfig == NULL) + return NULL; + + return ipconfig->last_dhcp_address; +} + +static void disable_ipv6(struct connman_ipconfig *ipconfig) +{ + struct connman_ipdevice *ipdevice; + + DBG(""); + + ipdevice = g_hash_table_lookup(ipdevice_hash, + GINT_TO_POINTER(ipconfig->index)); + if (ipdevice == NULL) + return; + + set_ipv6_state(ipdevice->ifname, FALSE); +} + +static void enable_ipv6(struct connman_ipconfig *ipconfig) +{ + struct connman_ipdevice *ipdevice; + + DBG(""); + + ipdevice = g_hash_table_lookup(ipdevice_hash, + GINT_TO_POINTER(ipconfig->index)); + if (ipdevice == NULL) + return; + + if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO) + set_ipv6_privacy(ipdevice->ifname, + ipconfig->ipv6_privacy_config); + + set_ipv6_state(ipdevice->ifname, TRUE); +} + +void __connman_ipconfig_enable_ipv6(struct connman_ipconfig *ipconfig) +{ + if (ipconfig == NULL || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6) + return; + + enable_ipv6(ipconfig); +} + +void __connman_ipconfig_disable_ipv6(struct connman_ipconfig *ipconfig) +{ + if (ipconfig == NULL || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6) + return; + + disable_ipv6(ipconfig); +} + int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig) { struct connman_ipdevice *ipdevice; @@ -1226,6 +1683,7 @@ 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; @@ -1309,6 +1767,10 @@ int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig) if (ipdevice->config_ipv6 == ipconfig) { ipconfig_list = g_list_remove(ipconfig_list, ipconfig); + if (ipdevice->config_ipv6->method == + CONNMAN_IPCONFIG_METHOD_AUTO) + disable_ipv6(ipdevice->config_ipv6); + connman_ipaddress_clear(ipdevice->config_ipv6->system); connman_ipconfig_unref(ipdevice->config_ipv6); ipdevice->config_ipv6 = NULL; @@ -1354,6 +1816,30 @@ enum connman_ipconfig_method __connman_ipconfig_string2method(const char *method return CONNMAN_IPCONFIG_METHOD_UNKNOWN; } +static const char *privacy2string(int privacy) +{ + if (privacy <= 0) + return "disabled"; + else if (privacy == 1) + return "enabled"; + else if (privacy > 1) + return "prefered"; + + return "disabled"; +} + +static int string2privacy(const char *privacy) +{ + if (g_strcmp0(privacy, "disabled") == 0) + return 0; + else if (g_strcmp0(privacy, "enabled") == 0) + return 1; + else if (g_strcmp0(privacy, "prefered") == 0) + return 2; + else + return 0; +} + void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, DBusMessageIter *iter) { @@ -1394,9 +1880,10 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, } void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, - DBusMessageIter *iter) + DBusMessageIter *iter, + struct connman_ipconfig *ipconfig_ipv4) { - const char *str; + const char *str, *privacy; DBG(""); @@ -1407,6 +1894,12 @@ void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, if (str == NULL) return; + if (ipconfig_ipv4 != NULL && + ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO) { + if (__connman_6to4_check(ipconfig_ipv4) == 1) + str = "6to4"; + } + connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str); if (ipconfig->system == NULL) @@ -1423,12 +1916,16 @@ void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, if (ipconfig->system->gateway != NULL) connman_dbus_dict_append_basic(iter, "Gateway", DBUS_TYPE_STRING, &ipconfig->system->gateway); + + privacy = privacy2string(ipconfig->ipv6_privacy_config); + connman_dbus_dict_append_basic(iter, "Privacy", + DBUS_TYPE_STRING, &privacy); } void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig, DBusMessageIter *iter) { - const char *str; + const char *str, *privacy; DBG(""); @@ -1463,6 +1960,10 @@ void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig, if (ipconfig->address->gateway != NULL) connman_dbus_dict_append_basic(iter, "Gateway", DBUS_TYPE_STRING, &ipconfig->address->gateway); + + privacy = privacy2string(ipconfig->ipv6_privacy_config); + connman_dbus_dict_append_basic(iter, "Privacy", + DBUS_TYPE_STRING, &privacy); } void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, @@ -1481,10 +1982,10 @@ 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; } @@ -1517,8 +2018,8 @@ 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; - int prefix_length = 0; + *prefix_length_string = NULL, *privacy_string = NULL; + int prefix_length = 0, privacy = 0; DBusMessageIter dict; DBG("ipconfig %p", ipconfig); @@ -1577,20 +2078,42 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, return -EINVAL; dbus_message_iter_get_basic(&entry, &gateway); + } else if (g_str_equal(key, "Privacy") == TRUE) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&entry, &privacy_string); + privacy = string2privacy(privacy_string); } dbus_message_iter_next(&dict); } - DBG("method %d address %s netmask %s gateway %s prefix_length %d", - method, address, netmask, gateway, prefix_length); + DBG("method %d address %s netmask %s gateway %s prefix_length %d " + "privacy %s", + method, address, netmask, gateway, prefix_length, + privacy_string); switch (method) { case CONNMAN_IPCONFIG_METHOD_UNKNOWN: - case CONNMAN_IPCONFIG_METHOD_OFF: case CONNMAN_IPCONFIG_METHOD_FIXED: - case CONNMAN_IPCONFIG_METHOD_AUTO: return -EINVAL; + case CONNMAN_IPCONFIG_METHOD_OFF: + ipconfig->method = method; + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) + disable_ipv6(ipconfig); + break; + + case CONNMAN_IPCONFIG_METHOD_AUTO: + if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6) + return -EINVAL; + + ipconfig->method = method; + if (privacy_string != NULL) + ipconfig->ipv6_privacy_config = privacy; + enable_ipv6(ipconfig); + break; + case CONNMAN_IPCONFIG_METHOD_MANUAL: if (address == NULL) return -EINVAL; @@ -1603,10 +2126,13 @@ 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) + return -EOPNOTSUPP; + ipconfig->method = method; break; } @@ -1646,6 +2172,7 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, { char *method; char *key; + char *str; DBG("ipconfig %p identifier %s", ipconfig, identifier); @@ -1662,6 +2189,22 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, 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) { + char *privacy; + char *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); + } + } + g_free(method); g_free(key); @@ -1690,6 +2233,14 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, keyfile, identifier, key, NULL); g_free(key); + key = g_strdup_printf("%sDHCP.LastAddress", prefix); + str = g_key_file_get_string(keyfile, identifier, key, NULL); + if (str != NULL) { + g_free(ipconfig->last_dhcp_address); + ipconfig->last_dhcp_address = str; + } + g_free(key); + return 0; } @@ -1707,6 +2258,34 @@ int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, g_key_file_set_string(keyfile, identifier, key, method); g_free(key); + 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); + } + + 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 != NULL && + strlen(ipconfig->last_dhcp_address) > 0) + g_key_file_set_string(keyfile, identifier, key, + ipconfig->last_dhcp_address); + else + g_key_file_remove_key(keyfile, identifier, key, NULL); + g_free(key); + /* fall through */ + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + case CONNMAN_IPCONFIG_METHOD_AUTO: + return 0; + } + key = g_strdup_printf("%snetmask_prefixlen", prefix); g_key_file_set_integer(keyfile, identifier, key, ipconfig->address->prefixlen);