fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 14:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: add PHYS_PORT_ID property to devices

Browse source 
The physical-port-id property was added to libnm (libnm-glib) in commit
47cc8b25f2.

(cherry picked from commit 8252553615)
This commit is contained in:
Jiří Klimeš 2015-04-14 12:08:15 +02:00
parent b6bc5641ed
commit dd0dde169f
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clients/cli/devices.c
View file

@ -72,13 +72,15 @@ static NmcOutputField nmc_fields_dev_show_general[] = {
{"NM-MANAGED", N_("NM-MANAGED"), 15}, /* 15 */
{"AUTOCONNECT", N_("AUTOCONNECT"), 15}, /* 16 */
{"FIRMWARE-MISSING", N_("FIRMWARE-MISSING"), 18}, /* 17 */
{"CONNECTION", N_("CONNECTION"), 20}, /* 18 */
{"CON-UUID", N_("CON-UUID"), 38}, /* 19 */
{"CON-PATH", N_("CON-PATH"), 51}, /* 20 */
{"PHYS-PORT-ID", N_("PHYS-PORT-ID"), 18}, /* 18 */
{"CONNECTION", N_("CONNECTION"), 20}, /* 19 */
{"CON-UUID", N_("CON-UUID"), 38}, /* 20 */
{"CON-PATH", N_("CON-PATH"), 51}, /* 21 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_DEV_SHOW_GENERAL_ALL "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,DRIVER-VERSION,FIRMWARE-VERSION,HWADDR,MTU,STATE,REASON,"\
"UDI,IP-IFACE,IS-SOFTWARE,NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,CONNECTION,CON-UUID,CON-PATH"
"UDI,IP-IFACE,IS-SOFTWARE,NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,PHYS-PORT-ID,"\
"CONNECTION,CON-UUID,CON-PATH"
#define NMC_FIELDS_DEV_SHOW_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE"
/* Available fields for 'device show' - CONNECTIONS part */
@ -849,9 +851,10 @@ show_device_info (NMDevice *device, NmCli *nmc)
set_val_strc (arr, 15, nm_device_get_managed (device) ? _("yes") : _("no"));
set_val_strc (arr, 16, nm_device_get_autoconnect (device) ? _("yes") : _("no"));
set_val_strc (arr, 17, nm_device_get_firmware_missing (device) ? _("yes") : _("no"));
set_val_strc (arr, 18, get_active_connection_id (device));
set_val_strc (arr, 19, acon ? nm_active_connection_get_uuid (acon) : NULL);
set_val_strc (arr, 20, acon ? nm_object_get_path (NM_OBJECT (acon)) : NULL);
set_val_strc (arr, 18, nm_device_get_physical_port_id (device));
set_val_strc (arr, 19, get_active_connection_id (device));
set_val_strc (arr, 20, acon ? nm_active_connection_get_uuid (acon) : NULL);
set_val_strc (arr, 21, acon ? nm_object_get_path (NM_OBJECT (acon)) : NULL);
g_ptr_array_add (nmc->output_data, arr);
print_data (nmc); /* Print all data */