X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fmeta.c;h=4c52464c33d2a62f663f54c2b920832b8a20e910;hp=fa475dfb758d32f3c69a4d201f0125c5d230bf9c;hb=e00b44cb98e4d50a0d426048ba01dbd80bcb5941;hpb=f75dcef72a81a337e847adf0bae54198894f65b9 diff --git a/src/meta.c b/src/meta.c index fa475df..4c52464 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,97 +14,124 @@ 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.1.2.29 2002/09/09 21:24:34 guus 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 "system.h" +#include #include -#include "net.h" +#include "avl_tree.h" #include "connection.h" -#include "system.h" +#include "logger.h" +#include "meta.h" +#include "net.h" #include "protocol.h" +#include "utils.h" +#include "xalloc.h" -int send_meta(connection_t * c, char *buffer, int length) -{ - char *bufp; +bool send_meta(connection_t *c, const char *buffer, int length) { int outlen; - char outbuf[MAXBUFSIZE]; + int result; - cp(); + if(!c) { + logger(LOG_ERR, "send_meta() called with NULL pointer!"); + abort(); + } - if(debug_lvl >= DEBUG_META) - syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length, + ifdebug(META) logger(LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length, c->name, c->hostname); + if(!c->outbuflen) + c->last_flushed_time = now; + + /* 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) { - 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; + 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(); + } + c->outbuflen += outlen; + } else { + memcpy(c->outbuf + c->outbufstart + c->outbuflen, buffer, length); + c->outbuflen += length; } - return 0; + return true; } -void broadcast_meta(connection_t * from, char *buffer, int length) -{ +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)); + } + + return false; + } + + c->outbufstart += result; + c->outbuflen -= result; + } + + c->outbufstart = 0; /* avoid unnecessary memmoves */ + return true; +} + +void broadcast_meta(connection_t *from, const 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; + 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; +bool receive_meta(connection_t *c) { + int oldlen, i, result; + int lenin, lenout, reqlen; + bool decrypted = false; 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. @@ -113,33 +141,36 @@ int receive_meta(connection_t * c) - If not, keep stuff in buffer and exit. */ - lenin = read(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen); + lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0); if(lenin <= 0) { - if(lenin == 0) { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), + if(!lenin || !errno) { + ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)", c->name, c->hostname); - } else if(errno == EINTR) - return 0; + } else if(sockwouldblock(sockerrno)) + return true; else - syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %s"), - c->name, c->hostname, strerror(errno)); + logger(LOG_ERR, "Metadata socket read error for %s (%s): %s", + c->name, c->hostname, sockstrerror(sockerrno)); - return -1; + return false; } oldlen = c->buflen; c->buflen += lenin; - while(lenin) { + while(lenin > 0) { /* Decrypt */ if(c->status.decryptin && !decrypted) { - EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, - lenin); + 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)); + return false; + } memcpy(c->buffer + oldlen, inbuf, lenin); - decrypted = 1; + decrypted = true; } /* Are we receiving a TCPpacket? */ @@ -149,7 +180,7 @@ int receive_meta(connection_t * c) receive_tcppacket(c, c->buffer, c->tcplen); c->buflen -= c->tcplen; - lenin -= c->tcplen; + lenin -= c->tcplen - oldlen; memmove(c->buffer, c->buffer + c->tcplen, c->buflen); oldlen = 0; c->tcplen = 0; @@ -173,11 +204,11 @@ int receive_meta(connection_t * c) if(reqlen) { c->reqlen = reqlen; - if(receive_request(c)) - return -1; + if(!receive_request(c)) + return false; c->buflen -= reqlen; - lenin -= reqlen; + lenin -= reqlen - oldlen; memmove(c->buffer, c->buffer + reqlen, c->buflen); oldlen = 0; continue; @@ -187,12 +218,10 @@ int receive_meta(connection_t * c) } if(c->buflen >= MAXBUFSIZE) { - syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"), + logger(LOG_ERR, "Metadata read buffer overflow for %s (%s)", c->name, c->hostname); - return -1; + return false; } - c->last_ping_time = now; - - return 0; + return true; }