IES,
SSID,
MESHID,
+ DURATION,
DONE,
} parse = NONE;
int freq;
+ unsigned int duration = 0;
bool passive = false, have_ssids = false, have_freqs = false;
+ bool duration_mandatory = false;
size_t ies_len = 0, meshid_len = 0;
unsigned char *ies = NULL, *meshid = NULL, *tmpies;
unsigned int flags = 0;
} else if (strcmp(argv[i], "ap-force") == 0) {
flags |= NL80211_SCAN_FLAG_AP;
break;
+ } else if (strcmp(argv[i], "duration-mandatory") == 0) {
+ duration_mandatory = true;
+ break;
} else if (strncmp(argv[i], "randomise", 9) == 0 ||
strncmp(argv[i], "randomize", 9) == 0) {
flags |= NL80211_SCAN_FLAG_RANDOM_ADDR;
} else if (strcmp(argv[i], "meshid") == 0) {
parse = MESHID;
break;
+ } else if (strcmp(argv[i], "duration") == 0) {
+ parse = DURATION;
+ break;
}
+ /* fall through - this is an error */
case DONE:
nlmsg_free(ssids);
nlmsg_free(freqs);
meshid_len += 2;
parse = NONE;
break;
+ case DURATION:
+ duration = strtoul(argv[i], &eptr, 10);
+ parse = NONE;
+ break;
}
}
nla_put_nested(msg, NL80211_ATTR_SCAN_FREQUENCIES, freqs);
if (flags)
NLA_PUT_U32(msg, NL80211_ATTR_SCAN_FLAGS, flags);
+ if (duration)
+ NLA_PUT_U16(msg, NL80211_ATTR_MEASUREMENT_DURATION, duration);
+ if (duration_mandatory) {
+ if (duration) {
+ NLA_PUT_FLAG(msg,
+ NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY);
+ } else {
+ err = -EINVAL;
+ goto nla_put_failure;
+ }
+ }
err = 0;
nla_put_failure:
*first = false;
}
-static void print_ssid(const uint8_t type, uint8_t len, const uint8_t *data)
+struct print_ies_data {
+ unsigned char *ie;
+ int ielen;
+};
+
+static void print_ssid(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf(" ");
print_ssid_escaped(len, data);
#define BSS_MEMBERSHIP_SELECTOR_VHT_PHY 126
#define BSS_MEMBERSHIP_SELECTOR_HT_PHY 127
-static void print_supprates(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_supprates(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
int i;
printf("\n");
}
-static void print_ds(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_ds(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf(" channel %d\n", data[0]);
}
}
}
-static void print_country(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_country(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf(" %.*s", 2, data);
return;
}
-static void print_powerconstraint(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_powerconstraint(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf(" %d dB\n", data[0]);
}
-static void print_tpcreport(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_tpcreport(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf(" TX power: %d dBm\n", data[0]);
/* printf(" Link Margin (%d dB) is reserved in Beacons\n", data[1]); */
}
-static void print_erp(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_erp(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
if (data[0] == 0x00)
printf(" <no flags>");
case 7:
printf("TDLS/TPK");
break;
+ case 8:
+ printf("SAE");
+ break;
+ case 9:
+ printf("FT/SAE");
+ break;
+ case 11:
+ printf("IEEE 802.1X/SUITE-B");
+ break;
+ case 12:
+ printf("IEEE 802.1X/SUITE-B-192");
+ break;
+ case 13:
+ printf("FT/IEEE 802.1X/SHA-384");
+ break;
+ case 14:
+ printf("FILS/SHA-256");
+ break;
+ case 15:
+ printf("FILS/SHA-384");
+ break;
+ case 16:
+ printf("FT/FILS/SHA-256");
+ break;
+ case 17:
+ printf("FT/FILS/SHA-384");
+ break;
+ case 18:
+ printf("OWE");
+ break;
default:
printf("%.02x-%.02x-%.02x:%d",
data[0], data[1] ,data[2], data[3]);
case 1:
printf("OSEN");
break;
+ case 2:
+ printf("DPP");
+ break;
default:
printf("%.02x-%.02x-%.02x:%d",
data[0], data[1] ,data[2], data[3]);
_print_rsn_ie(defcipher, defauth, len, data, 1);
}
-static void print_rsn(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_rsn(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
print_rsn_ie("CCMP", "IEEE 802.1X", len, data);
}
-static void print_ht_capa(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_ht_capa(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf("\n");
print_ht_capability(data[0] | (data[1] << 8));
}
}
-static void print_interworking(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_interworking(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
/* See Section 7.3.2.92 in the 802.11u spec. */
printf("\n");
data[1], data[2], data[3], data[4], data[5], data[6]);
}
-static void print_11u_advert(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_11u_advert(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
/* See Section 7.3.2.93 in the 802.11u spec. */
/* TODO: This code below does not decode private protocol IDs */
}
}
-static void print_11u_rcon(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_11u_rcon(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
/* See Section 7.3.2.96 in the 802.11u spec. */
int idx = 0;
"below",
};
-static void print_ht_op(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_ht_op(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
static const char *protection[4] = {
"no",
printf("\t\t * PCO phase: %d\n", (data[5] & 0x8) >> 3);
}
-static void print_capabilities(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_capabilities(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
- int i, base, bit;
- bool first = true;
+ int i, base, bit, si_duration = 0, max_amsdu = 0;
+ bool s_psmp_support = false, is_vht_cap = false;
+ unsigned char *ie = ie_buffer->ie;
+ int ielen = ie_buffer->ielen;
+ while (ielen >= 2 && ielen >= ie[1]) {
+ if (ie[0] == 191) {
+ is_vht_cap = true;
+ break;
+ }
+ ielen -= ie[1] + 2;
+ ie += ie[1] + 2;
+ }
for (i = 0; i < len; i++) {
base = i * 8;
if (!(data[i] & (1 << bit)))
continue;
- if (!first)
- printf(",");
- else
- first = false;
+ printf("\n\t\t *");
#define CAPA(bit, name) case bit: printf(" " name); break
+/* if the capability 'cap' exists add 'val' to 'sum'
+ * otherwise print 'Reserved' */
+#define ADD_BIT_VAL(bit, cap, sum, val) case (bit): do { \
+ if (!(cap)) { \
+ printf(" Reserved"); \
+ break; \
+ } \
+ sum += val; \
+ break; \
+} while (0)
+
switch (bit + base) {
CAPA(0, "HT Information Exchange Supported");
CAPA(1, "reserved (On-demand Beacon)");
CAPA(3, "reserved (Wave Indication)");
CAPA(4, "PSMP Capability");
CAPA(5, "reserved (Service Interval Granularity)");
- CAPA(6, "S-PSMP Capability");
+
+ case 6:
+ s_psmp_support = true;
+ printf(" S-PSMP Capability");
+ break;
+
CAPA(7, "Event");
CAPA(8, "Diagnostics");
CAPA(9, "Multicast Diagnostics");
CAPA(38, "TDLS Prohibited");
CAPA(39, "TDLS Channel Switching Prohibited");
CAPA(40, "Reject Unadmitted Frame");
+
+ ADD_BIT_VAL(41, s_psmp_support, si_duration, 1);
+ ADD_BIT_VAL(42, s_psmp_support, si_duration, 2);
+ ADD_BIT_VAL(43, s_psmp_support, si_duration, 4);
+
CAPA(44, "Identifier Location");
CAPA(45, "U-APSD Coexistence");
CAPA(46, "WNM-Notification");
CAPA(47, "Reserved");
CAPA(48, "UTF-8 SSID");
+ CAPA(49, "QMFActivated");
+ CAPA(50, "QMFReconfigurationActivated");
+ CAPA(51, "Robust AV Streaming");
+ CAPA(52, "Advanced GCR");
+ CAPA(53, "Mesh GCR");
+ CAPA(54, "SCS");
+ CAPA(55, "QLoad Report");
+ CAPA(56, "Alternate EDCA");
+ CAPA(57, "Unprotected TXOP Negotiation");
+ CAPA(58, "Protected TXOP egotiation");
+ CAPA(59, "Reserved");
+ CAPA(60, "Protected QLoad Report");
+ CAPA(61, "TDLS Wider Bandwidth");
+ CAPA(62, "Operating Mode Notification");
+
+ ADD_BIT_VAL(63, is_vht_cap, max_amsdu, 1);
+ ADD_BIT_VAL(64, is_vht_cap, max_amsdu, 2);
+
+ CAPA(65, "Channel Schedule Management");
+ CAPA(66, "Geodatabase Inband Enabling Signal");
+ CAPA(67, "Network Channel Control");
+ CAPA(68, "White Space Map");
+ CAPA(69, "Channel Availability Query");
CAPA(70, "FTM Responder");
CAPA(71, "FTM Initiator");
+ CAPA(72, "Reserved");
+ CAPA(73, "Extended Spectrum Management Capable");
+ CAPA(74, "Reserved");
default:
printf(" %d", bit);
break;
}
+#undef ADD_BIT_VAL
#undef CAPA
}
}
+ if (s_psmp_support)
+ printf("\n\t\t * Service Interval Granularity is %d ms",
+ (si_duration + 1) * 5);
+
+ if (is_vht_cap) {
+ printf("\n\t\t * Max Number Of MSDUs In A-MSDU is ");
+ switch (max_amsdu) {
+ case 0:
+ printf("unlimited");
+ break;
+ case 1:
+ printf("32");
+ break;
+ case 2:
+ printf("16");
+ break;
+ case 3:
+ printf("8");
+ break;
+ default:
+ break;
+ }
+ }
+
printf("\n");
}
-static void print_tim(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_tim(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf(" DTIM Count %u DTIM Period %u Bitmap Control 0x%x "
"Bitmap[0] 0x%x",
printf("\n");
}
-static void print_ibssatim(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_ibssatim(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf(" %d TUs", (data[1] << 8) + data[0]);
}
-static void print_vht_capa(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_vht_capa(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf("\n");
print_vht_info(data[0] | (data[1] << 8) |
data + 4);
}
-static void print_vht_oper(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_vht_oper(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
const char *chandwidths[] = {
[0] = "20 or 40 MHz",
printf("\t\t * VHT basic MCS set: 0x%.2x%.2x\n", data[4], data[3]);
}
-static void print_obss_scan_params(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_obss_scan_params(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf("\n");
printf("\t\t * passive dwell: %d TUs\n", (data[1] << 8) | data[0]);
((data[13] << 8) | data[12]) / 100, ((data[13] << 8) | data[12]) % 100);
}
-static void print_secchan_offs(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_secchan_offs(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
if (data[0] < ARRAY_SIZE(ht_secondary_offset))
printf(" %s (%d)\n", ht_secondary_offset[data[0]], data[0]);
printf(" %d\n", data[0]);
}
-static void print_bss_load(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_bss_load(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf("\n");
printf("\t\t * station count: %d\n", (data[1] << 8) | data[0]);
printf("\t\t * available admission capacity: %d [*32us]\n", (data[4] << 8) | data[3]);
}
-static void print_mesh_conf(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_mesh_conf(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
printf("\n");
printf("\t\t * Active Path Selection Protocol ID: %d\n", data[0]);
struct ie_print {
const char *name;
- void (*print)(const uint8_t type, uint8_t len, const uint8_t *data);
+ void (*print)(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer);
uint8_t minlen, maxlen;
uint8_t flags;
};
-static void print_ie(const struct ie_print *p, const uint8_t type,
- uint8_t len, const uint8_t *data)
+static void print_ie(const struct ie_print *p, const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
int i;
return;
}
- p->print(type, len, data);
+ p->print(type, len, data, ie_buffer);
}
#define PRINT_IGN { \
[111] = { "802.11u Roaming Consortium", print_11u_rcon, 0, 255, BIT(PRINT_SCAN), },
};
-static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
print_rsn_ie("TKIP", "IEEE 802.1X", len, data);
}
-static void print_wifi_osen(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_wifi_osen(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
print_osen_ie("OSEN", "OSEN", len, data);
}
return false;
}
-static void print_wifi_wmm(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_wifi_wmm(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
int i;
}
}
-static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data)
+static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
bool first = true;
__u16 subtype, sublen;
[4] = { "WPS", print_wifi_wps, 0, 255, BIT(PRINT_SCAN), },
};
-static inline void print_p2p(const uint8_t type, uint8_t len, const uint8_t *data)
+static inline void print_p2p(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
bool first = true;
__u8 subtype;
printf("\t * malformed device info\n");
break;
}
- /* fall through for now */
+ /* fall through */
case 0x00: /* status */
case 0x01: /* minor reason */
case 0x03: /* device ID */
}
}
-static inline void print_hs20_ind(const uint8_t type, uint8_t len, const uint8_t *data)
+static inline void print_hs20_ind(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
{
/* I can't find the spec for this...just going off what wireshark uses. */
printf("\n");
printf("\t\tUnexpected length: %i\n", len);
}
+static void print_wifi_owe_tarns(const uint8_t type, uint8_t len,
+ const uint8_t *data,
+ const struct print_ies_data *ie_buffer)
+{
+ char mac_addr[20];
+ int ssid_len;
+
+ printf("\n");
+ if (len < 7)
+ return;
+
+ mac_addr_n2a(mac_addr, data);
+ printf("\t\tBSSID: %s\n", mac_addr);
+
+ ssid_len = data[6];
+ if (ssid_len > len - 7)
+ return;
+ printf("\t\tSSID: ");
+ print_ssid_escaped(ssid_len, data + 7);
+ printf("\n");
+
+ /* optional elements */
+ if (len >= ssid_len + 9) {
+ printf("\t\tBand Info: %u\n", data[ssid_len + 7]);
+ printf("\t\tChannel Info: %u\n", data[ssid_len + 8]);
+ }
+}
+
static const struct ie_print wfa_printers[] = {
[9] = { "P2P", print_p2p, 2, 255, BIT(PRINT_SCAN), },
[16] = { "HotSpot 2.0 Indication", print_hs20_ind, 1, 255, BIT(PRINT_SCAN), },
[18] = { "HotSpot 2.0 OSEN", print_wifi_osen, 1, 255, BIT(PRINT_SCAN), },
+ [28] = { "OWE Transition Mode", print_wifi_owe_tarns, 7, 255, BIT(PRINT_SCAN), },
};
static void print_vendor(unsigned char len, unsigned char *data,
if (data[3] < ARRAY_SIZE(wifiprinters) &&
wifiprinters[data[3]].name &&
wifiprinters[data[3]].flags & BIT(ptype)) {
- print_ie(&wifiprinters[data[3]], data[3], len - 4, data + 4);
+ print_ie(&wifiprinters[data[3]],
+ data[3], len - 4, data + 4,
+ NULL);
return;
}
if (!unknown)
if (data[3] < ARRAY_SIZE(wfa_printers) &&
wfa_printers[data[3]].name &&
wfa_printers[data[3]].flags & BIT(ptype)) {
- print_ie(&wfa_printers[data[3]], data[3], len - 4, data + 4);
+ print_ie(&wfa_printers[data[3]],
+ data[3], len - 4, data + 4,
+ NULL);
return;
}
if (!unknown)
void print_ies(unsigned char *ie, int ielen, bool unknown,
enum print_ie_type ptype)
{
+ struct print_ies_data ie_buffer = {
+ .ie = ie,
+ .ielen = ielen };
+
while (ielen >= 2 && ielen >= ie[1]) {
if (ie[0] < ARRAY_SIZE(ieprinters) &&
ieprinters[ie[0]].name &&
ieprinters[ie[0]].flags & BIT(ptype)) {
- print_ie(&ieprinters[ie[0]], ie[0], ie[1], ie + 2);
+ print_ie(&ieprinters[ie[0]],
+ ie[0], ie[1], ie + 2, &ie_buffer);
} else if (ie[0] == 221 /* vendor */) {
print_vendor(ie[1], ie + 2, unknown, ptype);
} else if (unknown) {
}
if (bss[NL80211_BSS_INFORMATION_ELEMENTS] && show--) {
- if (bss[NL80211_BSS_BEACON_IES])
+ struct nlattr *ies = bss[NL80211_BSS_INFORMATION_ELEMENTS];
+ struct nlattr *bcnies = bss[NL80211_BSS_BEACON_IES];
+
+ if (bss[NL80211_BSS_PRESP_DATA] ||
+ (bcnies && (nla_len(ies) != nla_len(bcnies) ||
+ memcmp(nla_data(ies), nla_data(bcnies),
+ nla_len(ies)))))
printf("\tInformation elements from Probe Response "
"frame:\n");
- print_ies(nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]),
- nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]),
+ print_ies(nla_data(ies), nla_len(ies),
params->unknown, params->type);
}
if (bss[NL80211_BSS_BEACON_IES] && show--) {
scan_params.type = PRINT_SCAN;
- register_handler(print_bss_handler,
- &scan_params);
+ register_handler(print_bss_handler, &scan_params);
return 0;
}
dump_argv[0] = argv[0];
return handle_cmd(state, id, dump_argc, dump_argv);
}
-TOPLEVEL(scan, "[-u] [freq <freq>*] [
ies <hex as 00:11:..>] [meshid <meshid>] [lowpri,flush,ap-force] [randomise[=<addr>/<mask>]] [ssid <ssid>*|passive]", 0, 0,
+TOPLEVEL(scan, "[-u] [freq <freq>*] [
duration <dur>] [ies <hex as 00:11:..>] [meshid <meshid>] [lowpri,flush,ap-force,duration-mandatory] [randomise[=<addr>/<mask>]] [ssid <ssid>*|passive]", 0, 0,
CIB_NETDEV, handle_scan_combined,
"Scan on the given frequencies and probe for the given SSIDs\n"
"(or wildcard if not given) unless passive scanning is requested.\n"
NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump,
"Dump the current scan results. If -u is specified, print unknown\n"
"data in scan results.");
-COMMAND(scan, trigger, "[freq <freq>*] [
ies <hex as 00:11:..>] [meshid <meshid>] [lowpri,flush,ap-force] [randomise[=<addr>/<mask>]] [ssid <ssid>*|passive]",
+COMMAND(scan, trigger, "[freq <freq>*] [
duration <dur>] [ies <hex as 00:11:..>] [meshid <meshid>] [lowpri,flush,ap-force,duration-mandatory] [randomise[=<addr>/<mask>]] [ssid <ssid>*|passive]",
NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan,
"Trigger a scan on the given frequencies with probing for the given\n"
- "SSIDs (or wildcard if not given) unless passive scanning is requested.");
+ "SSIDs (or wildcard if not given) unless passive scanning is requested.\n"
+ "Duration(in TUs), if specified, will be used to set dwell times.\n");
static int handle_scan_abort(struct nl80211_state *state,
projects / thirdparty / iw.git / blobdiff