From a6328e341c8c1ad0deb8753fdc6f1a49d0a57a92 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Fri, 6 Apr 2012 14:47:34 -0700 Subject: P2P: Use P2P Device ID attribute if Device Info not available The "BSS p2p_dev_addr=address" command uses p2p_parse_dev_addr() to figure out the P2P Device Address of the GO from scan results. This used to work only if the P2P IE was received from Probe Response frames since only those include the P2P Device Info attribute. Make this work with Beacon frames, too, by using P2P Device ID attribute if the P2P Device Info attribute is not present. Change-Id: I3f0a49c22ee02e8971edb9ecd033e74342c318c0 Signed-hostap: Jouni Malinen --- src/p2p/p2p.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index d5884f2..a4c6a8f 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2094,6 +2094,7 @@ int p2p_parse_dev_addr(const u8 *ies, size_t ies_len, u8 *dev_addr) { struct wpabuf *p2p_ie; struct p2p_message msg; + int ret = -1; p2p_ie = ieee802_11_vendor_ie_concat(ies, ies_len, P2P_IE_VENDOR_TYPE); @@ -2105,14 +2106,16 @@ int p2p_parse_dev_addr(const u8 *ies, size_t ies_len, u8 *dev_addr) return -1; } - if (msg.p2p_device_addr == NULL) { - wpabuf_free(p2p_ie); - return -1; + if (msg.p2p_device_addr) { + os_memcpy(dev_addr, msg.p2p_device_addr, ETH_ALEN); + ret = 0; + } else if (msg.device_id) { + os_memcpy(dev_addr, msg.device_id, ETH_ALEN); + ret = 0; } - os_memcpy(dev_addr, msg.p2p_device_addr, ETH_ALEN); wpabuf_free(p2p_ie); - return 0; + return ret; } -- cgit v1.1