X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=b556e1750fa585b759d38084891de07aae4ba444;hb=6834b882015a9323672e9fce8811aa4283f196f0;hp=2791ea198c2b4e4471f7e0734a613cff686cc9bf;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5;p=tinc diff --git a/src/meta.c b/src/meta.c index 2791ea19..b556e175 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,8 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2006 Guus Sliepen , + 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,11 +14,9 @@ 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$ + 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 "system.h" @@ -33,9 +32,13 @@ #include "xalloc.h" bool send_meta(connection_t *c, const char *buffer, int length) { - cp(); + 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); + 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) { @@ -43,13 +46,14 @@ bool send_meta(connection_t *c, const char *buffer, int 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); + logger(LOG_ERR, "Error while encrypting metadata to %s (%s)", + c->name, c->hostname); return false; } - bufferevent_write(c->buffer, (void *)outbuf, length); + write(c->socket, outbuf, length); } else { - bufferevent_write(c->buffer, (void *)buffer, length); + write(c->socket, buffer, length); } return true; @@ -59,8 +63,6 @@ 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; @@ -69,84 +71,98 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) { } } +static bool process_meta(connection_t *c, char *reqbuf, int *len) { + while(*len) { + if(c->tcplen) { + if(c->tcplen > *len) + break; + + mutex_lock(&mutex); + receive_tcppacket(c, reqbuf, c->tcplen); + mutex_unlock(&mutex); + + memmove(reqbuf, reqbuf, *len - c->tcplen); + *len -= c->tcplen; + } else { + char *end = memchr(reqbuf, '\n', *len); + if(!end) + break; + else + *end++ = 0; + + mutex_lock(&mutex); + bool success = receive_request(c, reqbuf); + mutex_unlock(&mutex); + + if(!success) + return false; + + memmove(reqbuf, end, *len - (end - reqbuf)); + *len -= end - reqbuf; + } + } + + return true; +} + bool receive_meta(connection_t *c) { - size_t inlen; + int inlen; + int reqlen = 0; char inbuf[MAXBUFSIZE]; - char *bufp = inbuf, *endp; - - cp(); + char reqbuf[MAXBUFSIZE]; /* 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. + - Decrypt it if necessary. + - Check if a full request is in the request buffer. + - If yes, process request and remove it from the buffer, then check again. + - If not, try to read more. */ - 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; - } + while(true) { + inlen = recv(c->socket, inbuf, sizeof inbuf - reqlen, 0); - do { - if(!c->status.decryptin) { - endp = memchr(bufp, '\n', inlen); - if(endp) - endp++; + if(inlen <= 0) { + if(!inlen || !errno) { + ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)", + c->name, c->hostname); + } else if(sockwouldblock(sockerrno)) + continue; else - endp = bufp + inlen; - - evbuffer_add(c->buffer->input, bufp, endp - bufp); - - inlen -= endp - bufp; - bufp = endp; - } else { - size_t outlen = inlen; - evbuffer_expand(c->buffer->input, inlen); + logger(LOG_ERR, "Metadata socket read error for %s (%s): %s", + c->name, c->hostname, sockstrerror(sockerrno)); + return false; + } - if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer, &outlen, false) || inlen != outlen) { - logger(LOG_ERR, _("Error while decrypting metadata from %s (%s)"), c->name, c->hostname); - return false; - } + while(inlen) { + if(!c->status.decryptin) { + char *end = memchr(inbuf, '\n', inlen); + if(!end) + end = inbuf + inlen; + else + end++; + memcpy(reqbuf + reqlen, inbuf, end - inbuf); + reqlen += end - inbuf; + + if(!process_meta(c, reqbuf, &reqlen)) + return false; - c->buffer->input->off += inlen; - inlen = 0; - } + memmove(inbuf, end, inlen - (end - inbuf)); + inlen -= end - inbuf; + } else { + size_t outlen = inlen; - 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(!cipher_decrypt(&c->incipher, inbuf, inlen, reqbuf + reqlen, &outlen, false) || inlen != outlen) { + logger(LOG_ERR, "Error while decrypting metadata from %s (%s)", c->name, c->hostname); + return false; } - } - /* Otherwise we are waiting for a request */ + reqlen += inlen; + inlen = 0; - char *request = evbuffer_readline(c->buffer->input); - if(request) { - bool result = receive_request(c, request); - free(request); - if(!result) + if(!process_meta(c, reqbuf, &reqlen)) return false; - continue; - } else { - break; } } - } while(inlen); - - c->last_ping_time = time(NULL); - - return true; + } }