X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=7562792e2f4aa83da535ac2277f97976eec97248;hp=4c52464c33d2a62f663f54c2b920832b8a20e910;hb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;hpb=e00b44cb98e4d50a0d426048ba01dbd80bcb5941

diff --git a/src/meta.c b/src/meta.c
index 4c52464c..7562792e 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -21,10 +21,7 @@
 
 #include "system.h"
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-#include "avl_tree.h"
+#include "cipher.h"
 #include "connection.h"
 #include "logger.h"
 #include "meta.h"
@@ -33,104 +30,98 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_meta(connection_t *c, const char *buffer, int length) {
-	int outlen;
-	int result;
+bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) {
+	connection_t *c = handle;
 
 	if(!c) {
-		logger(LOG_ERR, "send_meta() called with NULL pointer!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!");
 		abort();
 	}
 
-	ifdebug(META) logger(LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
-			   c->name, c->hostname);
+	buffer_add(&c->outbuf, buffer, length);
+	event_add(&c->outevent, NULL);
 
-	if(!c->outbuflen)
-		c->last_flushed_time = now;
+	return true;
+}
 
-	/* Find room in connection's buffer */
-	if(length + c->outbuflen > c->outbufsize) {
-		c->outbufsize = length + c->outbuflen;
-		c->outbuf = xrealloc(c->outbuf, c->outbufsize);
+bool send_meta(connection_t *c, const char *buffer, int length) {
+	if(!c) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
+		abort();
 	}
 
-	if(length + c->outbuflen + c->outbufstart > c->outbufsize) {
-		memmove(c->outbuf, c->outbuf + c->outbufstart, c->outbuflen);
-		c->outbufstart = 0;
-	}
+	logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
+			   c->name, c->hostname);
+
+	if(c->protocol_minor >= 2)
+		return sptps_send_record(&c->sptps, 0, buffer, length);
 
 	/* Add our data to buffer */
 	if(c->status.encryptout) {
-		result = EVP_EncryptUpdate(c->outctx, (unsigned char *)c->outbuf + c->outbufstart + c->outbuflen,
-				&outlen, (unsigned char *)buffer, length);
-		if(!result || outlen < length) {
-			logger(LOG_ERR, "Error while encrypting metadata to %s (%s): %s",
-					c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+		size_t outlen = length;
+
+		if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
+					c->name, c->hostname);
 			return false;
-		} else if(outlen > length) {
-			logger(LOG_EMERG, "Encrypted data too long! Heap corrupted!");
-			abort();
 		}
-		c->outbuflen += outlen;
+
 	} else {
-		memcpy(c->outbuf + c->outbufstart + c->outbuflen, buffer, length);
-		c->outbuflen += length;
+		buffer_add(&c->outbuf, buffer, length);
 	}
 
+	event_add(&c->outevent, NULL);
+
 	return true;
 }
 
-bool flush_meta(connection_t *c) {
-	int result;
-	
-	ifdebug(META) logger(LOG_DEBUG, "Flushing %d bytes to %s (%s)",
-			 c->outbuflen, c->name, c->hostname);
-
-	while(c->outbuflen) {
-		result = send(c->socket, c->outbuf + c->outbufstart, c->outbuflen, 0);
-		if(result <= 0) {
-			if(!errno || errno == EPIPE) {
-				ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
-						   c->name, c->hostname);
-			} else if(errno == EINTR) {
-				continue;
-			} else if(sockwouldblock(sockerrno)) {
-				ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Flushing %d bytes to %s (%s) would block",
-						c->outbuflen, c->name, c->hostname);
-				return true;
-			} else {
-				logger(LOG_ERR, "Flushing meta data to %s (%s) failed: %s", c->name,
-					   c->hostname, sockstrerror(sockerrno));
-			}
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
+	for(list_node_t *node = connection_list->head, *next; node; node = next) {
+		next = node->next;
+		connection_t *c = node->data;
 
-			return false;
-		}
+		if(c != from && c->status.active)
+			send_meta(c, buffer, length);
+	}
+}
+
+bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
+	connection_t *c = handle;
 
-		c->outbufstart += result;
-		c->outbuflen -= result;
+	if(!c) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
+		abort();
 	}
 
-	c->outbufstart = 0; /* avoid unnecessary memmoves */
-	return true;
-}
+	if(type == SPTPS_HANDSHAKE) {
+		if(c->allow_request == ACK)
+			return send_ack(c);
+		else
+			return true;
+	}
 
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
-	avl_node_t *node;
-	connection_t *c;
+	if(!data)
+		return true;
 
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
+	/* Are we receiving a TCPpacket? */
 
-		if(c != from && c->status.active)
-			send_meta(c, buffer, length);
+	if(c->tcplen) {
+		if(length != c->tcplen)
+			return false;
+		receive_tcppacket(c, data, length);
+		c->tcplen = 0;
+		return true;
 	}
+
+	/* Otherwise we are waiting for a request */
+
+	return receive_request(c, data);
 }
 
 bool receive_meta(connection_t *c) {
-	int oldlen, i, result;
-	int lenin, lenout, reqlen;
-	bool decrypted = false;
+	int inlen;
 	char inbuf[MAXBUFSIZE];
+	char *bufp = inbuf, *endp;
 
 	/* Strategy:
 	   - Read as much as possible from the TCP socket in one go.
@@ -141,87 +132,89 @@ bool receive_meta(connection_t *c) {
 	   - If not, keep stuff in buffer and exit.
 	 */
 
-	lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
+	buffer_compact(&c->inbuf, MAXBUFSIZE);
+
+	if(sizeof inbuf <= c->inbuf.len) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
+		return false;
+	}
+
+	inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
 
-	if(lenin <= 0) {
-		if(!lenin || !errno) {
-			ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
+	if(inlen <= 0) {
+		if(!inlen || !errno) {
+			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)",
 					   c->name, c->hostname);
 		} else if(sockwouldblock(sockerrno))
 			return true;
 		else
-			logger(LOG_ERR, "Metadata socket read error for %s (%s): %s",
+			logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s",
 				   c->name, c->hostname, sockstrerror(sockerrno));
-
 		return false;
 	}
 
-	oldlen = c->buflen;
-	c->buflen += lenin;
+	do {
+		if(c->protocol_minor >= 2)
+			return sptps_receive_data(&c->sptps, bufp, inlen);
+
+		if(!c->status.decryptin) {
+			endp = memchr(bufp, '\n', inlen);
+			if(endp)
+				endp++;
+			else
+				endp = bufp + inlen;
+
+			buffer_add(&c->inbuf, bufp, endp - bufp);
 
-	while(lenin > 0) {
-		/* Decrypt */
+			inlen -= endp - bufp;
+			bufp = endp;
+		} else {
+			size_t outlen = inlen;
 
-		if(c->status.decryptin && !decrypted) {
-			result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &lenout, (unsigned char *)c->buffer + oldlen, lenin);
-			if(!result || lenout != lenin) {
-				logger(LOG_ERR, "Error while decrypting metadata from %s (%s): %s",
-						c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+			if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
+					   c->name, c->hostname);
 				return false;
 			}
-			memcpy(c->buffer + oldlen, inbuf, lenin);
-			decrypted = true;
+
+			inlen = 0;
 		}
 
-		/* Are we receiving a TCPpacket? */
+		while(c->inbuf.len) {
+			/* Are we receiving a TCPpacket? */
+
+			if(c->tcplen) {
+				char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
+				if(tcpbuffer) {
+					if(proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+						if(tcpbuffer[0] == 0 && tcpbuffer[1] == 0x5a) {
+							logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
+						} else {
+							logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected");
+							return false;
+						}
+					} else 
+						receive_tcppacket(c, tcpbuffer, c->tcplen);
+					c->tcplen = 0;
+					continue;
+				} else {
+					break;
+				}
+			}
 
-		if(c->tcplen) {
-			if(c->tcplen <= c->buflen) {
-				receive_tcppacket(c, c->buffer, c->tcplen);
+			/* Otherwise we are waiting for a request */
 
-				c->buflen -= c->tcplen;
-				lenin -= c->tcplen - oldlen;
-				memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
-				oldlen = 0;
-				c->tcplen = 0;
+			char *request = buffer_readline(&c->inbuf);
+			if(request) {
+				bool result = receive_request(c, request);
+				if(!result)
+					return false;
 				continue;
 			} else {
 				break;
 			}
 		}
-
-		/* Otherwise we are waiting for a request */
-
-		reqlen = 0;
-
-		for(i = oldlen; i < c->buflen; i++) {
-			if(c->buffer[i] == '\n') {
-				c->buffer[i] = '\0';	/* replace end-of-line by end-of-string so we can use sscanf */
-				reqlen = i + 1;
-				break;
-			}
-		}
-
-		if(reqlen) {
-			c->reqlen = reqlen;
-			if(!receive_request(c))
-				return false;
-
-			c->buflen -= reqlen;
-			lenin -= reqlen - oldlen;
-			memmove(c->buffer, c->buffer + reqlen, c->buflen);
-			oldlen = 0;
-			continue;
-		} else {
-			break;
-		}
-	}
-
-	if(c->buflen >= MAXBUFSIZE) {
-		logger(LOG_ERR, "Metadata read buffer overflow for %s (%s)",
-			   c->name, c->hostname);
-		return false;
-	}
+	} while(inlen);
 
 	return true;
 }