Attachment 156050 Details for Bug 199632 – Do not validate bssid for beacons and probe requests + add RUN -> RUN state transition

[patch] Do not validate bssid for beacons and probe requests + add RUN -> RUN state transition

patch-IBSS-merge.diff (text/plain), 1.09 KB, created by Andriy Voskoboinyk on 2015-04-27 18:36:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-04-27 18:36:00 UTC

Size: 1.09 KB

patch

obsolete

>Index: sys/net80211/ieee80211_adhoc.c
>===================================================================
>--- sys/net80211/ieee80211_adhoc.c	(revision 281839)
>+++ sys/net80211/ieee80211_adhoc.c	(working copy)
>@@ -229,6 +229,8 @@
> 			}
> #endif
> 			break;
>+		case IEEE80211_S_RUN:	/* IBSS merge */
>+			break;
> 		default:
> 			goto invalid;
> 		}
>@@ -369,7 +371,10 @@
> 		/*
> 		 * Validate the bssid.
> 		 */
>-		if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
>+		if (!(type == IEEE80211_FC0_TYPE_MGT &&
>+		     (subtype == IEEE80211_FC0_SUBTYPE_BEACON ||
>+		      subtype == IEEE80211_FC0_SUBTYPE_PROBE_REQ)) &&
>+		    !IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
> 		    !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) {
> 			/* not interested in */
> 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
>@@ -409,7 +414,7 @@
> 		}
> 		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
> 		ni->ni_noise = nf;
>-		if (HAS_SEQ(type)) {
>+		if (HAS_SEQ(type) && IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
> 			uint8_t tid = ieee80211_gettid(wh);
> 			if (IEEE80211_QOS_HAS_SEQ(wh) &&
> 			    TID_TO_WME_AC(tid) >= WME_AC_VI)

Actions: View | Diff

Attachments on bug 199632: 155886 | 156050 | 156623