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

Removed the automatic endian conversion in PutOption() - it was confusing and

Browse Source 
the actual cause that my router didn't send an acknowledgement (qemu didn't care) :-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19469 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-12-12 02:18:51 +00:00
parent 10cc12da06
commit 0cf5e6ac7d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,7 @@ struct dhcp_message {
uint8* PutOption(uint8* options, message_option option, uint8* data, uint32 size); uint8* PutOption(uint8* options, message_option option, uint8* data, uint32 size);
} _PACKED; } _PACKED;
#define DHCP_FLAG_BROADCAST 0x8000
#define ARP_HARDWARE_TYPE_ETHER 1 #define ARP_HARDWARE_TYPE_ETHER 1
@ -130,7 +131,7 @@ dhcp_message::dhcp_message(message_type type)
uint8* next = options; uint8* next = options;
next = PutOption(next, OPTION_MESSAGE_TYPE, (uint8)type); next = PutOption(next, OPTION_MESSAGE_TYPE, (uint8)type);
next = PutOption(next, OPTION_MESSAGE_SIZE, (uint16)sizeof(dhcp_message)); next = PutOption(next, OPTION_MESSAGE_SIZE, (uint16)htons(sizeof(dhcp_message)));
next = PutOption(next, OPTION_END); next = PutOption(next, OPTION_END);
} }
@ -263,7 +264,6 @@ dhcp_message::PutOption(uint8* options, message_option option, uint8 data)
uint8* uint8*
dhcp_message::PutOption(uint8* options, message_option option, uint16 data) dhcp_message::PutOption(uint8* options, message_option option, uint16 data)
{ {
data = htons(data);
return PutOption(options, option, (uint8*)&data, sizeof(data)); return PutOption(options, option, (uint8*)&data, sizeof(data));
} }
@ -271,7 +271,6 @@ dhcp_message::PutOption(uint8* options, message_option option, uint16 data)
uint8* uint8*
dhcp_message::PutOption(uint8* options, message_option option, uint32 data) dhcp_message::PutOption(uint8* options, message_option option, uint32 data)
{ {
data = htonl(data);
return PutOption(options, option, (uint8*)&data, sizeof(data)); return PutOption(options, option, (uint8*)&data, sizeof(data));
} }
@ -537,7 +536,7 @@ DHCPClient::_PrepareMessage(dhcp_message& message)
message.hardware_type = ARP_HARDWARE_TYPE_ETHER; message.hardware_type = ARP_HARDWARE_TYPE_ETHER;
message.hardware_address_length = 6; message.hardware_address_length = 6;
message.transaction_id = htonl(fTransactionID); message.transaction_id = htonl(fTransactionID);
message.seconds_since_boot = htons(max_c(system_time() / 1000000LL, 65535)); message.seconds_since_boot = htons(min_c(system_time() / 1000000LL, 65535));
memcpy(message.mac_address, fMAC, 6); memcpy(message.mac_address, fMAC, 6);
switch (message.Type()) { switch (message.Type()) {
@ -548,7 +547,7 @@ DHCPClient::_PrepareMessage(dhcp_message& message)
uint8* next = message.options; uint8* next = message.options;
next = message.PutOption(next, OPTION_MESSAGE_TYPE, (uint8)DHCP_REQUEST); next = message.PutOption(next, OPTION_MESSAGE_TYPE, (uint8)DHCP_REQUEST);
next = message.PutOption(next, OPTION_MESSAGE_SIZE, next = message.PutOption(next, OPTION_MESSAGE_SIZE,
(uint16)sizeof(dhcp_message)); (uint16)htons(sizeof(dhcp_message)));
next = message.PutOption(next, OPTION_SERVER_ADDRESS, next = message.PutOption(next, OPTION_SERVER_ADDRESS,
(uint32)fServer.sin_addr.s_addr); (uint32)fServer.sin_addr.s_addr);
next = message.PutOption(next, OPTION_REQUEST_IP_ADDRESS, fAssignedAddress); next = message.PutOption(next, OPTION_REQUEST_IP_ADDRESS, fAssignedAddress);