Add download rate to media progress bar (non http mode only!)

Minor coding style fixes

7 files changed, 281 insertions, 130 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 729640268..a4fabfa61 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -2698,6 +2698,18 @@ float Client::getRTT(void)
 	return m_con.getPeerStat(PEER_ID_SERVER,con::AVG_RTT);
 }
 
+float Client::getCurRate(void)
+{
+	return ( m_con.getLocalStat(con::CUR_INC_RATE) +
+			m_con.getLocalStat(con::CUR_DL_RATE));
+}
+
+float Client::getAvgRate(void)
+{
+	return ( m_con.getLocalStat(con::AVG_INC_RATE) +
+			m_con.getLocalStat(con::AVG_DL_RATE));
+}
+
 // IGameDef interface
 // Under envlock
 IItemDefManager* Client::getItemDefManager()
diff --git a/src/client.h b/src/client.h
index 885dc9d3b..fd07f26b4 100644
--- a/src/client.h
+++ b/src/client.h
@@ -433,6 +433,8 @@ public:
 	void afterContentReceived(IrrlichtDevice *device, gui::IGUIFont* font);
 
 	float getRTT(void);
+	float getCurRate(void);
+	float getAvgRate(void);
 
 	// IGameDef interface
 	virtual IItemDefManager* getItemDefManager();
diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp
index 35074a113..b3e7e8e06 100644
--- a/src/clientmedia.cpp
+++ b/src/clientmedia.cpp
@@ -110,14 +110,16 @@ void ClientMediaDownloader::addRemoteServer(std::string baseurl)
 
 	#ifdef USE_CURL
 
-	infostream << "Client: Adding remote server \""
-		<< baseurl << "\" for media download" << std::endl;
-
-	RemoteServerStatus *remote = new RemoteServerStatus;
-	remote->baseurl = baseurl;
-	remote->active_count = 0;
-	remote->request_by_filename = false;
-	m_remotes.push_back(remote);
+	if (g_settings->getBool("enable_remote_media_server")) {
+		infostream << "Client: Adding remote server \""
+			<< baseurl << "\" for media download" << std::endl;
+
+		RemoteServerStatus *remote = new RemoteServerStatus;
+		remote->baseurl = baseurl;
+		remote->active_count = 0;
+		remote->request_by_filename = false;
+		m_remotes.push_back(remote);
+	}
 
 	#else
 
diff --git a/src/connection.cpp b/src/connection.cpp
index a51cc9df4..e6b763206 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -190,9 +190,6 @@ SharedBuffer<u8> makeReliablePacket(
 		SharedBuffer<u8> data,
 		u16 seqnum)
 {
-	/*dstream<<"BEGIN SharedBuffer<u8> makeReliablePacket()"<<std::endl;
-	dstream<<"data.getSize()="<<data.getSize()<<", data[0]="
-			<<((unsigned int)data[0]&0xff)<<std::endl;*/
 	u32 header_size = 3;
 	u32 packet_size = data.getSize() + header_size;
 	SharedBuffer<u8> b(packet_size);
@@ -202,9 +199,6 @@ SharedBuffer<u8> makeReliablePacket(
 
 	memcpy(&b[header_size], *data, data.getSize());
 
-	/*dstream<<"data.getSize()="<<data.getSize()<<", data[0]="
-			<<((unsigned int)data[0]&0xff)<<std::endl;*/
-	//dstream<<"END SharedBuffer<u8> makeReliablePacket()"<<std::endl;
 	return b;
 }
 
@@ -280,10 +274,12 @@ BufferedPacket ReliablePacketBuffer::popFirst()
 	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]);	}
+	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)
@@ -291,7 +287,8 @@ 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);
+		LOG(dout_con<<"Sequence number: " << seqnum
+				<< " not found in reliable buffer"<<std::endl);
 		throw NotFoundException("seqnum not found in buffer");
 	}
 	BufferedPacket p = *r;
@@ -369,11 +366,15 @@ void ReliablePacketBuffer::insert(BufferedPacket &p,u16 next_expected)
 			)
 		{
 			/* if this happens your maximum transfer window may be to big */
-			fprintf(stderr, "Duplicated seqnum %d non matching packet detected:\n",seqnum);
+			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());
+					readU16(&(i->data[BASE_HEADER_SIZE+1])),i->data.getSize(),
+					i->address.serializeString().c_str());
 			fprintf(stderr, "New: seqnum: %05d size: %04d, address: %s\n",
-					readU16(&(p.data[BASE_HEADER_SIZE+1])),p.data.getSize(), p.address.serializeString().c_str());
+					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");
 		}
 
@@ -562,14 +563,19 @@ Channel::Channel() :
 		current_packet_too_late(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)
+		bpm_counter(0.0),
+		rate_samples(0)
 {
 }
 
@@ -665,6 +671,11 @@ void Channel::UpdateBytesSent(unsigned int bytes, unsigned int packets)
 	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);
@@ -684,7 +695,7 @@ void Channel::UpdatePacketTooLateCounter()
 	current_packet_too_late++;
 }
 
-void Channel::UpdateTimers(float dtime)
+void Channel::UpdateTimers(float dtime,bool legacy_peer)
 {
 	bpm_counter += dtime;
 	packet_loss_counter += dtime;
@@ -714,53 +725,56 @@ void Channel::UpdateTimers(float dtime)
 			current_packet_successfull = 0;
 		}
 
-		float successfull_to_lost_ratio = 0.0;
-		bool done = false;
+		/* 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);
+			if (packets_successfull > 0) {
+				successfull_to_lost_ratio = packet_loss/packets_successfull;
 			}
-			else if (successfull_to_lost_ratio > 0.15)
+			else if (packet_loss > 0)
 			{
 				window_size = MYMAX(
-											(window_size - 100),
-											MIN_RELIABLE_WINDOW_SIZE);
+						(window_size - 10),
+						MIN_RELIABLE_WINDOW_SIZE);
+				done = true;
 			}
-			else if (successfull_to_lost_ratio > 0.1)
+
+			if (!done)
 			{
-				window_size = MYMAX(
-											(window_size - 50),
-											MIN_RELIABLE_WINDOW_SIZE);
+				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);
+				}
 			}
 		}
 	}
@@ -769,11 +783,16 @@ void Channel::UpdateTimers(float dtime)
 	{
 		{
 			JMutexAutoLock internal(m_internal_mutex);
-			cur_kbps = (current_bytes_transfered/bpm_counter)/1024;
+			cur_kbps                 =
+					(((float) current_bytes_transfered)/bpm_counter)/1024.0;
 			current_bytes_transfered = 0;
-			cur_kbps_lost = (current_bytes_lost/bpm_counter)/1024;
-			current_bytes_lost = 0;
-			bpm_counter = 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)
@@ -786,8 +805,18 @@ void Channel::UpdateTimers(float dtime)
 			max_kbps_lost = cur_kbps_lost;
 		}
 
-		avg_kbps = avg_kbps * 0.9 + cur_kbps * 0.1;
-		avg_kbps_lost = avg_kbps_lost * 0.9 + cur_kbps_lost * 0.1;
+		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);
 	}
 }
 
@@ -798,8 +827,7 @@ void Channel::UpdateTimers(float dtime)
 
 PeerHelper::PeerHelper() :
 	m_peer(0)
-{
-}
+{}
 
 PeerHelper::PeerHelper(Peer* peer) :
 	m_peer(peer)
@@ -879,9 +907,8 @@ void Peer::DecUseCount()
 	delete this;
 }
 
-void Peer::RTTStatistics(float rtt,
-						std::string profiler_id,
-						unsigned int num_samples) {
+void Peer::RTTStatistics(float rtt, std::string profiler_id,
+		unsigned int num_samples) {
 
 	if (m_last_rtt > 0) {
 		/* set min max values */
@@ -952,10 +979,12 @@ void Peer::Drop()
 	}
 
 	PROFILE(std::stringstream peerIdentifier1);
-	PROFILE(peerIdentifier1 << "runTimeouts[" << m_connection->getDesc() << ";" << id << ";RELIABLE]");
+	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(peerIdentifier2 << "sendPackets[" << m_connection->getDesc()
+			<< ";" << id << ";RELIABLE]");
 	PROFILE(ScopeProfiler peerprofiler(g_profiler, peerIdentifier2.str(), SPT_AVG));
 
 	delete this;
@@ -1136,10 +1165,14 @@ bool UDPPeer::processReliableSendCommand(
 			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()
+				<< " 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;
 	}
@@ -1166,7 +1199,8 @@ void UDPPeer::RunCommandQueues(
 				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);
+							<< ", delaying sending of " << c.data.getSize()
+							<< " bytes" << std::endl);
 					channels[i].queued_commands.push_front(c);
 				}
 			}
@@ -1327,7 +1361,8 @@ void ConnectionSendThread::runTimeouts(float dtime)
 			continue;
 
 		PROFILE(std::stringstream peerIdentifier);
-		PROFILE(peerIdentifier << "runTimeouts[" << m_connection->getDesc() << ";" << *j << ";RELIABLE]");
+		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
@@ -1377,32 +1412,30 @@ void ConnectionSendThread::runTimeouts(float dtime)
 
 			m_iteration_packets_avaialble -= timed_outs.size();
 
-			for(std::list<BufferedPacket>::iterator j = timed_outs.begin();
-				j != timed_outs.end(); ++j)
+			for(std::list<BufferedPacket>::iterator k = timed_outs.begin();
+				k != timed_outs.end(); ++k)
 			{
-				u16 peer_id = readPeerId(*(j->data));
-				u8 channelnum  = readChannel(*(j->data));
-				u16 seqnum  = readU16(&(j->data[BASE_HEADER_SIZE+1]));
+				u16 peer_id = readPeerId(*(k->data));
+				u8 channelnum  = readChannel(*(k->data));
+				u16 seqnum  = readU16(&(k->data[BASE_HEADER_SIZE+1]));
 
-				channel->UpdateBytesLost(j->data.getSize());
+				channel->UpdateBytesLost(k->data.getSize());
 
 				LOG(derr_con<<m_connection->getDesc()
 						<<"RE-SENDING timed-out RELIABLE to "
-						<< j->address.serializeString()
+						<< k->address.serializeString()
 						<< "(t/o="<<resend_timeout<<"): "
 						<<"from_peer_id="<<peer_id
 						<<", channel="<<((int)channelnum&0xff)
 						<<", seqnum="<<seqnum
 						<<std::endl);
 
-				rawSend(*j);
+				rawSend(*k);
 
 				// do not handle rtt here as we can't decide if this packet was
 				// lost or really takes more time to transmit
 			}
-
-			if (!dynamic_cast<UDPPeer*>(&peer)->getLegacyPeer())
-				channel->UpdateTimers(dtime);
+			channel->UpdateTimers(dtime,dynamic_cast<UDPPeer*>(&peer)->getLegacyPeer());
 		}
 
 		/* send ping if necessary */
@@ -1436,9 +1469,11 @@ void ConnectionSendThread::runTimeouts(float dtime)
 void ConnectionSendThread::rawSend(const BufferedPacket &packet)
 {
 	try{
-		m_connection->m_udpSocket.Send(packet.address, *packet.data, packet.data.getSize());
+		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);
+				<< " rawSend: " << packet.data.getSize()
+				<< " bytes sent" << std::endl);
 	} catch(SendFailedException &e){
 		LOG(derr_con<<m_connection->getDesc()
 				<<"Connection::rawSend(): SendFailedException: "
@@ -1452,7 +1487,8 @@ void ConnectionSendThread::sendAsPacketReliable(BufferedPacket& p, Channel* chan
 		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));
+			(channel->readOutgoingSequenceNumber() - MAX_RELIABLE_WINDOW_SIZE)
+			% (MAX_RELIABLE_WINDOW_SIZE+1));
 	}
 	catch(AlreadyExistsException &e)
 	{
@@ -1472,7 +1508,8 @@ bool ConnectionSendThread::rawSendAsPacket(u16 peer_id, u8 channelnum,
 	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);
+				<<" 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;
 	}
@@ -1481,7 +1518,8 @@ bool ConnectionSendThread::rawSendAsPacket(u16 peer_id, u8 channelnum,
 	if(reliable)
 	{
 		bool have_sequence_number_for_raw_packet = true;
-		u16 seqnum = channel->getOutgoingSequenceNumber(have_sequence_number_for_raw_packet);
+		u16 seqnum =
+				channel->getOutgoingSequenceNumber(have_sequence_number_for_raw_packet);
 
 		if (!have_sequence_number_for_raw_packet)
 			return false;
@@ -1547,21 +1585,25 @@ void ConnectionSendThread::processReliableCommand(ConnectionCommand &c)
 
 	switch(c.type){
 	case CONNCMD_NONE:
-		LOG(dout_con<<m_connection->getDesc()<<"UDP processing reliable CONNCMD_NONE"<<std::endl);
+		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);
+		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);
+		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);
+		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 */
@@ -1570,7 +1612,8 @@ void ConnectionSendThread::processReliableCommand(ConnectionCommand &c)
 		return;
 
 	case CONCMD_DISABLE_LEGACY:
-		LOG(dout_con<<m_connection->getDesc()<<"UDP processing reliable CONCMD_DISABLE_LEGACY"<<std::endl);
+		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 */
@@ -1584,7 +1627,8 @@ void ConnectionSendThread::processReliableCommand(ConnectionCommand &c)
 	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);
+		LOG(dout_con<<m_connection->getDesc()
+				<<" Invalid reliable command type: " << c.type <<std::endl);
 	}
 }
 
@@ -1595,41 +1639,50 @@ void ConnectionSendThread::processNonReliableCommand(ConnectionCommand &c)
 
 	switch(c.type){
 	case CONNCMD_NONE:
-		LOG(dout_con<<m_connection->getDesc()<<" UDP processing CONNCMD_NONE"<<std::endl);
+		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="
+		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);
+		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);
+		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);
+		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);
+		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);
+		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);
+		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);
+		LOG(dout_con<<m_connection->getDesc()
+				<<" Invalid command type: " << c.type <<std::endl);
 	}
 }
 
@@ -1940,7 +1993,7 @@ void ConnectionSendThread::sendAsPacket(u16 peer_id, u8 channelnum,
 }
 
 ConnectionReceiveThread::ConnectionReceiveThread(Connection* parent,
-												unsigned int max_packet_size) :
+		unsigned int max_packet_size) :
 	m_connection(parent)
 {
 }
@@ -2163,6 +2216,10 @@ void ConnectionReceiveThread::receive()
 			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
@@ -2223,8 +2280,8 @@ bool ConnectionReceiveThread::getFromBuffers(u16 &peer_id, SharedBuffer<u8> &dst
 	return false;
 }
 
-bool ConnectionReceiveThread::checkIncomingBuffers(Channel *channel, u16 &peer_id,
-		SharedBuffer<u8> &dst)
+bool ConnectionReceiveThread::checkIncomingBuffers(Channel *channel,
+		u16 &peer_id, SharedBuffer<u8> &dst)
 {
 	u16 firstseqnum = 0;
 	if (channel->incoming_reliables.getFirstSeqnum(firstseqnum))
@@ -2258,8 +2315,7 @@ bool ConnectionReceiveThread::checkIncomingBuffers(Channel *channel, u16 &peer_i
 }
 
 SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel,
-		SharedBuffer<u8> packetdata, u16 peer_id,
-		u8 channelnum, bool reliable)
+		SharedBuffer<u8> packetdata, u16 peer_id, u8 channelnum, bool reliable)
 {
 	PeerHelper peer = m_connection->getPeer(peer_id);
 
@@ -2578,7 +2634,7 @@ SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel,
 */
 
 Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
-		bool ipv6):
+		bool ipv6) :
 	m_udpSocket(ipv6),
 	m_command_queue(),
 	m_event_queue(),
@@ -2599,7 +2655,7 @@ Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
 }
 
 Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
-		bool ipv6, PeerHandler *peerhandler):
+		bool ipv6, PeerHandler *peerhandler) :
 	m_udpSocket(ipv6),
 	m_command_queue(),
 	m_event_queue(),
@@ -2885,6 +2941,43 @@ float Connection::getPeerStat(u16 peer_id, rtt_stat_type type)
 	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
@@ -2959,7 +3052,8 @@ void Connection::PrintInfo()
 
 const std::string Connection::getDesc()
 {
-	return std::string("con(")+itos(m_udpSocket.GetHandle())+"/"+itos(m_peer_id)+")";
+	return std::string("con(")+
+			itos(m_udpSocket.GetHandle())+"/"+itos(m_peer_id)+")";
 }
 
 void Connection::DisconnectPeer(u16 peer_id)
@@ -2969,8 +3063,8 @@ void Connection::DisconnectPeer(u16 peer_id)
 	putCommand(discon);
 }
 
-void Connection::sendAck(u16 peer_id, u8 channelnum, u16 seqnum) {
-
+void Connection::sendAck(u16 peer_id, u8 channelnum, u16 seqnum)
+{
 	assert(channelnum < CHANNEL_COUNT);
 
 	LOG(dout_con<<getDesc()
diff --git a/src/connection.h b/src/connection.h
index 43fd2fb88..90344da3e 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -515,8 +515,9 @@ public:
 	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);
+	void UpdateTimers(float dtime, bool legacy_peer);
 
 	const float getCurrentDownloadRateKB()
 		{ JMutexAutoLock lock(m_internal_mutex); return cur_kbps; };
@@ -528,10 +529,17 @@ public:
 	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; };
 
@@ -551,14 +559,20 @@ private:
 	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;
@@ -617,7 +631,7 @@ private:
 
 class Connection;
 
-typedef enum rtt_stat_type {
+typedef enum {
 	MIN_RTT,
 	MAX_RTT,
 	AVG_RTT,
@@ -626,6 +640,15 @@ typedef enum rtt_stat_type {
 	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;
@@ -765,6 +788,7 @@ public:
 	friend class PeerHelper;
 	friend class ConnectionReceiveThread;
 	friend class ConnectionSendThread;
+	friend class Connection;
 
 	UDPPeer(u16 a_id, Address a_address, Connection* connection);
 	virtual ~UDPPeer() {};
@@ -1002,6 +1026,7 @@ public:
 	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);
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index e245abb83..ff0da4b2c 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -151,6 +151,8 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("curl_timeout", "5000");
 	settings->setDefault("curl_parallel_limit", "8");
 
+	settings->setDefault("enable_remote_media_server", "true");
+
 	settings->setDefault("serverlist_url", "servers.minetest.net");
 	settings->setDefault("serverlist_file", "favoriteservers.txt");
 	settings->setDefault("server_announce", "false");
diff --git a/src/game.cpp b/src/game.cpp
index 567c2c776..51e97d61b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1432,10 +1432,24 @@ void the_game(bool &kill, bool random_input, InputHandler *input,
 			}
 			else
 			{
-				wchar_t* text = wgettext("Media...");
+
+				std::stringstream message;
+				message.precision(3);
+				message << gettext("Media...");
+
+				if ( ( USE_CURL == 0) ||
+						(!g_settings->getBool("enable_remote_media_server"))) {
+					float cur = client.getCurRate();
+					std::string cur_unit = gettext(" KB/s");
+
+					if (cur > 900) {
+						cur /= 1024.0;
+						cur_unit = gettext(" MB/s");
+					}
+					message << " ( " << cur << cur_unit << " )";
+				}
 				progress = 50+client.mediaReceiveProgress()*50+0.5;
-				draw_load_screen(text, device, font, dtime, progress);
-				delete[] text;
+				draw_load_screen(narrow_to_wide(message.str().c_str()), device, font, dtime, progress);
 			}
 			
 			// On some computers framerate doesn't seem to be