Fill WiFi channel property with correct values

[connman] / src / network.c

diff --git a/src/network.c b/src/network.c
index dd935ba..11b550b 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -38,6 +38,7 @@ struct connman_network {
        connman_bool_t available;
        connman_bool_t connected;
        connman_uint8_t strength;
+       connman_uint16_t frequency;
        char *identifier;
        char *address;
        char *name;
@@ -55,6 +56,7 @@ struct connman_network {
                void *ssid;
                int ssid_len;
                char *mode;
+               unsigned short channel;
                char *security;
                char *passphrase;
        } wifi;
@@ -126,6 +128,10 @@ static DBusMessage *get_properties(DBusConnection *conn,
                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,
@@ -135,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);
@@ -926,6 +936,47 @@ connman_uint8_t connman_network_get_uint8(struct connman_network *network,
 }
 
 /**
+ * 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