X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=82dde3a54442ef73f933e1f607138fd52eab1966;hp=289d0b873bc032a3b21e6279c372a07e8e14e2a6;hb=551cd19406a560d0d206bff5b4e9da064ec222b6;hpb=408ca91766088b6c2d38e198b0692bf394b41248 diff --git a/src/meta.c b/src/meta.c index 289d0b87..82dde3a5 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,7 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000 Guus Sliepen , - 2000 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,168 +17,144 @@ 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.12 2000/11/20 19:12:12 guus Exp $ + $Id$ */ -#include "config.h" -#include - -#include -#include -#include -#include -#include -/* This line must be below the rest for FreeBSD */ -#include - -#ifdef HAVE_OPENSSL_EVP_H -# include -#else -# include -#endif +#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 *cl, char *buffer, int length) -{ - char outbuf[MAXBUFSIZE]; - char *bufp; - int outlen; -cp - if(debug_lvl >= DEBUG_META) - syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s): %s"), length, - cl->name, cl->hostname, buffer); - - buffer[length-1]='\n'; - - if(cl->status.encryptout) - { - EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length); - bufp = outbuf; - length = outlen; - } - else - bufp = buffer; - - if(write(cl->meta_socket, bufp, length) < 0) - { - syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %m"), cl->name, cl->hostname); - return -1; - } -cp - return 0; +#include "utils.h" +#include "xalloc.h" + +bool send_meta(connection_t *c, const char *buffer, int length) { + cp(); + + 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; + } + + 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 true; } -void broadcast_meta(connection_t *cl, char *buffer, int length) -{ - rbl_t *rbl; - connection_t *p; -cp - RBL_FOREACH(connection_tree, rbl) - { - p = (connection_t *)rbl->data; - if(p != cl && p->status.meta && p->status.active) - send_meta(p, buffer, length); - } -cp +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 = node->data; + + if(c != from && c->status.active) + send_meta(c, buffer, length); + } } -int receive_meta(connection_t *cl) -{ - int x, l = sizeof(x); - int oldlen, i; - int lenin = 0; - char inbuf[MAXBUFSIZE]; - char *bufp; -cp - if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) - { - syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->meta_socket, - cl->name, cl->hostname); - return -1; - } - if(x) - { - syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"), - cl->name, cl->hostname, strerror(x)); - return -1; - } - - if(cl->status.decryptin) - bufp = inbuf; - else - bufp = cl->buffer + cl->buflen; - - lenin = read(cl->meta_socket, bufp, MAXBUFSIZE - cl->buflen); - - if(lenin<=0) - { - if(errno==EINTR) - return 0; - if(errno==0) - { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), - cl->name, cl->hostname); - } - else - syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"), - cl->name, cl->hostname); - return -1; - } - - if(cl->status.decryptin) - { - EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin); - } - - oldlen = cl->buflen; - cl->buflen += lenin; - - for(;;) - { - cl->reqlen = 0; - - for(i = oldlen; i < cl->buflen; i++) - { - if(cl->buffer[i] == '\n') - { - cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */ - cl->reqlen = i + 1; - break; - } - } - - if(cl->reqlen) - { - if(debug_lvl >= DEBUG_META) - syslog(LOG_DEBUG, _("Got request from %s (%s): %s"), - cl->name, cl->hostname, cl->buffer); - - if(receive_request(cl)) - return -1; - - cl->buflen -= cl->reqlen; - memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen); - oldlen = 0; - } - else - { - break; - } - } - - if(cl->buflen >= MAXBUFSIZE) - { - syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"), - cl->name, cl->hostname); - return -1; - } - - cl->last_ping_time = time(NULL); -cp - return 0; +bool receive_meta(connection_t *c) { + size_t inlen; + char inbuf[MAXBUFSIZE]; + char *bufp = inbuf, *endp; + + cp(); + + /* 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. + */ + + inlen = recv(c->socket, inbuf, sizeof inbuf, 0); + + 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; + } + + do { + if(!c->status.decryptin) { + endp = memchr(bufp, '\n', inlen); + if(endp) + endp++; + else + endp = bufp + inlen; + + evbuffer_add(c->buffer->input, bufp, endp - bufp); + + 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); + + 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; + } + + 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; + } + } + + /* Otherwise we are waiting for a request */ + + 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); + + c->last_ping_time = time(NULL); + + return true; }