diff options
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 5 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_ioctl.h | 3 | ||||
| -rw-r--r-- | usr.bin/netstat/net80211.c | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 682b5606b7d..7d3bc51e26f 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,5 +1,5 @@ /* $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $ */ -/* $OpenBSD: ieee80211_input.c,v 1.61 2007/08/03 20:18:42 damien Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.62 2007/08/14 20:33:47 bluhm Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -355,6 +355,9 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni, ic->ic_stats.is_rx_nowep++; goto out; } + } else if (ic->ic_flags & IEEE80211_F_WEPON) { + ic->ic_stats.is_rx_unencrypted++; + goto out; } #if NBPFILTER > 0 /* copy to listener after decrypt */ diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h index a00a52a62bb..5cf82ec1676 100644 --- a/sys/net80211/ieee80211_ioctl.h +++ b/sys/net80211/ieee80211_ioctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_ioctl.h,v 1.9 2007/07/06 19:33:58 damien Exp $ */ +/* $OpenBSD: ieee80211_ioctl.h,v 1.10 2007/08/14 20:33:47 bluhm Exp $ */ /* $NetBSD: ieee80211_ioctl.h,v 1.7 2004/04/30 22:51:04 dyoung Exp $ */ /*- @@ -47,6 +47,7 @@ struct ieee80211_stats { u_int32_t is_rx_mcastecho; /* rx discard 'cuz mcast echo */ u_int32_t is_rx_notassoc; /* rx discard 'cuz sta !assoc */ u_int32_t is_rx_nowep; /* rx w/ wep but wep !config */ + u_int32_t is_rx_unencrypted; /* rx w/o wep but wep config */ u_int32_t is_rx_wepfail; /* rx wep processing failed */ u_int32_t is_rx_decap; /* rx decapsulation failed */ u_int32_t is_rx_mgtdiscard; /* rx discard mgt frames */ diff --git a/usr.bin/netstat/net80211.c b/usr.bin/netstat/net80211.c index d177aa3c6c0..ea5f95ddf03 100644 --- a/usr.bin/netstat/net80211.c +++ b/usr.bin/netstat/net80211.c @@ -1,4 +1,4 @@ -/* $OpenBSD: net80211.c,v 1.4 2007/06/19 05:29:26 ray Exp $ */ +/* $OpenBSD: net80211.c,v 1.5 2007/08/14 20:33:47 bluhm Exp $ */ /* * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org> @@ -68,7 +68,8 @@ net80211_ifstats(char *ifname) p(is_rx_wrongdir, "\t%lu input packet%s with wrong direction\n"); p(is_rx_mcastecho, "\t%lu input multicast echo packet%s discarded\n"); p(is_rx_notassoc, "\t%lu input packet%s from unassociated station discarded\n"); - p(is_rx_nowep, "\t%lu input wep packet%s without wep discarded\n"); + p(is_rx_nowep, "\t%lu input encrypted packet%s without wep config discarded\n"); + p(is_rx_unencrypted, "\t%lu input unencrypted packet%s with wep config discarded\n"); p(is_rx_wepfail, "\t%lu input wep packet%s processing failed\n"); p(is_rx_decap, "\t%lu input packet decapsulation%s failed\n"); p(is_rx_mgtdiscard, "\t%lu input management packet%s discarded\n"); |