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

core: update DNS when the device enters IP_CONFIG state

Browse source 
Update DNS information when the device enters the IP_CONFIG state. In
this way, when dispatcher events "dhcp4-change,dhcp6-change" are
emitted resolv.conf already contains the information received from
the DHCP lease.

https://bugzilla.redhat.com/show_bug.cgi?id=2100456
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1283
(cherry picked from commit 1784fc9fa1)
(cherry picked from commit 95df70112f)
This commit is contained in:
Beniamino Galvani 2022-07-01 13:42:26 +02:00
parent ab4c9539f7
commit ace95e5113
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2131,19 +2131,14 @@ device_l3cd_changed(NMDevice *device,
nm_dns_manager_begin_updates(priv->dns_manager, __func__);
/* We catch already all the IP events registering on the device state changes but
* the ones where the IP changes with a stable state (i.e., activated):
* ignore IP config changes but when the device is in activated state.
* Prevents unnecessary changes to DNS information.
* FIXME(l3cfg): check why ^^^ this is needed and implement it. Note that
* this function is not always called when the device becomes ACTIVATED.
* Previously, we would also update the DNS manager's IP config in
* device_state_change(ACTIVATED). There we would also special-case
* pseudo-VPNs like wireguard. I don't see the code where this is handled
* now.
/* FIXME(l3cfg): Note that this function is not always called when the
* device becomes ACTIVATED. Previously, we would also update the DNS
* manager's IP config in device_state_change(ACTIVATED). There we would
* also special-case pseudo-VPNs like wireguard. I don't see the code where
* this is handled now.
*/
state = nm_device_get_state(device);
if (l3cd_new && state > NM_DEVICE_STATE_IP_CONFIG && state < NM_DEVICE_STATE_DEACTIVATING) {
if (l3cd_new && state >= NM_DEVICE_STATE_IP_CONFIG && state < NM_DEVICE_STATE_DEACTIVATING) {
nm_dns_manager_set_ip_config(priv->dns_manager,
AF_UNSPEC,
device,