[Patch 2/4] Network rework: packet writing, sending and cleanups

NetworkPacket.cpp:
* Remove some deprecated functions, we must use streaming interface
* m_data converted from u8* to std::vector<u8>
* Add an exporter to forge packet to Connection object
* implement operator << std::wstring. n
* implement operator << std::string
* dynamic resize when write packet content.
* fix string writing and performances.
* create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
  * Reliability
  * Transmit channel
* Implement putRawString for some ugly char (_INIT packet), and use it.
* Many packet read and write migrated
* Implement oldForgePacket to interface writing with current connection
* fix U8/char/bool writing
* fix string writing and performances.
* add some missing functions
* Use v3s16 read instead of reading x,y,z separately
* Add irr::video::SColor support into packets
* Add some missing handlers
* Add a template function to increase offset
* Throw a serialization error on packet reading (must be improved)

PacketFactories:
* Create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Create ClientCommandFactory, used by server to get useful informations about packet processing (sending).

Client.cpp:
* implement NetworkPacket ::Send interface.
* Move packet handlers to a dedicated file
* Remove Client::Send(SharedBuffer)

Server.cpp:
* implement NetworkPacket ::Send interface.
* Rewrite all packets using NetworkPacket
* Move packet handlers to a dedicated file
* Remove Server::Send(SharedBuffer)

ClientIface.cpp:
* Remove sendToAll(SharedBuffer<u8>)

Connection.hpp rework:
* Remove duplicate include
* Remove duplicate negation
* Remove a useless variable
* Improve code performance by using a m_peers_list instead of scanning m_peers map
* Remove Connection::Send(SharedBuffer)
* Fix useafterfree into NetworkPacket Sending
* Remove unused Connection::sendToAll

Test.cpp:
* Remove dead code
* Update tests to use NetworkPackets

Misc:
* add new wrappers to Send packets in client, using NetworkPacket
* Add NetworkPacket methods for Connection
* coding style fix
* dead code since changes cleanup
* Use v3s16 read instead of reading x,y,z separately in some packets
* Use different files to handle packets received by client and server
* Cleanup: Remove useless includes

ok @Zeno-
Tested by @Zeno- @VanessaE and @nerzhul on running servers

14 files changed, 7314 insertions, 229 deletions

diff --git a/src/network/clientopcodes.cpp b/src/network/clientopcodes.cpp
index 247c67157..88eef0ad6 100644
--- a/src/network/clientopcodes.cpp
+++ b/src/network/clientopcodes.cpp
@@ -108,3 +108,77 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] =
 	{ "TOCLIENT_LOCAL_PLAYER_ANIMATIONS",  TOCLIENT_STATE_CONNECTED, &Client::handleCommand_LocalPlayerAnimations }, // 0x51
 	{ "TOCLIENT_EYE_OFFSET",               TOCLIENT_STATE_CONNECTED, &Client::handleCommand_EyeOffset }, // 0x52
 };
+
+const static ServerCommandFactory null_command_factory = { "TOSERVER_NULL", 0, false };
+
+const ServerCommandFactory serverCommandFactoryTable[TOSERVER_NUM_MSG_TYPES] =
+{
+	null_command_factory, // 0x00
+	null_command_factory, // 0x01
+	null_command_factory, // 0x02
+	null_command_factory, // 0x03
+	null_command_factory, // 0x04
+	null_command_factory, // 0x05
+	null_command_factory, // 0x06
+	null_command_factory, // 0x07
+	null_command_factory, // 0x08
+	null_command_factory, // 0x09
+	null_command_factory, // 0x0a
+	null_command_factory, // 0x0b
+	null_command_factory, // 0x0c
+	null_command_factory, // 0x0d
+	null_command_factory, // 0x0e
+	null_command_factory, // 0x0f
+	{ "TOSERVER_INIT",               1, false }, // 0x10
+	{ "TOSERVER_INIT2",              1, true }, // 0x11
+	null_command_factory, // 0x12
+	null_command_factory, // 0x13
+	null_command_factory, // 0x14
+	null_command_factory, // 0x15
+	null_command_factory, // 0x16
+	null_command_factory, // 0x17
+	null_command_factory, // 0x18
+	null_command_factory, // 0x19
+	null_command_factory, // 0x1a
+	null_command_factory, // 0x1b
+	null_command_factory, // 0x1c
+	null_command_factory, // 0x1d
+	null_command_factory, // 0x1e
+	null_command_factory, // 0x1f
+	null_command_factory, // 0x20
+	null_command_factory, // 0x21
+	null_command_factory, // 0x22
+	{ "TOSERVER_PLAYERPOS",          0, false }, // 0x23
+	{ "TOSERVER_GOTBLOCKS",          2, true }, // 0x24
+	{ "TOSERVER_DELETEDBLOCKS",      2, true }, // 0x25
+	null_command_factory, // 0x26
+	{ "TOSERVER_CLICK_OBJECT",       0, false }, // 0x27
+	{ "TOSERVER_GROUND_ACTION",      0, false }, // 0x28
+	{ "TOSERVER_RELEASE",            0, false }, // 0x29
+	null_command_factory, // 0x2a
+	null_command_factory, // 0x2b
+	null_command_factory, // 0x2c
+	null_command_factory, // 0x2d
+	null_command_factory, // 0x2e
+	null_command_factory, // 0x2f
+	{ "TOSERVER_SIGNTEXT",           0, false }, // 0x30
+	{ "TOSERVER_INVENTORY_ACTION",   0, true }, // 0x31
+	{ "TOSERVER_CHAT_MESSAGE",       0, true }, // 0x32
+	{ "TOSERVER_SIGNNODETEXT",       0, false }, // 0x33
+	{ "TOSERVER_CLICK_ACTIVEOBJECT", 0, false }, // 0x34
+	{ "TOSERVER_DAMAGE",             0, true }, // 0x35
+	{ "TOSERVER_PASSWORD",           0, true }, // 0x36
+	{ "TOSERVER_PLAYERITEM",         0, true }, // 0x37
+	{ "TOSERVER_RESPAWN",            0, true }, // 0x38
+	{ "TOSERVER_INTERACT",           0, true }, // 0x39
+	{ "TOSERVER_REMOVED_SOUNDS",     1, true }, // 0x3a
+	{ "TOSERVER_NODEMETA_FIELDS",    0, true }, // 0x3b
+	{ "TOSERVER_INVENTORY_FIELDS",   0, true }, // 0x3c
+	null_command_factory, // 0x3d
+	null_command_factory, // 0x3e
+	null_command_factory, // 0x3f
+	{ "TOSERVER_REQUEST_MEDIA",      1, true }, // 0x40
+	{ "TOSERVER_RECEIVED_MEDIA",     1, true }, // 0x41
+	{ "TOSERVER_BREATH",             0, true }, // 0x42
+	{ "TOSERVER_CLIENT_READY",       0, true }, // 0x43
+};
diff --git a/src/network/clientopcodes.h b/src/network/clientopcodes.h
index 6755342a3..9143865b8 100644
--- a/src/network/clientopcodes.h
+++ b/src/network/clientopcodes.h
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "client.h"
 #include "networkprotocol.h"
-#include "toclientpacket.h"
+#include "networkpacket.h"
 
 enum ToClientConnectionState {
 	TOCLIENT_STATE_NOT_CONNECTED,
@@ -33,11 +33,20 @@ enum ToClientConnectionState {
 
 struct ToClientCommandHandler
 {
-    char const* name;
+    const char* name;
     ToClientConnectionState state;
-    void (Client::*handler)(ToClientPacket* pkt);
+    void (Client::*handler)(NetworkPacket* pkt);
+};
+
+struct ServerCommandFactory
+{
+	const char* name;
+	u16 channel;
+	bool reliable;
 };
 
 extern const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES];
 
+extern const ServerCommandFactory serverCommandFactoryTable[TOSERVER_NUM_MSG_TYPES];
+
 #endif
diff --git a/src/network/connection.cpp b/src/network/connection.cpp
new file mode 100644
index 000000000..5c529faea
--- /dev/null
+++ b/src/network/connection.cpp
@@ -0,0 +1,3112 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <iomanip>
+#include <errno.h>
+#include "connection.h"
+#include "main.h"
+#include "serialization.h"
+#include "log.h"
+#include "porting.h"
+#include "util/serialize.h"
+#include "util/numeric.h"
+#include "util/string.h"
+#include "settings.h"
+#include "profiler.h"
+
+namespace con
+{
+
+/******************************************************************************/
+/* defines used for debugging and profiling                                   */
+/******************************************************************************/
+#ifdef NDEBUG
+#define LOG(a) a
+#define PROFILE(a)
+#undef DEBUG_CONNECTION_KBPS
+#else
+/* this mutex is used to achieve log message consistency */
+JMutex log_message_mutex;
+#define LOG(a)                                                                 \
+	{                                                                          \
+	JMutexAutoLock loglock(log_message_mutex);                                 \
+	a;                                                                         \
+	}
+#define PROFILE(a) a
+//#define DEBUG_CONNECTION_KBPS
+#undef DEBUG_CONNECTION_KBPS
+#endif
+
+
+static inline float CALC_DTIME(unsigned int lasttime, unsigned int curtime) {
+	float value = ( curtime - lasttime) / 1000.0;
+	return MYMAX(MYMIN(value,0.1),0.0);
+}
+
+/* maximum window size to use, 0xFFFF is theoretical maximum  don't think about
+ * touching it, the less you're away from it the more likely data corruption
+ * will occur
+ */
+#define MAX_RELIABLE_WINDOW_SIZE 0x8000
+ /* starting value for window size */
+#define MIN_RELIABLE_WINDOW_SIZE 0x40
+
+#define MAX_UDP_PEERS 65535
+
+#define PING_TIMEOUT 5.0
+
+static u16 readPeerId(u8 *packetdata)
+{
+	return readU16(&packetdata[4]);
+}
+static u8 readChannel(u8 *packetdata)
+{
+	return readU8(&packetdata[6]);
+}
+
+BufferedPacket makePacket(Address &address, u8 *data, u32 datasize,
+		u32 protocol_id, u16 sender_peer_id, u8 channel)
+{
+	u32 packet_size = datasize + BASE_HEADER_SIZE;
+	BufferedPacket p(packet_size);
+	p.address = address;
+
+	writeU32(&p.data[0], protocol_id);
+	writeU16(&p.data[4], sender_peer_id);
+	writeU8(&p.data[6], channel);
+
+	memcpy(&p.data[BASE_HEADER_SIZE], data, datasize);
+
+	return p;
+}
+
+BufferedPacket makePacket(Address &address, SharedBuffer<u8> &data,
+		u32 protocol_id, u16 sender_peer_id, u8 channel)
+{
+	return makePacket(address, *data, data.getSize(),
+			protocol_id, sender_peer_id, channel);
+}
+
+SharedBuffer<u8> makeOriginalPacket(
+		SharedBuffer<u8> data)
+{
+	u32 header_size = 1;
+	u32 packet_size = data.getSize() + header_size;
+	SharedBuffer<u8> b(packet_size);
+
+	writeU8(&(b[0]), TYPE_ORIGINAL);
+	if (data.getSize() > 0) {
+		memcpy(&(b[header_size]), *data, data.getSize());
+	}
+	return b;
+}
+
+std::list<SharedBuffer<u8> > makeSplitPacket(
+		SharedBuffer<u8> data,
+		u32 chunksize_max,
+		u16 seqnum)
+{
+	// Chunk packets, containing the TYPE_SPLIT header
+	std::list<SharedBuffer<u8> > chunks;
+
+	u32 chunk_header_size = 7;
+	u32 maximum_data_size = chunksize_max - chunk_header_size;
+	u32 start = 0;
+	u32 end = 0;
+	u32 chunk_num = 0;
+	u16 chunk_count = 0;
+	do{
+		end = start + maximum_data_size - 1;
+		if (end > data.getSize() - 1)
+			end = data.getSize() - 1;
+
+		u32 payload_size = end - start + 1;
+		u32 packet_size = chunk_header_size + payload_size;
+
+		SharedBuffer<u8> chunk(packet_size);
+
+		writeU8(&chunk[0], TYPE_SPLIT);
+		writeU16(&chunk[1], seqnum);
+		// [3] u16 chunk_count is written at next stage
+		writeU16(&chunk[5], chunk_num);
+		memcpy(&chunk[chunk_header_size], &data[start], payload_size);
+
+		chunks.push_back(chunk);
+		chunk_count++;
+
+		start = end + 1;
+		chunk_num++;
+	}
+	while(end != data.getSize() - 1);
+
+	for(std::list<SharedBuffer<u8> >::iterator i = chunks.begin();
+		i != chunks.end(); ++i)
+	{
+		// Write chunk_count
+		writeU16(&((*i)[3]), chunk_count);
+	}
+
+	return chunks;
+}
+
+std::list<SharedBuffer<u8> > makeAutoSplitPacket(
+		SharedBuffer<u8> data,
+		u32 chunksize_max,
+		u16 &split_seqnum)
+{
+	u32 original_header_size = 1;
+	std::list<SharedBuffer<u8> > list;
+	if (data.getSize() + original_header_size > chunksize_max)
+	{
+		list = makeSplitPacket(data, chunksize_max, split_seqnum);
+		split_seqnum++;
+		return list;
+	}
+	else
+	{
+		list.push_back(makeOriginalPacket(data));
+	}
+	return list;
+}
+
+SharedBuffer<u8> makeReliablePacket(
+		SharedBuffer<u8> data,
+		u16 seqnum)
+{
+	u32 header_size = 3;
+	u32 packet_size = data.getSize() + header_size;
+	SharedBuffer<u8> b(packet_size);
+
+	writeU8(&b[0], TYPE_RELIABLE);
+	writeU16(&b[1], seqnum);
+
+	memcpy(&b[header_size], *data, data.getSize());
+
+	return b;
+}
+
+/*
+	ReliablePacketBuffer
+*/
+
+ReliablePacketBuffer::ReliablePacketBuffer(): m_list_size(0) {}
+
+void ReliablePacketBuffer::print()
+{
+	JMutexAutoLock listlock(m_list_mutex);
+	LOG(dout_con<<"Dump of ReliablePacketBuffer:" << std::endl);
+	unsigned int index = 0;
+	for(std::list<BufferedPacket>::iterator i = m_list.begin();
+		i != m_list.end();
+		++i)
+	{
+		u16 s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
+		LOG(dout_con<<index<< ":" << s << std::endl);
+		index++;
+	}
+}
+bool ReliablePacketBuffer::empty()
+{
+	JMutexAutoLock listlock(m_list_mutex);
+	return m_list.empty();
+}
+
+u32 ReliablePacketBuffer::size()
+{
+	return m_list_size;
+}
+
+bool ReliablePacketBuffer::containsPacket(u16 seqnum)
+{
+	return !(findPacket(seqnum) == m_list.end());
+}
+
+RPBSearchResult ReliablePacketBuffer::findPacket(u16 seqnum)
+{
+	std::list<BufferedPacket>::iterator i = m_list.begin();
+	for(; i != m_list.end(); ++i)
+	{
+		u16 s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
+		/*dout_con<<"findPacket(): finding seqnum="<<seqnum
+				<<", comparing to s="<<s<<std::endl;*/
+		if (s == seqnum)
+			break;
+	}
+	return i;
+}
+RPBSearchResult ReliablePacketBuffer::notFound()
+{
+	return m_list.end();
+}
+bool ReliablePacketBuffer::getFirstSeqnum(u16& result)
+{
+	JMutexAutoLock listlock(m_list_mutex);
+	if (m_list.empty())
+		return false;
+	BufferedPacket p = *m_list.begin();
+	result = readU16(&p.data[BASE_HEADER_SIZE+1]);
+	return true;
+}
+
+BufferedPacket ReliablePacketBuffer::popFirst()
+{
+	JMutexAutoLock listlock(m_list_mutex);
+	if (m_list.empty())
+		throw NotFoundException("Buffer is empty");
+	BufferedPacket p = *m_list.begin();
+	m_list.erase(m_list.begin());
+	--m_list_size;
+
+	if (m_list_size == 0) {
+		m_oldest_non_answered_ack = 0;
+	} else {
+		m_oldest_non_answered_ack =
+				readU16(&(*m_list.begin()).data[BASE_HEADER_SIZE+1]);
+	}
+	return p;
+}
+BufferedPacket ReliablePacketBuffer::popSeqnum(u16 seqnum)
+{
+	JMutexAutoLock listlock(m_list_mutex);
+	RPBSearchResult r = findPacket(seqnum);
+	if (r == notFound()) {
+		LOG(dout_con<<"Sequence number: " << seqnum
+				<< " not found in reliable buffer"<<std::endl);
+		throw NotFoundException("seqnum not found in buffer");
+	}
+	BufferedPacket p = *r;
+
+
+	RPBSearchResult next = r;
+	next++;
+	if (next != notFound()) {
+		u16 s = readU16(&(next->data[BASE_HEADER_SIZE+1]));
+		m_oldest_non_answered_ack = s;
+	}
+
+	m_list.erase(r);
+	--m_list_size;
+
+	if (m_list_size == 0)
+	{ m_oldest_non_answered_ack = 0; }
+	else
+	{ m_oldest_non_answered_ack = readU16(&(*m_list.begin()).data[BASE_HEADER_SIZE+1]);	}
+	return p;
+}
+void ReliablePacketBuffer::insert(BufferedPacket &p,u16 next_expected)
+{
+	JMutexAutoLock listlock(m_list_mutex);
+	assert(p.data.getSize() >= BASE_HEADER_SIZE+3);
+	u8 type = readU8(&p.data[BASE_HEADER_SIZE+0]);
+	assert(type == TYPE_RELIABLE);
+	u16 seqnum = readU16(&p.data[BASE_HEADER_SIZE+1]);
+
+	assert(seqnum_in_window(seqnum,next_expected,MAX_RELIABLE_WINDOW_SIZE));
+	assert(seqnum != next_expected);
+
+	++m_list_size;
+	assert(m_list_size <= SEQNUM_MAX+1);
+
+	// Find the right place for the packet and insert it there
+	// If list is empty, just add it
+	if (m_list.empty())
+	{
+		m_list.push_back(p);
+		m_oldest_non_answered_ack = seqnum;
+		// Done.
+		return;
+	}
+
+	// Otherwise find the right place
+	std::list<BufferedPacket>::iterator i = m_list.begin();
+	// Find the first packet in the list which has a higher seqnum
+	u16 s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
+
+	/* case seqnum is smaller then next_expected seqnum */
+	/* this is true e.g. on wrap around */
+	if (seqnum < next_expected) {
+		while(((s < seqnum) || (s >= next_expected)) && (i != m_list.end())) {
+			i++;
+			if (i != m_list.end())
+				s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
+		}
+	}
+	/* non wrap around case (at least for incoming and next_expected */
+	else
+	{
+		while(((s < seqnum) && (s >= next_expected)) && (i != m_list.end())) {
+			i++;
+			if (i != m_list.end())
+				s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
+		}
+	}
+
+	if (s == seqnum) {
+		if (
+			(readU16(&(i->data[BASE_HEADER_SIZE+1])) != seqnum) ||
+			(i->data.getSize() != p.data.getSize()) ||
+			(i->address != p.address)
+			)
+		{
+			/* if this happens your maximum transfer window may be to big */
+			fprintf(stderr,
+					"Duplicated seqnum %d non matching packet detected:\n",
+					seqnum);
+			fprintf(stderr, "Old: seqnum: %05d size: %04d, address: %s\n",
+					readU16(&(i->data[BASE_HEADER_SIZE+1])),i->data.getSize(),
+					i->address.serializeString().c_str());
+			fprintf(stderr, "New: seqnum: %05d size: %04u, address: %s\n",
+					readU16(&(p.data[BASE_HEADER_SIZE+1])),p.data.getSize(),
+					p.address.serializeString().c_str());
+			throw IncomingDataCorruption("duplicated packet isn't same as original one");
+		}
+
+		assert(readU16(&(i->data[BASE_HEADER_SIZE+1])) == seqnum);
+		assert(i->data.getSize() == p.data.getSize());
+		assert(i->address == p.address);
+
+		/* nothing to do this seems to be a resent packet */
+		/* for paranoia reason data should be compared */
+		--m_list_size;
+	}
+	/* insert or push back */
+	else if (i != m_list.end()) {
+		m_list.insert(i, p);
+	}
+	else {
+		m_list.push_back(p);
+	}
+
+	/* update last packet number */
+	m_oldest_non_answered_ack = readU16(&(*m_list.begin()).data[BASE_HEADER_SIZE+1]);
+}
+
+void ReliablePacketBuffer::incrementTimeouts(float dtime)
+{
+	JMutexAutoLock listlock(m_list_mutex);
+	for(std::list<BufferedPacket>::iterator i = m_list.begin();
+		i != m_list.end(); ++i)
+	{
+		i->time += dtime;
+		i->totaltime += dtime;
+	}
+}
+
+std::list<BufferedPacket> ReliablePacketBuffer::getTimedOuts(float timeout,
+													unsigned int max_packets)
+{
+	JMutexAutoLock listlock(m_list_mutex);
+	std::list<BufferedPacket> timed_outs;
+	for(std::list<BufferedPacket>::iterator i = m_list.begin();
+		i != m_list.end(); ++i)
+	{
+		if (i->time >= timeout) {
+			timed_outs.push_back(*i);
+
+			//this packet will be sent right afterwards reset timeout here
+			i->time = 0.0;
+			if (timed_outs.size() >= max_packets)
+				break;
+		}
+	}
+	return timed_outs;
+}
+
+/*
+	IncomingSplitBuffer
+*/
+
+IncomingSplitBuffer::~IncomingSplitBuffer()
+{
+	JMutexAutoLock listlock(m_map_mutex);
+	for(std::map<u16, IncomingSplitPacket*>::iterator i = m_buf.begin();
+		i != m_buf.end(); ++i)
+	{
+		delete i->second;
+	}
+}
+/*
+	This will throw a GotSplitPacketException when a full
+	split packet is constructed.
+*/
+SharedBuffer<u8> IncomingSplitBuffer::insert(BufferedPacket &p, bool reliable)
+{
+	JMutexAutoLock listlock(m_map_mutex);
+	u32 headersize = BASE_HEADER_SIZE + 7;
+	assert(p.data.getSize() >= headersize);
+	u8 type = readU8(&p.data[BASE_HEADER_SIZE+0]);
+	assert(type == TYPE_SPLIT);
+	u16 seqnum = readU16(&p.data[BASE_HEADER_SIZE+1]);
+	u16 chunk_count = readU16(&p.data[BASE_HEADER_SIZE+3]);
+	u16 chunk_num = readU16(&p.data[BASE_HEADER_SIZE+5]);
+
+	// Add if doesn't exist
+	if (m_buf.find(seqnum) == m_buf.end())
+	{
+		IncomingSplitPacket *sp = new IncomingSplitPacket();
+		sp->chunk_count = chunk_count;
+		sp->reliable = reliable;
+		m_buf[seqnum] = sp;
+	}
+
+	IncomingSplitPacket *sp = m_buf[seqnum];
+
+	// TODO: These errors should be thrown or something? Dunno.
+	if (chunk_count != sp->chunk_count)
+		LOG(derr_con<<"Connection: WARNING: chunk_count="<<chunk_count
+				<<" != sp->chunk_count="<<sp->chunk_count
+				<<std::endl);
+	if (reliable != sp->reliable)
+		LOG(derr_con<<"Connection: WARNING: reliable="<<reliable
+				<<" != sp->reliable="<<sp->reliable
+				<<std::endl);
+
+	// If chunk already exists, ignore it.
+	// Sometimes two identical packets may arrive when there is network
+	// lag and the server re-sends stuff.
+	if (sp->chunks.find(chunk_num) != sp->chunks.end())
+		return SharedBuffer<u8>();
+
+	// Cut chunk data out of packet
+	u32 chunkdatasize = p.data.getSize() - headersize;
+	SharedBuffer<u8> chunkdata(chunkdatasize);
+	memcpy(*chunkdata, &(p.data[headersize]), chunkdatasize);
+
+	// Set chunk data in buffer
+	sp->chunks[chunk_num] = chunkdata;
+
+	// If not all chunks are received, return empty buffer
+	if (sp->allReceived() == false)
+		return SharedBuffer<u8>();
+
+	// Calculate total size
+	u32 totalsize = 0;
+	for(std::map<u16, SharedBuffer<u8> >::iterator i = sp->chunks.begin();
+		i != sp->chunks.end(); ++i)
+	{
+		totalsize += i->second.getSize();
+	}
+
+	SharedBuffer<u8> fulldata(totalsize);
+
+	// Copy chunks to data buffer
+	u32 start = 0;
+	for(u32 chunk_i=0; chunk_i<sp->chunk_count;
+			chunk_i++)
+	{
+		SharedBuffer<u8> buf = sp->chunks[chunk_i];
+		u16 chunkdatasize = buf.getSize();
+		memcpy(&fulldata[start], *buf, chunkdatasize);
+		start += chunkdatasize;;
+	}
+
+	// Remove sp from buffer
+	m_buf.erase(seqnum);
+	delete sp;
+
+	return fulldata;
+}
+void IncomingSplitBuffer::removeUnreliableTimedOuts(float dtime, float timeout)
+{
+	std::list<u16> remove_queue;
+	{
+		JMutexAutoLock listlock(m_map_mutex);
+		for(std::map<u16, IncomingSplitPacket*>::iterator i = m_buf.begin();
+			i != m_buf.end(); ++i)
+		{
+			IncomingSplitPacket *p = i->second;
+			// Reliable ones are not removed by timeout
+			if (p->reliable == true)
+				continue;
+			p->time += dtime;
+			if (p->time >= timeout)
+				remove_queue.push_back(i->first);
+		}
+	}
+	for(std::list<u16>::iterator j = remove_queue.begin();
+		j != remove_queue.end(); ++j)
+	{
+		JMutexAutoLock listlock(m_map_mutex);
+		LOG(dout_con<<"NOTE: Removing timed out unreliable split packet"<<std::endl);
+		delete m_buf[*j];
+		m_buf.erase(*j);
+	}
+}
+
+/*
+	Channel
+*/
+
+Channel::Channel() :
+		window_size(MIN_RELIABLE_WINDOW_SIZE),
+		next_incoming_seqnum(SEQNUM_INITIAL),
+		next_outgoing_seqnum(SEQNUM_INITIAL),
+		next_outgoing_split_seqnum(SEQNUM_INITIAL),
+		current_packet_loss(0),
+		current_packet_too_late(0),
+		current_packet_successfull(0),
+		packet_loss_counter(0),
+		current_bytes_transfered(0),
+		current_bytes_received(0),
+		current_bytes_lost(0),
+		max_kbps(0.0),
+		cur_kbps(0.0),
+		avg_kbps(0.0),
+		max_incoming_kbps(0.0),
+		cur_incoming_kbps(0.0),
+		avg_incoming_kbps(0.0),
+		max_kbps_lost(0.0),
+		cur_kbps_lost(0.0),
+		avg_kbps_lost(0.0),
+		bpm_counter(0.0),
+		rate_samples(0)
+{
+}
+
+Channel::~Channel()
+{
+}
+
+u16 Channel::readNextIncomingSeqNum()
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	return next_incoming_seqnum;
+}
+
+u16 Channel::incNextIncomingSeqNum()
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	u16 retval = next_incoming_seqnum;
+	next_incoming_seqnum++;
+	return retval;
+}
+
+u16 Channel::readNextSplitSeqNum()
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	return next_outgoing_split_seqnum;
+}
+void Channel::setNextSplitSeqNum(u16 seqnum)
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	next_outgoing_split_seqnum = seqnum;
+}
+
+u16 Channel::getOutgoingSequenceNumber(bool& successfull)
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	u16 retval = next_outgoing_seqnum;
+	u16 lowest_unacked_seqnumber;
+
+	/* shortcut if there ain't any packet in outgoing list */
+	if (outgoing_reliables_sent.empty())
+	{
+		next_outgoing_seqnum++;
+		return retval;
+	}
+
+	if (outgoing_reliables_sent.getFirstSeqnum(lowest_unacked_seqnumber))
+	{
+		if (lowest_unacked_seqnumber < next_outgoing_seqnum) {
+			// ugly cast but this one is required in order to tell compiler we
+			// know about difference of two unsigned may be negative in general
+			// but we already made sure it won't happen in this case
+			if (((u16)(next_outgoing_seqnum - lowest_unacked_seqnumber)) > window_size) {
+				successfull = false;
+				return 0;
+			}
+		}
+		else {
+			// ugly cast but this one is required in order to tell compiler we
+			// know about difference of two unsigned may be negative in general
+			// but we already made sure it won't happen in this case
+			if ((next_outgoing_seqnum + (u16)(SEQNUM_MAX - lowest_unacked_seqnumber)) >
+				window_size) {
+				successfull = false;
+				return 0;
+			}
+		}
+	}
+
+	next_outgoing_seqnum++;
+	return retval;
+}
+
+u16 Channel::readOutgoingSequenceNumber()
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	return next_outgoing_seqnum;
+}
+
+bool Channel::putBackSequenceNumber(u16 seqnum)
+{
+	if (((seqnum + 1) % (SEQNUM_MAX+1)) == next_outgoing_seqnum) {
+
+		next_outgoing_seqnum = seqnum;
+		return true;
+	}
+	return false;
+}
+
+void Channel::UpdateBytesSent(unsigned int bytes, unsigned int packets)
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	current_bytes_transfered += bytes;
+	current_packet_successfull += packets;
+}
+
+void Channel::UpdateBytesReceived(unsigned int bytes) {
+	JMutexAutoLock internal(m_internal_mutex);
+	current_bytes_received += bytes;
+}
+
+void Channel::UpdateBytesLost(unsigned int bytes)
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	current_bytes_lost += bytes;
+}
+
+
+void Channel::UpdatePacketLossCounter(unsigned int count)
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	current_packet_loss += count;
+}
+
+void Channel::UpdatePacketTooLateCounter()
+{
+	JMutexAutoLock internal(m_internal_mutex);
+	current_packet_too_late++;
+}
+
+void Channel::UpdateTimers(float dtime,bool legacy_peer)
+{
+	bpm_counter += dtime;
+	packet_loss_counter += dtime;
+
+	if (packet_loss_counter > 1.0)
+	{
+		packet_loss_counter -= 1.0;
+
+		unsigned int packet_loss = 11; /* use a neutral value for initialization */
+		unsigned int packets_successfull = 0;
+		//unsigned int packet_too_late = 0;
+
+		bool reasonable_amount_of_data_transmitted = false;
+
+		{
+			JMutexAutoLock internal(m_internal_mutex);
+			packet_loss = current_packet_loss;
+			//packet_too_late = current_packet_too_late;
+			packets_successfull = current_packet_successfull;
+
+			if (current_bytes_transfered > (unsigned int) (window_size*512/2))
+			{
+				reasonable_amount_of_data_transmitted = true;
+			}
+			current_packet_loss = 0;
+			current_packet_too_late = 0;
+			current_packet_successfull = 0;
+		}
+
+		/* dynamic window size is only available for non legacy peers */
+		if (!legacy_peer) {
+			float successfull_to_lost_ratio = 0.0;
+			bool done = false;
+
+			if (packets_successfull > 0) {
+				successfull_to_lost_ratio = packet_loss/packets_successfull;
+			}
+			else if (packet_loss > 0)
+			{
+				window_size = MYMAX(
+						(window_size - 10),
+						MIN_RELIABLE_WINDOW_SIZE);
+				done = true;
+			}
+
+			if (!done)
+			{
+				if ((successfull_to_lost_ratio < 0.01) &&
+					(window_size < MAX_RELIABLE_WINDOW_SIZE))
+				{
+					/* don't even think about increasing if we didn't even
+					 * use major parts of our window */
+					if (reasonable_amount_of_data_transmitted)
+						window_size = MYMIN(
+								(window_size + 100),
+								MAX_RELIABLE_WINDOW_SIZE);
+				}
+				else if ((successfull_to_lost_ratio < 0.05) &&
+						(window_size < MAX_RELIABLE_WINDOW_SIZE))
+				{
+					/* don't even think about increasing if we didn't even
+					 * use major parts of our window */
+					if (reasonable_amount_of_data_transmitted)
+						window_size = MYMIN(
+								(window_size + 50),
+								MAX_RELIABLE_WINDOW_SIZE);
+				}
+				else if (successfull_to_lost_ratio > 0.15)
+				{
+					window_size = MYMAX(
+							(window_size - 100),
+							MIN_RELIABLE_WINDOW_SIZE);
+				}
+				else if (successfull_to_lost_ratio > 0.1)
+				{
+					window_size = MYMAX(
+							(window_size - 50),
+							MIN_RELIABLE_WINDOW_SIZE);
+				}
+			}
+		}
+	}
+
+	if (bpm_counter > 10.0)
+	{
+		{
+			JMutexAutoLock internal(m_internal_mutex);
+			cur_kbps                 =
+					(((float) current_bytes_transfered)/bpm_counter)/1024.0;
+			current_bytes_transfered = 0;
+			cur_kbps_lost            =
+					(((float) current_bytes_lost)/bpm_counter)/1024.0;
+			current_bytes_lost       = 0;
+			cur_incoming_kbps        =
+					(((float) current_bytes_received)/bpm_counter)/1024.0;
+			current_bytes_received   = 0;
+			bpm_counter              = 0;
+		}
+
+		if (cur_kbps > max_kbps)
+		{
+			max_kbps = cur_kbps;
+		}
+
+		if (cur_kbps_lost > max_kbps_lost)
+		{
+			max_kbps_lost = cur_kbps_lost;
+		}
+
+		if (cur_incoming_kbps > max_incoming_kbps) {
+			max_incoming_kbps = cur_incoming_kbps;
+		}
+
+		rate_samples       = MYMIN(rate_samples+1,10);
+		float old_fraction = ((float) (rate_samples-1) )/( (float) rate_samples);
+		avg_kbps           = avg_kbps * old_fraction +
+				cur_kbps * (1.0 - old_fraction);
+		avg_kbps_lost      = avg_kbps_lost * old_fraction +
+				cur_kbps_lost * (1.0 - old_fraction);
+		avg_incoming_kbps  = avg_incoming_kbps * old_fraction +
+				cur_incoming_kbps * (1.0 - old_fraction);
+	}
+}
+
+
+/*
+	Peer
+*/
+
+PeerHelper::PeerHelper() :
+	m_peer(0)
+{}
+
+PeerHelper::PeerHelper(Peer* peer) :
+	m_peer(peer)
+{
+	if (peer != NULL)
+	{
+		if (!peer->IncUseCount())
+		{
+			m_peer = 0;
+		}
+	}
+}
+
+PeerHelper::~PeerHelper()
+{
+	if (m_peer != 0)
+		m_peer->DecUseCount();
+
+	m_peer = 0;
+}
+
+PeerHelper& PeerHelper::operator=(Peer* peer)
+{
+	m_peer = peer;
+	if (peer != NULL)
+	{
+		if (!peer->IncUseCount())
+		{
+			m_peer = 0;
+		}
+	}
+	return *this;
+}
+
+Peer* PeerHelper::operator->() const
+{
+	return m_peer;
+}
+
+Peer* PeerHelper::operator&() const
+{
+	return m_peer;
+}
+
+bool PeerHelper::operator!() {
+	return ! m_peer;
+}
+
+bool PeerHelper::operator!=(void* ptr)
+{
+	return ((void*) m_peer != ptr);
+}
+
+bool Peer::IncUseCount()
+{
+	JMutexAutoLock lock(m_exclusive_access_mutex);
+
+	if (!m_pending_deletion)
+	{
+		this->m_usage++;
+		return true;
+	}
+
+	return false;
+}
+
+void Peer::DecUseCount()
+{
+	{
+		JMutexAutoLock lock(m_exclusive_access_mutex);
+		assert(m_usage > 0);
+		m_usage--;
+
+		if (!((m_pending_deletion) && (m_usage == 0)))
+			return;
+	}
+	delete this;
+}
+
+void Peer::RTTStatistics(float rtt, std::string profiler_id,
+		unsigned int num_samples) {
+
+	if (m_last_rtt > 0) {
+		/* set min max values */
+		if (rtt < m_rtt.min_rtt)
+			m_rtt.min_rtt = rtt;
+		if (rtt >= m_rtt.max_rtt)
+			m_rtt.max_rtt = rtt;
+
+		/* do average calculation */
+		if (m_rtt.avg_rtt < 0.0)
+			m_rtt.avg_rtt  = rtt;
+		else
+			m_rtt.avg_rtt  = m_rtt.avg_rtt * (num_samples/(num_samples-1)) +
+								rtt * (1/num_samples);
+
+		/* do jitter calculation */
+
+		//just use some neutral value at beginning
+		float jitter = m_rtt.jitter_min;
+
+		if (rtt > m_last_rtt)
+			jitter = rtt-m_last_rtt;
+
+		if (rtt <= m_last_rtt)
+			jitter = m_last_rtt - rtt;
+
+		if (jitter < m_rtt.jitter_min)
+			m_rtt.jitter_min = jitter;
+		if (jitter >= m_rtt.jitter_max)
+			m_rtt.jitter_max = jitter;
+
+		if (m_rtt.jitter_avg < 0.0)
+			m_rtt.jitter_avg  = jitter;
+		else
+			m_rtt.jitter_avg  = m_rtt.jitter_avg * (num_samples/(num_samples-1)) +
+								jitter * (1/num_samples);
+
+		if (profiler_id != "")
+		{
+			g_profiler->graphAdd(profiler_id + "_rtt", rtt);
+			g_profiler->graphAdd(profiler_id + "_jitter", jitter);
+		}
+	}
+	/* save values required for next loop */
+	m_last_rtt = rtt;
+}
+
+bool Peer::isTimedOut(float timeout)
+{
+	JMutexAutoLock lock(m_exclusive_access_mutex);
+	u32 current_time = porting::getTimeMs();
+
+	float dtime = CALC_DTIME(m_last_timeout_check,current_time);
+	m_last_timeout_check = current_time;
+
+	m_timeout_counter += dtime;
+
+	return m_timeout_counter > timeout;
+}
+
+void Peer::Drop()
+{
+	{
+		JMutexAutoLock usage_lock(m_exclusive_access_mutex);
+		m_pending_deletion = true;
+		if (m_usage != 0)
+			return;
+	}
+
+	PROFILE(std::stringstream peerIdentifier1);
+	PROFILE(peerIdentifier1 << "runTimeouts[" << m_connection->getDesc()
+			<< ";" << id << ";RELIABLE]");
+	PROFILE(g_profiler->remove(peerIdentifier1.str()));
+	PROFILE(std::stringstream peerIdentifier2);
+	PROFILE(peerIdentifier2 << "sendPackets[" << m_connection->getDesc()
+			<< ";" << id << ";RELIABLE]");
+	PROFILE(ScopeProfiler peerprofiler(g_profiler, peerIdentifier2.str(), SPT_AVG));
+
+	delete this;
+}
+
+UDPPeer::UDPPeer(u16 a_id, Address a_address, Connection* connection) :
+	Peer(a_address,a_id,connection),
+	m_pending_disconnect(false),
+	resend_timeout(0.5),
+	m_legacy_peer(true)
+{
+}
+
+bool UDPPeer::getAddress(MTProtocols type,Address& toset)
+{
+	if ((type == MTP_UDP) || (type == MTP_MINETEST_RELIABLE_UDP) || (type == MTP_PRIMARY))
+	{
+		toset = address;
+		return true;
+	}
+
+	return false;
+}
+
+void UDPPeer::setNonLegacyPeer()
+{
+	m_legacy_peer = false;
+	for(unsigned int i=0; i< CHANNEL_COUNT; i++)
+	{
+		channels->setWindowSize(g_settings->getU16("max_packets_per_iteration"));
+	}
+}
+
+void UDPPeer::reportRTT(float rtt)
+{
+	if (rtt < 0.0) {
+		return;
+	}
+	RTTStatistics(rtt,"rudp",MAX_RELIABLE_WINDOW_SIZE*10);
+
+	float timeout = getStat(AVG_RTT) * RESEND_TIMEOUT_FACTOR;
+	if (timeout < RESEND_TIMEOUT_MIN)
+		timeout = RESEND_TIMEOUT_MIN;
+	if (timeout > RESEND_TIMEOUT_MAX)
+		timeout = RESEND_TIMEOUT_MAX;
+
+	JMutexAutoLock usage_lock(m_exclusive_access_mutex);
+	resend_timeout = timeout;
+}
+
+bool UDPPeer::Ping(float dtime,SharedBuffer<u8>& data)
+{
+	m_ping_timer += dtime;
+	if (m_ping_timer >= PING_TIMEOUT)
+	{
+		// Create and send PING packet
+		writeU8(&data[0], TYPE_CONTROL);
+		writeU8(&data[1], CONTROLTYPE_PING);
+		m_ping_timer = 0.0;
+		return true;
+	}
+	return false;
+}
+
+void UDPPeer::PutReliableSendCommand(ConnectionCommand &c,
+		unsigned int max_packet_size)
+{
+	if (m_pending_disconnect)
+		return;
+
+	if ( channels[c.channelnum].queued_commands.empty() &&
+			/* don't queue more packets then window size */
+			(channels[c.channelnum].queued_reliables.size()
+			< (channels[c.channelnum].getWindowSize()/2)))
+	{
+		LOG(dout_con<<m_connection->getDesc()
+				<<" processing reliable command for peer id: " << c.peer_id
+				<<" data size: " << c.data.getSize() << std::endl);
+		if (!processReliableSendCommand(c,max_packet_size))
+		{
+			channels[c.channelnum].queued_commands.push_back(c);
+		}
+	}
+	else
+	{
+		LOG(dout_con<<m_connection->getDesc()
+				<<" Queueing reliable command for peer id: " << c.peer_id
+				<<" data size: " << c.data.getSize() <<std::endl);
+		channels[c.channelnum].queued_commands.push_back(c);
+	}
+}
+
+bool UDPPeer::processReliableSendCommand(
+				ConnectionCommand &c,
+				unsigned int max_packet_size)
+{
+	if (m_pending_disconnect)
+		return true;
+
+	u32 chunksize_max = max_packet_size
+							- BASE_HEADER_SIZE
+							- RELIABLE_HEADER_SIZE;
+
+	assert(c.data.getSize() < MAX_RELIABLE_WINDOW_SIZE*512);
+
+	std::list<SharedBuffer<u8> > originals;
+	u16 split_sequence_number = channels[c.channelnum].readNextSplitSeqNum();
+
+	if (c.raw)
+	{
+		originals.push_back(c.data);
+	}
+	else {
+		originals = makeAutoSplitPacket(c.data, chunksize_max,split_sequence_number);
+		channels[c.channelnum].setNextSplitSeqNum(split_sequence_number);
+	}
+
+	bool have_sequence_number = true;
+	bool have_initial_sequence_number = false;
+	Queue<BufferedPacket> toadd;
+	volatile u16 initial_sequence_number = 0;
+
+	for(std::list<SharedBuffer<u8> >::iterator i = originals.begin();
+		i != originals.end(); ++i)
+	{
+		u16 seqnum = channels[c.channelnum].getOutgoingSequenceNumber(have_sequence_number);
+
+		/* oops, we don't have enough sequence numbers to send this packet */
+		if (!have_sequence_number)
+			break;
+
+		if (!have_initial_sequence_number)
+		{
+			initial_sequence_number = seqnum;
+			have_initial_sequence_number = true;
+		}
+
+		SharedBuffer<u8> reliable = makeReliablePacket(*i, seqnum);
+
+		// Add base headers and make a packet
+		BufferedPacket p = con::makePacket(address, reliable,
+				m_connection->GetProtocolID(), m_connection->GetPeerID(),
+				c.channelnum);
+
+		toadd.push_back(p);
+	}
+
+	if (have_sequence_number) {
+		volatile u16 pcount = 0;
+		while(toadd.size() > 0) {
+			BufferedPacket p = toadd.pop_front();
+//			LOG(dout_con<<connection->getDesc()
+//					<< " queuing reliable packet for peer_id: " << c.peer_id
+//					<< " channel: " << (c.channelnum&0xFF)
+//					<< " seqnum: " << readU16(&p.data[BASE_HEADER_SIZE+1])
+//					<< std::endl)
+			channels[c.channelnum].queued_reliables.push_back(p);
+			pcount++;
+		}
+		assert(channels[c.channelnum].queued_reliables.size() < 0xFFFF);
+		return true;
+	}
+	else {
+		volatile u16 packets_available = toadd.size();
+		/* we didn't get a single sequence number no need to fill queue */
+		if (!have_initial_sequence_number)
+		{
+			return false;
+		}
+		while(toadd.size() > 0) {
+			/* remove packet */
+			toadd.pop_front();
+
+			bool successfully_put_back_sequence_number
+				= channels[c.channelnum].putBackSequenceNumber(
+					(initial_sequence_number+toadd.size() % (SEQNUM_MAX+1)));
+
+			assert(successfully_put_back_sequence_number);
+		}
+		LOG(dout_con<<m_connection->getDesc()
+				<< " Windowsize exceeded on reliable sending "
+				<< c.data.getSize() << " bytes"
+				<< std::endl << "\t\tinitial_sequence_number: "
+				<< initial_sequence_number
+				<< std::endl << "\t\tgot at most            : "
+				<< packets_available << " packets"
+				<< std::endl << "\t\tpackets queued         : "
+				<< channels[c.channelnum].outgoing_reliables_sent.size()
+				<< std::endl);
+		return false;
+	}
+}
+
+void UDPPeer::RunCommandQueues(
+							unsigned int max_packet_size,
+							unsigned int maxcommands,
+							unsigned int maxtransfer)
+{
+
+	for (unsigned int i = 0; i < CHANNEL_COUNT; i++)
+	{
+		unsigned int commands_processed = 0;
+
+		if ((channels[i].queued_commands.size() > 0) &&
+				(channels[i].queued_reliables.size() < maxtransfer) &&
+				(commands_processed < maxcommands))
+		{
+			try {
+				ConnectionCommand c = channels[i].queued_commands.pop_front();
+				LOG(dout_con<<m_connection->getDesc()
+						<<" processing queued reliable command "<<std::endl);
+				if (!processReliableSendCommand(c,max_packet_size)) {
+					LOG(dout_con<<m_connection->getDesc()
+							<< " Failed to queue packets for peer_id: " << c.peer_id
+							<< ", delaying sending of " << c.data.getSize()
+							<< " bytes" << std::endl);
+					channels[i].queued_commands.push_front(c);
+				}
+			}
+			catch (ItemNotFoundException &e) {
+				// intentionally empty
+			}
+		}
+	}
+}
+
+u16 UDPPeer::getNextSplitSequenceNumber(u8 channel)
+{
+	assert(channel < CHANNEL_COUNT);
+	return channels[channel].readNextIncomingSeqNum();
+}
+
+void UDPPeer::setNextSplitSequenceNumber(u8 channel, u16 seqnum)
+{
+	assert(channel < CHANNEL_COUNT);
+	channels[channel].setNextSplitSeqNum(seqnum);
+}
+
+SharedBuffer<u8> UDPPeer::addSpiltPacket(u8 channel,
+											BufferedPacket toadd,
+											bool reliable)
+{
+	assert(channel < CHANNEL_COUNT);
+	return channels[channel].incoming_splits.insert(toadd,reliable);
+}
+
+/******************************************************************************/
+/* Connection Threads                                                         */
+/******************************************************************************/
+
+ConnectionSendThread::ConnectionSendThread( unsigned int max_packet_size,
+											float timeout) :
+	m_connection(NULL),
+	m_max_packet_size(max_packet_size),
+	m_timeout(timeout),
+	m_max_commands_per_iteration(1),
+	m_max_data_packets_per_iteration(g_settings->getU16("max_packets_per_iteration")),
+	m_max_packets_requeued(256)
+{
+}
+
+void * ConnectionSendThread::Thread()
+{
+	assert(m_connection != NULL);
+	ThreadStarted();
+	log_register_thread("ConnectionSend");
+
+	LOG(dout_con<<m_connection->getDesc()
+			<<"ConnectionSend thread started"<<std::endl);
+
+	u32 curtime = porting::getTimeMs();
+	u32 lasttime = curtime;
+
+	PROFILE(std::stringstream ThreadIdentifier);
+	PROFILE(ThreadIdentifier << "ConnectionSend: [" << m_connection->getDesc() << "]");
+
+	porting::setThreadName("ConnectionSend");
+
+	/* if stop is requested don't stop immediately but try to send all        */
+	/* packets first */
+	while(!StopRequested() || packetsQueued()) {
+		BEGIN_DEBUG_EXCEPTION_HANDLER
+		PROFILE(ScopeProfiler sp(g_profiler, ThreadIdentifier.str(), SPT_AVG));
+
+		m_iteration_packets_avaialble = m_max_data_packets_per_iteration;
+
+		/* wait for trigger or timeout */
+		m_send_sleep_semaphore.Wait(50);
+
+		/* remove all triggers */
+		while(m_send_sleep_semaphore.Wait(0)) {}
+
+		lasttime = curtime;
+		curtime = porting::getTimeMs();
+		float dtime = CALC_DTIME(lasttime,curtime);
+
+		/* first do all the reliable stuff */
+		runTimeouts(dtime);
+
+		/* translate commands to packets */
+		ConnectionCommand c = m_connection->m_command_queue.pop_frontNoEx(0);
+		while(c.type != CONNCMD_NONE)
+				{
+			if (c.reliable)
+				processReliableCommand(c);
+			else
+				processNonReliableCommand(c);
+
+			c = m_connection->m_command_queue.pop_frontNoEx(0);
+		}
+
+		/* send non reliable packets */
+		sendPackets(dtime);
+
+		END_DEBUG_EXCEPTION_HANDLER(errorstream);
+	}
+
+	PROFILE(g_profiler->remove(ThreadIdentifier.str()));
+	return NULL;
+}
+
+void ConnectionSendThread::Trigger()
+{
+	m_send_sleep_semaphore.Post();
+}
+
+bool ConnectionSendThread::packetsQueued()
+{
+	std::list<u16> peerIds = m_connection->getPeerIDs();
+
+	if (!m_outgoing_queue.empty() && !peerIds.empty())
+		return true;
+
+	for(std::list<u16>::iterator j = peerIds.begin();
+			j != peerIds.end(); ++j)
+	{
+		PeerHelper peer = m_connection->getPeerNoEx(*j);
+
+		if (!peer)
+			continue;
+
+		if (dynamic_cast<UDPPeer*>(&peer) == 0)
+			continue;
+
+		for(u16 i=0; i<CHANNEL_COUNT; i++)
+		{
+			Channel *channel = &(dynamic_cast<UDPPeer*>(&peer))->channels[i];
+
+			if (channel->queued_commands.size() > 0)
+			{
+				return true;
+			}
+		}
+	}
+
+
+	return false;
+}
+
+void ConnectionSendThread::runTimeouts(float dtime)
+{
+	std::list<u16> timeouted_peers;
+	std::list<u16> peerIds = m_connection->getPeerIDs();
+
+	for(std::list<u16>::iterator j = peerIds.begin();
+		j != peerIds.end(); ++j)
+	{
+		PeerHelper peer = m_connection->getPeerNoEx(*j);
+
+		if (!peer)
+			continue;
+
+		if (dynamic_cast<UDPPeer*>(&peer) == 0)
+			continue;
+
+		PROFILE(std::stringstream peerIdentifier);
+		PROFILE(peerIdentifier << "runTimeouts[" << m_connection->getDesc()
+				<< ";" << *j << ";RELIABLE]");
+		PROFILE(ScopeProfiler peerprofiler(g_profiler, peerIdentifier.str(), SPT_AVG));
+
+		SharedBuffer<u8> data(2); // data for sending ping, required here because of goto
+
+		/*
+			Check peer timeout
+		*/
+		if (peer->isTimedOut(m_timeout))
+		{
+			infostream<<m_connection->getDesc()
+					<<"RunTimeouts(): Peer "<<peer->id
+					<<" has timed out."
+					<<" (source=peer->timeout_counter)"
+					<<std::endl;
+			// Add peer to the list
+			timeouted_peers.push_back(peer->id);
+			// Don't bother going through the buffers of this one
+			continue;
+		}
+
+		float resend_timeout = dynamic_cast<UDPPeer*>(&peer)->getResendTimeout();
+		for(u16 i=0; i<CHANNEL_COUNT; i++)
+		{
+			std::list<BufferedPacket> timed_outs;
+			Channel *channel = &(dynamic_cast<UDPPeer*>(&peer))->channels[i];
+
+			if (dynamic_cast<UDPPeer*>(&peer)->getLegacyPeer())
+				channel->setWindowSize(g_settings->getU16("workaround_window_size"));
+
+			// Remove timed out incomplete unreliable split packets
+			channel->incoming_splits.removeUnreliableTimedOuts(dtime, m_timeout);
+
+			// Increment reliable packet times
+			channel->outgoing_reliables_sent.incrementTimeouts(dtime);
+
+			unsigned int numpeers = m_connection->m_peers.size();
+
+			if (numpeers == 0)
+				return;
+
+			// Re-send timed out outgoing reliables
+			timed_outs = channel->
+					outgoing_reliables_sent.getTimedOuts(resend_timeout,
+							(m_max_data_packets_per_iteration/numpeers));
+
+			channel->UpdatePacketLossCounter(timed_outs.size());
+			g_profiler->graphAdd("packets_lost", timed_outs.size());
+
+			m_iteration_packets_avaialble -= timed_outs.size();
+
+			for(std::list<BufferedPacket>::iterator k = timed_outs.begin();
+				k != timed_outs.end(); ++k)
+			{
+				u16 peer_id = readPeerId(*(k->data));
+				u8 channelnum  = readChannel(*(k->data));
+				u16 seqnum  = readU16(&(k->data[BASE_HEADER_SIZE+1]));
+
+				channel->UpdateBytesLost(k->data.getSize());
+				k->resend_count++;
+
+				LOG(derr_con<<m_connection->getDesc()
+						<<"RE-SENDING timed-out RELIABLE to "
+						<< k->address.serializeString()
+						<< "(t/o="<<resend_timeout<<"): "
+						<<"from_peer_id="<<peer_id
+						<<", channel="<<((int)channelnum&0xff)
+						<<", seqnum="<<seqnum
+						<<std::endl);
+
+				rawSend(*k);
+
+				// do not handle rtt here as we can't decide if this packet was
+				// lost or really takes more time to transmit
+			}
+			channel->UpdateTimers(dtime,dynamic_cast<UDPPeer*>(&peer)->getLegacyPeer());
+		}
+
+		/* send ping if necessary */
+		if (dynamic_cast<UDPPeer*>(&peer)->Ping(dtime,data)) {
+			LOG(dout_con<<m_connection->getDesc()
+					<<"Sending ping for peer_id: "
+					<< dynamic_cast<UDPPeer*>(&peer)->id <<std::endl);
+			/* this may fail if there ain't a sequence number left */
+			if (!rawSendAsPacket(dynamic_cast<UDPPeer*>(&peer)->id, 0, data, true))
+			{
+				//retrigger with reduced ping interval
+				dynamic_cast<UDPPeer*>(&peer)->Ping(4.0,data);
+			}
+		}
+
+		dynamic_cast<UDPPeer*>(&peer)->RunCommandQueues(m_max_packet_size,
+								m_max_commands_per_iteration,
+								m_max_packets_requeued);
+	}
+
+	// Remove timed out peers
+	for(std::list<u16>::iterator i = timeouted_peers.begin();
+		i != timeouted_peers.end(); ++i)
+	{
+		LOG(derr_con<<m_connection->getDesc()
+				<<"RunTimeouts(): Removing peer "<<(*i)<<std::endl);
+		m_connection->deletePeer(*i, true);
+	}
+}
+
+void ConnectionSendThread::rawSend(const BufferedPacket &packet)
+{
+	try{
+		m_connection->m_udpSocket.Send(packet.address, *packet.data,
+				packet.data.getSize());
+		LOG(dout_con <<m_connection->getDesc()
+				<< " rawSend: " << packet.data.getSize()
+				<< " bytes sent" << std::endl);
+	} catch(SendFailedException &e) {
+		LOG(derr_con<<m_connection->getDesc()
+				<<"Connection::rawSend(): SendFailedException: "
+				<<packet.address.serializeString()<<std::endl);
+	}
+}
+
+void ConnectionSendThread::sendAsPacketReliable(BufferedPacket& p, Channel* channel)
+{
+	try{
+		p.absolute_send_time = porting::getTimeMs();
+		// Buffer the packet
+		channel->outgoing_reliables_sent.insert(p,
+			(channel->readOutgoingSequenceNumber() - MAX_RELIABLE_WINDOW_SIZE)
+			% (MAX_RELIABLE_WINDOW_SIZE+1));
+	}
+	catch(AlreadyExistsException &e)
+	{
+		LOG(derr_con<<m_connection->getDesc()
+				<<"WARNING: Going to send a reliable packet"
+				<<" in outgoing buffer" <<std::endl);
+		//assert(0);
+	}
+
+	// Send the packet
+	rawSend(p);
+}
+
+bool ConnectionSendThread::rawSendAsPacket(u16 peer_id, u8 channelnum,
+		SharedBuffer<u8> data, bool reliable)
+{
+	PeerHelper peer = m_connection->getPeerNoEx(peer_id);
+	if (!peer) {
+		LOG(dout_con<<m_connection->getDesc()
+				<<" INFO: dropped packet for non existent peer_id: "
+				<< peer_id << std::endl);
+		assert(reliable && "trying to send raw packet reliable but no peer found!");
+		return false;
+	}
+	Channel *channel = &(dynamic_cast<UDPPeer*>(&peer)->channels[channelnum]);
+
+	if (reliable)
+	{
+		bool have_sequence_number_for_raw_packet = true;
+		u16 seqnum =
+				channel->getOutgoingSequenceNumber(have_sequence_number_for_raw_packet);
+
+		if (!have_sequence_number_for_raw_packet)
+			return false;
+
+		SharedBuffer<u8> reliable = makeReliablePacket(data, seqnum);
+		Address peer_address;
+		peer->getAddress(MTP_MINETEST_RELIABLE_UDP, peer_address);
+
+		// Add base headers and make a packet
+		BufferedPacket p = con::makePacket(peer_address, reliable,
+				m_connection->GetProtocolID(), m_connection->GetPeerID(),
+				channelnum);
+
+		// first check if our send window is already maxed out
+		if (channel->outgoing_reliables_sent.size()
+				< channel->getWindowSize()) {
+			LOG(dout_con<<m_connection->getDesc()
+					<<" INFO: sending a reliable packet to peer_id " << peer_id
+					<<" channel: " << channelnum
+					<<" seqnum: " << seqnum << std::endl);
+			sendAsPacketReliable(p,channel);
+			return true;
+		}
+		else {
+			LOG(dout_con<<m_connection->getDesc()
+					<<" INFO: queueing reliable packet for peer_id: " << peer_id
+					<<" channel: " << channelnum
+					<<" seqnum: " << seqnum << std::endl);
+			channel->queued_reliables.push_back(p);
+			return false;
+		}
+	}
+	else
+	{
+		Address peer_address;
+
+		if (peer->getAddress(MTP_UDP, peer_address))
+		{
+			// Add base headers and make a packet
+			BufferedPacket p = con::makePacket(peer_address, data,
+					m_connection->GetProtocolID(), m_connection->GetPeerID(),
+					channelnum);
+
+			// Send the packet
+			rawSend(p);
+			return true;
+		}
+		else {
+			LOG(dout_con<<m_connection->getDesc()
+					<<" INFO: dropped unreliable packet for peer_id: " << peer_id
+					<<" because of (yet) missing udp address" << std::endl);
+			return false;
+		}
+	}
+
+	//never reached
+	return false;
+}
+
+void ConnectionSendThread::processReliableCommand(ConnectionCommand &c)
+{
+	assert(c.reliable);
+
+	switch(c.type) {
+	case CONNCMD_NONE:
+		LOG(dout_con<<m_connection->getDesc()
+				<<"UDP processing reliable CONNCMD_NONE"<<std::endl);
+		return;
+
+	case CONNCMD_SEND:
+		LOG(dout_con<<m_connection->getDesc()
+				<<"UDP processing reliable CONNCMD_SEND"<<std::endl);
+		sendReliable(c);
+		return;
+
+	case CONNCMD_SEND_TO_ALL:
+		LOG(dout_con<<m_connection->getDesc()
+				<<"UDP processing CONNCMD_SEND_TO_ALL"<<std::endl);
+		sendToAllReliable(c);
+		return;
+
+	case CONCMD_CREATE_PEER:
+		LOG(dout_con<<m_connection->getDesc()
+				<<"UDP processing reliable CONCMD_CREATE_PEER"<<std::endl);
+		if (!rawSendAsPacket(c.peer_id,c.channelnum,c.data,c.reliable))
+		{
+			/* put to queue if we couldn't send it immediately */
+			sendReliable(c);
+		}
+		return;
+
+	case CONCMD_DISABLE_LEGACY:
+		LOG(dout_con<<m_connection->getDesc()
+				<<"UDP processing reliable CONCMD_DISABLE_LEGACY"<<std::endl);
+		if (!rawSendAsPacket(c.peer_id,c.channelnum,c.data,c.reliable))
+		{
+			/* put to queue if we couldn't send it immediately */
+			sendReliable(c);
+		}
+		return;
+
+	case CONNCMD_SERVE:
+	case CONNCMD_CONNECT:
+	case CONNCMD_DISCONNECT:
+	case CONCMD_ACK:
+		assert("Got command that shouldn't be reliable as reliable command" == 0);
+	default:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" Invalid reliable command type: " << c.type <<std::endl);
+	}
+}
+
+
+void ConnectionSendThread::processNonReliableCommand(ConnectionCommand &c)
+{
+	assert(!c.reliable);
+
+	switch(c.type) {
+	case CONNCMD_NONE:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" UDP processing CONNCMD_NONE"<<std::endl);
+		return;
+	case CONNCMD_SERVE:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" UDP processing CONNCMD_SERVE port="
+				<<c.address.serializeString()<<std::endl);
+		serve(c.address);
+		return;
+	case CONNCMD_CONNECT:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" UDP processing CONNCMD_CONNECT"<<std::endl);
+		connect(c.address);
+		return;
+	case CONNCMD_DISCONNECT:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" UDP processing CONNCMD_DISCONNECT"<<std::endl);
+		disconnect();
+		return;
+	case CONNCMD_DISCONNECT_PEER:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" UDP processing CONNCMD_DISCONNECT_PEER"<<std::endl);
+		disconnect_peer(c.peer_id);
+		return;
+	case CONNCMD_SEND:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" UDP processing CONNCMD_SEND"<<std::endl);
+		send(c.peer_id, c.channelnum, c.data);
+		return;
+	case CONNCMD_SEND_TO_ALL:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" UDP processing CONNCMD_SEND_TO_ALL"<<std::endl);
+		sendToAll(c.channelnum, c.data);
+		return;
+	case CONCMD_ACK:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" UDP processing CONCMD_ACK"<<std::endl);
+		sendAsPacket(c.peer_id,c.channelnum,c.data,true);
+		return;
+	case CONCMD_CREATE_PEER:
+		assert("Got command that should be reliable as unreliable command" == 0);
+	default:
+		LOG(dout_con<<m_connection->getDesc()
+				<<" Invalid command type: " << c.type <<std::endl);
+	}
+}
+
+void ConnectionSendThread::serve(Address bind_address)
+{
+	LOG(dout_con<<m_connection->getDesc()
+			<<"UDP serving at port " << bind_address.serializeString() <<std::endl);
+	try{
+		m_connection->m_udpSocket.Bind(bind_address);
+		m_connection->SetPeerID(PEER_ID_SERVER);
+	}
+	catch(SocketException &e) {
+		// Create event
+		ConnectionEvent ce;
+		ce.bindFailed();
+		m_connection->putEvent(ce);
+	}
+}
+
+void ConnectionSendThread::connect(Address address)
+{
+	LOG(dout_con<<m_connection->getDesc()<<" connecting to "<<address.serializeString()
+			<<":"<<address.getPort()<<std::endl);
+
+	UDPPeer *peer = m_connection->createServerPeer(address);
+
+	// Create event
+	ConnectionEvent e;
+	e.peerAdded(peer->id, peer->address);
+	m_connection->putEvent(e);
+
+	Address bind_addr;
+
+	if (address.isIPv6())
+		bind_addr.setAddress((IPv6AddressBytes*) NULL);
+	else
+		bind_addr.setAddress(0,0,0,0);
+
+	m_connection->m_udpSocket.Bind(bind_addr);
+
+	// Send a dummy packet to server with peer_id = PEER_ID_INEXISTENT
+	m_connection->SetPeerID(PEER_ID_INEXISTENT);
+	NetworkPacket* pkt = new NetworkPacket(0,0);
+	m_connection->Send(PEER_ID_SERVER, 0, pkt, true);
+}
+
+void ConnectionSendThread::disconnect()
+{
+	LOG(dout_con<<m_connection->getDesc()<<" disconnecting"<<std::endl);
+
+	// Create and send DISCO packet
+	SharedBuffer<u8> data(2);
+	writeU8(&data[0], TYPE_CONTROL);
+	writeU8(&data[1], CONTROLTYPE_DISCO);
+
+
+	// Send to all
+	std::list<u16> peerids = m_connection->getPeerIDs();
+
+	for (std::list<u16>::iterator i = peerids.begin();
+			i != peerids.end();
+			i++)
+	{
+		sendAsPacket(*i, 0,data,false);
+	}
+}
+
+void ConnectionSendThread::disconnect_peer(u16 peer_id)
+{
+	LOG(dout_con<<m_connection->getDesc()<<" disconnecting peer"<<std::endl);
+
+	// Create and send DISCO packet
+	SharedBuffer<u8> data(2);
+	writeU8(&data[0], TYPE_CONTROL);
+	writeU8(&data[1], CONTROLTYPE_DISCO);
+	sendAsPacket(peer_id, 0,data,false);
+
+	PeerHelper peer = m_connection->getPeerNoEx(peer_id);
+
+	if (!peer)
+		return;
+
+	if (dynamic_cast<UDPPeer*>(&peer) == 0)
+	{
+		return;
+	}
+
+	dynamic_cast<UDPPeer*>(&peer)->m_pending_disconnect = true;
+}
+
+void ConnectionSendThread::send(u16 peer_id, u8 channelnum,
+		SharedBuffer<u8> data)
+{
+	assert(channelnum < CHANNEL_COUNT);
+
+	PeerHelper peer = m_connection->getPeerNoEx(peer_id);
+	if (!peer)
+	{
+		LOG(dout_con<<m_connection->getDesc()<<" peer: peer_id="<<peer_id
+				<< ">>>NOT<<< found on sending packet"
+				<< ", channel " << (channelnum % 0xFF)
+				<< ", size: " << data.getSize() <<std::endl);
+		return;
+	}
+
+	LOG(dout_con<<m_connection->getDesc()<<" sending to peer_id="<<peer_id
+			<< ", channel " << (channelnum % 0xFF)
+			<< ", size: " << data.getSize() <<std::endl);
+
+	u16 split_sequence_number = peer->getNextSplitSequenceNumber(channelnum);
+
+	u32 chunksize_max = m_max_packet_size - BASE_HEADER_SIZE;
+	std::list<SharedBuffer<u8> > originals;
+
+	originals = makeAutoSplitPacket(data, chunksize_max,split_sequence_number);
+
+	peer->setNextSplitSequenceNumber(channelnum,split_sequence_number);
+
+	for(std::list<SharedBuffer<u8> >::iterator i = originals.begin();
+		i != originals.end(); ++i)
+	{
+		SharedBuffer<u8> original = *i;
+		sendAsPacket(peer_id, channelnum, original);
+	}
+}
+
+void ConnectionSendThread::sendReliable(ConnectionCommand &c)
+{
+	PeerHelper peer = m_connection->getPeerNoEx(c.peer_id);
+	if (!peer)
+		return;
+
+	peer->PutReliableSendCommand(c,m_max_packet_size);
+}
+
+void ConnectionSendThread::sendToAll(u8 channelnum, SharedBuffer<u8> data)
+{
+	std::list<u16> peerids = m_connection->getPeerIDs();
+
+	for (std::list<u16>::iterator i = peerids.begin();
+			i != peerids.end();
+			i++)
+	{
+		send(*i, channelnum, data);
+	}
+}
+
+void ConnectionSendThread::sendToAllReliable(ConnectionCommand &c)
+{
+	std::list<u16> peerids = m_connection->getPeerIDs();
+
+	for (std::list<u16>::iterator i = peerids.begin();
+			i != peerids.end();
+			i++)
+	{
+		PeerHelper peer = m_connection->getPeerNoEx(*i);
+
+		if (!peer)
+			continue;
+
+		peer->PutReliableSendCommand(c,m_max_packet_size);
+	}
+}
+
+void ConnectionSendThread::sendPackets(float dtime)
+{
+	std::list<u16> peerIds = m_connection->getPeerIDs();
+	std::list<u16> pendingDisconnect;
+	std::map<u16,bool> pending_unreliable;
+
+	for(std::list<u16>::iterator
+			j = peerIds.begin();
+			j != peerIds.end(); ++j)
+	{
+		PeerHelper peer = m_connection->getPeerNoEx(*j);
+		//peer may have been removed
+		if (!peer) {
+			LOG(dout_con<<m_connection->getDesc()<< " Peer not found: peer_id=" << *j << std::endl);
+			continue;
+		}
+		peer->m_increment_packets_remaining = m_iteration_packets_avaialble/m_connection->m_peers.size();
+
+		if (dynamic_cast<UDPPeer*>(&peer) == 0)
+		{
+			continue;
+		}
+
+		if (dynamic_cast<UDPPeer*>(&peer)->m_pending_disconnect)
+		{
+			pendingDisconnect.push_back(*j);
+		}
+
+		PROFILE(std::stringstream peerIdentifier);
+		PROFILE(peerIdentifier << "sendPackets[" << m_connection->getDesc() << ";" << *j << ";RELIABLE]");
+		PROFILE(ScopeProfiler peerprofiler(g_profiler, peerIdentifier.str(), SPT_AVG));
+
+		LOG(dout_con<<m_connection->getDesc()
+				<< " Handle per peer queues: peer_id=" << *j
+				<< " packet quota: " << peer->m_increment_packets_remaining << std::endl);
+		// first send queued reliable packets for all peers (if possible)
+		for (unsigned int i=0; i < CHANNEL_COUNT; i++)
+		{
+			u16 next_to_ack = 0;
+			dynamic_cast<UDPPeer*>(&peer)->channels[i].outgoing_reliables_sent.getFirstSeqnum(next_to_ack);
+			u16 next_to_receive = 0;
+			dynamic_cast<UDPPeer*>(&peer)->channels[i].incoming_reliables.getFirstSeqnum(next_to_receive);
+
+			LOG(dout_con<<m_connection->getDesc()<< "\t channel: "
+						<< i << ", peer quota:"
+						<< peer->m_increment_packets_remaining
+						<< std::endl
+					<< "\t\t\treliables on wire: "
+						<< dynamic_cast<UDPPeer*>(&peer)->channels[i].outgoing_reliables_sent.size()
+						<< ", waiting for ack for " << next_to_ack
+						<< std::endl
+					<< "\t\t\tincoming_reliables: "
+						<< dynamic_cast<UDPPeer*>(&peer)->channels[i].incoming_reliables.size()
+						<< ", next reliable packet: "
+						<< dynamic_cast<UDPPeer*>(&peer)->channels[i].readNextIncomingSeqNum()
+						<< ", next queued: " << next_to_receive
+						<< std::endl
+					<< "\t\t\treliables queued : "
+						<< dynamic_cast<UDPPeer*>(&peer)->channels[i].queued_reliables.size()
+						<< std::endl
+					<< "\t\t\tqueued commands  : "
+						<< dynamic_cast<UDPPeer*>(&peer)->channels[i].queued_commands.size()
+						<< std::endl);
+
+			while ((dynamic_cast<UDPPeer*>(&peer)->channels[i].queued_reliables.size() > 0) &&
+					(dynamic_cast<UDPPeer*>(&peer)->channels[i].outgoing_reliables_sent.size()
+							< dynamic_cast<UDPPeer*>(&peer)->channels[i].getWindowSize())&&
+							(peer->m_increment_packets_remaining > 0))
+			{
+				BufferedPacket p = dynamic_cast<UDPPeer*>(&peer)->channels[i].queued_reliables.pop_front();
+				Channel* channel = &(dynamic_cast<UDPPeer*>(&peer)->channels[i]);
+				LOG(dout_con<<m_connection->getDesc()
+						<<" INFO: sending a queued reliable packet "
+						<<" channel: " << i
+						<<", seqnum: " << readU16(&p.data[BASE_HEADER_SIZE+1])
+						<< std::endl);
+				sendAsPacketReliable(p,channel);
+				peer->m_increment_packets_remaining--;
+			}
+		}
+	}
+
+	if (m_outgoing_queue.size())
+	{
+		LOG(dout_con<<m_connection->getDesc()
+				<< " Handle non reliable queue ("
+				<< m_outgoing_queue.size() << " pkts)" << std::endl);
+	}
+
+	unsigned int initial_queuesize = m_outgoing_queue.size();
+	/* send non reliable packets*/
+	for(unsigned int i=0;i < initial_queuesize;i++) {
+		OutgoingPacket packet = m_outgoing_queue.pop_front();
+
+		assert(!packet.reliable &&
+			"reliable packets are not allowed in outgoing queue!");
+
+		PeerHelper peer = m_connection->getPeerNoEx(packet.peer_id);
+		if (!peer) {
+			LOG(dout_con<<m_connection->getDesc()
+							<<" Outgoing queue: peer_id="<<packet.peer_id
+							<< ">>>NOT<<< found on sending packet"
+							<< ", channel " << (packet.channelnum % 0xFF)
+							<< ", size: " << packet.data.getSize() <<std::endl);
+			continue;
+		}
+		/* send acks immediately */
+		else if (packet.ack)
+		{
+			rawSendAsPacket(packet.peer_id, packet.channelnum,
+								packet.data, packet.reliable);
+			peer->m_increment_packets_remaining =
+					MYMIN(0,peer->m_increment_packets_remaining--);
+		}
+		else if (
+			( peer->m_increment_packets_remaining > 0) ||
+			(StopRequested())) {
+			rawSendAsPacket(packet.peer_id, packet.channelnum,
+					packet.data, packet.reliable);
+			peer->m_increment_packets_remaining--;
+		}
+		else {
+			m_outgoing_queue.push_back(packet);
+			pending_unreliable[packet.peer_id] = true;
+		}
+	}
+
+	for(std::list<u16>::iterator
+				k = pendingDisconnect.begin();
+				k != pendingDisconnect.end(); ++k)
+	{
+		if (!pending_unreliable[*k])
+		{
+			m_connection->deletePeer(*k,false);
+		}
+	}
+}
+
+void ConnectionSendThread::sendAsPacket(u16 peer_id, u8 channelnum,
+		SharedBuffer<u8> data, bool ack)
+{
+	OutgoingPacket packet(peer_id, channelnum, data, false, ack);
+	m_outgoing_queue.push_back(packet);
+}
+
+ConnectionReceiveThread::ConnectionReceiveThread(unsigned int max_packet_size) :
+	m_connection(NULL)
+{
+}
+
+void * ConnectionReceiveThread::Thread()
+{
+	assert(m_connection != NULL);
+	ThreadStarted();
+	log_register_thread("ConnectionReceive");
+
+	LOG(dout_con<<m_connection->getDesc()
+			<<"ConnectionReceive thread started"<<std::endl);
+
+	PROFILE(std::stringstream ThreadIdentifier);
+	PROFILE(ThreadIdentifier << "ConnectionReceive: [" << m_connection->getDesc() << "]");
+
+	porting::setThreadName("ConnectionReceive");
+
+#ifdef DEBUG_CONNECTION_KBPS
+	u32 curtime = porting::getTimeMs();
+	u32 lasttime = curtime;
+	float debug_print_timer = 0.0;
+#endif
+
+	while(!StopRequested()) {
+		BEGIN_DEBUG_EXCEPTION_HANDLER
+		PROFILE(ScopeProfiler sp(g_profiler, ThreadIdentifier.str(), SPT_AVG));
+
+#ifdef DEBUG_CONNECTION_KBPS
+		lasttime = curtime;
+		curtime = porting::getTimeMs();
+		float dtime = CALC_DTIME(lasttime,curtime);
+#endif
+
+		/* receive packets */
+		receive();
+
+#ifdef DEBUG_CONNECTION_KBPS
+		debug_print_timer += dtime;
+		if (debug_print_timer > 20.0) {
+			debug_print_timer -= 20.0;
+
+			std::list<u16> peerids = m_connection->getPeerIDs();
+
+			for (std::list<u16>::iterator i = peerids.begin();
+					i != peerids.end();
+					i++)
+			{
+				PeerHelper peer = m_connection->getPeerNoEx(*i);
+				if (!peer)
+					continue;
+
+				float peer_current = 0.0;
+				float peer_loss = 0.0;
+				float avg_rate = 0.0;
+				float avg_loss = 0.0;
+
+				for(u16 j=0; j<CHANNEL_COUNT; j++)
+				{
+					peer_current +=peer->channels[j].getCurrentDownloadRateKB();
+					peer_loss += peer->channels[j].getCurrentLossRateKB();
+					avg_rate += peer->channels[j].getAvgDownloadRateKB();
+					avg_loss += peer->channels[j].getAvgLossRateKB();
+				}
+
+				std::stringstream output;
+				output << std::fixed << std::setprecision(1);
+				output << "OUT to Peer " << *i << " RATES (good / loss) " << std::endl;
+				output << "\tcurrent (sum): " << peer_current << "kb/s "<< peer_loss << "kb/s" << std::endl;
+				output << "\taverage (sum): " << avg_rate << "kb/s "<< avg_loss << "kb/s" << std::endl;
+				output << std::setfill(' ');
+				for(u16 j=0; j<CHANNEL_COUNT; j++)
+				{
+					output << "\tcha " << j << ":"
+						<< " CUR: " << std::setw(6) << peer->channels[j].getCurrentDownloadRateKB() <<"kb/s"
+						<< " AVG: " << std::setw(6) << peer->channels[j].getAvgDownloadRateKB() <<"kb/s"
+						<< " MAX: " << std::setw(6) << peer->channels[j].getMaxDownloadRateKB() <<"kb/s"
+						<< " /"
+						<< " CUR: " << std::setw(6) << peer->channels[j].getCurrentLossRateKB() <<"kb/s"
+						<< " AVG: " << std::setw(6) << peer->channels[j].getAvgLossRateKB() <<"kb/s"
+						<< " MAX: " << std::setw(6) << peer->channels[j].getMaxLossRateKB() <<"kb/s"
+						<< " / WS: " << peer->channels[j].getWindowSize()
+						<< std::endl;
+				}
+
+				fprintf(stderr,"%s\n",output.str().c_str());
+			}
+		}
+#endif
+		END_DEBUG_EXCEPTION_HANDLER(errorstream);
+	}
+	PROFILE(g_profiler->remove(ThreadIdentifier.str()));
+	return NULL;
+}
+
+// Receive packets from the network and buffers and create ConnectionEvents
+void ConnectionReceiveThread::receive()
+{
+	// use IPv6 minimum allowed MTU as receive buffer size as this is
+	// theoretical reliable upper boundary of a udp packet for all IPv6 enabled
+	// infrastructure
+	unsigned int packet_maxsize = 1500;
+	SharedBuffer<u8> packetdata(packet_maxsize);
+
+	bool packet_queued = true;
+
+	unsigned int loop_count = 0;
+
+	/* first of all read packets from socket */
+	/* check for incoming data available */
+	while( (loop_count < 10) &&
+			(m_connection->m_udpSocket.WaitData(50))) {
+		loop_count++;
+		try {
+			if (packet_queued) {
+				bool data_left = true;
+				u16 peer_id;
+				SharedBuffer<u8> resultdata;
+				while(data_left) {
+					try {
+						data_left = getFromBuffers(peer_id, resultdata);
+						if (data_left) {
+							ConnectionEvent e;
+							e.dataReceived(peer_id, resultdata);
+							m_connection->putEvent(e);
+						}
+					}
+					catch(ProcessedSilentlyException &e) {
+						/* try reading again */
+					}
+				}
+				packet_queued = false;
+			}
+
+			Address sender;
+			s32 received_size = m_connection->m_udpSocket.Receive(sender, *packetdata, packet_maxsize);
+
+			if ((received_size < BASE_HEADER_SIZE) ||
+				(readU32(&packetdata[0]) != m_connection->GetProtocolID()))
+			{
+				LOG(derr_con<<m_connection->getDesc()
+						<<"Receive(): Invalid incoming packet, "
+						<<"size: " << received_size
+						<<", protocol: "
+						<< ((received_size >= 4) ? readU32(&packetdata[0]) : -1)
+						<< std::endl);
+				continue;
+			}
+
+			u16 peer_id          = readPeerId(*packetdata);
+			u8 channelnum        = readChannel(*packetdata);
+
+			if (channelnum > CHANNEL_COUNT-1) {
+				LOG(derr_con<<m_connection->getDesc()
+						<<"Receive(): Invalid channel "<<channelnum<<std::endl);
+				throw InvalidIncomingDataException("Channel doesn't exist");
+			}
+
+			/* preserve original peer_id for later usage */
+			u16 packet_peer_id   = peer_id;
+
+			/* Try to identify peer by sender address (may happen on join) */
+			if (peer_id == PEER_ID_INEXISTENT) {
+				peer_id = m_connection->lookupPeer(sender);
+			}
+
+			/* The peer was not found in our lists. Add it. */
+			if (peer_id == PEER_ID_INEXISTENT) {
+				peer_id = m_connection->createPeer(sender, MTP_MINETEST_RELIABLE_UDP, 0);
+			}
+
+			PeerHelper peer = m_connection->getPeerNoEx(peer_id);
+
+			if (!peer) {
+				LOG(dout_con<<m_connection->getDesc()
+						<<" got packet from unknown peer_id: "
+						<<peer_id<<" Ignoring."<<std::endl);
+				continue;
+			}
+
+			// Validate peer address
+
+			Address peer_address;
+
+			if (peer->getAddress(MTP_UDP, peer_address)) {
+				if (peer_address != sender) {
+					LOG(derr_con<<m_connection->getDesc()
+							<<m_connection->getDesc()
+							<<" Peer "<<peer_id<<" sending from different address."
+							" Ignoring."<<std::endl);
+					continue;
+				}
+			}
+			else {
+
+				bool invalid_address = true;
+				if (invalid_address) {
+					LOG(derr_con<<m_connection->getDesc()
+							<<m_connection->getDesc()
+							<<" Peer "<<peer_id<<" unknown."
+							" Ignoring."<<std::endl);
+					continue;
+				}
+			}
+
+
+			/* mark peer as seen with id */
+			if (!(packet_peer_id == PEER_ID_INEXISTENT))
+				peer->setSentWithID();
+
+			peer->ResetTimeout();
+
+			Channel *channel = 0;
+
+			if (dynamic_cast<UDPPeer*>(&peer) != 0)
+			{
+				channel = &(dynamic_cast<UDPPeer*>(&peer)->channels[channelnum]);
+			}
+
+			if (channel != 0) {
+				channel->UpdateBytesReceived(received_size);
+			}
+
+			// Throw the received packet to channel->processPacket()
+
+			// Make a new SharedBuffer from the data without the base headers
+			SharedBuffer<u8> strippeddata(received_size - BASE_HEADER_SIZE);
+			memcpy(*strippeddata, &packetdata[BASE_HEADER_SIZE],
+					strippeddata.getSize());
+
+			try{
+				// Process it (the result is some data with no headers made by us)
+				SharedBuffer<u8> resultdata = processPacket
+						(channel, strippeddata, peer_id, channelnum, false);
+
+				LOG(dout_con<<m_connection->getDesc()
+						<<" ProcessPacket from peer_id: " << peer_id
+						<< ",channel: " << (channelnum & 0xFF) << ", returned "
+						<< resultdata.getSize() << " bytes" <<std::endl);
+
+				ConnectionEvent e;
+				e.dataReceived(peer_id, resultdata);
+				m_connection->putEvent(e);
+			}
+			catch(ProcessedSilentlyException &e) {
+			}
+			catch(ProcessedQueued &e) {
+				packet_queued = true;
+			}
+		}
+		catch(InvalidIncomingDataException &e) {
+		}
+		catch(ProcessedSilentlyException &e) {
+		}
+	}
+}
+
+bool ConnectionReceiveThread::getFromBuffers(u16 &peer_id, SharedBuffer<u8> &dst)
+{
+	std::list<u16> peerids = m_connection->getPeerIDs();
+
+	for(std::list<u16>::iterator j = peerids.begin();
+		j != peerids.end(); ++j)
+	{
+		PeerHelper peer = m_connection->getPeerNoEx(*j);
+		if (!peer)
+			continue;
+
+		if (dynamic_cast<UDPPeer*>(&peer) == 0)
+			continue;
+
+		for(u16 i=0; i<CHANNEL_COUNT; i++)
+		{
+			Channel *channel = &(dynamic_cast<UDPPeer*>(&peer))->channels[i];
+
+			if (checkIncomingBuffers(channel, peer_id, dst)) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+bool ConnectionReceiveThread::checkIncomingBuffers(Channel *channel,
+		u16 &peer_id, SharedBuffer<u8> &dst)
+{
+	u16 firstseqnum = 0;
+	if (channel->incoming_reliables.getFirstSeqnum(firstseqnum))
+	{
+		if (firstseqnum == channel->readNextIncomingSeqNum())
+		{
+			BufferedPacket p = channel->incoming_reliables.popFirst();
+			peer_id = readPeerId(*p.data);
+			u8 channelnum = readChannel(*p.data);
+			u16 seqnum = readU16(&p.data[BASE_HEADER_SIZE+1]);
+
+			LOG(dout_con<<m_connection->getDesc()
+					<<"UNBUFFERING TYPE_RELIABLE"
+					<<" seqnum="<<seqnum
+					<<" peer_id="<<peer_id
+					<<" channel="<<((int)channelnum&0xff)
+					<<std::endl);
+
+			channel->incNextIncomingSeqNum();
+
+			u32 headers_size = BASE_HEADER_SIZE + RELIABLE_HEADER_SIZE;
+			// Get out the inside packet and re-process it
+			SharedBuffer<u8> payload(p.data.getSize() - headers_size);
+			memcpy(*payload, &p.data[headers_size], payload.getSize());
+
+			dst = processPacket(channel, payload, peer_id, channelnum, true);
+			return true;
+		}
+	}
+	return false;
+}
+
+SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel,
+		SharedBuffer<u8> packetdata, u16 peer_id, u8 channelnum, bool reliable)
+{
+	PeerHelper peer = m_connection->getPeerNoEx(peer_id);
+
+	if (!peer) {
+		errorstream << "Peer not found (possible timeout)" << std::endl;
+		throw ProcessedSilentlyException("Peer not found (possible timeout)");
+	}
+
+	if (packetdata.getSize() < 1)
+		throw InvalidIncomingDataException("packetdata.getSize() < 1");
+
+	u8 type = readU8(&(packetdata[0]));
+
+	if (MAX_UDP_PEERS <= 65535 && peer_id >= MAX_UDP_PEERS) {
+		errorstream << "Something is wrong with peer_id" << std::endl;
+		assert(0);
+	}
+
+	if (type == TYPE_CONTROL)
+	{
+		if (packetdata.getSize() < 2)
+			throw InvalidIncomingDataException("packetdata.getSize() < 2");
+
+		u8 controltype = readU8(&(packetdata[1]));
+
+		if (controltype == CONTROLTYPE_ACK)
+		{
+			assert(channel != 0);
+			if (packetdata.getSize() < 4)
+				throw InvalidIncomingDataException
+						("packetdata.getSize() < 4 (ACK header size)");
+
+			u16 seqnum = readU16(&packetdata[2]);
+			LOG(dout_con<<m_connection->getDesc()
+					<<" [ CONTROLTYPE_ACK: channelnum="
+					<<((int)channelnum&0xff)<<", peer_id="<<peer_id
+					<<", seqnum="<<seqnum<< " ]"<<std::endl);
+
+			try{
+				BufferedPacket p =
+						channel->outgoing_reliables_sent.popSeqnum(seqnum);
+
+				// only calculate rtt from straight sent packets
+				if (p.resend_count == 0) {
+					// Get round trip time
+					unsigned int current_time = porting::getTimeMs();
+
+					// a overflow is quite unlikely but as it'd result in major
+					// rtt miscalculation we handle it here
+					if (current_time > p.absolute_send_time)
+					{
+						float rtt = (current_time - p.absolute_send_time) / 1000.0;
+
+						// Let peer calculate stuff according to it
+						// (avg_rtt and resend_timeout)
+						dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt);
+					}
+					else if (p.totaltime > 0)
+					{
+						float rtt = p.totaltime;
+
+						// Let peer calculate stuff according to it
+						// (avg_rtt and resend_timeout)
+						dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt);
+					}
+				}
+				//put bytes for max bandwidth calculation
+				channel->UpdateBytesSent(p.data.getSize(),1);
+				if (channel->outgoing_reliables_sent.size() == 0)
+				{
+					m_connection->TriggerSend();
+				}
+			}
+			catch(NotFoundException &e) {
+				LOG(derr_con<<m_connection->getDesc()
+						<<"WARNING: ACKed packet not "
+						"in outgoing queue"
+						<<std::endl);
+				channel->UpdatePacketTooLateCounter();
+			}
+			throw ProcessedSilentlyException("Got an ACK");
+		}
+		else if (controltype == CONTROLTYPE_SET_PEER_ID) {
+			// Got a packet to set our peer id
+			if (packetdata.getSize() < 4)
+				throw InvalidIncomingDataException
+						("packetdata.getSize() < 4 (SET_PEER_ID header size)");
+			u16 peer_id_new = readU16(&packetdata[2]);
+			LOG(dout_con<<m_connection->getDesc()
+					<<"Got new peer id: "<<peer_id_new<<"... "<<std::endl);
+
+			if (m_connection->GetPeerID() != PEER_ID_INEXISTENT)
+			{
+				LOG(derr_con<<m_connection->getDesc()
+						<<"WARNING: Not changing"
+						" existing peer id."<<std::endl);
+			}
+			else
+			{
+				LOG(dout_con<<m_connection->getDesc()<<"changing own peer id"<<std::endl);
+				m_connection->SetPeerID(peer_id_new);
+			}
+
+			ConnectionCommand cmd;
+
+			SharedBuffer<u8> reply(2);
+			writeU8(&reply[0], TYPE_CONTROL);
+			writeU8(&reply[1], CONTROLTYPE_ENABLE_BIG_SEND_WINDOW);
+			cmd.disableLegacy(PEER_ID_SERVER,reply);
+			m_connection->putCommand(cmd);
+
+			throw ProcessedSilentlyException("Got a SET_PEER_ID");
+		}
+		else if (controltype == CONTROLTYPE_PING)
+		{
+			// Just ignore it, the incoming data already reset
+			// the timeout counter
+			LOG(dout_con<<m_connection->getDesc()<<"PING"<<std::endl);
+			throw ProcessedSilentlyException("Got a PING");
+		}
+		else if (controltype == CONTROLTYPE_DISCO)
+		{
+			// Just ignore it, the incoming data already reset
+			// the timeout counter
+			LOG(dout_con<<m_connection->getDesc()
+					<<"DISCO: Removing peer "<<(peer_id)<<std::endl);
+
+			if (m_connection->deletePeer(peer_id, false) == false)
+			{
+				derr_con<<m_connection->getDesc()
+						<<"DISCO: Peer not found"<<std::endl;
+			}
+
+			throw ProcessedSilentlyException("Got a DISCO");
+		}
+		else if (controltype == CONTROLTYPE_ENABLE_BIG_SEND_WINDOW)
+		{
+			dynamic_cast<UDPPeer*>(&peer)->setNonLegacyPeer();
+			throw ProcessedSilentlyException("Got non legacy control");
+		}
+		else{
+			LOG(derr_con<<m_connection->getDesc()
+					<<"INVALID TYPE_CONTROL: invalid controltype="
+					<<((int)controltype&0xff)<<std::endl);
+			throw InvalidIncomingDataException("Invalid control type");
+		}
+	}
+	else if (type == TYPE_ORIGINAL)
+	{
+		if (packetdata.getSize() <= ORIGINAL_HEADER_SIZE)
+			throw InvalidIncomingDataException
+					("packetdata.getSize() <= ORIGINAL_HEADER_SIZE");
+		LOG(dout_con<<m_connection->getDesc()
+				<<"RETURNING TYPE_ORIGINAL to user"
+				<<std::endl);
+		// Get the inside packet out and return it
+		SharedBuffer<u8> payload(packetdata.getSize() - ORIGINAL_HEADER_SIZE);
+		memcpy(*payload, &(packetdata[ORIGINAL_HEADER_SIZE]), payload.getSize());
+		return payload;
+	}
+	else if (type == TYPE_SPLIT)
+	{
+		Address peer_address;
+
+		if (peer->getAddress(MTP_UDP, peer_address)) {
+
+			// We have to create a packet again for buffering
+			// This isn't actually too bad an idea.
+			BufferedPacket packet = makePacket(
+					peer_address,
+					packetdata,
+					m_connection->GetProtocolID(),
+					peer_id,
+					channelnum);
+
+			// Buffer the packet
+			SharedBuffer<u8> data =
+					peer->addSpiltPacket(channelnum,packet,reliable);
+
+			if (data.getSize() != 0)
+			{
+				LOG(dout_con<<m_connection->getDesc()
+						<<"RETURNING TYPE_SPLIT: Constructed full data, "
+						<<"size="<<data.getSize()<<std::endl);
+				return data;
+			}
+			LOG(dout_con<<m_connection->getDesc()<<"BUFFERED TYPE_SPLIT"<<std::endl);
+			throw ProcessedSilentlyException("Buffered a split packet chunk");
+		}
+		else {
+			//TODO throw some error
+		}
+	}
+	else if (type == TYPE_RELIABLE)
+	{
+		assert(channel != 0);
+		// Recursive reliable packets not allowed
+		if (reliable)
+			throw InvalidIncomingDataException("Found nested reliable packets");
+
+		if (packetdata.getSize() < RELIABLE_HEADER_SIZE)
+			throw InvalidIncomingDataException
+					("packetdata.getSize() < RELIABLE_HEADER_SIZE");
+
+		u16 seqnum = readU16(&packetdata[1]);
+		bool is_future_packet = false;
+		bool is_old_packet = false;
+
+		/* packet is within our receive window send ack */
+		if (seqnum_in_window(seqnum, channel->readNextIncomingSeqNum(),MAX_RELIABLE_WINDOW_SIZE))
+		{
+			m_connection->sendAck(peer_id,channelnum,seqnum);
+		}
+		else {
+			is_future_packet = seqnum_higher(seqnum, channel->readNextIncomingSeqNum());
+			is_old_packet    = seqnum_higher(channel->readNextIncomingSeqNum(), seqnum);
+
+
+			/* packet is not within receive window, don't send ack.           *
+			 * if this was a valid packet it's gonna be retransmitted         */
+			if (is_future_packet)
+			{
+				throw ProcessedSilentlyException("Received packet newer then expected, not sending ack");
+			}
+
+			/* seems like our ack was lost, send another one for a old packet */
+			if (is_old_packet)
+			{
+				LOG(dout_con<<m_connection->getDesc()
+						<< "RE-SENDING ACK: peer_id: " << peer_id
+						<< ", channel: " << (channelnum&0xFF)
+						<< ", seqnum: " << seqnum << std::endl;)
+				m_connection->sendAck(peer_id,channelnum,seqnum);
+
+				// we already have this packet so this one was on wire at least
+				// the current timeout
+				// we don't know how long this packet was on wire don't do silly guessing
+				// dynamic_cast<UDPPeer*>(&peer)->reportRTT(dynamic_cast<UDPPeer*>(&peer)->getResendTimeout());
+
+				throw ProcessedSilentlyException("Retransmitting ack for old packet");
+			}
+		}
+
+		if (seqnum != channel->readNextIncomingSeqNum())
+		{
+			Address peer_address;
+
+			// this is a reliable packet so we have a udp address for sure
+			peer->getAddress(MTP_MINETEST_RELIABLE_UDP, peer_address);
+			// This one comes later, buffer it.
+			// Actually we have to make a packet to buffer one.
+			// Well, we have all the ingredients, so just do it.
+			BufferedPacket packet = con::makePacket(
+					peer_address,
+					packetdata,
+					m_connection->GetProtocolID(),
+					peer_id,
+					channelnum);
+			try{
+				channel->incoming_reliables.insert(packet,channel->readNextIncomingSeqNum());
+
+				LOG(dout_con<<m_connection->getDesc()
+						<< "BUFFERING, TYPE_RELIABLE peer_id: " << peer_id
+						<< ", channel: " << (channelnum&0xFF)
+						<< ", seqnum: " << seqnum << std::endl;)
+
+				throw ProcessedQueued("Buffered future reliable packet");
+			}
+			catch(AlreadyExistsException &e)
+			{
+			}
+			catch(IncomingDataCorruption &e)
+			{
+				ConnectionCommand discon;
+				discon.disconnect_peer(peer_id);
+				m_connection->putCommand(discon);
+
+				LOG(derr_con<<m_connection->getDesc()
+						<< "INVALID, TYPE_RELIABLE peer_id: " << peer_id
+						<< ", channel: " << (channelnum&0xFF)
+						<< ", seqnum: " << seqnum
+						<< "DROPPING CLIENT!" << std::endl;)
+			}
+		}
+
+		/* we got a packet to process right now */
+		LOG(dout_con<<m_connection->getDesc()
+				<< "RECURSIVE, TYPE_RELIABLE peer_id: " << peer_id
+				<< ", channel: " << (channelnum&0xFF)
+				<< ", seqnum: " << seqnum << std::endl;)
+
+
+		/* check for resend case */
+		u16 queued_seqnum = 0;
+		if (channel->incoming_reliables.getFirstSeqnum(queued_seqnum))
+		{
+			if (queued_seqnum == seqnum)
+			{
+				BufferedPacket queued_packet = channel->incoming_reliables.popFirst();
+				/** TODO find a way to verify the new against the old packet */
+			}
+		}
+
+		channel->incNextIncomingSeqNum();
+
+		// Get out the inside packet and re-process it
+		SharedBuffer<u8> payload(packetdata.getSize() - RELIABLE_HEADER_SIZE);
+		memcpy(*payload, &packetdata[RELIABLE_HEADER_SIZE], payload.getSize());
+
+		return processPacket(channel, payload, peer_id, channelnum, true);
+	}
+	else
+	{
+		derr_con<<m_connection->getDesc()
+				<<"Got invalid type="<<((int)type&0xff)<<std::endl;
+		throw InvalidIncomingDataException("Invalid packet type");
+	}
+
+	// We should never get here.
+	// If you get here, add an exception or a return to some of the
+	// above conditionals.
+	assert(0);
+	throw BaseException("Error in Channel::ProcessPacket()");
+}
+
+/*
+	Connection
+*/
+
+Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
+		bool ipv6) :
+	m_udpSocket(ipv6),
+	m_command_queue(),
+	m_event_queue(),
+	m_peer_id(0),
+	m_protocol_id(protocol_id),
+	m_sendThread(max_packet_size, timeout),
+	m_receiveThread(max_packet_size),
+	m_info_mutex(),
+	m_bc_peerhandler(0),
+	m_bc_receive_timeout(0),
+	m_shutting_down(false),
+	m_next_remote_peer_id(2)
+{
+	m_udpSocket.setTimeoutMs(5);
+
+	m_sendThread.setParent(this);
+	m_receiveThread.setParent(this);
+
+	m_sendThread.Start();
+	m_receiveThread.Start();
+}
+
+Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
+		bool ipv6, PeerHandler *peerhandler) :
+	m_udpSocket(ipv6),
+	m_command_queue(),
+	m_event_queue(),
+	m_peer_id(0),
+	m_protocol_id(protocol_id),
+	m_sendThread(max_packet_size, timeout),
+	m_receiveThread(max_packet_size),
+	m_info_mutex(),
+	m_bc_peerhandler(peerhandler),
+	m_bc_receive_timeout(0),
+	m_shutting_down(false),
+	m_next_remote_peer_id(2)
+
+{
+	m_udpSocket.setTimeoutMs(5);
+
+	m_sendThread.setParent(this);
+	m_receiveThread.setParent(this);
+
+	m_sendThread.Start();
+	m_receiveThread.Start();
+
+}
+
+
+Connection::~Connection()
+{
+	m_shutting_down = true;
+	// request threads to stop
+	m_sendThread.Stop();
+	m_receiveThread.Stop();
+
+	//TODO for some unkonwn reason send/receive threads do not exit as they're
+	// supposed to be but wait on peer timeout. To speed up shutdown we reduce
+	// timeout to half a second.
+	m_sendThread.setPeerTimeout(0.5);
+
+	// wait for threads to finish
+	m_sendThread.Wait();
+	m_receiveThread.Wait();
+
+	// Delete peers
+	for(std::map<u16, Peer*>::iterator
+			j = m_peers.begin();
+			j != m_peers.end(); ++j)
+	{
+		delete j->second;
+	}
+}
+
+/* Internal stuff */
+void Connection::putEvent(ConnectionEvent &e)
+{
+	assert(e.type != CONNEVENT_NONE);
+	m_event_queue.push_back(e);
+}
+
+PeerHelper Connection::getPeer(u16 peer_id)
+{
+	JMutexAutoLock peerlock(m_peers_mutex);
+	std::map<u16, Peer*>::iterator node = m_peers.find(peer_id);
+
+	if (node == m_peers.end()) {
+		throw PeerNotFoundException("GetPeer: Peer not found (possible timeout)");
+	}
+
+	// Error checking
+	assert(node->second->id == peer_id);
+
+	return PeerHelper(node->second);
+}
+
+PeerHelper Connection::getPeerNoEx(u16 peer_id)
+{
+	JMutexAutoLock peerlock(m_peers_mutex);
+	std::map<u16, Peer*>::iterator node = m_peers.find(peer_id);
+
+	if (node == m_peers.end()) {
+		return PeerHelper(NULL);
+	}
+
+	// Error checking
+	assert(node->second->id == peer_id);
+
+	return PeerHelper(node->second);
+}
+
+/* find peer_id for address */
+u16 Connection::lookupPeer(Address& sender)
+{
+	JMutexAutoLock peerlock(m_peers_mutex);
+	std::map<u16, Peer*>::iterator j;
+	j = m_peers.begin();
+	for(; j != m_peers.end(); ++j)
+	{
+		Peer *peer = j->second;
+		if (peer->isActive())
+			continue;
+
+		Address tocheck;
+
+		if ((peer->getAddress(MTP_MINETEST_RELIABLE_UDP, tocheck)) && (tocheck == sender))
+			return peer->id;
+
+		if ((peer->getAddress(MTP_UDP, tocheck)) && (tocheck == sender))
+			return peer->id;
+	}
+
+	return PEER_ID_INEXISTENT;
+}
+
+std::list<Peer*> Connection::getPeers()
+{
+	std::list<Peer*> list;
+	for(std::map<u16, Peer*>::iterator j = m_peers.begin();
+		j != m_peers.end(); ++j)
+	{
+		Peer *peer = j->second;
+		list.push_back(peer);
+	}
+	return list;
+}
+
+bool Connection::deletePeer(u16 peer_id, bool timeout)
+{
+	Peer *peer = 0;
+
+	/* lock list as short as possible */
+	{
+		JMutexAutoLock peerlock(m_peers_mutex);
+		if (m_peers.find(peer_id) == m_peers.end())
+			return false;
+		peer = m_peers[peer_id];
+		m_peers.erase(peer_id);
+		m_peer_ids.remove(peer_id);
+	}
+
+	Address peer_address;
+	//any peer has a primary address this never fails!
+	peer->getAddress(MTP_PRIMARY, peer_address);
+	// Create event
+	ConnectionEvent e;
+	e.peerRemoved(peer_id, timeout, peer_address);
+	putEvent(e);
+
+
+	peer->Drop();
+	return true;
+}
+
+/* Interface */
+
+ConnectionEvent Connection::getEvent()
+{
+	if (m_event_queue.empty()) {
+		ConnectionEvent e;
+		e.type = CONNEVENT_NONE;
+		return e;
+	}
+	return m_event_queue.pop_frontNoEx();
+}
+
+ConnectionEvent Connection::waitEvent(u32 timeout_ms)
+{
+	try {
+		return m_event_queue.pop_front(timeout_ms);
+	} catch(ItemNotFoundException &ex) {
+		ConnectionEvent e;
+		e.type = CONNEVENT_NONE;
+		return e;
+	}
+}
+
+void Connection::putCommand(ConnectionCommand &c)
+{
+	if (!m_shutting_down) {
+		m_command_queue.push_back(c);
+		m_sendThread.Trigger();
+	}
+}
+
+void Connection::Serve(Address bind_addr)
+{
+	ConnectionCommand c;
+	c.serve(bind_addr);
+	putCommand(c);
+}
+
+void Connection::Connect(Address address)
+{
+	ConnectionCommand c;
+	c.connect(address);
+	putCommand(c);
+}
+
+bool Connection::Connected()
+{
+	JMutexAutoLock peerlock(m_peers_mutex);
+
+	if (m_peers.size() != 1)
+		return false;
+
+	std::map<u16, Peer*>::iterator node = m_peers.find(PEER_ID_SERVER);
+	if (node == m_peers.end())
+		return false;
+
+	if (m_peer_id == PEER_ID_INEXISTENT)
+		return false;
+
+	return true;
+}
+
+void Connection::Disconnect()
+{
+	ConnectionCommand c;
+	c.disconnect();
+	putCommand(c);
+}
+
+u32 Connection::Receive(u16 &peer_id, SharedBuffer<u8> &data)
+{
+	for(;;) {
+		ConnectionEvent e = waitEvent(m_bc_receive_timeout);
+		if (e.type != CONNEVENT_NONE)
+			LOG(dout_con<<getDesc()<<": Receive: got event: "
+					<<e.describe()<<std::endl);
+		switch(e.type) {
+		case CONNEVENT_NONE:
+			throw NoIncomingDataException("No incoming data");
+		case CONNEVENT_DATA_RECEIVED:
+			peer_id = e.peer_id;
+			data = SharedBuffer<u8>(e.data);
+			return e.data.getSize();
+		case CONNEVENT_PEER_ADDED: {
+			UDPPeer tmp(e.peer_id, e.address, this);
+			if (m_bc_peerhandler)
+				m_bc_peerhandler->peerAdded(&tmp);
+			continue; }
+		case CONNEVENT_PEER_REMOVED: {
+			UDPPeer tmp(e.peer_id, e.address, this);
+			if (m_bc_peerhandler)
+				m_bc_peerhandler->deletingPeer(&tmp, e.timeout);
+			continue; }
+		case CONNEVENT_BIND_FAILED:
+			throw ConnectionBindFailed("Failed to bind socket "
+					"(port already in use?)");
+		}
+	}
+	throw NoIncomingDataException("No incoming data");
+}
+
+void Connection::Send(u16 peer_id, u8 channelnum,
+		NetworkPacket* pkt, bool reliable)
+{
+	assert(channelnum < CHANNEL_COUNT);
+
+	ConnectionCommand c;
+
+	c.send(peer_id, channelnum, pkt->oldForgePacket(), reliable);
+	putCommand(c);
+}
+
+Address Connection::GetPeerAddress(u16 peer_id)
+{
+	PeerHelper peer = getPeerNoEx(peer_id);
+
+	if (!peer)
+		throw PeerNotFoundException("No address for peer found!");
+	Address peer_address;
+	peer->getAddress(MTP_PRIMARY, peer_address);
+	return peer_address;
+}
+
+float Connection::getPeerStat(u16 peer_id, rtt_stat_type type)
+{
+	PeerHelper peer = getPeerNoEx(peer_id);
+	if (!peer) return -1;
+	return peer->getStat(type);
+}
+
+float Connection::getLocalStat(rate_stat_type type)
+{
+	PeerHelper peer = getPeerNoEx(PEER_ID_SERVER);
+
+	if (!peer) {
+		assert("Connection::getLocalStat we couldn't get our own peer? are you serious???" == 0);
+	}
+
+	float retval = 0.0;
+
+	for (u16 j=0; j<CHANNEL_COUNT; j++) {
+		switch(type) {
+			case CUR_DL_RATE:
+				retval += dynamic_cast<UDPPeer*>(&peer)->channels[j].getCurrentDownloadRateKB();
+				break;
+			case AVG_DL_RATE:
+				retval += dynamic_cast<UDPPeer*>(&peer)->channels[j].getAvgDownloadRateKB();
+				break;
+			case CUR_INC_RATE:
+				retval += dynamic_cast<UDPPeer*>(&peer)->channels[j].getCurrentIncomingRateKB();
+				break;
+			case AVG_INC_RATE:
+				retval += dynamic_cast<UDPPeer*>(&peer)->channels[j].getAvgIncomingRateKB();
+				break;
+			case AVG_LOSS_RATE:
+				retval += dynamic_cast<UDPPeer*>(&peer)->channels[j].getAvgLossRateKB();
+				break;
+			case CUR_LOSS_RATE:
+				retval += dynamic_cast<UDPPeer*>(&peer)->channels[j].getCurrentLossRateKB();
+				break;
+		default:
+			assert("Connection::getLocalStat Invalid stat type" == 0);
+		}
+	}
+	return retval;
+}
+
+u16 Connection::createPeer(Address& sender, MTProtocols protocol, int fd)
+{
+	// Somebody wants to make a new connection
+
+	// Get a unique peer id (2 or higher)
+	u16 peer_id_new = m_next_remote_peer_id;
+	u16 overflow =  MAX_UDP_PEERS;
+
+	/*
+		Find an unused peer id
+	*/
+	JMutexAutoLock lock(m_peers_mutex);
+	bool out_of_ids = false;
+	for(;;) {
+		// Check if exists
+		if (m_peers.find(peer_id_new) == m_peers.end())
+
+			break;
+		// Check for overflow
+		if (peer_id_new == overflow) {
+			out_of_ids = true;
+			break;
+		}
+		peer_id_new++;
+	}
+
+	if (out_of_ids) {
+		errorstream << getDesc() << " ran out of peer ids" << std::endl;
+		return PEER_ID_INEXISTENT;
+	}
+
+	// Create a peer
+	Peer *peer = 0;
+	peer = new UDPPeer(peer_id_new, sender, this);
+
+	m_peers[peer->id] = peer;
+	m_peer_ids.push_back(peer->id);
+
+	m_next_remote_peer_id = (peer_id_new +1 ) % MAX_UDP_PEERS;
+
+	LOG(dout_con << getDesc()
+			<< "createPeer(): giving peer_id=" << peer_id_new << std::endl);
+
+	ConnectionCommand cmd;
+	SharedBuffer<u8> reply(4);
+	writeU8(&reply[0], TYPE_CONTROL);
+	writeU8(&reply[1], CONTROLTYPE_SET_PEER_ID);
+	writeU16(&reply[2], peer_id_new);
+	cmd.createPeer(peer_id_new,reply);
+	putCommand(cmd);
+
+	// Create peer addition event
+	ConnectionEvent e;
+	e.peerAdded(peer_id_new, sender);
+	putEvent(e);
+
+	// We're now talking to a valid peer_id
+	return peer_id_new;
+}
+
+void Connection::PrintInfo(std::ostream &out)
+{
+	m_info_mutex.Lock();
+	out<<getDesc()<<": ";
+	m_info_mutex.Unlock();
+}
+
+void Connection::PrintInfo()
+{
+	PrintInfo(dout_con);
+}
+
+const std::string Connection::getDesc()
+{
+	return std::string("con(")+
+			itos(m_udpSocket.GetHandle())+"/"+itos(m_peer_id)+")";
+}
+
+void Connection::DisconnectPeer(u16 peer_id)
+{
+	ConnectionCommand discon;
+	discon.disconnect_peer(peer_id);
+	putCommand(discon);
+}
+
+void Connection::sendAck(u16 peer_id, u8 channelnum, u16 seqnum)
+{
+	assert(channelnum < CHANNEL_COUNT);
+
+	LOG(dout_con<<getDesc()
+			<<" Queuing ACK command to peer_id: " << peer_id <<
+			" channel: " << (channelnum & 0xFF) <<
+			" seqnum: " << seqnum << std::endl);
+
+	ConnectionCommand c;
+	SharedBuffer<u8> ack(4);
+	writeU8(&ack[0], TYPE_CONTROL);
+	writeU8(&ack[1], CONTROLTYPE_ACK);
+	writeU16(&ack[2], seqnum);
+
+	c.ack(peer_id, channelnum, ack);
+	putCommand(c);
+	m_sendThread.Trigger();
+}
+
+UDPPeer* Connection::createServerPeer(Address& address)
+{
+	if (getPeerNoEx(PEER_ID_SERVER) != 0)
+	{
+		throw ConnectionException("Already connected to a server");
+	}
+
+	UDPPeer *peer = new UDPPeer(PEER_ID_SERVER, address, this);
+
+	{
+		JMutexAutoLock lock(m_peers_mutex);
+		m_peers[peer->id] = peer;
+		m_peer_ids.push_back(peer->id);
+	}
+
+	return peer;
+}
+
+} // namespace
diff --git a/src/network/connection.h b/src/network/connection.h
new file mode 100644
index 000000000..4ac9a4631
--- /dev/null
+++ b/src/network/connection.h
@@ -0,0 +1,1098 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef CONNECTION_HEADER
+#define CONNECTION_HEADER
+
+#include "irrlichttypes_bloated.h"
+#include "socket.h"
+#include "exceptions.h"
+#include "constants.h"
+#include "network/networkpacket.h"
+#include "util/pointer.h"
+#include "util/container.h"
+#include "util/thread.h"
+#include "util/numeric.h"
+#include <iostream>
+#include <fstream>
+#include <list>
+#include <map>
+
+namespace con
+{
+
+/*
+	Exceptions
+*/
+class NotFoundException : public BaseException
+{
+public:
+	NotFoundException(const char *s):
+		BaseException(s)
+	{}
+};
+
+class PeerNotFoundException : public BaseException
+{
+public:
+	PeerNotFoundException(const char *s):
+		BaseException(s)
+	{}
+};
+
+class ConnectionException : public BaseException
+{
+public:
+	ConnectionException(const char *s):
+		BaseException(s)
+	{}
+};
+
+class ConnectionBindFailed : public BaseException
+{
+public:
+	ConnectionBindFailed(const char *s):
+		BaseException(s)
+	{}
+};
+
+class InvalidIncomingDataException : public BaseException
+{
+public:
+	InvalidIncomingDataException(const char *s):
+		BaseException(s)
+	{}
+};
+
+class InvalidOutgoingDataException : public BaseException
+{
+public:
+	InvalidOutgoingDataException(const char *s):
+		BaseException(s)
+	{}
+};
+
+class NoIncomingDataException : public BaseException
+{
+public:
+	NoIncomingDataException(const char *s):
+		BaseException(s)
+	{}
+};
+
+class ProcessedSilentlyException : public BaseException
+{
+public:
+	ProcessedSilentlyException(const char *s):
+		BaseException(s)
+	{}
+};
+
+class ProcessedQueued : public BaseException
+{
+public:
+	ProcessedQueued(const char *s):
+		BaseException(s)
+	{}
+};
+
+class IncomingDataCorruption : public BaseException
+{
+public:
+	IncomingDataCorruption(const char *s):
+		BaseException(s)
+	{}
+};
+
+typedef enum MTProtocols {
+	MTP_PRIMARY,
+	MTP_UDP,
+	MTP_MINETEST_RELIABLE_UDP
+} MTProtocols;
+
+#define SEQNUM_MAX 65535
+inline bool seqnum_higher(u16 totest, u16 base)
+{
+	if (totest > base)
+	{
+		if ((totest - base) > (SEQNUM_MAX/2))
+			return false;
+		else
+			return true;
+	}
+	else
+	{
+		if ((base - totest) > (SEQNUM_MAX/2))
+			return true;
+		else
+			return false;
+	}
+}
+
+inline bool seqnum_in_window(u16 seqnum, u16 next,u16 window_size)
+{
+	u16 window_start = next;
+	u16 window_end   = ( next + window_size ) % (SEQNUM_MAX+1);
+
+	if (window_start < window_end)
+	{
+		return ((seqnum >= window_start) && (seqnum < window_end));
+	}
+	else
+	{
+		return ((seqnum < window_end) || (seqnum >= window_start));
+	}
+}
+
+struct BufferedPacket
+{
+	BufferedPacket(u8 *a_data, u32 a_size):
+		data(a_data, a_size), time(0.0), totaltime(0.0), absolute_send_time(-1),
+		resend_count(0)
+	{}
+	BufferedPacket(u32 a_size):
+		data(a_size), time(0.0), totaltime(0.0), absolute_send_time(-1),
+		resend_count(0)
+	{}
+	SharedBuffer<u8> data; // Data of the packet, including headers
+	float time; // Seconds from buffering the packet or re-sending
+	float totaltime; // Seconds from buffering the packet
+	unsigned int absolute_send_time;
+	Address address; // Sender or destination
+	unsigned int resend_count;
+};
+
+// This adds the base headers to the data and makes a packet out of it
+BufferedPacket makePacket(Address &address, u8 *data, u32 datasize,
+		u32 protocol_id, u16 sender_peer_id, u8 channel);
+BufferedPacket makePacket(Address &address, SharedBuffer<u8> &data,
+		u32 protocol_id, u16 sender_peer_id, u8 channel);
+
+// Add the TYPE_ORIGINAL header to the data
+SharedBuffer<u8> makeOriginalPacket(
+		SharedBuffer<u8> data);
+
+// Split data in chunks and add TYPE_SPLIT headers to them
+std::list<SharedBuffer<u8> > makeSplitPacket(
+		SharedBuffer<u8> data,
+		u32 chunksize_max,
+		u16 seqnum);
+
+// Depending on size, make a TYPE_ORIGINAL or TYPE_SPLIT packet
+// Increments split_seqnum if a split packet is made
+std::list<SharedBuffer<u8> > makeAutoSplitPacket(
+		SharedBuffer<u8> data,
+		u32 chunksize_max,
+		u16 &split_seqnum);
+
+// Add the TYPE_RELIABLE header to the data
+SharedBuffer<u8> makeReliablePacket(
+		SharedBuffer<u8> data,
+		u16 seqnum);
+
+struct IncomingSplitPacket
+{
+	IncomingSplitPacket()
+	{
+		time = 0.0;
+		reliable = false;
+	}
+	// Key is chunk number, value is data without headers
+	std::map<u16, SharedBuffer<u8> > chunks;
+	u32 chunk_count;
+	float time; // Seconds from adding
+	bool reliable; // If true, isn't deleted on timeout
+
+	bool allReceived()
+	{
+		return (chunks.size() == chunk_count);
+	}
+};
+
+/*
+=== NOTES ===
+
+A packet is sent through a channel to a peer with a basic header:
+TODO: Should we have a receiver_peer_id also?
+	Header (7 bytes):
+	[0] u32 protocol_id
+	[4] u16 sender_peer_id
+	[6] u8 channel
+sender_peer_id:
+	Unique to each peer.
+	value 0 (PEER_ID_INEXISTENT) is reserved for making new connections
+	value 1 (PEER_ID_SERVER) is reserved for server
+	these constants are defined in constants.h
+channel:
+	The lower the number, the higher the priority is.
+	Only channels 0, 1 and 2 exist.
+*/
+#define BASE_HEADER_SIZE 7
+#define CHANNEL_COUNT 3
+/*
+Packet types:
+
+CONTROL: This is a packet used by the protocol.
+- When this is processed, nothing is handed to the user.
+	Header (2 byte):
+	[0] u8 type
+	[1] u8 controltype
+controltype and data description:
+	CONTROLTYPE_ACK
+		[2] u16 seqnum
+	CONTROLTYPE_SET_PEER_ID
+		[2] u16 peer_id_new
+	CONTROLTYPE_PING
+	- There is no actual reply, but this can be sent in a reliable
+	  packet to get a reply
+	CONTROLTYPE_DISCO
+*/
+#define TYPE_CONTROL 0
+#define CONTROLTYPE_ACK 0
+#define CONTROLTYPE_SET_PEER_ID 1
+#define CONTROLTYPE_PING 2
+#define CONTROLTYPE_DISCO 3
+#define CONTROLTYPE_ENABLE_BIG_SEND_WINDOW 4
+
+/*
+ORIGINAL: This is a plain packet with no control and no error
+checking at all.
+- When this is processed, it is directly handed to the user.
+	Header (1 byte):
+	[0] u8 type
+*/
+#define TYPE_ORIGINAL 1
+#define ORIGINAL_HEADER_SIZE 1
+/*
+SPLIT: These are sequences of packets forming one bigger piece of
+data.
+- When processed and all the packet_nums 0...packet_count-1 are
+  present (this should be buffered), the resulting data shall be
+  directly handed to the user.
+- If the data fails to come up in a reasonable time, the buffer shall
+  be silently discarded.
+- These can be sent as-is or atop of a RELIABLE packet stream.
+	Header (7 bytes):
+	[0] u8 type
+	[1] u16 seqnum
+	[3] u16 chunk_count
+	[5] u16 chunk_num
+*/
+#define TYPE_SPLIT 2
+/*
+RELIABLE: Delivery of all RELIABLE packets shall be forced by ACKs,
+and they shall be delivered in the same order as sent. This is done
+with a buffer in the receiving and transmitting end.
+- When this is processed, the contents of each packet is recursively
+  processed as packets.
+	Header (3 bytes):
+	[0] u8 type
+	[1] u16 seqnum
+
+*/
+#define TYPE_RELIABLE 3
+#define RELIABLE_HEADER_SIZE 3
+#define SEQNUM_INITIAL 65500
+
+/*
+	A buffer which stores reliable packets and sorts them internally
+	for fast access to the smallest one.
+*/
+
+typedef std::list<BufferedPacket>::iterator RPBSearchResult;
+
+class ReliablePacketBuffer
+{
+public:
+	ReliablePacketBuffer();
+
+	bool getFirstSeqnum(u16& result);
+
+	BufferedPacket popFirst();
+	BufferedPacket popSeqnum(u16 seqnum);
+	void insert(BufferedPacket &p,u16 next_expected);
+
+	void incrementTimeouts(float dtime);
+	std::list<BufferedPacket> getTimedOuts(float timeout,
+			unsigned int max_packets);
+
+	void print();
+	bool empty();
+	bool containsPacket(u16 seqnum);
+	RPBSearchResult notFound();
+	u32 size();
+
+
+private:
+	RPBSearchResult findPacket(u16 seqnum);
+
+	std::list<BufferedPacket> m_list;
+	u32 m_list_size;
+
+	u16 m_oldest_non_answered_ack;
+
+	JMutex m_list_mutex;
+};
+
+/*
+	A buffer for reconstructing split packets
+*/
+
+class IncomingSplitBuffer
+{
+public:
+	~IncomingSplitBuffer();
+	/*
+		Returns a reference counted buffer of length != 0 when a full split
+		packet is constructed. If not, returns one of length 0.
+	*/
+	SharedBuffer<u8> insert(BufferedPacket &p, bool reliable);
+
+	void removeUnreliableTimedOuts(float dtime, float timeout);
+
+private:
+	// Key is seqnum
+	std::map<u16, IncomingSplitPacket*> m_buf;
+
+	JMutex m_map_mutex;
+};
+
+struct OutgoingPacket
+{
+	u16 peer_id;
+	u8 channelnum;
+	SharedBuffer<u8> data;
+	bool reliable;
+	bool ack;
+
+	OutgoingPacket(u16 peer_id_, u8 channelnum_, SharedBuffer<u8> data_,
+			bool reliable_,bool ack_=false):
+		peer_id(peer_id_),
+		channelnum(channelnum_),
+		data(data_),
+		reliable(reliable_),
+		ack(ack_)
+	{
+	}
+};
+
+enum ConnectionCommandType{
+	CONNCMD_NONE,
+	CONNCMD_SERVE,
+	CONNCMD_CONNECT,
+	CONNCMD_DISCONNECT,
+	CONNCMD_DISCONNECT_PEER,
+	CONNCMD_SEND,
+	CONNCMD_SEND_TO_ALL,
+	CONCMD_ACK,
+	CONCMD_CREATE_PEER,
+	CONCMD_DISABLE_LEGACY
+};
+
+struct ConnectionCommand
+{
+	enum ConnectionCommandType type;
+	Address address;
+	u16 peer_id;
+	u8 channelnum;
+	Buffer<u8> data;
+	bool reliable;
+	bool raw;
+
+	ConnectionCommand(): type(CONNCMD_NONE), peer_id(PEER_ID_INEXISTENT), reliable(false), raw(false) {}
+
+	void serve(Address address_)
+	{
+		type = CONNCMD_SERVE;
+		address = address_;
+	}
+	void connect(Address address_)
+	{
+		type = CONNCMD_CONNECT;
+		address = address_;
+	}
+	void disconnect()
+	{
+		type = CONNCMD_DISCONNECT;
+	}
+	void disconnect_peer(u16 peer_id_)
+	{
+		type = CONNCMD_DISCONNECT_PEER;
+		peer_id = peer_id_;
+	}
+	void send(u16 peer_id_, u8 channelnum_,
+			SharedBuffer<u8> data_, bool reliable_)
+	{
+		type = CONNCMD_SEND;
+		peer_id = peer_id_;
+		channelnum = channelnum_;
+		data = data_;
+		reliable = reliable_;
+	}
+	void sendToAll(u8 channelnum_, SharedBuffer<u8> data_, bool reliable_)
+	{
+		type = CONNCMD_SEND_TO_ALL;
+		channelnum = channelnum_;
+		data = data_;
+		reliable = reliable_;
+	}
+
+	void ack(u16 peer_id_, u8 channelnum_, SharedBuffer<u8> data_)
+	{
+		type = CONCMD_ACK;
+		peer_id = peer_id_;
+		channelnum = channelnum_;
+		data = data_;
+		reliable = false;
+	}
+
+	void createPeer(u16 peer_id_, SharedBuffer<u8> data_)
+	{
+		type = CONCMD_CREATE_PEER;
+		peer_id = peer_id_;
+		data = data_;
+		channelnum = 0;
+		reliable = true;
+		raw = true;
+	}
+
+	void disableLegacy(u16 peer_id_, SharedBuffer<u8> data_)
+	{
+		type = CONCMD_DISABLE_LEGACY;
+		peer_id = peer_id_;
+		data = data_;
+		channelnum = 0;
+		reliable = true;
+		raw = true;
+	}
+};
+
+class Channel
+{
+
+public:
+	u16 readNextIncomingSeqNum();
+	u16 incNextIncomingSeqNum();
+
+	u16 getOutgoingSequenceNumber(bool& successfull);
+	u16 readOutgoingSequenceNumber();
+	bool putBackSequenceNumber(u16);
+
+	u16 readNextSplitSeqNum();
+	void setNextSplitSeqNum(u16 seqnum);
+
+	// This is for buffering the incoming packets that are coming in
+	// the wrong order
+	ReliablePacketBuffer incoming_reliables;
+	// This is for buffering the sent packets so that the sender can
+	// re-send them if no ACK is received
+	ReliablePacketBuffer outgoing_reliables_sent;
+
+	//queued reliable packets
+	Queue<BufferedPacket> queued_reliables;
+
+	//queue commands prior splitting to packets
+	Queue<ConnectionCommand> queued_commands;
+
+	IncomingSplitBuffer incoming_splits;
+
+	Channel();
+	~Channel();
+
+	void UpdatePacketLossCounter(unsigned int count);
+	void UpdatePacketTooLateCounter();
+	void UpdateBytesSent(unsigned int bytes,unsigned int packages=1);
+	void UpdateBytesLost(unsigned int bytes);
+	void UpdateBytesReceived(unsigned int bytes);
+
+	void UpdateTimers(float dtime, bool legacy_peer);
+
+	const float getCurrentDownloadRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return cur_kbps; };
+	const float getMaxDownloadRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return max_kbps; };
+
+	const float getCurrentLossRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return cur_kbps_lost; };
+	const float getMaxLossRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return max_kbps_lost; };
+
+	const float getCurrentIncomingRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return cur_incoming_kbps; };
+	const float getMaxIncomingRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return max_incoming_kbps; };
+
+	const float getAvgDownloadRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return avg_kbps; };
+	const float getAvgLossRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return avg_kbps_lost; };
+	const float getAvgIncomingRateKB()
+		{ JMutexAutoLock lock(m_internal_mutex); return avg_incoming_kbps; };
+
+	const unsigned int getWindowSize() const { return window_size; };
+
+	void setWindowSize(unsigned int size) { window_size = size; };
+private:
+	JMutex m_internal_mutex;
+	int window_size;
+
+	u16 next_incoming_seqnum;
+
+	u16 next_outgoing_seqnum;
+	u16 next_outgoing_split_seqnum;
+
+	unsigned int current_packet_loss;
+	unsigned int current_packet_too_late;
+	unsigned int current_packet_successfull;
+	float packet_loss_counter;
+
+	unsigned int current_bytes_transfered;
+	unsigned int current_bytes_received;
+	unsigned int current_bytes_lost;
+	float max_kbps;
+	float cur_kbps;
+	float avg_kbps;
+	float max_incoming_kbps;
+	float cur_incoming_kbps;
+	float avg_incoming_kbps;
+	float max_kbps_lost;
+	float cur_kbps_lost;
+	float avg_kbps_lost;
+	float bpm_counter;
+
+	unsigned int rate_samples;
+};
+
+class Peer;
+
+enum PeerChangeType
+{
+	PEER_ADDED,
+	PEER_REMOVED
+};
+struct PeerChange
+{
+	PeerChangeType type;
+	u16 peer_id;
+	bool timeout;
+};
+
+class PeerHandler
+{
+public:
+
+	PeerHandler()
+	{
+	}
+	virtual ~PeerHandler()
+	{
+	}
+
+	/*
+		This is called after the Peer has been inserted into the
+		Connection's peer container.
+	*/
+	virtual void peerAdded(Peer *peer) = 0;
+	/*
+		This is called before the Peer has been removed from the
+		Connection's peer container.
+	*/
+	virtual void deletingPeer(Peer *peer, bool timeout) = 0;
+};
+
+class PeerHelper
+{
+public:
+	PeerHelper();
+	PeerHelper(Peer* peer);
+	~PeerHelper();
+
+	PeerHelper&   operator=(Peer* peer);
+	Peer*         operator->() const;
+	bool          operator!();
+	Peer*         operator&() const;
+	bool          operator!=(void* ptr);
+
+private:
+	Peer* m_peer;
+};
+
+class Connection;
+
+typedef enum {
+	MIN_RTT,
+	MAX_RTT,
+	AVG_RTT,
+	MIN_JITTER,
+	MAX_JITTER,
+	AVG_JITTER
+} rtt_stat_type;
+
+typedef enum {
+	CUR_DL_RATE,
+	AVG_DL_RATE,
+	CUR_INC_RATE,
+	AVG_INC_RATE,
+	CUR_LOSS_RATE,
+	AVG_LOSS_RATE,
+} rate_stat_type;
+
+class Peer {
+	public:
+		friend class PeerHelper;
+
+		Peer(Address address_,u16 id_,Connection* connection) :
+			id(id_),
+			m_increment_packets_remaining(9),
+			m_increment_bytes_remaining(0),
+			m_pending_deletion(false),
+			m_connection(connection),
+			address(address_),
+			m_ping_timer(0.0),
+			m_last_rtt(-1.0),
+			m_usage(0),
+			m_timeout_counter(0.0),
+			m_last_timeout_check(porting::getTimeMs()),
+			m_has_sent_with_id(false)
+		{
+			m_rtt.avg_rtt = -1.0;
+			m_rtt.jitter_avg = -1.0;
+			m_rtt.jitter_max = 0.0;
+			m_rtt.max_rtt = 0.0;
+			m_rtt.jitter_min = FLT_MAX;
+			m_rtt.min_rtt = FLT_MAX;
+		};
+
+		virtual ~Peer() {
+			JMutexAutoLock usage_lock(m_exclusive_access_mutex);
+			assert(m_usage == 0);
+		};
+
+		// Unique id of the peer
+		u16 id;
+
+		void Drop();
+
+		virtual void PutReliableSendCommand(ConnectionCommand &c,
+						unsigned int max_packet_size) {};
+
+		virtual bool isActive() { return false; };
+
+		virtual bool getAddress(MTProtocols type, Address& toset) = 0;
+
+		void ResetTimeout()
+			{JMutexAutoLock lock(m_exclusive_access_mutex); m_timeout_counter=0.0; };
+
+		bool isTimedOut(float timeout);
+
+		void setSentWithID()
+		{ JMutexAutoLock lock(m_exclusive_access_mutex); m_has_sent_with_id = true; };
+
+		bool hasSentWithID()
+		{ JMutexAutoLock lock(m_exclusive_access_mutex); return m_has_sent_with_id; };
+
+		unsigned int m_increment_packets_remaining;
+		unsigned int m_increment_bytes_remaining;
+
+		virtual u16 getNextSplitSequenceNumber(u8 channel) { return 0; };
+		virtual void setNextSplitSequenceNumber(u8 channel, u16 seqnum) {};
+		virtual SharedBuffer<u8> addSpiltPacket(u8 channel,
+												BufferedPacket toadd,
+												bool reliable)
+				{
+					fprintf(stderr,"Peer: addSplitPacket called, this is supposed to be never called!\n");
+					return SharedBuffer<u8>(0);
+				};
+
+		virtual bool Ping(float dtime, SharedBuffer<u8>& data) { return false; };
+
+		virtual float getStat(rtt_stat_type type) const {
+			switch (type) {
+				case MIN_RTT:
+					return m_rtt.min_rtt;
+				case MAX_RTT:
+					return m_rtt.max_rtt;
+				case AVG_RTT:
+					return m_rtt.avg_rtt;
+				case MIN_JITTER:
+					return m_rtt.jitter_min;
+				case MAX_JITTER:
+					return m_rtt.jitter_max;
+				case AVG_JITTER:
+					return m_rtt.jitter_avg;
+			}
+			return -1;
+		}
+	protected:
+		virtual void reportRTT(float rtt) {};
+
+		void RTTStatistics(float rtt,
+							std::string profiler_id="",
+							unsigned int num_samples=1000);
+
+		bool IncUseCount();
+		void DecUseCount();
+
+		JMutex m_exclusive_access_mutex;
+
+		bool m_pending_deletion;
+
+		Connection* m_connection;
+
+		// Address of the peer
+		Address address;
+
+		// Ping timer
+		float m_ping_timer;
+	private:
+
+		struct rttstats {
+			float jitter_min;
+			float jitter_max;
+			float jitter_avg;
+			float min_rtt;
+			float max_rtt;
+			float avg_rtt;
+		};
+
+		rttstats m_rtt;
+		float    m_last_rtt;
+
+		// current usage count
+		unsigned int m_usage;
+
+		// Seconds from last receive
+		float m_timeout_counter;
+
+		u32 m_last_timeout_check;
+
+		bool m_has_sent_with_id;
+};
+
+class UDPPeer : public Peer
+{
+public:
+
+	friend class PeerHelper;
+	friend class ConnectionReceiveThread;
+	friend class ConnectionSendThread;
+	friend class Connection;
+
+	UDPPeer(u16 a_id, Address a_address, Connection* connection);
+	virtual ~UDPPeer() {};
+
+	void PutReliableSendCommand(ConnectionCommand &c,
+							unsigned int max_packet_size);
+
+	bool isActive()
+	{ return ((hasSentWithID()) && (!m_pending_deletion)); };
+
+	bool getAddress(MTProtocols type, Address& toset);
+
+	void setNonLegacyPeer();
+
+	bool getLegacyPeer()
+	{ return m_legacy_peer; }
+
+	u16 getNextSplitSequenceNumber(u8 channel);
+	void setNextSplitSequenceNumber(u8 channel, u16 seqnum);
+
+	SharedBuffer<u8> addSpiltPacket(u8 channel,
+									BufferedPacket toadd,
+									bool reliable);
+
+
+protected:
+	/*
+		Calculates avg_rtt and resend_timeout.
+		rtt=-1 only recalculates resend_timeout
+	*/
+	void reportRTT(float rtt);
+
+	void RunCommandQueues(
+					unsigned int max_packet_size,
+					unsigned int maxcommands,
+					unsigned int maxtransfer);
+
+	float getResendTimeout()
+		{ JMutexAutoLock lock(m_exclusive_access_mutex); return resend_timeout; }
+
+	void setResendTimeout(float timeout)
+		{ JMutexAutoLock lock(m_exclusive_access_mutex); resend_timeout = timeout; }
+	bool Ping(float dtime,SharedBuffer<u8>& data);
+
+	Channel channels[CHANNEL_COUNT];
+	bool m_pending_disconnect;
+private:
+	// This is changed dynamically
+	float resend_timeout;
+
+	bool processReliableSendCommand(
+					ConnectionCommand &c,
+					unsigned int max_packet_size);
+
+	bool m_legacy_peer;
+};
+
+/*
+	Connection
+*/
+
+enum ConnectionEventType{
+	CONNEVENT_NONE,
+	CONNEVENT_DATA_RECEIVED,
+	CONNEVENT_PEER_ADDED,
+	CONNEVENT_PEER_REMOVED,
+	CONNEVENT_BIND_FAILED,
+};
+
+struct ConnectionEvent
+{
+	enum ConnectionEventType type;
+	u16 peer_id;
+	Buffer<u8> data;
+	bool timeout;
+	Address address;
+
+	ConnectionEvent(): type(CONNEVENT_NONE) {}
+
+	std::string describe()
+	{
+		switch(type) {
+		case CONNEVENT_NONE:
+			return "CONNEVENT_NONE";
+		case CONNEVENT_DATA_RECEIVED:
+			return "CONNEVENT_DATA_RECEIVED";
+		case CONNEVENT_PEER_ADDED:
+			return "CONNEVENT_PEER_ADDED";
+		case CONNEVENT_PEER_REMOVED:
+			return "CONNEVENT_PEER_REMOVED";
+		case CONNEVENT_BIND_FAILED:
+			return "CONNEVENT_BIND_FAILED";
+		}
+		return "Invalid ConnectionEvent";
+	}
+
+	void dataReceived(u16 peer_id_, SharedBuffer<u8> data_)
+	{
+		type = CONNEVENT_DATA_RECEIVED;
+		peer_id = peer_id_;
+		data = data_;
+	}
+	void peerAdded(u16 peer_id_, Address address_)
+	{
+		type = CONNEVENT_PEER_ADDED;
+		peer_id = peer_id_;
+		address = address_;
+	}
+	void peerRemoved(u16 peer_id_, bool timeout_, Address address_)
+	{
+		type = CONNEVENT_PEER_REMOVED;
+		peer_id = peer_id_;
+		timeout = timeout_;
+		address = address_;
+	}
+	void bindFailed()
+	{
+		type = CONNEVENT_BIND_FAILED;
+	}
+};
+
+class ConnectionSendThread : public JThread {
+
+public:
+	friend class UDPPeer;
+
+	ConnectionSendThread(unsigned int max_packet_size, float timeout);
+
+	void * Thread       ();
+
+	void Trigger();
+
+	void setParent(Connection* parent) {
+		assert(parent != NULL);
+		m_connection = parent;
+	}
+
+	void setPeerTimeout(float peer_timeout)
+		{ m_timeout = peer_timeout; }
+
+private:
+	void runTimeouts    (float dtime);
+	void rawSend        (const BufferedPacket &packet);
+	bool rawSendAsPacket(u16 peer_id, u8 channelnum,
+							SharedBuffer<u8> data, bool reliable);
+
+	void processReliableCommand (ConnectionCommand &c);
+	void processNonReliableCommand (ConnectionCommand &c);
+	void serve          (Address bind_address);
+	void connect        (Address address);
+	void disconnect     ();
+	void disconnect_peer(u16 peer_id);
+	void send           (u16 peer_id, u8 channelnum,
+							SharedBuffer<u8> data);
+	void sendReliable   (ConnectionCommand &c);
+	void sendToAll      (u8 channelnum,
+							SharedBuffer<u8> data);
+	void sendToAllReliable(ConnectionCommand &c);
+
+	void sendPackets    (float dtime);
+
+	void sendAsPacket   (u16 peer_id, u8 channelnum,
+							SharedBuffer<u8> data,bool ack=false);
+
+	void sendAsPacketReliable(BufferedPacket& p, Channel* channel);
+
+	bool packetsQueued();
+
+	Connection*           m_connection;
+	unsigned int          m_max_packet_size;
+	float                 m_timeout;
+	Queue<OutgoingPacket> m_outgoing_queue;
+	JSemaphore            m_send_sleep_semaphore;
+
+	unsigned int          m_iteration_packets_avaialble;
+	unsigned int          m_max_commands_per_iteration;
+	unsigned int          m_max_data_packets_per_iteration;
+	unsigned int          m_max_packets_requeued;
+};
+
+class ConnectionReceiveThread : public JThread {
+public:
+	ConnectionReceiveThread(unsigned int max_packet_size);
+
+	void * Thread       ();
+
+	void setParent(Connection* parent) {
+		assert(parent != NULL);
+		m_connection = parent;
+	}
+
+private:
+	void receive        ();
+
+	// Returns next data from a buffer if possible
+	// If found, returns true; if not, false.
+	// If found, sets peer_id and dst
+	bool getFromBuffers (u16 &peer_id, SharedBuffer<u8> &dst);
+
+	bool checkIncomingBuffers(Channel *channel, u16 &peer_id,
+							SharedBuffer<u8> &dst);
+
+	/*
+		Processes a packet with the basic header stripped out.
+		Parameters:
+			packetdata: Data in packet (with no base headers)
+			peer_id: peer id of the sender of the packet in question
+			channelnum: channel on which the packet was sent
+			reliable: true if recursing into a reliable packet
+	*/
+	SharedBuffer<u8> processPacket(Channel *channel,
+							SharedBuffer<u8> packetdata, u16 peer_id,
+							u8 channelnum, bool reliable);
+
+
+	Connection*           m_connection;
+};
+
+class Connection
+{
+public:
+	friend class ConnectionSendThread;
+	friend class ConnectionReceiveThread;
+
+	Connection(u32 protocol_id, u32 max_packet_size, float timeout, bool ipv6);
+	Connection(u32 protocol_id, u32 max_packet_size, float timeout, bool ipv6,
+			PeerHandler *peerhandler);
+	~Connection();
+
+	/* Interface */
+	ConnectionEvent getEvent();
+	ConnectionEvent waitEvent(u32 timeout_ms);
+	void putCommand(ConnectionCommand &c);
+
+	void SetTimeoutMs(int timeout) { m_bc_receive_timeout = timeout; }
+	void Serve(Address bind_addr);
+	void Connect(Address address);
+	bool Connected();
+	void Disconnect();
+	u32 Receive(u16 &peer_id, SharedBuffer<u8> &data);
+	void Send(u16 peer_id, u8 channelnum, NetworkPacket* pkt, bool reliable);
+	u16 GetPeerID() { return m_peer_id; }
+	Address GetPeerAddress(u16 peer_id);
+	float getPeerStat(u16 peer_id, rtt_stat_type type);
+	float getLocalStat(rate_stat_type type);
+	const u32 GetProtocolID() const { return m_protocol_id; };
+	const std::string getDesc();
+	void DisconnectPeer(u16 peer_id);
+
+protected:
+	PeerHelper getPeer(u16 peer_id);
+	PeerHelper getPeerNoEx(u16 peer_id);
+	u16   lookupPeer(Address& sender);
+
+	u16 createPeer(Address& sender, MTProtocols protocol, int fd);
+	UDPPeer*  createServerPeer(Address& sender);
+	bool deletePeer(u16 peer_id, bool timeout);
+
+	void SetPeerID(u16 id) { m_peer_id = id; }
+
+	void sendAck(u16 peer_id, u8 channelnum, u16 seqnum);
+
+	void PrintInfo(std::ostream &out);
+	void PrintInfo();
+
+	std::list<u16> getPeerIDs() { return m_peer_ids; }
+
+	UDPSocket m_udpSocket;
+	MutexedQueue<ConnectionCommand> m_command_queue;
+
+	void putEvent(ConnectionEvent &e);
+
+	void TriggerSend()
+		{ m_sendThread.Trigger(); }
+private:
+	std::list<Peer*> getPeers();
+
+	MutexedQueue<ConnectionEvent> m_event_queue;
+
+	u16 m_peer_id;
+	u32 m_protocol_id;
+
+	std::map<u16, Peer*> m_peers;
+	std::list<u16> m_peer_ids;
+	JMutex m_peers_mutex;
+
+	ConnectionSendThread m_sendThread;
+	ConnectionReceiveThread m_receiveThread;
+
+	JMutex m_info_mutex;
+
+	// Backwards compatibility
+	PeerHandler *m_bc_peerhandler;
+	int m_bc_receive_timeout;
+
+	bool m_shutting_down;
+
+	u16 m_next_remote_peer_id;
+};
+
+} // namespace
+
+#endif
diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
index 80ea830f9..b2b1974d7 100644
--- a/src/network/networkpacket.cpp
+++ b/src/network/networkpacket.cpp
@@ -1,6 +1,5 @@
 /*
 Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
 
 This program is free software; you can redistribute it and/or modify
@@ -20,37 +19,54 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "networkpacket.h"
 #include "debug.h"
+#include "exceptions.h"
 #include "util/serialize.h"
 
 NetworkPacket::NetworkPacket(u8 *data, u32 datasize, u16 peer_id):
-m_peer_id(peer_id)
+m_read_offset(0), m_peer_id(peer_id)
 {
 	m_read_offset = 0;
 	m_datasize = datasize - 2;
 
-	// Copy data packet to remove opcode
-	m_data = new u8[m_datasize];
+	// split command and datas
+	m_command = readU16(&data[0]);
+	m_data = std::vector<u8>(&data[2], &data[2 + m_datasize]);
+}
 
-	memcpy(m_data, &data[2], m_datasize);
+NetworkPacket::NetworkPacket(u16 command, u32 datasize, u16 peer_id):
+m_datasize(datasize), m_read_offset(0), m_command(command), m_peer_id(peer_id)
+{
+	m_data.resize(m_datasize);
+}
+
+NetworkPacket::NetworkPacket(u16 command, u32 datasize):
+m_datasize(datasize), m_read_offset(0), m_command(command), m_peer_id(0)
+{
+	m_data.resize(m_datasize);
 }
 
 NetworkPacket::~NetworkPacket()
 {
-	delete [] m_data;
+	m_data.clear();
 }
 
 char* NetworkPacket::getString(u32 from_offset)
 {
-	assert(from_offset < m_datasize);
+	if (from_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
 	return (char*)&m_data[from_offset];
 }
 
-char NetworkPacket::getChar(u32 offset)
+void NetworkPacket::putRawString(const char* src, u32 len)
 {
-	assert(offset < m_datasize);
+	if (m_read_offset + len * sizeof(char) >= m_datasize) {
+		m_datasize += len * sizeof(char);
+		m_data.resize(m_datasize);
+	}
 
-	return m_data[offset];
+	memcpy(&m_data[m_read_offset], src, len);
+	m_read_offset += len;
 }
 
 NetworkPacket& NetworkPacket::operator>>(std::string& dst)
@@ -64,14 +80,51 @@ NetworkPacket& NetworkPacket::operator>>(std::string& dst)
 		return *this;
 	}
 
-
 	dst.reserve(strLen);
 	dst.append((char*)&m_data[m_read_offset], strLen);
 
-	m_read_offset += strLen*sizeof(char);
+	m_read_offset += strLen * sizeof(char);
+	return *this;
+}
+
+NetworkPacket& NetworkPacket::operator<<(std::string src)
+{
+	u16 msgsize = src.size();
+	if (msgsize > 0xFFFF) {
+		msgsize = 0xFFFF;
+	}
+
+	*this << msgsize;
+
+	if (m_read_offset + msgsize * sizeof(char) >= m_datasize) {
+		m_datasize += msgsize * sizeof(char);
+		m_data.resize(m_datasize);
+	}
+
+	memcpy(&m_data[m_read_offset], src.c_str(), msgsize);
+	m_read_offset += msgsize;
+
 	return *this;
 }
 
+void NetworkPacket::putLongString(std::string src)
+{
+	u32 msgsize = src.size();
+	if (msgsize > 0xFFFFFFFF) {
+		msgsize = 0xFFFFFFFF;
+	}
+
+	*this << msgsize;
+
+	if (m_read_offset + msgsize * sizeof(char) >= m_datasize) {
+		m_datasize += msgsize * sizeof(char);
+		m_data.resize(m_datasize);
+	}
+
+	memcpy(&m_data[m_read_offset], src.c_str(), msgsize);
+	m_read_offset += msgsize;
+}
+
 NetworkPacket& NetworkPacket::operator>>(std::wstring& dst)
 {
 	u16 strLen = readU16(&m_data[m_read_offset]);
@@ -93,6 +146,23 @@ NetworkPacket& NetworkPacket::operator>>(std::wstring& dst)
 	return *this;
 }
 
+NetworkPacket& NetworkPacket::operator<<(std::wstring src)
+{
+	u16 msgsize = src.size();
+	if (msgsize > 0xFFFF) {
+		msgsize = 0xFFFF;
+	}
+
+	*this << msgsize;
+
+	// Write string
+	for (u16 i=0; i<msgsize; i++) {
+		*this << (u16) src[i];
+	}
+
+	return *this;
+}
+
 std::string NetworkPacket::readLongString()
 {
 	u32 strLen = readU32(&m_data[m_read_offset]);
@@ -114,151 +184,251 @@ std::string NetworkPacket::readLongString()
 
 NetworkPacket& NetworkPacket::operator>>(char& dst)
 {
-	dst = getChar(m_read_offset);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	dst = readU8(&m_data[m_read_offset]);
 
-	m_read_offset += sizeof(char);
+	incrOffset<char>();
 	return *this;
 }
 
-u8* NetworkPacket::getU8Ptr(u32 from_offset)
+char NetworkPacket::getChar(u32 offset)
 {
-	assert(from_offset < m_datasize);
+	if (offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
-	return (u8*)&m_data[from_offset];
+	return readU8(&m_data[offset]);
 }
 
-u8 NetworkPacket::getU8(u32 offset)
+NetworkPacket& NetworkPacket::operator<<(char src)
 {
-	assert(offset < m_datasize);
+	checkDataSize<u8>();
+
+	writeU8(&m_data[m_read_offset], src);
 
-	return m_data[offset];
+	incrOffset<char>();
+	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(u8& dst)
+NetworkPacket& NetworkPacket::operator<<(u8 src)
 {
-	assert(m_read_offset < m_datasize);
-	dst = m_data[m_read_offset];
+	checkDataSize<u8>();
 
-	m_read_offset += sizeof(u8);
+	writeU8(&m_data[m_read_offset], src);
+
+	incrOffset<u8>();
 	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(bool& dst)
+NetworkPacket& NetworkPacket::operator<<(bool src)
 {
-	assert(m_read_offset < m_datasize);
-	dst = m_data[m_read_offset];
+	checkDataSize<u8>();
 
-	m_read_offset += sizeof(u8);
+	writeU8(&m_data[m_read_offset], src);
+
+	incrOffset<u8>();
 	return *this;
 }
 
-u16 NetworkPacket::getU16(u32 from_offset)
+NetworkPacket& NetworkPacket::operator<<(u16 src)
 {
-	assert(from_offset < m_datasize);
+	checkDataSize<u16>();
 
-	return readU16(&m_data[from_offset]);
+	writeU16(&m_data[m_read_offset], src);
+
+	incrOffset<u16>();
+	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(u16& dst)
+NetworkPacket& NetworkPacket::operator<<(u32 src)
 {
-	dst = getU16(m_read_offset);
+	checkDataSize<u32>();
 
-	m_read_offset += sizeof(u16);
+	writeU32(&m_data[m_read_offset], src);
+
+	incrOffset<u32>();
 	return *this;
 }
 
-u32 NetworkPacket::getU32(u32 from_offset)
+NetworkPacket& NetworkPacket::operator<<(u64 src)
 {
-	assert(from_offset < m_datasize);
+	checkDataSize<u64>();
+
+	writeU64(&m_data[m_read_offset], src);
 
-	return readU32(&m_data[from_offset]);
+	incrOffset<u64>();
+	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(u32& dst)
+NetworkPacket& NetworkPacket::operator<<(float src)
 {
-	dst = getU32(m_read_offset);
+	checkDataSize<float>();
 
-	m_read_offset += sizeof(u32);
+	writeF1000(&m_data[m_read_offset], src);
+
+	incrOffset<float>();
 	return *this;
 }
 
-u64 NetworkPacket::getU64(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(bool& dst)
 {
-	assert(from_offset < m_datasize);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
-	return readU64(&m_data[from_offset]);
+	dst = readU8(&m_data[m_read_offset]);
+
+	incrOffset<u8>();
+	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(u64& dst)
+NetworkPacket& NetworkPacket::operator>>(u8& dst)
 {
-	dst = getU64(m_read_offset);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
-	m_read_offset += sizeof(u64);
+	dst = readU8(&m_data[m_read_offset]);
+
+	incrOffset<u8>();
 	return *this;
 }
 
-float NetworkPacket::getF1000(u32 from_offset)
+u8 NetworkPacket::getU8(u32 offset)
 {
-	assert(from_offset < m_datasize);
+	if (offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
-	return readF1000(&m_data[from_offset]);
+	return readU8(&m_data[offset]);
+}
+
+u8* NetworkPacket::getU8Ptr(u32 from_offset)
+{
+	if (m_datasize == 0) {
+		return NULL;
+	}
+
+	if (from_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	return (u8*)&m_data[from_offset];
+}
+
+NetworkPacket& NetworkPacket::operator>>(u16& dst)
+{
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	dst = readU16(&m_data[m_read_offset]);
+
+	incrOffset<u16>();
+	return *this;
+}
+
+u16 NetworkPacket::getU16(u32 from_offset)
+{
+	if (from_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	return readU16(&m_data[from_offset]);
+}
+
+NetworkPacket& NetworkPacket::operator>>(u32& dst)
+{
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	dst = readU32(&m_data[m_read_offset]);
+
+	incrOffset<u32>();
+	return *this;
+}
+
+NetworkPacket& NetworkPacket::operator>>(u64& dst)
+{
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	dst = readU64(&m_data[m_read_offset]);
+
+	incrOffset<u64>();
+	return *this;
 }
 
 NetworkPacket& NetworkPacket::operator>>(float& dst)
 {
-	dst = getF1000(m_read_offset);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	dst = readF1000(&m_data[m_read_offset]);
 
-	m_read_offset += sizeof(float);
+	incrOffset<float>();
 	return *this;
 }
 
 NetworkPacket& NetworkPacket::operator>>(v2f& dst)
 {
-	assert(m_read_offset < m_datasize);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
 	dst = readV2F1000(&m_data[m_read_offset]);
 
-	m_read_offset += sizeof(v2f);
+	incrOffset<v2f>();
 	return *this;
 }
 
 NetworkPacket& NetworkPacket::operator>>(v3f& dst)
 {
-	assert(m_read_offset < m_datasize);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
 	dst = readV3F1000(&m_data[m_read_offset]);
 
-	m_read_offset += sizeof(v3f);
+	incrOffset<v3f>();
 	return *this;
 }
 
-s16 NetworkPacket::getS16(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(s16& dst)
 {
-	assert(from_offset < m_datasize);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
-	return readS16(&m_data[from_offset]);
+	dst = readS16(&m_data[m_read_offset]);
+
+	incrOffset<s16>();
+	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(s16& dst)
+NetworkPacket& NetworkPacket::operator<<(s16 src)
 {
-	dst = getS16(m_read_offset);
-
-	m_read_offset += sizeof(s16);
+	*this << (u16) src;
 	return *this;
 }
 
-s32 NetworkPacket::getS32(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(s32& dst)
 {
-	assert(from_offset < m_datasize);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	dst = readS32(&m_data[m_read_offset]);
 
-	return readS32(&m_data[from_offset]);
+	incrOffset<s32>();
+	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(s32& dst)
+NetworkPacket& NetworkPacket::operator<<(s32 src)
 {
-	dst = getS32(m_read_offset);
+	*this << (u32) src;
+	return *this;
+}
 
-	m_read_offset += sizeof(s32);
+NetworkPacket& NetworkPacket::operator>>(v3s16& dst)
+{
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
+
+	dst = readV3S16(&m_data[m_read_offset]);
+
+	incrOffset<v3s16>();
 	return *this;
 }
 
@@ -266,36 +436,88 @@ NetworkPacket& NetworkPacket::operator>>(v2s32& dst)
 {
 	dst = readV2S32(&m_data[m_read_offset]);
 
-	m_read_offset += sizeof(v2s32);
+	incrOffset<v2s32>();
 	return *this;
 }
 
-v3s16 NetworkPacket::getV3S16(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(v3s32& dst)
 {
-	assert(from_offset < m_datasize);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
-	return readV3S16(&m_data[from_offset]);
+	dst = readV3S32(&m_data[m_read_offset]);
+
+	incrOffset<v3s32>();
+	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(v3s16& dst)
+NetworkPacket& NetworkPacket::operator<<(v2f src)
+{
+	*this << (float) src.X;
+	*this << (float) src.Y;
+	return *this;
+}
+
+NetworkPacket& NetworkPacket::operator<<(v3f src)
+{
+	*this << (float) src.X;
+	*this << (float) src.Y;
+	*this << (float) src.Z;
+	return *this;
+}
+
+NetworkPacket& NetworkPacket::operator<<(v3s16 src)
 {
-	dst = getV3S16(m_read_offset);
+	*this << (s16) src.X;
+	*this << (s16) src.Y;
+	*this << (s16) src.Z;
+	return *this;
+}
 
-	m_read_offset += sizeof(v3s16);
+NetworkPacket& NetworkPacket::operator<<(v2s32 src)
+{
+	*this << (s32) src.X;
+	*this << (s32) src.Y;
+	return *this;
+}
+
+NetworkPacket& NetworkPacket::operator<<(v3s32 src)
+{
+	*this << (s32) src.X;
+	*this << (s32) src.Y;
+	*this << (s32) src.Z;
 	return *this;
 }
 
-v3s32 NetworkPacket::getV3S32(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(video::SColor& dst)
 {
-	assert(from_offset < m_datasize);
+	if (m_read_offset >= m_datasize)
+		throw SerializationError("Malformed packet read");
 
-	return readV3S32(&m_data[from_offset]);
+	dst = readARGB8(&m_data[m_read_offset]);
+
+	incrOffset<u32>();
+	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(v3s32& dst)
+NetworkPacket& NetworkPacket::operator<<(video::SColor src)
 {
-	dst = getV3S32(m_read_offset);
+	checkDataSize<u32>();
 
-	m_read_offset += sizeof(v3s32);
+	writeU32(&m_data[m_read_offset], src.color);
+
+	incrOffset<u32>();
 	return *this;
 }
+
+SharedBuffer<u8> NetworkPacket::oldForgePacket()
+{
+	SharedBuffer<u8> sb(m_datasize + 2);
+	writeU16(&sb[0], m_command);
+
+	u8* datas = getU8Ptr(0);
+
+	if (datas != NULL)
+		memcpy(&sb[2], datas, m_datasize);
+	return sb;
+}
diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index c9f7e3cde..e8c8565b0 100644
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -1,6 +1,5 @@
 /*
 Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
 
 This program is free software; you can redistribute it and/or modify
@@ -21,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NETWORKPACKET_HEADER
 #define NETWORKPACKET_HEADER
 
+#include "util/pointer.h"
 #include "util/numeric.h"
 #include "networkprotocol.h"
 
@@ -29,57 +29,100 @@ class NetworkPacket
 
 public:
 		NetworkPacket(u8 *data, u32 datasize, u16 peer_id);
+		NetworkPacket(u16 command, u32 datasize, u16 peer_id);
+		NetworkPacket(u16 command, u32 datasize);
 		~NetworkPacket();
 
 		// Getters
 		u32 getSize() { return m_datasize; }
 		u16 getPeerId() { return m_peer_id; }
+		u16 getCommand() { return m_command; }
 
 		// Data extractors
 		char* getString(u32 from_offset);
+		void putRawString(const char* src, u32 len);
+
 		NetworkPacket& operator>>(std::string& dst);
+		NetworkPacket& operator<<(std::string src);
+
+		void putLongString(std::string src);
+
 		NetworkPacket& operator>>(std::wstring& dst);
+		NetworkPacket& operator<<(std::wstring src);
+
 		std::string readLongString();
 
 		char getChar(u32 offset);
 		NetworkPacket& operator>>(char& dst);
+		NetworkPacket& operator<<(char src);
 
 		NetworkPacket& operator>>(bool& dst);
+		NetworkPacket& operator<<(bool src);
 
 		u8 getU8(u32 offset);
+
 		NetworkPacket& operator>>(u8& dst);
+		NetworkPacket& operator<<(u8 src);
 
 		u8* getU8Ptr(u32 offset);
+
 		u16 getU16(u32 from_offset);
 		NetworkPacket& operator>>(u16& dst);
-		u32 getU32(u32 from_offset);
+		NetworkPacket& operator<<(u16 src);
+
 		NetworkPacket& operator>>(u32& dst);
-		u64 getU64(u32 from_offset);
+		NetworkPacket& operator<<(u32 src);
+
 		NetworkPacket& operator>>(u64& dst);
+		NetworkPacket& operator<<(u64 src);
 
-		float getF1000(u32 offset);
 		NetworkPacket& operator>>(float& dst);
+		NetworkPacket& operator<<(float src);
+
 		NetworkPacket& operator>>(v2f& dst);
+		NetworkPacket& operator<<(v2f src);
+
 		NetworkPacket& operator>>(v3f& dst);
+		NetworkPacket& operator<<(v3f src);
 
-		s16 getS16(u32 from_offset);
 		NetworkPacket& operator>>(s16& dst);
-		s32 getS32(u32 from_offset);
+		NetworkPacket& operator<<(s16 src);
+
 		NetworkPacket& operator>>(s32& dst);
+		NetworkPacket& operator<<(s32 src);
 
 		NetworkPacket& operator>>(v2s32& dst);
+		NetworkPacket& operator<<(v2s32 src);
 
-		v3s16 getV3S16(u32 from_offset);
 		NetworkPacket& operator>>(v3s16& dst);
+		NetworkPacket& operator<<(v3s16 src);
 
-		v3s32 getV3S32(u32 from_offset);
 		NetworkPacket& operator>>(v3s32& dst);
+		NetworkPacket& operator<<(v3s32 src);
 
-protected:
-		u8 *m_data;
+		NetworkPacket& operator>>(video::SColor& dst);
+		NetworkPacket& operator<<(video::SColor src);
+
+		// Temp, we remove SharedBuffer when migration finished
+		SharedBuffer<u8> oldForgePacket();
+private:
+		template<typename T> void checkDataSize()
+		{
+			if (m_read_offset + sizeof(T) > m_datasize) {
+				m_datasize += sizeof(T);
+				m_data.resize(m_datasize);
+			}
+		}
+
+		template<typename T> void incrOffset()
+		{
+			m_read_offset += sizeof(T);
+		}
+
+		std::vector<u8> m_data;
 		u32 m_datasize;
 		u32 m_read_offset;
-private:
+		u16 m_command;
 		u16 m_peer_id;
 };
 
diff --git a/src/network/packethandlers/client.cpp b/src/network/packethandlers/client.cpp
new file mode 100644
index 000000000..1ce54e38c
--- /dev/null
+++ b/src/network/packethandlers/client.cpp
@@ -0,0 +1,1024 @@
+/*
+Minetest
+Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "client.h"
+
+#include "base64.h"
+#include "clientmedia.h"
+#include "log.h"
+#include "map.h"
+#include "mapsector.h"
+#include "nodedef.h"
+#include "serialization.h"
+#include "server.h"
+#include "strfnd.h"
+#include "network/clientopcodes.h"
+#include "util/serialize.h"
+
+void Client::handleCommand_Deprecated(NetworkPacket* pkt)
+{
+	infostream << "Got deprecated command "
+			<< toClientCommandTable[pkt->getCommand()].name << " from peer "
+			<< pkt->getPeerId() << "!" << std::endl;
+}
+
+void Client::handleCommand_Init(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 1)
+		return;
+
+	u8 deployed;
+	*pkt >> deployed;
+
+	infostream << "Client: TOCLIENT_INIT received with "
+			"deployed=" << ((int)deployed & 0xff) << std::endl;
+
+	if (!ser_ver_supported(deployed)) {
+		infostream << "Client: TOCLIENT_INIT: Server sent "
+				<< "unsupported ser_fmt_ver"<< std::endl;
+		return;
+	}
+
+	m_server_ser_ver = deployed;
+
+	// Get player position
+	v3s16 playerpos_s16(0, BS * 2 + BS * 20, 0);
+	if (pkt->getSize() >= 1 + 6) {
+		*pkt >> playerpos_s16;
+	}
+	v3f playerpos_f = intToFloat(playerpos_s16, BS) - v3f(0, BS / 2, 0);
+
+
+	// Set player position
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+	player->setPosition(playerpos_f);
+
+	if (pkt->getSize() >= 1 + 6 + 8) {
+		// Get map seed
+		*pkt >> m_map_seed;
+		infostream << "Client: received map seed: " << m_map_seed << std::endl;
+	}
+
+	if (pkt->getSize() >= 1 + 6 + 8 + 4) {
+		*pkt >> m_recommended_send_interval;
+		infostream << "Client: received recommended send interval "
+				<< m_recommended_send_interval<<std::endl;
+	}
+
+	// Reply to server
+	NetworkPacket* resp_pkt = new NetworkPacket(TOSERVER_INIT2, 0);
+	Send(resp_pkt);
+
+	m_state = LC_Init;
+}
+
+void Client::handleCommand_AccessDenied(NetworkPacket* pkt)
+{
+	// The server didn't like our password. Note, this needs
+	// to be processed even if the serialisation format has
+	// not been agreed yet, the same as TOCLIENT_INIT.
+	m_access_denied = true;
+	m_access_denied_reason = L"Unknown";
+	if (pkt->getSize() >= 2) {
+		*pkt >> m_access_denied_reason;
+	}
+}
+
+void Client::handleCommand_RemoveNode(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 6)
+		return;
+
+	v3s16 p;
+	*pkt >> p;
+	removeNode(p);
+}
+
+void Client::handleCommand_AddNode(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 6 + MapNode::serializedLength(m_server_ser_ver))
+		return;
+
+	v3s16 p;
+	*pkt >> p;
+
+	MapNode n;
+	n.deSerialize(pkt->getU8Ptr(6), m_server_ser_ver);
+
+	bool remove_metadata = true;
+	u32 index = 6 + MapNode::serializedLength(m_server_ser_ver);
+	if ((pkt->getSize() >= index + 1) && pkt->getU8(index)) {
+		remove_metadata = false;
+	}
+
+	addNode(p, n, remove_metadata);
+}
+void Client::handleCommand_BlockData(NetworkPacket* pkt)
+{
+	// Ignore too small packet
+	if (pkt->getSize() < 6)
+		return;
+
+	v3s16 p;
+	*pkt >> p;
+
+	std::string datastring(pkt->getString(6), pkt->getSize() - 6);
+	std::istringstream istr(datastring, std::ios_base::binary);
+
+	MapSector *sector;
+	MapBlock *block;
+
+	v2s16 p2d(p.X, p.Z);
+	sector = m_env.getMap().emergeSector(p2d);
+
+	assert(sector->getPos() == p2d);
+
+	block = sector->getBlockNoCreateNoEx(p.Y);
+	if (block) {
+		/*
+			Update an existing block
+		*/
+		block->deSerialize(istr, m_server_ser_ver, false);
+		block->deSerializeNetworkSpecific(istr);
+	}
+	else {
+		/*
+			Create a new block
+		*/
+		block = new MapBlock(&m_env.getMap(), p, this);
+		block->deSerialize(istr, m_server_ser_ver, false);
+		block->deSerializeNetworkSpecific(istr);
+		sector->insertBlock(block);
+	}
+
+	if (localdb != NULL) {
+		((ServerMap&) localserver->getMap()).saveBlock(block, localdb);
+	}
+
+	/*
+		Add it to mesh update queue and set it to be acknowledged after update.
+	*/
+	addUpdateMeshTaskWithEdge(p, true);
+}
+
+void Client::handleCommand_Inventory(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 1)
+		return;
+
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	std::istringstream is(datastring, std::ios_base::binary);
+
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	player->inventory.deSerialize(is);
+
+	m_inventory_updated = true;
+
+	delete m_inventory_from_server;
+	m_inventory_from_server = new Inventory(player->inventory);
+	m_inventory_from_server_age = 0.0;
+}
+
+void Client::handleCommand_TimeOfDay(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 2)
+		return;
+
+	u16 time_of_day;
+
+	*pkt >> time_of_day;
+
+	time_of_day      = time_of_day % 24000;
+	float time_speed = 0;
+
+	if (pkt->getSize() >= 2 + 4) {
+		*pkt >> time_speed;
+	}
+	else {
+		// Old message; try to approximate speed of time by ourselves
+		float time_of_day_f = (float)time_of_day / 24000.0;
+		float tod_diff_f = 0;
+
+		if (time_of_day_f < 0.2 && m_last_time_of_day_f > 0.8)
+			tod_diff_f = time_of_day_f - m_last_time_of_day_f + 1.0;
+		else
+			tod_diff_f = time_of_day_f - m_last_time_of_day_f;
+
+		m_last_time_of_day_f       = time_of_day_f;
+		float time_diff            = m_time_of_day_update_timer;
+		m_time_of_day_update_timer = 0;
+
+		if (m_time_of_day_set) {
+			time_speed = (3600.0 * 24.0) * tod_diff_f / time_diff;
+			infostream << "Client: Measured time_of_day speed (old format): "
+					<< time_speed << " tod_diff_f=" << tod_diff_f
+					<< " time_diff=" << time_diff << std::endl;
+		}
+	}
+
+	// Update environment
+	m_env.setTimeOfDay(time_of_day);
+	m_env.setTimeOfDaySpeed(time_speed);
+	m_time_of_day_set = true;
+
+	u32 dr = m_env.getDayNightRatio();
+	infostream << "Client: time_of_day=" << time_of_day
+			<< " time_speed=" << time_speed
+			<< " dr=" << dr << std::endl;
+}
+
+void Client::handleCommand_ChatMessage(NetworkPacket* pkt)
+{
+	/*
+		u16 command
+		u16 length
+		wstring message
+	*/
+	u16 len, read_wchar;
+
+	*pkt >> len;
+
+	std::wstring message;
+	for (u32 i = 0; i < len; i++) {
+		*pkt >> read_wchar;
+		message += (wchar_t)read_wchar;
+	}
+
+	m_chat_queue.push_back(message);
+}
+
+void Client::handleCommand_ActiveObjectRemoveAdd(NetworkPacket* pkt)
+{
+	/*
+		u16 command
+		u16 count of removed objects
+		for all removed objects {
+			u16 id
+		}
+		u16 count of added objects
+		for all added objects {
+			u16 id
+			u8 type
+			u32 initialization data length
+			string initialization data
+		}
+	*/
+
+	// Read removed objects
+	u8 type;
+	u16 removed_count, added_count, id;
+
+	*pkt >> removed_count;
+
+	for (u16 i = 0; i < removed_count; i++) {
+		*pkt >> id;
+		m_env.removeActiveObject(id);
+	}
+
+	// Read added objects
+	*pkt >> added_count;
+
+	for (u16 i = 0; i < added_count; i++) {
+		*pkt >> id >> type;
+		m_env.addActiveObject(id, type, pkt->readLongString());
+	}
+}
+
+void Client::handleCommand_ActiveObjectMessages(NetworkPacket* pkt)
+{
+	/*
+		u16 command
+		for all objects
+		{
+			u16 id
+			u16 message length
+			string message
+		}
+	*/
+	char buf[6];
+	// Get all data except the command number
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	// Throw them in an istringstream
+	std::istringstream is(datastring, std::ios_base::binary);
+
+	while(is.eof() == false) {
+		is.read(buf, 2);
+		u16 id = readU16((u8*)buf);
+		if (is.eof())
+			break;
+		is.read(buf, 2);
+		size_t message_size = readU16((u8*)buf);
+		std::string message;
+		message.reserve(message_size);
+		for (u32 i = 0; i < message_size; i++) {
+			is.read(buf, 1);
+			message.append(buf, 1);
+		}
+		// Pass on to the environment
+		m_env.processActiveObjectMessage(id, message);
+	}
+}
+
+void Client::handleCommand_Movement(NetworkPacket* pkt)
+{
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	float mad, maa, maf, msw, mscr, msf, mscl, msj, lf, lfs, ls, g;
+
+	*pkt >> mad >> maa >> maf >> msw >> mscr >> msf >> mscl >> msj
+		>> lf >> lfs >> ls >> g;
+
+	player->movement_acceleration_default   = mad * BS;
+	player->movement_acceleration_air       = maa * BS;
+	player->movement_acceleration_fast      = maf * BS;
+	player->movement_speed_walk             = msw * BS;
+	player->movement_speed_crouch           = mscr * BS;
+	player->movement_speed_fast             = msf * BS;
+	player->movement_speed_climb            = mscl * BS;
+	player->movement_speed_jump             = msj * BS;
+	player->movement_liquid_fluidity        = lf * BS;
+	player->movement_liquid_fluidity_smooth = lfs * BS;
+	player->movement_liquid_sink            = ls * BS;
+	player->movement_gravity                = g * BS;
+}
+
+void Client::handleCommand_HP(NetworkPacket* pkt)
+{
+
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	u8 oldhp   = player->hp;
+
+	u8 hp;
+	*pkt >> hp;
+
+	player->hp = hp;
+
+	if (hp < oldhp) {
+		// Add to ClientEvent queue
+		ClientEvent event;
+		event.type = CE_PLAYER_DAMAGE;
+		event.player_damage.amount = oldhp - hp;
+		m_client_event_queue.push_back(event);
+	}
+}
+
+void Client::handleCommand_Breath(NetworkPacket* pkt)
+{
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	u16 breath;
+
+	*pkt >> breath;
+
+	player->setBreath(breath);
+}
+
+void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
+{
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	v3f pos;
+	f32 pitch, yaw;
+
+	*pkt >> pos >> pitch >> yaw;
+
+	player->setPosition(pos);
+
+	infostream << "Client got TOCLIENT_MOVE_PLAYER"
+			<< " pos=(" << pos.X << "," << pos.Y << "," << pos.Z << ")"
+			<< " pitch=" << pitch
+			<< " yaw=" << yaw
+			<< std::endl;
+
+	/*
+		Add to ClientEvent queue.
+		This has to be sent to the main program because otherwise
+		it would just force the pitch and yaw values to whatever
+		the camera points to.
+	*/
+	ClientEvent event;
+	event.type = CE_PLAYER_FORCE_MOVE;
+	event.player_force_move.pitch = pitch;
+	event.player_force_move.yaw = yaw;
+	m_client_event_queue.push_back(event);
+
+	// Ignore damage for a few seconds, so that the player doesn't
+	// get damage from falling on ground
+	m_ignore_damage_timer = 3.0;
+}
+
+void Client::handleCommand_PlayerItem(NetworkPacket* pkt)
+{
+	infostream << "Client: WARNING: Ignoring TOCLIENT_PLAYERITEM" << std::endl;
+}
+
+void Client::handleCommand_DeathScreen(NetworkPacket* pkt)
+{
+	bool set_camera_point_target;
+	v3f camera_point_target;
+
+	*pkt >> set_camera_point_target;
+	*pkt >> camera_point_target;
+
+	ClientEvent event;
+	event.type                                = CE_DEATHSCREEN;
+	event.deathscreen.set_camera_point_target = set_camera_point_target;
+	event.deathscreen.camera_point_target_x   = camera_point_target.X;
+	event.deathscreen.camera_point_target_y   = camera_point_target.Y;
+	event.deathscreen.camera_point_target_z   = camera_point_target.Z;
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_AnnounceMedia(NetworkPacket* pkt)
+{
+	u16 num_files;
+
+	*pkt >> num_files;
+
+	infostream << "Client: Received media announcement: packet size: "
+			<< pkt->getSize() << std::endl;
+
+	if (m_media_downloader == NULL ||
+			m_media_downloader->isStarted()) {
+		const char *problem = m_media_downloader ?
+			"we already saw another announcement" :
+			"all media has been received already";
+		errorstream << "Client: Received media announcement but "
+			<< problem << "! "
+			<< " files=" << num_files
+			<< " size=" << pkt->getSize() << std::endl;
+		return;
+	}
+
+	// Mesh update thread must be stopped while
+	// updating content definitions
+	assert(!m_mesh_update_thread.IsRunning());
+
+	for (u16 i = 0; i < num_files; i++) {
+		std::string name, sha1_base64;
+
+		*pkt >> name >> sha1_base64;
+
+		std::string sha1_raw = base64_decode(sha1_base64);
+		m_media_downloader->addFile(name, sha1_raw);
+	}
+
+	std::vector<std::string> remote_media;
+	try {
+		std::string str;
+
+		*pkt >> str;
+
+		Strfnd sf(str);
+		while(!sf.atend()) {
+			std::string baseurl = trim(sf.next(","));
+			if (baseurl != "")
+				m_media_downloader->addRemoteServer(baseurl);
+		}
+	}
+	catch(SerializationError& e) {
+		// not supported by server or turned off
+	}
+
+	m_media_downloader->step(this);
+}
+
+void Client::handleCommand_Media(NetworkPacket* pkt)
+{
+	/*
+		u16 command
+		u16 total number of file bunches
+		u16 index of this bunch
+		u32 number of files in this bunch
+		for each file {
+			u16 length of name
+			string name
+			u32 length of data
+			data
+		}
+	*/
+	u16 num_bunches;
+	u16 bunch_i;
+	u32 num_files;
+
+	*pkt >> num_bunches >> bunch_i >> num_files;
+
+	infostream << "Client: Received files: bunch " << bunch_i << "/"
+			<< num_bunches << " files=" << num_files
+			<< " size=" << pkt->getSize() << std::endl;
+
+	if (num_files == 0)
+		return;
+
+	if (m_media_downloader == NULL ||
+			!m_media_downloader->isStarted()) {
+		const char *problem = m_media_downloader ?
+			"media has not been requested" :
+			"all media has been received already";
+		errorstream << "Client: Received media but "
+			<< problem << "! "
+			<< " bunch " << bunch_i << "/" << num_bunches
+			<< " files=" << num_files
+			<< " size=" << pkt->getSize() << std::endl;
+		return;
+	}
+
+	// Mesh update thread must be stopped while
+	// updating content definitions
+	assert(!m_mesh_update_thread.IsRunning());
+
+	for (u32 i=0; i < num_files; i++) {
+		std::string name;
+
+		*pkt >> name;
+
+		std::string data = pkt->readLongString();
+
+		m_media_downloader->conventionalTransferDone(
+				name, data, this);
+	}
+}
+
+void Client::handleCommand_ToolDef(NetworkPacket* pkt)
+{
+	infostream << "Client: WARNING: Ignoring TOCLIENT_TOOLDEF" << std::endl;
+}
+
+void Client::handleCommand_NodeDef(NetworkPacket* pkt)
+{
+	infostream << "Client: Received node definitions: packet size: "
+			<< pkt->getSize() << std::endl;
+
+	// Mesh update thread must be stopped while
+	// updating content definitions
+	assert(!m_mesh_update_thread.IsRunning());
+
+	// Decompress node definitions
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	std::istringstream is(datastring, std::ios_base::binary);
+	std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+	std::ostringstream tmp_os;
+	decompressZlib(tmp_is, tmp_os);
+
+	// Deserialize node definitions
+	std::istringstream tmp_is2(tmp_os.str());
+	m_nodedef->deSerialize(tmp_is2);
+	m_nodedef_received = true;
+}
+
+void Client::handleCommand_CraftItemDef(NetworkPacket* pkt)
+{
+	infostream << "Client: WARNING: Ignoring TOCLIENT_CRAFTITEMDEF" << std::endl;
+}
+
+void Client::handleCommand_ItemDef(NetworkPacket* pkt)
+{
+	infostream << "Client: Received item definitions: packet size: "
+			<< pkt->getSize() << std::endl;
+
+	// Mesh update thread must be stopped while
+	// updating content definitions
+	assert(!m_mesh_update_thread.IsRunning());
+
+	// Decompress item definitions
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	std::istringstream is(datastring, std::ios_base::binary);
+	std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+	std::ostringstream tmp_os;
+	decompressZlib(tmp_is, tmp_os);
+
+	// Deserialize node definitions
+	std::istringstream tmp_is2(tmp_os.str());
+	m_itemdef->deSerialize(tmp_is2);
+	m_itemdef_received = true;
+}
+
+void Client::handleCommand_PlaySound(NetworkPacket* pkt)
+{
+	s32 server_id;
+	std::string name;
+	float gain;
+	u8 type; // 0=local, 1=positional, 2=object
+	v3f pos;
+	u16 object_id;
+	bool loop;
+
+	*pkt >> server_id >> name >> gain >> type >> pos >> object_id >> loop;
+
+	// Start playing
+	int client_id = -1;
+	switch(type) {
+		case 0: // local
+			client_id = m_sound->playSound(name, loop, gain);
+			break;
+		case 1: // positional
+			client_id = m_sound->playSoundAt(name, loop, gain, pos);
+			break;
+		case 2:
+		{ // object
+			ClientActiveObject *cao = m_env.getActiveObject(object_id);
+			if (cao)
+				pos = cao->getPosition();
+			client_id = m_sound->playSoundAt(name, loop, gain, pos);
+			// TODO: Set up sound to move with object
+			break;
+		}
+		default:
+			break;
+	}
+
+	if (client_id != -1) {
+		m_sounds_server_to_client[server_id] = client_id;
+		m_sounds_client_to_server[client_id] = server_id;
+		if (object_id != 0)
+			m_sounds_to_objects[client_id] = object_id;
+	}
+}
+
+void Client::handleCommand_StopSound(NetworkPacket* pkt)
+{
+	s32 server_id;
+
+	*pkt >> server_id;
+
+	std::map<s32, int>::iterator i =
+		m_sounds_server_to_client.find(server_id);
+
+	if (i != m_sounds_server_to_client.end()) {
+		int client_id = i->second;
+		m_sound->stopSound(client_id);
+	}
+}
+
+void Client::handleCommand_Privileges(NetworkPacket* pkt)
+{
+	m_privileges.clear();
+	infostream << "Client: Privileges updated: ";
+	u16 num_privileges;
+
+	*pkt >> num_privileges;
+
+	for (u16 i = 0; i < num_privileges; i++) {
+		std::string priv;
+
+		*pkt >> priv;
+
+		m_privileges.insert(priv);
+		infostream << priv << " ";
+	}
+	infostream << std::endl;
+}
+
+void Client::handleCommand_InventoryFormSpec(NetworkPacket* pkt)
+{
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	// Store formspec in LocalPlayer
+	player->inventory_formspec = pkt->readLongString();
+}
+
+void Client::handleCommand_DetachedInventory(NetworkPacket* pkt)
+{
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	std::istringstream is(datastring, std::ios_base::binary);
+
+	std::string name = deSerializeString(is);
+
+	infostream << "Client: Detached inventory update: \"" << name
+			<< "\"" << std::endl;
+
+	Inventory *inv = NULL;
+	if (m_detached_inventories.count(name) > 0)
+		inv = m_detached_inventories[name];
+	else {
+		inv = new Inventory(m_itemdef);
+		m_detached_inventories[name] = inv;
+	}
+	inv->deSerialize(is);
+}
+
+void Client::handleCommand_ShowFormSpec(NetworkPacket* pkt)
+{
+	std::string formspec = pkt->readLongString();
+	std::string formname;
+
+	*pkt >> formname;
+
+	ClientEvent event;
+	event.type = CE_SHOW_FORMSPEC;
+	// pointer is required as event is a struct only!
+	// adding a std:string to a struct isn't possible
+	event.show_formspec.formspec = new std::string(formspec);
+	event.show_formspec.formname = new std::string(formname);
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_SpawnParticle(NetworkPacket* pkt)
+{
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	std::istringstream is(datastring, std::ios_base::binary);
+
+	v3f pos                 = readV3F1000(is);
+	v3f vel                 = readV3F1000(is);
+	v3f acc                 = readV3F1000(is);
+	float expirationtime    = readF1000(is);
+	float size              = readF1000(is);
+	bool collisiondetection = readU8(is);
+	std::string texture     = deSerializeLongString(is);
+	bool vertical           = false;
+	try {
+		vertical = readU8(is);
+	} catch (...) {}
+
+	ClientEvent event;
+	event.type                              = CE_SPAWN_PARTICLE;
+	event.spawn_particle.pos                = new v3f (pos);
+	event.spawn_particle.vel                = new v3f (vel);
+	event.spawn_particle.acc                = new v3f (acc);
+	event.spawn_particle.expirationtime     = expirationtime;
+	event.spawn_particle.size               = size;
+	event.spawn_particle.collisiondetection = collisiondetection;
+	event.spawn_particle.vertical           = vertical;
+	event.spawn_particle.texture            = new std::string(texture);
+
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt)
+{
+	u16 amount;
+	float spawntime;
+	v3f minpos;
+	v3f maxpos;
+	v3f minvel;
+	v3f maxvel;
+	v3f minacc;
+	v3f maxacc;
+	float minexptime;
+	float maxexptime;
+	float minsize;
+	float maxsize;
+	bool collisiondetection;
+	u32 id;
+
+	*pkt >> amount >> spawntime >> minpos >> maxpos >> minvel >> maxvel
+		>> minacc >> maxacc >> minexptime >> maxexptime >> minsize
+		>> maxsize >> collisiondetection;
+
+	std::string texture = pkt->readLongString();
+
+	*pkt >> id;
+
+	bool vertical = false;
+	try {
+		*pkt >> vertical;
+	} catch (...) {}
+
+	ClientEvent event;
+	event.type                                   = CE_ADD_PARTICLESPAWNER;
+	event.add_particlespawner.amount             = amount;
+	event.add_particlespawner.spawntime          = spawntime;
+	event.add_particlespawner.minpos             = new v3f (minpos);
+	event.add_particlespawner.maxpos             = new v3f (maxpos);
+	event.add_particlespawner.minvel             = new v3f (minvel);
+	event.add_particlespawner.maxvel             = new v3f (maxvel);
+	event.add_particlespawner.minacc             = new v3f (minacc);
+	event.add_particlespawner.maxacc             = new v3f (maxacc);
+	event.add_particlespawner.minexptime         = minexptime;
+	event.add_particlespawner.maxexptime         = maxexptime;
+	event.add_particlespawner.minsize            = minsize;
+	event.add_particlespawner.maxsize            = maxsize;
+	event.add_particlespawner.collisiondetection = collisiondetection;
+	event.add_particlespawner.vertical           = vertical;
+	event.add_particlespawner.texture            = new std::string(texture);
+	event.add_particlespawner.id                 = id;
+
+	m_client_event_queue.push_back(event);
+}
+
+
+void Client::handleCommand_DeleteParticleSpawner(NetworkPacket* pkt)
+{
+	u16 id;
+
+	*pkt >> id;
+
+	ClientEvent event;
+	event.type                      = CE_DELETE_PARTICLESPAWNER;
+	event.delete_particlespawner.id = (u32) id;
+
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_HudAdd(NetworkPacket* pkt)
+{
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	std::istringstream is(datastring, std::ios_base::binary);
+
+	u32 id;
+	u8 type;
+	v2f pos;
+	std::string name;
+	v2f scale;
+	std::string text;
+	u32 number;
+	u32 item;
+	u32 dir;
+	v2f align;
+	v2f offset;
+	v3f world_pos;
+	v2s32 size;
+
+	*pkt >> id >> type >> pos >> name >> scale >> text >> number >> item
+		>> dir >> align >> offset;
+	try {
+		*pkt >> world_pos;
+	}
+	catch(SerializationError &e) {};
+
+	try {
+		*pkt >> size;
+	} catch(SerializationError &e) {};
+
+	ClientEvent event;
+	event.type             = CE_HUDADD;
+	event.hudadd.id        = id;
+	event.hudadd.type      = type;
+	event.hudadd.pos       = new v2f(pos);
+	event.hudadd.name      = new std::string(name);
+	event.hudadd.scale     = new v2f(scale);
+	event.hudadd.text      = new std::string(text);
+	event.hudadd.number    = number;
+	event.hudadd.item      = item;
+	event.hudadd.dir       = dir;
+	event.hudadd.align     = new v2f(align);
+	event.hudadd.offset    = new v2f(offset);
+	event.hudadd.world_pos = new v3f(world_pos);
+	event.hudadd.size      = new v2s32(size);
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_HudRemove(NetworkPacket* pkt)
+{
+	u32 id;
+
+	*pkt >> id;
+
+	ClientEvent event;
+	event.type     = CE_HUDRM;
+	event.hudrm.id = id;
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_HudChange(NetworkPacket* pkt)
+{
+	std::string sdata;
+	v2f v2fdata;
+	v3f v3fdata;
+	u32 intdata = 0;
+	v2s32 v2s32data;
+	u32 id;
+	u8 stat;
+
+	*pkt >> id >> stat;
+
+	if (stat == HUD_STAT_POS || stat == HUD_STAT_SCALE ||
+		stat == HUD_STAT_ALIGN || stat == HUD_STAT_OFFSET)
+		*pkt >> v2fdata;
+	else if (stat == HUD_STAT_NAME || stat == HUD_STAT_TEXT)
+		*pkt >> sdata;
+	else if (stat == HUD_STAT_WORLD_POS)
+		*pkt >> v3fdata;
+	else if (stat == HUD_STAT_SIZE )
+		*pkt >> v2s32data;
+	else
+		*pkt >> intdata;
+
+	ClientEvent event;
+	event.type              = CE_HUDCHANGE;
+	event.hudchange.id      = id;
+	event.hudchange.stat    = (HudElementStat)stat;
+	event.hudchange.v2fdata = new v2f(v2fdata);
+	event.hudchange.v3fdata = new v3f(v3fdata);
+	event.hudchange.sdata   = new std::string(sdata);
+	event.hudchange.data    = intdata;
+	event.hudchange.v2s32data = new v2s32(v2s32data);
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_HudSetFlags(NetworkPacket* pkt)
+{
+	u32 flags, mask;
+
+	*pkt >> flags >> mask;
+
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	player->hud_flags &= ~mask;
+	player->hud_flags |= flags;
+}
+
+void Client::handleCommand_HudSetParam(NetworkPacket* pkt)
+{
+	u16 param; std::string value;
+
+	*pkt >> param >> value;
+
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	if (param == HUD_PARAM_HOTBAR_ITEMCOUNT && value.size() == 4) {
+		s32 hotbar_itemcount = readS32((u8*) value.c_str());
+		if (hotbar_itemcount > 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX)
+			player->hud_hotbar_itemcount = hotbar_itemcount;
+	}
+	else if (param == HUD_PARAM_HOTBAR_IMAGE) {
+		((LocalPlayer *) player)->hotbar_image = value;
+	}
+	else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) {
+		((LocalPlayer *) player)->hotbar_selected_image = value;
+	}
+}
+
+void Client::handleCommand_HudSetSky(NetworkPacket* pkt)
+{
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	std::istringstream is(datastring, std::ios_base::binary);
+
+	video::SColor *bgcolor           = new video::SColor(readARGB8(is));
+	std::string *type                = new std::string(deSerializeString(is));
+	u16 count                        = readU16(is);
+	std::vector<std::string> *params = new std::vector<std::string>;
+
+	for (size_t i = 0; i < count; i++)
+		params->push_back(deSerializeString(is));
+
+	ClientEvent event;
+	event.type            = CE_SET_SKY;
+	event.set_sky.bgcolor = bgcolor;
+	event.set_sky.type    = type;
+	event.set_sky.params  = params;
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_OverrideDayNightRatio(NetworkPacket* pkt)
+{
+	bool do_override;
+	u16 day_night_ratio_u;
+
+	*pkt >> do_override >> day_night_ratio_u;
+
+	float day_night_ratio_f = (float)day_night_ratio_u / 65536;
+
+	ClientEvent event;
+	event.type                                 = CE_OVERRIDE_DAY_NIGHT_RATIO;
+	event.override_day_night_ratio.do_override = do_override;
+	event.override_day_night_ratio.ratio_f     = day_night_ratio_f;
+	m_client_event_queue.push_back(event);
+}
+
+void Client::handleCommand_LocalPlayerAnimations(NetworkPacket* pkt)
+{
+	LocalPlayer *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	*pkt >> player->local_animations[0];
+	*pkt >> player->local_animations[1];
+	*pkt >> player->local_animations[2];
+	*pkt >> player->local_animations[3];
+	*pkt >> player->local_animation_speed;
+}
+
+void Client::handleCommand_EyeOffset(NetworkPacket* pkt)
+{
+	LocalPlayer *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+
+	*pkt >> player->eye_offset_first >> player->eye_offset_third;
+}
diff --git a/src/network/packethandlers/server.cpp b/src/network/packethandlers/server.cpp
new file mode 100644
index 000000000..4627bd5ed
--- /dev/null
+++ b/src/network/packethandlers/server.cpp
@@ -0,0 +1,1537 @@
+/*
+Minetest
+Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "server.h"
+#include "log.h"
+
+#include "base64.h"
+#include "content_abm.h"
+#include "content_sao.h"
+#include "emerge.h"
+#include "main.h"
+#include "nodedef.h"
+#include "player.h"
+#include "rollback_interface.h"
+#include "scripting_game.h"
+#include "settings.h"
+#include "tool.h"
+#include "version.h"
+#include "network/networkprotocol.h"
+#include "network/serveropcodes.h"
+#include "util/pointedthing.h"
+#include "util/serialize.h"
+
+void Server::handleCommand_Deprecated(NetworkPacket* pkt)
+{
+	infostream << "Server: " << toServerCommandTable[pkt->getCommand()].name
+		<< " not supported anymore" << std::endl;
+}
+
+void Server::handleCommand_Init(NetworkPacket* pkt)
+{
+	// [0] u8 SER_FMT_VER_HIGHEST_READ
+	// [1] u8[20] player_name
+	// [21] u8[28] password <--- can be sent without this, from old versions
+
+	if (pkt->getSize() < 1+PLAYERNAME_SIZE)
+		return;
+
+	RemoteClient* client = getClient(pkt->getPeerId(), CS_Created);
+
+	std::string addr_s;
+	try {
+		Address address = getPeerAddress(pkt->getPeerId());
+		addr_s = address.serializeString();
+	}
+	catch (con::PeerNotFoundException &e) {
+		/*
+		 * no peer for this packet found
+		 * most common reason is peer timeout, e.g. peer didn't
+		 * respond for some time, your server was overloaded or
+		 * things like that.
+		 */
+		infostream << "Server::ProcessData(): Cancelling: peer "
+				<< pkt->getPeerId() << " not found" << std::endl;
+		return;
+	}
+
+	// If net_proto_version is set, this client has already been handled
+	if (client->getState() > CS_Created) {
+		verbosestream << "Server: Ignoring multiple TOSERVER_INITs from "
+				<< addr_s << " (peer_id=" << pkt->getPeerId() << ")" << std::endl;
+		return;
+	}
+
+	verbosestream << "Server: Got TOSERVER_INIT from " << addr_s << " (peer_id="
+			<< pkt->getPeerId() << ")" << std::endl;
+
+	// Do not allow multiple players in simple singleplayer mode.
+	// This isn't a perfect way to do it, but will suffice for now
+	if (m_simple_singleplayer_mode && m_clients.getClientIDs().size() > 1) {
+		infostream << "Server: Not allowing another client (" << addr_s
+				<< ") to connect in simple singleplayer mode" << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Running in simple singleplayer mode.");
+		return;
+	}
+
+	// First byte after command is maximum supported
+	// serialization version
+	u8 client_max;
+
+	*pkt >> client_max;
+
+	u8 our_max = SER_FMT_VER_HIGHEST_READ;
+	// Use the highest version supported by both
+	int deployed = std::min(client_max, our_max);
+	// If it's lower than the lowest supported, give up.
+	if (deployed < SER_FMT_VER_LOWEST)
+		deployed = SER_FMT_VER_INVALID;
+
+	if (deployed == SER_FMT_VER_INVALID) {
+		actionstream << "Server: A mismatched client tried to connect from "
+				<< addr_s << std::endl;
+		infostream<<"Server: Cannot negotiate serialization version with "
+				<< addr_s << std::endl;
+		DenyAccess(pkt->getPeerId(), std::wstring(
+				L"Your client's version is not supported.\n"
+				L"Server version is ")
+				+ narrow_to_wide(minetest_version_simple) + L"."
+		);
+		return;
+	}
+
+	client->setPendingSerializationVersion(deployed);
+
+	/*
+		Read and check network protocol version
+	*/
+
+	u16 min_net_proto_version = 0;
+	if (pkt->getSize() >= 1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2)
+		min_net_proto_version = pkt->getU16(1 + PLAYERNAME_SIZE + PASSWORD_SIZE);
+
+	// Use same version as minimum and maximum if maximum version field
+	// doesn't exist (backwards compatibility)
+	u16 max_net_proto_version = min_net_proto_version;
+	if (pkt->getSize() >= 1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2 + 2)
+		max_net_proto_version = pkt->getU16(1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2);
+
+	// Start with client's maximum version
+	u16 net_proto_version = max_net_proto_version;
+
+	// Figure out a working version if it is possible at all
+	if (max_net_proto_version >= SERVER_PROTOCOL_VERSION_MIN ||
+			min_net_proto_version <= SERVER_PROTOCOL_VERSION_MAX) {
+		// If maximum is larger than our maximum, go with our maximum
+		if (max_net_proto_version > SERVER_PROTOCOL_VERSION_MAX)
+			net_proto_version = SERVER_PROTOCOL_VERSION_MAX;
+		// Else go with client's maximum
+		else
+			net_proto_version = max_net_proto_version;
+	}
+
+	verbosestream << "Server: " << addr_s << ": Protocol version: min: "
+			<< min_net_proto_version << ", max: " << max_net_proto_version
+			<< ", chosen: " << net_proto_version << std::endl;
+
+	client->net_proto_version = net_proto_version;
+
+	if (net_proto_version < SERVER_PROTOCOL_VERSION_MIN ||
+			net_proto_version > SERVER_PROTOCOL_VERSION_MAX) {
+		actionstream << "Server: A mismatched client tried to connect from "
+				<< addr_s << std::endl;
+		DenyAccess(pkt->getPeerId(), std::wstring(
+				L"Your client's version is not supported.\n"
+				L"Server version is ")
+				+ narrow_to_wide(minetest_version_simple) + L",\n"
+				+ L"server's PROTOCOL_VERSION is "
+				+ narrow_to_wide(itos(SERVER_PROTOCOL_VERSION_MIN))
+				+ L"..."
+				+ narrow_to_wide(itos(SERVER_PROTOCOL_VERSION_MAX))
+				+ L", client's PROTOCOL_VERSION is "
+				+ narrow_to_wide(itos(min_net_proto_version))
+				+ L"..."
+				+ narrow_to_wide(itos(max_net_proto_version))
+		);
+		return;
+	}
+
+	if (g_settings->getBool("strict_protocol_version_checking")) {
+		if (net_proto_version != LATEST_PROTOCOL_VERSION) {
+			actionstream << "Server: A mismatched (strict) client tried to "
+					<< "connect from " << addr_s << std::endl;
+			DenyAccess(pkt->getPeerId(), std::wstring(
+					L"Your client's version is not supported.\n"
+					L"Server version is ")
+					+ narrow_to_wide(minetest_version_simple) + L",\n"
+					+ L"server's PROTOCOL_VERSION (strict) is "
+					+ narrow_to_wide(itos(LATEST_PROTOCOL_VERSION))
+					+ L", client's PROTOCOL_VERSION is "
+					+ narrow_to_wide(itos(min_net_proto_version))
+					+ L"..."
+					+ narrow_to_wide(itos(max_net_proto_version))
+			);
+			return;
+		}
+	}
+
+	/*
+		Set up player
+	*/
+	char playername[PLAYERNAME_SIZE];
+	unsigned int playername_length = 0;
+	for (; playername_length < PLAYERNAME_SIZE; playername_length++ ) {
+		playername[playername_length] = pkt->getChar(1+playername_length);
+		if (pkt->getChar(1+playername_length) == 0)
+			break;
+	}
+
+	if (playername_length == PLAYERNAME_SIZE) {
+		actionstream << "Server: Player with name exceeding max length "
+				<< "tried to connect from " << addr_s << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Name too long");
+		return;
+	}
+
+
+	if (playername[0]=='\0') {
+		actionstream << "Server: Player with an empty name "
+				<< "tried to connect from " << addr_s << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Empty name");
+		return;
+	}
+
+	if (string_allowed(playername, PLAYERNAME_ALLOWED_CHARS) == false) {
+		actionstream << "Server: Player with an invalid name "
+				<< "tried to connect from " << addr_s << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Name contains unallowed characters");
+		return;
+	}
+
+	if (!isSingleplayer() && strcasecmp(playername, "singleplayer") == 0) {
+		actionstream << "Server: Player with the name \"singleplayer\" "
+				<< "tried to connect from " << addr_s << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Name is not allowed");
+		return;
+	}
+
+	{
+		std::string reason;
+		if (m_script->on_prejoinplayer(playername, addr_s, reason)) {
+			actionstream << "Server: Player with the name \"" << playername << "\" "
+					<< "tried to connect from " << addr_s << " "
+					<< "but it was disallowed for the following reason: "
+					<< reason << std::endl;
+			DenyAccess(pkt->getPeerId(), narrow_to_wide(reason.c_str()));
+			return;
+		}
+	}
+
+	infostream<<"Server: New connection: \""<<playername<<"\" from "
+			<<addr_s<<" (peer_id="<<pkt->getPeerId()<<")"<<std::endl;
+
+	// Get password
+	char given_password[PASSWORD_SIZE];
+	if (pkt->getSize() < 1 + PLAYERNAME_SIZE + PASSWORD_SIZE) {
+		// old version - assume blank password
+		given_password[0] = 0;
+	}
+	else {
+		for (u16 i = 0; i < PASSWORD_SIZE - 1; i++) {
+			given_password[i] = pkt->getChar(21 + i);
+		}
+		given_password[PASSWORD_SIZE - 1] = 0;
+	}
+
+	if (!base64_is_valid(given_password)) {
+		actionstream << "Server: " << playername
+				<< " supplied invalid password hash" << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Invalid password hash");
+		return;
+	}
+
+	// Enforce user limit.
+	// Don't enforce for users that have some admin right
+	if (m_clients.getClientIDs(CS_Created).size() >= g_settings->getU16("max_users") &&
+			!checkPriv(playername, "server") &&
+			!checkPriv(playername, "ban") &&
+			!checkPriv(playername, "privs") &&
+			!checkPriv(playername, "password") &&
+			playername != g_settings->get("name")) {
+		actionstream << "Server: " << playername << " tried to join, but there"
+				<< " are already max_users="
+				<< g_settings->getU16("max_users") << " players." << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Too many users.");
+		return;
+	}
+
+	std::string checkpwd; // Password hash to check against
+	bool has_auth = m_script->getAuth(playername, &checkpwd, NULL);
+
+	// If no authentication info exists for user, create it
+	if (!has_auth) {
+		if (!isSingleplayer() &&
+				g_settings->getBool("disallow_empty_password") &&
+				std::string(given_password) == "") {
+			actionstream << "Server: " << playername
+					<< " supplied empty password" << std::endl;
+			DenyAccess(pkt->getPeerId(), L"Empty passwords are "
+					L"disallowed. Set a password and try again.");
+			return;
+		}
+		std::wstring raw_default_password =
+			narrow_to_wide(g_settings->get("default_password"));
+		std::string initial_password =
+			translatePassword(playername, raw_default_password);
+
+		// If default_password is empty, allow any initial password
+		if (raw_default_password.length() == 0)
+			initial_password = given_password;
+
+		m_script->createAuth(playername, initial_password);
+	}
+
+	has_auth = m_script->getAuth(playername, &checkpwd, NULL);
+
+	if (!has_auth) {
+		actionstream << "Server: " << playername << " cannot be authenticated"
+				<< " (auth handler does not work?)" << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Not allowed to login");
+		return;
+	}
+
+	if (given_password != checkpwd) {
+		actionstream << "Server: " << playername << " supplied wrong password"
+				<< std::endl;
+		DenyAccess(pkt->getPeerId(), L"Wrong password");
+		return;
+	}
+
+	RemotePlayer *player =
+			static_cast<RemotePlayer*>(m_env->getPlayer(playername));
+
+	if (player && player->peer_id != 0) {
+		errorstream << "Server: " << playername << ": Failed to emerge player"
+				<< " (player allocated to an another client)" << std::endl;
+		DenyAccess(pkt->getPeerId(), L"Another client is connected with this "
+				L"name. If your client closed unexpectedly, try again in "
+				L"a minute.");
+	}
+
+	m_clients.setPlayerName(pkt->getPeerId(), playername);
+
+	/*
+		Answer with a TOCLIENT_INIT
+	*/
+
+	NetworkPacket* resp_pkt = new NetworkPacket(TOCLIENT_INIT, 1 + 6 + 8 + 4,
+			pkt->getPeerId());
+
+	*resp_pkt << (u8) deployed << (v3s16) floatToInt(v3f(0,0,0), BS)
+			<< (u64) m_env->getServerMap().getSeed()
+			<< g_settings->getFloat("dedicated_server_step");
+
+	Send(resp_pkt);
+	m_clients.event(pkt->getPeerId(), CSE_Init);
+}
+
+void Server::handleCommand_Init2(NetworkPacket* pkt)
+{
+	verbosestream << "Server: Got TOSERVER_INIT2 from "
+			<< pkt->getPeerId() << std::endl;
+
+	m_clients.event(pkt->getPeerId(), CSE_GotInit2);
+	u16 protocol_version = m_clients.getProtocolVersion(pkt->getPeerId());
+
+
+	///// begin compatibility code
+	PlayerSAO* playersao = NULL;
+	if (protocol_version <= 22) {
+		playersao = StageTwoClientInit(pkt->getPeerId());
+
+		if (playersao == NULL) {
+			errorstream
+				<< "TOSERVER_INIT2 stage 2 client init failed for peer "
+				<< pkt->getPeerId() << std::endl;
+			return;
+		}
+	}
+	///// end compatibility code
+
+	/*
+		Send some initialization data
+	*/
+
+	infostream << "Server: Sending content to "
+			<< getPlayerName(pkt->getPeerId()) << std::endl;
+
+	// Send player movement settings
+	SendMovement(pkt->getPeerId());
+
+	// Send item definitions
+	SendItemDef(pkt->getPeerId(), m_itemdef, protocol_version);
+
+	// Send node definitions
+	SendNodeDef(pkt->getPeerId(), m_nodedef, protocol_version);
+
+	m_clients.event(pkt->getPeerId(), CSE_SetDefinitionsSent);
+
+	// Send media announcement
+	sendMediaAnnouncement(pkt->getPeerId());
+
+	// Send detached inventories
+	sendDetachedInventories(pkt->getPeerId());
+
+	// Send time of day
+	u16 time = m_env->getTimeOfDay();
+	float time_speed = g_settings->getFloat("time_speed");
+	SendTimeOfDay(pkt->getPeerId(), time, time_speed);
+
+	///// begin compatibility code
+	if (protocol_version <= 22) {
+		m_clients.event(pkt->getPeerId(), CSE_SetClientReady);
+		m_script->on_joinplayer(playersao);
+	}
+	///// end compatibility code
+
+	// Warnings about protocol version can be issued here
+	if (getClient(pkt->getPeerId())->net_proto_version < LATEST_PROTOCOL_VERSION) {
+		SendChatMessage(pkt->getPeerId(), L"# Server: WARNING: YOUR CLIENT'S "
+				L"VERSION MAY NOT BE FULLY COMPATIBLE WITH THIS SERVER!");
+	}
+}
+
+void Server::handleCommand_RequestMedia(NetworkPacket* pkt)
+{
+	std::list<std::string> tosend;
+	u16 numfiles;
+
+	*pkt >> numfiles;
+
+	infostream << "Sending " << numfiles << " files to "
+			<< getPlayerName(pkt->getPeerId()) << std::endl;
+	verbosestream << "TOSERVER_REQUEST_MEDIA: " << std::endl;
+
+	for (u16 i = 0; i < numfiles; i++) {
+		std::string name;
+
+		*pkt >> name;
+
+		tosend.push_back(name);
+		verbosestream << "TOSERVER_REQUEST_MEDIA: requested file "
+				<< name << std::endl;
+	}
+
+	sendRequestedMedia(pkt->getPeerId(), tosend);
+}
+
+void Server::handleCommand_ReceivedMedia(NetworkPacket* pkt)
+{
+}
+
+void Server::handleCommand_ClientReady(NetworkPacket* pkt)
+{
+	u16 peer_id = pkt->getPeerId();
+	u16 peer_proto_ver = getClient(peer_id, CS_InitDone)->net_proto_version;
+
+	// clients <= protocol version 22 did not send ready message,
+	// they're already initialized
+	if (peer_proto_ver <= 22) {
+		infostream << "Client sent message not expected by a "
+			<< "client using protocol version <= 22,"
+			<< "disconnecing peer_id: " << peer_id << std::endl;
+		m_con.DisconnectPeer(peer_id);
+		return;
+	}
+
+	PlayerSAO* playersao = StageTwoClientInit(peer_id);
+
+	if (playersao == NULL) {
+		errorstream
+			<< "TOSERVER_CLIENT_READY stage 2 client init failed for peer_id: "
+			<< peer_id << std::endl;
+		m_con.DisconnectPeer(peer_id);
+		return;
+	}
+
+
+	if (pkt->getSize() < 8) {
+		errorstream
+			<< "TOSERVER_CLIENT_READY client sent inconsistent data, disconnecting peer_id: "
+			<< peer_id << std::endl;
+		m_con.DisconnectPeer(peer_id);
+		return;
+	}
+
+	u8 major_ver, minor_ver, patch_ver;
+	*pkt >> major_ver >> minor_ver >> patch_ver;
+
+	m_clients.setClientVersion(
+			peer_id, major_ver, minor_ver, patch_ver,
+			std::string(pkt->getString(6),(u16) pkt->getU8(4)));
+
+	m_clients.event(peer_id, CSE_SetClientReady);
+	m_script->on_joinplayer(playersao);
+}
+
+void Server::handleCommand_GotBlocks(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 1)
+		return;
+
+	/*
+		[0] u16 command
+		[2] u8 count
+		[3] v3s16 pos_0
+		[3+6] v3s16 pos_1
+		...
+	*/
+
+	u8 count;
+	*pkt >> count;
+
+	RemoteClient *client = getClient(pkt->getPeerId());
+
+	for (u16 i = 0; i < count; i++) {
+		if ((s16)pkt->getSize() < 1 + (i + 1) * 6)
+			throw con::InvalidIncomingDataException
+				("GOTBLOCKS length is too short");
+		v3s16 p;
+
+		*pkt >> p;
+
+		client->GotBlock(p);
+	}
+}
+
+void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 12 + 12 + 4 + 4)
+		return;
+
+	v3s32 ps, ss;
+	s32 f32pitch, f32yaw;
+
+	*pkt >> ps;
+	*pkt >> ss;
+	*pkt >> f32pitch;
+	*pkt >> f32yaw;
+
+	f32 pitch = (f32)f32pitch / 100.0;
+	f32 yaw = (f32)f32yaw / 100.0;
+	u32 keyPressed = 0;
+
+	if (pkt->getSize() >= 12 + 12 + 4 + 4 + 4)
+		*pkt >> keyPressed;
+
+	v3f position((f32)ps.X / 100.0, (f32)ps.Y / 100.0, (f32)ps.Z / 100.0);
+	v3f speed((f32)ss.X / 100.0, (f32)ss.Y / 100.0, (f32)ss.Z / 100.0);
+
+	pitch = wrapDegrees(pitch);
+	yaw = wrapDegrees(yaw);
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	PlayerSAO *playersao = player->getPlayerSAO();
+	if (playersao == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player object for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	player->setPosition(position);
+	player->setSpeed(speed);
+	player->setPitch(pitch);
+	player->setYaw(yaw);
+	player->keyPressed = keyPressed;
+	player->control.up = (keyPressed & 1);
+	player->control.down = (keyPressed & 2);
+	player->control.left = (keyPressed & 4);
+	player->control.right = (keyPressed & 8);
+	player->control.jump = (keyPressed & 16);
+	player->control.aux1 = (keyPressed & 32);
+	player->control.sneak = (keyPressed & 64);
+	player->control.LMB = (keyPressed & 128);
+	player->control.RMB = (keyPressed & 256);
+
+	bool cheated = playersao->checkMovementCheat();
+	if (cheated) {
+		// Call callbacks
+		m_script->on_cheat(playersao, "moved_too_fast");
+	}
+}
+
+void Server::handleCommand_DeletedBlocks(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 1)
+		return;
+
+	/*
+		[0] u16 command
+		[2] u8 count
+		[3] v3s16 pos_0
+		[3+6] v3s16 pos_1
+		...
+	*/
+
+	u8 count;
+	*pkt >> count;
+
+	RemoteClient *client = getClient(pkt->getPeerId());
+
+	for (u16 i = 0; i < count; i++) {
+		if ((s16)pkt->getSize() < 1 + (i + 1) * 6)
+			throw con::InvalidIncomingDataException
+				("DELETEDBLOCKS length is too short");
+		v3s16 p;
+		*pkt >> p;
+
+		client->SetBlockNotSent(p);
+	}
+}
+
+void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
+{
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	PlayerSAO *playersao = player->getPlayerSAO();
+	if (playersao == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player object for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	// Strip command and create a stream
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	verbosestream << "TOSERVER_INVENTORY_ACTION: data=" << datastring
+		<< std::endl;
+	std::istringstream is(datastring, std::ios_base::binary);
+	// Create an action
+	InventoryAction *a = InventoryAction::deSerialize(is);
+	if (a == NULL) {
+		infostream << "TOSERVER_INVENTORY_ACTION: "
+				<< "InventoryAction::deSerialize() returned NULL"
+				<< std::endl;
+		return;
+	}
+
+	// If something goes wrong, this player is to blame
+	RollbackScopeActor rollback_scope(m_rollback,
+			std::string("player:")+player->getName());
+
+	/*
+		Note: Always set inventory not sent, to repair cases
+		where the client made a bad prediction.
+	*/
+
+	/*
+		Handle restrictions and special cases of the move action
+	*/
+	if (a->getType() == IACTION_MOVE) {
+		IMoveAction *ma = (IMoveAction*)a;
+
+		ma->from_inv.applyCurrentPlayer(player->getName());
+		ma->to_inv.applyCurrentPlayer(player->getName());
+
+		setInventoryModified(ma->from_inv);
+		setInventoryModified(ma->to_inv);
+
+		bool from_inv_is_current_player =
+			(ma->from_inv.type == InventoryLocation::PLAYER) &&
+			(ma->from_inv.name == player->getName());
+
+		bool to_inv_is_current_player =
+			(ma->to_inv.type == InventoryLocation::PLAYER) &&
+			(ma->to_inv.name == player->getName());
+
+		/*
+			Disable moving items out of craftpreview
+		*/
+		if (ma->from_list == "craftpreview") {
+			infostream << "Ignoring IMoveAction from "
+					<< (ma->from_inv.dump()) << ":" << ma->from_list
+					<< " to " << (ma->to_inv.dump()) << ":" << ma->to_list
+					<< " because src is " << ma->from_list << std::endl;
+			delete a;
+			return;
+		}
+
+		/*
+			Disable moving items into craftresult and craftpreview
+		*/
+		if (ma->to_list == "craftpreview" || ma->to_list == "craftresult") {
+			infostream << "Ignoring IMoveAction from "
+					<< (ma->from_inv.dump()) << ":" << ma->from_list
+					<< " to " << (ma->to_inv.dump()) << ":" << ma->to_list
+					<< " because dst is " << ma->to_list << std::endl;
+			delete a;
+			return;
+		}
+
+		// Disallow moving items in elsewhere than player's inventory
+		// if not allowed to interact
+		if (!checkPriv(player->getName(), "interact") &&
+				(!from_inv_is_current_player ||
+				!to_inv_is_current_player)) {
+			infostream << "Cannot move outside of player's inventory: "
+					<< "No interact privilege" << std::endl;
+			delete a;
+			return;
+		}
+	}
+	/*
+		Handle restrictions and special cases of the drop action
+	*/
+	else if (a->getType() == IACTION_DROP) {
+		IDropAction *da = (IDropAction*)a;
+
+		da->from_inv.applyCurrentPlayer(player->getName());
+
+		setInventoryModified(da->from_inv);
+
+		/*
+			Disable dropping items out of craftpreview
+		*/
+		if (da->from_list == "craftpreview") {
+			infostream << "Ignoring IDropAction from "
+					<< (da->from_inv.dump()) << ":" << da->from_list
+					<< " because src is " << da->from_list << std::endl;
+			delete a;
+			return;
+		}
+
+		// Disallow dropping items if not allowed to interact
+		if (!checkPriv(player->getName(), "interact")) {
+			delete a;
+			return;
+		}
+	}
+	/*
+		Handle restrictions and special cases of the craft action
+	*/
+	else if (a->getType() == IACTION_CRAFT) {
+		ICraftAction *ca = (ICraftAction*)a;
+
+		ca->craft_inv.applyCurrentPlayer(player->getName());
+
+		setInventoryModified(ca->craft_inv);
+
+		//bool craft_inv_is_current_player =
+		//	(ca->craft_inv.type == InventoryLocation::PLAYER) &&
+		//	(ca->craft_inv.name == player->getName());
+
+		// Disallow crafting if not allowed to interact
+		if (!checkPriv(player->getName(), "interact")) {
+			infostream << "Cannot craft: "
+					<< "No interact privilege" << std::endl;
+			delete a;
+			return;
+		}
+	}
+
+	// Do the action
+	a->apply(this, playersao, this);
+	// Eat the action
+	delete a;
+}
+
+void Server::handleCommand_ChatMessage(NetworkPacket* pkt)
+{
+	/*
+		u16 command
+		u16 length
+		wstring message
+	*/
+	u16 len;
+	*pkt >> len;
+
+	std::wstring message;
+	for (u16 i = 0; i < len; i++) {
+		u16 tmp_wchar;
+		*pkt >> tmp_wchar;
+
+		message += (wchar_t)tmp_wchar;
+	}
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	// If something goes wrong, this player is to blame
+	RollbackScopeActor rollback_scope(m_rollback,
+			std::string("player:")+player->getName());
+
+	// Get player name of this client
+	std::wstring name = narrow_to_wide(player->getName());
+
+	// Run script hook
+	bool ate = m_script->on_chat_message(player->getName(),
+			wide_to_narrow(message));
+	// If script ate the message, don't proceed
+	if (ate)
+		return;
+
+	// Line to send to players
+	std::wstring line;
+	// Whether to send to the player that sent the line
+	bool send_to_sender_only = false;
+
+	// Commands are implemented in Lua, so only catch invalid
+	// commands that were not "eaten" and send an error back
+	if (message[0] == L'/') {
+		message = message.substr(1);
+		send_to_sender_only = true;
+		if (message.length() == 0)
+			line += L"-!- Empty command";
+		else
+			line += L"-!- Invalid command: " + str_split(message, L' ')[0];
+	}
+	else {
+		if (checkPriv(player->getName(), "shout")) {
+			line += L"<";
+			line += name;
+			line += L"> ";
+			line += message;
+		} else {
+			line += L"-!- You don't have permission to shout.";
+			send_to_sender_only = true;
+		}
+	}
+
+	if (line != L"")
+	{
+		/*
+			Send the message to sender
+		*/
+		if (send_to_sender_only) {
+			SendChatMessage(pkt->getPeerId(), line);
+		}
+		/*
+			Send the message to others
+		*/
+		else {
+			actionstream << "CHAT: " << wide_to_narrow(line)<<std::endl;
+
+			std::list<u16> clients = m_clients.getClientIDs();
+
+			for (std::list<u16>::iterator
+				i = clients.begin();
+				i != clients.end(); ++i) {
+				if (*i != pkt->getPeerId())
+					SendChatMessage(*i, line);
+			}
+		}
+	}
+}
+
+void Server::handleCommand_Damage(NetworkPacket* pkt)
+{
+	u8 damage;
+
+	*pkt >> damage;
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	PlayerSAO *playersao = player->getPlayerSAO();
+	if (playersao == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player object for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	if (g_settings->getBool("enable_damage")) {
+		actionstream << player->getName() << " damaged by "
+				<< (int)damage << " hp at " << PP(player->getPosition() / BS)
+				<< std::endl;
+
+		playersao->setHP(playersao->getHP() - damage);
+
+		if (playersao->getHP() == 0 && playersao->m_hp_not_sent)
+			DiePlayer(pkt->getPeerId());
+
+		if (playersao->m_hp_not_sent)
+			SendPlayerHP(pkt->getPeerId());
+	}
+}
+
+void Server::handleCommand_Breath(NetworkPacket* pkt)
+{
+	u16 breath;
+
+	*pkt >> breath;
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	PlayerSAO *playersao = player->getPlayerSAO();
+	if (playersao == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player object for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	playersao->setBreath(breath);
+	m_script->player_event(playersao,"breath_changed");
+}
+
+void Server::handleCommand_Password(NetworkPacket* pkt)
+{
+	/*
+		[0] u16 TOSERVER_PASSWORD
+		[2] u8[28] old password
+		[30] u8[28] new password
+	*/
+
+	errorstream << "PAssword packet size: " << pkt->getSize() << " size required: " << PASSWORD_SIZE * 2 << std::endl;
+	if (pkt->getSize() != PASSWORD_SIZE * 2)
+		return;
+
+	std::string oldpwd;
+	std::string newpwd;
+
+	for (u16 i = 0; i < PASSWORD_SIZE - 1; i++) {
+		char c = pkt->getChar(i);
+		if (c == 0)
+			break;
+		oldpwd += c;
+	}
+
+	for (u16 i = 0; i < PASSWORD_SIZE - 1; i++) {
+		char c = pkt->getChar(PASSWORD_SIZE + i);
+		if (c == 0)
+			break;
+		newpwd += c;
+	}
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	if (!base64_is_valid(newpwd)) {
+		infostream<<"Server: " << player->getName() <<
+				" supplied invalid password hash" << std::endl;
+		// Wrong old password supplied!!
+		SendChatMessage(pkt->getPeerId(), L"Invalid new password hash supplied. Password NOT changed.");
+		return;
+	}
+
+	infostream << "Server: Client requests a password change from "
+			<< "'" << oldpwd << "' to '" << newpwd << "'" << std::endl;
+
+	std::string playername = player->getName();
+
+	std::string checkpwd;
+	m_script->getAuth(playername, &checkpwd, NULL);
+
+	if (oldpwd != checkpwd) {
+		infostream << "Server: invalid old password" << std::endl;
+		// Wrong old password supplied!!
+		SendChatMessage(pkt->getPeerId(), L"Invalid old password supplied. Password NOT changed.");
+		return;
+	}
+
+	bool success = m_script->setPassword(playername, newpwd);
+	if (success) {
+		actionstream << player->getName() << " changes password" << std::endl;
+		SendChatMessage(pkt->getPeerId(), L"Password change successful.");
+	} else {
+		actionstream << player->getName() << " tries to change password but "
+				<< "it fails" << std::endl;
+		SendChatMessage(pkt->getPeerId(), L"Password change failed or inavailable.");
+	}
+}
+
+void Server::handleCommand_PlayerItem(NetworkPacket* pkt)
+{
+	if (pkt->getSize() < 2)
+		return;
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	PlayerSAO *playersao = player->getPlayerSAO();
+	if (playersao == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player object for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	u16 item;
+
+	*pkt >> item;
+
+	playersao->setWieldIndex(item);
+}
+
+void Server::handleCommand_Respawn(NetworkPacket* pkt)
+{
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	if (player->hp != 0 || !g_settings->getBool("enable_damage"))
+		return;
+
+	RespawnPlayer(pkt->getPeerId());
+
+	actionstream<<player->getName()<<" respawns at "
+			<<PP(player->getPosition()/BS)<<std::endl;
+
+	// ActiveObject is added to environment in AsyncRunStep after
+	// the previous addition has been succesfully removed
+}
+
+void Server::handleCommand_Interact(NetworkPacket* pkt)
+{
+	std::string datastring(pkt->getString(0), pkt->getSize());
+	std::istringstream is(datastring, std::ios_base::binary);
+
+	/*
+		[0] u16 command
+		[2] u8 action
+		[3] u16 item
+		[5] u32 length of the next item
+		[9] serialized PointedThing
+		actions:
+		0: start digging (from undersurface) or use
+		1: stop digging (all parameters ignored)
+		2: digging completed
+		3: place block or item (to abovesurface)
+		4: use item
+	*/
+	u8 action = readU8(is);
+	u16 item_i = readU16(is);
+	std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+	PointedThing pointed;
+	pointed.deSerialize(tmp_is);
+
+	verbosestream << "TOSERVER_INTERACT: action=" << (int)action << ", item="
+			<< item_i << ", pointed=" << pointed.dump() << std::endl;
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	PlayerSAO *playersao = player->getPlayerSAO();
+	if (playersao == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player object for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	if (player->hp == 0) {
+		verbosestream << "TOSERVER_INTERACT: " << player->getName()
+			<< " tried to interact, but is dead!" << std::endl;
+		return;
+	}
+
+	v3f player_pos = playersao->getLastGoodPosition();
+
+	// Update wielded item
+	playersao->setWieldIndex(item_i);
+
+	// Get pointed to node (undefined if not POINTEDTYPE_NODE)
+	v3s16 p_under = pointed.node_undersurface;
+	v3s16 p_above = pointed.node_abovesurface;
+
+	// Get pointed to object (NULL if not POINTEDTYPE_OBJECT)
+	ServerActiveObject *pointed_object = NULL;
+	if (pointed.type == POINTEDTHING_OBJECT) {
+		pointed_object = m_env->getActiveObject(pointed.object_id);
+		if (pointed_object == NULL) {
+			verbosestream << "TOSERVER_INTERACT: "
+				"pointed object is NULL" << std::endl;
+			return;
+		}
+
+	}
+
+	v3f pointed_pos_under = player_pos;
+	v3f pointed_pos_above = player_pos;
+	if (pointed.type == POINTEDTHING_NODE) {
+		pointed_pos_under = intToFloat(p_under, BS);
+		pointed_pos_above = intToFloat(p_above, BS);
+	}
+	else if (pointed.type == POINTEDTHING_OBJECT) {
+		pointed_pos_under = pointed_object->getBasePosition();
+		pointed_pos_above = pointed_pos_under;
+	}
+
+	/*
+		Check that target is reasonably close
+		(only when digging or placing things)
+	*/
+	if (action == 0 || action == 2 || action == 3) {
+		float d = player_pos.getDistanceFrom(pointed_pos_under);
+		float max_d = BS * 14; // Just some large enough value
+		if (d > max_d) {
+			actionstream << "Player " << player->getName()
+					<< " tried to access " << pointed.dump()
+					<< " from too far: "
+					<< "d=" << d <<", max_d=" << max_d
+					<< ". ignoring." << std::endl;
+			// Re-send block to revert change on client-side
+			RemoteClient *client = getClient(pkt->getPeerId());
+			v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
+			client->SetBlockNotSent(blockpos);
+			// Call callbacks
+			m_script->on_cheat(playersao, "interacted_too_far");
+			// Do nothing else
+			return;
+		}
+	}
+
+	/*
+		Make sure the player is allowed to do it
+	*/
+	if (!checkPriv(player->getName(), "interact")) {
+		actionstream<<player->getName()<<" attempted to interact with "
+				<<pointed.dump()<<" without 'interact' privilege"
+				<<std::endl;
+		// Re-send block to revert change on client-side
+		RemoteClient *client = getClient(pkt->getPeerId());
+		// Digging completed -> under
+		if (action == 2) {
+			v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
+			client->SetBlockNotSent(blockpos);
+		}
+		// Placement -> above
+		if (action == 3) {
+			v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_above, BS));
+			client->SetBlockNotSent(blockpos);
+		}
+		return;
+	}
+
+	/*
+		If something goes wrong, this player is to blame
+	*/
+	RollbackScopeActor rollback_scope(m_rollback,
+			std::string("player:")+player->getName());
+
+	/*
+		0: start digging or punch object
+	*/
+	if (action == 0) {
+		if (pointed.type == POINTEDTHING_NODE) {
+			/*
+				NOTE: This can be used in the future to check if
+				somebody is cheating, by checking the timing.
+			*/
+			MapNode n(CONTENT_IGNORE);
+			bool pos_ok;
+			n = m_env->getMap().getNodeNoEx(p_under, &pos_ok);
+			if (pos_ok)
+				n = m_env->getMap().getNodeNoEx(p_under, &pos_ok);
+
+			if (!pos_ok) {
+				infostream << "Server: Not punching: Node not found."
+						<< " Adding block to emerge queue."
+						<< std::endl;
+				m_emerge->enqueueBlockEmerge(pkt->getPeerId(), getNodeBlockPos(p_above), false);
+			}
+
+			if (n.getContent() != CONTENT_IGNORE)
+				m_script->node_on_punch(p_under, n, playersao, pointed);
+			// Cheat prevention
+			playersao->noCheatDigStart(p_under);
+		}
+		else if (pointed.type == POINTEDTHING_OBJECT) {
+			// Skip if object has been removed
+			if (pointed_object->m_removed)
+				return;
+
+			actionstream<<player->getName()<<" punches object "
+					<<pointed.object_id<<": "
+					<<pointed_object->getDescription()<<std::endl;
+
+			ItemStack punchitem = playersao->getWieldedItem();
+			ToolCapabilities toolcap =
+					punchitem.getToolCapabilities(m_itemdef);
+			v3f dir = (pointed_object->getBasePosition() -
+					(player->getPosition() + player->getEyeOffset())
+						).normalize();
+			float time_from_last_punch =
+				playersao->resetTimeFromLastPunch();
+			pointed_object->punch(dir, &toolcap, playersao,
+					time_from_last_punch);
+		}
+
+	} // action == 0
+
+	/*
+		1: stop digging
+	*/
+	else if (action == 1) {
+	} // action == 1
+
+	/*
+		2: Digging completed
+	*/
+	else if (action == 2) {
+		// Only digging of nodes
+		if (pointed.type == POINTEDTHING_NODE) {
+			bool pos_ok;
+			MapNode n = m_env->getMap().getNodeNoEx(p_under, &pos_ok);
+			if (!pos_ok) {
+				infostream << "Server: Not finishing digging: Node not found."
+						   << " Adding block to emerge queue."
+						   << std::endl;
+				m_emerge->enqueueBlockEmerge(pkt->getPeerId(), getNodeBlockPos(p_above), false);
+			}
+
+			/* Cheat prevention */
+			bool is_valid_dig = true;
+			if (!isSingleplayer() && !g_settings->getBool("disable_anticheat")) {
+				v3s16 nocheat_p = playersao->getNoCheatDigPos();
+				float nocheat_t = playersao->getNoCheatDigTime();
+				playersao->noCheatDigEnd();
+				// If player didn't start digging this, ignore dig
+				if (nocheat_p != p_under) {
+					infostream << "Server: NoCheat: " << player->getName()
+							<< " started digging "
+							<< PP(nocheat_p) << " and completed digging "
+							<< PP(p_under) << "; not digging." << std::endl;
+					is_valid_dig = false;
+					// Call callbacks
+					m_script->on_cheat(playersao, "finished_unknown_dig");
+				}
+				// Get player's wielded item
+				ItemStack playeritem;
+				InventoryList *mlist = playersao->getInventory()->getList("main");
+				if (mlist != NULL)
+					playeritem = mlist->getItem(playersao->getWieldIndex());
+				ToolCapabilities playeritem_toolcap =
+						playeritem.getToolCapabilities(m_itemdef);
+				// Get diggability and expected digging time
+				DigParams params = getDigParams(m_nodedef->get(n).groups,
+						&playeritem_toolcap);
+				// If can't dig, try hand
+				if (!params.diggable) {
+					const ItemDefinition &hand = m_itemdef->get("");
+					const ToolCapabilities *tp = hand.tool_capabilities;
+					if (tp)
+						params = getDigParams(m_nodedef->get(n).groups, tp);
+				}
+				// If can't dig, ignore dig
+				if (!params.diggable) {
+					infostream << "Server: NoCheat: " << player->getName()
+							<< " completed digging " << PP(p_under)
+							<< ", which is not diggable with tool. not digging."
+							<< std::endl;
+					is_valid_dig = false;
+					// Call callbacks
+					m_script->on_cheat(playersao, "dug_unbreakable");
+				}
+				// Check digging time
+				// If already invalidated, we don't have to
+				if (!is_valid_dig) {
+					// Well not our problem then
+				}
+				// Clean and long dig
+				else if (params.time > 2.0 && nocheat_t * 1.2 > params.time) {
+					// All is good, but grab time from pool; don't care if
+					// it's actually available
+					playersao->getDigPool().grab(params.time);
+				}
+				// Short or laggy dig
+				// Try getting the time from pool
+				else if (playersao->getDigPool().grab(params.time)) {
+					// All is good
+				}
+				// Dig not possible
+				else {
+					infostream << "Server: NoCheat: " << player->getName()
+							<< " completed digging " << PP(p_under)
+							<< "too fast; not digging." << std::endl;
+					is_valid_dig = false;
+					// Call callbacks
+					m_script->on_cheat(playersao, "dug_too_fast");
+				}
+			}
+
+			/* Actually dig node */
+
+			if (is_valid_dig && n.getContent() != CONTENT_IGNORE)
+				m_script->node_on_dig(p_under, n, playersao);
+
+			v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
+			RemoteClient *client = getClient(pkt->getPeerId());
+			// Send unusual result (that is, node not being removed)
+			if (m_env->getMap().getNodeNoEx(p_under).getContent() != CONTENT_AIR) {
+				// Re-send block to revert change on client-side
+				client->SetBlockNotSent(blockpos);
+			}
+			else {
+				client->ResendBlockIfOnWire(blockpos);
+			}
+		}
+	} // action == 2
+
+	/*
+		3: place block or right-click object
+	*/
+	else if (action == 3) {
+		ItemStack item = playersao->getWieldedItem();
+
+		// Reset build time counter
+		if (pointed.type == POINTEDTHING_NODE &&
+				item.getDefinition(m_itemdef).type == ITEM_NODE)
+			getClient(pkt->getPeerId())->m_time_from_building = 0.0;
+
+		if (pointed.type == POINTEDTHING_OBJECT) {
+			// Right click object
+
+			// Skip if object has been removed
+			if (pointed_object->m_removed)
+				return;
+
+			actionstream << player->getName() << " right-clicks object "
+					<< pointed.object_id << ": "
+					<< pointed_object->getDescription() << std::endl;
+
+			// Do stuff
+			pointed_object->rightClick(playersao);
+		}
+		else if (m_script->item_OnPlace(
+				item, playersao, pointed)) {
+			// Placement was handled in lua
+
+			// Apply returned ItemStack
+			playersao->setWieldedItem(item);
+		}
+
+		// If item has node placement prediction, always send the
+		// blocks to make sure the client knows what exactly happened
+		RemoteClient *client = getClient(pkt->getPeerId());
+		v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_above, BS));
+		v3s16 blockpos2 = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
+		if (item.getDefinition(m_itemdef).node_placement_prediction != "") {
+			client->SetBlockNotSent(blockpos);
+			if (blockpos2 != blockpos) {
+				client->SetBlockNotSent(blockpos2);
+			}
+		}
+		else {
+			client->ResendBlockIfOnWire(blockpos);
+			if (blockpos2 != blockpos) {
+				client->ResendBlockIfOnWire(blockpos2);
+			}
+		}
+	} // action == 3
+
+	/*
+		4: use
+	*/
+	else if (action == 4) {
+		ItemStack item = playersao->getWieldedItem();
+
+		actionstream << player->getName() << " uses " << item.name
+				<< ", pointing at " << pointed.dump() << std::endl;
+
+		if (m_script->item_OnUse(
+				item, playersao, pointed)) {
+			// Apply returned ItemStack
+			playersao->setWieldedItem(item);
+		}
+
+	} // action == 4
+
+
+	/*
+		Catch invalid actions
+	*/
+	else {
+		infostream << "WARNING: Server: Invalid action "
+				<< action << std::endl;
+	}
+}
+
+void Server::handleCommand_RemovedSounds(NetworkPacket* pkt)
+{
+	u16 num;
+	*pkt >> num;
+	for (u16 k = 0; k < num; k++) {
+		s32 id;
+
+		*pkt >> id;
+
+		std::map<s32, ServerPlayingSound>::iterator i =
+			m_playing_sounds.find(id);
+
+		if (i == m_playing_sounds.end())
+			continue;
+
+		ServerPlayingSound &psound = i->second;
+		psound.clients.erase(pkt->getPeerId());
+		if (psound.clients.empty())
+			m_playing_sounds.erase(i++);
+	}
+}
+
+void Server::handleCommand_NodeMetaFields(NetworkPacket* pkt)
+{
+	v3s16 p;
+	std::string formname;
+	u16 num;
+
+	*pkt >> p >> formname >> num;
+
+	std::map<std::string, std::string> fields;
+	for (u16 k = 0; k < num; k++) {
+		std::string fieldname;
+		*pkt >> fieldname;
+		fields[fieldname] = pkt->readLongString();
+	}
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	PlayerSAO *playersao = player->getPlayerSAO();
+	if (playersao == NULL) {
+		errorstream << "Server::ProcessData(): Cancelling: "
+				"No player object for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!"  << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	// If something goes wrong, this player is to blame
+	RollbackScopeActor rollback_scope(m_rollback,
+			std::string("player:")+player->getName());
+
+	// Check the target node for rollback data; leave others unnoticed
+	RollbackNode rn_old(&m_env->getMap(), p, this);
+
+	m_script->node_on_receive_fields(p, formname, fields, playersao);
+
+	// Report rollback data
+	RollbackNode rn_new(&m_env->getMap(), p, this);
+	if (rollback() && rn_new != rn_old) {
+		RollbackAction action;
+		action.setSetNode(p, rn_old, rn_new);
+		rollback()->reportAction(action);
+	}
+}
+
+void Server::handleCommand_InventoryFields(NetworkPacket* pkt)
+{
+	std::string formname;
+	u16 num;
+
+	*pkt >> formname >> num;
+
+	std::map<std::string, std::string> fields;
+	for (u16 k = 0; k < num; k++) {
+		std::string fieldname;
+		*pkt >> fieldname;
+		fields[fieldname] = pkt->readLongString();
+	}
+
+	Player *player = m_env->getPlayer(pkt->getPeerId());
+	if (player == NULL) {
+		errorstream << "Server::ProcessData(): Canceling: "
+				"No player for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	PlayerSAO *playersao = player->getPlayerSAO();
+	if (playersao == NULL) {
+		errorstream << "Server::ProcessData(): Canceling: "
+				"No player object for peer_id=" << pkt->getPeerId()
+				<< " disconnecting peer!" << std::endl;
+		m_con.DisconnectPeer(pkt->getPeerId());
+		return;
+	}
+
+	m_script->on_playerReceiveFields(playersao, formname, fields);
+}
diff --git a/src/network/serveropcodes.cpp b/src/network/serveropcodes.cpp
index 11d2c65ea..bd36b427f 100644
--- a/src/network/serveropcodes.cpp
+++ b/src/network/serveropcodes.cpp
@@ -93,3 +93,92 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
 	{ "TOSERVER_BREATH",                   TOSERVER_STATE_INGAME, &Server::handleCommand_Breath }, // 0x42
 	{ "TOSERVER_CLIENT_READY",             TOSERVER_STATE_STARTUP, &Server::handleCommand_ClientReady }, // 0x43
 };
+
+const static ClientCommandFactory null_command_factory = { "TOCLIENT_NULL", 0, false };
+
+const ClientCommandFactory clientCommandFactoryTable[TOCLIENT_NUM_MSG_TYPES] =
+{
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	{ "TOCLIENT_INIT",                     0, true }, // 0x10
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	{ "TOCLIENT_BLOCKDATA",                2, true }, // 0x20
+	{ "TOCLIENT_ADDNODE",                  0, true }, // 0x21
+	{ "TOCLIENT_REMOVENODE",               0, true }, // 0x22
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	{ "TOCLIENT_INVENTORY",                0, true }, // 0x27
+	null_command_factory,
+	{ "TOCLIENT_TIME_OF_DAY",              0, true }, // 0x29
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	null_command_factory,
+	{ "TOCLIENT_CHAT_MESSAGE",             0, true }, // 0x30
+	{ "TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD", 0, true }, // 0x31
+	{ "TOCLIENT_ACTIVE_OBJECT_MESSAGES",   0, true }, // 0x32 Special packet, sent by 0 (rel) and 1 (unrel) channel
+	{ "TOCLIENT_HP",                       0, true }, // 0x33
+	{ "TOCLIENT_MOVE_PLAYER",              0, true }, // 0x34
+	{ "TOCLIENT_ACCESS_DENIED",            0, true }, // 0x35
+	{ "TOCLIENT_PLAYERITEM",               0, false }, // 0x36 obsolete
+	{ "TOCLIENT_DEATHSCREEN",              0, true }, // 0x37
+	{ "TOCLIENT_MEDIA",                    2, true }, // 0x38
+	{ "TOCLIENT_TOOLDEF",                  0, false }, // 0x39 obsolete
+	{ "TOCLIENT_NODEDEF",                  0, true }, // 0x3a
+	{ "TOCLIENT_CRAFTITEMDEF",             0, false }, // 0x3b obsolete
+	{ "TOCLIENT_ANNOUNCE_MEDIA",           0, true }, // 0x3c
+	{ "TOCLIENT_ITEMDEF",                  0, true }, // 0x3d
+	null_command_factory,
+	{ "TOCLIENT_PLAY_SOUND",               0, true }, // 0x3f
+	{ "TOCLIENT_STOP_SOUND",               0, true }, // 0x40
+	{ "TOCLIENT_PRIVILEGES",               0, true }, // 0x41
+	{ "TOCLIENT_INVENTORY_FORMSPEC",       0, true }, // 0x42
+	{ "TOCLIENT_DETACHED_INVENTORY",       0, true }, // 0x43
+	{ "TOCLIENT_SHOW_FORMSPEC",            0, true }, // 0x44
+	{ "TOCLIENT_MOVEMENT",                 0, true }, // 0x45
+	{ "TOCLIENT_SPAWN_PARTICLE",           0, true }, // 0x46
+	{ "TOCLIENT_ADD_PARTICLESPAWNER",      0, true }, // 0x47
+	{ "TOCLIENT_DELETE_PARTICLESPAWNER",   0, true }, // 0x48
+	{ "TOCLIENT_HUDADD",                   1, true }, // 0x49
+	{ "TOCLIENT_HUDRM",                    1, true }, // 0x4a
+	{ "TOCLIENT_HUDCHANGE",                0, true }, // 0x4b
+	{ "TOCLIENT_HUD_SET_FLAGS",            0, true }, // 0x4c
+	{ "TOCLIENT_HUD_SET_PARAM",            0, true }, // 0x4d
+	{ "TOCLIENT_BREATH",                   0, true }, // 0x4e
+	{ "TOCLIENT_SET_SKY",                  0, true }, // 0x4f
+	{ "TOCLIENT_OVERRIDE_DAY_NIGHT_RATIO", 0, true }, // 0x50
+	{ "TOCLIENT_LOCAL_PLAYER_ANIMATIONS",  0, true }, // 0x51
+	{ "TOCLIENT_EYE_OFFSET",               0, true }, // 0x52
+};
diff --git a/src/network/serveropcodes.h b/src/network/serveropcodes.h
index 77f39e09a..aa3301069 100644
--- a/src/network/serveropcodes.h
+++ b/src/network/serveropcodes.h
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "server.h"
 #include "networkprotocol.h"
-#include "toserverpacket.h"
+#include "networkpacket.h"
 
 enum ToServerConnectionState {
 	TOSERVER_STATE_NOT_CONNECTED,
@@ -35,9 +35,18 @@ struct ToServerCommandHandler
 {
     const std::string name;
     ToServerConnectionState state;
-    void (Server::*handler)(ToServerPacket* pkt);
+    void (Server::*handler)(NetworkPacket* pkt);
+};
+
+struct ClientCommandFactory
+{
+	const char* name;
+	u16 channel;
+	bool reliable;
 };
 
 extern const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES];
 
+extern const ClientCommandFactory clientCommandFactoryTable[TOCLIENT_NUM_MSG_TYPES];
+
 #endif
diff --git a/src/network/toclientpacket.cpp b/src/network/toclientpacket.cpp
deleted file mode 100644
index b51da48cf..000000000
--- a/src/network/toclientpacket.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "toclientpacket.h"
-#include "util/serialize.h"
-
-ToClientPacket::ToClientPacket(u8 *data, u32 datasize, u16 peer_id):
-NetworkPacket(data, datasize, peer_id)
-{
-	m_command = (ToClientCommand)readU16(&data[0]);
-}
diff --git a/src/network/toclientpacket.h b/src/network/toclientpacket.h
deleted file mode 100644
index b926514fb..000000000
--- a/src/network/toclientpacket.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef TOCLIENTPACKET_HEADER
-#define TOCLIENTPACKET_HEADER
-
-#include "util/numeric.h"
-#include "networkprotocol.h"
-#include "networkpacket.h"
-
-class ToClientPacket: public NetworkPacket
-{
-public:
-	ToClientPacket(u8 *data, u32 datasize, u16 peer_id);
-	ToClientCommand getCommand() { return m_command; }
-
-private:
-	ToClientCommand m_command;
-};
-
-#endif
diff --git a/src/network/toserverpacket.cpp b/src/network/toserverpacket.cpp
deleted file mode 100644
index 7b4968679..000000000
--- a/src/network/toserverpacket.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "toserverpacket.h"
-#include "util/serialize.h"
-
-ToServerPacket::ToServerPacket(u8 *data, u32 datasize, u16 peer_id):
-NetworkPacket(data, datasize, peer_id)
-{
-	m_command = (ToServerCommand)readU16(&data[0]);
-}
diff --git a/src/network/toserverpacket.h b/src/network/toserverpacket.h
deleted file mode 100644
index eb8470b07..000000000
--- a/src/network/toserverpacket.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef TOSERVERPACKET_HEADER
-#define TOSERVERPACKET_HEADER
-
-#include "util/numeric.h"
-#include "networkprotocol.h"
-#include "networkpacket.h"
-
-class ToServerPacket: public NetworkPacket
-{
-public:
-	ToServerPacket(u8 *data, u32 datasize, u16 peer_id);
-	ToServerCommand getCommand() { return m_command; }
-
-private:
-	ToServerCommand m_command;
-};
-
-#endif