Fall back to using level value when quality is not available

[connman] / plugins / supplicant.c

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index 581ebc4..6019bec 100644 (file)
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -158,6 +158,7 @@ struct supplicant_result {
        gboolean has_wpa;
        gboolean has_rsn;
        gboolean has_wps;
+       dbus_int32_t frequency;
        dbus_int32_t quality;
        dbus_int32_t noise;
        dbus_int32_t level;
@@ -259,7 +260,9 @@ done:
 
 static int add_interface(struct supplicant_task *task)
 {
+       const char *driver = "wext";
        DBusMessage *message;
+       DBusMessageIter array, dict;
        DBusPendingCall *call;
 
        DBG("task %p", task);
@@ -269,8 +272,20 @@ static int add_interface(struct supplicant_task *task)
        if (message == NULL)
                return -ENOMEM;
 
-       dbus_message_append_args(message, DBUS_TYPE_STRING, &task->ifname,
-                                                       DBUS_TYPE_INVALID);
+       dbus_message_iter_init_append(message, &array);
+
+       dbus_message_iter_append_basic(&array,
+                                       DBUS_TYPE_STRING, &task->ifname);
+
+       dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
+                       DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+                       DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+       connman_dbus_dict_append_variant(&dict, "driver",
+                                               DBUS_TYPE_STRING, &driver);
+
+       dbus_message_iter_close_container(&array, &dict);
 
        if (dbus_connection_send_with_reply(connection, message,
                                                &call, TIMEOUT) == FALSE) {
@@ -985,6 +1000,33 @@ static void extract_capabilites(DBusMessageIter *value,
                result->has_wep = TRUE;
 }
 
+static unsigned char calculate_strength(struct supplicant_result *result)
+{
+       if (result->quality < 0) {
+               unsigned char strength;
+
+               if (result->level > 0)
+                       strength = 100 - result->level;
+               else
+                       strength = 120 + result->level;
+
+               if (strength > 100)
+                       strength = 100;
+
+               return strength;
+       }
+
+       return result->quality;
+}
+
+static unsigned short calculate_channel(struct supplicant_result *result)
+{
+       if (result->frequency < 0)
+               return 0;
+
+       return (result->frequency - 2407) / 5;
+}
+
 static void get_properties(struct supplicant_task *task);
 
 static void properties_reply(DBusPendingCall *call, void *user_data)
@@ -995,6 +1037,7 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
        DBusMessage *reply;
        DBusMessageIter array, dict;
        unsigned char strength;
+       unsigned short channel, frequency;
        const char *mode, *security;
        char *group;
 
@@ -1013,6 +1056,10 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
        }
 
        memset(&result, 0, sizeof(result));
+       result.frequency = -1;
+       result.quality = -1;
+       result.level = 0;
+       result.noise = 0;
 
        dbus_message_iter_init(reply, &array);
 
@@ -1058,6 +1105,8 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
                        extract_wpsie(&value, &result);
                else if (g_str_equal(key, "capabilities") == TRUE)
                        extract_capabilites(&value, &result);
+               else if (g_str_equal(key, "frequency") == TRUE)
+                       dbus_message_iter_get_basic(&value, &result.frequency);
                else if (g_str_equal(key, "quality") == TRUE)
                        dbus_message_iter_get_basic(&value, &result.quality);
                else if (g_str_equal(key, "noise") == TRUE)
@@ -1076,7 +1125,15 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
        if (result.path[0] == '\0')
                goto done;
 
-       strength = result.quality;
+       if (result.frequency > 0 && result.frequency < 14)
+               result.frequency = 2407 + (5 * result.frequency);
+       else if (result.frequency == 14)
+               result.frequency = 2484;
+
+       strength = calculate_strength(&result);
+       channel  = calculate_channel(&result);
+
+       frequency = (result.frequency < 0) ? 0 : result.frequency;
 
        if (result.has_rsn == TRUE)
                security = "rsn";
@@ -1130,7 +1187,9 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
 
        connman_network_set_available(network, TRUE);
        connman_network_set_uint8(network, "Strength", strength);
+       connman_network_set_uint16(network, "Frequency", frequency);
 
+       connman_network_set_uint16(network, "WiFi.Channel", channel);
        connman_network_set_string(network, "WiFi.Security", security);
 
        connman_network_set_group(network, group);