diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-12-06 13:16:30 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-15 11:36:07 +0100 |
| commit | 989b5fabaac95f9367fb5f1c730db5dca7eab0de (patch) | |
| tree | 13399e58ed18d42fee76bd33374dc5babec9bfb0 | |
| parent | d83eee5d575ffaa42da77e06698f6a93e85b62b8 (diff) | |
| download | NetworkManager-989b5fabaac95f9367fb5f1c730db5dca7eab0de.tar.gz | |
device: expose nm_device_get_route_metric_default()
| -rw-r--r-- | src/devices/nm-device.c | 8 | ||||
| -rw-r--r-- | src/devices/nm-device.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index a1115e58ea..cbd3aee02d 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1721,8 +1721,8 @@ nm_device_get_metered (NMDevice *self) return NM_DEVICE_GET_PRIVATE (self)->metered; } -static guint32 -_get_route_metric_default (NMDevice *self) +guint32 +nm_device_get_route_metric_default (NMDeviceType device_type) { /* Device 'priority' is used for the default route-metric and is based on * the device type. The settings ipv4.route-metric and ipv6.route-metric @@ -1741,7 +1741,7 @@ _get_route_metric_default (NMDevice *self) * metrics (except for IPv6, where 0 means 1024). */ - switch (nm_device_get_device_type (self)) { + switch (device_type) { /* 50 is reserved for VPN (NM_VPN_ROUTE_METRIC_DEFAULT) */ case NM_DEVICE_TYPE_ETHERNET: case NM_DEVICE_TYPE_VETH: @@ -1870,7 +1870,7 @@ nm_device_get_route_metric (NMDevice *self, if (route_metric >= 0) goto out; } - route_metric = _get_route_metric_default (self); + route_metric = nm_device_get_route_metric_default (nm_device_get_device_type (self)); out: return nm_utils_ip_route_metric_normalize (addr_family, route_metric); } diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 42107ce481..abb2420c14 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -450,6 +450,8 @@ NMMetered nm_device_get_metered (NMDevice *dev); guint32 nm_device_get_route_table (NMDevice *self, int addr_family, gboolean fallback_main); guint32 nm_device_get_route_metric (NMDevice *dev, int addr_family); +guint32 nm_device_get_route_metric_default (NMDeviceType device_type); + const char * nm_device_get_hw_address (NMDevice *dev); const char * nm_device_get_permanent_hw_address (NMDevice *self); const char * nm_device_get_permanent_hw_address_full (NMDevice *self, |