Cumulative patch from commit aef5047acc971c97622c85236f0cd84d169221e6
aef5047 P2P: Fix missing eloop_cancel_timeout in invitation trigger
3cdcb34 tests: Add module tests for WPS attribute parsing
da179bd WPS: Fix parsing of 0-length WFA vendor extension subelement
211d7ab P2P: Add even more debug prints for Probe Request in non-Listen state
Change-Id: Ifbdb1c8aa74906aaf60cb5be025dd7f02bb07c6e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 7170e47..6f3cd68 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -1971,7 +1971,8 @@
if (!p2p->in_listen || !p2p->drv_in_listen) {
/* not in Listen state - ignore Probe Request */
- p2p_dbg(p2p, "Not in Listen state - ignore Probe Request");
+ p2p_dbg(p2p, "Not in Listen state (in_listen=%d drv_in_listen=%d) - ignore Probe Request",
+ p2p->in_listen, p2p->drv_in_listen);
return P2P_PREQ_NOT_LISTEN;
}
@@ -2142,6 +2143,7 @@
== 0) {
/* Received a Probe Request from Invite peer */
p2p_dbg(p2p, "Found Invite peer - try to start Invite from timeout");
+ eloop_cancel_timeout(p2p_invite_start, p2p, NULL);
eloop_register_timeout(0, 0, p2p_invite_start, p2p, NULL);
return P2P_PREQ_PROCESSED;
}