diff options
author | taesub.kim <taesub.kim@samsung.com> | 2015-10-06 11:04:26 +0900 |
---|---|---|
committer | taesub.kim <taesub.kim@samsung.com> | 2015-10-06 11:04:49 +0900 |
commit | 811c8790cfc2a5cf3806558be7aecac544037ebb (patch) | |
tree | 964bc79dfe5a78b468b4d0cadb50c3c9711591e2 /src/ipconfig.c | |
parent | 8b4bc4bc6b4dc5f2a5723421bd7da133647c3ce0 (diff) | |
download | connman-811c8790cfc2a5cf3806558be7aecac544037ebb.tar.gz connman-811c8790cfc2a5cf3806558be7aecac544037ebb.tar.bz2 connman-811c8790cfc2a5cf3806558be7aecac544037ebb.zip |
Sync with Tizen 2.4(1.29.36)submit/tizen/20151020.082803accepted/tizen/wearable/20151020.111030accepted/tizen/tv/20151020.111019accepted/tizen/mobile/20151020.111002
Change-Id: I02fc50820cccc66aed702a97a9928981e73b43cf
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Diffstat (limited to 'src/ipconfig.c')
-rwxr-xr-x | src/ipconfig.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ipconfig.c b/src/ipconfig.c index 5d6da915..8987ab1a 100755 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -1845,6 +1845,11 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, case CONNMAN_IPCONFIG_METHOD_MANUAL: case CONNMAN_IPCONFIG_METHOD_DHCP: append_addr = ipconfig->system; +#if defined TIZEN_EXT + /* TIZEN enables get_properties before __connman_ipconfig_newaddr */ + if (append_addr && append_addr->local == NULL) + append_addr = ipconfig->address; +#endif break; } @@ -1908,6 +1913,11 @@ void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, case CONNMAN_IPCONFIG_METHOD_DHCP: case CONNMAN_IPCONFIG_METHOD_AUTO: append_addr = ipconfig->system; +#if defined TIZEN_EXT + /* TIZEN enables get_properties before __connman_ipconfig_newaddr */ + if (append_addr && append_addr->local == NULL) + append_addr = ipconfig->address; +#endif break; } |