fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 19:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: delay IP ready state until all objects are committed

Browse source 
Don't progress to the IP ready state until all objects are committed
to platform. Note that l3cfg has a 20 seconds timeout after which
unavailable objects are considered "definitely unavailable" and are
removed from the list.

Fixes-test: @ipv6_routes_with_src
https://bugzilla.redhat.com/show_bug.cgi?id=2043133
(cherry picked from commit f15b3f15a7)
This commit is contained in:
Beniamino Galvani 2022-02-14 09:39:35 +01:00
parent ce3638cd33
commit f8577bf7f7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/devices/nm-device.c
View file

@ -3057,6 +3057,7 @@ _dev_ip_state_check(NMDevice *self, int addr_family)
gboolean s_is_started = FALSE;
gboolean s_is_failed = FALSE;
gboolean s_is_pending = FALSE;
gboolean has_tna = FALSE;
gboolean v_bool;
NMDeviceIPState ip_state;
NMDeviceIPState ip_state_other;
@ -3188,6 +3189,10 @@ _dev_ip_state_check(NMDevice *self, int addr_family)
&s_is_pending,
&s_is_failed);
has_tna = priv->l3cfg && nm_l3cfg_has_temp_not_available_obj(priv->l3cfg, addr_family);
if (has_tna)
s_is_pending = TRUE;
if (s_is_failed)
ip_state = NM_DEVICE_IP_STATE_FAILED;
else if (s_is_pending)
@ -3215,7 +3220,7 @@ got_ip_state:
nm_assert(!priv->ip_data_4.is_ignore);
_LOGT_ip(addr_family,
"check-state: state %s => %s, is_failed=%d, is_pending=%d, is_started=%d, "
"check-state: state %s => %s, is_failed=%d, is_pending=%d, is_started=%d temp_na=%d, "
"may-fail-4=%d, may-fail-6=%d;"
"%s;%s%s%s%s%s%s;%s%s%s%s%s%s%s%s",
nm_device_ip_state_to_string(priv->ip_data_x[IS_IPv4].state),
@ -3223,6 +3228,7 @@ got_ip_state:
s_is_failed,
s_is_pending,
s_is_started,
has_tna,
_prop_get_ipvx_may_fail_cached(self, AF_INET, IS_IPv4 ? &may_fail : &may_fail_other),
_prop_get_ipvx_may_fail_cached(self, AF_INET6, !IS_IPv4 ? &may_fail : &may_fail_other),
priv->ip_data_4.is_disabled ? " disabled4" : "",