summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaurav Babu <saurav.babu@samsung.com>2017-12-07 11:42:46 (GMT)
committerSaurav Babu <saurav.babu@samsung.com>2017-12-07 11:43:27 (GMT)
commitd10ecb571bd2e4b3011b5bdd101c9aa1ba65e442 (patch)
tree4ebf1d9974edd276f79692c28e4c9a226b8fa6b4
parent72f98c00c468f34732c30ebbab885dee404d559a (diff)
downloadconnman-d10ecb571bd2e4b3011b5bdd101c9aa1ba65e442.zip
connman-d10ecb571bd2e4b3011b5bdd101c9aa1ba65e442.tar.gz
connman-d10ecb571bd2e4b3011b5bdd101c9aa1ba65e442.tar.bz2
Revert "[connman] Configure IPv6 after IPv4 dhcp succeed."refs/changes/48/163148/2
This reverts commit 0d3b96f6fe23316f15444576b5a590a917beb8a5. Change-Id: I83a7f0b3a5485bb6bd14f863b0e180bea1570899
-rwxr-xr-xsrc/network.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/network.c b/src/network.c
index 08b1319..644267c 100755
--- a/src/network.c
+++ b/src/network.c
@@ -114,8 +114,6 @@ struct connman_network {
};
-static void autoconf_ipv6_set(struct connman_network *network);
-
static const char *type2string(enum connman_network_type type)
{
switch (type) {
@@ -228,27 +226,12 @@ static void dhcp_callback(struct connman_ipconfig *ipconfig,
struct connman_network *network,
bool success, gpointer data)
{
-#if defined TIZEN_EXT
- struct connman_service *service;
- struct connman_ipconfig *ipconfig_ipv6;
-#endif
-
network->connecting = false;
if (success)
dhcp_success(network);
else
dhcp_failure(network);
-
-#if defined TIZEN_EXT
- service = connman_service_lookup_from_network(network);
- ipconfig_ipv6 = __connman_service_get_ip6config(service);
- if (__connman_ipconfig_get_method(ipconfig_ipv6) == CONNMAN_IPCONFIG_METHOD_AUTO) {
- DBG("IPv6 autoconf start");
- set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV6);
- autoconf_ipv6_set(network);
- }
-#endif
}
static int set_connected_manual(struct connman_network *network)
@@ -407,6 +390,7 @@ err:
return err;
}
+static void autoconf_ipv6_set(struct connman_network *network);
static void dhcpv6_callback(struct connman_network *network,
enum __connman_dhcpv6_status status, gpointer data);
@@ -1841,9 +1825,7 @@ int __connman_network_enable_ipconfig(struct connman_network *network,
return -ENOSYS;
case CONNMAN_IPCONFIG_TYPE_IPV6:
-#if !defined TIZEN_EXT
set_configuration(network, type);
-#endif
method = __connman_ipconfig_get_method(ipconfig);
@@ -1866,16 +1848,11 @@ int __connman_network_enable_ipconfig(struct connman_network *network,
CONNMAN_SERVICE_STATE_CONFIGURATION,
CONNMAN_IPCONFIG_TYPE_IPV6);
#endif
-#if !defined TIZEN_EXT
autoconf_ipv6_set(network);
-#endif
break;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
-#if defined TIZEN_EXT
- set_configuration(network, type);
-#endif
r = manual_ipv6_set(network, ipconfig);
break;