X-Git-Url: http://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=5499b344f5106a9fbea8b352d2fb2b6bc8cb4c3a;hb=5dde6461a321ee47b06e33f8203f2acf00a31a51;hp=0b893a677a653403aa59dd22aa5535ddfd62c0ed;hpb=af95368c0f30955f0e13b587d5d6d4989fd5a83e;p=tinc

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 0b893a67..5499b344 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -1,7 +1,7 @@
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -13,11 +13,9 @@
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    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 "system.h"
@@ -35,8 +33,7 @@ int maxoutbufsize = 0;
 
 /* Status and error notification routines */
 
-bool send_status(connection_t *c, int statusno, const char *statusstring)
-{
+bool send_status(connection_t *c, int statusno, const char *statusstring) {
 	cp();
 
 	if(!statusstring)
@@ -45,8 +42,7 @@ bool send_status(connection_t *c, int statusno, const char *statusstring)
 	return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
 }
 
-bool status_h(connection_t *c)
-{
+bool status_h(connection_t *c) {
 	int statusno;
 	char statusstring[MAX_STRING_SIZE];
 
@@ -64,8 +60,7 @@ bool status_h(connection_t *c)
 	return true;
 }
 
-bool send_error(connection_t *c, int err, const char *errstring)
-{
+bool send_error(connection_t *c, int err, const char *errstring) {
 	cp();
 
 	if(!errstring)
@@ -74,8 +69,7 @@ bool send_error(connection_t *c, int err, const char *errstring)
 	return send_request(c, "%d %d %s", ERROR, err, errstring);
 }
 
-bool error_h(connection_t *c)
-{
+bool error_h(connection_t *c) {
 	int err;
 	char errorstring[MAX_STRING_SIZE];
 
@@ -95,15 +89,13 @@ bool error_h(connection_t *c)
 	return true;
 }
 
-bool send_termreq(connection_t *c)
-{
+bool send_termreq(connection_t *c) {
 	cp();
 
 	return send_request(c, "%d", TERMREQ);
 }
 
-bool termreq_h(connection_t *c)
-{
+bool termreq_h(connection_t *c) {
 	cp();
 
 	terminate_connection(c, c->status.active);
@@ -111,8 +103,7 @@ bool termreq_h(connection_t *c)
 	return true;
 }
 
-bool send_ping(connection_t *c)
-{
+bool send_ping(connection_t *c) {
 	cp();
 
 	c->status.pinged = true;
@@ -121,22 +112,19 @@ bool send_ping(connection_t *c)
 	return send_request(c, "%d", PING);
 }
 
-bool ping_h(connection_t *c)
-{
+bool ping_h(connection_t *c) {
 	cp();
 
 	return send_pong(c);
 }
 
-bool send_pong(connection_t *c)
-{
+bool send_pong(connection_t *c) {
 	cp();
 
 	return send_request(c, "%d", PONG);
 }
 
-bool pong_h(connection_t *c)
-{
+bool pong_h(connection_t *c) {
 	cp();
 
 	c->status.pinged = false;
@@ -151,13 +139,13 @@ bool pong_h(connection_t *c)
 
 /* Sending and receiving packets via TCP */
 
-bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
-{
+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 / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX)
 		return true;
 
 	if(!send_request(c, "%d %hd", PACKET, packet->len))
@@ -166,8 +154,7 @@ bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
 	return send_meta(c, (char *)packet->data, packet->len);
 }
 
-bool tcppacket_h(connection_t *c)
-{
+bool tcppacket_h(connection_t *c) {
 	short int len;
 
 	cp();