Add support for disconnecting networks first

[connman] / src / device.c

diff --git a/src/device.c b/src/device.c
index d865ad4..74196b7 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -317,6 +317,7 @@ static DBusMessage *set_property(DBusConnection *conn,
        struct connman_device *device = data;
        DBusMessageIter iter, value;
        const char *name;
+       int type;
 
        DBG("conn %p", conn);
 
@@ -331,10 +332,15 @@ static DBusMessage *set_property(DBusConnection *conn,
                                        CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
                return __connman_error_permission_denied(msg);
 
+       type = dbus_message_iter_get_arg_type(&value);
+
        if (g_str_equal(name, "Powered") == TRUE) {
                connman_bool_t powered;
                int err;
 
+               if (type != DBUS_TYPE_BOOLEAN)
+                       return __connman_error_invalid_arguments(msg);
+
                dbus_message_iter_get_basic(&value, &powered);
 
                if (device->powered == powered)
@@ -348,6 +354,9 @@ static DBusMessage *set_property(DBusConnection *conn,
                const char *str;
                int err;
 
+               if (type != DBUS_TYPE_STRING)
+                       return __connman_error_invalid_arguments(msg);
+
                dbus_message_iter_get_basic(&value, &str);
                policy = string2policy(str);
                if (policy == CONNMAN_DEVICE_POLICY_UNKNOWN)
@@ -359,6 +368,9 @@ static DBusMessage *set_property(DBusConnection *conn,
        } else if (g_str_equal(name, "Priority") == TRUE) {
                connman_uint8_t priority;
 
+               if (type != DBUS_TYPE_BYTE)
+                       return __connman_error_invalid_arguments(msg);
+
                dbus_message_iter_get_basic(&value, &priority);
 
                device->priority = priority;
@@ -710,11 +722,10 @@ struct connman_device *connman_device_create(const char *node,
 
        DBG("device %p", device);
 
-       device->element.refcount = 1;
+       __connman_element_initialize(&device->element);
 
        device->element.name = g_strdup(node);
        device->element.type = CONNMAN_ELEMENT_TYPE_DEVICE;
-       device->element.index = -1;
 
        device->element.device = device;
        device->element.destruct = device_destruct;
@@ -882,6 +893,17 @@ void connman_device_set_mode(struct connman_device *device,
 }
 
 /**
+ * connman_device_get_mode:
+ * @device: device structure
+ *
+ * Get network mode of device
+ */
+enum connman_device_mode connman_device_get_mode(struct connman_device *device)
+{
+       return device->mode;
+}
+
+/**
  * connman_device_set_powered:
  * @device: device structure
  * @powered: powered state
@@ -974,8 +996,28 @@ int connman_device_set_carrier(struct connman_device *device,
        return 0;
 }
 
+void __connman_device_disconnect(struct connman_device *device)
+{
+       GHashTableIter iter;
+       gpointer key, value;
+
+       DBG("device %p", device);
+
+       g_hash_table_iter_init(&iter, device->networks);
+
+       while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
+               struct connman_network *network = value;
+
+               if (connman_network_get_connected(network) == FALSE)
+                       continue;
+
+               __connman_network_disconnect(network);
+       }
+}
+
 static void connect_known_network(struct connman_device *device)
 {
+       struct connman_network *network = NULL;
        GHashTableIter iter;
        gpointer key, value;
        unsigned int count = 0;
@@ -985,13 +1027,37 @@ static void connect_known_network(struct connman_device *device)
        g_hash_table_iter_init(&iter, device->networks);
 
        while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
-               struct connman_network *network = value;
-               int err;
+               connman_uint8_t old_priority, new_priority;
+               connman_uint8_t old_strength, new_strength;
 
                count++;
 
-               if (connman_network_get_remember(network) == FALSE)
+               if (connman_network_get_remember(value) == FALSE)
+                       continue;
+
+               if (network == NULL) {
+                       network = value;
                        continue;
+               }
+
+               old_priority = connman_network_get_uint8(network, "Priority");
+               new_priority = connman_network_get_uint8(value, "Priority");
+
+               if (new_priority != old_priority) {
+                       if (new_priority > old_priority)
+                               network = value;
+                       continue;
+               }
+
+               old_strength = connman_network_get_uint8(network, "Strength");
+               new_strength = connman_network_get_uint8(value, "Strength");
+
+               if (new_strength > old_strength)
+                       network = value;
+       }
+
+       if (network != NULL) {
+               int err;
 
                err = connman_network_connect(network);
                if (err == 0 || err == -EINPROGRESS)
@@ -1005,6 +1071,31 @@ static void connect_known_network(struct connman_device *device)
                device->driver->scan(device);
 }
 
+static void mark_network_unavailable(gpointer key, gpointer value,
+                                                       gpointer user_data)
+{
+       struct connman_network *network = value;
+
+       if (connman_network_get_remember(network) == TRUE)
+               return;
+
+       connman_network_set_available(network, FALSE);
+}
+
+static gboolean remove_unavailable_network(gpointer key, gpointer value,
+                                                       gpointer user_data)
+{
+       struct connman_network *network = value;
+
+       if (connman_network_get_remember(network) == TRUE)
+               return FALSE;
+
+       if (connman_network_get_available(network) == TRUE)
+               return FALSE;
+
+       return TRUE;
+}
+
 /**
  * connman_device_set_scanning:
  * @device: device structure
@@ -1045,8 +1136,14 @@ int connman_device_set_scanning(struct connman_device *device,
 
        g_dbus_send_message(connection, signal);
 
-       if (scanning == TRUE)
+       if (scanning == TRUE) {
+               g_hash_table_foreach(device->networks,
+                                       mark_network_unavailable, NULL);
                return 0;
+       }
+
+       g_hash_table_foreach_remove(device->networks,
+                                       remove_unavailable_network, NULL);
 
        if (device->connections > 0)
                return 0;
@@ -1103,10 +1200,10 @@ const char *connman_device_get_string(struct connman_device *device,
        return NULL;
 }
 
-static void set_flightmode(struct connman_element *element, gpointer user_data)
+static void set_offlinemode(struct connman_element *element, gpointer user_data)
 {
        struct connman_device *device = element->device;
-       connman_bool_t flightmode = GPOINTER_TO_UINT(user_data);
+       connman_bool_t offlinemode = GPOINTER_TO_UINT(user_data);
        connman_bool_t powered;
 
        DBG("element %p name %s", element, element->name);
@@ -1114,7 +1211,7 @@ static void set_flightmode(struct connman_element *element, gpointer user_data)
        if (device == NULL)
                return;
 
-       powered = (flightmode == TRUE) ? FALSE : TRUE;
+       powered = (offlinemode == TRUE) ? FALSE : TRUE;
 
        if (device->powered == powered)
                return;
@@ -1122,12 +1219,12 @@ static void set_flightmode(struct connman_element *element, gpointer user_data)
        set_powered(device, powered);
 }
 
-int __connman_device_set_flightmode(connman_bool_t flightmode)
+int __connman_device_set_offlinemode(connman_bool_t offlinemode)
 {
-       DBG("flightmode %d", flightmode);
+       DBG("offlinmode %d", offlinemode);
 
        __connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
-                               set_flightmode, GUINT_TO_POINTER(flightmode));
+                       set_offlinemode, GUINT_TO_POINTER(offlinemode));
 
        return 0;
 }
@@ -1225,6 +1322,16 @@ int connman_device_register(struct connman_device *device)
 {
        __connman_storage_load_device(device);
 
+       switch (device->mode) {
+       case CONNMAN_DEVICE_MODE_UNKNOWN:
+       case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+               break;
+       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+               __connman_storage_init_network(device);
+               break;
+       }
+
        return connman_element_register(&device->element, NULL);
 }