diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2009-10-12 14:51:19 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2009-10-12 14:51:19 +0000 |
| commit | 22562b38d7c19f5ba51a9f0cf8b82e708507ed29 (patch) | |
| tree | bcc227f23e2b40da9e77a4062204f37ec74cb76d /sbin | |
| parent | 160933eb93ffe31d667fc617375f07f59c4c4e11 (diff) | |
| download | FreeBSD-src-22562b38d7c19f5ba51a9f0cf8b82e708507ed29.zip FreeBSD-src-22562b38d7c19f5ba51a9f0cf8b82e708507ed29.tar.gz | |
Update for latest 802.11s changes in meshconf format.
MFC after: 3 days
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ifconfig/ifieee80211.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 10fb83d..ccb650c 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2624,25 +2624,31 @@ do { \ if (verbose) { const struct ieee80211_meshconf_ie *mconf = (const struct ieee80211_meshconf_ie *)ie; - const uint8_t null[4] = IEEE80211_MESHCONF_NULL; - const uint8_t hwmp[4] = IEEE80211_MESHCONF_HWMP; - const uint8_t airtime[4] = IEEE80211_MESHCONF_AIRTIME; - const uint8_t ccsig[4] = IEEE80211_MESHCONF_CCSIG; - const uint8_t sae[4] = IEEE80211_MESHCONF_SAE; - const uint8_t neighoff[4] = IEEE80211_MESHCONF_SAE; - printf("<v%d PATH:", mconf->conf_ver); - MATCHOUI(mconf->conf_pselid, hwmp, "HWMP"); + printf("<PATH:"); + if (mconf->conf_pselid == IEEE80211_MESHCONF_PATH_HWMP) + printf("HWMP"); + else + printf("UNKNOWN"); printf(" LINK:"); - MATCHOUI(mconf->conf_pmetid, airtime, "AIRTIME"); + if (mconf->conf_pmetid == IEEE80211_MESHCONF_METRIC_AIRTIME) + printf("AIRTIME"); + else + printf("UNKNOWN"); printf(" CONGESTION:"); - MATCHOUI(mconf->conf_ccid, ccsig, "SIG"); - MATCHOUI(mconf->conf_ccid, null, "NULL"); + if (mconf->conf_ccid == IEEE80211_MESHCONF_CC_DISABLED) + printf("DISABLED"); + else + printf("UNKNOWN"); printf(" SYNC:"); - MATCHOUI(mconf->conf_syncid, neighoff, "NEIGHOFF"); - MATCHOUI(mconf->conf_syncid, null, "NULL"); + if (mconf->conf_syncid == IEEE80211_MESHCONF_SYNC_NEIGHOFF) + printf("NEIGHOFF"); + else + printf("UNKNOWN"); printf(" AUTH:"); - MATCHOUI(mconf->conf_authid, sae, "SAE"); - MATCHOUI(mconf->conf_authid, null, "NULL"); + if (mconf->conf_authid == IEEE80211_MESHCONF_AUTH_DISABLED) + printf("DISABLED"); + else + printf("UNKNOWN"); printf(" FORM:0x%x CAPS:0x%x>", mconf->conf_form, mconf->conf_cap); } |
