diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-04-06 15:38:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-06 15:38:24 -0700 |
| commit | 33fd1689363dd194839377b82e3532ee35ca8b96 (patch) | |
| tree | 6f7f5c19e90bfeaa2b72c0e0889ec83daaf26c69 /src | |
| parent | 40fa98b45e4e61fcf0cb9292fdf8882b0624bd35 (diff) | |
| parent | a6328e341c8c1ad0deb8753fdc6f1a49d0a57a92 (diff) | |
| download | external_wpa_supplicant_8-33fd1689363dd194839377b82e3532ee35ca8b96.zip external_wpa_supplicant_8-33fd1689363dd194839377b82e3532ee35ca8b96.tar.gz external_wpa_supplicant_8-33fd1689363dd194839377b82e3532ee35ca8b96.tar.bz2 | |
Merge "P2P: Use P2P Device ID attribute if Device Info not available"
Diffstat (limited to 'src')
| -rw-r--r-- | src/p2p/p2p.c | 13 |
1 files changed, 8 insertions, 5 deletions
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; } |