colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: rename NM_DEVICE_MANAGED_TYPE_MANAGED to _TYPE_FULL

Browse Source 
Managed type = managed is a bit unclear, because all managed types are
for devices that are managed, but with different levels. Managed type =
managed could be interpreted as other types are unmanaged. Change it to
managed type = full.
This commit is contained in:
Íñigo Huguet
2024-08-27 10:43:26 +02:00
committed by Fernando Fernandez Mancera
parent 573c48d034
commit 7dae55f0f2
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/internal/device.md
View File

@@ -318,5 +318,5 @@ touch the interface. The external status is tracked in the
- EXTERNAL: the interface is not touched by NM.
- ASSUME: this value is deprecated; it used to mean that NM should manage the device without fully reconfiguring it. Now, the interface is either managed on external.
- MANAGED: the interface is fully managed.
- FULL: the interface is fully managed.
- REMOVED: the link was removed externally.

2
src/core/devices/nm-device-utils.c
View File

@@ -157,7 +157,7 @@ NM_UTILS_LOOKUP_STR_DEFINE(nm_device_managed_type_to_string,
NM_UTILS_LOOKUP_DEFAULT_NM_ASSERT("unknown"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_MANAGED_TYPE_EXTERNAL, "external"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_MANAGED_TYPE_ASSUME, "assume"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_MANAGED_TYPE_MANAGED, "managed"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_MANAGED_TYPE_FULL, "full"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_MANAGED_TYPE_REMOVED, "removed"), );
NM_UTILS_LOOKUP_STR_DEFINE(nm_device_ip_state_to_string,

2
src/core/devices/nm-device-utils.h
View File

@@ -59,7 +59,7 @@ const char *nm_device_mtu_source_to_string(NMDeviceMtuSource mtu_source);
typedef enum _nm_packed {
NM_DEVICE_MANAGED_TYPE_EXTERNAL,
NM_DEVICE_MANAGED_TYPE_ASSUME,
NM_DEVICE_MANAGED_TYPE_MANAGED,
NM_DEVICE_MANAGED_TYPE_FULL,
/* the REMOVED state applies when the device is manually set to unmanaged
* or the link was externally removed. In both cases, we move the device

26
src/core/devices/nm-device.c
View File

@@ -3388,7 +3388,7 @@ nm_device_managed_type_set(NMDevice *self, NMDeviceManagedType managed_type)
g_return_if_fail(NM_IN_SET(managed_type,
NM_DEVICE_MANAGED_TYPE_EXTERNAL,
NM_DEVICE_MANAGED_TYPE_ASSUME,
NM_DEVICE_MANAGED_TYPE_MANAGED,
NM_DEVICE_MANAGED_TYPE_FULL,
NM_DEVICE_MANAGED_TYPE_REMOVED));
priv = NM_DEVICE_GET_PRIVATE(self);
@@ -4736,7 +4736,7 @@ _dev_l3_cfg_commit_type_reset(NMDevice *self)
* Meanwhile, the commit type must be updated. */
commit_type = NM_L3_CFG_COMMIT_TYPE_UPDATE;
goto do_set;
case NM_DEVICE_MANAGED_TYPE_MANAGED:
case NM_DEVICE_MANAGED_TYPE_FULL:
commit_type = NM_L3_CFG_COMMIT_TYPE_UPDATE;
goto do_set;
}
@@ -8469,9 +8469,9 @@ port_state_changed(NMDevice *port,
}
if (release) {
configure = (priv->managed_type == NM_DEVICE_MANAGED_TYPE_MANAGED
configure = (priv->managed_type == NM_DEVICE_MANAGED_TYPE_FULL
&& nm_device_managed_type_get(port) != NM_DEVICE_MANAGED_TYPE_EXTERNAL)
|| nm_device_managed_type_get(port) == NM_DEVICE_MANAGED_TYPE_MANAGED;
|| nm_device_managed_type_get(port) == NM_DEVICE_MANAGED_TYPE_FULL;
nm_device_controller_release_port(self,
port,
@@ -13404,7 +13404,7 @@ act_request_set(NMDevice *self, NMActRequest *act_request)
priv->managed_type,
NM_DEVICE_MANAGED_TYPE_EXTERNAL,
NM_DEVICE_MANAGED_TYPE_ASSUME))
nm_device_managed_type_set(self, NM_DEVICE_MANAGED_TYPE_MANAGED);
nm_device_managed_type_set(self, NM_DEVICE_MANAGED_TYPE_FULL);
break;
}
}
@@ -13948,7 +13948,7 @@ reapply_cb(NMDevice *self,
}
if (nm_device_managed_type_is_external(self))
nm_device_managed_type_set(self, NM_DEVICE_MANAGED_TYPE_MANAGED);
nm_device_managed_type_set(self, NM_DEVICE_MANAGED_TYPE_FULL);
if (!check_and_reapply_connection(self,
connection
@@ -14435,7 +14435,7 @@ nm_device_disconnect_active_connection(NMActiveConnection *active,
* the managed-type to managed so that we deconfigure/cleanup the interface.
* But for external connections that go down otherwise, we don't want to touch the interface. */
if (nm_device_managed_type_is_external(self))
nm_device_managed_type_set(self, NM_DEVICE_MANAGED_TYPE_MANAGED);
nm_device_managed_type_set(self, NM_DEVICE_MANAGED_TYPE_FULL);
nm_device_state_changed(self, NM_DEVICE_STATE_DEACTIVATING, device_reason);
} else {
@@ -16767,7 +16767,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
priv->managed_type,
NM_DEVICE_MANAGED_TYPE_EXTERNAL,
NM_DEVICE_MANAGED_TYPE_ASSUME))
nm_device_managed_type_set(self, NM_DEVICE_MANAGED_TYPE_MANAGED);
nm_device_managed_type_set(self, NM_DEVICE_MANAGED_TYPE_FULL);
if (state <= NM_DEVICE_STATE_DISCONNECTED || state >= NM_DEVICE_STATE_ACTIVATED)
priv->auth_retries = NM_DEVICE_AUTH_RETRIES_UNSET;
@@ -16809,7 +16809,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
case NM_DEVICE_STATE_UNMANAGED:
nm_device_set_firmware_missing(self, FALSE);
if (old_state > NM_DEVICE_STATE_UNMANAGED) {
if (priv->managed_type != NM_DEVICE_MANAGED_TYPE_MANAGED) {
if (priv->managed_type != NM_DEVICE_MANAGED_TYPE_FULL) {
nm_device_cleanup(self,
reason,
priv->managed_type == NM_DEVICE_MANAGED_TYPE_REMOVED
@@ -16830,7 +16830,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
case NM_DEVICE_STATE_UNAVAILABLE:
if (old_state == NM_DEVICE_STATE_UNMANAGED) {
_dev_sysctl_save_ip6_properties(self);
if (priv->managed_type == NM_DEVICE_MANAGED_TYPE_MANAGED)
if (priv->managed_type == NM_DEVICE_MANAGED_TYPE_FULL)
ip6_managed_setup(self);
device_init_static_sriov_num_vfs(self);
@@ -16842,7 +16842,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
carrier_detect_wait(self);
}
if (priv->managed_type == NM_DEVICE_MANAGED_TYPE_MANAGED) {
if (priv->managed_type == NM_DEVICE_MANAGED_TYPE_FULL) {
if (old_state == NM_DEVICE_STATE_UNMANAGED || priv->firmware_missing) {
if (!nm_device_bring_up_full(self, TRUE, FALSE, &no_firmware) && no_firmware)
_LOGW(LOGD_PLATFORM, "firmware may be missing.");
@@ -16872,7 +16872,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
nm_device_cleanup(self, reason, CLEANUP_TYPE_DECONFIGURE);
} else if (old_state < NM_DEVICE_STATE_DISCONNECTED) {
if (priv->managed_type == NM_DEVICE_MANAGED_TYPE_MANAGED) {
if (priv->managed_type == NM_DEVICE_MANAGED_TYPE_FULL) {
/* Ensure IPv6 is set up as it may not have been done when
* entering the UNAVAILABLE state depending on the reason.
*/
@@ -18725,7 +18725,7 @@ nm_device_init(NMDevice *self)
priv->managed_type_ = NM_DEVICE_MANAGED_TYPE_EXTERNAL;
/* If networking is already disabled at boot, we want to manage all devices
* after re-enabling networking; hence, the initial state is MANAGED. */
priv->managed_type_before_sleep = NM_DEVICE_MANAGED_TYPE_MANAGED;
priv->managed_type_before_sleep = NM_DEVICE_MANAGED_TYPE_FULL;
priv->promisc_reset = NM_OPTION_BOOL_DEFAULT;
}

2
src/core/devices/ovs/nm-device-ovs-port.c
View File

@@ -219,7 +219,7 @@ detach_port(NMDevice *device,
{
NMDeviceOvsPort *self = NM_DEVICE_OVS_PORT(device);
bool port_not_managed = !NM_IN_SET(nm_device_managed_type_get(port),
NM_DEVICE_MANAGED_TYPE_MANAGED,
NM_DEVICE_MANAGED_TYPE_FULL,
NM_DEVICE_MANAGED_TYPE_ASSUME);
NMTernary ret = TRUE;

2
src/core/nm-active-connection.c
View File

@@ -992,7 +992,7 @@ _set_activation_type_managed(NMActiveConnection *self)
&& NM_IN_SET(nm_device_managed_type_get(priv->device),
NM_DEVICE_MANAGED_TYPE_EXTERNAL,
NM_DEVICE_MANAGED_TYPE_ASSUME))
nm_device_managed_type_set(priv->device, NM_DEVICE_MANAGED_TYPE_MANAGED);
nm_device_managed_type_set(priv->device, NM_DEVICE_MANAGED_TYPE_FULL);
}
NMActivationReason

2
src/core/nm-manager.c
View File

@@ -5768,7 +5768,7 @@ _internal_activate_device(NMManager *self, NMActiveConnection *active, GError **
}
if (nm_active_connection_get_activation_type(active) == NM_ACTIVATION_TYPE_MANAGED)
nm_device_managed_type_set(device, NM_DEVICE_MANAGED_TYPE_MANAGED);
nm_device_managed_type_set(device, NM_DEVICE_MANAGED_TYPE_FULL);
/* Try to find the controller connection/device if the connection has a dependency */
if (!find_controller(self,