P2P: Postpone P2P-DEVICE-FOUND if config_methods not known

If we discover a P2P peer based on a Beacon frame from the GO role, we
do not get information about the supported configuration methods. This
can result in issues if the P2P managing entity above wpa_supplicant is
not prepared to handling config_methods=0x0. To avoid this, postpone
reporting of the P2P-DEVICE-FOUND event when this happens on one of the
social channels. It would be good to be able to this on all channels,
but that could result in issues of never indicating the event for a peer
that is operating a GO on a channel that requires passive scanning.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index ca15d2b3d722f1b3863a168f5eca646efc26eed1..554c238595a2f7b48512d596eb77e71ae3bcbadb 100644 (file)
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -750,6 +750,28 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
                return 0;
        }
 
+       if (dev->info.config_methods == 0 &&
+           (freq == 2412 || freq == 2437 || freq == 2462)) {
+               /*
+                * If we have only seen a Beacon frame from a GO, we do not yet
+                * know what WPS config methods it supports. Since some
+                * applications use config_methods value from P2P-DEVICE-FOUND
+                * events, postpone reporting this peer until we've fully
+                * discovered its capabilities.
+                *
+                * At least for now, do this only if the peer was detected on
+                * one of the social channels since that peer can be easily be
+                * found again and there are no limitations of having to use
+                * passive scan on this channels, so this can be done through
+                * Probe Response frame that includes the config_methods
+                * information.
+                */
+               wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
+                       "P2P: Do not report peer " MACSTR " with unknown "
+                       "config methods", MAC2STR(addr));
+               return 0;
+       }
+
        p2p->cfg->dev_found(p2p->cfg->cb_ctx, addr, &dev->info,
                            !(dev->flags & P2P_DEV_REPORTED_ONCE));
        dev->flags |= P2P_DEV_REPORTED | P2P_DEV_REPORTED_ONCE;