X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=b15ed8374eaca3cef2a18d8acef4ac291535d53c;hb=2956559f7d12caa9779207525419801e0e9ab3e3;hp=5048e63bb1d19236ae212867c4d8a954d345a4b1;hpb=b0dd705a264f0f72a7afba6de85200598cbe083b;p=meshlink diff --git a/src/meta.c b/src/meta.c index 5048e63b..b15ed837 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,6 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2003 Guus Sliepen , - 2000-2003 Ivo Timmermans + Copyright (C) 2014 Guus Sliepen , 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,92 +12,96 @@ 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.45 2003/10/10 16:24:24 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 "system.h" -#include - -#include "avl_tree.h" +#include "cipher.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; - int outlen; - char outbuf[MAXBUFSIZE]; - int result; +bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) { + connection_t *c = handle; - cp(); + if(!c) { + logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!"); + abort(); + } - ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length, - c->name, c->hostname); + buffer_add(&c->outbuf, buffer, length); + io_set(&c->io, IO_READ | IO_WRITE); - if(c->status.encryptout) { - result = EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length); - if(!result || outlen != length) { - logger(LOG_ERR, _("Error while encrypting metadata to %s (%s): %s"), 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; - } - return true; } -void broadcast_meta(connection_t *from, const char *buffer, int length) -{ - avl_node_t *node; - connection_t *c; +bool send_meta(connection_t *c, const char *buffer, int length) { + if(!c) { + logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!"); + abort(); + } - cp(); + logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length, + c->name, c->hostname); - for(node = connection_tree->head; node; node = node->next) { - c = node->data; + return sptps_send_record(&c->sptps, 0, buffer, length); +} +void broadcast_meta(connection_t *from, const char *buffer, int length) { + for list_each(connection_t, c, connection_list) if(c != from && c->status.active) send_meta(c, buffer, length); +} + +bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) { + connection_t *c = handle; + + if(!c) { + logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!"); + abort(); + } + + if(type == SPTPS_HANDSHAKE) { + if(c->allow_request == ACK) + return send_ack(c); + else + return true; } + + if(!data) + return true; + + /* Are we receiving a TCPpacket? */ + + if(c->tcplen) { + if(length != c->tcplen) + return false; + receive_tcppacket(c, data, length); + c->tcplen = 0; + return true; + } + + /* Change newline to null byte, just like non-SPTPS requests */ + + if(data[length - 1] == '\n') + ((char *)data)[length - 1] = 0; + + /* Otherwise we are waiting for a request */ + + return receive_request(c, data); } -bool receive_meta(connection_t *c) -{ - int oldlen, i, result; - int lenin, lenout, reqlen; - bool decrypted = false; +bool receive_meta(connection_t *c) { + int inlen; char inbuf[MAXBUFSIZE]; - - cp(); + char *bufp = inbuf, *endp; /* Strategy: - Read as much as possible from the TCP socket in one go. @@ -109,88 +112,26 @@ 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)); + buffer_compact(&c->inbuf, MAXBUFSIZE); + if(sizeof inbuf <= c->inbuf.len) { + logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname); return false; } - oldlen = c->buflen; - c->buflen += lenin; - - while(lenin > 0) { - /* Decrypt */ - - if(c->status.decryptin && !decrypted) { - result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, c->buffer + oldlen, lenin); - if(!result || lenout != lenin) { - logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"), ERR_error_string(ERR_get_error(), NULL)); - return false; - } - memcpy(c->buffer + oldlen, inbuf, lenin); - decrypted = true; - } - - /* Are we receiving a TCPpacket? */ - - if(c->tcplen) { - if(c->tcplen <= c->buflen) { - receive_tcppacket(c, c->buffer, c->tcplen); - - c->buflen -= c->tcplen; - lenin -= c->tcplen; - memmove(c->buffer, c->buffer + c->tcplen, c->buflen); - oldlen = 0; - c->tcplen = 0; - continue; - } else { - break; - } - } - - /* 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; - memmove(c->buffer, c->buffer + reqlen, c->buflen); - oldlen = 0; - continue; - } else { - break; - } - } + inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0); - if(c->buflen >= MAXBUFSIZE) { - logger(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"), - c->name, c->hostname); + if(inlen <= 0) { + if(!inlen || !errno) { + logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)", + c->name, c->hostname); + } else if(sockwouldblock(sockerrno)) + return true; + else + logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s", + c->name, c->hostname, sockstrerror(sockerrno)); return false; } - c->last_ping_time = now; - - return true; + return sptps_receive_data(&c->sptps, bufp, inlen); }