Fill WiFi channel property with correct values

[connman] / src / network.c

diff --git a/src/network.c b/src/network.c
index cb24662..11b550b 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -37,9 +37,8 @@ struct connman_network {
        connman_bool_t secondary;
        connman_bool_t available;
        connman_bool_t connected;
-       connman_bool_t remember;
-       connman_uint8_t priority;
        connman_uint8_t strength;
+       connman_uint16_t frequency;
        char *identifier;
        char *address;
        char *name;
@@ -57,6 +56,7 @@ struct connman_network {
                void *ssid;
                int ssid_len;
                char *mode;
+               unsigned short channel;
                char *security;
                char *passphrase;
        } wifi;
@@ -124,14 +124,14 @@ static DBusMessage *get_properties(DBusConnection *conn,
        connman_dbus_dict_append_variant(&dict, "Connected",
                                DBUS_TYPE_BOOLEAN, &network->connected);
 
-       if (network->priority > 0)
-               connman_dbus_dict_append_variant(&dict, "Priority",
-                                       DBUS_TYPE_BYTE, &network->priority);
-
        if (network->strength > 0)
                connman_dbus_dict_append_variant(&dict, "Strength",
                                        DBUS_TYPE_BYTE, &network->strength);
 
+       if (network->frequency > 0)
+               connman_dbus_dict_append_variant(&dict, "Frequency",
+                                       DBUS_TYPE_UINT16, &network->frequency);
+
        if (network->wifi.ssid != NULL && network->wifi.ssid_len > 0)
                connman_dbus_dict_append_array(&dict, "WiFi.SSID",
                                DBUS_TYPE_BYTE, &network->wifi.ssid,
@@ -141,6 +141,10 @@ static DBusMessage *get_properties(DBusConnection *conn,
                connman_dbus_dict_append_variant(&dict, "WiFi.Mode",
                                DBUS_TYPE_STRING, &network->wifi.mode);
 
+       if (network->wifi.channel > 0)
+               connman_dbus_dict_append_variant(&dict, "WiFi.Channel",
+                               DBUS_TYPE_UINT16, &network->wifi.channel);
+
        if (network->wifi.security != NULL)
                connman_dbus_dict_append_variant(&dict, "WiFi.Security",
                                DBUS_TYPE_STRING, &network->wifi.security);
@@ -193,15 +197,6 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                g_free(network->wifi.passphrase);
                network->wifi.passphrase = g_strdup(passphrase);
-       } 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;
        }
 
        __connman_storage_save_network(network);
@@ -586,8 +581,34 @@ void connman_network_set_protocol(struct connman_network *network,
 void connman_network_set_group(struct connman_network *network,
                                                        const char *group)
 {
-       g_free(network->group);
+       if (network->secondary == TRUE)
+               return;
+
+       if (g_strcmp0(network->group, group) == 0)
+               return;
+
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_HSO:
+               return;
+       case CONNMAN_NETWORK_TYPE_WIFI:
+       case CONNMAN_NETWORK_TYPE_WIMAX:
+               break;
+       }
+
+       if (network->group != NULL) {
+               __connman_profile_remove_network(network);
+
+               g_free(network->group);
+       }
+
        network->group = g_strdup(group);
+
+       if (network->group != NULL)
+               __connman_profile_add_network(network);
 }
 
 const char *__connman_network_get_group(struct connman_network *network)
@@ -778,37 +799,6 @@ connman_bool_t connman_network_get_connected(struct connman_network *network)
 }
 
 /**
- * connman_network_set_remember:
- * @network: network structure
- * @remember: remember state
- *
- * Change remember state of network (known networks)
- */
-int connman_network_set_remember(struct connman_network *network,
-                                               connman_bool_t remember)
-{
-       DBG("network %p remember %d", network, remember);
-
-       if (network->remember == remember)
-               return -EALREADY;
-
-       network->remember = remember;
-
-       return 0;
-}
-
-/**
- * connman_network_get_remember:
- * @network: network structure
- *
- * Get network remember setting
- */
-connman_bool_t connman_network_get_remember(struct connman_network *network)
-{
-       return network->remember;
-}
-
-/**
  * connman_network_connect:
  * @network: network structure
  *
@@ -832,6 +822,8 @@ int __connman_network_disconnect(struct connman_network *network)
        if (network->connected == FALSE)
                return -ENOTCONN;
 
+       __connman_device_set_network(network->device, NULL);
+
        connman_element_unregister_children(&network->element);
 
        if (network->driver && network->driver->disconnect)
@@ -919,9 +911,7 @@ int connman_network_set_uint8(struct connman_network *network,
 {
        DBG("network %p key %s value %d", network, key, value);
 
-       if (g_str_equal(key, "Priority") == TRUE)
-               network->priority = value;
-       else if (g_str_equal(key, "Strength") == TRUE)
+       if (g_str_equal(key, "Strength") == TRUE)
                network->strength = value;
 
        return connman_element_set_uint8(&network->element, key, value);
@@ -939,15 +929,54 @@ connman_uint8_t connman_network_get_uint8(struct connman_network *network,
 {
        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)
+       if (g_str_equal(key, "Strength") == TRUE)
                return network->strength;
 
        return connman_element_get_uint8(&network->element, key);
 }
 
 /**
+ * connman_network_set_uint16:
+ * @network: network structure
+ * @key: unique identifier
+ * @value: integer value
+ *
+ * Set integer value for specific key
+ */
+int connman_network_set_uint16(struct connman_network *network,
+                               const char *key, connman_uint16_t value)
+{
+       DBG("network %p key %s value %d", network, key, value);
+
+       if (g_str_equal(key, "Frequency") == TRUE)
+               network->frequency = value;
+       else if (g_str_equal(key, "WiFi.Channel") == TRUE)
+               network->wifi.channel = value;
+
+       return -EINVAL;
+}
+
+/**
+ * connman_network_get_uint16:
+ * @network: network structure
+ * @key: unique identifier
+ *
+ * Get integer value for specific key
+ */
+connman_uint16_t connman_network_get_uint16(struct connman_network *network,
+                                                       const char *key)
+{
+       DBG("network %p key %s", network, key);
+
+       if (g_str_equal(key, "Frequency") == TRUE)
+               return network->frequency;
+       else if (g_str_equal(key, "WiFi.Channel") == TRUE)
+               return network->wifi.channel;
+
+       return 0;
+}
+
+/**
  * connman_network_set_blob:
  * @network: network structure
  * @key: unique identifier
@@ -1092,7 +1121,7 @@ static int network_probe(struct connman_element *element)
                break;
        case CONNMAN_NETWORK_TYPE_WIFI:
        case CONNMAN_NETWORK_TYPE_WIMAX:
-               if (network->secondary == FALSE)
+               if (network->group != NULL && network->secondary == FALSE)
                        __connman_profile_add_network(network);
                break;
        }
@@ -1121,8 +1150,12 @@ static void network_remove(struct connman_element *element)
                break;
        case CONNMAN_NETWORK_TYPE_WIFI:
        case CONNMAN_NETWORK_TYPE_WIMAX:
-               if (network->secondary == FALSE)
+               if (network->group != NULL && network->secondary == FALSE) {
                        __connman_profile_remove_network(network);
+
+                       g_free(network->group);
+                       network->group = NULL;
+               }
                break;
        }