Remove duplicate code in main menu
[oweals/minetest.git] / src / connection.cpp
index 42bfdfb9f24e77621e5f50e5355f4eecb64e65b1..58a0fb2bd9c3ef377f119dcea5982afbc9cd30b1 100644 (file)
@@ -1,6 +1,27 @@
+/*
+Minetest-c55
+Copyright (C) 2010 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 General Public License as published by
+the Free Software Foundation; either version 2 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 General Public License for more details.
+
+You should have received a copy of the GNU 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 "connection.h"
 #include "main.h"
 #include "serialization.h"
+#include "log.h"
+#include "porting.h"
 
 namespace con
 {
@@ -301,7 +322,7 @@ IncomingSplitBuffer::~IncomingSplitBuffer()
        This will throw a GotSplitPacketException when a full
        split packet is constructed.
 */
-void IncomingSplitBuffer::insert(BufferedPacket &p, bool reliable)
+SharedBuffer<u8> IncomingSplitBuffer::insert(BufferedPacket &p, bool reliable)
 {
        u32 headersize = BASE_HEADER_SIZE + 7;
        assert(p.data.getSize() >= headersize);
@@ -344,9 +365,9 @@ void IncomingSplitBuffer::insert(BufferedPacket &p, bool reliable)
        // Set chunk data in buffer
        sp->chunks[chunk_num] = chunkdata;
        
-       // If not all chunks are received, return
+       // If not all chunks are received, return empty buffer
        if(sp->allReceived() == false)
-               return;
+               return SharedBuffer<u8>();
 
        // Calculate total size
        u32 totalsize = 0;
@@ -373,8 +394,8 @@ void IncomingSplitBuffer::insert(BufferedPacket &p, bool reliable)
        // Remove sp from buffer
        m_buf.remove(seqnum);
        delete sp;
-       
-       throw GotSplitPacketException(fulldata);
+
+       return fulldata;
 }
 void IncomingSplitBuffer::removeUnreliableTimedOuts(float dtime, float timeout)
 {
@@ -420,15 +441,19 @@ Channel::~Channel()
        Peer
 */
 
-Peer::Peer(u16 a_id, Address a_address)
+Peer::Peer(u16 a_id, Address a_address):
+       address(a_address),
+       id(a_id),
+       timeout_counter(0.0),
+       ping_timer(0.0),
+       resend_timeout(0.5),
+       avg_rtt(-1.0),
+       has_sent_with_id(false),
+       m_sendtime_accu(0),
+       m_max_packets_per_second(10),
+       m_num_sent(0),
+       m_max_num_sent(0)
 {
-       id = a_id;
-       address = a_address;
-       timeout_counter = 0.0;
-       //resend_timeout = RESEND_TIMEOUT_MINIMUM;
-       resend_timeout = 0.5;
-       avg_rtt = -1.0;
-       has_sent_with_id = false;
 }
 Peer::~Peer()
 {
@@ -436,6 +461,20 @@ Peer::~Peer()
 
 void Peer::reportRTT(float rtt)
 {
+       if(rtt >= 0.0){
+               if(rtt < 0.01){
+                       if(m_max_packets_per_second < 400)
+                               m_max_packets_per_second += 10;
+               } else if(rtt < 0.2){
+                       if(m_max_packets_per_second < 100)
+                               m_max_packets_per_second += 2;
+               } else {
+                       m_max_packets_per_second *= 0.8;
+                       if(m_max_packets_per_second < 10)
+                               m_max_packets_per_second = 10;
+               }
+       }
+
        if(rtt < -0.999)
        {}
        else if(avg_rtt < 0.0)
@@ -465,183 +504,876 @@ void Peer::reportRTT(float rtt)
        Connection
 */
 
-Connection::Connection(
-       u32 protocol_id,
-       u32 max_packet_size,
-       float timeout,
-       PeerHandler *peerhandler
-)
+Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout):
+       m_protocol_id(protocol_id),
+       m_max_packet_size(max_packet_size),
+       m_timeout(timeout),
+       m_peer_id(0),
+       m_bc_peerhandler(NULL),
+       m_bc_receive_timeout(0),
+       m_indentation(0)
 {
-       assert(peerhandler != NULL);
+       m_socket.setTimeoutMs(5);
 
-       m_protocol_id = protocol_id;
-       m_max_packet_size = max_packet_size;
-       m_timeout = timeout;
-       m_peer_id = PEER_ID_NEW;
-       //m_waiting_new_peer_id = false;
-       m_indentation = 0;
-       m_peerhandler = peerhandler;
+       Start();
 }
 
-Connection::~Connection()
+Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
+               PeerHandler *peerhandler):
+       m_protocol_id(protocol_id),
+       m_max_packet_size(max_packet_size),
+       m_timeout(timeout),
+       m_peer_id(0),
+       m_bc_peerhandler(peerhandler),
+       m_bc_receive_timeout(0),
+       m_indentation(0)
 {
-       // Clear peers
-       core::map<u16, Peer*>::Iterator j;
-       j = m_peers.getIterator();
-       for(; j.atEnd() == false; j++)
-       {
-               Peer *peer = j.getNode()->getValue();
-               delete peer;
-       }
+       m_socket.setTimeoutMs(5);
+
+       Start();
 }
 
-void Connection::Serve(unsigned short port)
+
+Connection::~Connection()
 {
-       m_socket.Bind(port);
-       m_peer_id = PEER_ID_SERVER;
+       stop();
 }
 
-void Connection::Connect(Address address)
+/* Internal stuff */
+
+void * Connection::Thread()
 {
-       core::map<u16, Peer*>::Node *node = m_peers.find(PEER_ID_SERVER);
-       if(node != NULL){
-               throw ConnectionException("Already connected to a server");
-       }
+       ThreadStarted();
+       log_register_thread("Connection");
 
-       Peer *peer = new Peer(PEER_ID_SERVER, address);
-       m_peers.insert(peer->id, peer);
-       m_peerhandler->peerAdded(peer);
+       dout_con<<"Connection thread started"<<std::endl;
        
-       m_socket.Bind(0);
-       
-       // Send a dummy packet to server with peer_id = PEER_ID_NEW
-       m_peer_id = PEER_ID_NEW;
-       SharedBuffer<u8> data(0);
-       Send(PEER_ID_SERVER, 0, data, true);
+       u32 curtime = porting::getTimeMs();
+       u32 lasttime = curtime;
 
-       //m_waiting_new_peer_id = true;
-}
+       while(getRun())
+       {
+               BEGIN_DEBUG_EXCEPTION_HANDLER
+               
+               lasttime = curtime;
+               curtime = porting::getTimeMs();
+               float dtime = (float)(curtime - lasttime) / 1000.;
+               if(dtime > 0.1)
+                       dtime = 0.1;
+               if(dtime < 0.0)
+                       dtime = 0.0;
+               
+               runTimeouts(dtime);
 
-bool Connection::Connected()
-{
-       if(m_peers.size() != 1)
-               return false;
+               while(m_command_queue.size() != 0){
+                       ConnectionCommand c = m_command_queue.pop_front();
+                       processCommand(c);
+               }
+
+               send(dtime);
+
+               receive();
                
-       core::map<u16, Peer*>::Node *node = m_peers.find(PEER_ID_SERVER);
-       if(node == NULL)
-               return false;
-       
-       if(m_peer_id == PEER_ID_NEW)
-               return false;
-       
-       return true;
+               END_DEBUG_EXCEPTION_HANDLER(derr_con);
+       }
+
+       return NULL;
 }
 
-SharedBuffer<u8> Channel::ProcessPacket(
-               SharedBuffer<u8> packetdata,
-               Connection *con,
-               u16 peer_id,
-               u8 channelnum,
-               bool reliable)
+void Connection::putEvent(ConnectionEvent &e)
 {
-       IndentationRaiser iraiser(&(con->m_indentation));
+       assert(e.type != CONNEVENT_NONE);
+       m_event_queue.push_back(e);
+}
 
-       if(packetdata.getSize() < 1)
-               throw InvalidIncomingDataException("packetdata.getSize() < 1");
+void Connection::processCommand(ConnectionCommand &c)
+{
+       switch(c.type){
+       case CONNCMD_NONE:
+               dout_con<<getDesc()<<" processing CONNCMD_NONE"<<std::endl;
+               return;
+       case CONNCMD_SERVE:
+               dout_con<<getDesc()<<" processing CONNCMD_SERVE port="
+                               <<c.port<<std::endl;
+               serve(c.port);
+               return;
+       case CONNCMD_CONNECT:
+               dout_con<<getDesc()<<" processing CONNCMD_CONNECT"<<std::endl;
+               connect(c.address);
+               return;
+       case CONNCMD_DISCONNECT:
+               dout_con<<getDesc()<<" processing CONNCMD_DISCONNECT"<<std::endl;
+               disconnect();
+               return;
+       case CONNCMD_SEND:
+               dout_con<<getDesc()<<" processing CONNCMD_SEND"<<std::endl;
+               send(c.peer_id, c.channelnum, c.data, c.reliable);
+               return;
+       case CONNCMD_SEND_TO_ALL:
+               dout_con<<getDesc()<<" processing CONNCMD_SEND_TO_ALL"<<std::endl;
+               sendToAll(c.channelnum, c.data, c.reliable);
+               return;
+       case CONNCMD_DELETE_PEER:
+               dout_con<<getDesc()<<" processing CONNCMD_DELETE_PEER"<<std::endl;
+               deletePeer(c.peer_id, false);
+               return;
+       }
+}
 
-       u8 type = readU8(&packetdata[0]);
-       
-       if(type == TYPE_CONTROL)
+void Connection::send(float dtime)
+{
+       for(core::map<u16, Peer*>::Iterator
+                       j = m_peers.getIterator();
+                       j.atEnd() == false; j++)
        {
-               if(packetdata.getSize() < 2)
-                       throw InvalidIncomingDataException("packetdata.getSize() < 2");
+               Peer *peer = j.getNode()->getValue();
+               peer->m_sendtime_accu += dtime;
+               peer->m_num_sent = 0;
+               peer->m_max_num_sent = peer->m_sendtime_accu *
+                               peer->m_max_packets_per_second;
+       }
+       Queue<OutgoingPacket> postponed_packets;
+       while(m_outgoing_queue.size() != 0){
+               OutgoingPacket packet = m_outgoing_queue.pop_front();
+               Peer *peer = getPeerNoEx(packet.peer_id);
+               if(!peer)
+                       continue;
+               if(peer->channels[packet.channelnum].outgoing_reliables.size() >= 5){
+                       postponed_packets.push_back(packet);
+               } else if(peer->m_num_sent < peer->m_max_num_sent){
+                       rawSendAsPacket(packet.peer_id, packet.channelnum,
+                                       packet.data, packet.reliable);
+                       peer->m_num_sent++;
+               } else {
+                       postponed_packets.push_back(packet);
+               }
+       }
+       while(postponed_packets.size() != 0){
+               m_outgoing_queue.push_back(postponed_packets.pop_front());
+       }
+       for(core::map<u16, Peer*>::Iterator
+                       j = m_peers.getIterator();
+                       j.atEnd() == false; j++)
+       {
+               Peer *peer = j.getNode()->getValue();
+               peer->m_sendtime_accu -= (float)peer->m_num_sent /
+                               peer->m_max_packets_per_second;
+               if(peer->m_sendtime_accu > 10. / peer->m_max_packets_per_second)
+                       peer->m_sendtime_accu = 10. / peer->m_max_packets_per_second;
+       }
+}
 
-               u8 controltype = readU8(&packetdata[1]);
+// Receive packets from the network and buffers and create ConnectionEvents
+void Connection::receive()
+{
+       u32 datasize = m_max_packet_size * 2;  // Double it just to be safe
+       // TODO: We can not know how many layers of header there are.
+       // For now, just assume there are no other than the base headers.
+       u32 packet_maxsize = datasize + BASE_HEADER_SIZE;
+       SharedBuffer<u8> packetdata(packet_maxsize);
 
-               if(controltype == CONTROLTYPE_ACK)
+       bool single_wait_done = false;
+       
+       for(;;)
+       {
+       try{
+               /* Check if some buffer has relevant data */
                {
-                       if(packetdata.getSize() < 4)
-                               throw InvalidIncomingDataException
-                                               ("packetdata.getSize() < 4 (ACK header size)");
-
-                       u16 seqnum = readU16(&packetdata[2]);
-                       con->PrintInfo();
-                       dout_con<<"Got CONTROLTYPE_ACK: channelnum="
-                                       <<((int)channelnum&0xff)<<", peer_id="<<peer_id
-                                       <<", seqnum="<<seqnum<<std::endl;
+                       u16 peer_id;
+                       SharedBuffer<u8> resultdata;
+                       bool got = getFromBuffers(peer_id, resultdata);
+                       if(got){
+                               ConnectionEvent e;
+                               e.dataReceived(peer_id, resultdata);
+                               putEvent(e);
+                               continue;
+                       }
+               }
+               
+               if(single_wait_done){
+                       if(m_socket.WaitData(0) == false)
+                               break;
+               }
+               
+               single_wait_done = true;
 
-                       try{
-                               BufferedPacket p = outgoing_reliables.popSeqnum(seqnum);
-                               // Get round trip time
-                               float rtt = p.totaltime;
+               Address sender;
+               s32 received_size = m_socket.Receive(sender, *packetdata, packet_maxsize);
 
-                               // Let peer calculate stuff according to it
-                               // (avg_rtt and resend_timeout)
-                               Peer *peer = con->GetPeer(peer_id);
-                               peer->reportRTT(rtt);
+               if(received_size < 0)
+                       break;
+               if(received_size < BASE_HEADER_SIZE)
+                       continue;
+               if(readU32(&packetdata[0]) != m_protocol_id)
+                       continue;
+               
+               u16 peer_id = readPeerId(*packetdata);
+               u8 channelnum = readChannel(*packetdata);
+               if(channelnum > CHANNEL_COUNT-1){
+                       PrintInfo(derr_con);
+                       derr_con<<"Receive(): Invalid channel "<<channelnum<<std::endl;
+                       throw InvalidIncomingDataException("Channel doesn't exist");
+               }
 
-                               //con->PrintInfo(dout_con);
-                               //dout_con<<"RTT = "<<rtt<<std::endl;
+               if(peer_id == PEER_ID_INEXISTENT)
+               {
+                       /*
+                               Somebody is trying to send stuff to us with no peer id.
+                               
+                               Check if the same address and port was added to our peer
+                               list before.
+                               Allow only entries that have has_sent_with_id==false.
+                       */
 
-                               /*dout_con<<"OUTGOING: ";
-                               con->PrintInfo();
-                               outgoing_reliables.print();
-                               dout_con<<std::endl;*/
+                       core::map<u16, Peer*>::Iterator j;
+                       j = m_peers.getIterator();
+                       for(; j.atEnd() == false; j++)
+                       {
+                               Peer *peer = j.getNode()->getValue();
+                               if(peer->has_sent_with_id)
+                                       continue;
+                               if(peer->address == sender)
+                                       break;
                        }
-                       catch(NotFoundException &e){
-                               con->PrintInfo(derr_con);
-                               derr_con<<"WARNING: ACKed packet not "
-                                               "in outgoing queue"
-                                               <<std::endl;
+                       
+                       /*
+                               If no peer was found with the same address and port,
+                               we shall assume it is a new peer and create an entry.
+                       */
+                       if(j.atEnd())
+                       {
+                               // Pass on to adding the peer
+                       }
+                       // Else: A peer was found.
+                       else
+                       {
+                               Peer *peer = j.getNode()->getValue();
+                               peer_id = peer->id;
+                               PrintInfo(derr_con);
+                               derr_con<<"WARNING: Assuming unknown peer to be "
+                                               <<"peer_id="<<peer_id<<std::endl;
                        }
-
-                       throw ProcessedSilentlyException("Got an ACK");
                }
-               else if(controltype == CONTROLTYPE_SET_PEER_ID)
+               
+               /*
+                       The peer was not found in our lists. Add it.
+               */
+               if(peer_id == PEER_ID_INEXISTENT)
                {
-                       if(packetdata.getSize() < 4)
-                               throw InvalidIncomingDataException
-                                               ("packetdata.getSize() < 4 (SET_PEER_ID header size)");
-                       u16 peer_id_new = readU16(&packetdata[2]);
-                       con->PrintInfo();
-                       dout_con<<"Got new peer id: "<<peer_id_new<<"... "<<std::endl;
+                       // Somebody wants to make a new connection
 
-                       if(con->GetPeerID() != PEER_ID_NEW)
+                       // Get a unique peer id (2 or higher)
+                       u16 peer_id_new = 2;
+                       /*
+                               Find an unused peer id
+                       */
+                       bool out_of_ids = false;
+                       for(;;)
                        {
-                               con->PrintInfo(derr_con);
-                               derr_con<<"WARNING: Not changing"
-                                               " existing peer id."<<std::endl;
+                               // Check if exists
+                               if(m_peers.find(peer_id_new) == NULL)
+                                       break;
+                               // Check for overflow
+                               if(peer_id_new == 65535){
+                                       out_of_ids = true;
+                                       break;
+                               }
+                               peer_id_new++;
                        }
-                       else
-                       {
-                               dout_con<<"changing."<<std::endl;
-                               con->SetPeerID(peer_id_new);
+                       if(out_of_ids){
+                               errorstream<<getDesc()<<" ran out of peer ids"<<std::endl;
+                               continue;
                        }
-                       throw ProcessedSilentlyException("Got a SET_PEER_ID");
+
+                       PrintInfo();
+                       dout_con<<"Receive(): Got a packet with peer_id=PEER_ID_INEXISTENT,"
+                                       " giving peer_id="<<peer_id_new<<std::endl;
+
+                       // Create a peer
+                       Peer *peer = new Peer(peer_id_new, sender);
+                       m_peers.insert(peer->id, peer);
+                       
+                       // Create peer addition event
+                       ConnectionEvent e;
+                       e.peerAdded(peer_id_new, sender);
+                       putEvent(e);
+                       
+                       // Create CONTROL packet to tell the peer id to the new peer.
+                       SharedBuffer<u8> reply(4);
+                       writeU8(&reply[0], TYPE_CONTROL);
+                       writeU8(&reply[1], CONTROLTYPE_SET_PEER_ID);
+                       writeU16(&reply[2], peer_id_new);
+                       sendAsPacket(peer_id_new, 0, reply, true);
+                       
+                       // We're now talking to a valid peer_id
+                       peer_id = peer_id_new;
+
+                       // Go on and process whatever it sent
                }
-               else if(controltype == CONTROLTYPE_PING)
+
+               core::map<u16, Peer*>::Node *node = m_peers.find(peer_id);
+
+               if(node == NULL)
                {
-                       // Just ignore it, the incoming data already reset
-                       // the timeout counter
-                       con->PrintInfo();
-                       dout_con<<"PING"<<std::endl;
-                       throw ProcessedSilentlyException("Got a SET_PEER_ID");
+                       // Peer not found
+                       // This means that the peer id of the sender is not PEER_ID_INEXISTENT
+                       // and it is invalid.
+                       PrintInfo(derr_con);
+                       derr_con<<"Receive(): Peer not found"<<std::endl;
+                       throw InvalidIncomingDataException("Peer not found (possible timeout)");
                }
-               else{
-                       con->PrintInfo(derr_con);
-                       derr_con<<"INVALID TYPE_CONTROL: invalid controltype="
-                                       <<((int)controltype&0xff)<<std::endl;
-                       throw InvalidIncomingDataException("Invalid control type");
+
+               Peer *peer = node->getValue();
+
+               // Validate peer address
+               if(peer->address != sender)
+               {
+                       PrintInfo(derr_con);
+                       derr_con<<"Peer "<<peer_id<<" sending from different address."
+                                       " Ignoring."<<std::endl;
+                       continue;
                }
-       }
-       else if(type == TYPE_ORIGINAL)
-       {
-               if(packetdata.getSize() < ORIGINAL_HEADER_SIZE)
-                       throw InvalidIncomingDataException
-                                       ("packetdata.getSize() < ORIGINAL_HEADER_SIZE");
-               con->PrintInfo();
-               dout_con<<"RETURNING TYPE_ORIGINAL to user"
-                               <<std::endl;
+               
+               peer->timeout_counter = 0.0;
+
+               Channel *channel = &(peer->channels[channelnum]);
+               
+               // 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);
+                       
+                       PrintInfo();
+                       dout_con<<"ProcessPacket returned data of size "
+                                       <<resultdata.getSize()<<std::endl;
+                       
+                       ConnectionEvent e;
+                       e.dataReceived(peer_id, resultdata);
+                       putEvent(e);
+                       continue;
+               }catch(ProcessedSilentlyException &e){
+               }
+       }catch(InvalidIncomingDataException &e){
+       }
+       catch(ProcessedSilentlyException &e){
+       }
+       } // for
+}
+
+void Connection::runTimeouts(float dtime)
+{
+       core::list<u16> timeouted_peers;
+       core::map<u16, Peer*>::Iterator j;
+       j = m_peers.getIterator();
+       for(; j.atEnd() == false; j++)
+       {
+               Peer *peer = j.getNode()->getValue();
+               
+               /*
+                       Check peer timeout
+               */
+               peer->timeout_counter += dtime;
+               if(peer->timeout_counter > m_timeout)
+               {
+                       PrintInfo(derr_con);
+                       derr_con<<"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 = peer->resend_timeout;
+               for(u16 i=0; i<CHANNEL_COUNT; i++)
+               {
+                       core::list<BufferedPacket> timed_outs;
+                       core::list<BufferedPacket>::Iterator j;
+                       
+                       Channel *channel = &peer->channels[i];
+
+                       // Remove timed out incomplete unreliable split packets
+                       channel->incoming_splits.removeUnreliableTimedOuts(dtime, m_timeout);
+                       
+                       // Increment reliable packet times
+                       channel->outgoing_reliables.incrementTimeouts(dtime);
+
+                       // Check reliable packet total times, remove peer if
+                       // over timeout.
+                       if(channel->outgoing_reliables.anyTotaltimeReached(m_timeout))
+                       {
+                               PrintInfo(derr_con);
+                               derr_con<<"RunTimeouts(): Peer "<<peer->id
+                                               <<" has timed out."
+                                               <<" (source=reliable packet totaltime)"
+                                               <<std::endl;
+                               // Add peer to the to-be-removed list
+                               timeouted_peers.push_back(peer->id);
+                               goto nextpeer;
+                       }
+
+                       // Re-send timed out outgoing reliables
+                       
+                       timed_outs = channel->
+                                       outgoing_reliables.getTimedOuts(resend_timeout);
+
+                       channel->outgoing_reliables.resetTimedOuts(resend_timeout);
+
+                       j = timed_outs.begin();
+                       for(; j != timed_outs.end(); j++)
+                       {
+                               u16 peer_id = readPeerId(*(j->data));
+                               u8 channel = readChannel(*(j->data));
+                               u16 seqnum = readU16(&(j->data[BASE_HEADER_SIZE+1]));
+
+                               PrintInfo(derr_con);
+                               derr_con<<"RE-SENDING timed-out RELIABLE to ";
+                               j->address.print(&derr_con);
+                               derr_con<<"(t/o="<<resend_timeout<<"): "
+                                               <<"from_peer_id="<<peer_id
+                                               <<", channel="<<((int)channel&0xff)
+                                               <<", seqnum="<<seqnum
+                                               <<std::endl;
+
+                               rawSend(*j);
+
+                               // Enlarge avg_rtt and resend_timeout:
+                               // The rtt will be at least the timeout.
+                               // NOTE: This won't affect the timeout of the next
+                               // checked channel because it was cached.
+                               peer->reportRTT(resend_timeout);
+                       }
+               }
+               
+               /*
+                       Send pings
+               */
+               peer->ping_timer += dtime;
+               if(peer->ping_timer >= 5.0)
+               {
+                       // Create and send PING packet
+                       SharedBuffer<u8> data(2);
+                       writeU8(&data[0], TYPE_CONTROL);
+                       writeU8(&data[1], CONTROLTYPE_PING);
+                       rawSendAsPacket(peer->id, 0, data, true);
+
+                       peer->ping_timer = 0.0;
+               }
+               
+nextpeer:
+               continue;
+       }
+
+       // Remove timed out peers
+       core::list<u16>::Iterator i = timeouted_peers.begin();
+       for(; i != timeouted_peers.end(); i++)
+       {
+               PrintInfo(derr_con);
+               derr_con<<"RunTimeouts(): Removing peer "<<(*i)<<std::endl;
+               deletePeer(*i, true);
+       }
+}
+
+void Connection::serve(u16 port)
+{
+       dout_con<<getDesc()<<" serving at port "<<port<<std::endl;
+       try{
+               m_socket.Bind(port);
+               m_peer_id = PEER_ID_SERVER;
+       }
+       catch(SocketException &e){
+               // Create event
+               ConnectionEvent e;
+               e.bindFailed();
+               putEvent(e);
+       }
+}
+
+void Connection::connect(Address address)
+{
+       dout_con<<getDesc()<<" connecting to "<<address.serializeString()
+                       <<":"<<address.getPort()<<std::endl;
+
+       core::map<u16, Peer*>::Node *node = m_peers.find(PEER_ID_SERVER);
+       if(node != NULL){
+               throw ConnectionException("Already connected to a server");
+       }
+
+       Peer *peer = new Peer(PEER_ID_SERVER, address);
+       m_peers.insert(peer->id, peer);
+
+       // Create event
+       ConnectionEvent e;
+       e.peerAdded(peer->id, peer->address);
+       putEvent(e);
+       
+       m_socket.Bind(0);
+       
+       // Send a dummy packet to server with peer_id = PEER_ID_INEXISTENT
+       m_peer_id = PEER_ID_INEXISTENT;
+       SharedBuffer<u8> data(0);
+       Send(PEER_ID_SERVER, 0, data, true);
+}
+
+void Connection::disconnect()
+{
+       dout_con<<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
+       core::map<u16, Peer*>::Iterator j;
+       j = m_peers.getIterator();
+       for(; j.atEnd() == false; j++)
+       {
+               Peer *peer = j.getNode()->getValue();
+               rawSendAsPacket(peer->id, 0, data, false);
+       }
+}
+
+void Connection::sendToAll(u8 channelnum, SharedBuffer<u8> data, bool reliable)
+{
+       core::map<u16, Peer*>::Iterator j;
+       j = m_peers.getIterator();
+       for(; j.atEnd() == false; j++)
+       {
+               Peer *peer = j.getNode()->getValue();
+               send(peer->id, channelnum, data, reliable);
+       }
+}
+
+void Connection::send(u16 peer_id, u8 channelnum,
+               SharedBuffer<u8> data, bool reliable)
+{
+       dout_con<<getDesc()<<" sending to peer_id="<<peer_id<<std::endl;
+
+       assert(channelnum < CHANNEL_COUNT);
+       
+       Peer *peer = getPeerNoEx(peer_id);
+       if(peer == NULL)
+               return;
+       Channel *channel = &(peer->channels[channelnum]);
+
+       u32 chunksize_max = m_max_packet_size - BASE_HEADER_SIZE;
+       if(reliable)
+               chunksize_max -= RELIABLE_HEADER_SIZE;
+
+       core::list<SharedBuffer<u8> > originals;
+       originals = makeAutoSplitPacket(data, chunksize_max,
+                       channel->next_outgoing_split_seqnum);
+       
+       core::list<SharedBuffer<u8> >::Iterator i;
+       i = originals.begin();
+       for(; i != originals.end(); i++)
+       {
+               SharedBuffer<u8> original = *i;
+               
+               sendAsPacket(peer_id, channelnum, original, reliable);
+       }
+}
+
+void Connection::sendAsPacket(u16 peer_id, u8 channelnum,
+               SharedBuffer<u8> data, bool reliable)
+{
+       OutgoingPacket packet(peer_id, channelnum, data, reliable);
+       m_outgoing_queue.push_back(packet);
+}
+
+void Connection::rawSendAsPacket(u16 peer_id, u8 channelnum,
+               SharedBuffer<u8> data, bool reliable)
+{
+       Peer *peer = getPeerNoEx(peer_id);
+       if(!peer)
+               return;
+       Channel *channel = &(peer->channels[channelnum]);
+
+       if(reliable)
+       {
+               u16 seqnum = channel->next_outgoing_seqnum;
+               channel->next_outgoing_seqnum++;
+
+               SharedBuffer<u8> reliable = makeReliablePacket(data, seqnum);
+
+               // Add base headers and make a packet
+               BufferedPacket p = makePacket(peer->address, reliable,
+                               m_protocol_id, m_peer_id, channelnum);
+               
+               try{
+                       // Buffer the packet
+                       channel->outgoing_reliables.insert(p);
+               }
+               catch(AlreadyExistsException &e)
+               {
+                       PrintInfo(derr_con);
+                       derr_con<<"WARNING: Going to send a reliable packet "
+                                       "seqnum="<<seqnum<<" that is already "
+                                       "in outgoing buffer"<<std::endl;
+                       //assert(0);
+               }
+               
+               // Send the packet
+               rawSend(p);
+       }
+       else
+       {
+               // Add base headers and make a packet
+               BufferedPacket p = makePacket(peer->address, data,
+                               m_protocol_id, m_peer_id, channelnum);
+
+               // Send the packet
+               rawSend(p);
+       }
+}
+
+void Connection::rawSend(const BufferedPacket &packet)
+{
+       try{
+               m_socket.Send(packet.address, *packet.data, packet.data.getSize());
+       } catch(SendFailedException &e){
+               derr_con<<"Connection::rawSend(): SendFailedException: "
+                               <<packet.address.serializeString()<<std::endl;
+       }
+}
+
+Peer* Connection::getPeer(u16 peer_id)
+{
+       core::map<u16, Peer*>::Node *node = m_peers.find(peer_id);
+
+       if(node == NULL){
+               throw PeerNotFoundException("GetPeer: Peer not found (possible timeout)");
+       }
+
+       // Error checking
+       assert(node->getValue()->id == peer_id);
+
+       return node->getValue();
+}
+
+Peer* Connection::getPeerNoEx(u16 peer_id)
+{
+       core::map<u16, Peer*>::Node *node = m_peers.find(peer_id);
+
+       if(node == NULL){
+               return NULL;
+       }
+
+       // Error checking
+       assert(node->getValue()->id == peer_id);
+
+       return node->getValue();
+}
+
+core::list<Peer*> Connection::getPeers()
+{
+       core::list<Peer*> list;
+       core::map<u16, Peer*>::Iterator j;
+       j = m_peers.getIterator();
+       for(; j.atEnd() == false; j++)
+       {
+               Peer *peer = j.getNode()->getValue();
+               list.push_back(peer);
+       }
+       return list;
+}
+
+bool Connection::getFromBuffers(u16 &peer_id, SharedBuffer<u8> &dst)
+{
+       core::map<u16, Peer*>::Iterator j;
+       j = m_peers.getIterator();
+       for(; j.atEnd() == false; j++)
+       {
+               Peer *peer = j.getNode()->getValue();
+               for(u16 i=0; i<CHANNEL_COUNT; i++)
+               {
+                       Channel *channel = &peer->channels[i];
+                       SharedBuffer<u8> resultdata;
+                       bool got = checkIncomingBuffers(channel, peer_id, resultdata);
+                       if(got){
+                               dst = resultdata;
+                               return true;
+                       }
+               }
+       }
+       return false;
+}
+
+bool Connection::checkIncomingBuffers(Channel *channel, u16 &peer_id,
+               SharedBuffer<u8> &dst)
+{
+       u16 firstseqnum = 0;
+       // Clear old packets from start of buffer
+       try{
+       for(;;){
+               firstseqnum = channel->incoming_reliables.getFirstSeqnum();
+               if(seqnum_higher(channel->next_incoming_seqnum, firstseqnum))
+                       channel->incoming_reliables.popFirst();
+               else
+                       break;
+       }
+       // This happens if all packets are old
+       }catch(con::NotFoundException)
+       {}
+       
+       if(channel->incoming_reliables.empty() == false)
+       {
+               if(firstseqnum == channel->next_incoming_seqnum)
+               {
+                       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]);
+
+                       PrintInfo();
+                       dout_con<<"UNBUFFERING TYPE_RELIABLE"
+                                       <<" seqnum="<<seqnum
+                                       <<" peer_id="<<peer_id
+                                       <<" channel="<<((int)channelnum&0xff)
+                                       <<std::endl;
+
+                       channel->next_incoming_seqnum++;
+                       
+                       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> Connection::processPacket(Channel *channel,
+               SharedBuffer<u8> packetdata, u16 peer_id,
+               u8 channelnum, bool reliable)
+{
+       IndentationRaiser iraiser(&(m_indentation));
+
+       if(packetdata.getSize() < 1)
+               throw InvalidIncomingDataException("packetdata.getSize() < 1");
+
+       u8 type = readU8(&packetdata[0]);
+       
+       if(type == TYPE_CONTROL)
+       {
+               if(packetdata.getSize() < 2)
+                       throw InvalidIncomingDataException("packetdata.getSize() < 2");
+
+               u8 controltype = readU8(&packetdata[1]);
+
+               if(controltype == CONTROLTYPE_ACK)
+               {
+                       if(packetdata.getSize() < 4)
+                               throw InvalidIncomingDataException
+                                               ("packetdata.getSize() < 4 (ACK header size)");
+
+                       u16 seqnum = readU16(&packetdata[2]);
+                       PrintInfo();
+                       dout_con<<"Got CONTROLTYPE_ACK: channelnum="
+                                       <<((int)channelnum&0xff)<<", peer_id="<<peer_id
+                                       <<", seqnum="<<seqnum<<std::endl;
+
+                       try{
+                               BufferedPacket p = channel->outgoing_reliables.popSeqnum(seqnum);
+                               // Get round trip time
+                               float rtt = p.totaltime;
+
+                               // Let peer calculate stuff according to it
+                               // (avg_rtt and resend_timeout)
+                               Peer *peer = getPeer(peer_id);
+                               peer->reportRTT(rtt);
+
+                               //PrintInfo(dout_con);
+                               //dout_con<<"RTT = "<<rtt<<std::endl;
+
+                               /*dout_con<<"OUTGOING: ";
+                               PrintInfo();
+                               channel->outgoing_reliables.print();
+                               dout_con<<std::endl;*/
+                       }
+                       catch(NotFoundException &e){
+                               PrintInfo(derr_con);
+                               derr_con<<"WARNING: ACKed packet not "
+                                               "in outgoing queue"
+                                               <<std::endl;
+                       }
+
+                       throw ProcessedSilentlyException("Got an ACK");
+               }
+               else if(controltype == CONTROLTYPE_SET_PEER_ID)
+               {
+                       if(packetdata.getSize() < 4)
+                               throw InvalidIncomingDataException
+                                               ("packetdata.getSize() < 4 (SET_PEER_ID header size)");
+                       u16 peer_id_new = readU16(&packetdata[2]);
+                       PrintInfo();
+                       dout_con<<"Got new peer id: "<<peer_id_new<<"... "<<std::endl;
+
+                       if(GetPeerID() != PEER_ID_INEXISTENT)
+                       {
+                               PrintInfo(derr_con);
+                               derr_con<<"WARNING: Not changing"
+                                               " existing peer id."<<std::endl;
+                       }
+                       else
+                       {
+                               dout_con<<"changing."<<std::endl;
+                               SetPeerID(peer_id_new);
+                       }
+                       throw ProcessedSilentlyException("Got a SET_PEER_ID");
+               }
+               else if(controltype == CONTROLTYPE_PING)
+               {
+                       // Just ignore it, the incoming data already reset
+                       // the timeout counter
+                       PrintInfo();
+                       dout_con<<"PING"<<std::endl;
+                       throw ProcessedSilentlyException("Got a PING");
+               }
+               else if(controltype == CONTROLTYPE_DISCO)
+               {
+                       // Just ignore it, the incoming data already reset
+                       // the timeout counter
+                       PrintInfo();
+                       dout_con<<"DISCO: Removing peer "<<(peer_id)<<std::endl;
+                       
+                       if(deletePeer(peer_id, false) == false)
+                       {
+                               PrintInfo(derr_con);
+                               derr_con<<"DISCO: Peer not found"<<std::endl;
+                       }
+
+                       throw ProcessedSilentlyException("Got a DISCO");
+               }
+               else{
+                       PrintInfo(derr_con);
+                       derr_con<<"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");
+               PrintInfo();
+               dout_con<<"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());
@@ -652,26 +1384,22 @@ SharedBuffer<u8> Channel::ProcessPacket(
                // We have to create a packet again for buffering
                // This isn't actually too bad an idea.
                BufferedPacket packet = makePacket(
-                               con->GetPeer(peer_id)->address,
+                               getPeer(peer_id)->address,
                                packetdata,
-                               con->GetProtocolID(),
+                               GetProtocolID(),
                                peer_id,
                                channelnum);
-               try{
-                       // Buffer the packet
-                       incoming_splits.insert(packet, reliable);
-               }
-               // This exception happens when all the pieces of a packet
-               // are collected.
-               catch(GotSplitPacketException &e)
+               // Buffer the packet
+               SharedBuffer<u8> data = channel->incoming_splits.insert(packet, reliable);
+               if(data.getSize() != 0)
                {
-                       con->PrintInfo();
+                       PrintInfo();
                        dout_con<<"RETURNING TYPE_SPLIT: Constructed full data, "
-                                       <<"size="<<e.getData().getSize()<<std::endl;
-                       return e.getData();
+                                       <<"size="<<data.getSize()<<std::endl;
+                       return data;
                }
-               con->PrintInfo();
-               dout_con<<"BUFFERING TYPE_SPLIT"<<std::endl;
+               PrintInfo();
+               dout_con<<"BUFFERED TYPE_SPLIT"<<std::endl;
                throw ProcessedSilentlyException("Buffered a split packet chunk");
        }
        else if(type == TYPE_RELIABLE)
@@ -685,10 +1413,10 @@ SharedBuffer<u8> Channel::ProcessPacket(
 
                u16 seqnum = readU16(&packetdata[1]);
 
-               bool is_future_packet = seqnum_higher(seqnum, next_incoming_seqnum);
-               bool is_old_packet = seqnum_higher(next_incoming_seqnum, seqnum);
+               bool is_future_packet = seqnum_higher(seqnum, channel->next_incoming_seqnum);
+               bool is_old_packet = seqnum_higher(channel->next_incoming_seqnum, seqnum);
                
-               con->PrintInfo();
+               PrintInfo();
                if(is_future_packet)
                        dout_con<<"BUFFERING";
                else if(is_old_packet)
@@ -696,25 +1424,25 @@ SharedBuffer<u8> Channel::ProcessPacket(
                else
                        dout_con<<"RECUR";
                dout_con<<" TYPE_RELIABLE seqnum="<<seqnum
-                               <<" next="<<next_incoming_seqnum;
+                               <<" next="<<channel->next_incoming_seqnum;
                dout_con<<" [sending CONTROLTYPE_ACK"
                                " to peer_id="<<peer_id<<"]";
                dout_con<<std::endl;
                
                //DEBUG
-               //assert(incoming_reliables.size() < 100);
+               //assert(channel->incoming_reliables.size() < 100);
 
                // Send a CONTROLTYPE_ACK
                SharedBuffer<u8> reply(4);
                writeU8(&reply[0], TYPE_CONTROL);
                writeU8(&reply[1], CONTROLTYPE_ACK);
                writeU16(&reply[2], seqnum);
-               con->SendAsPacket(peer_id, channelnum, reply, false);
+               rawSendAsPacket(peer_id, channelnum, reply, false);
 
-               //if(seqnum_higher(seqnum, next_incoming_seqnum))
+               //if(seqnum_higher(seqnum, channel->next_incoming_seqnum))
                if(is_future_packet)
                {
-                       /*con->PrintInfo();
+                       /*PrintInfo();
                        dout_con<<"Buffering reliable packet (seqnum="
                                        <<seqnum<<")"<<std::endl;*/
                        
@@ -722,594 +1450,215 @@ SharedBuffer<u8> Channel::ProcessPacket(
                        // Actually we have to make a packet to buffer one.
                        // Well, we have all the ingredients, so just do it.
                        BufferedPacket packet = makePacket(
-                                       con->GetPeer(peer_id)->address,
+                                       getPeer(peer_id)->address,
                                        packetdata,
-                                       con->GetProtocolID(),
+                                       GetProtocolID(),
                                        peer_id,
                                        channelnum);
                        try{
-                               incoming_reliables.insert(packet);
+                               channel->incoming_reliables.insert(packet);
                                
-                               /*con->PrintInfo();
+                               /*PrintInfo();
                                dout_con<<"INCOMING: ";
-                               incoming_reliables.print();
+                               channel->incoming_reliables.print();
                                dout_con<<std::endl;*/
                        }
                        catch(AlreadyExistsException &e)
-                       {
-                       }
-
-                       throw ProcessedSilentlyException("Buffered future reliable packet");
-               }
-               //else if(seqnum_higher(next_incoming_seqnum, seqnum))
-               else if(is_old_packet)
-               {
-                       // An old packet, dump it
-                       throw InvalidIncomingDataException("Got an old reliable packet");
-               }
-
-               next_incoming_seqnum++;
-
-               // 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(payload, con, peer_id, channelnum, true);
-       }
-       else
-       {
-               con->PrintInfo(derr_con);
-               derr_con<<"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()");
-}
-
-SharedBuffer<u8> Channel::CheckIncomingBuffers(Connection *con,
-               u16 &peer_id)
-{
-       u16 firstseqnum = 0;
-       // Clear old packets from start of buffer
-       try{
-       for(;;){
-               firstseqnum = incoming_reliables.getFirstSeqnum();
-               if(seqnum_higher(next_incoming_seqnum, firstseqnum))
-                       incoming_reliables.popFirst();
-               else
-                       break;
-       }
-       // This happens if all packets are old
-       }catch(con::NotFoundException)
-       {}
-       
-       if(incoming_reliables.empty() == false)
-       {
-               if(firstseqnum == next_incoming_seqnum)
-               {
-                       BufferedPacket p = incoming_reliables.popFirst();
-                       
-                       peer_id = readPeerId(*p.data);
-                       u8 channelnum = readChannel(*p.data);
-                       u16 seqnum = readU16(&p.data[BASE_HEADER_SIZE+1]);
-
-                       con->PrintInfo();
-                       dout_con<<"UNBUFFERING TYPE_RELIABLE"
-                                       <<" seqnum="<<seqnum
-                                       <<" peer_id="<<peer_id
-                                       <<" channel="<<((int)channelnum&0xff)
-                                       <<std::endl;
-
-                       next_incoming_seqnum++;
-                       
-                       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());
-
-                       return ProcessPacket(payload, con, peer_id, channelnum, true);
-               }
-       }
-               
-       throw NoIncomingDataException("No relevant data in buffers");
-}
-
-SharedBuffer<u8> Connection::GetFromBuffers(u16 &peer_id)
-{
-       core::map<u16, Peer*>::Iterator j;
-       j = m_peers.getIterator();
-       for(; j.atEnd() == false; j++)
-       {
-               Peer *peer = j.getNode()->getValue();
-               for(u16 i=0; i<CHANNEL_COUNT; i++)
-               {
-                       Channel *channel = &peer->channels[i];
-                       try{
-                               SharedBuffer<u8> resultdata = channel->CheckIncomingBuffers
-                                               (this, peer_id);
-
-                               return resultdata;
-                       }
-                       catch(NoIncomingDataException &e)
-                       {
-                       }
-                       catch(InvalidIncomingDataException &e)
-                       {
-                       }
-                       catch(ProcessedSilentlyException &e)
-                       {
-                       }
-               }
-       }
-       throw NoIncomingDataException("No relevant data in buffers");
-}
-
-u32 Connection::Receive(u16 &peer_id, u8 *data, u32 datasize)
-{
-       /*
-               Receive a packet from the network
-       */
-       
-       // TODO: We can not know how many layers of header there are.
-       // For now, just assume there are no other than the base headers.
-       u32 packet_maxsize = datasize + BASE_HEADER_SIZE;
-       Buffer<u8> packetdata(packet_maxsize);
-       
-       for(;;)
-       {
-       try
-       {
-               /*
-                       Check if some buffer has relevant data
-               */
-               try{
-                       SharedBuffer<u8> resultdata = GetFromBuffers(peer_id);
-
-                       if(datasize < resultdata.getSize())
-                               throw InvalidIncomingDataException
-                                               ("Buffer too small for received data");
-                               
-                       memcpy(data, *resultdata, resultdata.getSize());
-                       return resultdata.getSize();
-               }
-               catch(NoIncomingDataException &e)
-               {
-               }
-       
-               Address sender;
-
-               s32 received_size = m_socket.Receive(sender, *packetdata, packet_maxsize);
-
-               if(received_size < 0)
-                       throw NoIncomingDataException("No incoming data");
-               if(received_size < BASE_HEADER_SIZE)
-                       throw InvalidIncomingDataException("No full header received");
-               if(readU32(&packetdata[0]) != m_protocol_id)
-                       throw InvalidIncomingDataException("Invalid protocol id");
-               
-               peer_id = readPeerId(*packetdata);
-               u8 channelnum = readChannel(*packetdata);
-               if(channelnum > CHANNEL_COUNT-1){
-                       PrintInfo(derr_con);
-                       derr_con<<"Receive(): Invalid channel "<<channelnum<<std::endl;
-                       throw InvalidIncomingDataException("Channel doesn't exist");
-               }
-
-               if(peer_id == PEER_ID_NEW)
-               {
-                       /*
-                               Somebody is trying to send stuff to us with no peer id.
-                               
-                               Check if the same address and port was added to our peer
-                               list before.
-                               Allow only entries that have has_sent_with_id==false.
-                       */
-
-                       core::map<u16, Peer*>::Iterator j;
-                       j = m_peers.getIterator();
-                       for(; j.atEnd() == false; j++)
-                       {
-                               Peer *peer = j.getNode()->getValue();
-                               if(peer->has_sent_with_id)
-                                       continue;
-                               if(peer->address == sender)
-                                       break;
-                       }
-                       
-                       /*
-                               If no peer was found with the same address and port,
-                               we shall assume it is a new peer and create an entry.
-                       */
-                       if(j.atEnd())
-                       {
-                               // Pass on to adding the peer
-                       }
-                       // Else: A peer was found.
-                       else
-                       {
-                               Peer *peer = j.getNode()->getValue();
-                               peer_id = peer->id;
-                               PrintInfo(derr_con);
-                               derr_con<<"WARNING: Assuming unknown peer to be "
-                                               <<"peer_id="<<peer_id<<std::endl;
-                       }
-               }
-               
-               /*
-                       The peer was not found in our lists. Add it.
-               */
-               if(peer_id == PEER_ID_NEW)
-               {
-                       // Somebody wants to make a new connection
-
-                       // Get a unique peer id (2 or higher)
-                       u16 peer_id_new = 2;
-                       /*
-                               Find an unused peer id
-                       */
-                       for(;;)
-                       {
-                               // Check if exists
-                               if(m_peers.find(peer_id_new) == NULL)
-                                       break;
-                               // Check for overflow
-                               if(peer_id_new == 65535)
-                                       throw ConnectionException
-                                               ("Connection ran out of peer ids");
-                               peer_id_new++;
-                       }
-
-                       PrintInfo();
-                       dout_con<<"Receive(): Got a packet with peer_id=PEER_ID_NEW,"
-                                       " giving peer_id="<<peer_id_new<<std::endl;
-
-                       // Create a peer
-                       Peer *peer = new Peer(peer_id_new, sender);
-                       m_peers.insert(peer->id, peer);
-                       m_peerhandler->peerAdded(peer);
-                       
-                       // Create CONTROL packet to tell the peer id to the new peer.
-                       SharedBuffer<u8> reply(4);
-                       writeU8(&reply[0], TYPE_CONTROL);
-                       writeU8(&reply[1], CONTROLTYPE_SET_PEER_ID);
-                       writeU16(&reply[2], peer_id_new);
-                       SendAsPacket(peer_id_new, 0, reply, true);
-                       
-                       // We're now talking to a valid peer_id
-                       peer_id = peer_id_new;
-
-                       // Go on and process whatever it sent
-               }
-
-               core::map<u16, Peer*>::Node *node = m_peers.find(peer_id);
-
-               if(node == NULL)
-               {
-                       // Peer not found
-                       // This means that the peer id of the sender is not PEER_ID_NEW
-                       // and it is invalid.
-                       PrintInfo(derr_con);
-                       derr_con<<"Receive(): Peer not found"<<std::endl;
-                       throw InvalidIncomingDataException("Peer not found (possible timeout)");
-               }
-
-               Peer *peer = node->getValue();
-
-               // Validate peer address
-               if(peer->address != sender)
-               {
-                       PrintInfo(derr_con);
-                       derr_con<<"Peer "<<peer_id<<" sending from different address."
-                                       " Ignoring."<<std::endl;
-                       throw InvalidIncomingDataException
-                                       ("Peer sending from different address");
-                       /*// If there is more data, receive again
-                       if(m_socket.WaitData(0) == true)
-                               continue;
-                       throw NoIncomingDataException("No incoming data (2)");*/
-               }
-               
-               peer->timeout_counter = 0.0;
-
-               Channel *channel = &(peer->channels[channelnum]);
-               
-               // 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 = channel->ProcessPacket
-                                       (strippeddata, this, peer_id, channelnum);
-                       
-                       PrintInfo();
-                       dout_con<<"ProcessPacket returned data of size "
-                                       <<resultdata.getSize()<<std::endl;
-                       
-                       if(datasize < resultdata.getSize())
-                               throw InvalidIncomingDataException
-                                               ("Buffer too small for received data");
-                       
-                       memcpy(data, *resultdata, resultdata.getSize());
-                       return resultdata.getSize();
+                       {
+                       }
+
+                       throw ProcessedSilentlyException("Buffered future reliable packet");
                }
-               catch(ProcessedSilentlyException &e)
+               //else if(seqnum_higher(channel->next_incoming_seqnum, seqnum))
+               else if(is_old_packet)
                {
-                       // If there is more data, receive again
-                       if(m_socket.WaitData(0) == true)
-                               continue;
+                       // An old packet, dump it
+                       throw InvalidIncomingDataException("Got an old reliable packet");
                }
-               throw NoIncomingDataException("No incoming data (2)");
-       } // try
-       catch(InvalidIncomingDataException &e)
-       {
-               // If there is more data, receive again
-               if(m_socket.WaitData(0) == true)
-                       continue;
-       }
-       } // for
-}
 
-void Connection::SendToAll(u8 channelnum, SharedBuffer<u8> data, bool reliable)
-{
-       core::map<u16, Peer*>::Iterator j;
-       j = m_peers.getIterator();
-       for(; j.atEnd() == false; j++)
+               channel->next_incoming_seqnum++;
+
+               // 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
        {
-               Peer *peer = j.getNode()->getValue();
-               Send(peer->id, channelnum, data, reliable);
+               PrintInfo(derr_con);
+               derr_con<<"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()");
 }
 
-void Connection::Send(u16 peer_id, u8 channelnum,
-               SharedBuffer<u8> data, bool reliable)
+bool Connection::deletePeer(u16 peer_id, bool timeout)
 {
-       assert(channelnum < CHANNEL_COUNT);
+       if(m_peers.find(peer_id) == NULL)
+               return false;
        
-       Peer *peer = GetPeer(peer_id);
-       Channel *channel = &(peer->channels[channelnum]);
+       Peer *peer = m_peers[peer_id];
 
-       u32 chunksize_max = m_max_packet_size - BASE_HEADER_SIZE;
-       if(reliable)
-               chunksize_max -= RELIABLE_HEADER_SIZE;
+       // Create event
+       ConnectionEvent e;
+       e.peerRemoved(peer_id, timeout, peer->address);
+       putEvent(e);
 
-       core::list<SharedBuffer<u8> > originals;
-       originals = makeAutoSplitPacket(data, chunksize_max,
-                       channel->next_outgoing_split_seqnum);
-       
-       core::list<SharedBuffer<u8> >::Iterator i;
-       i = originals.begin();
-       for(; i != originals.end(); i++)
-       {
-               SharedBuffer<u8> original = *i;
-               
-               SendAsPacket(peer_id, channelnum, original, reliable);
-       }
+       delete m_peers[peer_id];
+       m_peers.remove(peer_id);
+       return true;
 }
 
-void Connection::SendAsPacket(u16 peer_id, u8 channelnum,
-               SharedBuffer<u8> data, bool reliable)
-{
-       Peer *peer = GetPeer(peer_id);
-       Channel *channel = &(peer->channels[channelnum]);
-
-       if(reliable)
-       {
-               u16 seqnum = channel->next_outgoing_seqnum;
-               channel->next_outgoing_seqnum++;
-
-               SharedBuffer<u8> reliable = makeReliablePacket(data, seqnum);
+/* Interface */
 
-               // Add base headers and make a packet
-               BufferedPacket p = makePacket(peer->address, reliable,
-                               m_protocol_id, m_peer_id, channelnum);
-               
-               try{
-                       // Buffer the packet
-                       channel->outgoing_reliables.insert(p);
-               }
-               catch(AlreadyExistsException &e)
-               {
-                       PrintInfo(derr_con);
-                       derr_con<<"WARNING: Going to send a reliable packet "
-                                       "seqnum="<<seqnum<<" that is already "
-                                       "in outgoing buffer"<<std::endl;
-                       //assert(0);
-               }
-               
-               // Send the packet
-               RawSend(p);
+ConnectionEvent Connection::getEvent()
+{
+       if(m_event_queue.size() == 0){
+               ConnectionEvent e;
+               e.type = CONNEVENT_NONE;
+               return e;
        }
-       else
-       {
-               // Add base headers and make a packet
-               BufferedPacket p = makePacket(peer->address, data,
-                               m_protocol_id, m_peer_id, channelnum);
+       return m_event_queue.pop_front();
+}
 
-               // Send the packet
-               RawSend(p);
+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::RawSend(const BufferedPacket &packet)
+void Connection::putCommand(ConnectionCommand &c)
 {
-       m_socket.Send(packet.address, *packet.data, packet.data.getSize());
+       m_command_queue.push_back(c);
 }
 
-void Connection::RunTimeouts(float dtime)
+void Connection::Serve(unsigned short port)
 {
-       core::list<u16> timeouted_peers;
-       core::map<u16, Peer*>::Iterator j;
-       j = m_peers.getIterator();
-       for(; j.atEnd() == false; j++)
-       {
-               Peer *peer = j.getNode()->getValue();
-               
-               /*
-                       Check peer timeout
-               */
-               peer->timeout_counter += dtime;
-               if(peer->timeout_counter > m_timeout)
-               {
-                       PrintInfo(derr_con);
-                       derr_con<<"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 = peer->resend_timeout;
-               for(u16 i=0; i<CHANNEL_COUNT; i++)
-               {
-                       core::list<BufferedPacket> timed_outs;
-                       core::list<BufferedPacket>::Iterator j;
-                       
-                       Channel *channel = &peer->channels[i];
-
-                       // Remove timed out incomplete unreliable split packets
-                       channel->incoming_splits.removeUnreliableTimedOuts(dtime, m_timeout);
-                       
-                       // Increment reliable packet times
-                       channel->outgoing_reliables.incrementTimeouts(dtime);
-
-                       // Check reliable packet total times, remove peer if
-                       // over timeout.
-                       if(channel->outgoing_reliables.anyTotaltimeReached(m_timeout))
-                       {
-                               PrintInfo(derr_con);
-                               derr_con<<"RunTimeouts(): Peer "<<peer->id
-                                               <<" has timed out."
-                                               <<" (source=reliable packet totaltime)"
-                                               <<std::endl;
-                               // Add peer to the to-be-removed list
-                               timeouted_peers.push_back(peer->id);
-                               goto nextpeer;
-                       }
-
-                       // Re-send timed out outgoing reliables
-                       
-                       timed_outs = channel->
-                                       outgoing_reliables.getTimedOuts(resend_timeout);
-
-                       channel->outgoing_reliables.resetTimedOuts(resend_timeout);
-
-                       j = timed_outs.begin();
-                       for(; j != timed_outs.end(); j++)
-                       {
-                               u16 peer_id = readPeerId(*(j->data));
-                               u8 channel = readChannel(*(j->data));
-                               u16 seqnum = readU16(&(j->data[BASE_HEADER_SIZE+1]));
+       ConnectionCommand c;
+       c.serve(port);
+       putCommand(c);
+}
 
-                               PrintInfo(derr_con);
-                               derr_con<<"RE-SENDING timed-out RELIABLE to ";
-                               j->address.print(&derr_con);
-                               derr_con<<"(t/o="<<resend_timeout<<"): "
-                                               <<"from_peer_id="<<peer_id
-                                               <<", channel="<<((int)channel&0xff)
-                                               <<", seqnum="<<seqnum
-                                               <<std::endl;
+void Connection::Connect(Address address)
+{
+       ConnectionCommand c;
+       c.connect(address);
+       putCommand(c);
+}
 
-                               RawSend(*j);
+bool Connection::Connected()
+{
+       JMutexAutoLock peerlock(m_peers_mutex);
 
-                               // Enlarge avg_rtt and resend_timeout:
-                               // The rtt will be at least the timeout.
-                               // NOTE: This won't affect the timeout of the next
-                               // checked channel because it was cached.
-                               peer->reportRTT(resend_timeout);
-                       }
-               }
+       if(m_peers.size() != 1)
+               return false;
                
-               /*
-                       Send pings
-               */
-               peer->ping_timer += dtime;
-               if(peer->ping_timer >= 5.0)
-               {
-                       // Create and send PING packet
-                       SharedBuffer<u8> data(2);
-                       writeU8(&data[0], TYPE_CONTROL);
-                       writeU8(&data[1], CONTROLTYPE_PING);
-                       SendAsPacket(peer->id, 0, data, true);
+       core::map<u16, Peer*>::Node *node = m_peers.find(PEER_ID_SERVER);
+       if(node == NULL)
+               return false;
+       
+       if(m_peer_id == PEER_ID_INEXISTENT)
+               return false;
+       
+       return true;
+}
 
-                       peer->ping_timer = 0.0;
-               }
-               
-nextpeer:
-               continue;
-       }
+void Connection::Disconnect()
+{
+       ConnectionCommand c;
+       c.disconnect();
+       putCommand(c);
+}
 
-       // Remove timeouted peers
-       core::list<u16>::Iterator i = timeouted_peers.begin();
-       for(; i != timeouted_peers.end(); i++)
-       {
-               PrintInfo(derr_con);
-               derr_con<<"RunTimeouts(): Removing peer "<<(*i)<<std::endl;
-               m_peerhandler->deletingPeer(m_peers[*i], true);
-               delete m_peers[*i];
-               m_peers.remove(*i);
+u32 Connection::Receive(u16 &peer_id, SharedBuffer<u8> &data)
+{
+       for(;;){
+               ConnectionEvent e = waitEvent(m_bc_receive_timeout);
+               if(e.type != CONNEVENT_NONE)
+                       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: {
+                       Peer tmp(e.peer_id, e.address);
+                       if(m_bc_peerhandler)
+                               m_bc_peerhandler->peerAdded(&tmp);
+                       continue; }
+               case CONNEVENT_PEER_REMOVED: {
+                       Peer tmp(e.peer_id, e.address);
+                       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");
 }
 
-Peer* Connection::GetPeer(u16 peer_id)
+void Connection::SendToAll(u8 channelnum, SharedBuffer<u8> data, bool reliable)
 {
-       core::map<u16, Peer*>::Node *node = m_peers.find(peer_id);
+       assert(channelnum < CHANNEL_COUNT);
 
-       if(node == NULL){
-               // Peer not found
-               throw PeerNotFoundException("Peer not found (possible timeout)");
-       }
+       ConnectionCommand c;
+       c.sendToAll(channelnum, data, reliable);
+       putCommand(c);
+}
 
-       // Error checking
-       assert(node->getValue()->id == peer_id);
+void Connection::Send(u16 peer_id, u8 channelnum,
+               SharedBuffer<u8> data, bool reliable)
+{
+       assert(channelnum < CHANNEL_COUNT);
 
-       return node->getValue();
+       ConnectionCommand c;
+       c.send(peer_id, channelnum, data, reliable);
+       putCommand(c);
 }
 
-Peer* Connection::GetPeerNoEx(u16 peer_id)
+void Connection::RunTimeouts(float dtime)
 {
-       core::map<u16, Peer*>::Node *node = m_peers.find(peer_id);
-
-       if(node == NULL){
-               return NULL;
-       }
+       // No-op
+}
 
-       // Error checking
-       assert(node->getValue()->id == peer_id);
+Address Connection::GetPeerAddress(u16 peer_id)
+{
+       JMutexAutoLock peerlock(m_peers_mutex);
+       return getPeer(peer_id)->address;
+}
 
-       return node->getValue();
+float Connection::GetPeerAvgRTT(u16 peer_id)
+{
+       JMutexAutoLock peerlock(m_peers_mutex);
+       return getPeer(peer_id)->avg_rtt;
 }
 
-core::list<Peer*> Connection::GetPeers()
+void Connection::DeletePeer(u16 peer_id)
 {
-       core::list<Peer*> list;
-       core::map<u16, Peer*>::Iterator j;
-       j = m_peers.getIterator();
-       for(; j.atEnd() == false; j++)
-       {
-               Peer *peer = j.getNode()->getValue();
-               list.push_back(peer);
-       }
-       return list;
+       ConnectionCommand c;
+       c.deletePeer(peer_id);
+       putCommand(c);
 }
 
 void Connection::PrintInfo(std::ostream &out)
 {
-       out<<m_socket.GetHandle();
-       out<<" ";
-       out<<"con "<<m_peer_id<<": ";
-       for(s16 i=0; i<(s16)m_indentation-1; i++)
-               out<<"  ";
+       out<<getDesc()<<": ";
 }
 
 void Connection::PrintInfo()
@@ -1317,5 +1666,10 @@ void Connection::PrintInfo()
        PrintInfo(dout_con);
 }
 
+std::string Connection::getDesc()
+{
+       return std::string("con(")+itos(m_socket.GetHandle())+"/"+itos(m_peer_id)+")";
+}
+
 } // namespace