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

2005-07-05 Robert Love <rml@novell.com>

Browse source 
* src/NetworkManagerDevice.c: use link-local (autoip) on DHCP failure
          on wired or unencrypted wireless.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@781 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2005-07-05 15:05:33 +00:00 • committed by Robert Love
parent 8cf611abfb
commit 94f05a42d2
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,6 +1,11 @@
2005-07-05 Robert Love <rml@novell.com>
* src/NetworkManagerDevice.c: use link-local (autoip) on DHCP failure
on wired or unencrypted wireless.
2005-07-01 Robert Love <rml@novell.com>
* src/NetworkManagersystem.c: Print the error via strerror().
* src/NetworkManagerSystem.c: Print the error via strerror().
2005-06-30 Robert Love <rml@novell.com>

20
src/NetworkManagerDevice.c
View file

@ -2845,7 +2845,11 @@ static gboolean nm_device_activate_stage4_ip_config_timeout (NMActRequest *req)
}
if (nm_device_is_wired (dev))
nm_policy_schedule_activation_failed (req);
{
/* Wired network, no DHCP reply. Let's get an IP via Zeroconf. */
nm_info ("No DHCP reply received. Automatically obtaining IP via Zeroconf.");
ip4_config = nm_device_new_ip4_autoip_config (dev);
}
else if (nm_device_is_wireless (dev))
{
NMAccessPoint *ap = nm_act_request_get_ap (req);
@ -2873,11 +2877,21 @@ static gboolean nm_device_activate_stage4_ip_config_timeout (NMActRequest *req)
}
else
{
/* If DHCP fails on an unencrypted access point, we're done */
nm_policy_schedule_activation_failed (req);
/*
* Wireless, not encrypted, no DHCP Reply. Try Zeroconf. We do not do this in
* the encrypted case, because the problem could be (and more likely is) a bad key.
*/
nm_info ("No DHCP reply received. Automatically obtaining IP via Zeroconf.");
ip4_config = nm_device_new_ip4_autoip_config (dev);
}
}
if (ip4_config)
{
nm_act_request_set_ip4_config (req, ip4_config);
nm_device_activate_schedule_stage5_ip_config_commit (req);
}
out:
nm_info ("Activation (%s) Stage 4 (IP Configure Timeout) complete.", nm_device_get_iface (dev));
return FALSE;