X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=8f56aee50aff918a20f6a0791aa0c9acd7323a6b;hp=b2f6ddc5f3f0e3b8e4ea3cd41d09ec54b1f10ec8;hb=a60a0a1f1357508063ee565d672c39898a787e33;hpb=228e7a5c8f0e517dcede50f886965a44fca39853 diff --git a/src/protocol_misc.c b/src/protocol_misc.c index b2f6ddc5..8f56aee5 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 , - 2000-2005 Guus Sliepen + Copyright (C) 1999-2005 Ivo Timmermans, + 2000-2006 Guus Sliepen 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 @@ -155,15 +155,16 @@ 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)) return false; - return send_meta(c, packet->data, packet->len); + return send_meta(c, (char *)packet->data, packet->len); } bool tcppacket_h(connection_t *c)