diff options
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p.c | 17 | ||||
| -rw-r--r-- | src/p2p/p2p_build.c | 7 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 16ffac43..b87ff96b 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2315,6 +2315,19 @@ p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst, u8 i; int p2ps_svc_found = 0; + p2p_dbg(p2p, "in_listen=%d drv_in_listen=%d when received P2PS Probe Request at %u MHz; own Listen channel %u, pending listen freq %u MHz", + p2p->in_listen, p2p->drv_in_listen, rx_freq, + p2p->cfg->channel, p2p->pending_listen_freq); + + if (!p2p->in_listen && !p2p->drv_in_listen && + p2p->pending_listen_freq && rx_freq && + rx_freq != p2p->pending_listen_freq) { + p2p_dbg(p2p, "Do not reply to Probe Request frame that was received on %u MHz while waiting to start Listen state on %u MHz", + rx_freq, p2p->pending_listen_freq); + p2p_parse_free(&msg); + return P2P_PREQ_NOT_LISTEN; + } + for (i = 0; i < msg.service_hash_count; i++) { if (p2p_service_find_asp(p2p, hash)) { p2p_dbg(p2p, "Service Hash match found: " @@ -2389,8 +2402,8 @@ p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst, return P2P_PREQ_NOT_PROCESSED; } - resp = NULL; - resp = wpabuf_put(buf, resp->u.probe_resp.variable - (u8 *) resp); + resp = wpabuf_put(buf, offsetof(struct ieee80211_mgmt, + u.probe_resp.variable)); resp->frame_control = host_to_le16((WLAN_FC_TYPE_MGMT << 2) | (WLAN_FC_STYPE_PROBE_RESP << 4)); diff --git a/src/p2p/p2p_build.c b/src/p2p/p2p_build.c index 6b6e7701..c733543c 100644 --- a/src/p2p/p2p_build.c +++ b/src/p2p/p2p_build.c @@ -557,7 +557,7 @@ void p2p_buf_add_service_instance(struct wpabuf *buf, struct p2p_data *p2p, struct p2ps_advertisement *adv_list) { struct p2ps_advertisement *adv; - int p2ps_wildcard, found = 0; + int p2ps_wildcard; size_t total_len; struct wpabuf *tmp_buf = NULL; u8 *pos, *attr_len, *ie_len = NULL; @@ -593,7 +593,6 @@ void p2p_buf_add_service_instance(struct wpabuf *buf, struct p2p_data *p2p, /* org.wi-fi.wfds match found */ p2p_buf_add_service_info(tmp_buf, p2p, 0, 0, P2PS_WILD_HASH_STR, &ie_len, &pos, &total_len, attr_len); - found++; } /* add advertised service info of matching services */ @@ -613,12 +612,12 @@ void p2p_buf_add_service_instance(struct wpabuf *buf, struct p2p_data *p2p, &total_len, attr_len)) break; - found++; + test += P2PS_HASH_LEN; } } - if (found) + if (total_len) wpabuf_put_buf(buf, tmp_buf); wpabuf_free(tmp_buf); } |