[haiku-commits] r38355 - haiku/trunk/src/add-ons/kernel/network/protocols/udp
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 25 Aug 2010 17:51:43 +0200 (CEST)
Author: axeld
Date: 2010-08-25 17:51:43 +0200 (Wed, 25 Aug 2010)
New Revision: 38355
Changeset: http://dev.haiku-os.org/changeset/38355
Modified:
haiku/trunk/src/add-ons/kernel/network/protocols/udp/udp.cpp
Log:
* The KDL command "udp_endpoints" did not work anymore, since
DatagramSocket::AvailableData() locks; introduced a UdpEndpoint::Dump() method
to work around that.
* Minor cleanup.
Modified: haiku/trunk/src/add-ons/kernel/network/protocols/udp/udp.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/udp/udp.cpp
2010-08-25 15:06:49 UTC (rev 38354)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/udp/udp.cpp
2010-08-25 15:51:43 UTC (rev 38355)
@@ -73,42 +73,44 @@
class UdpEndpoint : public net_protocol, public DatagramSocket<> {
public:
- UdpEndpoint(net_socket *socket);
+
UdpEndpoint(net_socket* socket);
- status_t Bind(const sockaddr *newAddr);
- status_t Unbind(sockaddr *newAddr);
- status_t Connect(const sockaddr
*newAddr);
+ status_t Bind(const sockaddr*
newAddr);
+ status_t Unbind(sockaddr*
newAddr);
+ status_t Connect(const sockaddr*
newAddr);
- status_t Open();
- status_t Close();
- status_t Free();
+ status_t Open();
+ status_t Close();
+ status_t Free();
- status_t SendRoutedData(net_buffer
*buffer,
- net_route
*route);
- status_t SendData(net_buffer *buffer);
+ status_t
SendRoutedData(net_buffer* buffer,
+
net_route* route);
+ status_t SendData(net_buffer*
buffer);
- ssize_t BytesAvailable();
- status_t FetchData(size_t numBytes,
uint32 flags,
- net_buffer
**_buffer);
+ ssize_t BytesAvailable();
+ status_t FetchData(size_t
numBytes, uint32 flags,
+
net_buffer** _buffer);
- status_t StoreData(net_buffer *buffer);
- status_t DeliverData(net_buffer *buffer);
+ status_t StoreData(net_buffer*
buffer);
+ status_t DeliverData(net_buffer*
buffer);
- // only the domain support will change/check the Active flag so
- // we don't really need to protect it with the socket lock.
- bool IsActive() const { return
fActive; }
- void SetActive(bool newValue) {
fActive = newValue; }
+ // only the domain support will change/check the Active
flag so
+ // we don't really need to protect it with the socket
lock.
+ bool IsActive() const {
return fActive; }
+ void SetActive(bool
newValue) { fActive = newValue; }
- UdpEndpoint *&HashTableLink() { return
fLink; }
+ UdpEndpoint*& HashTableLink() { return fLink;
}
+ void Dump() const;
+
private:
- UdpDomainSupport *fManager;
- bool fActive;
- // an active
UdpEndpoint is part of the
- // endpoint
hash (and it is bound and optionally
- // connected)
+ UdpDomainSupport* fManager;
+ bool fActive;
+ // an
active UdpEndpoint is part of the
+ //
endpoint hash (and it is bound and
+ //
optionally connected)
- UdpEndpoint *fLink;
+ UdpEndpoint* fLink;
};
@@ -400,15 +402,8 @@
EndpointTable::Iterator it = fActiveEndpoints.GetIterator();
- while (it.HasNext()) {
- UdpEndpoint *endpoint = it.Next();
-
- char localBuf[64], peerBuf[64];
- endpoint->LocalAddress().AsString(localBuf, sizeof(localBuf),
true);
- endpoint->PeerAddress().AsString(peerBuf, sizeof(peerBuf),
true);
-
- kprintf("%p %20s %20s %8lu\n", endpoint, localBuf, peerBuf,
- endpoint->AvailableData());
+ while (UdpEndpoint* endpoint = it.Next()) {
+ endpoint->Dump();
}
}
@@ -879,7 +874,11 @@
UdpEndpoint::UdpEndpoint(net_socket *socket)
- : DatagramSocket<>("udp endpoint", socket), fActive(false) {}
+ :
+ DatagramSocket<>("udp endpoint", socket),
+ fActive(false)
+{
+}
// #pragma mark - activation
@@ -1009,7 +1008,7 @@
TRACE_EP("FetchData(%ld, 0x%lx)", numBytes, flags);
status_t status = Dequeue(flags, _buffer);
- TRACE_EP(" FetchData(): returned from fifo status=0x%lx", status);
+ TRACE_EP(" FetchData(): returned from fifo status: %s",
strerror(status));
if (status != B_OK)
return status;
@@ -1046,6 +1045,18 @@
}
+void
+UdpEndpoint::Dump() const
+{
+ char local[64];
+ LocalAddress().AsString(local, sizeof(local), true);
+ char peer[64];
+ PeerAddress().AsString(peer, sizeof(peer), true);
+
+ kprintf("%p %20s %20s %8lu\n", this, local, peer, fCurrentBytes);
+}
+
+
// #pragma mark - protocol interface
Other related posts:
- » [haiku-commits] r38355 - haiku/trunk/src/add-ons/kernel/network/protocols/udp - axeld
