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

nmcli/connections: export nmc_connection_check_deprecated()

Browse source 
It's going to be useful with "nmcli dev wifi connect" that also creates
a connection that should be checked.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1224
This commit is contained in:
Lubomir Rintel 2022-05-12 12:30:58 +02:00
parent 1a995325d5
commit 2dbbea3f10
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nmcli/connections.c
View file

@ -639,8 +639,8 @@ _con_show_fcn_get_type(NMConnection *c, NMActiveConnection *ac, NMMetaAccessorGe
return connection_type_to_display(s, get_type);
}
static const char *
_connection_check_deprecated(NMConnection *c)
const char *
nmc_connection_check_deprecated(NMConnection *c)
{
NMSettingWirelessSecurity *s_wsec;
const char *key_mgmt;
@ -667,7 +667,7 @@ _connection_to_color(NMConnection *c, NMActiveConnection *ac)
if (ac)
return nmc_active_connection_state_to_color(ac);
if (_connection_check_deprecated(c))
if (nmc_connection_check_deprecated(c))
return NM_META_COLOR_CONNECTION_DEPRECATED;
return NM_META_COLOR_CONNECTION_UNKNOWN;
@ -2039,7 +2039,8 @@ con_show_get_items_cmp(gconstpointer pa, gconstpointer pb, gpointer user_data)
}
}
NM_CMP_DIRECT(!!_connection_check_deprecated(c_a), !!_connection_check_deprecated(c_b));
NM_CMP_DIRECT(!!nmc_connection_check_deprecated(c_a),
!!nmc_connection_check_deprecated(c_b));
NM_CMP_DIRECT_STRCMP0(nm_connection_get_uuid(c_a), nm_connection_get_uuid(c_b));
NM_CMP_DIRECT_STRCMP0(nm_connection_get_path(c_a), nm_connection_get_path(c_b));
}
@ -5381,7 +5382,7 @@ connection_warnings(NmCli *nmc, NMConnection *connection)
const char *id;
const char *deprecated;
deprecated = _connection_check_deprecated(NM_CONNECTION(connection));
deprecated = nmc_connection_check_deprecated(NM_CONNECTION(connection));
if (deprecated)
g_printerr(_("Warning: %s.\n"), deprecated);

2
src/nmcli/connections.h
View file

@ -10,6 +10,8 @@
void monitor_connections(NmCli *nmc);
const char *nmc_connection_check_deprecated(NMConnection *c);
gboolean nmc_process_connection_properties(NmCli *nmc,
NMConnection *connection,
int *argc,