From ef8ff79cdb21ff4e05d6f0a69d04f0418990984d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 12 Dec 2006 02:56:23 +0000 Subject: [PATCH] * A copy and paste bug prevented the gateway to be added (worked before the previous commit). * Removed the acceptance of a missing DHCP acknowledge message. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19470 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/net/DHCPClient.cpp | 9 +-------- src/servers/net/NetServer.cpp | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/servers/net/DHCPClient.cpp b/src/servers/net/DHCPClient.cpp index 14dda2b4e5..060103c94d 100644 --- a/src/servers/net/DHCPClient.cpp +++ b/src/servers/net/DHCPClient.cpp @@ -369,15 +369,8 @@ DHCPClient::DHCPClient(BMessenger target, const char* device) if (state == INIT) fStatus = _SendMessage(socket, discover, broadcast); - else if (state == REQUESTING) { - if (fTries > 0) { - // The server not only didn't acknowledge the address, it did nothing. - // So we just ignore this little annoyance and continue with life. - fStatus = B_OK; - break; - } + if (state == REQUESTING) fStatus = _SendMessage(socket, request, broadcast); - } if (fStatus < B_OK) break; diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp index a96f989562..0858cef0a4 100644 --- a/src/servers/net/NetServer.cpp +++ b/src/servers/net/NetServer.cpp @@ -428,6 +428,7 @@ NetServer::_ConfigureInterface(int socket, BMessage& interface, bool fromMessage route.flags = RTF_STATIC | RTF_DEFAULT | RTF_GATEWAY; route.gateway = &gateway; + request.ifr_route = route; if (ioctl(socket, SIOCADDRT, &request, sizeof(request)) < 0) { fprintf(stderr, "%s: Could not add route for %s: %s\n", Name(), device, strerror(errno));