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

l3cfg: add the DNS routing rule only when needed

Browse Source 
Don't try to add the routing rule that points to the table containing
DNS routes at every commit.

Instead, look into the platform cache to see if the rule already
exists and add it only when needed.
This commit is contained in:
Beniamino Galvani
2025-01-10 13:58:34 +01:00
parent d3da1d56fd
commit aefc7732f0
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/nm-l3cfg.c
View File

@@ -4009,11 +4009,12 @@ _l3cfg_routed_dns(NML3Cfg *self, NML3ConfigData *l3cd)
if (route_added) { if (route_added) {
NMPlatformRoutingRule rule; NMPlatformRoutingRule rule;
NMPObject rule_obj;
/* Add a routing rule that selects the table when not using the /* Add a routing rule that selects the table when not using the
* special fwmark. Note that the rule is shared between all * special fwmark. Note that the rule is shared between all
* devices that use DNS routes. At the moment there is no cleanup * devices that use DNS routes. There is no cleanup mechanism:
* mechanism: once added the rule stays forever. */ * once added the rule stays forever. */
rule = ((NMPlatformRoutingRule) { rule = ((NMPlatformRoutingRule) {
.addr_family = addr_family, .addr_family = addr_family,
.flags = FIB_RULE_INVERT, .flags = FIB_RULE_INVERT,
@@ -4025,9 +4026,17 @@ _l3cfg_routed_dns(NML3Cfg *self, NML3ConfigData *l3cd)
.protocol = RTPROT_STATIC, .protocol = RTPROT_STATIC,
}); });
/* FIXME: don't add the rule every time */ nmp_object_stackinit(&rule_obj, NMP_OBJECT_TYPE_ROUTING_RULE, &rule);
nmp_global_tracker_track_rule(self->priv.global_tracker, &rule, 10, self, NULL);
nmp_global_tracker_sync(self->priv.global_tracker, NMP_OBJECT_TYPE_ROUTING_RULE, TRUE); if (!nm_platform_lookup_obj(self->priv.platform,
NMP_CACHE_ID_TYPE_OBJECT_TYPE,
&rule_obj)) {
_LOGT("adding rule to DNS routing table");
nmp_global_tracker_track_rule(self->priv.global_tracker, &rule, 10, self, NULL);
nmp_global_tracker_sync(self->priv.global_tracker,
NMP_OBJECT_TYPE_ROUTING_RULE,
TRUE);
}
} }
self->priv.dns_route_added_x[IS_IPv4] = route_added; self->priv.dns_route_added_x[IS_IPv4] = route_added;