Maintain connection status when wifi roaming

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

diff --git a/src/dhcp.c b/src/dhcp.c
index 26a350b..7c446cf 100644 (file)
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -134,7 +134,7 @@ static bool apply_dhcp_invalidate_on_network(struct connman_dhcp *dhcp)
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 #else
                        __connman_service_nameserver_remove(service,
-                                       dhcp->nameservers[i], false);
+                                               dhcp->nameservers[i], false);
 #endif
                }
                g_strfreev(dhcp->nameservers);
@@ -265,6 +265,7 @@ static gboolean dhcp_retry_cb(gpointer user_data)
        struct connman_dhcp *dhcp = user_data;
 
        dhcp->timeout = 0;
+
 #if defined TIZEN_EXT
        DBG("dhcp %p", dhcp);
        DBG("dhcp->timeout %d", dhcp->timeout);
@@ -283,6 +284,22 @@ static void no_lease_cb(GDHCPClient *dhcp_client, gpointer user_data)
        DBG("No lease available ipv4ll %d client %p", dhcp->ipv4ll_running,
                dhcp->ipv4ll_client);
 
+#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);
+
+               return;
+       }
+
+       if (connman_setting_get_bool("EnableAutoIp") == false) {
+               DBG("link-local address autoconfiguration is disabled.");
+               if (dhcp->network)
+                       __connman_network_disconnect(dhcp->network);
+               return;
+       }
+#endif
        if (dhcp->timeout > 0)
                g_source_remove(dhcp->timeout);
 
@@ -554,6 +571,17 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
                        __connman_service_notify_ipv4_configuration(service);
        }
 
+#if defined TIZEN_EXT
+       if (connman_network_get_bool(dhcp->network, "WiFi.RoamingDHCP")) {
+
+               if (ip_change)
+                       connman_service_notify_reconnection(
+                               connman_service_lookup_from_network(dhcp->network));
+
+               connman_network_set_bool(dhcp->network, "WiFi.RoamingDHCP", false);
+       }
+#endif
+
        if (ip_change) {
                __connman_ipconfig_set_local(dhcp->ipconfig, address);
                __connman_ipconfig_set_prefixlen(dhcp->ipconfig, prefixlen);
@@ -675,7 +703,7 @@ static int dhcp_initialize(struct connman_dhcp *dhcp)
        g_dhcp_client_set_request(dhcp_client, G_DHCP_ROUTER);
        g_dhcp_client_set_request(dhcp_client, G_DHCP_SUBNET);
 
-       vendor_class_id = connman_option_get_string("VendorClassID");
+       vendor_class_id = connman_setting_get_string("VendorClassID");
        if (vendor_class_id)
                g_dhcp_client_set_send(dhcp_client, G_DHCP_VENDOR_CLASS_ID,
                                        vendor_class_id);
@@ -820,9 +848,15 @@ int __connman_dhcp_start(struct connman_ipconfig *ipconfig,
        dhcp->user_data = user_data;
 
 #if defined TIZEN_EXT
-       DBG("Start DHCP with DHCPDISCOVER request");
+       if (connman_network_get_bool(network, "WiFi.RoamingDHCP")) {
+               const char *last_addr = __connman_ipconfig_get_dhcp_address(ipconfig);
 
-       return g_dhcp_client_start(dhcp->dhcp_client, NULL);
+               DBG("Start DHCP with last address request");
+               return g_dhcp_client_start(dhcp->dhcp_client, last_addr);
+       } else {
+               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
@@ -849,6 +883,30 @@ void __connman_dhcp_stop(struct connman_ipconfig *ipconfig)
        }
 }
 
+void __connman_dhcp_decline(struct connman_ipconfig *ipconfig)
+{
+       struct connman_dhcp *dhcp;
+       const char *address;
+       struct in_addr addr;
+
+       DBG("ipconfig_table %p ipconfig %p", ipconfig_table, ipconfig);
+
+       if (!ipconfig_table)
+               return;
+
+       dhcp = g_hash_table_lookup(ipconfig_table, ipconfig);
+       if (dhcp) {
+               address = __connman_ipconfig_get_local(ipconfig);
+               if (!address)
+                       return;
+
+               if (inet_pton(AF_INET, address, &addr) != 1)
+                       connman_error("Could not convert address %s", address);
+
+               g_dhcp_client_decline(dhcp->dhcp_client, htonl(addr.s_addr));
+       }
+}
+
 int __connman_dhcp_init(void)
 {
        DBG("");
@@ -865,6 +923,4 @@ void __connman_dhcp_cleanup(void)
 
        g_hash_table_destroy(ipconfig_table);
        ipconfig_table = NULL;
-
-       dhcp_cleanup_random();
 }