diff options
author | taesub kim <taesub.kim@samsung.com> | 2017-12-11 03:38:47 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2017-12-11 03:38:48 +0000 |
commit | 99e9e6faf41282c79f2a6c362c06a81e13de1e46 (patch) | |
tree | 0439b84762ceebba7f600eaf2420c13a291cd566 | |
parent | 5e9af0e41c652bf5a6329bfe9709020087cb6ef4 (diff) | |
parent | 280b740311de1f508707ae800b760416ae8ab9c3 (diff) | |
download | connman-99e9e6faf41282c79f2a6c362c06a81e13de1e46.tar.gz connman-99e9e6faf41282c79f2a6c362c06a81e13de1e46.tar.bz2 connman-99e9e6faf41282c79f2a6c362c06a81e13de1e46.zip |
Merge "In dhcpv6 request always set G_DHCPV6_IA_NA option." into tizensubmit/tizen/20171211.062320accepted/tizen/unified/20171212.064754
-rwxr-xr-x | src/dhcpv6.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 85714e91..b1b2f63d 100755 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -1768,7 +1768,9 @@ static gboolean timeout_solicitation(gpointer user_data) static int dhcpv6_solicitation(struct connman_dhcpv6 *dhcp) { struct connman_service *service; +#if !defined TIZEN_EXT struct connman_ipconfig *ipconfig_ipv6; +#endif GDHCPClient *dhcp_client; GDHCPClientError error; int index, ret; @@ -1811,8 +1813,20 @@ static int dhcpv6_solicitation(struct connman_dhcpv6 *dhcp) g_dhcpv6_client_set_oro(dhcp_client, 3, G_DHCPV6_DNS_SERVERS, G_DHCPV6_DOMAIN_LIST, G_DHCPV6_SNTP_SERVERS); +#if defined TIZEN_EXT + /** + When privacy extension is enabled then connman requests + OPTION_IA_TA (4) from DHCPv6 server. This option is used to request + temporary IPv6 address from DHCPv6 server but we found that DHCPv6 + server never provided temporary IPv6 address and connman resend dhcpv6 + requests. So always set OPTION_IA_NA in dhcpv6 request to get IPv6 + address from DHCPv6 server. + */ + dhcp->use_ta = FALSE; +#else ipconfig_ipv6 = __connman_service_get_ip6config(service); dhcp->use_ta = __connman_ipconfig_ipv6_privacy_enabled(ipconfig_ipv6); +#endif g_dhcpv6_client_set_ia(dhcp_client, index, dhcp->use_ta ? G_DHCPV6_IA_TA : G_DHCPV6_IA_NA, |