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

fixed an issue in UDP due to copying addresses to sockaddr, which may be too small for protocols other than IPv4. In fact, we don't need to copy the addresses at all, we can use the original address pointers in the hash key for lookup and hashing.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20588 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Hugo Santos 2007-04-05 18:35:22 +00:00
parent 0d5afa4dec
commit c3e054c876
1 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,10 @@
/* /*
* Copyright 2006, Haiku, Inc. All Rights Reserved. * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Oliver Tappe, zooey@hirschkaefer.de * Oliver Tappe, zooey@hirschkaefer.de
* Hugo Santos, hugosantos@gmail.com
*/ */
@ -25,6 +26,7 @@
#include <new> #include <new>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <utility>
//#define TRACE_UDP //#define TRACE_UDP
@ -81,13 +83,7 @@ private:
class UdpEndpointManager { class UdpEndpointManager {
typedef std::pair<sockaddr *, sockaddr *> HashKey;
struct hash_key {
hash_key(sockaddr *ourAddress, sockaddr *peerAddress);
sockaddr ourAddress;
sockaddr peerAddress;
};
class Ephemerals { class Ephemerals {
public: public:
@ -155,16 +151,6 @@ static net_stack_module_info *sStackModule;
// #pragma mark - // #pragma mark -
UdpEndpointManager::hash_key::hash_key(sockaddr *_ourAddress, sockaddr *_peerAddress)
{
memcpy(&ourAddress, _ourAddress, sizeof(sockaddr));
memcpy(&peerAddress, _peerAddress, sizeof(sockaddr));
}
// #pragma mark -
UdpEndpointManager::Ephemerals::Ephemerals() UdpEndpointManager::Ephemerals::Ephemerals()
: :
fLastUsed(kLast) fLastUsed(kLast)
@ -278,13 +264,13 @@ UdpEndpointManager::InitCheck() const
UdpEndpointManager::Compare(void *_udpEndpoint, const void *_key) UdpEndpointManager::Compare(void *_udpEndpoint, const void *_key)
{ {
struct UdpEndpoint *udpEndpoint = (UdpEndpoint*)_udpEndpoint; struct UdpEndpoint *udpEndpoint = (UdpEndpoint*)_udpEndpoint;
hash_key *key = (hash_key *)_key; const HashKey *key = (const HashKey *)_key;
sockaddr *ourAddr = (sockaddr *)&udpEndpoint->socket->address; sockaddr *ourAddr = (sockaddr *)&udpEndpoint->socket->address;
sockaddr *peerAddr = (sockaddr *)&udpEndpoint->socket->peer; sockaddr *peerAddr = (sockaddr *)&udpEndpoint->socket->peer;
if (sAddressModule->equal_addresses_and_ports(ourAddr, &key->ourAddress) if (sAddressModule->equal_addresses_and_ports(ourAddr, key->first)
&& sAddressModule->equal_addresses_and_ports(peerAddr, &key->peerAddress)) && sAddressModule->equal_addresses_and_ports(peerAddr, key->second))
return 0; return 0;
return 1; return 1;
@ -309,8 +295,8 @@ UdpEndpointManager::Hash(void *_udpEndpoint, const void *_key, uint32 range)
sockaddr *peerAddr = (sockaddr*)&udpEndpoint->socket->peer; sockaddr *peerAddr = (sockaddr*)&udpEndpoint->socket->peer;
hash = ComputeHash(ourAddr, peerAddr); hash = ComputeHash(ourAddr, peerAddr);
} else { } else {
hash_key *key = (hash_key *)_key; const HashKey *key = (const HashKey *)_key;
hash = ComputeHash(&key->ourAddress, &key->peerAddress); hash = ComputeHash(key->first, key->second);
} }
// move the bits into the relevant range (as defined by kNumHashBuckets): // move the bits into the relevant range (as defined by kNumHashBuckets):
@ -332,9 +318,9 @@ UdpEndpointManager::FindActiveEndpoint(sockaddr *ourAddress,
TRACE(("trying to find UDP-endpoint for (l:%s p:%s)\n", TRACE(("trying to find UDP-endpoint for (l:%s p:%s)\n",
AddressString(sDomain, ourAddress, true).Data(), AddressString(sDomain, ourAddress, true).Data(),
AddressString(sDomain, peerAddress, true).Data())); AddressString(sDomain, peerAddress, true).Data()));
hash_key key(ourAddress, peerAddress);
UdpEndpoint *endpoint = (UdpEndpoint *)hash_lookup(fActiveEndpoints, &key); HashKey key(ourAddress, peerAddress);
return endpoint; return (UdpEndpoint *)hash_lookup(fActiveEndpoints, &key);
} }