diff options
author | Kahrl <kahrl@gmx.net> | 2011-11-07 04:20:33 +0100 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-07 11:21:42 +0200 |
commit | 1c98ec94da18c97272e1b0a2c1e43baf0683a187 (patch) | |
tree | 9351db1279247e48303fb021323e4e3428f9a42b /src/server.cpp | |
parent | 28660b4c1af1b1b6ac2d3fda6984bda2a1199dc1 (diff) | |
download | minetest-1c98ec94da18c97272e1b0a2c1e43baf0683a187.tar.gz minetest-1c98ec94da18c97272e1b0a2c1e43baf0683a187.tar.bz2 minetest-1c98ec94da18c97272e1b0a2c1e43baf0683a187.zip |
Make Connection::Receive return the data via a SharedBuffer reference, so the caller doesn't have to choose the right buffer size in advance.
Conflicts:
src/test.cpp
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server.cpp b/src/server.cpp index 37ba65a95..52e9dc879 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1777,14 +1777,13 @@ void Server::AsyncRunStep() void Server::Receive() { DSTACK(__FUNCTION_NAME); - u32 data_maxsize = 10000; - Buffer<u8> data(data_maxsize); + SharedBuffer<u8> data; u16 peer_id; u32 datasize; try{ { JMutexAutoLock conlock(m_con_mutex); - datasize = m_con.Receive(peer_id, *data, data_maxsize); + datasize = m_con.Receive(peer_id, data); } // This has to be called so that the client list gets synced |