P2P: Use timer to fail GO Negotation while waiting for peer

The timeout check while waiting for the peer to accept the GO
Negotiation depended on the WAIT_PEER_IDLE or WAIT_PEER_CONNECT states
being in use. Any P2P command to alter such states would have resulted
in the failure to time out GO Negotiation and thus ended up in not
indicating GO Negotiation failure or left the selected peer available
for new GO negotiation after the expected two minute timeout.

Fix this by using a separate timer to time out GO Negotiation
irrespective of the P2P state.

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

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 394a00d10eb558227eb9ab723279617baf5584c9..2c899f1a6bcc5c7532a9b54d051e23b6710431a3 100644 (file)
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -216,6 +216,7 @@ void p2p_go_neg_failed(struct p2p_data *p2p, struct p2p_device *peer,
 {
        struct p2p_go_neg_results res;
        p2p_clear_timeout(p2p);
+       eloop_cancel_timeout(p2p_go_neg_wait_timeout, p2p, NULL);
        p2p_set_state(p2p, P2P_IDLE);
        if (p2p->go_neg_peer) {
                p2p->go_neg_peer->flags &= ~P2P_DEV_PEER_WAITING_RESPONSE;
@@ -2551,6 +2552,7 @@ void p2p_deinit(struct p2p_data *p2p)
        eloop_cancel_timeout(p2p_ext_listen_timeout, p2p, NULL);
        eloop_cancel_timeout(p2p_scan_timeout, p2p, NULL);
        eloop_cancel_timeout(p2p_go_neg_start, p2p, NULL);
+       eloop_cancel_timeout(p2p_go_neg_wait_timeout, p2p, NULL);
        p2p_flush(p2p);
        p2p_free_req_dev_types(p2p);
        os_free(p2p->cfg->dev_name);
@@ -2593,8 +2595,10 @@ int p2p_unauthorize(struct p2p_data *p2p, const u8 *addr)
 
        p2p_dbg(p2p, "Unauthorizing " MACSTR, MAC2STR(addr));
 
-       if (p2p->go_neg_peer == dev)
+       if (p2p->go_neg_peer == dev) {
+               eloop_cancel_timeout(p2p_go_neg_wait_timeout, p2p, NULL);
                p2p->go_neg_peer = NULL;
+       }
 
        dev->wps_method = WPS_NOT_READY;
        dev->oob_pw_id = 0;
@@ -3404,20 +3408,12 @@ static void p2p_timeout_wait_peer_connect(struct p2p_data *p2p)
 static void p2p_timeout_wait_peer_idle(struct p2p_data *p2p)
 {
        struct p2p_device *dev = p2p->go_neg_peer;
-       struct os_reltime now;
 
        if (dev == NULL) {
                p2p_dbg(p2p, "Unknown GO Neg peer - stop GO Neg wait");
                return;
        }
 
-       os_get_reltime(&now);
-       if (os_reltime_expired(&now, &dev->go_neg_wait_started, 120)) {
-               p2p_dbg(p2p, "Timeout on waiting peer to become ready for GO Negotiation");
-               p2p_go_neg_failed(p2p, dev, -1);
-               return;
-       }
-
        p2p_dbg(p2p, "Go to Listen state while waiting for the peer to become ready for GO Negotiation");
        p2p_set_state(p2p, P2P_WAIT_PEER_CONNECT);
        p2p_listen_in_find(p2p, 0);
@@ -4902,3 +4898,14 @@ void p2p_set_vendor_elems(struct p2p_data *p2p, struct wpabuf **vendor_elem)
 {
        p2p->vendor_elem = vendor_elem;
 }
+
+
+void p2p_go_neg_wait_timeout(void *eloop_ctx, void *timeout_ctx)
+{
+       struct p2p_data *p2p = eloop_ctx;
+
+       p2p_dbg(p2p,
+               "Timeout on waiting peer to become ready for GO Negotiation");
+       if (p2p->go_neg_peer)
+               p2p_go_neg_failed(p2p, p2p->go_neg_peer, -1);
+}

diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c
index 21fae3f20542c77077c2644b883f75180efb47b4..9b3608b63c8b2e32446478c9170673c5a4afa39f 100644 (file)
--- a/src/p2p/p2p_go_neg.c
+++ b/src/p2p/p2p_go_neg.c
@@ -9,6 +9,7 @@
 #include "includes.h"
 
 #include "common.h"
+#include "utils/eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "common/wpa_ctrl.h"
 #include "wps/wps_defs.h"
@@ -240,6 +241,7 @@ int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev)
        p2p_set_state(p2p, P2P_CONNECT);
        p2p->pending_action_state = P2P_PENDING_GO_NEG_REQUEST;
        p2p->go_neg_peer = dev;
+       eloop_cancel_timeout(p2p_go_neg_wait_timeout, p2p, NULL);
        dev->flags |= P2P_DEV_WAIT_GO_NEG_RESPONSE;
        dev->connect_reqs++;
        if (p2p_send_action(p2p, freq, dev->info.p2p_device_addr,
@@ -645,6 +647,9 @@ void p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
                p2p_add_dev_info(p2p, sa, dev, &msg);
        }
 
+       if (p2p->go_neg_peer && p2p->go_neg_peer == dev)
+               eloop_cancel_timeout(p2p_go_neg_wait_timeout, p2p, NULL);
+
        if (dev && dev->flags & P2P_DEV_USER_REJECTED) {
                p2p_dbg(p2p, "User has rejected this peer");
                status = P2P_SC_FAIL_REJECTED_BY_USER;
@@ -789,6 +794,7 @@ void p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
                dev->dialog_token = msg.dialog_token;
                os_memcpy(dev->intended_addr, msg.intended_addr, ETH_ALEN);
                p2p->go_neg_peer = dev;
+               eloop_cancel_timeout(p2p_go_neg_wait_timeout, p2p, NULL);
                status = P2P_SC_SUCCESS;
        }
 
@@ -957,7 +963,10 @@ void p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa,
                if (*msg.status == P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE) {
                        p2p_dbg(p2p, "Wait for the peer to become ready for GO Negotiation");
                        dev->flags |= P2P_DEV_NOT_YET_READY;
-                       os_get_reltime(&dev->go_neg_wait_started);
+                       eloop_cancel_timeout(p2p_go_neg_wait_timeout, p2p,
+                                            NULL);
+                       eloop_register_timeout(120, 0, p2p_go_neg_wait_timeout,
+                                              p2p, NULL);
                        if (p2p->state == P2P_CONNECT_LISTEN)
                                p2p_set_state(p2p, P2P_WAIT_PEER_CONNECT);
                        else

diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h
index bb8952d1e28a189129bb02d8e345882390a6c1c6..19f4a80366905087bbdea036db5acb9e96cafbf1 100644 (file)
--- a/src/p2p/p2p_i.h
+++ b/src/p2p/p2p_i.h
@@ -101,7 +101,6 @@ struct p2p_device {
        unsigned int flags;
 
        int status; /* enum p2p_status_code */
-       struct os_reltime go_neg_wait_started;
        unsigned int wait_count;
        unsigned int connect_reqs;
        unsigned int invitation_reqs;
@@ -789,6 +788,7 @@ void p2p_stop_listen_for_freq(struct p2p_data *p2p, int freq);
 int p2p_prepare_channel(struct p2p_data *p2p, struct p2p_device *dev,
                        unsigned int force_freq, unsigned int pref_freq,
                        int go);
+void p2p_go_neg_wait_timeout(void *eloop_ctx, void *timeout_ctx);
 void p2p_dbg(struct p2p_data *p2p, const char *fmt, ...)
 PRINTF_FORMAT(2, 3);
 void p2p_info(struct p2p_data *p2p, const char *fmt, ...)