X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=b15ed8374eaca3cef2a18d8acef4ac291535d53c;hb=2956559f7d12caa9779207525419801e0e9ab3e3;hp=a3f7ef3cfa1f38c7fae38badbfcc11f28eb641a9;hpb=a22041922f160667573e9a5ae3f4195e1668906a;p=meshlink diff --git a/src/meta.c b/src/meta.c index a3f7ef3c..b15ed837 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,7 +19,6 @@ #include "system.h" -#include "splay_tree.h" #include "cipher.h" #include "connection.h" #include "logger.h" @@ -31,48 +28,74 @@ #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) { - char outbuf[length]; - size_t outlen = length; + return true; +} - 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); - return false; - } - - ifdebug(META) logger(LOG_DEBUG, "Encrypted write %p %p %p %d", c, c->buffer, outbuf, length); - bufferevent_write(c->buffer, (void *)outbuf, length); - ifdebug(META) logger(LOG_DEBUG, "Done."); - } else { - ifdebug(META) logger(LOG_DEBUG, "Unencrypted write %p %p %p %d", c, c->buffer, buffer, length); - bufferevent_write(c->buffer, (void *)buffer, length); - ifdebug(META) logger(LOG_DEBUG, "Done."); +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(); } - return true; + logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length, + c->name, c->hostname); + + 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, 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) { @@ -89,75 +112,26 @@ bool receive_meta(connection_t *c) { - If not, keep stuff in buffer and exit. */ - inlen = recv(c->socket, inbuf, sizeof inbuf, 0); + 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; - - evbuffer_add(c->buffer->input, bufp, endp - bufp); - - inlen -= endp - bufp; - bufp = endp; - } else { - size_t outlen = inlen; - ifdebug(META) logger(LOG_DEBUG, "Received encrypted %d bytes", inlen); - evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen); - - if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) { - logger(LOG_ERR, "Error while decrypting metadata from %s (%s)", - c->name, c->hostname); - return false; - } - c->buffer->input->off += inlen; - - inlen = 0; - } - - 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; - } - } - - /* Otherwise we are waiting for a request */ - - char *request = evbuffer_readline(c->buffer->input); - if(request) { - bool result = receive_request(c, request); - free(request); - if(!result) - return false; - continue; - } else { - break; - } - } - } while(inlen); - - return true; + return sptps_receive_data(&c->sptps, bufp, inlen); }