system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-06 16:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: add nm_utils_error_is_cancelled() and nm_utils_error_is_cancelled_or_disposing()

Browse source 
Most callers would pass FALSE to nm_utils_error_is_cancelled(). That's
not very useful. Split the two functions and have nm_utils_error_is_cancelled()
and nm_utils_error_is_cancelled_is_disposing().
This commit is contained in:
Thomas Haller 2020-01-23 10:36:24 +01:00
parent 08f86ce04d
commit 53f6858a27
24 changed files with 66 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/cloud-setup/main.c
View file

@ -31,7 +31,7 @@ _provider_detect_cb (GObject *source,
nm_assert (success != (!!error));
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
dd = user_data;
@ -219,7 +219,7 @@ _get_config_cb (GObject *source,
config_dict = nmcs_provider_get_config_finish (NMCS_PROVIDER (source), result, &error);
if (!config_dict) {
if (!nm_utils_error_is_cancelled (error, FALSE))
if (!nm_utils_error_is_cancelled (error))
_LOGI ("failure to get meta data: %s", error->message);
} else
_LOGD ("meta data received");
@ -426,7 +426,7 @@ try_again:
&applied_version_id,
&error);
if (!applied_connection) {
if (!nm_utils_error_is_cancelled (error, FALSE))
if (!nm_utils_error_is_cancelled (error))
_LOGD ("config device %s: device has no applied connection (%s). Skip", hwaddr, error->message);
return any_changes;
}
@ -477,7 +477,7 @@ try_again:
goto try_again;
}
if (!nm_utils_error_is_cancelled (error, FALSE)) {
if (!nm_utils_error_is_cancelled (error)) {
_LOGD ("config device %s: failure to reapply connection \"%s\" (%s): %s",
hwaddr,
nm_connection_get_id (applied_connection),
@ -576,7 +576,7 @@ main (int argc, const char *const*argv)
nmcs_wait_for_objects_register (nm_client_get_context_busy_watcher (nmc));
if (error) {
if (!nm_utils_error_is_cancelled (error, FALSE))
if (!nm_utils_error_is_cancelled (error))
_LOGI ("failure to talk to NetworkManager: %s", error->message);
goto done;
}

2
clients/cloud-setup/nm-cloud-setup-utils.c
View file

@ -294,7 +294,7 @@ _poll_done_cb (GObject *source,
poll_task_data->probe_user_data,
&error);
if (nm_utils_error_is_cancelled (error, FALSE)) {
if (nm_utils_error_is_cancelled (error)) {
/* we already handle this differently. Nothing to do. */
return;
}

4
clients/cloud-setup/nm-http-client.c
View file

@ -163,7 +163,7 @@ _ehandle_complete (EHandleData *edata,
&edata->cancellable_id);
if (error_take) {
if (nm_utils_error_is_cancelled (error_take, FALSE))
if (nm_utils_error_is_cancelled (error_take))
_LOG2T (edata, "cancelled");
else
_LOG2D (edata, "failed with %s", error_take->message);
@ -422,7 +422,7 @@ _poll_get_probe_finish_fcn (GObject *source,
&local_error);
if (!success) {
if (nm_utils_error_is_cancelled (local_error, FALSE)) {
if (nm_utils_error_is_cancelled (local_error)) {
g_propagate_error (error, g_steal_pointer (&local_error));
return TRUE;
}

8
clients/cloud-setup/nmcs-provider-ec2.c
View file

@ -98,7 +98,7 @@ _detect_get_meta_data_done_cb (GObject *source,
NULL,
&get_error);
if (nm_utils_error_is_cancelled (get_error, FALSE)) {
if (nm_utils_error_is_cancelled (get_error)) {
g_task_return_error (task, g_steal_pointer (&get_error));
return;
}
@ -168,7 +168,7 @@ _get_config_task_return (GetConfigIfaceData *iface_data,
nm_g_slice_free (iface_data);
if (error_take) {
if (nm_utils_error_is_cancelled (error_take, FALSE))
if (nm_utils_error_is_cancelled (error_take))
_LOGD ("get-config: cancelled");
else
_LOGD ("get-config: failed: %s", error_take->message);
@ -204,7 +204,7 @@ _get_config_fetch_done_cb (NMHttpClient *http_client,
NULL,
&response_data,
&error);
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
get_config_data = iface_data->get_config_data;
@ -327,7 +327,7 @@ _get_config_metadata_ready_cb (GObject *source,
.n_pending = 0,
};
if (nm_utils_error_is_cancelled (error, FALSE)) {
if (nm_utils_error_is_cancelled (error)) {
_get_config_task_return (iface_data, g_steal_pointer (&error));
return;
}

4
clients/common/nm-polkit-listener.c
View file

@ -233,7 +233,7 @@ agent_register_cb (GObject *source_object,
res,
&error);
if (nm_utils_error_is_cancelled (error, FALSE)) {
if (nm_utils_error_is_cancelled (error)) {
return;
}
@ -328,7 +328,7 @@ retrieve_session_id_cb (GObject *source_object,
res,
&error);
if (nm_utils_error_is_cancelled (error, FALSE)) {
if (nm_utils_error_is_cancelled (error)) {
return;
}

16
libnm/nm-client.c
View file

@ -3142,7 +3142,7 @@ _dbus_get_managed_objects_cb (GObject *source,
nm_assert ((!!ret) != (!!error));
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
priv = NM_CLIENT_GET_PRIVATE (self);
@ -3193,7 +3193,7 @@ _nm_client_get_settings_call_cb (GObject *source, GAsyncResult *result, gpointer
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
remote_connection = user_data;
@ -3432,7 +3432,7 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
self = user_data;
@ -4865,7 +4865,7 @@ activate_connection_cb (GObject *object,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (object), result, &error);
if (!ret) {
if (!nm_utils_error_is_cancelled (error, FALSE))
if (!nm_utils_error_is_cancelled (error))
g_dbus_error_strip_remote_error (error);
g_task_return_error (task, error);
return;
@ -5003,7 +5003,7 @@ _add_and_activate_connection_done (GObject *object,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (object), result, &error);
if (!ret) {
if (!nm_utils_error_is_cancelled (error, FALSE))
if (!nm_utils_error_is_cancelled (error))
g_dbus_error_strip_remote_error (error);
g_task_return_error (task, error);
return;
@ -5526,7 +5526,7 @@ _add_connection_cb (GObject *source,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if (!ret) {
if (!nm_utils_error_is_cancelled (error, FALSE))
if (!nm_utils_error_is_cancelled (error))
g_dbus_error_strip_remote_error (error);
g_task_return_error (task, error);
return;
@ -6268,7 +6268,7 @@ checkpoint_create_cb (GObject *object,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (object), result, &error);
if (!ret) {
if (!nm_utils_error_is_cancelled (error, FALSE))
if (!nm_utils_error_is_cancelled (error))
g_dbus_error_strip_remote_error (error);
g_task_return_error (task, error);
return;
@ -6942,7 +6942,7 @@ name_owner_get_cb (GObject *source,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
priv = NM_CLIENT_GET_PRIVATE (self);

6
libnm/nm-secret-agent-old.c
View file

@ -1148,7 +1148,7 @@ _register_call_cb (GObject *source,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
nm_assert (!priv->registering_retry_source);
@ -1229,7 +1229,7 @@ _get_connection_unix_user_cb (GObject *source,
guint32 sender_uid = 0;
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
self = user_data;
@ -1324,7 +1324,7 @@ _name_owner_get_cb (const char *name_owner,
gpointer user_data)
{
if ( name_owner
|| !nm_utils_error_is_cancelled (error, FALSE))
|| !nm_utils_error_is_cancelled (error))
_name_owner_changed (user_data, name_owner, FALSE);
}

9
shared/nm-glib-aux/nm-shared-utils.c
View file

@ -1643,16 +1643,13 @@ nm_utils_error_set_cancelled (GError **error,
}
gboolean
nm_utils_error_is_cancelled (GError *error,
gboolean consider_is_disposing)
nm_utils_error_is_cancelled_or_disposing (GError *error)
{
if (error) {
if (error->domain == G_IO_ERROR)
return NM_IN_SET (error->code, G_IO_ERROR_CANCELLED);
if (consider_is_disposing) {
if (error->domain == NM_UTILS_ERROR)
return NM_IN_SET (error->code, NM_UTILS_ERROR_CANCELLED_DISPOSING);
}
if (error->domain == NM_UTILS_ERROR)
return NM_IN_SET (error->code, NM_UTILS_ERROR_CANCELLED_DISPOSING);
}
return FALSE;
}

11
shared/nm-glib-aux/nm-shared-utils.h
View file

@ -883,8 +883,15 @@ nm_utils_error_new_cancelled (gboolean is_disposing,
return error;
}
gboolean nm_utils_error_is_cancelled (GError *error,
gboolean consider_is_disposing);
gboolean nm_utils_error_is_cancelled_or_disposing (GError *error);
static inline gboolean
nm_utils_error_is_cancelled (GError *error)
{
return error
&& error->code == G_IO_ERROR_CANCELLED
&& error->domain == G_IO_ERROR;
}
gboolean nm_utils_error_is_notfound (GError *error);

10
src/devices/bluetooth/nm-bluez-manager.c
View file

@ -1089,7 +1089,7 @@ _network_server_register_cb (GObject *source_object,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), res, &error);
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
bzobj = user_data;
@ -2172,7 +2172,7 @@ _dbus_get_managed_objects_cb (GVariant *result,
GVariant *ifaces;
if ( !result
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
self = user_data;
@ -2475,7 +2475,7 @@ _connect_dun_step2_cb (NMBluez5DunContext *context,
{
BzDBusObj *bzobj;
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
bzobj = user_data;
@ -2517,7 +2517,7 @@ _connect_dun_step1_cb (GObject *source_object,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), res, &error);
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
bzobj = user_data;
@ -2564,7 +2564,7 @@ _connect_nap_cb (GObject *source_object,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), res, &error);
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
if (ret)

2
src/devices/bluetooth/nm-bluez5-dun.c
View file

@ -805,7 +805,7 @@ _context_invoke_callback (NMBluez5DunContext *context,
if (!error)
_LOGD (context, "connected via \"%s\"", context->rfcomm_tty_path);
else if (nm_utils_error_is_cancelled (error, FALSE))
else if (nm_utils_error_is_cancelled (error))
_LOGD (context, "cancelled");
else
_LOGD (context, "failed to connect: %s", error->message);

2
src/devices/bluetooth/nm-device-bt.c
View file

@ -830,7 +830,7 @@ connect_bz_cb (NMBluezManager *bz_mgr,
NMDeviceBtPrivate *priv;
char sbuf[100];
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
self = user_data;

2
src/devices/nm-device-bridge.c
View file

@ -518,7 +518,7 @@ _bt_register_bridge_cb (GError *error,
{
NMDeviceBridge *self;
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
self = user_data;

2
src/devices/nm-device-ethernet.c
View file

@ -623,7 +623,7 @@ supplicant_iface_assoc_cb (NMSupplicantInterface *iface,
{
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (user_data);
if (error && !nm_utils_error_is_cancelled (error, TRUE)) {
if (error && !nm_utils_error_is_cancelled_or_disposing (error)) {
supplicant_interface_release (self);
nm_device_queue_state (NM_DEVICE (self),
NM_DEVICE_STATE_FAILED,

2
src/devices/nm-device-macsec.c
View file

@ -270,7 +270,7 @@ supplicant_iface_assoc_cb (NMSupplicantInterface *iface,
{
NMDeviceMacsec *self = NM_DEVICE_MACSEC (user_data);
if (error && !nm_utils_error_is_cancelled (error, TRUE)) {
if (error && !nm_utils_error_is_cancelled_or_disposing (error)) {
supplicant_interface_release (self);
nm_device_queue_state (NM_DEVICE (self),
NM_DEVICE_STATE_FAILED,

2
src/devices/nm-device-wireguard.c
View file

@ -684,7 +684,7 @@ _peers_resolve_cb (GObject *source_object,
list = g_resolver_lookup_by_name_finish (G_RESOLVER (source_object), res, &resolv_error);
if (nm_utils_error_is_cancelled (resolv_error, FALSE))
if (nm_utils_error_is_cancelled (resolv_error))
return;
peer_data = user_data;

6
src/devices/nm-device.c
View file

@ -6505,7 +6505,7 @@ sriov_params_cb (GError *error, gpointer data)
nm_utils_user_data_unpack (data, &self, &plat_vfs);
if (nm_utils_error_is_cancelled (error, TRUE))
if (nm_utils_error_is_cancelled_or_disposing (error))
return;
priv = NM_DEVICE_GET_PRIVATE (self);
@ -10713,7 +10713,7 @@ fw_change_zone_cb (NMFirewallManager *firewall_manager,
priv->fw_call = NULL;
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
switch (priv->fw_state) {
@ -15466,7 +15466,7 @@ sriov_deactivate_cb (GError *error, gpointer user_data)
NMDevice *self;
gpointer reason;
if (nm_utils_error_is_cancelled (error, TRUE))
if (nm_utils_error_is_cancelled_or_disposing (error))
return;
nm_utils_user_data_unpack (user_data, &self, &reason);

2
src/devices/ovs/nm-ovsdb.c
View file

@ -1394,7 +1394,7 @@ static void
_monitor_bridges_cb (NMOvsdb *self, json_t *result, GError *error, gpointer user_data)
{
if (error) {
if (!nm_utils_error_is_cancelled (error, TRUE)) {
if (!nm_utils_error_is_cancelled_or_disposing (error)) {
_LOGI ("%s", error->message);
ovsdb_disconnect (self, FALSE);
}

14
src/devices/wifi/nm-device-iwd.c
View file

@ -993,7 +993,7 @@ scan_cb (GObject *source, GAsyncResult *res, gpointer user_data)
gs_free_error GError *error = NULL;
variant = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, &error);
if (!variant && nm_utils_error_is_cancelled (error, FALSE))
if (!variant && nm_utils_error_is_cancelled (error))
return;
priv = NM_DEVICE_IWD_GET_PRIVATE (self);
@ -1270,7 +1270,7 @@ wifi_secrets_cb (NMActRequest *req,
priv->wifi_secrets_id = NULL;
if (nm_utils_error_is_cancelled (error, FALSE)) {
if (nm_utils_error_is_cancelled (error)) {
g_dbus_method_invocation_return_error_literal (invocation, NM_DEVICE_ERROR,
NM_DEVICE_ERROR_INVALID_CONNECTION,
"NM secrets request cancelled");
@ -1366,7 +1366,7 @@ network_connect_cb (GObject *source, GAsyncResult *res, gpointer user_data)
"Activation: (wifi) Network.Connect failed: %s",
error->message);
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
if (!NM_IN_SET (nm_device_get_state (device), NM_DEVICE_STATE_CONFIG, NM_DEVICE_STATE_NEED_AUTH))
@ -1438,7 +1438,7 @@ act_failed_cb (GObject *source, GAsyncResult *res, gpointer user_data)
gs_free_error GError *error = NULL;
variant = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, &error);
if (!variant && nm_utils_error_is_cancelled (error, FALSE))
if (!variant && nm_utils_error_is_cancelled (error))
return;
/* Change state to FAILED unless already done by state_changed
@ -1467,7 +1467,7 @@ act_start_cb (GObject *source, GAsyncResult *res, gpointer user_data)
"Activation: (wifi) Network.Connect failed: %s",
error->message);
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
if (!NM_IN_SET (nm_device_get_state (device), NM_DEVICE_STATE_CONFIG))
@ -1587,7 +1587,7 @@ act_set_mode_cb (GObject *source, GAsyncResult *res, gpointer user_data)
"Activation: (wifi) Setting Device.Mode failed: %s",
error->message);
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
if ( !NM_IN_SET (nm_device_get_state (device), NM_DEVICE_STATE_CONFIG)
@ -1647,7 +1647,7 @@ act_psk_cb (NMActRequest *req,
NMDeviceIwdPrivate *priv;
NMDevice *device;
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
priv = NM_DEVICE_IWD_GET_PRIVATE (self);

2
src/devices/wifi/nm-device-wifi.c
View file

@ -2171,7 +2171,7 @@ supplicant_iface_assoc_cb (NMSupplicantInterface *iface,
NMDeviceWifi *self = NM_DEVICE_WIFI (user_data);
NMDevice *device = NM_DEVICE (self);
if ( error && !nm_utils_error_is_cancelled (error, TRUE)
if ( error && !nm_utils_error_is_cancelled_or_disposing (error)
&& nm_device_is_activating (device)) {
cleanup_association_attempt (self, TRUE);
nm_device_queue_state (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);

6
src/dns/nm-dns-dnsmasq.c
View file

@ -304,7 +304,7 @@ _gl_pid_spawn_notify (GlPidSpawnAsyncData *sdata,
if (error) {
nm_assert (pid == 0);
nm_assert (!p_exit_code);
if (!nm_utils_error_is_cancelled (error, FALSE))
if (!nm_utils_error_is_cancelled (error))
_LOGD ("spawn: dnsmasq failed: %s", error->message);
} else if (p_exit_code) {
/* the only caller already logged about this condition extensively. */
@ -838,7 +838,7 @@ dnsmasq_update_done (GObject *source_object, GAsyncResult *res, gpointer user_da
response = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), res, &error);
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
self = user_data;
@ -987,7 +987,7 @@ spawn_notify (GCancellable *cancellable,
NMDnsDnsmasq *self;
NMDnsDnsmasqPrivate *priv;
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
self = notify_user_data;

2
src/nm-firewall-manager.c
View file

@ -265,7 +265,7 @@ _handle_dbus_cb (GObject *source,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
call_id = user_data;

2
src/settings/nm-secret-agent.c
View file

@ -370,7 +370,7 @@ _dbus_call_cb (GObject *source,
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
if ( !ret
&& nm_utils_error_is_cancelled (error, FALSE))
&& nm_utils_error_is_cancelled (error))
return;
call_id = user_data;

2
src/vpn/nm-vpn-connection.c
View file

@ -1194,7 +1194,7 @@ fw_change_zone_cb (NMFirewallManager *firewall_manager,
priv->fw_call = NULL;
if (nm_utils_error_is_cancelled (error, FALSE))
if (nm_utils_error_is_cancelled (error))
return;
if (error) {