Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-17 18:34:03 -05:00
Code Issues Projects Releases Wiki Activity

P2P: Inform upper layer when WFD-IE field of a P2P device has changed

Browse Source 
When WFD IE of a P2P device changes, the field is locally updated in P2P
supplicant but upper layer is not informed about this change.

Signed-off-by: Jean Trivelly <jean.trivelly@intel.com>
This commit is contained in:
Jean Trivelly 2014-10-10 18:29:46 +02:00 committed by Jouni Malinen
parent 0a5787162a
commit 4b32f6a5ec
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/p2p/p2p.c
View File

@ -650,6 +650,24 @@ static void p2p_update_peer_vendor_elems(struct p2p_device *dev, const u8 *ies,
} }
static int p2p_compare_wfd_info(struct p2p_device *dev,
const struct p2p_message *msg)
{
if (dev->info.wfd_subelems && msg->wfd_subelems) {
if (dev->info.wfd_subelems->used != msg->wfd_subelems->used)
return 1;
return os_memcmp(dev->info.wfd_subelems->buf,
msg->wfd_subelems->buf,
dev->info.wfd_subelems->used);
}
if (dev->info.wfd_subelems || msg->wfd_subelems)
return 1;
return 0;
}
/** /**
* p2p_add_device - Add peer entries based on scan results or P2P frames * p2p_add_device - Add peer entries based on scan results or P2P frames
* @p2p: P2P module context from p2p_init() * @p2p: P2P module context from p2p_init()
@ -675,6 +693,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
struct p2p_device *dev; struct p2p_device *dev;
struct p2p_message msg; struct p2p_message msg;
const u8 *p2p_dev_addr; const u8 *p2p_dev_addr;
int wfd_changed;
int i; int i;
struct os_reltime time_now; struct os_reltime time_now;
@ -786,6 +805,8 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
break; break;
} }
wfd_changed = p2p_compare_wfd_info(dev, &msg);
if (msg.wfd_subelems) { if (msg.wfd_subelems) {
wpabuf_free(dev->info.wfd_subelems); wpabuf_free(dev->info.wfd_subelems);
dev->info.wfd_subelems = wpabuf_dup(msg.wfd_subelems); dev->info.wfd_subelems = wpabuf_dup(msg.wfd_subelems);
@ -800,7 +821,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
p2p_update_peer_vendor_elems(dev, ies, ies_len); p2p_update_peer_vendor_elems(dev, ies, ies_len);
if (dev->flags & P2P_DEV_REPORTED) if (dev->flags & P2P_DEV_REPORTED && !wfd_changed)
return 0; return 0;
p2p_dbg(p2p, "Peer found with Listen frequency %d MHz (rx_time=%u.%06u)", p2p_dbg(p2p, "Peer found with Listen frequency %d MHz (rx_time=%u.%06u)",