diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-10-20 11:46:52 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-20 11:52:50 +0200 |
| commit | 78ac8151a255e233ac3191e7eb7e9b3e31e1bcb8 (patch) | |
| tree | ed8142e6eb516d12668ca9cd3e0e4eccac93ec52 /src/dhcp-manager/nm-dhcp-utils.c | |
| parent | 461da6fe1a5e9b7080281055bf5d5fb23a1e9922 (diff) | |
| parent | ae36f1bbdc75f999e8b02a05d44af098b5f6ecab (diff) | |
| download | NetworkManager-th/lr-rdisc-mtu.tar.gz | |
rdisc: merge branch 'lkundrak/lr-rdisc-mtu' (bgo#738104)th/lr-rdisc-mtu
https://bugzilla.gnome.org/show_bug.cgi?id=738104
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'src/dhcp-manager/nm-dhcp-utils.c')
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c index c017f6cfb3..46fa96ecd9 100644 --- a/src/dhcp-manager/nm-dhcp-utils.c +++ b/src/dhcp-manager/nm-dhcp-utils.c @@ -84,7 +84,7 @@ ip4_process_dhcpcd_rfc3442_routes (const char *str, route.network = rt_addr; route.plen = rt_cidr; route.gateway = rt_route; - route.source = NM_PLATFORM_SOURCE_DHCP; + route.source = NM_IP_CONFIG_SOURCE_DHCP; route.metric = priority; nm_ip4_config_add_route (ip4_config, &route); } @@ -191,7 +191,7 @@ ip4_process_dhclient_rfc3442_routes (const char *str, char addr[INET_ADDRSTRLEN]; /* normal route */ - route.source = NM_PLATFORM_SOURCE_DHCP; + route.source = NM_IP_CONFIG_SOURCE_DHCP; route.metric = priority; nm_ip4_config_add_route (ip4_config, &route); @@ -313,7 +313,7 @@ process_classful_routes (GHashTable *options, guint priority, NMIP4Config *ip4_c route.plen = 32; } route.gateway = rt_route; - route.source = NM_PLATFORM_SOURCE_DHCP; + route.source = NM_IP_CONFIG_SOURCE_DHCP; route.metric = priority; nm_ip4_config_add_route (ip4_config, &route); @@ -462,7 +462,7 @@ nm_dhcp_utils_ip4_config_from_options (const char *iface, route.plen = 32; /* this will be a device route if gwaddr is 0 */ route.gateway = gwaddr; - route.source = NM_PLATFORM_SOURCE_DHCP; + route.source = NM_IP_CONFIG_SOURCE_DHCP; route.metric = priority; nm_ip4_config_add_route (ip4_config, &route); nm_log_dbg (LOGD_IP, "adding route for server identifier: %s", @@ -479,7 +479,7 @@ nm_dhcp_utils_ip4_config_from_options (const char *iface, nm_log_info (LOGD_DHCP4, " lease time %d", address.lifetime); } - address.source = NM_PLATFORM_SOURCE_DHCP; + address.source = NM_IP_CONFIG_SOURCE_DHCP; nm_ip4_config_add_address (ip4_config, &address); str = g_hash_table_lookup (options, "host_name"); @@ -542,7 +542,7 @@ nm_dhcp_utils_ip4_config_from_options (const char *iface, goto error; if (int_mtu > 576) - nm_ip4_config_set_mtu (ip4_config, int_mtu); + nm_ip4_config_set_mtu (ip4_config, int_mtu, NM_IP_CONFIG_SOURCE_DHCP); } str = g_hash_table_lookup (options, "nis_domain"); @@ -629,7 +629,7 @@ nm_dhcp_utils_ip6_config_from_options (const char *iface, } address.address = tmp_addr; - address.source = NM_PLATFORM_SOURCE_DHCP; + address.source = NM_IP_CONFIG_SOURCE_DHCP; nm_ip6_config_add_address (ip6_config, &address); nm_log_info (LOGD_DHCP6, " address %s", str); } else if (info_only == FALSE) { |