Refactor Code

[platform/upstream/connman.git] / src / dhcp.c

diff --git a/src/dhcp.c b/src/dhcp.c
index 7c446cf..5ad1efb 100644 (file)
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -43,6 +43,12 @@
 
 #define RATE_LIMIT_INTERVAL    60      /* delay between successive attempts */
 
+#if defined TIZEN_EXT
+#define DHCP_SUCCESS           "DHCP_SUCCESS"
+#define DHCP_FAIL              "DHCP_FAIL"
+#define DHCP_STARTED           "DHCP_STARTED"
+#endif
+
 struct connman_dhcp {
        struct connman_ipconfig *ipconfig;
        struct connman_network *network;
@@ -287,16 +293,24 @@ static void no_lease_cb(GDHCPClient *dhcp_client, gpointer user_data)
 #if defined TIZEN_EXT
        if (dhcp->network &&
                        connman_network_get_bool(dhcp->network, "WiFi.RoamingDHCP")) {
+
                connman_network_set_bool(dhcp->network, "WiFi.RoamingDHCP", false);
                __connman_network_enable_ipconfig(dhcp->network, dhcp->ipconfig);
+               __connman_network_notify_dhcp_changed(DHCP_FAIL,
+                                       g_dhcp_client_get_interface(dhcp_client));
 
                return;
        }
 
        if (connman_setting_get_bool("EnableAutoIp") == false) {
                DBG("link-local address autoconfiguration is disabled.");
-               if (dhcp->network)
-                       __connman_network_disconnect(dhcp->network);
+
+               if (dhcp->network) {
+                       DBG("[DHCP-C] auto ip is not used, set dhcp-fail error and disconnect");
+                       __connman_network_notify_dhcp_changed(DHCP_FAIL,
+                                               g_dhcp_client_get_interface(dhcp_client));
+                       connman_network_set_error(dhcp->network, CONNMAN_NETWORK_ERROR_DHCP_FAIL);
+               }
                return;
        }
 #endif
@@ -555,6 +569,8 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
 
 #if defined TIZEN_EXT
        __connman_ipconfig_set_dhcp_lease_duration(dhcp->ipconfig, dhcp_lease_duration);
+       __connman_network_notify_dhcp_changed(DHCP_SUCCESS,
+                               g_dhcp_client_get_interface(dhcp_client));
 #endif
 
        /*
@@ -575,7 +591,7 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
        if (connman_network_get_bool(dhcp->network, "WiFi.RoamingDHCP")) {
 
                if (ip_change)
-                       connman_service_notify_reconnection(
+                       connman_service_notify_reconnection_roaming(
                                connman_service_lookup_from_network(dhcp->network));
 
                connman_network_set_bool(dhcp->network, "WiFi.RoamingDHCP", false);
@@ -641,6 +657,11 @@ static void ipv4ll_available_cb(GDHCPClient *ipv4ll_client, gpointer user_data)
 
        g_free(address);
        g_free(netmask);
+
+#if defined TIZEN_EXT
+       __connman_network_notify_dhcp_changed(DHCP_FAIL,
+                       g_dhcp_client_get_interface(ipv4ll_client));
+#endif
 }
 
 static int dhcp_initialize(struct connman_dhcp *dhcp)
@@ -848,7 +869,10 @@ int __connman_dhcp_start(struct connman_ipconfig *ipconfig,
        dhcp->user_data = user_data;
 
 #if defined TIZEN_EXT
-       if (connman_network_get_bool(network, "WiFi.RoamingDHCP")) {
+       __connman_network_notify_dhcp_changed(DHCP_STARTED,
+                       g_dhcp_client_get_interface(dhcp->dhcp_client));
+
+       if (network && connman_network_get_bool(network, "WiFi.RoamingDHCP")) {
                const char *last_addr = __connman_ipconfig_get_dhcp_address(ipconfig);
 
                DBG("Start DHCP with last address request");