X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=6054427ce62b0d64b8a283f109afc7dfe7a3c3c7;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=fa475dfb758d32f3c69a4d201f0125c5d230bf9c;hpb=f75dcef72a81a337e847adf0bae54198894f65b9;p=meshlink diff --git a/src/meta.c b/src/meta.c index fa475dfb..6054427c 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,7 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2002 Guus Sliepen , - 2000-2002 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,93 +17,76 @@ 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 $ + $Id$ */ -#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" +#include "utils.h" +#include "xalloc.h" -int send_meta(connection_t * c, char *buffer, int length) -{ - char *bufp; - int outlen; - char outbuf[MAXBUFSIZE]; - +bool send_meta(connection_t *c, const char *buffer, int length) { cp(); - if(debug_lvl >= DEBUG_META) - syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), 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) { - 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; + 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; + } + + ifdebug(META) logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length); + bufferevent_write(c->buffer, (void *)outbuf, length); + ifdebug(META) logger(LOG_DEBUG, _("Done.")); + } else { + ifdebug(META) logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length); + bufferevent_write(c->buffer, (void *)buffer, length); + ifdebug(META) logger(LOG_DEBUG, _("Done.")); } - return 0; + return true; } -void broadcast_meta(connection_t * from, 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(); 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) { + size_t inlen; char inbuf[MAXBUFSIZE]; + char *bufp = inbuf, *endp; 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,86 +96,70 @@ 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); + inlen = recv(c->socket, inbuf, sizeof inbuf, 0); - 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; + if(inlen <= 0) { + logger(LOG_ERR, _("Receive callback called for %s (%s) but no data to receive: %s"), c->name, c->hostname, strerror(errno)); + return false; } - oldlen = c->buflen; - c->buflen += lenin; + do { + if(!c->status.decryptin) { + endp = memchr(bufp, '\n', inlen); + if(endp) + endp++; + else + endp = bufp + inlen; - 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; - } + evbuffer_add(c->buffer->input, bufp, endp - bufp); - /* Are we receiving a TCPpacket? */ - - if(c->tcplen) { - if(c->tcplen <= c->buflen) { - receive_tcppacket(c, c->buffer, c->tcplen); + inlen -= endp - bufp; + bufp = endp; + } else { + size_t outlen = inlen; + ifdebug(META) logger(LOG_DEBUG, _("Received encrypted %zu bytes"), inlen); + evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen); - c->buflen -= c->tcplen; - lenin -= c->tcplen; - memmove(c->buffer, c->buffer + c->tcplen, c->buflen); - oldlen = 0; - c->tcplen = 0; - continue; - } else { - break; + if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) { + logger(LOG_ERR, _("Error while decrypting metadata from %s (%s)"), + c->name, c->hostname); + return false; } + c->buffer->input->off += inlen; + + inlen = 0; } - /* Otherwise we are waiting for a request */ + while(c->buffer->input->off) { + /* Are we receiving a TCPpacket? */ + + if(c->tcplen) { + if(c->tcplen <= c->buffer->input->off) { + receive_tcppacket(c, (char *)c->buffer->input->buffer, c->tcplen); + evbuffer_drain(c->buffer->input, c->tcplen); + c->tcplen = 0; + continue; + } else { + break; + } + } - reqlen = 0; + /* Otherwise we are waiting for a request */ - 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; + char *request = evbuffer_readline(c->buffer->input); + if(request) { + bool result = receive_request(c, request); + free(request); + if(!result) + return false; + continue; + } else { break; } } + } while(inlen); - if(reqlen) { - c->reqlen = 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; + c->last_ping_time = time(NULL); - return 0; + return true; }