summaryrefslogtreecommitdiff
path: root/src/dhcp.c
diff options
context:
space:
mode:
authortaesub kim <taesub.kim@samsung.com>2017-03-28 01:41:45 -0700
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2017-03-28 01:41:45 -0700
commit619c30df57f62fbbc958f707f681ebe5ef4a5470 (patch)
treec80c870ce3542cef13fe5bb2ba1396b57def49fe /src/dhcp.c
parent0d3b96f6fe23316f15444576b5a590a917beb8a5 (diff)
parente4d49d1aa74f8682807bf57a969795eb1bae1862 (diff)
downloadconnman-619c30df57f62fbbc958f707f681ebe5ef4a5470.tar.gz
connman-619c30df57f62fbbc958f707f681ebe5ef4a5470.tar.bz2
connman-619c30df57f62fbbc958f707f681ebe5ef4a5470.zip
Merge "Modified the DHCP descover/request timeout and disable DHCP reququest for last address" into tizen
Diffstat (limited to 'src/dhcp.c')
-rwxr-xr-xsrc/dhcp.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/dhcp.c b/src/dhcp.c
index 5b0beab5..013948e3 100755
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -634,7 +634,9 @@ int __connman_dhcp_start(struct connman_ipconfig *ipconfig,
struct connman_network *network, dhcp_cb callback,
gpointer user_data)
{
+#if !defined TIZEN_EXT
const char *last_addr = NULL;
+#endif
struct connman_dhcp *dhcp;
int err;
@@ -648,7 +650,9 @@ int __connman_dhcp_start(struct connman_ipconfig *ipconfig,
return -EINVAL;
}
+#if !defined TIZEN_EXT
last_addr = __connman_ipconfig_get_dhcp_address(ipconfig);
+#endif
dhcp = g_hash_table_lookup(ipconfig_table, ipconfig);
if (!dhcp) {
@@ -680,7 +684,14 @@ int __connman_dhcp_start(struct connman_ipconfig *ipconfig,
dhcp->callback = callback;
dhcp->user_data = user_data;
+#if defined TIZEN_EXT
+ DBG("Start DHCP with DHCPDISCOVER request");
+
+ return g_dhcp_client_start(dhcp->dhcp_client, NULL);
+#else
return g_dhcp_client_start(dhcp->dhcp_client, last_addr);
+#endif
+
}
void __connman_dhcp_stop(struct connman_ipconfig *ipconfig)