colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: change "IN-USE" property to only honor the exact access point

Browse Source 
On the D-Bus API, the current access point is referred exactly, by its
D-Bus path. Likewise, in libnm's NMClient cache, the access point
instance is unique in representing the D-Bus object (meaning, we
can directly use pointer equality).

Let's not compare the active AP based on the BSSID. It can happen
that the scan list contains the same BSSID multiple times (for example
on different bands). In that case, the output should only highlight
one AP as in-use:

  $ nmcli device wifi list
  IN-USE  BSSID              SSID              MODE   CHAN  RATE        SIGNAL  BARS  SECURITY
  *       E4:0f:4b:2a:c3:d1  MYSSID1           Infra  6     270 Mbit/s  100     ▂▄▆█  WPA2
  *       E4:0f:4b:2a:c3:d1  MYSSID1           Infra  6     270 Mbit/s  87      ▂▄▆█  WPA2
This commit is contained in:
Thomas Haller
2022-02-28 18:49:25 +01:00
parent caf50b96bd
commit dd42af636a
1 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/nmcli/devices.c
View File

@@ -1249,12 +1249,12 @@ sort_access_points(const GPtrArray *aps)
} }
typedef struct { typedef struct {
NmCli *nmc; NmCli *nmc;
int index; int index;
guint32 output_flags; guint32 output_flags;
const char *active_bssid; NMAccessPoint *active_ap;
const char *device; const char *device;
GPtrArray *output_data; GPtrArray *output_data;
} APInfo; } APInfo;
static void static void
@@ -1263,7 +1263,7 @@ fill_output_access_point(gpointer data, gpointer user_data)
NMAccessPoint *ap = NM_ACCESS_POINT(data); NMAccessPoint *ap = NM_ACCESS_POINT(data);
APInfo *info = user_data; APInfo *info = user_data;
NmcOutputField *arr; NmcOutputField *arr;
gboolean active = FALSE; gboolean active;
NM80211ApFlags flags; NM80211ApFlags flags;
NM80211ApSecurityFlags wpa_flags, rsn_flags; NM80211ApSecurityFlags wpa_flags, rsn_flags;
guint32 freq, bitrate; guint32 freq, bitrate;
@@ -1284,11 +1284,7 @@ fill_output_access_point(gpointer data, gpointer user_data)
const char *sig_bars; const char *sig_bars;
NMMetaColor color; NMMetaColor color;
if (info->active_bssid) { active = (info->active_ap == ap);
const char *current_bssid = nm_access_point_get_bssid(ap);
if (current_bssid && !strcmp(current_bssid, info->active_bssid))
active = TRUE;
}
/* Get AP properties */ /* Get AP properties */
flags = nm_access_point_get_flags(ap); flags = nm_access_point_get_flags(ap);
@@ -1679,18 +1675,14 @@ show_device_info(NMDevice *device, NmCli *nmc)
/* Wireless specific information */ /* Wireless specific information */
if ((NM_IS_DEVICE_WIFI(device))) { if ((NM_IS_DEVICE_WIFI(device))) {
NMAccessPoint *active_ap = NULL;
const char *active_bssid = NULL;
/* section AP */ /* section AP */
if (!g_ascii_strcasecmp(nmc_fields_dev_show_sections[section_idx]->name, if (!g_ascii_strcasecmp(nmc_fields_dev_show_sections[section_idx]->name,
nmc_fields_dev_show_sections[4]->name)) { nmc_fields_dev_show_sections[4]->name)) {
NMAccessPoint *active_ap = NULL;
NMC_OUTPUT_DATA_DEFINE_SCOPED(out); NMC_OUTPUT_DATA_DEFINE_SCOPED(out);
if (state == NM_DEVICE_STATE_ACTIVATED) { if (state == NM_DEVICE_STATE_ACTIVATED)
active_ap = nm_device_wifi_get_active_access_point(NM_DEVICE_WIFI(device)); active_ap = nm_device_wifi_get_active_access_point(NM_DEVICE_WIFI(device));
active_bssid = active_ap ? nm_access_point_get_bssid(active_ap) : NULL;
}
tmpl = (const NMMetaAbstractInfo *const *) nmc_fields_dev_wifi_list; tmpl = (const NMMetaAbstractInfo *const *) nmc_fields_dev_wifi_list;
out_indices = out_indices =
@@ -1708,7 +1700,7 @@ show_device_info(NMDevice *device, NmCli *nmc)
.nmc = nmc, .nmc = nmc,
.index = 1, .index = 1,
.output_flags = NMC_OF_FLAG_SECTION_PREFIX, .output_flags = NMC_OF_FLAG_SECTION_PREFIX,
.active_bssid = active_bssid, .active_ap = active_ap,
.device = nm_device_get_iface(device), .device = nm_device_get_iface(device),
.output_data = out.output_data, .output_data = out.output_data,
}; };
@@ -2991,14 +2983,11 @@ find_ap_on_device(NMDevice *device, const char *bssid, const char *ssid, gboolea
static void static void
show_access_point_info(NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out) show_access_point_info(NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out)
{ {
NMAccessPoint *active_ap = NULL; NMAccessPoint *active_ap = NULL;
const char *active_bssid = NULL;
NmcOutputField *arr; NmcOutputField *arr;
if (nm_device_get_state(NM_DEVICE(wifi)) == NM_DEVICE_STATE_ACTIVATED) { if (nm_device_get_state(NM_DEVICE(wifi)) == NM_DEVICE_STATE_ACTIVATED)
active_ap = nm_device_wifi_get_active_access_point(wifi); active_ap = nm_device_wifi_get_active_access_point(wifi);
active_bssid = active_ap ? nm_access_point_get_bssid(active_ap) : NULL;
}
arr = nmc_dup_fields_array((const NMMetaAbstractInfo *const *) nmc_fields_dev_wifi_list, arr = nmc_dup_fields_array((const NMMetaAbstractInfo *const *) nmc_fields_dev_wifi_list,
NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES);
@@ -3010,7 +2999,7 @@ show_access_point_info(NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out)
.nmc = nmc, .nmc = nmc,
.index = 1, .index = 1,
.output_flags = 0, .output_flags = 0,
.active_bssid = active_bssid, .active_ap = active_ap,
.device = nm_device_get_iface(NM_DEVICE(wifi)), .device = nm_device_get_iface(NM_DEVICE(wifi)),
.output_data = out->output_data, .output_data = out->output_data,
}; };
@@ -3064,7 +3053,6 @@ wifi_print_aps(NMDeviceWifi *wifi,
.nmc = nmc, .nmc = nmc,
.index = 1, .index = 1,
.output_flags = 0, .output_flags = 0,
.active_bssid = NULL,
.device = nm_device_get_iface(NM_DEVICE(wifi)), .device = nm_device_get_iface(NM_DEVICE(wifi)),
.output_data = out.output_data, .output_data = out.output_data,
}; };