Ticket #509: madwifi-large-scan-results.patch

madwifi-ng/net80211/ieee80211_scan_ap.c

@@ -367 +367 @@
-        /* XXX is there anything meaningful to do? */
-}
-
-void
+int
-ap_iterate(struct ieee80211_scan_state *ss,
-        ieee80211_scan_iter_func *f, void *arg)
-{
-        /* NB: nothing meaningful we can do */
+  return 0;
-}
-
-static void

madwifi-ng/net80211/ieee80211_scan.c

@@ -922 +922 @@
-/*
- * Iterate over the contents of the scan cache.
- */
-
+
-ieee80211_scan_iterate(struct ieee80211com *ic,
-        ieee80211_scan_iter_func *f, void *arg)
-{
+  int res = 0;
-        struct ieee80211_scan_state *ss = ic->ic_scan;
-
-        if (ss->ss_ops != NULL)
-
+
+
+
+
+
-}
-
-/*

madwifi-ng/net80211/ieee80211_scan.h

@@ -113 +113 @@
-void ieee80211_scan_flush(struct ieee80211com *);
-
-struct ieee80211_scan_entry;
-void
-void
+int
+int
-
-/*
- * Parameters supplied when adding/updating an entry in a
@@ -205 +205 @@
-        void (*scan_assoc_success)(struct ieee80211_scan_state *,
-                const u_int8_t macaddr[IEEE80211_ADDR_LEN]);
-        /* iterate over entries in the scan cache */
-void
-
+int
+           
-        /* default action to take when found scan match */
-        int (*scan_default)(struct ieee80211vap *,
-                const struct ieee80211_scan_entry *);

madwifi-ng/net80211/ieee80211_scan_sta.c

@@ -1040 +1040 @@
- * Iterate over the entries in the scan cache, invoking
- * the callback function on each one.
- */
-void
+int
-sta_iterate(struct ieee80211_scan_state *ss, 
-        ieee80211_scan_iter_func *f, void *arg)
-{
-        struct sta_table *st = ss->ss_priv;
-        struct sta_entry *se;
-        u_int gen;
+        int res = 0;
-
-        spin_lock_bh(&st->st_scanlock);
-        gen = st->st_scangen++;
@@ -1058 +1059 @@
-                        /* update public state */
-                        se->base.se_age = jiffies - se->se_lastupdate;
-                        spin_unlock(&st->st_lock);
-
+
+
+
+
+
+
+
-                        goto restart;
-                }
-        }
+
-        spin_unlock(&st->st_lock);
-
+done:
-        spin_unlock_bh(&st->st_scanlock);
+
+        return res;
-}
-
-static void

madwifi-ng/net80211/ieee80211_wireless.c

@@ -1330 +1330 @@
-        int i;
-};
-
-void
+int
-waplist_cb(void *arg, const struct ieee80211_scan_entry *se)
-{
-        struct waplistreq *req = arg;
-        int i = req->i;
-
-        if (i >= IW_MAX_AP)
-
+ 0
-        req->addr[i].sa_family = ARPHRD_ETHER;
-        if (req->vap->iv_opmode == IEEE80211_M_HOSTAP)
-                IEEE80211_ADDR_COPY(req->addr[i].sa_data, se->se_macaddr);
@@ -1345 +1345 @@
-                IEEE80211_ADDR_COPY(req->addr[i].sa_data, se->se_bssid);
-        set_quality(&req->qual[i], se->se_rssi);
-        req->i = i + 1;
+
+        return 0;
-}
-
-static int
@@ -1427 +1429 @@
-        int mode;
-};
-
-void
+int
-giwscan_cb(void *arg, const struct ieee80211_scan_entry *se)
-{
-        struct iwscanreq *req = arg;
-        struct ieee80211vap *vap = req->vap;
-        char *current_ev = req->current_ev;
-        char *end_buf = req->end_buf;
+        char *last_ev;
-#if WIRELESS_EXT > 14
-        char buf[64 * 2 + 30];
-#endif
@@ -1442 +1445 @@
-        int j;
-
-        if (current_ev >= end_buf)
-
+
+
-        /* WPA/!WPA sort criteria */
-        if ((req->mode != 0) ^ (se->se_wpa_ie != NULL))
-
+ 0
-
-        memset(&iwe, 0, sizeof(iwe));
+        last_ev = current_ev;
-        iwe.cmd = SIOCGIWAP;
-        iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-        if (vap->iv_opmode == IEEE80211_M_HOSTAP)
@@ -1456 +1461 @@
-                IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_bssid);
-        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
-
+        // We ran out of space in the buffer.
+        if (last_ev == current_ev) 
+            return E2BIG;
+
-        memset(&iwe, 0, sizeof(iwe));
+        last_ev = current_ev;
-        iwe.cmd = SIOCGIWESSID;
-        iwe.u.data.flags = 1;
-        if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
@@ -1470 +1480 @@
-                        end_buf, &iwe, (char *) se->se_ssid+2);
-        }
-
+        // We ran out of space in the buffer.
+        if (last_ev == current_ev) 
+            return E2BIG;
+
-        if (se->se_capinfo & (IEEE80211_CAPINFO_ESS|IEEE80211_CAPINFO_IBSS)) {
-                memset(&iwe, 0, sizeof(iwe));
+                last_ev = current_ev;
-                iwe.cmd = SIOCGIWMODE;
-                iwe.u.mode = se->se_capinfo & IEEE80211_CAPINFO_ESS ?
-                        IW_MODE_MASTER : IW_MODE_ADHOC;
-                current_ev = iwe_stream_add_event(current_ev,
-                        end_buf, &iwe, IW_EV_UINT_LEN);
+
+                // We ran out of space in the buffer.
+                if (last_ev == current_ev) 
+                    return E2BIG;
-        }
-
-        memset(&iwe, 0, sizeof(iwe));
+        last_ev = current_ev;
-        iwe.cmd = SIOCGIWFREQ;
-        iwe.u.freq.m = se->se_chan->ic_freq * 100000;
-        iwe.u.freq.e = 1;
-        current_ev = iwe_stream_add_event(current_ev,
-                end_buf, &iwe, IW_EV_FREQ_LEN);
-
+        // We ran out of space in the buffer.
+        if (last_ev == current_ev) 
+            return E2BIG;
+
-        memset(&iwe, 0, sizeof(iwe));
+        last_ev = current_ev;
-        iwe.cmd = IWEVQUAL;
-        set_quality(&iwe.u.qual, se->se_rssi);
-        current_ev = iwe_stream_add_event(current_ev,
-                end_buf, &iwe, IW_EV_QUAL_LEN);
-
+        // We ran out of space in the buffer.
+        if (last_ev == current_ev) 
+            return E2BIG;
+
-        memset(&iwe, 0, sizeof(iwe));
+        last_ev = current_ev;
-        iwe.cmd = SIOCGIWENCODE;
-        if (se->se_capinfo & IEEE80211_CAPINFO_PRIVACY)
-                iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
@@ -1501 +1531 @@
-        iwe.u.data.length = 0;
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
-
+        // We ran out of space in the buffer.
+        if (last_ev == current_ev) 
+            return E2BIG;
+
-        memset(&iwe, 0, sizeof(iwe));
+        last_ev = current_ev;
-        iwe.cmd = SIOCGIWRATE;
-        current_val = current_ev + IW_EV_LCP_LEN;
-        /* NB: not sorted, does it matter? */
@@ -1525 +1560 @@
-        }
-        /* remove fixed header if no rates were added */
-        if ((current_val - current_ev) > IW_EV_LCP_LEN)
+          {
-                current_ev = current_val;
+          }
+        else
+          {
+            // We ran out of space in the buffer.
+            if (last_ev == current_ev)
+              return E2BIG;
+          }
-
-#if WIRELESS_EXT > 14
-        memset(&iwe, 0, sizeof(iwe));
+        last_ev = current_ev;
-        iwe.cmd = IWEVCUSTOM;
-        snprintf(buf, sizeof(buf), "bcn_int=%d", se->se_intval);
-        iwe.u.data.length = strlen(buf);
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-
+        // We ran out of space in the buffer.
+        if (last_ev == current_ev) 
+            return E2BIG;
+
-        if (se->se_rsn_ie != NULL) {
-                static const char rsn_leader[] = "rsn_ie=";
-
-                memset(&iwe, 0, sizeof(iwe));
+                last_ev = current_ev;
-                iwe.cmd = IWEVCUSTOM;
-                if (se->se_rsn_ie[0] == IEEE80211_ELEMID_RSN)
-                        iwe.u.data.length = encode_ie(buf, sizeof(buf),
-                                se->se_rsn_ie, se->se_rsn_ie[1] + 2,
-                                rsn_leader, sizeof(rsn_leader) - 1);
-                if (iwe.u.data.length != 0)
+                  {
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                &iwe, buf);
+
+                        // We ran out of space in the buffer.
+                        if (last_ev == current_ev) 
+                          return E2BIG;
+                  }
-        }
-        if (se->se_wpa_ie != NULL) {
-                static const char wpa_leader[] = "wpa_ie=";
-
-                memset(&iwe, 0, sizeof(iwe));
+                last_ev = current_ev;
-                iwe.cmd = IWEVCUSTOM;
-                iwe.u.data.length = encode_ie(buf, sizeof(buf),
-                        se->se_wpa_ie, se->se_wpa_ie[1] + 2,
-                        wpa_leader, sizeof(wpa_leader) - 1);
-                if (iwe.u.data.length != 0)
+                  {
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                &iwe, buf);
+
+                        // We ran out of space in the buffer.
+                        if (last_ev == current_ev) 
+                          return E2BIG;
+                  }
-        }
-        if (se->se_wme_ie != NULL) {
-                static const char wme_leader[] = "wme_ie=";
-
-                memset(&iwe, 0, sizeof(iwe));
+                last_ev = current_ev;
-                iwe.cmd = IWEVCUSTOM;
-                iwe.u.data.length = encode_ie(buf, sizeof(buf),
-                        se->se_wme_ie, se->se_wme_ie[1] + 2,
-                        wme_leader, sizeof(wme_leader) - 1);
-                if (iwe.u.data.length != 0)
+                  {
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                &iwe, buf);
+
+                        // We ran out of space in the buffer.
+                        if (last_ev == current_ev) 
+                          return E2BIG;
+                  }
-        }
-        if (se->se_ath_ie != NULL) {
-                static const char ath_leader[] = "ath_ie=";
-
-                memset(&iwe, 0, sizeof(iwe));
+                last_ev = current_ev;
-                iwe.cmd = IWEVCUSTOM;
-                iwe.u.data.length = encode_ie(buf, sizeof(buf),
-                        se->se_ath_ie, se->se_ath_ie[1] + 2,
-                        ath_leader, sizeof(ath_leader) - 1);
-                if (iwe.u.data.length != 0)
+                  {
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                &iwe, buf);
+
+                        // We ran out of space in the buffer.
+                        if (last_ev == current_ev) 
+                          return E2BIG;
+                  }
-        }
-#endif /* WIRELESS_EXT > 14 */
-        req->current_ev = current_ev;
+
+        return 0;
-}
-
-static int
@@ -1594 +1672 @@
-        struct ieee80211vap *vap = dev->priv;
-        struct ieee80211com *ic = vap->iv_ic;
-        struct iwscanreq req;
+        int res = 0;
-
-        req.vap = vap;
-        req.current_ev = extra;
-
+
+
+
+
+
+
+
+
-
-        /*
+         * XXX -- This is no longer needed, as long as the caller supports
+         * large scan results.  - CH
+         *
-         * Do two passes to ensure WPA/non-WPA scan candidates
-         * are sorted to the front.  This is a hack to deal with
-         * the wireless extensions capping scan results at
@@ -1609 +1698 @@
-         * guarantee we won't overflow anyway.
-         */
-        req.mode = vap->iv_flags & IEEE80211_F_WPA;
-
-
-
+
+
+
+
+
+
-
-        data->length = req.current_ev - extra;
-
+
+
+
+
+
+
-}
-#endif /* SIOCGIWSCAN */
-
@@ -2802 +2899 @@
-/*
- * Match mac address and any ssid.
- */
-void
+int
-mlmelookup(void *arg, const struct ieee80211_scan_entry *se)
-{
-        struct scanlookup *look = arg;
-
-        if (!IEEE80211_ADDR_EQ(look->mac, se->se_macaddr))
-
+ 0
-        if (look->esslen != 0) {
-                if (se->se_ssid[1] != look->esslen)
-
+ 0
-                if (memcmp(look->essid, se->se_ssid + 2, look->esslen))
-
+ 0
-        }
-        look->se = se;
+
+        return 0;
-}
-
-static int
@@ -3319 +3418 @@
-                se->se_ssid[1] + *ielen, sizeof(u_int32_t));
-}
-
-void
+int
-get_scan_space(void *arg, const struct ieee80211_scan_entry *se)
-{
-        struct scanreq *req = arg;
-        int ielen;
-
-        req->space += scan_space(se, &ielen);
+
+        return 0;
-}
-
-void
+int
-get_scan_result(void *arg, const struct ieee80211_scan_entry *se)
-{
-        struct scanreq *req = arg;
@@ -3338 +3439 @@
-
-        len = scan_space(se, &ielen);
-        if (len > req->space)
-
+
+
+
+
-
-        sr = req->sr;
-        memset(sr, 0, sizeof(*sr));
@@ -3382 +3486 @@
-
-        req->space -= len;
-        req->sr = (struct ieee80211req_scan_result *)(((u_int8_t *)sr) + len);
+
+        return 0;
-}
-
-static int