i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Further improved debug output.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37938 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-06 11:13:00 +00:00
parent b0cf274a3f
commit 081dd39e94
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
+10 -3
View File
@@ -386,6 +386,9 @@ arp_update_entry(in_addr_t protocolAddress, sockaddr_dl *hardwareAddress,
uint32 flags, arp_entry **_entry = NULL) uint32 flags, arp_entry **_entry = NULL)
{ {
ASSERT_LOCKED_MUTEX(&sCacheLock); ASSERT_LOCKED_MUTEX(&sCacheLock);
TRACE(("%s(%s, %s, flags 0x%" B_PRIx32 ")\n", __FUNCTION__,
inet_to_string(protocolAddress), mac_to_string(LLADDR(hardwareAddress)),
flags));
arp_entry *entry = arp_entry::Lookup(protocolAddress); arp_entry *entry = arp_entry::Lookup(protocolAddress);
if (entry != NULL) { if (entry != NULL) {
@@ -398,11 +401,10 @@ arp_update_entry(in_addr_t protocolAddress, sockaddr_dl *hardwareAddress,
&& entry->hardware_address.sdl_alen != 0 && entry->hardware_address.sdl_alen != 0
&& memcmp(LLADDR(&entry->hardware_address), && memcmp(LLADDR(&entry->hardware_address),
LLADDR(hardwareAddress), ETHER_ADDRESS_LENGTH)) { LLADDR(hardwareAddress), ETHER_ADDRESS_LENGTH)) {
uint8* data = LLADDR(hardwareAddress);
dprintf("ARP host %08x updated with different hardware address " dprintf("ARP host %08x updated with different hardware address "
"%02x:%02x:%02x:%02x:%02x:%02x.\n", protocolAddress, "%02x:%02x:%02x:%02x:%02x:%02x.\n", protocolAddress,
hardwareAddress->sdl_data[0], hardwareAddress->sdl_data[1], data[0], data[1], data[2], data[3], data[4], data[5]);
hardwareAddress->sdl_data[2], hardwareAddress->sdl_data[3],
hardwareAddress->sdl_data[4], hardwareAddress->sdl_data[5]);
return B_ERROR; return B_ERROR;
} }
@@ -1061,7 +1063,12 @@ arp_send_data(net_datalink_protocol *_protocol, net_buffer *buffer)
memcpy(buffer->destination, &entry->hardware_address, memcpy(buffer->destination, &entry->hardware_address,
entry->hardware_address.sdl_len); entry->hardware_address.sdl_len);
} }
// the broadcast address is set in the ethernet frame module
} }
TRACE(("%s(%p): from %s\n", __FUNCTION__, buffer,
mac_to_string(LLADDR((sockaddr_dl*)buffer->source))));
TRACE((" to %s\n",
mac_to_string(LLADDR((sockaddr_dl*)buffer->destination))));
return protocol->next->module->send_data(protocol->next, buffer); return protocol->next->module->send_data(protocol->next, buffer);
} }
src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
+2 -2
View File
@@ -1691,8 +1691,8 @@ ipv4_deliver_data(net_protocol* _protocol, net_buffer* buffer)
status_t status_t
ipv4_error_received(net_error error, net_buffer* buffer) ipv4_error_received(net_error error, net_buffer* buffer)
{ {
TRACE(" ipv4_error_received(code %" B_PRIx32 ", buffer %p [%zu bytes])", TRACE(" ipv4_error_received(error %d, buffer %p [%zu bytes])", (int)error,
error, buffer, buffer->size); buffer, buffer->size);
NetBufferHeaderReader<ipv4_header> bufferHeader(buffer); NetBufferHeaderReader<ipv4_header> bufferHeader(buffer);
if (bufferHeader.Status() != B_OK) if (bufferHeader.Status() != B_OK)