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

device: detect duplicate IPv4 addresses when method=auto

Browse source
This commit is contained in:
Beniamino Galvani 2015-12-23 17:59:08 +01:00
parent 28f6e8b4d2
commit 75068a085a
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4446,6 +4446,17 @@ dhcp4_fail (NMDevice *self, gboolean timeout)
g_warn_if_reached ();
}
static void
dhcp4_dad_cb (NMDevice *self, NMIP4Config **configs, gboolean success)
{
if (success)
nm_device_activate_schedule_ip4_config_result (self, configs[1]);
else {
nm_device_state_changed (self, NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_CONFIG_FAILED);
}
}
static void
dhcp4_state_changed (NMDhcpClient *client,
NMDhcpState state,
@ -4456,6 +4467,8 @@ dhcp4_state_changed (NMDhcpClient *client,
{
NMDevice *self = NM_DEVICE (user_data);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMIP4Config *manual, **configs;
NMConnection *connection;
g_return_if_fail (nm_dhcp_client_get_ipv6 (client) == FALSE);
g_return_if_fail (!ip4_config || NM_IS_IP4_CONFIG (ip4_config));
@ -4475,9 +4488,21 @@ dhcp4_state_changed (NMDhcpClient *client,
nm_dhcp4_config_set_options (priv->dhcp4_config, options);
g_object_notify (G_OBJECT (self), NM_DEVICE_DHCP4_CONFIG);
if (priv->ip4_state == IP_CONF)
nm_device_activate_schedule_ip4_config_result (self, ip4_config);
else if (priv->ip4_state == IP_DONE) {
if (priv->ip4_state == IP_CONF) {
connection = nm_device_get_applied_connection (self);
g_assert (connection);
manual = nm_ip4_config_new (nm_device_get_ip_ifindex (self));
nm_ip4_config_merge_setting (manual,
nm_connection_get_setting_ip4_config (connection),
nm_device_get_ip4_route_metric (self));
configs = g_new0 (NMIP4Config *, 3);
configs[0] = manual;
configs[1] = g_object_ref (ip4_config);
ipv4_dad_start (self, configs, dhcp4_dad_cb);
} else if (priv->ip4_state == IP_DONE) {
dhcp4_lease_change (self, ip4_config);
nm_device_update_metered (self);
}