diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-11 15:34:28 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-11 15:34:28 +0000 |
| commit | 42d3e35e7b9eeb9be5ec1445206b35f3b81a59d8 (patch) | |
| tree | e976549a512e821b35cd65ed211490800fee7d6a /sys | |
| parent | f665a2d2b4f8932e9865932864260ba7077a6987 (diff) | |
o Check supported speeds before examing capabilties
o If capinfo doesn't match, save it anyway for debugging porpoises
o Add more info for capinfo failures in debug mode
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/if_wi_hostap.c | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c index 4de5826acdd..65d9fc95dc1 100644 --- a/sys/dev/ic/if_wi_hostap.c +++ b/sys/dev/ic/if_wi_hostap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_hostap.c,v 1.11 2002/04/08 18:44:42 mickey Exp $ */ +/* $OpenBSD: if_wi_hostap.c,v 1.12 2002/04/11 15:34:27 millert Exp $ */ /* * Copyright (c) 2002 @@ -656,31 +656,39 @@ wihap_assoc_req(struct wi_softc *sc, struct wi_frame *rxfrm, return; } + /* Check supported rates against ours. */ + if (wihap_check_rates(sta, rates, rates_len)<0) { + status = IEEE80211_STATUS_RATES; + goto fail; + } + /* Check capinfo. * Check for ESS, not IBSS. - * Check WEP/PRIVACY flags match. XXX: WEP doesn't work for host AP. + * Check WEP/PRIVACY flags match. * Refuse stations requesting to be put on CF-polling list. */ + sta->capinfo = capinfo; + status = IEEE80211_STATUS_CAPINFO; if ((capinfo & (IEEE80211_CAPINFO_ESS | IEEE80211_CAPINFO_IBSS)) != - IEEE80211_CAPINFO_ESS || - (sc->wi_use_wep && !(capinfo & IEEE80211_CAPINFO_PRIVACY)) || - (!sc->wi_use_wep && (capinfo & IEEE80211_CAPINFO_PRIVACY)) || - (capinfo & (IEEE80211_CAPINFO_CF_POLLABLE | - IEEE80211_CAPINFO_CF_POLLREQ)) == - IEEE80211_CAPINFO_CF_POLLABLE) { - + IEEE80211_CAPINFO_ESS) { if (sc->arpcom.ac_if.if_flags & IFF_DEBUG) printf("wihap_assoc_req: capinfo mismatch: " - "capinfo=0x%x\n", capinfo); + "client using IBSS mode\n"); + goto fail; - status = IEEE80211_STATUS_CAPINFO; + } + if ((sc->wi_use_wep && !(capinfo & IEEE80211_CAPINFO_PRIVACY)) || + (!sc->wi_use_wep && (capinfo & IEEE80211_CAPINFO_PRIVACY))) { + if (sc->arpcom.ac_if.if_flags & IFF_DEBUG) + printf("wihap_assoc_req: capinfo mismatch: client " + "%susing WEP\n", sc->wi_use_wep ? "not " : ""); goto fail; } - sta->capinfo = capinfo; - - /* Check supported rates against ours. */ - if (wihap_check_rates(sta, rates, rates_len)<0) { - status = IEEE80211_STATUS_RATES; + if ((capinfo & (IEEE80211_CAPINFO_CF_POLLABLE | + IEEE80211_CAPINFO_CF_POLLREQ)) == IEEE80211_CAPINFO_CF_POLLABLE) { + if (sc->arpcom.ac_if.if_flags & IFF_DEBUG) + printf("wihap_assoc_req: capinfo mismatch: " + "client requested CF polling\n"); goto fail; } |