diff options
author | taesub kim <taesub.kim@samsung.com> | 2017-12-11 03:38:37 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2017-12-11 03:38:37 +0000 |
commit | 5e9af0e41c652bf5a6329bfe9709020087cb6ef4 (patch) | |
tree | daceb628841ace0bdaddc3af56e6f1121ec39cb4 | |
parent | d10ecb571bd2e4b3011b5bdd101c9aa1ba65e442 (diff) | |
parent | fc5cde2f21e82f0ea15fc9e41f7015ef03db061e (diff) | |
download | connman-5e9af0e41c652bf5a6329bfe9709020087cb6ef4.tar.gz connman-5e9af0e41c652bf5a6329bfe9709020087cb6ef4.tar.bz2 connman-5e9af0e41c652bf5a6329bfe9709020087cb6ef4.zip |
Merge "Process RDNSS option for IPv6 if connecting or connected." into tizen
-rwxr-xr-x | src/rtnl.c | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -1316,30 +1316,33 @@ static void rtnl_newnduseropt(struct nlmsghdr *hdr) #if defined TIZEN_EXT struct connman_service *service; + enum connman_service_state state; enum connman_dnsconfig_method ipv6_dns_method; - char *ifname; service = __connman_service_lookup_from_index(index); - if (!service || !(__connman_service_index_is_default(index))) { - DBG("Invalid service, index: %d\n", index); + if (!service) { + DBG("Invalid service"); return; } DBG("service: %p index: %d\n", service, index); - ifname = connman_inet_ifname(index); - if (ifname == NULL) { - DBG("Interface is NULL, return"); - return; + if (connman_setting_get_bool("SingleConnectedTechnology") == TRUE) { + state = __connman_service_ipconfig_get_state(service, CONNMAN_IPCONFIG_TYPE_IPV6); + if (state != CONNMAN_SERVICE_STATE_ASSOCIATION && + state != CONNMAN_SERVICE_STATE_CONFIGURATION && + state != CONNMAN_SERVICE_STATE_READY && + state != CONNMAN_SERVICE_STATE_ONLINE) { + DBG("Service state[%d] is not connecting/connected", state); + return; + } } ipv6_dns_method = connman_service_get_ipv6_dns_method(service); if (ipv6_dns_method != CONNMAN_DNSCONFIG_METHOD_DHCP) { DBG("IPv6 DNS method is not Auto ignore RA!!! [DNS method: %d]", ipv6_dns_method); - g_free(ifname); return; } - g_free(ifname); #endif for (opt = (void *)&msg[1]; |