P2P: Show P2P peer signal level in D-Bus P2P device properties

Move level parameter from p2p_device to p2p_device_info in order to
expose this information and modify D-Bus P2P handler to return this new
parameter through the P2P device properties.

Signed-off-by: Fabien Marotte <fabienx.marotte@intel.com>
Signed-off-by: Jayant Sane <jayant.sane@intel.com>

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 016a121..380db64 100644 (file)
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -576,7 +576,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq, int level,
        dev->listen_freq = freq;
        if (msg.group_info)
                dev->oper_freq = freq;
-       dev->level = level;
+       dev->info.level = level;
 
        p2p_copy_wps_info(dev, 0, &msg);
 
@@ -2961,7 +2961,7 @@ int p2p_get_peer_info(struct p2p_data *p2p, const u8 *addr, int next,
                          "invitation_reqs=%u\n",
                          (int) (now.sec - dev->last_seen.sec),
                          dev->listen_freq,
-                         dev->level,
+                         dev->info.level,
                          p2p_wps_method_text(dev->wps_method),
                          MAC2STR(dev->interface_addr),
                          MAC2STR(dev->member_in_go_dev),

diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 1a9ecae..28357b5 100644 (file)
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -180,6 +180,11 @@ struct p2p_peer_info {
        char serial_number[33];
 
        /**
+        * level - Signal level
+        */
+       int level;
+
+       /**
         * config_methods - WPS Configuration Methods
         */
        u16 config_methods;

diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h
index ef90f0a..52d9311 100644 (file)
--- a/src/p2p/p2p_i.h
+++ b/src/p2p/p2p_i.h
@@ -33,7 +33,6 @@ struct p2p_device {
        struct dl_list list;
        struct os_time last_seen;
        int listen_freq;
-       int level;
        enum p2p_wps_method wps_method;
 
        struct p2p_peer_info info;

diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
index 42391c3..766418c 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
@@ -1112,6 +1112,9 @@ DBusMessage *wpas_dbus_getter_p2p_peer_properties(DBusMessage * message,
        if (!wpa_dbus_dict_append_uint16(&dict_iter, "config_method",
                                         info->config_methods))
                goto err_no_mem;
+       if (!wpa_dbus_dict_append_uint16(&dict_iter, "level",
+                                        info->level))
+               goto err_no_mem;
        if (!wpa_dbus_dict_append_byte(&dict_iter, "devicecapability",
                                       info->dev_capab))
                goto err_no_mem;