diff options
| author | hyunuktak <hyunuk.tak@samsung.com> | 2015-08-07 17:11:34 +0900 |
|---|---|---|
| committer | hyunuktak <hyunuk.tak@samsung.com> | 2015-08-07 17:11:56 +0900 |
| commit | 6aa4055ef0544ae85457c25c510fe3db04949c43 (patch) | |
| tree | 94018be3cef92c33b60650c488dc15536c8f978a /src/dhcp.c | |
| parent | bc55a3df0d4d2d97964ce2fadc9fe3ffc4953f4e (diff) | |
| download | connman-6aa4055ef0544ae85457c25c510fe3db04949c43.tar.gz connman-6aa4055ef0544ae85457c25c510fe3db04949c43.tar.bz2 connman-6aa4055ef0544ae85457c25c510fe3db04949c43.zip | |
Base Code merged to SPIN 2.4submit/tizen/20150810.034432
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
Change-Id: I84a42375b5c59739e4caca1f726699ea7647ef17
Diffstat (limited to 'src/dhcp.c')
| -rwxr-xr-x[-rw-r--r--] | src/dhcp.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/dhcp.c b/src/dhcp.c index 505d9f06..9a743626 100644..100755 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -399,7 +399,8 @@ static bool apply_lease_available_on_network(GDHCPClient *dhcp_client, dhcp->pac); } - __connman_6to4_probe(service); + if (connman_setting_get_bool("Enable6to4")) + __connman_6to4_probe(service); return true; } @@ -582,6 +583,17 @@ static int dhcp_release(struct connman_dhcp *dhcp) return 0; } +char *__connman_dhcp_get_server_address(struct connman_ipconfig *ipconfig) +{ + struct connman_dhcp *dhcp; + + dhcp = g_hash_table_lookup(ipconfig_table, ipconfig); + if (!dhcp) + return NULL; + + return g_dhcp_client_get_server_address(dhcp->dhcp_client); +} + int __connman_dhcp_start(struct connman_ipconfig *ipconfig, struct connman_network *network, dhcp_cb callback, gpointer user_data) @@ -672,4 +684,6 @@ void __connman_dhcp_cleanup(void) g_hash_table_destroy(ipconfig_table); ipconfig_table = NULL; + + dhcp_cleanup_random(); } |