DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

TDLS: Move existing-entry check into wpa_tdls_add_peer()

Browse source 
There is no need to have this check copied to each caller since this
needs to be done for every case when a new peer is being added.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-02-05 13:16:35 +02:00 committed by Jouni Malinen
parent cd22fbf85c
commit 283a26f358
1 changed files with 24 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/rsn_supp/tdls.c
View file

@ -868,10 +868,20 @@ static int wpa_tdls_send_error(struct wpa_sm *sm, const u8 *dst,
static struct wpa_tdls_peer * static struct wpa_tdls_peer *
wpa_tdls_add_peer(struct wpa_sm *sm, const u8 *addr) wpa_tdls_add_peer(struct wpa_sm *sm, const u8 *addr, int *existing)
{ {
struct wpa_tdls_peer *peer; struct wpa_tdls_peer *peer;
if (existing)
*existing = 0;
for (peer = sm->tdls; peer; peer = peer->next) {
if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0) {
if (existing)
*existing = 1;
return peer; /* re-use existing entry */
}
}
wpa_printf(MSG_INFO, "TDLS: Creating peer entry for " MACSTR, wpa_printf(MSG_INFO, "TDLS: Creating peer entry for " MACSTR,
MAC2STR(addr)); MAC2STR(addr));
@ -1281,17 +1291,10 @@ wpa_tdls_process_discovery_request(struct wpa_sm *sm, const u8 *addr,
" BSS " MACSTR, MAC2STR(lnkid->bssid)); " BSS " MACSTR, MAC2STR(lnkid->bssid));
return -1; return -1;
} }
/* Find existing entry and if found, use that instead of adding
* a new one */ peer = wpa_tdls_add_peer(sm, addr, NULL);
for (peer = sm->tdls; peer; peer = peer->next) { if (peer == NULL)
if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0) return -1;
break;
}
if (peer == NULL) {
peer = wpa_tdls_add_peer(sm, addr);
if (peer == NULL)
return -1;
}
return wpa_tdls_send_discovery_response(sm, peer, dialog_token); return wpa_tdls_send_discovery_response(sm, peer, dialog_token);
} }
@ -1359,18 +1362,9 @@ static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
wpa_printf(MSG_INFO, "TDLS: Dialog Token in TPK M1 %d", dtoken); wpa_printf(MSG_INFO, "TDLS: Dialog Token in TPK M1 %d", dtoken);
for (peer = sm->tdls; peer; peer = peer->next) { peer = wpa_tdls_add_peer(sm, src_addr, &existing_peer);
if (os_memcmp(peer->addr, src_addr, ETH_ALEN) == 0) { if (peer == NULL)
existing_peer = 1; goto error;
break;
}
}
if (peer == NULL) {
peer = wpa_tdls_add_peer(sm, src_addr);
if (peer == NULL)
goto error;
}
/* capability information */ /* capability information */
peer->capability = WPA_GET_LE16(cpos); peer->capability = WPA_GET_LE16(cpos);
@ -1404,15 +1398,9 @@ static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
#ifdef CONFIG_TDLS_TESTING #ifdef CONFIG_TDLS_TESTING
if (tdls_testing & TDLS_TESTING_CONCURRENT_INIT) { if (tdls_testing & TDLS_TESTING_CONCURRENT_INIT) {
for (peer = sm->tdls; peer; peer = peer->next) { peer = wpa_tdls_add_peer(sm, src_addr, NULL);
if (os_memcmp(peer->addr, src_addr, ETH_ALEN) == 0) if (peer == NULL)
break; goto error;
}
if (peer == NULL) {
peer = wpa_tdls_add_peer(sm, src_addr);
if (peer == NULL)
goto error;
}
wpa_printf(MSG_DEBUG, "TDLS: Testing concurrent initiation of " wpa_printf(MSG_DEBUG, "TDLS: Testing concurrent initiation of "
"TDLS setup - send own request"); "TDLS setup - send own request");
peer->initiator = 1; peer->initiator = 1;
@ -2065,18 +2053,9 @@ int wpa_tdls_start(struct wpa_sm *sm, const u8 *addr)
return -1; return -1;
} }
/* Find existing entry and if found, use that instead of adding peer = wpa_tdls_add_peer(sm, addr, NULL);
* a new one */ if (peer == NULL)
for (peer = sm->tdls; peer; peer = peer->next) { return -1;
if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0)
break;
}
if (peer == NULL) {
peer = wpa_tdls_add_peer(sm, addr);
if (peer == NULL)
return -1;
}
peer->initiator = 1; peer->initiator = 1;