From c8de52e2817715eeb69c2f64b0995cf9f965ee91 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Nov 2017 10:33:23 +0100 Subject: [PATCH] policy: minor refactoring of device_state_changed() (cherry picked from commit ddb8713d443d3953594feddbdd88b3f40cf97524) --- src/nm-policy.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/nm-policy.c b/src/nm-policy.c index 117faed6ef..bc54e4df87 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1781,21 +1781,24 @@ device_state_changed (NMDevice *device, update_routing_and_dns (self, FALSE); break; case NM_DEVICE_STATE_DEACTIVATING: - if (NM_IN_SET (nm_device_state_reason_check (reason), - NM_DEVICE_STATE_REASON_USER_REQUESTED, - NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED)) { - if (connection) { - NMSettingsAutoconnectBlockedReason blocked_reason; + if (connection) { + NMSettingsAutoconnectBlockedReason blocked_reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE; - /* The connection was deactivated, so block just this connection */ + switch (nm_device_state_reason_check (reason)) { + case NM_DEVICE_STATE_REASON_USER_REQUESTED: + blocked_reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST; + break; + case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: + blocked_reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED; + break; + default: + break; + } + if (blocked_reason != NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE) { _LOGD (LOGD_DEVICE, "blocking autoconnect of connection '%s': %s", nm_settings_connection_get_id (connection), NM_UTILS_LOOKUP_STR (nm_device_state_reason_to_str, nm_device_state_reason_check (reason))); - if (nm_device_state_reason_check (reason) == NM_DEVICE_STATE_REASON_USER_REQUESTED) - blocked_reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST; - else - blocked_reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED; nm_settings_connection_autoconnect_blocked_reason_set (connection, blocked_reason); } }