diff options
| author | taesub.kim <taesub.kim@samsung.com> | 2015-05-29 00:08:28 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2015-05-29 00:08:29 -0700 |
| commit | 5e922c0ab85ce1f61686093f227da5e23e54ce95 (patch) | |
| tree | 448422c40fc151acbdf496ebeb15ae5711a05411 | |
| parent | 5eff96f0f0c67bc7233e8600fd077a0af1ed1230 (diff) | |
| parent | 1e3486770b5de4f0e496a7a4103b0e5cb1da8433 (diff) | |
| download | connman-5e922c0ab85ce1f61686093f227da5e23e54ce95.tar.gz connman-5e922c0ab85ce1f61686093f227da5e23e54ce95.tar.bz2 connman-5e922c0ab85ce1f61686093f227da5e23e54ce95.zip | |
Merge "Add support for ipv6" into tizensubmit/tizen/20150603.094522submit/tizen/20150530.015511accepted/tizen/wearable/20150602.002855accepted/tizen/tv/20150602.002833accepted/tizen/mobile/20150602.002901accepted/tizen/common/20150601.145645tizen_3.0.2015.q2_common
| -rw-r--r-- | plugins/telephony.c | 5 | ||||
| -rw-r--r-- | src/network.c | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/plugins/telephony.c b/plugins/telephony.c index ea0bf655..88703edf 100644 --- a/plugins/telephony.c +++ b/plugins/telephony.c @@ -1202,8 +1202,11 @@ static void __set_network_connected(struct telephony_network *network, case CONNMAN_IPCONFIG_METHOD_OFF: case CONNMAN_IPCONFIG_METHOD_MANUAL: case CONNMAN_IPCONFIG_METHOD_DHCP: + break; case CONNMAN_IPCONFIG_METHOD_AUTO: - DBG("ipv6 not supported"); + connman_network_set_ipv6_method(network->network, + network->ipv6_method); + setip = TRUE; break; case CONNMAN_IPCONFIG_METHOD_FIXED: diff --git a/src/network.c b/src/network.c index 8c9fdcbb..eba068b2 100644 --- a/src/network.c +++ b/src/network.c @@ -614,6 +614,11 @@ static void autoconf_ipv6_set(struct connman_network *network) network->connecting = false; +#if defined TIZEN_EXT + if(network->type == CONNMAN_NETWORK_TYPE_CELLULAR) + return; +#endif + service = connman_service_lookup_from_network(network); if (!service) return; @@ -664,6 +669,12 @@ static void set_connected(struct connman_network *network) break; case CONNMAN_IPCONFIG_METHOD_DHCP: case CONNMAN_IPCONFIG_METHOD_AUTO: +#if defined TIZEN_EXT + if(network->type == CONNMAN_NETWORK_TYPE_CELLULAR) + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_CONFIGURATION, + CONNMAN_IPCONFIG_TYPE_IPV6); +#endif autoconf_ipv6_set(network); break; case CONNMAN_IPCONFIG_METHOD_FIXED: |