diff options
author | Thomas Haller <thaller@redhat.com> | 2017-09-12 15:27:59 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2017-09-13 08:17:31 +0200 |
commit | 6698bf58bb53fb07838c52ca67293dd5352ec31c (patch) | |
tree | 681d5f4b08f4bf00fa2eec7f62ed2ecd2b9325e2 /src/nm-ip6-config.c | |
parent | 9a3117f1d3095e58859efce57ea4fb41d8fb7696 (diff) | |
download | NetworkManager-6698bf58bb53fb07838c52ca67293dd5352ec31c.tar.gz |
core: track routes with source RTPROT_KERNEL (rtm_protocol) in NMIP4Config/NMIP6Config
Let's not treat those routes special. I think this was originally done, because
we relied on kernel to add the IPv4 device route, so we would ignore RTPROT_KERNEL
routes and not delete them.
We want to track them for various reasons:
- for consistency, there is nothing special except that they might be
added by kernel.
- we expose the routes of NMIP4Config/NMIP6Config on D-Bus. That should
include also routes such as device routes. Note, this commit changes
that we now expose device routes on D-Bus too.
Diffstat (limited to 'src/nm-ip6-config.c')
-rw-r--r-- | src/nm-ip6-config.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 97d25d549c..ce77394256 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -501,8 +501,6 @@ nm_ip6_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int i if (route->table_coerced) continue; - if (route->rt_source == NM_IP_CONFIG_SOURCE_RTPROT_KERNEL) - continue; _add_route (self, plobj, NULL, NULL); } @@ -553,7 +551,7 @@ nm_ip6_config_commit (const NMIP6Config *self, AF_INET6, ifindex, routes, - nm_platform_lookup_predicate_routes_main_skip_rtprot_kernel, + nm_platform_lookup_predicate_routes_main, NULL)) success = FALSE; |