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

* some minor cleanups and clarifications

Browse Source 
* dropped tracing of udp-header


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26518 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe 2008-07-19 22:32:51 +00:00
parent 14eaa7b61d
commit 9e05183977
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/add-ons/kernel/network/protocols/udp/udp.cpp
View File

@ -418,7 +418,7 @@ UdpDomainSupport::_BindToEphemeral(UdpEndpoint *endpoint,
if (allocedPort == 0) if (allocedPort == 0)
return ENOBUFS; return ENOBUFS;
newAddress.SetPort(allocedPort); newAddress.SetPort(htons(allocedPort));
return _FinishBind(endpoint, *newAddress); return _FinishBind(endpoint, *newAddress);
} }
@ -442,7 +442,7 @@ UdpEndpoint *
UdpDomainSupport::_FindActiveEndpoint(const sockaddr *ourAddress, UdpDomainSupport::_FindActiveEndpoint(const sockaddr *ourAddress,
const sockaddr *peerAddress) const sockaddr *peerAddress)
{ {
TRACE_DOMAIN("finding Endpoint for %s -> %s", TRACE_DOMAIN("finding Endpoint for %s <- %s",
AddressString(fDomain, ourAddress, true).Data(), AddressString(fDomain, ourAddress, true).Data(),
AddressString(fDomain, peerAddress, true).Data()); AddressString(fDomain, peerAddress, true).Data());
@ -524,8 +524,10 @@ UdpDomainSupport::_DemuxUnicast(net_buffer *buffer)
} }
} }
if (!endpoint) if (!endpoint) {
TRACE_DOMAIN("_DemuxBroadcast(%p) - no matching endpoint found!", buffer);
return B_NAME_NOT_FOUND; return B_NAME_NOT_FOUND;
}
endpoint->StoreData(buffer); endpoint->StoreData(buffer);
return B_OK; return B_OK;
@ -544,12 +546,11 @@ UdpDomainSupport::_GetNextEphemeral()
curr = kFirst; curr = kFirst;
} }
// TODO: a free list could be used to avoid the impact of these
// two nested loops most of the time... let's see how bad this really is
TRACE_DOMAIN("_GetNextEphemeral(), last %hu, curr %hu, stop %hu", TRACE_DOMAIN("_GetNextEphemeral(), last %hu, curr %hu, stop %hu",
fLastUsedEphemeral, curr, stop); fLastUsedEphemeral, curr, stop);
// TODO: a free list could be used to avoid the impact of these two
// nested loops most of the time... let's see how bad this really is
for (; curr != stop; curr = (curr < kLast) ? (curr + 1) : kFirst) { for (; curr != stop; curr = (curr < kLast) ? (curr + 1) : kFirst) {
TRACE_DOMAIN(" _GetNextEphemeral(): trying port %hu...", curr); TRACE_DOMAIN(" _GetNextEphemeral(): trying port %hu...", curr);
@ -879,8 +880,6 @@ UdpEndpoint::SendRoutedData(net_buffer *buffer, net_route *route)
*UDPChecksumField(buffer) = calculatedChecksum; *UDPChecksumField(buffer) = calculatedChecksum;
TRACE_BLOCK(((char*)&header, sizeof(udp_header), "udp-hdr: "));
return next->module->send_routed_data(next, route, buffer); return next->module->send_routed_data(next, route, buffer);
} }