device: Include Reason in Disconnect Skip Warning

[framework/connectivity/connman.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 07c427d..a9f4330 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -40,11 +40,13 @@ struct connman_device {
        connman_bool_t disconnected;
        connman_bool_t reconnect;
        connman_uint16_t scan_interval;
+       connman_uint16_t backoff_interval;
        char *name;
        char *node;
        char *address;
        char *interface;
        char *ident;
+       char *path;
        int phyindex;
        unsigned int connections;
        guint scan_timeout;
@@ -57,6 +59,8 @@ struct connman_device {
        GHashTable *networks;
 };
 
+#define SCAN_INITIAL_DELAY 10
+
 static gboolean device_scan_trigger(gpointer user_data)
 {
        struct connman_device *device = user_data;
@@ -87,9 +91,23 @@ static void reset_scan_trigger(struct connman_device *device)
        clear_scan_trigger(device);
 
        if (device->scan_interval > 0) {
-               guint interval = device->scan_interval;
+               guint interval;
+
+               if (g_hash_table_size(device->networks) == 0) {
+                       if (device->backoff_interval >= device->scan_interval)
+                               device->backoff_interval = SCAN_INITIAL_DELAY;
+                       interval = device->backoff_interval;
+               } else
+                       interval = device->scan_interval;
+
+               DBG("interval %d", interval);
+
                device->scan_timeout = g_timeout_add_seconds(interval,
                                        device_scan_trigger, device);
+
+               device->backoff_interval *= 2;
+               if (device->backoff_interval > device->scan_interval)
+                       device->backoff_interval = device->scan_interval;
        }
 }
 
@@ -423,6 +441,7 @@ static void device_destruct(struct connman_element *element)
        g_free(device->name);
        g_free(device->address);
        g_free(device->interface);
+       g_free(device->path);
 
        g_free(device->last_network);
 
@@ -445,6 +464,7 @@ struct connman_device *connman_device_create(const char *node,
        struct connman_device *device;
        const char *str;
        enum connman_service_type service_type;
+       connman_bool_t bg_scan;
 
        DBG("node %s type %d", node, type);
 
@@ -454,6 +474,8 @@ struct connman_device *connman_device_create(const char *node,
 
        DBG("device %p", device);
 
+       bg_scan = connman_setting_get_bool("BackgroundScanning");
+
        __connman_element_initialize(&device->element);
 
        device->element.name = g_strdup(node);
@@ -467,8 +489,6 @@ struct connman_device *connman_device_create(const char *node,
                connman_element_set_string(&device->element,
                                        CONNMAN_PROPERTY_ID_TYPE, str);
 
-       device->element.ipv4.method = CONNMAN_IPCONFIG_METHOD_DHCP;
-
        device->type = type;
        device->name = g_strdup(type2description(device->type));
 
@@ -478,31 +498,25 @@ struct connman_device *connman_device_create(const char *node,
 
        service_type = __connman_device_get_service_type(device);
        device->blocked = __connman_technology_get_blocked(service_type);
+       device->backoff_interval = SCAN_INITIAL_DELAY;
 
        switch (type) {
        case CONNMAN_DEVICE_TYPE_UNKNOWN:
-       case CONNMAN_DEVICE_TYPE_VENDOR:
-               device->scan_interval = 0;
-               break;
        case CONNMAN_DEVICE_TYPE_ETHERNET:
-       case CONNMAN_DEVICE_TYPE_WIFI:
-               device->scan_interval = 300;
-               break;
        case CONNMAN_DEVICE_TYPE_WIMAX:
-               device->scan_interval = 0;
-               break;
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
-               device->scan_interval = 0;
-               break;
-       case CONNMAN_DEVICE_TYPE_GPS:
-               device->scan_interval = 0;
-               break;
        case CONNMAN_DEVICE_TYPE_CELLULAR:
-               device->scan_interval = 0;
-               break;
+       case CONNMAN_DEVICE_TYPE_GPS:
        case CONNMAN_DEVICE_TYPE_GADGET:
+       case CONNMAN_DEVICE_TYPE_VENDOR:
                device->scan_interval = 0;
                break;
+       case CONNMAN_DEVICE_TYPE_WIFI:
+               if (bg_scan == TRUE)
+                       device->scan_interval = 300;
+               else
+                       device->scan_interval = 0;
+               break;
        }
 
        device->networks = g_hash_table_new_full(g_str_hash, g_str_equal,
@@ -769,7 +783,7 @@ int __connman_device_disconnect(struct connman_device *device)
        while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
                struct connman_network *network = value;
 
-               if (__connman_network_get_connecting(network) == TRUE) {
+               if (connman_network_get_connecting(network) == TRUE) {
                        /*
                         * Skip network in the process of connecting.
                         * This is a workaround for WiFi networks serviced
@@ -780,7 +794,7 @@ int __connman_device_disconnect(struct connman_device *device)
                         * will fail.  There is nothing to be gained by
                         * removing the network here anyway.
                         */
-                       connman_warn("Skipping disconnect of %s",
+                       connman_warn("Skipping disconnect of %s, network is connecting.",
                                connman_network_get_identifier(network));
                        continue;
                }
@@ -939,9 +953,14 @@ int connman_device_set_string(struct connman_device *device,
        } else if (g_str_equal(key, "Node") == TRUE) {
                g_free(device->node);
                device->node = g_strdup(value);
+       } else if (g_str_equal(key, "Path") == TRUE) {
+               g_free(device->path);
+               device->path = g_strdup(value);
+       } else {
+               return -EINVAL;
        }
 
-       return connman_element_set_string(&device->element, key, value);
+       return 0;
 }
 
 /**
@@ -964,8 +983,10 @@ const char *connman_device_get_string(struct connman_device *device,
                return device->node;
        else if (g_str_equal(key, "Interface") == TRUE)
                return device->interface;
+       else if (g_str_equal(key, "Path") == TRUE)
+               return device->path;
 
-       return connman_element_get_string(&device->element, key);
+       return NULL;
 }
 
 static void set_offlinemode(struct connman_element *element, gpointer user_data)
@@ -1021,6 +1042,9 @@ void __connman_device_decrease_connections(struct connman_device *device)
                return;
 
        device->connections--;
+
+       if (device->connections == 0)
+               device->backoff_interval = SCAN_INITIAL_DELAY;
 }
 
 /**
@@ -1258,7 +1282,6 @@ static int device_load(struct connman_device *device)
        GError *error = NULL;
        gchar *identifier;
        connman_bool_t powered;
-       int val;
 
        DBG("device %p", device);
 
@@ -1276,12 +1299,6 @@ static int device_load(struct connman_device *device)
                device->powered_persistent = powered;
        g_clear_error(&error);
 
-       val = g_key_file_get_integer(keyfile, identifier,
-                                               "ScanInterval", &error);
-       if (error == NULL)
-               device->scan_interval = val;
-       g_clear_error(&error);
-
 done:
        g_free(identifier);
 
@@ -1309,9 +1326,6 @@ static int device_save(struct connman_device *device)
        g_key_file_set_boolean(keyfile, identifier,
                                        "Powered", device->powered_persistent);
 
-       g_key_file_set_integer(keyfile, identifier,
-                                       "ScanInterval", device->scan_interval);
-
 done:
        g_free(identifier);