diff options
author | Eun Chul Kim <ec4537.kim@samsung.com> | 2017-02-27 15:57:08 +0900 |
---|---|---|
committer | Seonah Moon <seonah1.moon@samsung.com> | 2017-03-30 18:46:32 +0900 |
commit | 1437341c77d3501da366a3645736d509d73415f8 (patch) | |
tree | a064bafe213f72130efb0c6f23e6ed57d229dfff /gdhcp | |
parent | b9a4f38dcd5587016b057bd044fd643218b77b4d (diff) | |
download | connman-1437341c77d3501da366a3645736d509d73415f8.tar.gz connman-1437341c77d3501da366a3645736d509d73415f8.tar.bz2 connman-1437341c77d3501da366a3645736d509d73415f8.zip |
apply upstream fixessubmit/tizen/20170403.015738accepted/tizen/wearable/20170403.124441accepted/tizen/unified/20170403.124614accepted/tizen/tv/20170403.124414accepted/tizen/mobile/20170403.124303accepted/tizen/ivi/20170403.124556accepted/tizen/common/20170403.190030accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_common
- Replace g_timeout_add_seconds() with 0 as timeout to g_idle_add()
- gdhcp: Set T1 and T2 to infinite if expiry time is infinite
- dhcpv6: Return -EISCONN when the expiry time is inifinite
Change-Id: I59ddd9b4c2d1af0f1ee8898381bc0372fba8e8ad
Diffstat (limited to 'gdhcp')
-rwxr-xr-x | gdhcp/client.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gdhcp/client.c b/gdhcp/client.c index 3157632a..7e04176e 100755 --- a/gdhcp/client.c +++ b/gdhcp/client.c @@ -854,16 +854,19 @@ int g_dhcpv6_client_get_timeouts(GDHCPClient *dhcp_client, return -EINVAL; if (T1) - *T1 = dhcp_client->T1; + *T1 = (dhcp_client->expire == 0xffffffff) ? 0xffffffff: + dhcp_client->T1; if (T2) - *T2 = dhcp_client->T2; + *T2 = (dhcp_client->expire == 0xffffffff) ? 0xffffffff: + dhcp_client->T2; if (started) *started = dhcp_client->last_request; if (expire) - *expire = dhcp_client->last_request + dhcp_client->expire; + *expire = (dhcp_client->expire == 0xffffffff) ? 0xffffffff: + dhcp_client->last_request + dhcp_client->expire; return 0; } |