X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=b556e1750fa585b759d38084891de07aae4ba444;hb=6834b882015a9323672e9fce8811aa4283f196f0;hp=352c691f645580c1032e371067cc4d12fc0a52f7;hpb=462ab530e546f5732dfd51134751da6f6910d679;p=tinc diff --git a/src/meta.c b/src/meta.c index 352c691f..b556e175 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,8 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2002 Guus Sliepen , - 2000-2002 Ivo Timmermans + Copyright (C) 2000-2009 Guus Sliepen , + 2000-2005 Ivo Timmermans + 2006 Scott Lamb 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 @@ -13,198 +14,155 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id: meta.c,v 1.2 2002/04/09 15:26:00 zarq Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" -#include -#include - -#include -#include -#include -#include -/* This line must be below the rest for FreeBSD */ -#include -#include - -#include +#include "system.h" -#include "net.h" +#include "splay_tree.h" +#include "cipher.h" #include "connection.h" -#include "system.h" +#include "logger.h" +#include "meta.h" +#include "net.h" #include "protocol.h" - -int send_meta(connection_t *c, char *buffer, int length) -{ - char *bufp; - int outlen; - char outbuf[MAXBUFSIZE]; -cp - if(debug_lvl >= DEBUG_META) - syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length, - c->name, c->hostname); - - if(c->status.encryptout) - { - EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length); - bufp = outbuf; - length = outlen; - } - else - bufp = buffer; - - if(write(c->socket, bufp, length) < 0) - { - syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name, c->hostname, strerror(errno)); - return -1; - } -cp - return 0; +#include "utils.h" +#include "xalloc.h" + +bool send_meta(connection_t *c, const char *buffer, int length) { + if(!c) { + logger(LOG_ERR, "send_meta() called with NULL pointer!"); + abort(); + } + + ifdebug(META) logger(LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length, + c->name, c->hostname); + + /* Add our data to buffer */ + if(c->status.encryptout) { + char outbuf[length]; + size_t outlen = length; + + if(!cipher_encrypt(&c->outcipher, buffer, length, outbuf, &outlen, false) || outlen != length) { + logger(LOG_ERR, "Error while encrypting metadata to %s (%s)", + c->name, c->hostname); + return false; + } + + write(c->socket, outbuf, length); + } else { + write(c->socket, buffer, length); + } + + return true; } -void broadcast_meta(connection_t *from, char *buffer, int length) -{ - avl_node_t *node; - connection_t *c; -cp - for(node = connection_tree->head; node; node = node->next) - { - c = (connection_t *)node->data; - if(c != from && c->status.active) - send_meta(c, buffer, length); - } -cp +void broadcast_meta(connection_t *from, const char *buffer, int length) { + splay_node_t *node; + connection_t *c; + + for(node = connection_tree->head; node; node = node->next) { + c = node->data; + + if(c != from && c->status.active) + send_meta(c, buffer, length); + } } -int receive_meta(connection_t *c) -{ - int x, l = sizeof(x); - int oldlen, i; - int lenin, reqlen; - int decrypted = 0; - char inbuf[MAXBUFSIZE]; -cp - if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) - { - syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s %s (%s)"), __FILE__, __LINE__, c->socket, strerror(errno), - c->name, c->hostname); - return -1; - } - if(x) - { - syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"), - c->name, c->hostname, strerror(x)); - return -1; - } - - /* Strategy: - - Read as much as possible from the TCP socket in one go. - - Decrypt it. - - Check if a full request is in the input buffer. - - If yes, process request and remove it from the buffer, - then check again. - - If not, keep stuff in buffer and exit. - */ - - lenin = read(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen); - - if(lenin<=0) - { - if(lenin==0) - { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), - c->name, c->hostname); - } - else - if(errno==EINTR) - return 0; - else - syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %s"), - c->name, c->hostname, strerror(errno)); - - return -1; - } - - oldlen = c->buflen; - c->buflen += lenin; - - while(lenin) - { - /* Decrypt */ - - if(c->status.decryptin && !decrypted) - { - EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin); - memcpy(c->buffer + oldlen, inbuf, lenin); - decrypted = 1; - } - - /* Are we receiving a TCPpacket? */ - - if(c->tcplen) - { - if(c->tcplen <= c->buflen) - { - receive_tcppacket(c, c->buffer, c->tcplen); - - c->buflen -= c->tcplen; - lenin -= c->tcplen; - memmove(c->buffer, c->buffer + c->tcplen, c->buflen); - oldlen = 0; - c->tcplen = 0; - 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) - { - if(receive_request(c)) - return -1; - - c->buflen -= reqlen; - lenin -= reqlen; - memmove(c->buffer, c->buffer + reqlen, c->buflen); - oldlen = 0; - continue; - } - else - { - break; - } - } - - if(c->buflen >= MAXBUFSIZE) - { - syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"), - c->name, c->hostname); - return -1; - } - - c->last_ping_time = now; -cp - return 0; +static bool process_meta(connection_t *c, char *reqbuf, int *len) { + while(*len) { + if(c->tcplen) { + if(c->tcplen > *len) + break; + + mutex_lock(&mutex); + receive_tcppacket(c, reqbuf, c->tcplen); + mutex_unlock(&mutex); + + memmove(reqbuf, reqbuf, *len - c->tcplen); + *len -= c->tcplen; + } else { + char *end = memchr(reqbuf, '\n', *len); + if(!end) + break; + else + *end++ = 0; + + mutex_lock(&mutex); + bool success = receive_request(c, reqbuf); + mutex_unlock(&mutex); + + if(!success) + return false; + + memmove(reqbuf, end, *len - (end - reqbuf)); + *len -= end - reqbuf; + } + } + + return true; +} + +bool receive_meta(connection_t *c) { + int inlen; + int reqlen = 0; + char inbuf[MAXBUFSIZE]; + char reqbuf[MAXBUFSIZE]; + + /* Strategy: + - Read as much as possible from the TCP socket in one go. + - Decrypt it if necessary. + - Check if a full request is in the request buffer. + - If yes, process request and remove it from the buffer, then check again. + - If not, try to read more. + */ + + while(true) { + inlen = recv(c->socket, inbuf, sizeof inbuf - reqlen, 0); + + if(inlen <= 0) { + if(!inlen || !errno) { + ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)", + c->name, c->hostname); + } else if(sockwouldblock(sockerrno)) + continue; + else + logger(LOG_ERR, "Metadata socket read error for %s (%s): %s", + c->name, c->hostname, sockstrerror(sockerrno)); + return false; + } + + while(inlen) { + if(!c->status.decryptin) { + char *end = memchr(inbuf, '\n', inlen); + if(!end) + end = inbuf + inlen; + else + end++; + memcpy(reqbuf + reqlen, inbuf, end - inbuf); + reqlen += end - inbuf; + + if(!process_meta(c, reqbuf, &reqlen)) + return false; + + memmove(inbuf, end, inlen - (end - inbuf)); + inlen -= end - inbuf; + } else { + size_t outlen = inlen; + + if(!cipher_decrypt(&c->incipher, inbuf, inlen, reqbuf + reqlen, &outlen, false) || inlen != outlen) { + logger(LOG_ERR, "Error while decrypting metadata from %s (%s)", c->name, c->hostname); + return false; + } + + reqlen += inlen; + inlen = 0; + + if(!process_meta(c, reqbuf, &reqlen)) + return false; + } + } + } }