From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 9 Mar 2009 13:04:31 +0000 (+0100)
Subject: Use a simple Random Early Drop algorithm in send_tcppacket().
X-Git-Tag: release-1.0.10~80
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=43fa7283ac01f2ecc95381b519ef6b3342546f35;p=tinc

Use a simple Random Early Drop algorithm in send_tcppacket().
---

diff --git a/src/net.c b/src/net.c
index 41b3fb94..0cdc72cc 100644
--- a/src/net.c
+++ b/src/net.c
@@ -366,6 +366,7 @@ int main_loop(void)
 	last_graph_dump = now;
 	
 	srand(now);
+	srand48(now);
 
 	running = true;
 
diff --git a/src/net_setup.c b/src/net_setup.c
index 256fdf78..3eb56441 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -547,7 +547,7 @@ bool setup_network_connections(void)
 		pingtimeout = pinginterval;
 
 	if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
-		maxoutbufsize = 4 * MTU;
+		maxoutbufsize = 10 * MTU;
 
 	if(!setup_myself())
 		return false;
diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 52e97e54..8f56aee5 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -155,9 +155,10 @@ bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
 {
 	cp();
 
-	/* If there already is a lot of data in the outbuf buffer, discard this packet. */
+	/* If there already is a lot of data in the outbuf buffer, discard this packet.
+           We use a very simple Random Early Drop algorithm. */
 
-	if(c->outbuflen > maxoutbufsize)
+	if(2.0 * c->outbuflen / (double)maxoutbufsize - 1 > drand48())
 		return true;
 
 	if(!send_request(c, "%d %hd", PACKET, packet->len))