fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 21:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: make route-metric configurable per-device

Browse source 
The route-metric can be configured per connection via the
ipv4.route-metric and ipv6.route-metric fields. When the
value is left at -1 (the default), we would determine the
route-metric based on the device type (nm_device_get_priority()).

Extend that scheme by making the default value overwritable in
NetworkManager.conf.
This commit is contained in:
Thomas Haller 2015-05-15 12:21:59 +02:00
parent dc0193ac02
commit 59a991725a
2 changed files with 51 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
man/NetworkManager.conf.xml.in
View file

@ -490,7 +490,7 @@ ipv6.ip6-privacy=1
Note that also "wlan0" gets "ipv6.ip6-privacy=1", because although the section
"[connection-wifi-wlan0]" matches the device, it does not contain that property
and the search continues.
This is just an example, currently these properties are not overwritable.
This is just an example, ipv6.ip6-privacy property is currently not overwritable.
</para>
<para>
@ -520,6 +520,12 @@ ipv6.ip6-privacy=1
<para>
The following properties are supported to have their default values configured:
<variablelist>
<varlistentry>
<term><varname>ipv4.route-metric</varname></term>
</varlistentry>
<varlistentry>
<term><varname>ipv6.route-metric</varname></term>
</varlistentry>
</variablelist>
</para>
</refsect1>

75
src/devices/nm-device.c
View file

@ -741,50 +741,63 @@ nm_device_get_priority (NMDevice *self)
return 11000;
}
guint32
nm_device_get_ip4_route_metric (NMDevice *self)
static guint32
_get_ipx_route_metric (NMDevice *self,
gboolean is_v4)
{
char *value;
gint64 route_metric;
NMSettingIPConfig *s_ip;
NMConnection *connection;
NMSettingIPConfig *s_ip = NULL;
gint64 route_metric = -1;
g_return_val_if_fail (NM_IS_DEVICE (self), G_MAXUINT32);
connection = nm_device_get_connection (self);
if (connection)
s_ip = nm_connection_get_setting_ip4_config (connection);
if (connection) {
s_ip = is_v4
? nm_connection_get_setting_ip4_config (connection)
: nm_connection_get_setting_ip6_config (connection);
/* Slave interfaces don't have IP settings, but we may get here when
* external changes are made or when noticing IP changes when starting
* the slave connection.
*/
if (s_ip)
route_metric = nm_setting_ip_config_get_route_metric (s_ip);
/* Slave interfaces don't have IP settings, but we may get here when
* external changes are made or when noticing IP changes when starting
* the slave connection.
*/
if (s_ip) {
route_metric = nm_setting_ip_config_get_route_metric (s_ip);
if (route_metric >= 0)
goto out;
}
}
return route_metric >= 0 ? route_metric : nm_device_get_priority (self);
/* use the current NMConfigData, which makes this configuration reloadable.
* Note that that means that the route-metric might change between SIGHUP.
* You must cache the returned value if that is a problem. */
value = nm_config_data_get_connection_default (nm_config_get_data (nm_config_get ()),
is_v4 ? "ipv4.route-metric" : "ipv6.route-metric", self);
if (value) {
route_metric = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT32, -1);
g_free (value);
if (route_metric >= 0)
goto out;
}
route_metric = nm_device_get_priority (self);
out:
if (!is_v4)
route_metric = nm_utils_ip6_route_metric_normalize (route_metric);
return route_metric;
}
guint32
nm_device_get_ip4_route_metric (NMDevice *self)
{
return _get_ipx_route_metric (self, TRUE);
}
guint32
nm_device_get_ip6_route_metric (NMDevice *self)
{
NMConnection *connection;
NMSettingIPConfig *s_ip = NULL;
gint64 route_metric = -1;
g_return_val_if_fail (NM_IS_DEVICE (self), G_MAXUINT32);
connection = nm_device_get_connection (self);
if (connection)
s_ip = nm_connection_get_setting_ip6_config (connection);
/* Slave interfaces don't have IP settings, but we may get here when
* external changes are made or when noticing IP changes when starting
* the slave connection.
*/
if (s_ip)
route_metric = nm_setting_ip_config_get_route_metric (s_ip);
return route_metric >= 0 ? route_metric : nm_device_get_priority (self);
return _get_ipx_route_metric (self, FALSE);
}
const NMPlatformIP4Route *