summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-07-29 19:13:31 +0200
committerThomas Haller <thaller@redhat.com>2014-07-29 19:41:26 +0200
commit816715d7261380ba75d8a036f8a1d86f39fb654d (patch)
treeb188a4c5b37336114d97ecc46a8ababccef5ec1c
parent7f35d808f54ac0b085866fd985471d1c248228f8 (diff)
downloadNetworkManager-816715d7261380ba75d8a036f8a1d86f39fb654d.tar.gz
core: fix setting next_hop in nm_ip6_config_create_setting()
The next-hop should always be set to route->gateway. Just as it is done for IPv4. This bug only affects routes to ::/x, with x > 0 (i.e. the uncommon case of an all-zero, non-default route). Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r--src/nm-ip6-config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 365f48667a..7ec5be9f41 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -559,8 +559,7 @@ nm_ip6_config_create_setting (const NMIP6Config *config)
s_route = nm_ip6_route_new ();
nm_ip6_route_set_dest (s_route, &route->network);
nm_ip6_route_set_prefix (s_route, route->plen);
- if (!IN6_IS_ADDR_UNSPECIFIED (&route->network))
- nm_ip6_route_set_next_hop (s_route, &route->gateway);
+ nm_ip6_route_set_next_hop (s_route, &route->gateway);
nm_ip6_route_set_metric (s_route, route->metric);
nm_setting_ip6_config_add_route (s_ip6, s_route);