fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 14:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

utils: rename NM_SETTINGS_AUTO_CONNECT_* to NM_SETTINGS_AUTOCONNECT_*

Browse source
This commit is contained in:
Fernando Fernandez Mancera 2023-02-09 21:04:15 +01:00
parent b73b34c3ee
commit 81fbe0634e
7 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/NetworkManagerUtils.c
View file

@ -1866,7 +1866,7 @@ nm_linux_platform_setup_with_tc_cache(void)
NM_UTILS_FLAGS2STR_DEFINE( NM_UTILS_FLAGS2STR_DEFINE(
nm_settings_autoconnect_blocked_reason_to_string, nm_settings_autoconnect_blocked_reason_to_string,
NMSettingsAutoconnectBlockedReason, NMSettingsAutoconnectBlockedReason,
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE, "none"), NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NONE, "none"),
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, "user-request"), NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST, "user-request"),
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, "failed"), NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED, "failed"),
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, "no-secrets"), ); NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NO_SECRETS, "no-secrets"), );

16
src/core/NetworkManagerUtils.h
View file

@ -229,16 +229,16 @@ void nm_utils_ip_routes_to_dbus(int addr_family,
/*****************************************************************************/ /*****************************************************************************/
typedef enum _nm_packed { typedef enum _nm_packed {
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE = 0, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NONE = 0,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST = (1LL << 0), NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST = (1LL << 0),
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED = (1LL << 1), NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED = (1LL << 1),
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS = (1LL << 2), NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NO_SECRETS = (1LL << 2),
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_ALL = NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_ALL =
(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST (NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST
| NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED | NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED
| NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS), | NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NO_SECRETS),
} NMSettingsAutoconnectBlockedReason; } NMSettingsAutoconnectBlockedReason;
const char * const char *

2
src/core/devices/ovs/nm-ovs-factory.c
View file

@ -244,7 +244,7 @@ ovsdb_interface_failed(NMOvsdb *ovsdb,
nm_device_get_manager(device), nm_device_get_manager(device),
device, device,
connection, connection,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED,
TRUE); TRUE);
} }

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

@ -1386,7 +1386,7 @@ nm_manager_devcon_autoconnect_reset_reconnect_all(NMManager *self,
/* we only reset the no-secrets blocked flag. */ /* we only reset the no-secrets blocked flag. */
if (nm_settings_connection_autoconnect_blocked_reason_set( if (nm_settings_connection_autoconnect_blocked_reason_set(
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NO_SECRETS,
FALSE)) { FALSE)) {
/* maybe the connection is still blocked afterwards for other reasons /* maybe the connection is still blocked afterwards for other reasons
* and in the larger picture nothing changed. Check if the connection * and in the larger picture nothing changed. Check if the connection
@ -1407,8 +1407,8 @@ nm_manager_devcon_autoconnect_reset_reconnect_all(NMManager *self,
self, self,
device, device,
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED
| NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, | NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST,
FALSE)) FALSE))
changed = TRUE; changed = TRUE;
@ -1416,8 +1416,8 @@ nm_manager_devcon_autoconnect_reset_reconnect_all(NMManager *self,
* happened, then it means the status changed */ * happened, then it means the status changed */
if (nm_settings_connection_autoconnect_blocked_reason_set( if (nm_settings_connection_autoconnect_blocked_reason_set(
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NO_SECRETS
| NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, | NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST,
FALSE)) FALSE))
changed = TRUE; changed = TRUE;
@ -1466,7 +1466,7 @@ nm_manager_devcon_autoconnect_is_blocked(NMManager *self,
return TRUE; return TRUE;
data = _devcon_lookup_data(self, device, sett_conn, TRUE); data = _devcon_lookup_data(self, device, sett_conn, TRUE);
if (data->autoconnect.blocked_reason != NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE) if (data->autoconnect.blocked_reason != NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NONE)
return TRUE; return TRUE;
if (data->autoconnect.retries == 0 && data->autoconnect.initialized) if (data->autoconnect.retries == 0 && data->autoconnect.initialized)
@ -5597,7 +5597,7 @@ _internal_activate_device(NMManager *self, NMActiveConnection *active, GError **
if (nm_active_connection_get_activation_reason(active) if (nm_active_connection_get_activation_reason(active)
== NM_ACTIVATION_REASON_AUTOCONNECT == NM_ACTIVATION_REASON_AUTOCONNECT
&& NM_FLAGS_HAS(nm_settings_connection_autoconnect_blocked_reason_get(parent_con), && NM_FLAGS_HAS(nm_settings_connection_autoconnect_blocked_reason_get(parent_con),
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST)) { NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST)) {
g_set_error(error, g_set_error(error,
NM_MANAGER_ERROR, NM_MANAGER_ERROR,
NM_MANAGER_ERROR_DEPENDENCY_FAILED, NM_MANAGER_ERROR_DEPENDENCY_FAILED,
@ -6228,7 +6228,7 @@ _activation_auth_done(NMManager *self,
nm_settings_connection_autoconnect_blocked_reason_set( nm_settings_connection_autoconnect_blocked_reason_set(
connection, connection,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST,
FALSE); FALSE);
g_dbus_method_invocation_return_value( g_dbus_method_invocation_return_value(
invocation, invocation,

26
src/core/nm-policy.c
View file

@ -1332,7 +1332,7 @@ pending_ac_state_changed(NMActiveConnection *ac, guint state, guint reason, NMPo
priv->manager, priv->manager,
nm_active_connection_get_device(ac), nm_active_connection_get_device(ac),
con, con,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED,
TRUE); TRUE);
schedule_activate_check(self, nm_active_connection_get_device(ac)); schedule_activate_check(self, nm_active_connection_get_device(ac));
} }
@ -1441,7 +1441,7 @@ auto_activate_device(NMPolicy *self, NMDevice *device)
priv->manager, priv->manager,
device, device,
best_connection, best_connection,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED,
TRUE); TRUE);
schedule_activate_check(self, device); schedule_activate_check(self, device);
return; return;
@ -1609,7 +1609,7 @@ nm_policy_unblock_failed_ovs_interfaces(NMPolicy *self)
priv->manager, priv->manager,
NULL, NULL,
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED,
FALSE); FALSE);
} }
} }
@ -1836,7 +1836,7 @@ activate_slave_connections(NMPolicy *self, NMDevice *device)
priv->manager, priv->manager,
NULL, NULL,
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED,
FALSE)) { FALSE)) {
if (!nm_settings_connection_autoconnect_is_blocked(sett_conn)) if (!nm_settings_connection_autoconnect_is_blocked(sett_conn))
changed = TRUE; changed = TRUE;
@ -1963,7 +1963,7 @@ device_state_changed(NMDevice *device,
priv->manager, priv->manager,
device, device,
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED,
TRUE); TRUE);
} }
break; break;
@ -2004,7 +2004,7 @@ device_state_changed(NMDevice *device,
nm_settings_connection_get_id(sett_conn)); nm_settings_connection_get_id(sett_conn));
nm_settings_connection_autoconnect_blocked_reason_set( nm_settings_connection_autoconnect_blocked_reason_set(
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NO_SECRETS,
TRUE); TRUE);
blocked = TRUE; blocked = TRUE;
} }
@ -2027,7 +2027,7 @@ device_state_changed(NMDevice *device,
priv->manager, priv->manager,
device, device,
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED,
TRUE); TRUE);
blocked = TRUE; blocked = TRUE;
} }
@ -2090,25 +2090,25 @@ device_state_changed(NMDevice *device,
case NM_DEVICE_STATE_DEACTIVATING: case NM_DEVICE_STATE_DEACTIVATING:
if (sett_conn) { if (sett_conn) {
NMSettingsAutoconnectBlockedReason blocked_reason = NMSettingsAutoconnectBlockedReason blocked_reason =
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE; NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NONE;
switch (nm_device_state_reason_check(reason)) { switch (nm_device_state_reason_check(reason)) {
case NM_DEVICE_STATE_REASON_USER_REQUESTED: case NM_DEVICE_STATE_REASON_USER_REQUESTED:
blocked_reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST; blocked_reason = NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST;
break; break;
case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED:
blocked_reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED; blocked_reason = NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED;
break; break;
default: default:
break; break;
} }
if (blocked_reason != NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE) { if (blocked_reason != NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NONE) {
_LOGD(LOGD_DEVICE, _LOGD(LOGD_DEVICE,
"blocking autoconnect of connection '%s': %s", "blocking autoconnect of connection '%s': %s",
nm_settings_connection_get_id(sett_conn), nm_settings_connection_get_id(sett_conn),
NM_UTILS_LOOKUP_STR_A(nm_device_state_reason_to_string, NM_UTILS_LOOKUP_STR_A(nm_device_state_reason_to_string,
nm_device_state_reason_check(reason))); nm_device_state_reason_check(reason)));
if (blocked_reason == NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED) if (blocked_reason == NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_FAILED)
nm_manager_devcon_autoconnect_blocked_reason_set(priv->manager, nm_manager_devcon_autoconnect_blocked_reason_set(priv->manager,
device, device,
sett_conn, sett_conn,
@ -2160,7 +2160,7 @@ device_state_changed(NMDevice *device,
priv->manager, priv->manager,
device, device,
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_ALL, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_ALL,
FALSE); FALSE);
break; break;
case NM_DEVICE_STATE_SECONDARIES: case NM_DEVICE_STATE_SECONDARIES:

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

@ -1502,7 +1502,7 @@ update_auth_cb(NMSettingsConnection *self,
/* New secrets, allow autoconnection again */ /* New secrets, allow autoconnection again */
if (nm_settings_connection_autoconnect_blocked_reason_set( if (nm_settings_connection_autoconnect_blocked_reason_set(
self, self,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NO_SECRETS,
FALSE) FALSE)
&& !nm_settings_connection_autoconnect_blocked_reason_get(self)) && !nm_settings_connection_autoconnect_blocked_reason_get(self))
nm_manager_devcon_autoconnect_retries_reset( nm_manager_devcon_autoconnect_retries_reset(
@ -2544,7 +2544,7 @@ nm_settings_connection_autoconnect_is_blocked(NMSettingsConnection *self)
priv = NM_SETTINGS_CONNECTION_GET_PRIVATE(self); priv = NM_SETTINGS_CONNECTION_GET_PRIVATE(self);
if (priv->autoconnect_blocked_reason != NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE) if (priv->autoconnect_blocked_reason != NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_NONE)
return TRUE; return TRUE;
flags = priv->flags; flags = priv->flags;

2
src/core/settings/nm-settings.c
View file

@ -1119,7 +1119,7 @@ _connection_changed_update(NMSettings *self,
if (NM_FLAGS_HAS(update_reason, NM_SETTINGS_CONNECTION_UPDATE_REASON_BLOCK_AUTOCONNECT)) { if (NM_FLAGS_HAS(update_reason, NM_SETTINGS_CONNECTION_UPDATE_REASON_BLOCK_AUTOCONNECT)) {
nm_settings_connection_autoconnect_blocked_reason_set( nm_settings_connection_autoconnect_blocked_reason_set(
sett_conn, sett_conn,
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, NM_SETTINGS_AUTOCONNECT_BLOCKED_REASON_USER_REQUEST,
TRUE); TRUE);
} }