Add helper for setting network address and use it

[connman] / plugins / supplicant.c

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index 1eb6b87..cb84cc5 100644 (file)
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -33,10 +33,11 @@
 
 #define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/device.h>
+#include <connman/option.h>
+#include <connman/inet.h>
 #include <connman/dbus.h>
 #include <connman/log.h>
 
-#include "inet.h"
 #include "supplicant.h"
 
 #define TIMEOUT 5000
@@ -149,7 +150,8 @@ enum supplicant_state {
 struct supplicant_result {
        char *path;
        char *name;
-       char *addr;
+       unsigned char *addr;
+       unsigned int addr_len;
        unsigned char *ssid;
        unsigned int ssid_len;
        dbus_uint16_t capabilities;
@@ -260,7 +262,9 @@ done:
 
 static int add_interface(struct supplicant_task *task)
 {
+       const char *driver = connman_option_get_string("wifi");
        DBusMessage *message;
+       DBusMessageIter array, dict;
        DBusPendingCall *call;
 
        DBG("task %p", task);
@@ -270,8 +274,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) {
@@ -382,7 +398,7 @@ static void remove_interface_reply(DBusPendingCall *call, void *user_data)
 
        connman_device_unref(task->device);
 
-       inet_ifdown(task->ifindex);
+       connman_inet_ifdown(task->ifindex);
 
        free_task(task);
 
@@ -817,7 +833,8 @@ static struct {
        { "2wire"     },
        { "compaq"    },
        { "tsunami"   },
-       { "comcomcom" },
+       { "comcomcom", "3com"     },
+       { "3Com",      "3com"     },
        { "Symbol",    "symbol"   },
        { "Wireless" , "wireless" },
        { "WLAN",      "wlan"     },
@@ -876,25 +893,20 @@ static void extract_addr(DBusMessageIter *value,
        if (addr_len != 6)
                return;
 
-       eth = (void *) addr;
-
-       result->addr = g_try_malloc0(18);
+       result->addr = g_try_malloc(addr_len);
        if (result->addr == NULL)
                return;
 
-       snprintf(result->addr, 18, "%02X:%02X:%02X:%02X:%02X:%02X",
-                                               eth->ether_addr_octet[0],
-                                               eth->ether_addr_octet[1],
-                                               eth->ether_addr_octet[2],
-                                               eth->ether_addr_octet[3],
-                                               eth->ether_addr_octet[4],
-                                               eth->ether_addr_octet[5]);
+       memcpy(result->addr, addr, addr_len);
+       result->addr_len = addr_len;
 
-       result->path = g_try_malloc0(18);
+       result->path = g_try_malloc0(13);
        if (result->path == NULL)
                return;
 
-       snprintf(result->path, 18, "%02x%02x%02x%02x%02x%02x",
+       eth = (void *) addr;
+
+       snprintf(result->path, 13, "%02x%02x%02x%02x%02x%02x",
                                                eth->ether_addr_octet[0],
                                                eth->ether_addr_octet[1],
                                                eth->ether_addr_octet[2],
@@ -988,15 +1000,29 @@ static void extract_capabilites(DBusMessageIter *value,
 
 static unsigned char calculate_strength(struct supplicant_result *result)
 {
-       if (result->quality < 0)
-               return 0;
+       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)
 {
-       return 0;
+       if (result->frequency < 0)
+               return 0;
+
+       return (result->frequency - 2407) / 5;
 }
 
 static void get_properties(struct supplicant_task *task);
@@ -1030,8 +1056,8 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
        memset(&result, 0, sizeof(result));
        result.frequency = -1;
        result.quality = -1;
-       result.level = -1;
-       result.noise = -1;
+       result.level = 0;
+       result.noise = 0;
 
        dbus_message_iter_init(reply, &array);
 
@@ -1137,7 +1163,8 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
                connman_network_set_protocol(network,
                                                CONNMAN_NETWORK_PROTOCOL_IP);
 
-               connman_network_set_string(network, "Address", result.addr);
+               connman_network_set_address(network, result.addr,
+                                                       result.addr_len);
 
                if (connman_device_add_network(task->device, network) < 0) {
                        connman_network_unref(network);
@@ -1146,7 +1173,7 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
        }
 
        if (result.name != NULL && result.name[0] != '\0')
-               connman_network_set_string(network, "Name", result.name);
+               connman_network_set_name(network, result.name);
 
        connman_network_set_blob(network, "WiFi.SSID",
                                                result.ssid, result.ssid_len);
@@ -1158,9 +1185,9 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
                                (result.has_wps == TRUE) ? "WPS" : "no WPS");
 
        connman_network_set_available(network, TRUE);
-       connman_network_set_uint8(network, "Strength", strength);
-       connman_network_set_uint16(network, "Frequency", frequency);
+       connman_network_set_strength(network, strength);
 
+       connman_network_set_uint16(network, "Frequency", frequency);
        connman_network_set_uint16(network, "WiFi.Channel", channel);
        connman_network_set_string(network, "WiFi.Security", security);
 
@@ -1452,7 +1479,7 @@ int supplicant_start(struct connman_device *device)
                return -ENOMEM;
 
        task->ifindex = connman_device_get_index(device);
-       task->ifname = inet_index2name(task->ifindex);
+       task->ifname = connman_inet_ifname(task->ifindex);
 
        if (task->ifname == NULL) {
                g_free(task);