Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now delays configuring the interface until we got the DHCP acknowledge message - this 

might fix the missing message from my router.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19468 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-12-12 01:49:47 +00:00
parent a3d2f8eea7
commit 10cc12da06
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/servers/net/DHCPClient.cpp
View File

@ -292,7 +292,8 @@ dhcp_message::PutOption(uint8* options, message_option option, uint8* data, uint
DHCPClient::DHCPClient(BMessenger target, const char* device)
: BHandler("dhcp"),
fDevice(device)
fDevice(device),
fConfiguration(kMsgConfigureInterface)
{
fTransactionID = system_time();
@ -409,42 +410,43 @@ DHCPClient::DHCPClient(BMessenger target, const char* device)
fAssignedAddress = message->your_address;
BMessage configure(kMsgConfigureInterface);
configure.AddString("device", fDevice.String());
fConfiguration.MakeEmpty();
fConfiguration.AddString("device", fDevice.String());
BMessage address;
address.AddString("family", "inet");
address.AddString("address", _ToString(fAssignedAddress));
_ParseOptions(*message, address);
configure.AddMessage("address", &address);
fConfiguration.AddMessage("address", &address);
// configure interface
BMessage reply;
target.SendMessage(&configure, &reply);
// request configuration from the server
status_t status;
if (reply.FindInt32("status", &status) == B_OK
&& status == B_OK) {
// configuration succeeded, request it from the server
_ResetTimeout(socket);
_ResetTimeout(socket);
state = REQUESTING;
_PrepareMessage(request);
state = REQUESTING;
_PrepareMessage(request);
fStatus = _SendMessage(socket, request, broadcast);
// we're sending a broadcast so that all offers get an answer
}
fStatus = _SendMessage(socket, request, broadcast);
// we're sending a broadcast so that all potential offers get an answer
break;
}
case DHCP_ACK:
{
if (state != REQUESTING)
continue;
// our address request has been acknowledged
state = ACKNOWLEDGED;
fStatus = B_OK;
// configure interface
BMessage reply;
target.SendMessage(&fConfiguration, &reply);
if (reply.FindInt32("status", &fStatus) != B_OK)
fStatus = B_OK;
break;
}
case DHCP_NACK:
if (state != REQUESTING)

1
src/servers/net/DHCPClient.h
View File

@ -38,6 +38,7 @@ class DHCPClient : public BHandler {
BString _ToString(in_addr_t address) const;
BString fDevice;
BMessage fConfiguration;
BMessageRunner* fRunner;
uint8 fMAC[6];
uint32 fTransactionID;