X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=524a6ce03254d5d4651c465fdf971dbabeb66cd8;hb=40731d030fef793c6b6405efd9b3e64c26c00045;hp=93bc48b37712619caa09fed6dc9887d9f3404001;hpb=7926a156e5b118d06295228e57de0cc9de0433b4;p=tinc diff --git a/src/meta.c b/src/meta.c index 93bc48b3..524a6ce0 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,7 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2004 Guus Sliepen , - 2000-2004 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 @@ -25,62 +25,48 @@ #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(); 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) { - result = EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length); + char outbuf[length]; + + result = EVP_EncryptUpdate(c->outctx, (unsigned char *)outbuf, &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; } - bufp = outbuf; - length = outlen; - } else - bufp = buffer; - - while(length) { - result = send(c->socket, bufp, length, 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 - logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name, - c->hostname, strerror(errno)); - return false; - } - bufp += result; - length -= result; + + logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length); + bufferevent_write(c->buffer, (void *)outbuf, length); + logger(LOG_DEBUG, _("Done.")); + } else { + logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length); + bufferevent_write(c->buffer, (void *)buffer, length); + logger(LOG_DEBUG, _("Done.")); } - + return true; } -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,12 +79,10 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) } } -bool receive_meta(connection_t *c) -{ - int oldlen, i, result; - int lenin, lenout, reqlen; - bool decrypted = false; +bool receive_meta(connection_t *c) { + int result, inlen, outlen; char inbuf[MAXBUFSIZE]; + char *bufp = inbuf, *endp; cp(); @@ -111,89 +95,67 @@ 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); - - if(lenin <= 0) { - if(!lenin || !errno) { - ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"), - c->name, c->hostname); - } else if(errno == EINTR) - return true; - else - logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"), - c->name, c->hostname, strerror(errno)); + 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; } - 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 > 0) { - /* Decrypt */ + evbuffer_add(c->buffer->input, bufp, endp - bufp); - if(c->status.decryptin && !decrypted) { - result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, c->buffer + oldlen, lenin); - if(!result || lenout != lenin) { + inlen -= endp - bufp; + bufp = endp; + } else { + logger(LOG_DEBUG, _("Received encrypted %d bytes"), inlen); + evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen); + result = EVP_DecryptUpdate(c->inctx, (unsigned char *)c->buffer->input->buffer + c->buffer->input->off, &outlen, (unsigned char *)bufp, 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)); + c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL)); return false; } - memcpy(c->buffer + oldlen, inbuf, lenin); - decrypted = true; + c->buffer->input->off += inlen; + + inlen = 0; } - /* Are we receiving a TCPpacket? */ + 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; + } + } - if(c->tcplen) { - if(c->tcplen <= c->buflen) { - receive_tcppacket(c, c->buffer, c->tcplen); + /* Otherwise we are waiting for a request */ - c->buflen -= c->tcplen; - lenin -= c->tcplen - oldlen; - memmove(c->buffer, c->buffer + c->tcplen, c->buflen); - oldlen = 0; - c->tcplen = 0; + char *request = evbuffer_readline(c->buffer->input); + if(request) { + receive_request(c, request); + free(request); continue; } else { break; } } + } while(inlen); - /* 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) { - c->reqlen = reqlen; - if(!receive_request(c)) - return false; - - c->buflen -= reqlen; - lenin -= reqlen - oldlen; - memmove(c->buffer, c->buffer + reqlen, c->buflen); - oldlen = 0; - continue; - } else { - break; - } - } - - if(c->buflen >= MAXBUFSIZE) { - logger(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"), - c->name, c->hostname); - return false; - } - - c->last_ping_time = now; + c->last_ping_time = time(NULL); return true; }