X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=14342608518aac02ee8c06cfe16d572e2935750a;hb=5216839fa30dfbf5204b274b4e8becbb34e6ca21;hp=1fbd22c29c26e90ccc11a85337598d6413c5f4f3;hpb=ffa3a443b9f01d3ea0fcb3c4fc6928a5c695cf4a;p=meshlink diff --git a/src/meta.c b/src/meta.c index 1fbd22c2..14342608 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,8 +1,6 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2009 Guus Sliepen , - 2000-2005 Ivo Timmermans - 2006 Scott Lamb + 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 @@ -21,58 +19,93 @@ #include "system.h" -#include "splay_tree.h" -#include "cipher.h" #include "connection.h" #include "logger.h" +#include "meshlink_internal.h" #include "meta.h" #include "net.h" #include "protocol.h" #include "utils.h" #include "xalloc.h" -bool send_meta(connection_t *c, const char *buffer, int length) { +bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) { + connection_t *c = handle; + if(!c) { - logger(LOG_ERR, "send_meta() called with NULL pointer!"); + 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); - /* Add our data to buffer */ - if(c->status.encryptout) { - size_t outlen = length; + return true; +} - if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) { - logger(LOG_ERR, "Error while encrypting metadata to %s (%s)", - c->name, c->hostname); - return false; - } +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(); + } + + logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length, + c->name, c->hostname); - } else { + if(c->allow_request == ID) { buffer_add(&c->outbuf, buffer, length); + io_set(&c->io, IO_READ | IO_WRITE); + return true; } - event_add(&c->outevent, NULL); - - return true; + return sptps_send_record(&c->sptps, 0, buffer, length); } void broadcast_meta(connection_t *from, const char *buffer, int length) { - splay_node_t *node; - connection_t *c; - - for(node = connection_tree->head; node; node = node->next) { - c = node->data; - + for list_each(connection_t, c, mesh->connections) 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 inlen, reqlen; + int inlen; char inbuf[MAXBUFSIZE]; char *bufp = inbuf, *endp; @@ -85,60 +118,40 @@ bool receive_meta(connection_t *c) { - If not, keep stuff in buffer and exit. */ + 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; + } + inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0); if(inlen <= 0) { if(!inlen || !errno) { - ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)", + logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)", c->name, c->hostname); } else if(sockwouldblock(sockerrno)) return true; else - logger(LOG_ERR, "Metadata socket read error for %s (%s): %s", + logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s", c->name, c->hostname, sockstrerror(sockerrno)); return false; } - do { - if(!c->status.decryptin) { - endp = memchr(bufp, '\n', inlen); - if(endp) - endp++; - else - endp = bufp + inlen; - - buffer_add(&c->inbuf, bufp, endp - bufp); - - inlen -= endp - bufp; - bufp = endp; - } else { - size_t outlen = inlen; - ifdebug(META) logger(LOG_DEBUG, "Received encrypted %d bytes", inlen); + if(c->allow_request == ID) { + endp = memchr(bufp, '\n', inlen); + if(endp) + endp++; + else + endp = bufp + inlen; - if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) { - logger(LOG_ERR, "Error while decrypting metadata from %s (%s)", - c->name, c->hostname); - return false; - } + buffer_add(&c->inbuf, bufp, endp - bufp); - inlen = 0; - } + inlen -= endp - bufp; + bufp = endp; while(c->inbuf.len) { - /* Are we receiving a TCPpacket? */ - - if(c->tcplen) { - char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen); - if(tcpbuffer) { - receive_tcppacket(c, tcpbuffer, c->tcplen); - continue; - } else { - break; - } - } - - /* Otherwise we are waiting for a request */ - char *request = buffer_readline(&c->inbuf); if(request) { bool result = receive_request(c, request); @@ -149,9 +162,9 @@ bool receive_meta(connection_t *c) { break; } } - } while(inlen); - buffer_compact(&c->inbuf); + return true; + } - return true; + return sptps_receive_data(&c->sptps, bufp, inlen); }