aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-08-09 19:55:12 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-09 20:18:32 (GMT)
commitab9ff376956757de6175cce27f6f95c61c79a951 (patch)
tree52b243d6c06357593244edb18eb4bef6fbbed717
parent2c2be21e918e3ec5610fcbd2aa9891e6bc2d29a9 (diff)
downloadhostap-ab9ff376956757de6175cce27f6f95c61c79a951.zip
hostap-ab9ff376956757de6175cce27f6f95c61c79a951.tar.gz
hostap-ab9ff376956757de6175cce27f6f95c61c79a951.tar.bz2
AOSP: WPS registrar PBC check for P2P interface addr
-rw-r--r--src/wps/wps_registrar.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 85ec317..5ed7ea4 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -312,8 +312,13 @@ static void wps_registrar_remove_pbc_session(struct wps_registrar *reg,
pbc = reg->pbc_sessions;
while (pbc) {
if (os_memcmp(pbc->uuid_e, uuid_e, WPS_UUID_LEN) == 0 ||
+#ifdef ANDROID_P2P
+ (p2p_dev_addr && !is_zero_ether_addr(pbc->addr) &&
+ os_memcmp(pbc->addr, p2p_dev_addr, ETH_ALEN) ==
+#else
(p2p_dev_addr && !is_zero_ether_addr(reg->p2p_dev_addr) &&
os_memcmp(reg->p2p_dev_addr, p2p_dev_addr, ETH_ALEN) ==
+#endif
0)) {
if (prev)
prev->next = pbc->next;