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

added new helper ProtocolSocket. Moved some stuff together to achieve better inlining.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20848 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Hugo Santos
2007-04-27 07:09:46 +00:00
parent 13593fb776
commit 4b55736dde
4 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/net/AddressUtilities.h
+7 -22
View File
@@ -16,20 +16,13 @@
class SocketAddress {
public:
SocketAddress(net_address_module_info *module, sockaddr *address)
: fModule(module), fAddress(NULL)
{
SetAddressTo(address);
}
: fModule(module), fAddress(address) {}
SocketAddress(net_address_module_info *module, sockaddr_storage *address)
: fModule(module), fAddress(NULL)
{
SetAddressTo((sockaddr *)address);
}
: fModule(module), fAddress((sockaddr *)address) {}
SocketAddress(const SocketAddress &address)
: fModule(address.fModule), fAddress(address.fAddress)
{}
: fModule(address.fModule), fAddress(address.fAddress) {}
void SetAddressTo(sockaddr *address)
{
@@ -113,25 +106,17 @@ class ConstSocketAddress {
public:
ConstSocketAddress(net_address_module_info *module,
const sockaddr *address)
: fModule(module), fAddress(NULL)
{
SetAddressTo(address);
}
: fModule(module), fAddress(address) {}
ConstSocketAddress(net_address_module_info *module,
const sockaddr_storage *address)
: fModule(module), fAddress(NULL)
{
SetAddressTo((sockaddr *)address);
}
: fModule(module), fAddress((sockaddr *)address) {}
ConstSocketAddress(const ConstSocketAddress &address)
: fModule(address.fModule), fAddress(address.fAddress)
{}
: fModule(address.fModule), fAddress(address.fAddress) {}
ConstSocketAddress(const SocketAddress &address)
: fModule(address.Module()), fAddress(*address)
{}
: fModule(address.Module()), fAddress(*address) {}
void SetAddressTo(const sockaddr *address)
{
headers/private/net/ProtocolUtilities.h
+48 -3
View File
@@ -14,9 +14,12 @@
#include <util/DoublyLinkedList.h>
#include <net_buffer.h>
#include <net_protocol.h>
#include <net_socket.h>
#include <net_stack.h>
#include <AddressUtilities.h>
class BenaphoreLocking {
public:
typedef benaphore Type;
@@ -40,9 +43,52 @@ public:
};
class ProtocolSocket {
public:
ProtocolSocket(net_socket *socket);
status_t Open();
SocketAddress LocalAddress()
{ return SocketAddress(fDomain->address_module, &fSocket->address); }
ConstSocketAddress LocalAddress() const
{ return ConstSocketAddress(fDomain->address_module, &fSocket->address); }
SocketAddress PeerAddress()
{ return SocketAddress(fDomain->address_module, &fSocket->peer); }
ConstSocketAddress PeerAddress() const
{ return ConstSocketAddress(fDomain->address_module, &fSocket->peer); }
net_domain *Domain() const { return fDomain; }
net_address_module_info *AddressModule() const
{ return fDomain->address_module; }
protected:
net_socket *fSocket;
net_domain *fDomain;
};
inline ProtocolSocket::ProtocolSocket(net_socket *socket)
: fSocket(socket), fDomain(NULL) {}
inline status_t
ProtocolSocket::Open()
{
fDomain = fSocket->first_protocol->module->get_domain(
fSocket->first_protocol);
if (fDomain == NULL || fDomain->address_module == NULL)
return EAFNOSUPPORT;
return B_OK;
}
template<typename LockingBase = BenaphoreLocking,
typename ModuleBundle = NetModuleBundleGetter>
class DatagramSocket {
class DatagramSocket : public ProtocolSocket {
public:
DatagramSocket(const char *name, net_socket *socket);
virtual ~DatagramSocket();
@@ -83,7 +129,6 @@ protected:
typedef DoublyLinkedListCLink<net_buffer> NetBufferLink;
typedef DoublyLinkedList<net_buffer, NetBufferLink> BufferList;
net_socket *fSocket;
sem_id fNotify;
BufferList fBuffers;
size_t fCurrentBytes;
@@ -98,7 +143,7 @@ protected:
DECL_DATAGRAM_SOCKET(inline)::DatagramSocket(const char *name,
net_socket *socket)
: fSocket(socket), fCurrentBytes(0)
: ProtocolSocket(socket), fCurrentBytes(0)
{
status_t status = LockingBase::Init(&fLock, name);
if (status < B_OK)