From 8c06b389e25cfeeee9a5a8d9443fe4ad85f30a87 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 11 Aug 2005 13:31:50 +0000 Subject: [PATCH] 2005-08-11 Dan Williams * src/nm-dhcp-manager.c - (nm_dhcp_manager_get_ip4_config): if for some reason we don't get an gateway returned from DHCP, try to use the address of the DHCP server as the gateway instead. Found by Ralf Ertzinger. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@834 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/dhcp-manager/nm-dhcp-manager.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 967effdb2..9237acda1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-08-11 Dan Williams + + * src/nm-dhcp-manager.c + - (nm_dhcp_manager_get_ip4_config): if for some reason we don't get + an gateway returned from DHCP, try to use the address of the DHCP + server as the gateway instead. Found by Ralf Ertzinger. + 2005-08-10 Robert Love * gnome/applet/applet.c: Make applet->dbus_thread joinable so we can diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index c0f872034..09a43b92c 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -479,7 +479,11 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque goto out; if (!get_ip4_uint32s (manager, dev, "routers", &ip4_gateway, &count) || !count) - goto out; + { + /* If DHCP doesn't have a 'routers', just use the DHCP server's address as our gateway for now */ + if (!get_ip4_uint32s (manager, dev, "dhcp_server_identifier", &ip4_gateway, &count) || !count) + goto out; + } if (!get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers) || !num_ip4_nameservers) goto out;