X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=088a5242b97bf4a54c22ff68fe545cf6825611f2;hb=6debc6c79ba385d35f646e0958f84ace5b8f4b4d;hp=27125da80b6399a8fe04149faee0197201f79182;hpb=1545909dcb3ac618754486f4ccd4d8f237d64bb7;p=tinc

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 27125da8..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"
@@ -29,10 +30,6 @@
 #include "protocol.h"
 #include "utils.h"
 
-#ifndef MIN
-#define MIN(x, y) (((x)<(y))?(x):(y))
-#endif
-
 int maxoutbufsize = 0;
 int mtu_info_interval = 5;
 int udp_info_interval = 5;
@@ -77,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;
 	}
 
@@ -91,7 +98,7 @@ bool send_tcppacket(connection_t *c, const vpn_packet_t *packet) {
 		return false;
 	}
 
-	return send_meta(c, (char *)DATA(packet), packet->len);
+	return send_meta(c, DATA(packet), packet->len);
 }
 
 bool tcppacket_h(connection_t *c, const char *request) {
@@ -110,15 +117,15 @@ bool tcppacket_h(connection_t *c, const char *request) {
 	return true;
 }
 
-bool send_sptps_tcppacket(connection_t *c, const char *packet, int len) {
+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;
 	}
 
-	if(!send_request(c, "%d %d", SPTPS_PACKET, len)) {
+	if(!send_request(c, "%d %zu", SPTPS_PACKET, len)) {
 		return false;
 	}