X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=78b81604a354bf22b5c0b951ad671a20ce8025fb;hb=e37ef57a956507cc29e80930201731562b4266e5;hp=dde0e2a4fce9b2c2130c21f32ac7be15114ec21d;hpb=ffb7327c20952cefcb5578e40f9802295172c5c2;p=tinc diff --git a/src/meta.c b/src/meta.c index dde0e2a4..78b81604 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,7 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2003 Guus Sliepen , - 2000-2003 Ivo Timmermans + Copyright (C) 2000-2006 Guus Sliepen , + 2000-2005 Ivo Timmermans 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 @@ -17,7 +17,7 @@ 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.1.2.47 2003/10/11 14:18:52 guus Exp $ + $Id$ */ #include "system.h" @@ -25,20 +25,17 @@ #include #include -#include "avl_tree.h" +#include "splay_tree.h" #include "connection.h" #include "logger.h" #include "meta.h" #include "net.h" #include "protocol.h" -#include "system.h" #include "utils.h" +#include "xalloc.h" -bool send_meta(connection_t *c, const char *buffer, int length) -{ - const char *bufp; +bool send_meta(connection_t *c, const char *buffer, int length) { int outlen; - char outbuf[MAXBUFSIZE]; int result; cp(); @@ -46,41 +43,86 @@ bool send_meta(connection_t *c, const char *buffer, int length) ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length, c->name, c->hostname); + if(!c->outbuflen) { + if(event_add(&c->outev, NULL) < 0) { + logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno)); + abort(); + } + } + + /* Find room in connection's buffer */ + if(length + c->outbuflen > c->outbufsize) { + c->outbufsize = length + c->outbuflen; + c->outbuf = xrealloc(c->outbuf, c->outbufsize); + } + + if(length + c->outbuflen + c->outbufstart > c->outbufsize) { + memmove(c->outbuf, c->outbuf + c->outbufstart, c->outbuflen); + c->outbufstart = 0; + } + + /* Add our data to buffer */ if(c->status.encryptout) { - result = EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length); - if(!result || outlen != length) { + 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)); return false; + } else if(outlen > length) { + logger(LOG_EMERG, _("Encrypted data too long! Heap corrupted!")); + abort(); } - bufp = outbuf; - length = outlen; - } else - bufp = buffer; + c->outbuflen += outlen; + } else { + memcpy(c->outbuf + c->outbufstart + c->outbuflen, buffer, length); + c->outbuflen += length; + } + + return true; +} - while(length) { - result = send(c->socket, bufp, length, 0); +void flush_meta(int fd, short events, void *data) { + connection_t *c = data; + 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) + } else if(errno == EINTR) { continue; - else - logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name, +#ifdef EWOULDBLOCK + } else if(errno == EWOULDBLOCK) { + ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s) would block"), + c->outbuflen, c->name, c->hostname); + return; +#endif + } else { + logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name, c->hostname, strerror(errno)); - return false; + } + + terminate_connection(c, c->status.active); + return; } - bufp += result; - length -= result; + + c->outbufstart += result; + c->outbuflen -= result; } - - return true; + + event_del(&c->outev); + + c->outbufstart = 0; /* avoid unnecessary memmoves */ } -void broadcast_meta(connection_t *from, const char *buffer, int length) -{ - avl_node_t *node; +void broadcast_meta(connection_t *from, const char *buffer, int length) { + splay_node_t *node; connection_t *c; cp(); @@ -93,10 +135,9 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) } } -bool receive_meta(connection_t *c) -{ +bool receive_meta(connection_t *c) { int oldlen, i, result; - int lenin, lenout, reqlen; + int inlen, outlen, reqlen; bool decrypted = false; char inbuf[MAXBUFSIZE]; @@ -111,10 +152,10 @@ 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); + inlen = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0); - if(lenin <= 0) { - if(!lenin || !errno) { + if(inlen <= 0) { + if(!inlen || !errno) { ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"), c->name, c->hostname); } else if(errno == EINTR) @@ -127,19 +168,19 @@ bool receive_meta(connection_t *c) } oldlen = c->buflen; - c->buflen += lenin; + c->buflen += inlen; - while(lenin > 0) { + while(inlen > 0) { /* Decrypt */ if(c->status.decryptin && !decrypted) { - result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, c->buffer + oldlen, lenin); - if(!result || lenout != lenin) { + result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &outlen, (unsigned char *)c->buffer + oldlen, inlen); + if(!result || outlen != inlen) { logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"), c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL)); return false; } - memcpy(c->buffer + oldlen, inbuf, lenin); + memcpy(c->buffer + oldlen, inbuf, inlen); decrypted = true; } @@ -150,7 +191,7 @@ bool receive_meta(connection_t *c) receive_tcppacket(c, c->buffer, c->tcplen); c->buflen -= c->tcplen; - lenin -= c->tcplen; + inlen -= c->tcplen - oldlen; memmove(c->buffer, c->buffer + c->tcplen, c->buflen); oldlen = 0; c->tcplen = 0; @@ -178,7 +219,7 @@ bool receive_meta(connection_t *c) return false; c->buflen -= reqlen; - lenin -= reqlen - oldlen; + inlen -= reqlen - oldlen; memmove(c->buffer, c->buffer + reqlen, c->buflen); oldlen = 0; continue; @@ -193,7 +234,7 @@ bool receive_meta(connection_t *c) return false; } - c->last_ping_time = now; + c->last_ping_time = time(NULL); return true; }