fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 18:40:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup! policy: track autoconnect retries per Device x Connection

Browse source
This commit is contained in:
Thomas Haller 2023-02-21 12:16:27 +01:00
parent df1eeb4b8f
commit bbd76a3bcc
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/core/settings/nm-settings-connection.c
View file

@ -2513,22 +2513,28 @@ nm_settings_connection_autoconnect_blocked_reason_set(NMSettingsConnection
NMSettingsAutoconnectBlockedReason reason,
gboolean set)
{
NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE(self);
NMSettingsAutoconnectBlockedReason v;
char buf[100];
NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE(self);
char buf1[100];
char buf2[100];
nm_assert(reason);
v = priv->autoconnect_blocked_reason;
if (set) {
priv->autoconnect_blocked_reason = priv->autoconnect_blocked_reason | reason;
_LOGD("autoconnect: blocked reason: %s",
nm_settings_autoconnect_blocked_reason_to_string(reason, buf, sizeof(buf)));
return v != priv->autoconnect_blocked_reason;
} else {
priv->autoconnect_blocked_reason = priv->autoconnect_blocked_reason & ~reason;
_LOGD("autoconnect: unblocked reason: %s",
nm_settings_autoconnect_blocked_reason_to_string(reason, buf, sizeof(buf)));
return v != priv->autoconnect_blocked_reason;
}
if (set)
v = v | reason;
else
v = v & ~reason;
if (priv->autoconnect_blocked_reason == v)
return FALSE;
_LOGD("autoconnect: %s blocked reason: %s (now %s)",
set ? "set" : "unset",
nm_settings_autoconnect_blocked_reason_to_string(reason, buf1, sizeof(buf1)),
nm_settings_autoconnect_blocked_reason_to_string(v, buf2, sizeof(buf2)));
priv->autoconnect_blocked_reason = v;
return TRUE;
}
gboolean