nmcli: print the band of wifi access points

It's a valuable information for users, especially because the channel
number can be ambiguous.

Before:
$ nmcli device wifi
IN-USE  BSSID              SSID   MODE   CHAN  RATE         SIGNAL  BARS  SECURITY
        42:00:00:AA:DD:CC  test   Infra  44    1170 Mbit/s  85      ▂▄▆█  WPA2
        92:00:00:AB:DD:CC  guest  Infra  44    1170 Mbit/s  85      ▂▄▆█  WPA2

After:
$ nmcli device wifi
IN-USE  BSSID              SSID   MODE   BAND     CHAN  RATE         SIGNAL  BARS  SECURITY
        42:00:00:AA:DD:CC  test   Infra  5 GHz    44    1170 Mbit/s  85      ▂▄▆█  WPA2
        42:00:00:AB:DD:CC  guest  Infra  5 GHz    44    1170 Mbit/s  85      ▂▄▆█  WPA2
This commit is contained in:
Beniamino Galvani 2025-11-29 17:51:39 +01:00
parent 7879acea8f
commit c39b967a47
6 changed files with 2525 additions and 2056 deletions

View file

@ -299,7 +299,7 @@ test_wifi_ap_added_removed(void)
ret = g_dbus_proxy_call_sync(sinfo->proxy, ret = g_dbus_proxy_call_sync(sinfo->proxy,
"AddWifiAp", "AddWifiAp",
g_variant_new("(sss)", "wlan0", "test-ap", expected_bssid), g_variant_new("(sssu)", "wlan0", "test-ap", expected_bssid, 2412),
G_DBUS_CALL_FLAGS_NO_AUTO_START, G_DBUS_CALL_FLAGS_NO_AUTO_START,
3000, 3000,
NULL, NULL,

View file

@ -732,21 +732,22 @@ const NmcMetaGenericInfo *const nmc_fields_dev_wifi_list[] = {
NMC_META_GENERIC("BSSID"), /* 3 */ NMC_META_GENERIC("BSSID"), /* 3 */
NMC_META_GENERIC("MODE"), /* 4 */ NMC_META_GENERIC("MODE"), /* 4 */
NMC_META_GENERIC("CHAN"), /* 5 */ NMC_META_GENERIC("CHAN"), /* 5 */
NMC_META_GENERIC("FREQ"), /* 6 */ NMC_META_GENERIC("BAND"), /* 6 */
NMC_META_GENERIC("RATE"), /* 7 */ NMC_META_GENERIC("FREQ"), /* 7 */
NMC_META_GENERIC("BANDWIDTH"), /* 8 */ NMC_META_GENERIC("RATE"), /* 8 */
NMC_META_GENERIC("SIGNAL"), /* 9 */ NMC_META_GENERIC("BANDWIDTH"), /* 9 */
NMC_META_GENERIC("BARS"), /* 10 */ NMC_META_GENERIC("SIGNAL"), /* 10 */
NMC_META_GENERIC("SECURITY"), /* 11 */ NMC_META_GENERIC("BARS"), /* 11 */
NMC_META_GENERIC("WPA-FLAGS"), /* 12 */ NMC_META_GENERIC("SECURITY"), /* 12 */
NMC_META_GENERIC("RSN-FLAGS"), /* 13 */ NMC_META_GENERIC("WPA-FLAGS"), /* 13 */
NMC_META_GENERIC("DEVICE"), /* 14 */ NMC_META_GENERIC("RSN-FLAGS"), /* 14 */
NMC_META_GENERIC("ACTIVE"), /* 15 */ NMC_META_GENERIC("DEVICE"), /* 15 */
NMC_META_GENERIC("IN-USE"), /* 16 */ NMC_META_GENERIC("ACTIVE"), /* 16 */
NMC_META_GENERIC("DBUS-PATH"), /* 17 */ NMC_META_GENERIC("IN-USE"), /* 17 */
NMC_META_GENERIC("DBUS-PATH"), /* 18 */
NULL, NULL,
}; };
#define NMC_FIELDS_DEV_WIFI_LIST_COMMON "IN-USE,BSSID,SSID,MODE,CHAN,RATE,SIGNAL,BARS,SECURITY" #define NMC_FIELDS_DEV_WIFI_LIST_COMMON "IN-USE,BSSID,SSID,MODE,BAND,CHAN,RATE,SIGNAL,BARS,SECURITY"
#define NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST "NAME," NMC_FIELDS_DEV_WIFI_LIST_COMMON #define NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST "NAME," NMC_FIELDS_DEV_WIFI_LIST_COMMON
const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[] = { const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[] = {
@ -1323,6 +1324,7 @@ fill_output_access_point(NMAccessPoint *ap, const APInfo *info)
const char *bssid; const char *bssid;
NM80211Mode mode; NM80211Mode mode;
char *channel_str; char *channel_str;
const char *band_str;
char *freq_str; char *freq_str;
char *ssid_str = NULL; char *ssid_str = NULL;
char *ssid_hex_str = NULL; char *ssid_hex_str = NULL;
@ -1367,6 +1369,22 @@ fill_output_access_point(NMAccessPoint *ap, const APInfo *info)
rsn_flags_str = ap_wpa_rsn_flags_to_string(rsn_flags, NM_META_ACCESSOR_GET_TYPE_PRETTY); rsn_flags_str = ap_wpa_rsn_flags_to_string(rsn_flags, NM_META_ACCESSOR_GET_TYPE_PRETTY);
sig_bars = nmc_wifi_strength_bars(strength); sig_bars = nmc_wifi_strength_bars(strength);
switch (nm_utils_wifi_freq_to_band(freq)) {
case NM_WIFI_BAND_2_4_GHZ:
band_str = _("2.4 GHz");
break;
case NM_WIFI_BAND_5_GHZ:
band_str = _("5 GHz");
break;
case NM_WIFI_BAND_6_GHZ:
band_str = _("6 GHz");
break;
default:
case NM_WIFI_BAND_UNKNOWN:
band_str = "";
break;
}
security_str = g_string_new(NULL); security_str = g_string_new(NULL);
if (_ap_is_wep(ap)) { if (_ap_is_wep(ap)) {
@ -1415,18 +1433,19 @@ fill_output_access_point(NMAccessPoint *ap, const APInfo *info)
: mode == NM_802_11_MODE_MESH ? _("Mesh") : mode == NM_802_11_MODE_MESH ? _("Mesh")
: _("N/A")); : _("N/A"));
set_val_str(arr, 5, channel_str); set_val_str(arr, 5, channel_str);
set_val_str(arr, 6, freq_str); set_val_strc(arr, 6, band_str);
set_val_str(arr, 7, bitrate_str); set_val_str(arr, 7, freq_str);
set_val_str(arr, 8, bandwidth_str); set_val_str(arr, 8, bitrate_str);
set_val_str(arr, 9, strength_str); set_val_str(arr, 9, bandwidth_str);
set_val_strc(arr, 10, sig_bars); set_val_str(arr, 10, strength_str);
set_val_str(arr, 11, g_string_free(security_str, FALSE)); set_val_strc(arr, 11, sig_bars);
set_val_str(arr, 12, wpa_flags_str); set_val_str(arr, 12, g_string_free(security_str, FALSE));
set_val_str(arr, 13, rsn_flags_str); set_val_str(arr, 13, wpa_flags_str);
set_val_strc(arr, 14, info->device); set_val_str(arr, 14, rsn_flags_str);
set_val_strc(arr, 15, active ? _("yes") : _("no")); set_val_strc(arr, 15, info->device);
set_val_strc(arr, 16, active ? "*" : " "); set_val_strc(arr, 16, active ? _("yes") : _("no"));
set_val_strc(arr, 17, nm_object_get_path(NM_OBJECT(ap))); set_val_strc(arr, 17, active ? "*" : " ");
set_val_strc(arr, 18, nm_object_get_path(NM_OBJECT(ap)));
/* Set colors */ /* Set colors */
color = wifi_signal_to_color(strength); color = wifi_signal_to_color(strength);

View file

@ -136,18 +136,19 @@ Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje
o użyciu. o użyciu.
<<< <<<
size: 1423 size: 1566
location: src/tests/client/test-client.py:test_002()/7 location: src/tests/client/test-client.py:test_002()/7
cmd: $NMCLI -f AP -mode multiline d show wlan0 cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: C lang: C
returncode: 0 returncode: 0
stdout: 1271 bytes stdout: 1414 bytes
>>> >>>
AP[1].IN-USE: AP[1].IN-USE:
AP[1].BSSID: 60:B3:25:25:E2:C8 AP[1].BSSID: 60:B3:25:25:E2:C8
AP[1].SSID: wlan0-ap-3 AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infra AP[1].MODE: Infra
AP[1].CHAN: 1 AP[1].BAND: 6 GHz
AP[1].CHAN: 129
AP[1].RATE: 54 Mbit/s AP[1].RATE: 54 Mbit/s
AP[1].SIGNAL: 55 AP[1].SIGNAL: 55
AP[1].BARS: ** AP[1].BARS: **
@ -156,7 +157,8 @@ AP[2].IN-USE:
AP[2].BSSID: 90:B1:5F:9E:E0:E3 AP[2].BSSID: 90:B1:5F:9E:E0:E3
AP[2].SSID: wlan0-ap-1 AP[2].SSID: wlan0-ap-1
AP[2].MODE: Infra AP[2].MODE: Infra
AP[2].CHAN: 1 AP[2].BAND: 2.4 GHz
AP[2].CHAN: 6
AP[2].RATE: 54 Mbit/s AP[2].RATE: 54 Mbit/s
AP[2].SIGNAL: 44 AP[2].SIGNAL: 44
AP[2].BARS: ** AP[2].BARS: **
@ -165,25 +167,27 @@ AP[3].IN-USE:
AP[3].BSSID: 61:66:D2:E7:44:A2 AP[3].BSSID: 61:66:D2:E7:44:A2
AP[3].SSID: wlan0-ap-2 AP[3].SSID: wlan0-ap-2
AP[3].MODE: Infra AP[3].MODE: Infra
AP[3].CHAN: 1 AP[3].BAND: 5 GHz
AP[3].CHAN: 44
AP[3].RATE: 54 Mbit/s AP[3].RATE: 54 Mbit/s
AP[3].SIGNAL: 34 AP[3].SIGNAL: 34
AP[3].BARS: ** AP[3].BARS: **
AP[3].SECURITY: WPA1 WPA2 AP[3].SECURITY: WPA1 WPA2
<<< <<<
size: 1460 size: 1603
location: src/tests/client/test-client.py:test_002()/8 location: src/tests/client/test-client.py:test_002()/8
cmd: $NMCLI -f AP -mode multiline d show wlan0 cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: pl_PL.UTF-8 lang: pl_PL.UTF-8
returncode: 0 returncode: 0
stdout: 1298 bytes stdout: 1441 bytes
>>> >>>
AP[1].IN-USE: AP[1].IN-USE:
AP[1].BSSID: 60:B3:25:25:E2:C8 AP[1].BSSID: 60:B3:25:25:E2:C8
AP[1].SSID: wlan0-ap-3 AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infrastruktura AP[1].MODE: Infrastruktura
AP[1].CHAN: 1 AP[1].BAND: 6 GHz
AP[1].CHAN: 129
AP[1].RATE: 54Mb/s AP[1].RATE: 54Mb/s
AP[1].SIGNAL: 55 AP[1].SIGNAL: 55
AP[1].BARS: ** AP[1].BARS: **
@ -192,7 +196,8 @@ AP[2].IN-USE:
AP[2].BSSID: 90:B1:5F:9E:E0:E3 AP[2].BSSID: 90:B1:5F:9E:E0:E3
AP[2].SSID: wlan0-ap-1 AP[2].SSID: wlan0-ap-1
AP[2].MODE: Infrastruktura AP[2].MODE: Infrastruktura
AP[2].CHAN: 1 AP[2].BAND: 2.4 GHz
AP[2].CHAN: 6
AP[2].RATE: 54Mb/s AP[2].RATE: 54Mb/s
AP[2].SIGNAL: 44 AP[2].SIGNAL: 44
AP[2].BARS: ** AP[2].BARS: **
@ -201,19 +206,20 @@ AP[3].IN-USE:
AP[3].BSSID: 61:66:D2:E7:44:A2 AP[3].BSSID: 61:66:D2:E7:44:A2
AP[3].SSID: wlan0-ap-2 AP[3].SSID: wlan0-ap-2
AP[3].MODE: Infrastruktura AP[3].MODE: Infrastruktura
AP[3].CHAN: 1 AP[3].BAND: 5 GHz
AP[3].CHAN: 44
AP[3].RATE: 54Mb/s AP[3].RATE: 54Mb/s
AP[3].SIGNAL: 34 AP[3].SIGNAL: 34
AP[3].BARS: ** AP[3].BARS: **
AP[3].SECURITY: WPA1 WPA2 AP[3].SECURITY: WPA1 WPA2
<<< <<<
size: 1877 size: 2020
location: src/tests/client/test-client.py:test_002()/9 location: src/tests/client/test-client.py:test_002()/9
cmd: $NMCLI -f AP -mode multiline -p d show wlan0 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: C lang: C
returncode: 0 returncode: 0
stdout: 1722 bytes stdout: 1865 bytes
>>> >>>
=============================================================================== ===============================================================================
Device details (wlan0) Device details (wlan0)
@ -222,7 +228,8 @@ AP[1].IN-USE:
AP[1].BSSID: 60:B3:25:25:E2:C8 AP[1].BSSID: 60:B3:25:25:E2:C8
AP[1].SSID: wlan0-ap-3 AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infra AP[1].MODE: Infra
AP[1].CHAN: 1 AP[1].BAND: 6 GHz
AP[1].CHAN: 129
AP[1].RATE: 54 Mbit/s AP[1].RATE: 54 Mbit/s
AP[1].SIGNAL: 55 AP[1].SIGNAL: 55
AP[1].BARS: ** AP[1].BARS: **
@ -232,7 +239,8 @@ AP[2].IN-USE:
AP[2].BSSID: 90:B1:5F:9E:E0:E3 AP[2].BSSID: 90:B1:5F:9E:E0:E3
AP[2].SSID: wlan0-ap-1 AP[2].SSID: wlan0-ap-1
AP[2].MODE: Infra AP[2].MODE: Infra
AP[2].CHAN: 1 AP[2].BAND: 2.4 GHz
AP[2].CHAN: 6
AP[2].RATE: 54 Mbit/s AP[2].RATE: 54 Mbit/s
AP[2].SIGNAL: 44 AP[2].SIGNAL: 44
AP[2].BARS: ** AP[2].BARS: **
@ -242,7 +250,8 @@ AP[3].IN-USE:
AP[3].BSSID: 61:66:D2:E7:44:A2 AP[3].BSSID: 61:66:D2:E7:44:A2
AP[3].SSID: wlan0-ap-2 AP[3].SSID: wlan0-ap-2
AP[3].MODE: Infra AP[3].MODE: Infra
AP[3].CHAN: 1 AP[3].BAND: 5 GHz
AP[3].CHAN: 44
AP[3].RATE: 54 Mbit/s AP[3].RATE: 54 Mbit/s
AP[3].SIGNAL: 34 AP[3].SIGNAL: 34
AP[3].BARS: ** AP[3].BARS: **
@ -250,12 +259,12 @@ AP[3].SECURITY: WPA1 WPA2
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
<<< <<<
size: 1922 size: 2065
location: src/tests/client/test-client.py:test_002()/10 location: src/tests/client/test-client.py:test_002()/10
cmd: $NMCLI -f AP -mode multiline -p d show wlan0 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: pl_PL.UTF-8 lang: pl_PL.UTF-8
returncode: 0 returncode: 0
stdout: 1756 bytes stdout: 1899 bytes
>>> >>>
=============================================================================== ===============================================================================
Informacje o urządzeniu (wlan0) Informacje o urządzeniu (wlan0)
@ -264,7 +273,8 @@ AP[1].IN-USE:
AP[1].BSSID: 60:B3:25:25:E2:C8 AP[1].BSSID: 60:B3:25:25:E2:C8
AP[1].SSID: wlan0-ap-3 AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infrastruktura AP[1].MODE: Infrastruktura
AP[1].CHAN: 1 AP[1].BAND: 6 GHz
AP[1].CHAN: 129
AP[1].RATE: 54Mb/s AP[1].RATE: 54Mb/s
AP[1].SIGNAL: 55 AP[1].SIGNAL: 55
AP[1].BARS: ** AP[1].BARS: **
@ -274,7 +284,8 @@ AP[2].IN-USE:
AP[2].BSSID: 90:B1:5F:9E:E0:E3 AP[2].BSSID: 90:B1:5F:9E:E0:E3
AP[2].SSID: wlan0-ap-1 AP[2].SSID: wlan0-ap-1
AP[2].MODE: Infrastruktura AP[2].MODE: Infrastruktura
AP[2].CHAN: 1 AP[2].BAND: 2.4 GHz
AP[2].CHAN: 6
AP[2].RATE: 54Mb/s AP[2].RATE: 54Mb/s
AP[2].SIGNAL: 44 AP[2].SIGNAL: 44
AP[2].BARS: ** AP[2].BARS: **
@ -284,7 +295,8 @@ AP[3].IN-USE:
AP[3].BSSID: 61:66:D2:E7:44:A2 AP[3].BSSID: 61:66:D2:E7:44:A2
AP[3].SSID: wlan0-ap-2 AP[3].SSID: wlan0-ap-2
AP[3].MODE: Infrastruktura AP[3].MODE: Infrastruktura
AP[3].CHAN: 1 AP[3].BAND: 5 GHz
AP[3].CHAN: 44
AP[3].RATE: 54Mb/s AP[3].RATE: 54Mb/s
AP[3].SIGNAL: 34 AP[3].SIGNAL: 34
AP[3].BARS: ** AP[3].BARS: **
@ -292,18 +304,19 @@ AP[3].SECURITY: WPA1 WPA2
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
<<< <<<
size: 670 size: 726
location: src/tests/client/test-client.py:test_002()/11 location: src/tests/client/test-client.py:test_002()/11
cmd: $NMCLI -f AP -mode multiline -t d show wlan0 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: C lang: C
returncode: 0 returncode: 0
stdout: 515 bytes stdout: 571 bytes
>>> >>>
AP[1].IN-USE: AP[1].IN-USE:
AP[1].BSSID:60:B3:25:25:E2:C8 AP[1].BSSID:60:B3:25:25:E2:C8
AP[1].SSID:wlan0-ap-3 AP[1].SSID:wlan0-ap-3
AP[1].MODE:Infra AP[1].MODE:Infra
AP[1].CHAN:1 AP[1].BAND:6 GHz
AP[1].CHAN:129
AP[1].RATE:54 Mbit/s AP[1].RATE:54 Mbit/s
AP[1].SIGNAL:55 AP[1].SIGNAL:55
AP[1].BARS:** AP[1].BARS:**
@ -312,7 +325,8 @@ AP[2].IN-USE:
AP[2].BSSID:90:B1:5F:9E:E0:E3 AP[2].BSSID:90:B1:5F:9E:E0:E3
AP[2].SSID:wlan0-ap-1 AP[2].SSID:wlan0-ap-1
AP[2].MODE:Infra AP[2].MODE:Infra
AP[2].CHAN:1 AP[2].BAND:2.4 GHz
AP[2].CHAN:6
AP[2].RATE:54 Mbit/s AP[2].RATE:54 Mbit/s
AP[2].SIGNAL:44 AP[2].SIGNAL:44
AP[2].BARS:** AP[2].BARS:**
@ -321,25 +335,27 @@ AP[3].IN-USE:
AP[3].BSSID:61:66:D2:E7:44:A2 AP[3].BSSID:61:66:D2:E7:44:A2
AP[3].SSID:wlan0-ap-2 AP[3].SSID:wlan0-ap-2
AP[3].MODE:Infra AP[3].MODE:Infra
AP[3].CHAN:1 AP[3].BAND:5 GHz
AP[3].CHAN:44
AP[3].RATE:54 Mbit/s AP[3].RATE:54 Mbit/s
AP[3].SIGNAL:34 AP[3].SIGNAL:34
AP[3].BARS:** AP[3].BARS:**
AP[3].SECURITY:WPA1 WPA2 AP[3].SECURITY:WPA1 WPA2
<<< <<<
size: 707 size: 763
location: src/tests/client/test-client.py:test_002()/12 location: src/tests/client/test-client.py:test_002()/12
cmd: $NMCLI -f AP -mode multiline -t d show wlan0 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: pl_PL.UTF-8 lang: pl_PL.UTF-8
returncode: 0 returncode: 0
stdout: 542 bytes stdout: 598 bytes
>>> >>>
AP[1].IN-USE: AP[1].IN-USE:
AP[1].BSSID:60:B3:25:25:E2:C8 AP[1].BSSID:60:B3:25:25:E2:C8
AP[1].SSID:wlan0-ap-3 AP[1].SSID:wlan0-ap-3
AP[1].MODE:Infrastruktura AP[1].MODE:Infrastruktura
AP[1].CHAN:1 AP[1].BAND:6 GHz
AP[1].CHAN:129
AP[1].RATE:54Mb/s AP[1].RATE:54Mb/s
AP[1].SIGNAL:55 AP[1].SIGNAL:55
AP[1].BARS:** AP[1].BARS:**
@ -348,7 +364,8 @@ AP[2].IN-USE:
AP[2].BSSID:90:B1:5F:9E:E0:E3 AP[2].BSSID:90:B1:5F:9E:E0:E3
AP[2].SSID:wlan0-ap-1 AP[2].SSID:wlan0-ap-1
AP[2].MODE:Infrastruktura AP[2].MODE:Infrastruktura
AP[2].CHAN:1 AP[2].BAND:2.4 GHz
AP[2].CHAN:6
AP[2].RATE:54Mb/s AP[2].RATE:54Mb/s
AP[2].SIGNAL:44 AP[2].SIGNAL:44
AP[2].BARS:** AP[2].BARS:**
@ -357,131 +374,132 @@ AP[3].IN-USE:
AP[3].BSSID:61:66:D2:E7:44:A2 AP[3].BSSID:61:66:D2:E7:44:A2
AP[3].SSID:wlan0-ap-2 AP[3].SSID:wlan0-ap-2
AP[3].MODE:Infrastruktura AP[3].MODE:Infrastruktura
AP[3].CHAN:1 AP[3].BAND:5 GHz
AP[3].CHAN:44
AP[3].RATE:54Mb/s AP[3].RATE:54Mb/s
AP[3].SIGNAL:34 AP[3].SIGNAL:34
AP[3].BARS:** AP[3].BARS:**
AP[3].SECURITY:WPA1 WPA2 AP[3].SECURITY:WPA1 WPA2
<<< <<<
size: 530 size: 566
location: src/tests/client/test-client.py:test_002()/13 location: src/tests/client/test-client.py:test_002()/13
cmd: $NMCLI -f AP -mode tabular d show wlan0 cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: C lang: C
returncode: 0 returncode: 0
stdout: 380 bytes stdout: 416 bytes
>>> >>>
NAME IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY NAME IN-USE BSSID SSID MODE BAND CHAN RATE SIGNAL BARS SECURITY
AP[1] 60:B3:25:25:E2:C8 wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA3 AP[1] 60:B3:25:25:E2:C8 wlan0-ap-3 Infra 6 GHz 129 54 Mbit/s 55 ** WPA3
AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1 AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infra 2.4 GHz 6 54 Mbit/s 44 ** WPA1
AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2 AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infra 5 GHz 44 54 Mbit/s 34 ** WPA1 WPA2
<<< <<<
size: 574 size: 610
location: src/tests/client/test-client.py:test_002()/14 location: src/tests/client/test-client.py:test_002()/14
cmd: $NMCLI -f AP -mode tabular d show wlan0 cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: pl_PL.UTF-8 lang: pl_PL.UTF-8
returncode: 0 returncode: 0
stdout: 414 bytes stdout: 450 bytes
>>> >>>
NAME IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY NAME IN-USE BSSID SSID MODE BAND CHAN RATE SIGNAL BARS SECURITY
AP[1] 60:B3:25:25:E2:C8 wlan0-ap-3 Infrastruktura 1 54Mb/s 55 ** WPA3 AP[1] 60:B3:25:25:E2:C8 wlan0-ap-3 Infrastruktura 6 GHz 129 54Mb/s 55 ** WPA3
AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infrastruktura 1 54Mb/s 44 ** WPA1 AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infrastruktura 2.4 GHz 6 54Mb/s 44 ** WPA1
AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infrastruktura 1 54Mb/s 34 ** WPA1 WPA2 AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infrastruktura 5 GHz 44 54Mb/s 34 ** WPA1 WPA2
<<< <<<
size: 708 size: 753
location: src/tests/client/test-client.py:test_002()/15 location: src/tests/client/test-client.py:test_002()/15
cmd: $NMCLI -f AP -mode tabular -p d show wlan0 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: C lang: C
returncode: 0 returncode: 0
stdout: 555 bytes stdout: 600 bytes
>>> >>>
========================== ==========================
Device details (wlan0) Device details (wlan0)
========================== ==========================
NAME IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY NAME IN-USE BSSID SSID MODE BAND CHAN RATE SIGNAL BARS SECURITY
----------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------
AP[1] 60:B3:25:25:E2:C8 wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA3 AP[1] 60:B3:25:25:E2:C8 wlan0-ap-3 Infra 6 GHz 129 54 Mbit/s 55 ** WPA3
AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1 AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infra 2.4 GHz 6 54 Mbit/s 44 ** WPA1
AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2 AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infra 5 GHz 44 54 Mbit/s 34 ** WPA1 WPA2
<<< <<<
size: 788 size: 833
location: src/tests/client/test-client.py:test_002()/16 location: src/tests/client/test-client.py:test_002()/16
cmd: $NMCLI -f AP -mode tabular -p d show wlan0 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: pl_PL.UTF-8 lang: pl_PL.UTF-8
returncode: 0 returncode: 0
stdout: 625 bytes stdout: 670 bytes
>>> >>>
=================================== ===================================
Informacje o urządzeniu (wlan0) Informacje o urządzeniu (wlan0)
=================================== ===================================
NAME IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY NAME IN-USE BSSID SSID MODE BAND CHAN RATE SIGNAL BARS SECURITY
------------------------------------------------------------------------------------------------------ ---------------------------------------------------------------------------------------------------------------
AP[1] 60:B3:25:25:E2:C8 wlan0-ap-3 Infrastruktura 1 54Mb/s 55 ** WPA3 AP[1] 60:B3:25:25:E2:C8 wlan0-ap-3 Infrastruktura 6 GHz 129 54Mb/s 55 ** WPA3
AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infrastruktura 1 54Mb/s 44 ** WPA1 AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infrastruktura 2.4 GHz 6 54Mb/s 44 ** WPA1
AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infrastruktura 1 54Mb/s 34 ** WPA1 WPA2 AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infrastruktura 5 GHz 44 54Mb/s 34 ** WPA1 WPA2
<<< <<<
size: 377 size: 400
location: src/tests/client/test-client.py:test_002()/17 location: src/tests/client/test-client.py:test_002()/17
cmd: $NMCLI -f AP -mode tabular -t d show wlan0 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: C lang: C
returncode: 0 returncode: 0
stdout: 224 bytes stdout: 247 bytes
>>> >>>
AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA3 AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:** :WPA3
AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infra:1:54 Mbit/s:44:** :WPA1 AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:44:** :WPA1
AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infra:1:54 Mbit/s:34:** :WPA1 WPA2 AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:34:** :WPA1 WPA2
<<< <<<
size: 414 size: 437
location: src/tests/client/test-client.py:test_002()/18 location: src/tests/client/test-client.py:test_002()/18
cmd: $NMCLI -f AP -mode tabular -t d show wlan0 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: pl_PL.UTF-8 lang: pl_PL.UTF-8
returncode: 0 returncode: 0
stdout: 251 bytes stdout: 274 bytes
>>> >>>
AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infrastruktura:1:54Mb/s:55:** :WPA3 AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infrastruktura:6 GHz:129:54Mb/s:55:** :WPA3
AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infrastruktura:1:54Mb/s:44:** :WPA1 AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54Mb/s:44:** :WPA1
AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infrastruktura:1:54Mb/s:34:** :WPA1 WPA2 AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infrastruktura:5 GHz:44:54Mb/s:34:** :WPA1 WPA2
<<< <<<
size: 2049 size: 2109
location: src/tests/client/test-client.py:test_002()/19 location: src/tests/client/test-client.py:test_002()/19
cmd: $NMCLI -f ALL d wifi cmd: $NMCLI -f ALL d wifi
lang: C lang: C
returncode: 0 returncode: 0
stdout: 1917 bytes stdout: 1977 bytes
>>> >>>
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH NAME SSID SSID-HEX BSSID MODE CHAN BAND FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infra 1 2412 MHz 54 Mbit/s 40 MHz 55 ** WPA3 (none) pair_tkip pair_ccmp group_tkip group_ccmp sae wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infra 129 6 GHz 6595 MHz 54 Mbit/s 40 MHz 55 ** WPA3 (none) pair_tkip pair_ccmp group_tkip group_ccmp sae wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infra 1 2412 MHz 54 Mbit/s 40 MHz 44 ** WPA1 pair_tkip pair_ccmp group_tkip group_ccmp psk (none) wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infra 6 2.4 GHz 2437 MHz 54 Mbit/s 40 MHz 44 ** WPA1 pair_tkip pair_ccmp group_tkip group_ccmp psk (none) wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infra 1 2412 MHz 54 Mbit/s 40 MHz 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infra 44 5 GHz 5220 MHz 54 Mbit/s 40 MHz 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH NAME SSID SSID-HEX BSSID MODE CHAN BAND FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infra 1 2412 MHz 54 Mbit/s 40 MHz 38 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infra 1 2.4 GHz 2412 MHz 54 Mbit/s 40 MHz 38 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH NAME SSID SSID-HEX BSSID MODE CHAN BAND FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
<<< <<<
size: 2125 size: 2185
location: src/tests/client/test-client.py:test_002()/20 location: src/tests/client/test-client.py:test_002()/20
cmd: $NMCLI -f ALL d wifi cmd: $NMCLI -f ALL d wifi
lang: pl_PL.UTF-8 lang: pl_PL.UTF-8
returncode: 0 returncode: 0
stdout: 1983 bytes stdout: 2043 bytes
>>> >>>
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH NAME SSID SSID-HEX BSSID MODE CHAN BAND FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infrastruktura 1 2412MHz 54Mb/s 40MHz 55 ** WPA3 (brak) pair_tkip pair_ccmp group_tkip group_ccmp sae wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infrastruktura 129 6 GHz 6595MHz 54Mb/s 40MHz 55 ** WPA3 (brak) pair_tkip pair_ccmp group_tkip group_ccmp sae wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infrastruktura 1 2412MHz 54Mb/s 40MHz 44 ** WPA1 pair_tkip pair_ccmp group_tkip group_ccmp psk (brak) wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infrastruktura 6 2.4 GHz 2437MHz 54Mb/s 40MHz 44 ** WPA1 pair_tkip pair_ccmp group_tkip group_ccmp psk (brak) wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infrastruktura 1 2412MHz 54Mb/s 40MHz 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infrastruktura 44 5 GHz 5220MHz 54Mb/s 40MHz 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH NAME SSID SSID-HEX BSSID MODE CHAN BAND FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infrastruktura 1 2412MHz 54Mb/s 40MHz 38 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infrastruktura 1 2.4 GHz 2412MHz 54Mb/s 40MHz 38 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH NAME SSID SSID-HEX BSSID MODE CHAN BAND FREQ RATE BANDWIDTH SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
<<< <<<
size: 245 size: 245

File diff suppressed because it is too large Load diff

View file

@ -1557,9 +1557,9 @@ class TestNmcli(unittest.TestCase):
# does not enforce the ifnames are unique. # does not enforce the ifnames are unique.
self.ctx.srv.op_AddObj("WifiDevice", ident="wlan1/x", iface="wlan1") self.ctx.srv.op_AddObj("WifiDevice", ident="wlan1/x", iface="wlan1")
self.ctx.srv.op_AddObj("WifiAp", device="wlan0", rsnf=0x0) self.ctx.srv.op_AddObj("WifiAp", device="wlan0", rsnf=0x0, freq=2437)
self.ctx.srv.op_AddObj("WifiAp", device="wlan0") self.ctx.srv.op_AddObj("WifiAp", device="wlan0", freq=5220)
NM_AP_FLAGS = getattr(NM, "80211ApSecurityFlags") NM_AP_FLAGS = getattr(NM, "80211ApSecurityFlags")
rsnf = 0x0 rsnf = 0x0
@ -1568,7 +1568,7 @@ class TestNmcli(unittest.TestCase):
rsnf = rsnf | NM_AP_FLAGS.GROUP_TKIP rsnf = rsnf | NM_AP_FLAGS.GROUP_TKIP
rsnf = rsnf | NM_AP_FLAGS.GROUP_CCMP rsnf = rsnf | NM_AP_FLAGS.GROUP_CCMP
rsnf = rsnf | NM_AP_FLAGS.KEY_MGMT_SAE rsnf = rsnf | NM_AP_FLAGS.KEY_MGMT_SAE
self.ctx.srv.op_AddObj("WifiAp", device="wlan0", wpaf=0x0, rsnf=rsnf) self.ctx.srv.op_AddObj("WifiAp", device="wlan0", wpaf=0x0, rsnf=rsnf, freq=6595)
self.ctx.srv.op_AddObj("WifiAp", device="wlan1") self.ctx.srv.op_AddObj("WifiAp", device="wlan1")

View file

@ -2069,10 +2069,10 @@ class NetworkManager(ExportedObj):
d = self.find_device_first(path=path, require=TestError) d = self.find_device_first(path=path, require=TestError)
self.remove_device(d) self.remove_device(d)
@dbus.service.method(IFACE_TEST, in_signature="sss", out_signature="o") @dbus.service.method(IFACE_TEST, in_signature="sssu", out_signature="o")
def AddWifiAp(self, ident, ssid, bssid): def AddWifiAp(self, ident, ssid, bssid, freq):
d = self.find_device_first(ident=ident, require=TestError) d = self.find_device_first(ident=ident, require=TestError)
ap = WifiAp(ssid, bssid) ap = WifiAp(ssid, bssid=bssid, freq=freq)
return ExportedObj.to_path(d.add_ap(ap)) return ExportedObj.to_path(d.add_ap(ap))
@dbus.service.method(IFACE_TEST, in_signature="so", out_signature="") @dbus.service.method(IFACE_TEST, in_signature="so", out_signature="")