if (suites & IWINFO_KMGMT_8021x)
pos += sprintf(pos, "802.1X/");
+ if (suites & IWINFO_KMGMT_SAE)
+ pos += sprintf(pos, "SAE/");
+
+ if (suites & IWINFO_KMGMT_OWE)
+ pos += sprintf(pos, "OWE/");
+
if (!suites || (suites & IWINFO_KMGMT_NONE))
pos += sprintf(pos, "NONE/");
else if (c->wpa_version)
{
switch (c->wpa_version) {
+ case 4:
+ sprintf(desc, "WPA3 %s (%s)",
+ iwinfo_crypto_print_suites(c->auth_suites),
+ iwinfo_crypto_print_ciphers(
+ c->pair_ciphers | c->group_ciphers));
+ break;
+
case 3:
sprintf(desc, "mixed WPA/WPA2 %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers(
- c->pair_ciphers & c->group_ciphers));
+ c->pair_ciphers | c->group_ciphers));
break;
case 2:
sprintf(desc, "WPA2 %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers(
- c->pair_ciphers & c->group_ciphers));
+ c->pair_ciphers | c->group_ciphers));
break;
case 1:
sprintf(desc, "WPA %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers(
- c->pair_ciphers & c->group_ciphers));
+ c->pair_ciphers | c->group_ciphers));
break;
}
}
set_rateinfo(L, &e->rx_rate, true);
set_rateinfo(L, &e->tx_rate, false);
+ if (e->thr) {
+ lua_pushnumber(L, e->thr);
+ lua_setfield(L, -2, "expected_throughput");
+ }
+
lua_setfield(L, -2, macstr);
}
}
lua_pushboolean(L, hwmodes & IWINFO_80211_AC);
lua_setfield(L, -2, "ac");
+ lua_pushboolean(L, hwmodes & IWINFO_80211_AD);
+ lua_setfield(L, -2, "ad");
+
return 1;
}