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

fix: don't add loopback addr during _l3_commit_one()

Browse source 
It's already added to the combined NML3ConfigData. Why here again?
This commit is contained in:
Thomas Haller 2022-07-26 17:11:58 +02:00
parent 5d6e1e39b7
commit e48eef030f
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3700,6 +3700,7 @@ _l3cfg_update_combined_config(NML3Cfg *self,
.address = NM_IPV4LO_NETWORK, .address = NM_IPV4LO_NETWORK,
.plen = 8, .plen = 8,
.peer_address = NM_IPV4LO_NETWORK, .peer_address = NM_IPV4LO_NETWORK,
.a_no_auto_noprefixroute = TRUE,
}; };
nm_l3_config_data_add_address_4(l3cd, &ip4_address); nm_l3_config_data_add_address_4(l3cd, &ip4_address);
@ -3708,6 +3709,7 @@ _l3cfg_update_combined_config(NML3Cfg *self,
const NMPlatformIP6Address ip6_address = (NMPlatformIP6Address){ const NMPlatformIP6Address ip6_address = (NMPlatformIP6Address){
.address = IN6ADDR_LOOPBACK_INIT, .address = IN6ADDR_LOOPBACK_INIT,
.plen = 128, .plen = 128,
.a_no_auto_noprefixroute = TRUE,
}; };
nm_l3_config_data_add_address_6(l3cd, &ip6_address); nm_l3_config_data_add_address_6(l3cd, &ip6_address);
@ -4299,30 +4301,6 @@ _l3_commit_one(NML3Cfg *self,
} }
} }
if (self->priv.ifindex == 1) {
if (!addresses)
addresses = g_ptr_array_new_with_free_func((GDestroyNotify) nmp_object_unref);
if (IS_IPv4) {
g_ptr_array_add(addresses,
nmp_object_new(NMP_OBJECT_TYPE_IP4_ADDRESS,
&((const NMPlatformIP4Address){
.address = NM_IPV4LO_NETWORK,
.a_no_auto_noprefixroute = TRUE,
.ifindex = 1,
.plen = 8,
})));
} else {
g_ptr_array_add(addresses,
nmp_object_new(NMP_OBJECT_TYPE_IP6_ADDRESS,
&((const NMPlatformIP6Address){
.address = IN6ADDR_LOOPBACK_INIT,
.a_no_auto_noprefixroute = TRUE,
.ifindex = 1,
.plen = 128,
})));
}
}
/* FIXME(l3cfg): need to honor and set nm_l3_config_data_get_ndisc_*(). */ /* FIXME(l3cfg): need to honor and set nm_l3_config_data_get_ndisc_*(). */
/* FIXME(l3cfg): need to honor and set nm_l3_config_data_get_mtu(). */ /* FIXME(l3cfg): need to honor and set nm_l3_config_data_get_mtu(). */