svn commit: r188184 - in projects/vap7/sys: . contrib/pf dev
dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210
dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212
dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...
Sam Leffler
sam at FreeBSD.org
Thu Feb 5 12:33:00 PST 2009
Author: sam
Date: Thu Feb 5 20:32:59 2009
New Revision: 188184
URL: http://svn.freebsd.org/changeset/base/188184
Log:
merge r188170,r188182: ddb improvements
Modified:
projects/vap7/sys/ (props changed)
projects/vap7/sys/contrib/pf/ (props changed)
projects/vap7/sys/dev/ (props changed)
projects/vap7/sys/dev/ath/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed)
projects/vap7/sys/dev/cxgb/ (props changed)
projects/vap7/sys/dev/usb2/ (props changed)
projects/vap7/sys/i386/conf/USB2 (props changed)
projects/vap7/sys/modules/usb2/ (props changed)
projects/vap7/sys/net80211/ (props changed)
projects/vap7/sys/net80211/ieee80211_crypto.h
projects/vap7/sys/net80211/ieee80211_ddb.c
Modified: projects/vap7/sys/net80211/ieee80211_crypto.h
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_crypto.h Thu Feb 5 20:31:39 2009 (r188183)
+++ projects/vap7/sys/net80211/ieee80211_crypto.h Thu Feb 5 20:32:59 2009 (r188184)
@@ -104,6 +104,10 @@ struct ieee80211_key {
(IEEE80211_KEY_SWENCRYPT | IEEE80211_KEY_SWDECRYPT)
#define IEEE80211_KEY_SWMIC (IEEE80211_KEY_SWENMIC | IEEE80211_KEY_SWDEMIC)
+#define IEEE80211_KEY_BITS \
+ "\20\1XMIT\2RECV\3GROUP\4SWENCRYPT\5SWDECRYPT\6SWENMIC\7SWDEMIC" \
+ "\10DEVKEY\11CIPHER0\12CIPHER1"
+
#define IEEE80211_KEYIX_NONE ((ieee80211_keyix) -1)
/*
Modified: projects/vap7/sys/net80211/ieee80211_ddb.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_ddb.c Thu Feb 5 20:31:39 2009 (r188183)
+++ projects/vap7/sys/net80211/ieee80211_ddb.c Thu Feb 5 20:32:59 2009 (r188184)
@@ -59,6 +59,8 @@ static void _db_show_vap(const struct ie
static void _db_show_com(const struct ieee80211com *,
int showvaps, int showsta, int showprocs);
+static void _db_show_node_table(const char *tag,
+ const struct ieee80211_node_table *);
static void _db_show_channel(const char *tag, const struct ieee80211_channel *);
static void _db_show_ssid(const char *tag, int ix, int len, const uint8_t *);
static void _db_show_appie(const char *tag, const struct ieee80211_appie *);
@@ -78,6 +80,15 @@ DB_SHOW_COMMAND(sta, db_show_sta)
_db_show_sta((const struct ieee80211_node *) addr);
}
+DB_SHOW_COMMAND(statab, db_show_statab)
+{
+ if (!have_addr) {
+ db_printf("usage: show statab <addr>\n");
+ return;
+ }
+ _db_show_node_table("", (const struct ieee80211_node_table *) addr);
+}
+
DB_SHOW_COMMAND(vap, db_show_vap)
{
int i, showprocs = 0;
@@ -213,6 +224,7 @@ _db_show_sta(const struct ieee80211_node
ni->ni_rxfragstamp);
db_printf("\trxfrag[0] %p rxfrag[1] %p rxfrag[2] %p\n",
ni->ni_rxfrag[0], ni->ni_rxfrag[1], ni->ni_rxfrag[2]);
+ _db_show_key("\tucastkey", 0, &ni->ni_ucastkey);
db_printf("\trstamp %u avgrssi 0x%x (rssi %d) noise %d\n",
ni->ni_rstamp, ni->ni_avgrssi,
IEEE80211_RSSI_GET(ni->ni_avgrssi), ni->ni_noise);
@@ -502,9 +514,12 @@ _db_show_com(const struct ieee80211com *
db_printf("\n");
db_printf("\tmax_keyix %d", ic->ic_max_keyix);
- db_printf(" sta %p", &ic->ic_sta);
db_printf(" wme %p", &ic->ic_wme);
+ if (!showsta)
+ db_printf(" sta %p", &ic->ic_sta);
db_printf("\n");
+ if (showsta)
+ _db_show_node_table("\t", &ic->ic_sta);
db_printf("\tprotmode %d", ic->ic_protmode);
db_printf(" nonerpsta %u", ic->ic_nonerpsta);
@@ -569,6 +584,26 @@ _db_show_com(const struct ieee80211com *
}
static void
+_db_show_node_table(const char *tag, const struct ieee80211_node_table *nt)
+{
+ int i;
+
+ db_printf("%s%s@%p:\n", tag, nt->nt_name, nt);
+ db_printf("%s nodelock %p", tag, &nt->nt_nodelock);
+ db_printf(" inact_init %d", nt->nt_inact_init);
+ db_printf(" scanlock %p", &nt->nt_scanlock);
+ db_printf(" scangen %u\n", nt->nt_scangen);
+ db_printf("%s keyixmax %d keyixmap %p\n",
+ tag, nt->nt_keyixmax, nt->nt_keyixmap);
+ for (i = 0; i < nt->nt_keyixmax; i++) {
+ const struct ieee80211_node *ni = nt->nt_keyixmap[i];
+ if (ni != NULL)
+ db_printf("%s [%3u] %p %s\n", tag, i, ni,
+ ether_sprintf(ni->ni_macaddr));
+ }
+}
+
+static void
_db_show_channel(const char *tag, const struct ieee80211_channel *c)
{
db_printf("%s ", tag);
@@ -577,7 +612,7 @@ _db_show_channel(const char *tag, const
else if (c == IEEE80211_CHAN_ANYC)
db_printf("<ANY>");
else
- db_printf("[%u (%u) flags=%b maxreg %u maxpow %u minpow %u state 0x%x extieee %u]",
+ db_printf("[%u (%u) flags=%b maxreg %d maxpow %d minpow %d state 0x%x extieee %u]",
c->ic_freq, c->ic_ieee,
c->ic_flags, IEEE80211_CHAN_BITS,
c->ic_maxregpower, c->ic_maxpower, c->ic_minpower,
@@ -632,8 +667,6 @@ _db_show_key(const char *tag, int ix, co
const struct ieee80211_cipher *cip = wk->wk_cipher;
int keylen = wk->wk_keylen;
- if ((wk->wk_flags & IEEE80211_KEY_DEVKEY) == 0)
- return;
db_printf(tag, ix);
switch (cip->ic_cipher) {
case IEEE80211_CIPHER_WEP:
@@ -664,6 +697,8 @@ _db_show_key(const char *tag, int ix, co
cip->ic_cipher, wk->wk_keyix, 8*keylen);
break;
}
+ if (wk->wk_rxkeyix != wk->wk_keyix)
+ db_printf(" rxkeyix %u", wk->wk_rxkeyix);
if (memcmp(wk->wk_key, zerodata, keylen) != 0) {
int i;
@@ -677,22 +712,9 @@ _db_show_key(const char *tag, int ix, co
if (cip->ic_cipher != IEEE80211_CIPHER_WEP &&
wk->wk_keytsc != 0)
db_printf(" tsc %ju", (uintmax_t)wk->wk_keytsc);
- if (wk->wk_flags != 0) {
- const char *sep = " ";
-
- if (wk->wk_flags & IEEE80211_KEY_XMIT)
- db_printf("%stx", sep), sep = "+";
- if (wk->wk_flags & IEEE80211_KEY_RECV)
- db_printf("%srx", sep), sep = "+";
- if (wk->wk_flags & IEEE80211_KEY_DEFAULT)
- db_printf("%sdef", sep), sep = "+";
- if (wk->wk_flags & IEEE80211_KEY_SWCRYPT)
- db_printf("%sswcrypt", sep), sep = "+";
- if (wk->wk_flags & IEEE80211_KEY_SWMIC)
- db_printf("%sswmic", sep), sep = "+";
- }
- db_printf("\n");
+ db_printf(" flags=%b", wk->wk_flags, IEEE80211_KEY_BITS);
}
+ db_printf("\n");
}
static void
More information about the svn-src-projects
mailing list