diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-09-28 18:48:39 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-10-09 22:06:25 +0200 |
| commit | 2e146148702615f31209f6ccc07ca02663eddb7b (patch) | |
| tree | 98c7d5a1739491ac0745a16b5d5162206bfe5700 /src/nm-ip6-config.c | |
| parent | 01930c96b853f2fc776a02cd394167b99ab6a8ea (diff) | |
| download | NetworkManager-2e146148702615f31209f6ccc07ca02663eddb7b.tar.gz | |
core: use ipv6.route-table setting for other IPv6 routes
Including device-routes, default-route, SLAAC.
Diffstat (limited to 'src/nm-ip6-config.c')
| -rw-r--r-- | src/nm-ip6-config.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index a5fb3a3c23..480465e5b9 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -470,6 +470,7 @@ nm_ip6_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int i void nm_ip6_config_add_device_routes (NMIP6Config *self, + guint32 route_table, guint32 route_metric) { const NMIP6ConfigPrivate *priv; @@ -513,6 +514,7 @@ nm_ip6_config_add_device_routes (NMIP6Config *self, route->ifindex = ifindex; route->rt_source = NM_IP_CONFIG_SOURCE_KERNEL; + route->table_coerced = nm_platform_route_table_coerce (route_table); route->metric = route_metric; if (has_peer) { @@ -1855,7 +1857,8 @@ void nm_ip6_config_reset_routes_ndisc (NMIP6Config *self, const NMNDiscRoute *routes, guint routes_n, - guint32 metric) + guint32 route_table, + guint32 route_metric) { NMIP6ConfigPrivate *priv; guint i; @@ -1884,7 +1887,8 @@ nm_ip6_config_reset_routes_ndisc (NMIP6Config *self, r->plen = ndisc_route->plen; r->gateway = ndisc_route->gateway; r->rt_source = NM_IP_CONFIG_SOURCE_NDISC; - r->metric = metric; + r->table_coerced = nm_platform_route_table_coerce (route_table); + r->metric = route_metric; if (_nm_ip_config_add_obj (priv->multi_idx, &priv->idx_ip6_routes_, |