summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-09-20 20:32:24 +0200
committerThomas Haller <thaller@redhat.com>2021-09-21 08:36:14 +0200
commitb1ad3f1ba5f15a3a4a753bbc19bb6d08f313bc69 (patch)
tree1bafdb8c7e4193d65d4500515b4f66ed6cceb219
parentc52bf43948e16a518a279882a6b16f5635acb672 (diff)
downloadNetworkManager-b1ad3f1ba5f15a3a4a753bbc19bb6d08f313bc69.tar.gz
l3cfg: return any IPv4/IPv6 route from nm_l3_config_data_get_best_default_route()
-rw-r--r--src/core/nm-l3-config-data.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index cb0f608795..70fca5afb4 100644
--- a/src/core/nm-l3-config-data.c
+++ b/src/core/nm-l3-config-data.c
@@ -1315,9 +1315,16 @@ const NMPObject *
nm_l3_config_data_get_best_default_route(const NML3ConfigData *self, int addr_family)
{
nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
- nm_assert_addr_family(addr_family);
- return self->best_default_route_x[NM_IS_IPv4(addr_family)];
+ switch (addr_family) {
+ case AF_INET:
+ return self->best_default_route_4;
+ case AF_INET6:
+ return self->best_default_route_6;
+ case AF_UNSPEC:
+ return self->best_default_route_4 ?: self->best_default_route_6;
+ }
+ return nm_assert_unreachable_val(NULL);
}
/*****************************************************************************/