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

dhcp: pass device specific route metric to nm_dhcp_systemd_get_lease_ip_configs()

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-11-19 15:17:32 +01:00
committed by Dan Winship
parent 9013fd42d6
commit 13d9b28323
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dhcp-manager/nm-dhcp-systemd.c
View File

@@ -372,7 +372,8 @@ get_leasefile_path (const char *iface, const char *uuid, gboolean ipv6)
static GSList *
nm_dhcp_systemd_get_lease_ip_configs (const char *iface,
const char *uuid,
gboolean ipv6)
gboolean ipv6,
guint32 default_route_metric)
{
GSList *leases = NULL;
gs_free char *path = NULL;
@@ -386,7 +387,7 @@ nm_dhcp_systemd_get_lease_ip_configs (const char *iface,
path = get_leasefile_path (iface, uuid, FALSE);
r = sd_dhcp_lease_load (&lease, path);
if (r == 0 && lease) {
ip4_config = lease_to_ip4_config (lease, NULL, 0, FALSE, NULL);
ip4_config = lease_to_ip4_config (lease, NULL, default_route_metric, FALSE, NULL);
if (ip4_config)
leases = g_slist_append (leases, ip4_config);
}