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

core: consolidate DHCP failure handling code

Browse source
This commit is contained in:
Dan Williams 2011-10-07 12:23:35 -05:00
parent 7050e6909c
commit d90f0e186a
1 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/nm-device.c
View file

@ -1233,13 +1233,26 @@ dhcp4_lease_change (NMDevice *device)
} }
} }
static void
dhcp4_fail (NMDevice *device, gboolean timeout)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
NMDeviceState dev_state = nm_device_get_state (device);
nm_dhcp4_config_reset (priv->dhcp4_config);
if (timeout || (dev_state == NM_DEVICE_STATE_IP_CONFIG))
nm_device_activate_schedule_stage4_ip4_config_timeout (device);
else if (dev_state == NM_DEVICE_STATE_ACTIVATED)
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED);
}
static void static void
dhcp4_state_changed (NMDHCPClient *client, dhcp4_state_changed (NMDHCPClient *client,
NMDHCPState state, NMDHCPState state,
gpointer user_data) gpointer user_data)
{ {
NMDevice *device = NM_DEVICE (user_data); NMDevice *device = NM_DEVICE (user_data);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
NMDeviceState dev_state; NMDeviceState dev_state;
g_return_if_fail (nm_dhcp_client_get_ipv6 (client) == FALSE); g_return_if_fail (nm_dhcp_client_get_ipv6 (client) == FALSE);
@ -1260,20 +1273,13 @@ dhcp4_state_changed (NMDHCPClient *client,
dhcp4_lease_change (device); dhcp4_lease_change (device);
break; break;
case DHC_TIMEOUT: /* timed out contacting DHCP server */ case DHC_TIMEOUT: /* timed out contacting DHCP server */
nm_dhcp4_config_reset (priv->dhcp4_config); dhcp4_fail (device, TRUE);
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG)
nm_device_activate_schedule_stage4_ip4_config_timeout (device);
break; break;
case DHC_END: /* dhclient exited normally */ case DHC_END: /* dhclient exited normally */
case DHC_FAIL: /* all attempts to contact server timed out, sleeping */ case DHC_FAIL: /* all attempts to contact server timed out, sleeping */
case DHC_ABEND: /* dhclient exited abnormally */ case DHC_ABEND: /* dhclient exited abnormally */
nm_dhcp4_config_reset (priv->dhcp4_config);
/* dhclient quit and can't get/renew a lease; so kill the connection */ /* dhclient quit and can't get/renew a lease; so kill the connection */
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG) dhcp4_fail (device, FALSE);
nm_device_activate_schedule_stage4_ip4_config_timeout (device);
else if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED)
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED);
break; break;
default: default:
break; break;
@ -1289,9 +1295,7 @@ dhcp4_timeout (NMDHCPClient *client, gpointer user_data)
g_return_if_fail (nm_dhcp_client_get_ipv6 (client) == FALSE); g_return_if_fail (nm_dhcp_client_get_ipv6 (client) == FALSE);
nm_dhcp_client_stop (client, FALSE); nm_dhcp_client_stop (client, FALSE);
dhcp4_fail (device, TRUE);
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG)
nm_device_activate_schedule_stage4_ip4_config_timeout (device);
} }
static NMActStageReturn static NMActStageReturn
@ -1633,6 +1637,20 @@ dhcp6_lease_change (NMDevice *device)
} }
} }
static void
dhcp6_fail (NMDevice *device, gboolean timeout)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
NMDeviceState dev_state = nm_device_get_state (device);
nm_dhcp6_config_reset (priv->dhcp6_config);
if (timeout || (dev_state == NM_DEVICE_STATE_IP_CONFIG))
nm_device_activate_schedule_stage4_ip6_config_timeout (device);
else if (dev_state == NM_DEVICE_STATE_ACTIVATED)
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED);
}
static void static void
dhcp6_state_changed (NMDHCPClient *client, dhcp6_state_changed (NMDHCPClient *client,
NMDHCPState state, NMDHCPState state,
@ -1660,9 +1678,7 @@ dhcp6_state_changed (NMDHCPClient *client,
dhcp6_lease_change (device); dhcp6_lease_change (device);
break; break;
case DHC_TIMEOUT: /* timed out contacting DHCP server */ case DHC_TIMEOUT: /* timed out contacting DHCP server */
nm_dhcp6_config_reset (priv->dhcp6_config); dhcp6_fail (device, TRUE);
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG)
nm_device_activate_schedule_stage4_ip6_config_timeout (device);
break; break;
case DHC_END: /* dhclient exited normally */ case DHC_END: /* dhclient exited normally */
/* In IPv6 info-only mode, the client doesn't handle leases so it /* In IPv6 info-only mode, the client doesn't handle leases so it
@ -1674,13 +1690,8 @@ dhcp6_state_changed (NMDHCPClient *client,
/* Otherwise, fall through */ /* Otherwise, fall through */
case DHC_FAIL: /* all attempts to contact server timed out, sleeping */ case DHC_FAIL: /* all attempts to contact server timed out, sleeping */
case DHC_ABEND: /* dhclient exited abnormally */ case DHC_ABEND: /* dhclient exited abnormally */
nm_dhcp6_config_reset (priv->dhcp6_config);
/* dhclient quit and can't get/renew a lease; so kill the connection */ /* dhclient quit and can't get/renew a lease; so kill the connection */
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG) dhcp6_fail (device, FALSE);
nm_device_activate_schedule_stage4_ip6_config_timeout (device);
else if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED)
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED);
break; break;
default: default:
break; break;
@ -1696,9 +1707,7 @@ dhcp6_timeout (NMDHCPClient *client, gpointer user_data)
g_return_if_fail (nm_dhcp_client_get_ipv6 (client) == TRUE); g_return_if_fail (nm_dhcp_client_get_ipv6 (client) == TRUE);
nm_dhcp_client_stop (client, FALSE); nm_dhcp_client_stop (client, FALSE);
dhcp6_fail (device, TRUE);
if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG)
nm_device_activate_schedule_stage4_ip6_config_timeout (device);
} }
static NMActStageReturn static NMActStageReturn