X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fconnection.cpp;h=b9c5d2ac8bac413c1264ac6746e873fca0c471e7;hb=8492796a5c45787810aad7fe08fc63cadc0c96b5;hp=31c0f77a353279f25d20e58b92600f3d71ad89d4;hpb=6aab526989c292994d379b1ef5459d6ddc0eb74b;p=oweals%2Fminetest.git diff --git a/src/connection.cpp b/src/connection.cpp index 31c0f77a3..b9c5d2ac8 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -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 &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(e.data); return e.data.getSize(); case CONNEVENT_PEER_ADDED: { Peer tmp(e.peer_id, e.address);