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

fixup! policy: track autoconnect retries per Device x Connection

Browse source 
The "set-full(value, mask)" variants allow to set and clear flags at the
same time. Granted, that flexibility is totally unused and unnecessary.

The current patch does right to drop nm_settings_connection_autoconnect_blocked_reason_set_full()
and only have a (simplified) nm_settings_connection_autoconnect_blocked_reason_set().

If we already recognize that the set-full() variant is overkill, let's
not introduce it here either.

While at it, don't do:

   if (...) {
       ...
       return ...;
   } else {
       ...

If a branch can always return early from a function, don't have an else
branch. Unindent the code.
This commit is contained in:
Thomas Haller 2023-02-21 13:43:57 +01:00
parent c3fc0eddce
commit 13ebb5fc12
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 25 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/core/nm-manager.c
View file

@ -1411,25 +1411,24 @@ nm_manager_devcon_autoconnect_is_blocked(NMManager *self,
}
gboolean
nm_manager_devcon_autoconnect_blocked_reason_set_full(NMManager *self,
NMDevice *device,
NMSettingsConnection *sett_conn,
NMSettingsAutoconnectBlockedReason mask,
NMSettingsAutoconnectBlockedReason value)
nm_manager_devcon_autoconnect_blocked_reason_set(NMManager *self,
NMDevice *device,
NMSettingsConnection *sett_conn,
NMSettingsAutoconnectBlockedReason value,
gboolean set)
{
NMSettingsAutoconnectBlockedReason v;
DevConData *data;
gboolean changed = FALSE;
char buf[100];
nm_assert(mask);
nm_assert(value);
nm_assert(sett_conn);
nm_assert(!NM_FLAGS_ANY(value, ~mask));
if (device) {
data = _devcon_lookup_data(self, device, sett_conn, TRUE);
v = data->autoconnect.blocked_reason;
v = (v & ~mask) | (value & mask);
v = set ? NM_FLAGS_SET(v, value) : NM_FLAGS_UNSET(v, value);
if (data->autoconnect.blocked_reason == v)
return FALSE;
@ -1440,20 +1439,20 @@ nm_manager_devcon_autoconnect_blocked_reason_set_full(NMManager
nm_device_get_ip_iface(device));
data->autoconnect.blocked_reason = v;
return TRUE;
} else {
c_list_for_each_entry (data, &sett_conn->devcon_con_lst_head, con_lst) {
v = data->autoconnect.blocked_reason;
v = (v & ~mask) | (value & mask);
}
if (data->autoconnect.blocked_reason == v)
continue;
_LOGT(LOGD_SETTINGS,
"autoconnect: blocked reason: %s for device %s",
nm_settings_autoconnect_blocked_reason_to_string(v, buf, sizeof(buf)),
nm_device_get_ip_iface(data->device));
data->autoconnect.blocked_reason = v;
changed = TRUE;
}
c_list_for_each_entry (data, &sett_conn->devcon_con_lst_head, con_lst) {
v = data->autoconnect.blocked_reason;
v = set ? NM_FLAGS_SET(v, value) : NM_FLAGS_UNSET(v, value);
if (data->autoconnect.blocked_reason == v)
continue;
_LOGT(LOGD_SETTINGS,
"autoconnect: blocked reason: %s for device %s",
nm_settings_autoconnect_blocked_reason_to_string(v, buf, sizeof(buf)),
nm_device_get_ip_iface(data->device));
data->autoconnect.blocked_reason = v;
changed = TRUE;
}
return changed;

26
src/core/nm-manager.h
View file

@ -249,26 +249,10 @@ gboolean nm_manager_devcon_autoconnect_is_blocked(NMManager *self,
NMDevice *device,
NMSettingsConnection *sett_conn);
gboolean
nm_manager_devcon_autoconnect_blocked_reason_set_full(NMManager *self,
NMDevice *device,
NMSettingsConnection *sett_conn,
NMSettingsAutoconnectBlockedReason mask,
NMSettingsAutoconnectBlockedReason value);
static inline gboolean
nm_manager_devcon_autoconnect_blocked_reason_set(NMManager *self,
NMDevice *device,
NMSettingsConnection *sett_conn,
NMSettingsAutoconnectBlockedReason mask,
gboolean set)
{
return nm_manager_devcon_autoconnect_blocked_reason_set_full(
self,
device,
sett_conn,
mask,
set ? mask : NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE);
}
gboolean nm_manager_devcon_autoconnect_blocked_reason_set(NMManager *self,
NMDevice *device,
NMSettingsConnection *sett_conn,
NMSettingsAutoconnectBlockedReason value,
gboolean set);
#endif /* __NETWORKMANAGER_MANAGER_H__ */