* Cleanup, no functional change.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38362 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-26 08:42:58 +00:00
parent 00a2914f9c
commit 4cd42050fa
+46 -13
View File
@@ -1,11 +1,10 @@
/* /*
* Copyright 2007-2008, Haiku, Inc. All Rights Reserved. * Copyright 2007-2010, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Hugo Santos, [email protected] * Hugo Santos, [email protected]
*/ */
#ifndef NET_ADDRESS_UTILITIES_H #ifndef NET_ADDRESS_UTILITIES_H
#define NET_ADDRESS_UTILITIES_H #define NET_ADDRESS_UTILITIES_H
@@ -19,13 +18,25 @@
class SocketAddress { class SocketAddress {
public: public:
SocketAddress(net_address_module_info* module, sockaddr* address) SocketAddress(net_address_module_info* module, sockaddr* address)
: fModule(module), fAddress(address) {} :
fModule(module),
fAddress(address)
{
}
SocketAddress(net_address_module_info* module, sockaddr_storage* address) SocketAddress(net_address_module_info* module, sockaddr_storage* address)
: fModule(module), fAddress((sockaddr *)address) {} :
fModule(module),
fAddress((sockaddr*)address)
{
}
SocketAddress(const SocketAddress& address) SocketAddress(const SocketAddress& address)
: fModule(address.fModule), fAddress(address.fAddress) {} :
fModule(address.fModule),
fAddress(address.fAddress)
{
}
void SetAddressTo(sockaddr* address) void SetAddressTo(sockaddr* address)
{ {
@@ -46,7 +57,7 @@ public:
{ {
if (checkPort) if (checkPort)
return fModule->equal_addresses_and_ports(fAddress, address); return fModule->equal_addresses_and_ports(fAddress, address);
else
return fModule->equal_addresses(fAddress, address); return fModule->equal_addresses(fAddress, address);
} }
@@ -111,7 +122,8 @@ public:
} }
const char* AsString(char* buffer, size_t bufferSize, const char* AsString(char* buffer, size_t bufferSize,
bool printPort = false) const { bool printPort = false) const
{
fModule->print_address_buffer(fAddress, buffer, bufferSize, printPort); fModule->print_address_buffer(fAddress, buffer, bufferSize, printPort);
return buffer; return buffer;
} }
@@ -126,21 +138,38 @@ private:
sockaddr* fAddress; sockaddr* fAddress;
}; };
class ConstSocketAddress { class ConstSocketAddress {
public: public:
ConstSocketAddress(net_address_module_info* module, ConstSocketAddress(net_address_module_info* module,
const sockaddr* address) const sockaddr* address)
: fModule(module), fAddress(address) {} :
fModule(module),
fAddress(address)
{
}
ConstSocketAddress(net_address_module_info* module, ConstSocketAddress(net_address_module_info* module,
const sockaddr_storage* address) const sockaddr_storage* address)
: fModule(module), fAddress((sockaddr *)address) {} :
fModule(module),
fAddress((sockaddr*)address)
{
}
ConstSocketAddress(const ConstSocketAddress& address) ConstSocketAddress(const ConstSocketAddress& address)
: fModule(address.fModule), fAddress(address.fAddress) {} :
fModule(address.fModule),
fAddress(address.fAddress)
{
}
ConstSocketAddress(const SocketAddress& address) ConstSocketAddress(const SocketAddress& address)
: fModule(address.Module()), fAddress(*address) {} :
fModule(address.Module()),
fAddress(*address)
{
}
void SetAddressTo(const sockaddr* address) void SetAddressTo(const sockaddr* address)
{ {
@@ -209,14 +238,18 @@ private:
const sockaddr* fAddress; const sockaddr* fAddress;
}; };
class SocketAddressStorage : public SocketAddress { class SocketAddressStorage : public SocketAddress {
public: public:
SocketAddressStorage(net_address_module_info* module) SocketAddressStorage(net_address_module_info* module)
: SocketAddress(module, &fAddressStorage) :
{} SocketAddress(module, &fAddressStorage)
{
}
private: private:
sockaddr_storage fAddressStorage; sockaddr_storage fAddressStorage;
}; };
#endif // NET_ADDRESS_UTILITIES_H #endif // NET_ADDRESS_UTILITIES_H