X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=088a5242b97bf4a54c22ff68fe545cf6825611f2;hb=6debc6c79ba385d35f646e0958f84ace5b8f4b4d;hp=284006bbf99d2b2c39fc0c4a9cc354d86d95dea2;hpb=a80253aee68968c722c796c523ed26655d29c882;p=tinc diff --git a/src/protocol_misc.c b/src/protocol_misc.c index 284006bb..088a5242 100644 --- a/src/protocol_misc.c +++ b/src/protocol_misc.c @@ -22,6 +22,7 @@ #include "address_cache.h" #include "connection.h" +#include "crypto.h" #include "logger.h" #include "meta.h" #include "net.h" @@ -73,13 +74,23 @@ bool pong_h(connection_t *c, const char *request) { return true; } +static bool random_early_drop(connection_t *c) { + if(c->outbuf.len > maxoutbufsize / 2) { + if((c->outbuf.len - maxoutbufsize / 2) > prng((maxoutbufsize) / 2)) { + return true; + } + } + + return false; +} + /* Sending and receiving packets via TCP */ bool send_tcppacket(connection_t *c, const vpn_packet_t *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(2.0 * c->outbuf.len / (float)maxoutbufsize - 1 > (float)rand() / (float)RAND_MAX) { + if(random_early_drop(c)) { return true; } @@ -110,7 +121,7 @@ bool send_sptps_tcppacket(connection_t *c, const void *packet, size_t len) { /* 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(2.0 * c->outbuf.len / (float)maxoutbufsize - 1 > (float)rand() / (float)RAND_MAX) { + if(random_early_drop(c)) { return true; }