Reconnecting to last selected network by default

[connman] / src / network.c

diff --git a/src/network.c b/src/network.c
index f368ae8..4a7b8f2 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -158,6 +158,7 @@ static DBusMessage *set_property(DBusConnection *conn,
        struct connman_network *network = data;
        DBusMessageIter iter, value;
        const char *name;
+       int type;
 
        DBG("conn %p", conn);
 
@@ -172,16 +173,26 @@ 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, "Remember") == TRUE) {
                connman_bool_t remember;
 
+               if (type != DBUS_TYPE_BOOLEAN)
+                       return __connman_error_invalid_arguments(msg);
+
                dbus_message_iter_get_basic(&value, &remember);
 
                if (network->remember == remember)
                        return __connman_error_invalid_arguments(msg);
+
+               network->remember = remember;
        } else if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
                const char *passphrase;
 
+               if (type != DBUS_TYPE_STRING)
+                       return __connman_error_invalid_arguments(msg);
+
                if (__connman_security_check_privilege(msg,
                                        CONNMAN_SECURITY_PRIVILEGE_SECRET) < 0)
                        return __connman_error_permission_denied(msg);
@@ -193,6 +204,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);
 
                network->priority = priority;
@@ -219,6 +233,12 @@ static DBusMessage *do_connect(DBusConnection *conn,
                return __connman_error_failed(msg);
 
        if (network->driver && network->driver->connect) {
+               enum connman_device_mode mode;
+
+               mode = connman_device_get_mode(network->device);
+               if (mode == CONNMAN_DEVICE_MODE_NETWORK_SINGLE)
+                       __connman_device_disconnect(network->device);
+
                err = network->driver->connect(network);
                if (err < 0 && err != -EINPROGRESS)
                        return __connman_error_failed(msg);
@@ -293,11 +313,12 @@ static void append_networks(struct connman_device *device,
 
 static void emit_networks_signal(struct connman_device *device)
 {
+       const char *path = connman_device_get_path(device);
        DBusMessage *signal;
        DBusMessageIter entry;
 
-       signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
-                               CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+       signal = dbus_message_new_signal(path,
+                               CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
        if (signal == NULL)
                return;
 
@@ -431,21 +452,20 @@ struct connman_network *connman_network_create(const char *identifier,
 
        DBG("network %p", network);
 
-       network->element.refcount = 1;
+       __connman_element_initialize(&network->element);
 
        network->element.name = g_strdup(identifier);
        network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK;
-       network->element.index = -1;
 
        network->element.network = network;
        network->element.destruct = network_destruct;
 
        str = type2string(type);
        if (str != NULL)
-               connman_element_add_static_property(&network->element,
+               connman_element_set_static_property(&network->element,
                                        "Type", DBUS_TYPE_STRING, &str);
 
-       connman_element_add_static_property(&network->element,
+       connman_element_set_static_property(&network->element,
                                        "Strength", DBUS_TYPE_BYTE, &strength);
 
        network->type = type;
@@ -561,7 +581,10 @@ int connman_network_set_available(struct connman_network *network,
        if (network->registered == FALSE)
                return 0;
 
-       if (network->connected == FALSE && network->remember == FALSE)
+       if (network->connected == TRUE)
+               return 0;
+
+       if (network->remember == FALSE)
                return 0;
 
        signal = dbus_message_new_signal(network->element.path,
@@ -651,6 +674,8 @@ int connman_network_set_connected(struct connman_network *network,
 
                __connman_device_increase_connections(network->device);
 
+               __connman_device_set_network(network->device, network);
+
                element = connman_element_create(NULL);
                if (element != NULL) {
                        element->type  = type;
@@ -663,6 +688,8 @@ int connman_network_set_connected(struct connman_network *network,
        } else {
                connman_element_unregister_children(&network->element);
 
+               __connman_device_set_network(network->device, NULL);
+
                __connman_device_decrease_connections(network->device);
        }
 
@@ -670,6 +697,17 @@ int connman_network_set_connected(struct connman_network *network,
 }
 
 /**
+ * connman_network_get_connected:
+ * @network: network structure
+ *
+ * Get network connection status
+ */
+connman_bool_t connman_network_get_connected(struct connman_network *network)
+{
+       return network->connected;
+}
+
+/**
  * connman_network_set_remember:
  * @network: network structure
  * @remember: remember state
@@ -742,6 +780,19 @@ int connman_network_connect(struct connman_network *network)
        return 0;
 }
 
+int __connman_network_disconnect(struct connman_network *network)
+{
+       if (network->connected == FALSE)
+               return -ENOTCONN;
+
+       if (network->driver && network->driver->disconnect)
+               return network->driver->disconnect(network);
+
+       network->connected = FALSE;
+
+       return 0;
+}
+
 /**
  * connman_network_set_string:
  * @network: network structure
@@ -814,7 +865,9 @@ int connman_network_set_uint8(struct connman_network *network,
 {
        DBG("network %p key %s value %d", network, key, value);
 
-       if (g_str_equal(key, "Strength") == TRUE) {
+       if (g_str_equal(key, "Priority") == TRUE)
+               network->priority = value;
+       else if (g_str_equal(key, "Strength") == TRUE) {
                network->strength = value;
                connman_element_set_static_property(&network->element,
                                        "Strength", DBUS_TYPE_BYTE, &value);
@@ -824,6 +877,26 @@ int connman_network_set_uint8(struct connman_network *network,
 }
 
 /**
+ * connman_network_get_uint8:
+ * @network: network structure
+ * @key: unique identifier
+ *
+ * Get integer value for specific key
+ */
+connman_uint8_t connman_network_get_uint8(struct connman_network *network,
+                                                       const char *key)
+{
+       DBG("network %p key %s", network, key);
+
+       if (g_str_equal(key, "Priority") == TRUE)
+               return network->priority;
+       else if (g_str_equal(key, "Strength") == TRUE)
+               return network->strength;
+
+       return 0;
+}
+
+/**
  * connman_network_set_blob:
  * @network: network structure
  * @key: unique identifier
@@ -986,6 +1059,13 @@ static struct connman_driver network_driver = {
        .remove         = network_remove,
 };
 
+static int network_init(struct connman_device *device)
+{
+       DBG("device %p", device);
+
+       return 0;
+}
+
 static int network_load(struct connman_network *network)
 {
        GKeyFile *keyfile;
@@ -1080,13 +1160,15 @@ update:
                g_key_file_set_integer(keyfile, network->identifier,
                                                "Priority", network->priority);
 
-       if (network->wifi.security != NULL)
-               g_key_file_set_string(keyfile, network->identifier,
+       if (network->remember == TRUE || network->connected == TRUE) {
+               if (network->wifi.security != NULL)
+                       g_key_file_set_string(keyfile, network->identifier,
                                "WiFi.Security", network->wifi.security);
 
-       if (network->wifi.passphrase != NULL)
-               g_key_file_set_string(keyfile, network->identifier,
+               if (network->wifi.passphrase != NULL)
+                       g_key_file_set_string(keyfile, network->identifier,
                                "WiFi.Passphrase", network->wifi.passphrase);
+       }
 
        data = g_key_file_to_data(keyfile, &length, NULL);
 
@@ -1105,6 +1187,7 @@ done:
 static struct connman_storage network_storage = {
        .name           = "network",
        .priority       = CONNMAN_STORAGE_PRIORITY_LOW,
+       .network_init   = network_init,
        .network_load   = network_load,
        .network_save   = network_save,
 };