Add support for toggling debug output

[connman] / src / device.c

diff --git a/src/device.c b/src/device.c
index a2a29be..b9ed1f5 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -36,6 +36,7 @@ struct connman_device {
        connman_bool_t powered;
        connman_bool_t carrier;
        connman_bool_t scanning;
+       connman_bool_t disconnected;
        connman_uint8_t priority;
        char *name;
        char *node;
@@ -1035,6 +1036,8 @@ void __connman_device_disconnect(struct connman_device *device)
 
        DBG("device %p", device);
 
+       connman_device_set_disconnected(device, TRUE);
+
        g_hash_table_iter_init(&iter, device->networks);
 
        while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
@@ -1063,6 +1066,9 @@ static void connect_known_network(struct connman_device *device)
 
                count++;
 
+               if (connman_network_get_available(value) == FALSE)
+                       continue;
+
                name = connman_network_get_string(value, "Name");
                if (name != NULL && device->last_network != NULL) {
                        if (g_str_equal(name, device->last_network) == TRUE) {
@@ -1115,7 +1121,7 @@ static void mark_network_unavailable(gpointer key, gpointer value,
 {
        struct connman_network *network = value;
 
-       if (connman_network_get_remember(network) == TRUE)
+       if (connman_network_get_connected(network) == TRUE)
                return;
 
        connman_network_set_available(network, FALSE);
@@ -1126,6 +1132,9 @@ static gboolean remove_unavailable_network(gpointer key, gpointer value,
 {
        struct connman_network *network = value;
 
+       if (connman_network_get_connected(network) == TRUE)
+               return FALSE;
+
        if (connman_network_get_remember(network) == TRUE)
                return FALSE;
 
@@ -1187,6 +1196,9 @@ int connman_device_set_scanning(struct connman_device *device,
        if (device->connections > 0)
                return 0;
 
+       if (device->disconnected == TRUE)
+               return 0;
+
        if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
                return 0;
 
@@ -1196,6 +1208,35 @@ int connman_device_set_scanning(struct connman_device *device,
 }
 
 /**
+ * connman_device_set_disconnected:
+ * @device: device structure
+ * @disconnected: disconnected state
+ *
+ * Change disconnected state of device (only for device with networks)
+ */
+int connman_device_set_disconnected(struct connman_device *device,
+                                               connman_bool_t disconnected)
+{
+       DBG("driver %p disconnected %d", device, disconnected);
+
+       switch (device->mode) {
+       case CONNMAN_DEVICE_MODE_UNKNOWN:
+       case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+               return -EINVAL;
+       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+               break;
+       }
+
+       if (device->disconnected == disconnected)
+               return -EALREADY;
+
+       device->disconnected = disconnected;
+
+       return 0;
+}
+
+/**
  * connman_device_set_string:
  * @device: device structure
  * @key: unique identifier