fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 14:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: limit maximum MTU for connection default of "infiniband.mtu"

Browse source 
Connection defaults should correspond in range to the per-profile values.
"infiniband.mtu" is required to be not larger than 65520, so we also
need to honor that when parsing the connection default.
This commit is contained in:
Thomas Haller 2019-04-05 12:31:49 +02:00
parent b25cf61a33
commit 47412936c2
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/devices/nm-device-private.h
View file

@ -168,7 +168,8 @@ NMIPConfig *nm_device_ip_config_new (NMDevice *self, int addr_family);
/*****************************************************************************/
gint64 nm_device_get_configured_mtu_from_connection_default (NMDevice *self,
const char *property_name);
const char *property_name,
guint32 max_mtu);
guint32 nm_device_get_configured_mtu_from_connection (NMDevice *device,
GType setting_type,

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

@ -8926,12 +8926,13 @@ linklocal6_start (NMDevice *self)
gint64
nm_device_get_configured_mtu_from_connection_default (NMDevice *self,
const char *property_name)
const char *property_name,
guint32 max_mtu)
{
return nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA,
property_name,
self,
0, G_MAXUINT32, -1);
0, max_mtu, -1);
}
guint32
@ -8944,6 +8945,7 @@ nm_device_get_configured_mtu_from_connection (NMDevice *self,
NMSetting *setting;
gint64 mtu_default;
guint32 mtu = 0;
guint32 max_mtu = G_MAXUINT32;
nm_assert (NM_IS_DEVICE (self));
nm_assert (out_source);
@ -8966,6 +8968,7 @@ nm_device_get_configured_mtu_from_connection (NMDevice *self,
if (setting)
mtu = nm_setting_infiniband_get_mtu (NM_SETTING_INFINIBAND (setting));
global_property_name = NM_CON_DEFAULT ("infiniband.mtu");
max_mtu = NM_INFINIBAND_MAX_MTU;
} else if (setting_type == NM_TYPE_SETTING_IP_TUNNEL) {
if (setting)
mtu = nm_setting_ip_tunnel_get_mtu (NM_SETTING_IP_TUNNEL (setting));
@ -8977,13 +8980,12 @@ nm_device_get_configured_mtu_from_connection (NMDevice *self,
} else
g_return_val_if_reached (0);
if (mtu) {
*out_source = NM_DEVICE_MTU_SOURCE_CONNECTION;
return mtu;
}
mtu_default = nm_device_get_configured_mtu_from_connection_default (self, global_property_name);
mtu_default = nm_device_get_configured_mtu_from_connection_default (self, global_property_name, max_mtu);
if (mtu_default >= 0) {
*out_source = NM_DEVICE_MTU_SOURCE_CONNECTION;
return (guint32) mtu_default;

2
src/devices/wwan/nm-modem.c
View file

@ -885,7 +885,7 @@ nm_modem_get_configured_mtu (NMDevice *self, NMDeviceMtuSource *out_source)
}
property_name = NM_IS_SETTING_GSM (setting) ? "gsm.mtu" : "cdma.mtu";
mtu_default = nm_device_get_configured_mtu_from_connection_default (self, property_name);
mtu_default = nm_device_get_configured_mtu_from_connection_default (self, property_name, G_MAXUINT32);
if (mtu_default >= 0) {
*out_source = NM_DEVICE_MTU_SOURCE_CONNECTION;
return (guint32) mtu_default;