lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Packets handling in UdpSocket is now more robust

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1490 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-04-05 14:06:37 +00:00
parent 507f467390
commit 41f09975ab
3 changed files with 76 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/SFML/Network/TcpSocket.cpp
View file

@ -208,7 +208,7 @@ Socket::Status TcpSocket::Send(const char* data, std::size_t size)
// Check the parameters
if (!data || (size == 0))
{
Err() << "Cannot send data over the network (invalid parameters)" << std::endl;
Err() << "Cannot send data over the network (no data to send)" << std::endl;
return Error;
}
@ -221,7 +221,7 @@ Socket::Status TcpSocket::Send(const char* data, std::size_t size)
sent = send(GetHandle(), data + length, sizeToSend - length, 0);
// Check for errors
if (sent <= 0)
if (sent < 0)
return priv::SocketImpl::GetErrorStatus();
}
@ -235,10 +235,10 @@ Socket::Status TcpSocket::Receive(char* data, std::size_t size, std::size_t& rec
// First clear the variables to fill
received = 0;
// Check the parameters
if (!data || (size == 0))
// Check the destination buffer
if (!data)
{
Err() << "Cannot receive data from the network (invalid parameters)" << std::endl;
Err() << "Cannot receive data from the network (the destination buffer is invalid)" << std::endl;
return Error;
}
@ -265,6 +265,10 @@ Socket::Status TcpSocket::Receive(char* data, std::size_t size, std::size_t& rec
////////////////////////////////////////////////////////////
Socket::Status TcpSocket::Send(Packet& packet)
{
// TCP is a stream protocol, it doesn't preserve messages boundaries.
// This means that we have to send the packet size first, so that the
// receiver knows the actual end of the packet in the data stream.
// Get the data to send from the packet
std::size_t size = 0;
const char* data = packet.OnSend(size);