oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Make Connection::Receive return the data via a SharedBuffer reference, so the caller doesn't have to choose the right buffer size in advance.

Browse source 
Conflicts:

	src/test.cpp
This commit is contained in:
Kahrl 2011-11-07 04:20:33 +01:00 • committed by Perttu Ahola
parent 28660b4c1a
commit 1c98ec94da
5 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/connection.cpp
View file

@ -1577,7 +1577,7 @@ void Connection::Disconnect()
putCommand(c);
}
u32 Connection::Receive(u16 &peer_id, u8 *data, u32 datasize)
u32 Connection::Receive(u16 &peer_id, SharedBuffer<u8> &data)
{
for(;;){
ConnectionEvent e = waitEvent(m_bc_receive_timeout);
@ -1589,7 +1589,7 @@ u32 Connection::Receive(u16 &peer_id, u8 *data, u32 datasize)
throw NoIncomingDataException("No incoming data");
case CONNEVENT_DATA_RECEIVED:
peer_id = e.peer_id;
memcpy(data, *e.data, e.data.getSize());
data = SharedBuffer<u8>(e.data);
return e.data.getSize();
case CONNEVENT_PEER_ADDED: {
Peer tmp(e.peer_id, e.address);