Changeset 1360

Timestamp:

12/19/05 02:30:25 (6 years ago)

Author:

jbicket

Message:

add monitor mode sysctls:
monitor_txf_len - truncate packets to this length if they
were sent from this node. A value of '0' means don't truncate,
which is the default.

monitor_nods_only - ignore tods, fromds, and dstods packets
on this montitor device. A value of '0' means accept all packets,
which is the default.

Files:

• trunk/net80211/ieee80211_linux.c (modified) (2 diffs)
• trunk/net80211/ieee80211_monitor.c (modified) (2 diffs)
• trunk/net80211/ieee80211_var.h (modified) (1 diff)

trunk/net80211/ieee80211_linux.c

@@ -493 +493 @@
-        return ret;
-}
+static int
+IEEE80211_SYSCTL_DECL(ieee80211_sysctl_monitor_nods_only, ctl, write, filp, buffer,
+                lenp, ppos)
+{
+        struct ieee80211vap *vap = ctl->extra1;
+        u_int val;
+        int ret;
+
+        ctl->data = &val;
+        ctl->maxlen = sizeof(val);
+        if (write) {
+                ret = IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer,
+                                lenp, ppos);
+                if (ret == 0) {
+                        vap->iv_monitor_nods_only = val;
+                }
+        } else {
+                val = vap->iv_monitor_nods_only;
+                ret = IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer,
+                                                     lenp, ppos);
+        }
+        return ret;
+}
+static int
+IEEE80211_SYSCTL_DECL(ieee80211_sysctl_monitor_txf_len, ctl, write, filp, buffer,
+                lenp, ppos)
+{
+        struct ieee80211vap *vap = ctl->extra1;
+        u_int val;
+        int ret;
+
+        ctl->data = &val;
+        ctl->maxlen = sizeof(val);
+        if (write) {
+                ret = IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer,
+                                lenp, ppos);
+                if (ret == 0) {
+                        vap->iv_monitor_txf_len = val;
+                }
+        } else {
+                val = vap->iv_monitor_txf_len;
+                ret = IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer,
+                                lenp, ppos);
+        }
+        return ret;
+}
-
-#define CTL_AUTO        -2      /* cannot be CTL_ANY or CTL_NONE */
@@ -508 +554 @@
-          .mode         = 0644,
-          .proc_handler = ieee80211_sysctl_dev_type
+        },
+        { .ctl_name     = CTL_AUTO,
+          .procname     = "monitor_nods_only",
+          .mode         = 0644,
+          .proc_handler = ieee80211_sysctl_monitor_nods_only
+        },
+        { .ctl_name     = CTL_AUTO,
+          .procname     = "monitor_txf_len",
+          .mode         = 0644,
+          .proc_handler = ieee80211_sysctl_monitor_txf_len
-        },
-        /* NB: must be last entry before NULL */

trunk/net80211/ieee80211_monitor.c

@@ -187 +187 @@
-                struct sk_buff *skb1;
-                struct net_device *dev = vap->iv_dev;
+                struct ieee80211_frame *wh;
+                u_int8_t dir;
-                next = TAILQ_NEXT(vap, iv_next);
-                if (vap->iv_opmode != IEEE80211_M_MONITOR ||
@@ -196 +198 @@
-                        /* XXX stat+msg */
-                        continue;
-
-
+
+
+
+
+
+
+
+
+
+
+
-                switch (vap->iv_dev->type) {
-                case ARPHRD_IEEE80211:

trunk/net80211/ieee80211_var.h

@@ -284 +284 @@
-        u_int32_t               iv_debug;       /* debug msg flags */
-        struct ieee80211_stats  iv_stats;       /* statistics */
+
+        int                     iv_monitor_nods_only; /* in monitor mode only nods traffic */
+        int                     iv_monitor_txf_len;   /* in monitor mode, truncate tx packets */
-
-        int                     (*iv_newstate)(struct ieee80211vap *,