luanti-org · Aug 4, 2013
diff --git a/‎src/connection.cpp
+8-8 b/‎src/connection.cpp
+8-8
diff --git a/‎src/connection.h
+1-1 b/‎src/connection.h
+1-1
@@ -207,12 +207,13 @@ RPBSearchResult ReliablePacketBuffer::notFound()
 {
 	return m_list.end();
 }
-u16 ReliablePacketBuffer::getFirstSeqnum()
+bool ReliablePacketBuffer::getFirstSeqnum(u16 *result)
 {
 	if(empty())
-		throw NotFoundException("Buffer is empty");
+		return false;
 	BufferedPacket p = *m_list.begin();
-	return readU16(&p.data[BASE_HEADER_SIZE+1]);
+	*result = readU16(&p.data[BASE_HEADER_SIZE+1]);
+	return true;
 }
 BufferedPacket ReliablePacketBuffer::popFirst()
 {
@@ -700,7 +701,7 @@ void Connection::receive()
 
 	bool single_wait_done = false;
 
-	for(;;)
+	for(u32 loop_i=0; loop_i<1000; loop_i++) // Limit in case of DoS
 	{
 	try{
 		/* Check if some buffer has relevant data */
@@ -1245,17 +1246,16 @@ bool Connection::checkIncomingBuffers(Channel *channel, u16 &peer_id,
 {
 	u16 firstseqnum = 0;
 	// Clear old packets from start of buffer
-	try{
 	for(;;){
-		firstseqnum = channel->incoming_reliables.getFirstSeqnum();
+		bool found = channel->incoming_reliables.getFirstSeqnum(&firstseqnum);
+		if(!found)
+			break;
 		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)
 	{
 
@@ -281,7 +281,7 @@ class ReliablePacketBuffer
 	u32 size();
 	RPBSearchResult findPacket(u16 seqnum);
 	RPBSearchResult notFound();
-	u16 getFirstSeqnum();
+	bool getFirstSeqnum(u16 *result);
 	BufferedPacket popFirst();
 	BufferedPacket popSeqnum(u16 seqnum);
 	void insert(BufferedPacket &p);
Original file line number	Diff line number	Diff line change
`@@ -207,12 +207,13 @@ RPBSearchResult ReliablePacketBuffer::notFound()`
`207`	`207`	`{`
`208`	`208`	`return m_list.end();`
`209`	`209`	`}`
`210`		`-u16 ReliablePacketBuffer::getFirstSeqnum()`
	`210`	`+bool ReliablePacketBuffer::getFirstSeqnum(u16 *result)`
`211`	`211`	`{`
`212`	`212`	`if(empty())`
`213`		`- throw NotFoundException("Buffer is empty");`
	`213`	`+ return false;`
`214`	`214`	`BufferedPacket p = *m_list.begin();`
`215`		`- return readU16(&p.data[BASE_HEADER_SIZE+1]);`
	`215`	`+ *result = readU16(&p.data[BASE_HEADER_SIZE+1]);`
	`216`	`+ return true;`
`216`	`217`	`}`
`217`	`218`	`BufferedPacket ReliablePacketBuffer::popFirst()`
`218`	`219`	`{`
`@@ -700,7 +701,7 @@ void Connection::receive()`
`700`	`701`
`701`	`702`	`bool single_wait_done = false;`
`702`	`703`
`703`		`- for(;;)`
	`704`	`+ for(u32 loop_i=0; loop_i<1000; loop_i++) // Limit in case of DoS`
`704`	`705`	`{`
`705`	`706`	`try{`
`706`	`707`	`/* Check if some buffer has relevant data */`
`@@ -1245,17 +1246,16 @@ bool Connection::checkIncomingBuffers(Channel *channel, u16 &peer_id,`
`1245`	`1246`	`{`
`1246`	`1247`	`u16 firstseqnum = 0;`
`1247`	`1248`	`// Clear old packets from start of buffer`
`1248`		`- try{`
`1249`	`1249`	`for(;;){`
`1250`		`- firstseqnum = channel->incoming_reliables.getFirstSeqnum();`
	`1250`	`+ bool found = channel->incoming_reliables.getFirstSeqnum(&firstseqnum);`
	`1251`	`+ if(!found)`
	`1252`	`+ break;`
`1251`	`1253`	`if(seqnum_higher(channel->next_incoming_seqnum, firstseqnum))`
`1252`	`1254`	`channel->incoming_reliables.popFirst();`
`1253`	`1255`	`else`
`1254`	`1256`	`break;`
`1255`	`1257`	`}`
`1256`	`1258`	`// This happens if all packets are old`
`1257`		`- }catch(con::NotFoundException)`
`1258`		`- {}`
`1259`	`1259`
`1260`	`1260`	`if(channel->incoming_reliables.empty() == false)`
`1261`	`1261`	`{`