diff options
| author | Peter Hessler <phessler@cvs.openbsd.org> | 2018-07-13 07:22:56 +0000 |
|---|---|---|
| committer | Peter Hessler <phessler@cvs.openbsd.org> | 2018-07-13 07:22:56 +0000 |
| commit | 51d654e4067adb60d8ecf4d18ad59ad96410ecfb (patch) | |
| tree | ecccc6e826a6f756bd712f4976a24cb6e0b95dae /sys/net80211 | |
| parent | d52bfce1255cb26aae9ee7c9327c75dda1b3637b (diff) | |
Some more checks before auto-join switches networks.
Make sure all of the crypto options the AP announces matches what we
would configure. While here, don't switch if the user has specified
a specific BSSID, and the new AP does not match.
OK stsp@
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index b5dbc7c083a..ba435d07567 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_node.c,v 1.130 2018/07/11 20:18:09 phessler Exp $ */ +/* $OpenBSD: ieee80211_node.c,v 1.131 2018/07/13 07:22:55 phessler Exp $ */ /* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */ /*- @@ -373,6 +373,30 @@ ieee80211_match_ess(struct ieee80211com *ic) ni->ni_fails != 0) continue; + /* make sure encryptions match */ + if (ess->flags & + (IEEE80211_F_PSK | IEEE80211_F_RSNON)) { + if ((ni->ni_capinfo & + IEEE80211_CAPINFO_PRIVACY) == 0) + continue; + } else { + if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) + continue; + } + + if (ess->rsnprotos != ni->ni_rsnprotos) + continue; + if (ess->rsnakms != ni->ni_rsnakms) + continue; + if (ess->rsngroupcipher != ni->ni_rsngroupcipher) + continue; + if (ess->rsnciphers != ni->ni_rsnciphers) + continue; + + if ((ic->ic_flags & IEEE80211_F_DESBSSID) && + !IEEE80211_ADDR_EQ(ic->ic_des_bssid, ni->ni_bssid)) + continue; + if (selni == NULL || ieee80211_ess_is_better(ic, ni, selni) > 1) { seless = ess; |