X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fipconfig.c;h=7fc887b7ddd93eef611bb50a1d0f9b766fb380bf;hb=0198bed1ceed7a84e10a4bd8cd428ac729a3ac85;hp=17ac5d345a054cdcc89446c28a3abbfa7c48760f;hpb=a2c69f7c9d0f506ea74737a0d072f5ff6cb18703;p=platform%2Fupstream%2Fconnman.git diff --git a/src/ipconfig.c b/src/ipconfig.c index 17ac5d3..7fc887b 100644 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -23,6 +23,7 @@ #include #endif +#include #include #include #include @@ -50,6 +51,8 @@ struct connman_ipconfig { enum connman_ipconfig_method method; struct connman_ipaddress *address; struct connman_ipaddress *system; + + int ipv6_privacy_config; }; struct connman_ipdevice { @@ -77,11 +80,8 @@ struct connman_ipdevice { struct connman_ipconfig *config_ipv4; struct connman_ipconfig *config_ipv6; - struct connman_ipconfig_driver *driver_ipv4; - struct connman_ipconfig *driver_config_ipv4; - - struct connman_ipconfig_driver *driver_ipv6; - struct connman_ipconfig *driver_config_ipv6; + gboolean ipv6_enabled; + int ipv6_privacy; }; static GHashTable *ipdevice_hash = NULL; @@ -297,191 +297,166 @@ static const char *scope2str(unsigned char scope) return ""; } -static void free_ipdevice(gpointer data) +static gboolean get_ipv6_state(gchar *ifname) { - struct connman_ipdevice *ipdevice = data; + int disabled; + gchar *path; + FILE *f; + gboolean enabled = FALSE; - connman_info("%s {remove} index %d", ipdevice->ifname, - ipdevice->index); + 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 (ipdevice->config_ipv4 != NULL) { - connman_ipconfig_unref(ipdevice->config_ipv4); - ipdevice->config_ipv4 = NULL; - } + if (path == NULL) + return enabled; - if (ipdevice->config_ipv6 != NULL) { - connman_ipconfig_unref(ipdevice->config_ipv6); - ipdevice->config_ipv6 = NULL; - } + f = fopen(path, "r"); - free_address_list(ipdevice); - g_free(ipdevice->ipv4_gateway); - g_free(ipdevice->ipv6_gateway); - g_free(ipdevice->pac); + g_free(path); - g_free(ipdevice->address); - g_free(ipdevice->ifname); - g_free(ipdevice); -} + if (f != NULL) { + if (fscanf(f, "%d", &disabled) > 0) + enabled = !disabled; + fclose(f); + } -static GSList *driver_list = NULL; + return enabled; +} -static gint compare_priority(gconstpointer a, gconstpointer b) +static void set_ipv6_state(gchar *ifname, gboolean enable) { - const struct connman_ipconfig_driver *driver1 = a; - const struct connman_ipconfig_driver *driver2 = b; + gchar *path; + FILE *f; - return driver2->priority - driver1->priority; -} + 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); -/** - * connman_ipconfig_driver_register: - * @driver: IP configuration driver - * - * Register a new IP configuration driver - * - * Returns: %0 on success - */ -int connman_ipconfig_driver_register(struct connman_ipconfig_driver *driver) -{ - DBG("driver %p name %s", driver, driver->name); + if (path == NULL) + return; - driver_list = g_slist_insert_sorted(driver_list, driver, - compare_priority); + f = fopen(path, "r+"); - return 0; + g_free(path); + + if (f == NULL) + return; + + if (enable == FALSE) + fprintf(f, "1"); + else + fprintf(f, "0"); + + fclose(f); } -/** - * connman_ipconfig_driver_unregister: - * @driver: IP configuration driver - * - * Remove a previously registered IP configuration driver. - */ -void connman_ipconfig_driver_unregister(struct connman_ipconfig_driver *driver) +static int get_ipv6_privacy(gchar *ifname) { - DBG("driver %p name %s", driver, driver->name); + 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); - driver_list = g_slist_remove(driver_list, driver); + return value; } -static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice) +/* 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) { - GSList *list; - int is_dhcpv4 = 0, is_dhcpv6 = 0; - int found = 0; + gchar *path; + FILE *f; - DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4, - ipdevice->config_ipv6); - - if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL) + if (ifname == NULL) return; - if (ipdevice->driver_ipv4 != NULL && ipdevice->driver_ipv6 != NULL) + path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr", + ifname); + + if (path == NULL) return; - if (ipdevice->config_ipv4) { - switch (ipdevice->config_ipv4->method) { - case CONNMAN_IPCONFIG_METHOD_UNKNOWN: - case CONNMAN_IPCONFIG_METHOD_OFF: - case CONNMAN_IPCONFIG_METHOD_FIXED: - case CONNMAN_IPCONFIG_METHOD_MANUAL: - break; - case CONNMAN_IPCONFIG_METHOD_DHCP: - is_dhcpv4 = 1; - break; - } - } + if (value < 0) + value = 0; - if (ipdevice->config_ipv6) { - switch (ipdevice->config_ipv6->method) { - case CONNMAN_IPCONFIG_METHOD_UNKNOWN: - case CONNMAN_IPCONFIG_METHOD_OFF: - case CONNMAN_IPCONFIG_METHOD_FIXED: - case CONNMAN_IPCONFIG_METHOD_MANUAL: - break; - case CONNMAN_IPCONFIG_METHOD_DHCP: - is_dhcpv6 = 1; - break; - } - } + f = fopen(path, "r+"); - if (is_dhcpv4 && ipdevice->config_ipv4) { - ipdevice->driver_config_ipv4 = connman_ipconfig_clone( - ipdevice->config_ipv4); - if (ipdevice->driver_config_ipv4 == NULL) - return; - } + g_free(path); - if (is_dhcpv6 && ipdevice->config_ipv6) { - ipdevice->driver_config_ipv6 = connman_ipconfig_clone( - ipdevice->config_ipv6); - if (ipdevice->driver_config_ipv6 == NULL) - return; - } + if (f == NULL) + return; - for (list = driver_list; list; list = list->next) { - struct connman_ipconfig_driver *driver = list->data; + fprintf(f, "%d", value); + fclose(f); +} - if (is_dhcpv4 && ipdevice->driver_ipv4 != NULL) { - if (!driver->request(ipdevice->driver_config_ipv4)) { - ipdevice->driver_ipv4 = driver; - found++; - } - } +static void free_ipdevice(gpointer data) +{ + struct connman_ipdevice *ipdevice = data; - if (is_dhcpv6 && ipdevice->driver_ipv6 != NULL) { - if (!driver->request(ipdevice->driver_config_ipv6)) { - ipdevice->driver_ipv6 = driver; - found++; - } - } + connman_info("%s {remove} index %d", ipdevice->ifname, + ipdevice->index); - if (found > 1) - break; + if (ipdevice->config_ipv4 != NULL) { + connman_ipconfig_unref(ipdevice->config_ipv4); + ipdevice->config_ipv4 = NULL; } - if (ipdevice->driver_ipv4 == NULL) { - connman_ipconfig_unref(ipdevice->driver_config_ipv4); - ipdevice->driver_config_ipv4 = NULL; + if (ipdevice->config_ipv6 != NULL) { + connman_ipconfig_unref(ipdevice->config_ipv6); + ipdevice->config_ipv6 = NULL; } - if (ipdevice->driver_ipv6 == NULL) { - connman_ipconfig_unref(ipdevice->driver_config_ipv6); - ipdevice->driver_config_ipv6 = NULL; - } + free_address_list(ipdevice); + g_free(ipdevice->ipv4_gateway); + g_free(ipdevice->ipv6_gateway); + 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); } -static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice) +static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice) { DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4, ipdevice->config_ipv6); +} - if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL) - return; - - if (ipdevice->driver_ipv4 == NULL && ipdevice->driver_ipv6 == NULL) - return; - - if (ipdevice->driver_ipv4) { - ipdevice->driver_ipv4->release(ipdevice->driver_config_ipv4); - ipdevice->driver_ipv4 = NULL; - } - - if (ipdevice->driver_ipv6) { - ipdevice->driver_ipv6->release(ipdevice->driver_config_ipv6); - ipdevice->driver_ipv6 = NULL; - } - - if (ipdevice->driver_config_ipv4) { - connman_ipconfig_unref(ipdevice->driver_config_ipv4); - ipdevice->driver_config_ipv4 = NULL; - } - - if (ipdevice->driver_config_ipv6) { - connman_ipconfig_unref(ipdevice->driver_config_ipv6); - ipdevice->driver_config_ipv6 = NULL; - } +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, @@ -563,6 +538,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); @@ -770,7 +748,8 @@ void __connman_ipconfig_deladdr(int index, int family, const char *label, 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); @@ -940,7 +919,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; @@ -951,7 +936,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; @@ -962,7 +947,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; @@ -992,6 +977,110 @@ 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) +{ + struct connman_service *service; + + if (ipconfig->address == NULL) + return; + + service = __connman_service_lookup_from_index(ipconfig->index); + if (service != NULL) + __connman_connection_gateway_remove(service); + + g_free(ipconfig->address->gateway); + ipconfig->address->gateway = g_strdup(gateway); + + if (service != NULL && ipconfig->address->gateway != NULL) { + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) { + __connman_connection_gateway_add(service, + NULL, + ipconfig->address->gateway, + ipconfig->address->peer); + } else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) { + __connman_connection_gateway_add(service, + ipconfig->address->gateway, + NULL, + ipconfig->address->peer); + } + } +} + +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; @@ -1002,9 +1091,12 @@ static struct connman_ipconfig *create_ipv6config(int index) if (ipv6config == NULL) return NULL; + ipv6config->refcount = 1; + ipv6config->index = index; ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6; - ipv6config->method = CONNMAN_IPCONFIG_METHOD_OFF; + ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO; + ipv6config->ipv6_privacy_config = 0; ipv6config->address = connman_ipaddress_alloc(AF_INET6); if (ipv6config->address == NULL) { @@ -1058,31 +1150,6 @@ struct connman_ipconfig *connman_ipconfig_create(int index, return ipconfig; } -/** - * connman_ipconfig_clone: - * - * Clone an ipconfig structure and create new reference. - * - * Returns: a newly-allocated #connman_ipconfig structure - */ -struct connman_ipconfig *connman_ipconfig_clone(struct connman_ipconfig *ipconfig) -{ - struct connman_ipconfig *ipconfig_clone; - - DBG("ipconfig %p", ipconfig); - - ipconfig_clone = g_try_new0(struct connman_ipconfig, 1); - if (ipconfig_clone == NULL) - return NULL; - - ipconfig_clone->refcount = 1; - - ipconfig_clone->origin = connman_ipconfig_ref(ipconfig); - - ipconfig_clone->index = -1; - - return ipconfig_clone; -} /** * connman_ipconfig_ref: @@ -1092,6 +1159,9 @@ struct connman_ipconfig *connman_ipconfig_clone(struct connman_ipconfig *ipconfi */ struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig) { + DBG("ipconfig %p refcount %d", ipconfig, + g_atomic_int_get(&ipconfig->refcount) + 1); + g_atomic_int_inc(&ipconfig->refcount); return ipconfig; @@ -1105,8 +1175,13 @@ struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig) */ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) { - if (ipconfig && - g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) { + if (ipconfig == NULL) + return; + + DBG("ipconfig %p refcount %d", ipconfig, + g_atomic_int_get(&ipconfig->refcount) - 1); + + if (g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) { __connman_ipconfig_disable(ipconfig); connman_ipconfig_set_ops(ipconfig, NULL); @@ -1130,6 +1205,9 @@ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) */ void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig) { + if (ipconfig == NULL) + return NULL; + return ipconfig->ops_data; } @@ -1199,15 +1277,6 @@ void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, ipconfig->ops = ops; } -struct connman_ipconfig *connman_ipconfig_get_ipv6config( - struct connman_ipconfig *ipconfig) -{ - if (ipconfig == NULL || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6) - return NULL; - - return ipconfig; -} - /** * connman_ipconfig_set_method: * @ipconfig: ipconfig structure @@ -1258,33 +1327,6 @@ void __connman_ipconfig_set_element_ipv6_gateway( 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) { DBG(""); @@ -1294,6 +1336,7 @@ int __connman_ipconfig_set_address(struct connman_ipconfig *ipconfig) 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_MANUAL: if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) @@ -1321,6 +1364,7 @@ int __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig) 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_MANUAL: if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) @@ -1374,6 +1418,46 @@ const char *__connman_ipconfig_get_proxy_autoconfig(struct connman_ipconfig *ipc return ipdevice->pac; } +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_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; @@ -1399,12 +1483,14 @@ 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) { - ipconfig_list = g_list_remove(ipconfig_list, ipconfig); + ipconfig_list = g_list_remove(ipconfig_list, + ipdevice->config_ipv4); connman_ipaddress_clear(ipdevice->config_ipv4->system); @@ -1413,7 +1499,8 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig) if (type == CONNMAN_IPCONFIG_TYPE_IPV6 && ipdevice->config_ipv6 != NULL) { - ipconfig_list = g_list_remove(ipconfig_list, ipconfig); + ipconfig_list = g_list_remove(ipconfig_list, + ipdevice->config_ipv6); connman_ipaddress_clear(ipdevice->config_ipv6->system); @@ -1480,6 +1567,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; @@ -1502,6 +1593,8 @@ const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method return "manual"; case CONNMAN_IPCONFIG_METHOD_DHCP: return "dhcp"; + case CONNMAN_IPCONFIG_METHOD_AUTO: + return "auto"; } return NULL; @@ -1517,10 +1610,36 @@ enum connman_ipconfig_method __connman_ipconfig_string2method(const char *method return CONNMAN_IPCONFIG_METHOD_MANUAL; else if (g_strcmp0(method, "dhcp") == 0) return CONNMAN_IPCONFIG_METHOD_DHCP; + else if (g_strcmp0(method, "auto") == 0) + return CONNMAN_IPCONFIG_METHOD_AUTO; else 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) { @@ -1563,7 +1682,7 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, DBusMessageIter *iter) { - const char *str; + const char *str, *privacy; DBG(""); @@ -1590,12 +1709,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(""); @@ -1612,6 +1735,7 @@ void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig, return; case CONNMAN_IPCONFIG_METHOD_FIXED: case CONNMAN_IPCONFIG_METHOD_MANUAL: + case CONNMAN_IPCONFIG_METHOD_AUTO: break; } @@ -1629,6 +1753,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, @@ -1649,6 +1777,7 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, 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_MANUAL: break; @@ -1678,19 +1807,15 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, } int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, - enum connman_ipconfig_type type, DBusMessageIter *array) + DBusMessageIter *array) { 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 type %d", ipconfig, type); - - if (type != CONNMAN_IPCONFIG_TYPE_IPV4 && - type != CONNMAN_IPCONFIG_TYPE_IPV6) - return -EINVAL; + DBG("ipconfig %p", ipconfig); if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY) return -EINVAL; @@ -1746,26 +1871,49 @@ 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: 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; ipconfig->method = method; - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) connman_ipaddress_set_ipv4(ipconfig->address, address, netmask, gateway); else @@ -1775,8 +1923,8 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, break; case CONNMAN_IPCONFIG_METHOD_DHCP: - if (ipconfig->method == method) - return 0; + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) + return -EOPNOTSUPP; ipconfig->method = method; break; @@ -1815,7 +1963,7 @@ void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig, int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, GKeyFile *keyfile, const char *identifier, const char *prefix) { - const char *method; + char *method; char *key; DBG("ipconfig %p identifier %s", ipconfig, identifier); @@ -1829,6 +1977,27 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF; } else ipconfig->method = __connman_ipconfig_string2method(method); + + if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_UNKNOWN) + ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF; + + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) { + if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO || + ipconfig->method == CONNMAN_IPCONFIG_METHOD_MANUAL) { + 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); key = g_strdup_printf("%snetmask_prefixlen", prefix); @@ -1873,6 +2042,17 @@ int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, g_key_file_set_string(keyfile, identifier, key, method); g_free(key); + switch (ipconfig->method) { + case CONNMAN_IPCONFIG_METHOD_FIXED: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + break; + 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); @@ -1902,6 +2082,14 @@ int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, key, ipconfig->address->gateway); 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); + } + return 0; }