From f2e0eecf09ba5826f1fa4104ada7ab7bd7c715d4 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 18 Jun 2015 17:15:45 +0300 Subject: [PATCH] P2PS: Do not ignore other hashes if org.wi-fi.wfds hash is included When doing initial processing of Probe Request frame service hashes, the previous implementation dropped all other hash values if a hash for org.wi-fi.wfds was included. This is not correct, since that is not a full wildcard of all services (it only matches WFA defined org.wi-fi.wfds.* services). Signed-off-by: Jouni Malinen --- src/p2p/p2p.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index ad501ce..30260b2 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2323,16 +2323,6 @@ p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst, if (p2p_service_find_asp(p2p, hash)) { p2ps_svc_found = 1; - if (!os_memcmp(hash, p2p->wild_card_hash, - P2PS_HASH_LEN)) { - /* We found match(es) but wildcard - * will return all */ - query_count = 1; - os_memcpy(query_hash, hash, - P2PS_HASH_LEN); - break; - } - /* Save each matching hash */ if (query_count < P2P_MAX_QUERY_HASH) { os_memcpy(dest, hash, P2PS_HASH_LEN); -- 2.1.4