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

* Moved DatagramSocket::Socket() up to its parent.

Browse Source 
* Some cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37645 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-07-21 11:22:54 +00:00
parent 5d498edbb5
commit 866e21d3a6
1 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/net/ProtocolUtilities.h
+56 -45
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2007-2009, 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:
@@ -46,28 +46,37 @@ public:
class ProtocolSocket { class ProtocolSocket {
public: public:
ProtocolSocket(net_socket* socket); ProtocolSocket(net_socket* socket);
status_t Open(); status_t Open();
SocketAddress LocalAddress() SocketAddress LocalAddress()
{ return SocketAddress(fDomain->address_module, &fSocket->address); } { return SocketAddress(
ConstSocketAddress LocalAddress() const fDomain->address_module,
{ return ConstSocketAddress(fDomain->address_module, &fSocket->address); }
&fSocket->address); } ConstSocketAddress LocalAddress() const
{ return ConstSocketAddress(
fDomain->address_module,
&fSocket->address); }
SocketAddress PeerAddress() SocketAddress PeerAddress()
{ return SocketAddress(fDomain->address_module, &fSocket->peer); } { return SocketAddress(
ConstSocketAddress PeerAddress() const fDomain->address_module,
{ return ConstSocketAddress(fDomain->address_module, &fSocket->peer); } &fSocket->peer); }
ConstSocketAddress PeerAddress() const
{ return ConstSocketAddress(
fDomain->address_module,
&fSocket->peer); }
net_domain* Domain() const { return fDomain; } net_domain* Domain() const { return fDomain; }
net_address_module_info* AddressModule() const net_address_module_info* AddressModule() const
{ return fDomain->address_module; } { return fDomain->address_module; }
net_socket* Socket() const { return fSocket; }
protected: protected:
net_socket* fSocket; net_socket* fSocket;
net_domain* fDomain; net_domain* fDomain;
}; };
@@ -97,49 +106,49 @@ template<typename LockingBase = MutexLocking,
typename ModuleBundle = NetModuleBundleGetter> typename ModuleBundle = NetModuleBundleGetter>
class DatagramSocket : public ProtocolSocket { class DatagramSocket : public ProtocolSocket {
public: public:
DatagramSocket(const char* name, net_socket* socket); DatagramSocket(const char* name,
virtual ~DatagramSocket(); net_socket* socket);
virtual ~DatagramSocket();
status_t InitCheck() const; status_t InitCheck() const;
status_t Enqueue(net_buffer* buffer); status_t Enqueue(net_buffer* buffer);
net_buffer* Dequeue(bool clone); net_buffer* Dequeue(bool clone);
status_t BlockingDequeue(bool clone, bigtime_t timeout, status_t BlockingDequeue(bool clone, bigtime_t timeout,
net_buffer** _buffer); net_buffer** _buffer);
void Clear(); void Clear();
status_t SocketEnqueue(net_buffer* buffer); status_t SocketEnqueue(net_buffer* buffer);
status_t SocketDequeue(uint32 flags, net_buffer** _buffer); status_t SocketDequeue(uint32 flags,
net_buffer** _buffer);
ssize_t AvailableData() const; ssize_t AvailableData() const;
void WakeAll(); void WakeAll();
net_socket* Socket() const { return fSocket; }
protected: protected:
virtual status_t _SocketStatus() const; virtual status_t _SocketStatus() const;
status_t _Enqueue(net_buffer* buffer); status_t _Enqueue(net_buffer* buffer);
status_t _SocketEnqueue(net_buffer* buffer); status_t _SocketEnqueue(net_buffer* buffer);
net_buffer* _Dequeue(bool clone); net_buffer* _Dequeue(bool clone);
void _Clear(); void _Clear();
status_t _Wait(bigtime_t timeout); status_t _Wait(bigtime_t timeout);
void _NotifyOneReader(bool notifySocket); void _NotifyOneReader(bool notifySocket);
bool _IsEmpty() const { return fBuffers.IsEmpty(); } bool _IsEmpty() const { return fBuffers.IsEmpty(); }
bigtime_t _SocketTimeout(uint32 flags) const; bigtime_t _SocketTimeout(uint32 flags) const;
typedef typename LockingBase::Type LockType; typedef typename LockingBase::Type LockType;
typedef typename LockingBase::AutoLocker AutoLocker; typedef typename LockingBase::AutoLocker AutoLocker;
typedef DoublyLinkedListCLink<net_buffer> NetBufferLink; typedef DoublyLinkedListCLink<net_buffer> NetBufferLink;
typedef DoublyLinkedList<net_buffer, NetBufferLink> BufferList; typedef DoublyLinkedList<net_buffer, NetBufferLink> BufferList;
sem_id fNotify; sem_id fNotify;
BufferList fBuffers; BufferList fBuffers;
size_t fCurrentBytes; size_t fCurrentBytes;
mutable LockType fLock; mutable LockType fLock;
}; };
@@ -150,7 +159,8 @@ protected:
DECL_DATAGRAM_SOCKET(inline)::DatagramSocket(const char* name, DECL_DATAGRAM_SOCKET(inline)::DatagramSocket(const char* name,
net_socket* socket) net_socket* socket)
: ProtocolSocket(socket), fCurrentBytes(0) :
ProtocolSocket(socket), fCurrentBytes(0)
{ {
status_t status = LockingBase::Init(&fLock, name); status_t status = LockingBase::Init(&fLock, name);
if (status != B_OK) if (status != B_OK)
@@ -356,4 +366,5 @@ DECL_DATAGRAM_SOCKET(inline bigtime_t)::_SocketTimeout(uint32 flags) const
return timeout; return timeout;
} }
#endif // PROTOCOL_UTILITIES_H #endif // PROTOCOL_UTILITIES_H