X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=c402919b6bfd999b8a5f3d6833f37fae96041a4b;hb=cf5a9d0ff6ef59cd130a865ce1be44b4e8b8471a;hp=f7450fdfd959be45820bad2c652995aa9eeef1db;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad;p=meshlink diff --git a/src/meta.c b/src/meta.c index f7450fdf..c402919b 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,7 +1,6 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2002 Guus Sliepen , - 2000-2002 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,105 +12,106 @@ 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.34 2003/07/06 22:11:31 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 "config.h" -#include -#include - -#include -#include -#include -/* This line must be below the rest for FreeBSD */ -#include -#include - -#include +#include "system.h" -#include "net.h" #include "connection.h" -#include "system.h" -#include "protocol.h" #include "logger.h" +#include "meshlink_internal.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]; - int result; +bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) { + connection_t *c = handle; + meshlink_handle_t *mesh = c->mesh; - cp(); + if(!c) { + logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!"); + abort(); + } - logger(DEBUG_META, LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length, - c->name, c->hostname); + buffer_add(&c->outbuf, (const char *)buffer, length); + io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE); - if(c->status.encryptout) { - EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length); - bufp = outbuf; - length = outlen; - } else - bufp = buffer; - - while(length) { - result = write(c->socket, bufp, length); - if(result <= 0) { - if(errno == EINTR) - continue; - logger(DEBUG_ALWAYS, LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name, - c->hostname, strerror(errno)); - return -1; - } - bufp += result; - length -= result; - } - - return 0; + return true; } -void broadcast_meta(connection_t *from, char *buffer, int length) -{ - avl_node_t *node; - connection_t *c; +bool send_meta(meshlink_handle_t *mesh, 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 = (connection_t *) node->data; + if(c->allow_request == ID) { + buffer_add(&c->outbuf, buffer, length); + io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE); + return true; + } + return sptps_send_record(&c->sptps, 0, buffer, length); +} + +void broadcast_meta(meshlink_handle_t *mesh, connection_t *from, const char *buffer, int length) { + for list_each(connection_t, c, mesh->connections) if(c != from && c->status.active) - send_meta(c, buffer, length); - } + send_meta(mesh, c, buffer, length); } -int receive_meta(connection_t *c) -{ - int x; - socklen_t l = sizeof(x); - int oldlen, i; - int lenin, reqlen; - int decrypted = 0; - char inbuf[MAXBUFSIZE]; +bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t length) { + connection_t *c = handle; + meshlink_handle_t *mesh = c->mesh; + char *request = (char *)data; - cp(); + if(!c) { + logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!"); + abort(); + } - if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) { - logger(DEBUG_ALWAYS, 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(type == SPTPS_HANDSHAKE) { + if(c->allow_request == ACK) + return send_ack(mesh, c); + else + return true; } - if(x) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Metadata socket error for %s (%s): %s"), - c->name, c->hostname, strerror(x)); - return -1; + if(!request) + return true; + + /* Are we receiving a TCPpacket? */ + + if(c->tcplen) { + if(length != c->tcplen) + return false; + receive_tcppacket(mesh, c, request, length); + c->tcplen = 0; + return true; } + /* Change newline to null byte, just like non-SPTPS requests */ + + if(request[length - 1] == '\n') + request[length - 1] = 0; + + /* Otherwise we are waiting for a request */ + + return receive_request(mesh, c, request); +} + +bool receive_meta(meshlink_handle_t *mesh, connection_t *c) { + int inlen; + char inbuf[MAXBUFSIZE]; + char *bufp = inbuf, *endp; + /* Strategy: - Read as much as possible from the TCP socket in one go. - Decrypt it. @@ -121,84 +121,53 @@ 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); + buffer_compact(&c->inbuf, MAXBUFSIZE); - if(lenin <= 0) { - if(lenin == 0) { - logger(DEBUG_CONNECTIONS, LOG_NOTICE, _("Connection closed by %s (%s)"), - c->name, c->hostname); - } else if(errno == EINTR) - return 0; - else - logger(DEBUG_ALWAYS, LOG_ERR, _("Metadata socket read error for %s (%s): %s"), - c->name, c->hostname, strerror(errno)); - - return -1; + 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; + inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0); - while(lenin) { - /* Decrypt */ + 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; + } - if(c->status.decryptin && !decrypted) { - EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin); - memcpy(c->buffer + oldlen, inbuf, lenin); - decrypted = 1; - } + if(c->allow_request == ID) { + endp = memchr(bufp, '\n', inlen); + if(endp) + endp++; + else + endp = bufp + inlen; - /* Are we receiving a TCPpacket? */ + buffer_add(&c->inbuf, bufp, endp - bufp); - if(c->tcplen) { - if(c->tcplen <= c->buflen) { - receive_tcppacket(c, c->buffer, c->tcplen); + inlen -= endp - bufp; + bufp = endp; - c->buflen -= c->tcplen; - lenin -= c->tcplen; - memmove(c->buffer, c->buffer + c->tcplen, c->buflen); - oldlen = 0; - c->tcplen = 0; + while(c->inbuf.len) { + char *request = buffer_readline(&c->inbuf); + if(request) { + bool result = receive_request(mesh, c, request); + if(!result) + return false; 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 -1; - - c->buflen -= reqlen; - lenin -= reqlen; - memmove(c->buffer, c->buffer + reqlen, c->buflen); - oldlen = 0; - continue; - } else { - break; - } - } - - if(c->buflen >= MAXBUFSIZE) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Metadata read buffer overflow for %s (%s)"), - c->name, c->hostname); - return -1; + return true; } - c->last_ping_time = now; - - return 0; + return sptps_receive_data(&c->sptps, bufp, inlen); }