[src/trunk]: src/sys/net80211 Prevent ad hoc lossage: copy the SSID from a be...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11060241bb90
branches:  trunk
changeset: 567088:11060241bb90
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Mon May 31 11:12:24 2004 +0000

description:
Prevent ad hoc lossage: copy the SSID from a beacon into the
beacon-sender's ieee80211_node, if ni->ni_esslen == 0.  This fixes
WEP for Matthew.  I think that it also will save us from IBSS
splits.

Thanks again, Matthew Gream.

diffstat:

 sys/net80211/ieee80211_input.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b9b0b34070fb -r 11060241bb90 sys/net80211/ieee80211_input.c
--- a/sys/net80211/ieee80211_input.c    Mon May 31 11:02:55 2004 +0000
+++ b/sys/net80211/ieee80211_input.c    Mon May 31 11:12:24 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211_input.c,v 1.23 2004/05/06 02:56:48 dyoung Exp $      */
+/*     $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $      */
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -35,7 +35,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.20 2004/04/02 23:35:24 sam Exp $");
 #else
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.23 2004/05/06 02:56:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $");
 #endif
 
 #include "opt_inet.h"
@@ -1071,7 +1071,7 @@
                        memset(ni->ni_essid, 0, sizeof(ni->ni_essid));
                        memcpy(ni->ni_essid, ssid + 2, ssid[1]);
                        allocbs = 1;
-               } else if (ssid[1] != 0 && isprobe) {
+               } else if (ssid[1] != 0 && (isprobe || ni->ni_esslen == 0)) {
                        /*
                         * Update ESSID at probe response to adopt hidden AP by
                         * Lucent/Cisco, which announces null ESSID in beacon.