fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-16 18:10:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ip-tunnel: set cloned-mac-address only for layer2 tunnel devices

Browse source 
For ip-tunnel modes that encapsulate layer2 packets (gretap and
ip6gretap) we allow the presence of an ethernet setting in the
connection and honor the cloned-mac-address specified in it.

For all other modes, the ethernet setting is removed during
normalization, but a value different from 'preserve' could be set via
global default.

The kernel doesn't allow setting a MAC for layer3 devices, don't do
it.

(cherry picked from commit 0494a84878)
This commit is contained in:
Beniamino Galvani 2020-05-13 10:10:13 +02:00
parent 5d2f2a6549
commit 78ed14166c
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/devices/nm-device-ip-tunnel.c
View file

@ -667,7 +667,8 @@ create_and_realize (NMDevice *device,
mode = nm_setting_ip_tunnel_get_mode (s_ip_tunnel);
if ( nm_device_hw_addr_get_cloned (device,
if ( _nm_ip_tunnel_mode_is_layer2 (mode)
&& nm_device_hw_addr_get_cloned (device,
connection,
FALSE,
&hwaddr,
@ -686,13 +687,6 @@ create_and_realize (NMDevice *device,
g_return_val_if_reached (FALSE);
}
if (NM_IN_SET (mode, NM_IP_TUNNEL_MODE_GRE)) {
g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
"Invalid hardware address '%s' for tunnel type",
hwaddr);
return FALSE;
}
mac_address_valid = TRUE;
}
@ -929,6 +923,23 @@ can_reapply_change (NMDevice *device,
error);
}
static NMActStageReturn
act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason)
{
NMDeviceIPTunnel *self = NM_DEVICE_IP_TUNNEL (device);
NMDeviceIPTunnelPrivate *priv = NM_DEVICE_IP_TUNNEL_GET_PRIVATE (self);
if ( _nm_ip_tunnel_mode_is_layer2 (priv->mode)
&& !nm_device_hw_addr_set_cloned (device,
nm_device_get_applied_connection (device),
FALSE)) {
*out_failure_reason = NM_DEVICE_STATE_REASON_CONFIG_FAILED;
return NM_ACT_STAGE_RETURN_FAILURE;
}
return NM_ACT_STAGE_RETURN_SUCCESS;
}
/*****************************************************************************/
static void
@ -1078,7 +1089,8 @@ nm_device_ip_tunnel_class_init (NMDeviceIPTunnelClass *klass)
NM_LINK_TYPE_IPIP,
NM_LINK_TYPE_SIT);
device_class->act_stage1_prepare_set_hwaddr_ethernet = TRUE;
device_class->act_stage1_prepare = act_stage1_prepare;
device_class->link_changed = link_changed;
device_class->can_reapply_change = can_reapply_change;
device_class->complete_connection = complete_connection;