Release 0.10

[connman] / src / network.c

diff --git a/src/network.c b/src/network.c
index 3563515..c41871d 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,9 +173,14 @@ 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)
@@ -184,6 +190,9 @@ static DBusMessage *set_property(DBusConnection *conn,
        } 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);
@@ -195,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;
@@ -221,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);
@@ -247,6 +265,8 @@ static DBusMessage *do_disconnect(DBusConnection *conn,
 
        connman_element_unregister_children(&network->element);
 
+       connman_device_set_disconnected(network->device, TRUE);
+
        if (network->driver && network->driver->disconnect) {
                err = network->driver->disconnect(network);
                if (err < 0 && err != -EINPROGRESS)
@@ -434,21 +454,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;
@@ -564,7 +583,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,
@@ -654,6 +676,10 @@ int connman_network_set_connected(struct connman_network *network,
 
                __connman_device_increase_connections(network->device);
 
+               __connman_device_set_network(network->device, network);
+
+               connman_device_set_disconnected(network->device, FALSE);
+
                element = connman_element_create(NULL);
                if (element != NULL) {
                        element->type  = type;
@@ -666,6 +692,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);
        }
 
@@ -673,6 +701,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
@@ -745,6 +784,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
@@ -1061,15 +1113,13 @@ static int network_load(struct connman_network *network)
        if (val > 0)
                network->priority = val;
 
-       if (network->remember == TRUE) {
-               g_free(network->wifi.security);
-               network->wifi.security = g_key_file_get_string(keyfile,
+       g_free(network->wifi.security);
+       network->wifi.security = g_key_file_get_string(keyfile,
                                network->identifier, "WiFi.Security", NULL);
 
-               g_free(network->wifi.passphrase);
-               network->wifi.passphrase = g_key_file_get_string(keyfile,
+       g_free(network->wifi.passphrase);
+       network->wifi.passphrase = g_key_file_get_string(keyfile,
                                network->identifier, "WiFi.Passphrase", NULL);
-       }
 
        g_key_file_free(keyfile);
 
@@ -1114,7 +1164,7 @@ update:
                g_key_file_set_integer(keyfile, network->identifier,
                                                "Priority", network->priority);
 
-       if (network->remember == TRUE) {
+       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);