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

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index a8b30ff3..088a5242 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -20,79 +20,27 @@
 
 #include "system.h"
 
-#include "conf.h"
+#include "address_cache.h"
 #include "connection.h"
+#include "crypto.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
 #include "utils.h"
-#include "xalloc.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;
 
-/* Status and error notification routines */
-
-bool send_status(connection_t *c, int statusno, const char *statusstring) {
-	if(!statusstring) {
-		statusstring = "Status";
-	}
-
-	return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
-}
-
-bool status_h(connection_t *c, const char *request) {
-	int statusno;
-	char statusstring[MAX_STRING_SIZE];
-
-	if(sscanf(request, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "STATUS",
-		       c->name, c->hostname);
-		return false;
-	}
-
-	logger(DEBUG_STATUS, LOG_NOTICE, "Status message from %s (%s): %d: %s",
-	       c->name, c->hostname, statusno, statusstring);
-
-	return true;
-}
-
-bool send_error(connection_t *c, int err, const char *errstring) {
-	if(!errstring) {
-		errstring = "Error";
-	}
-
-	return send_request(c, "%d %d %s", ERROR, err, errstring);
-}
-
-bool error_h(connection_t *c, const char *request) {
-	int err;
-	char errorstring[MAX_STRING_SIZE];
-
-	if(sscanf(request, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ERROR",
-		       c->name, c->hostname);
-		return false;
-	}
-
-	logger(DEBUG_ERROR, LOG_NOTICE, "Error message from %s (%s): %d: %s",
-	       c->name, c->hostname, err, errorstring);
-
-	return false;
-}
-
 bool send_termreq(connection_t *c) {
 	return send_request(c, "%d", TERMREQ);
 }
 
 bool termreq_h(connection_t *c, const char *request) {
+	(void)c;
+	(void)request;
 	return false;
 }
 
@@ -104,6 +52,7 @@ bool send_ping(connection_t *c) {
 }
 
 bool ping_h(connection_t *c, const char *request) {
+	(void)request;
 	return send_pong(c);
 }
 
@@ -112,23 +61,27 @@ bool send_pong(connection_t *c) {
 }
 
 bool pong_h(connection_t *c, const char *request) {
+	(void)request;
 	c->status.pinged = false;
 
-	/* Succesful connection, reset timeout if this is an outgoing connection. */
+	/* Successful connection, reset timeout if this is an outgoing connection. */
 
-	if(c->outgoing) {
+	if(c->outgoing && c->outgoing->timeout) {
 		c->outgoing->timeout = 0;
-		c->outgoing->cfg = NULL;
+		reset_address_cache(c->outgoing->node->address_cache, &c->address);
+	}
 
-		if(c->outgoing->ai) {
-			freeaddrinfo(c->outgoing->ai);
-		}
+	return true;
+}
 
-		c->outgoing->ai = NULL;
-		c->outgoing->aip = NULL;
+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 true;
+	return false;
 }
 
 /* Sending and receiving packets via TCP */
@@ -137,7 +90,7 @@ 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;
 	}
 
@@ -145,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) {
@@ -164,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;
 	}