X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=fe213643e2db018a790883eaa720ee5cdc761bb6;hb=f79cc0e0bba16a3aa42a5fa13098cda714623205;hp=160333b2c4cb140ced2bb17395ab550f0d6cb89d;hpb=21f0bddfa4dca5fb21c9dc4970ac64fa8fe706e4;p=meshlink diff --git a/src/meta.c b/src/meta.c index 160333b2..fe213643 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,6 +1,6 @@ /* meta.c -- handle the meta communication - Copyright (C) 2014 Guus Sliepen , + Copyright (C) 2014-2017 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 @@ -19,7 +19,6 @@ #include "system.h" -#include "cipher.h" #include "connection.h" #include "logger.h" #include "meshlink_internal.h" @@ -29,143 +28,120 @@ #include "utils.h" #include "xalloc.h" -bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) { +bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) { + (void)type; connection_t *c = handle; + meshlink_handle_t *mesh = c->mesh; if(!c) { - logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!"); + logger(mesh, MESHLINK_ERROR, "send_meta_sptps() called with NULL pointer!"); abort(); } - buffer_add(&c->outbuf, buffer, length); - io_set(&c->io, IO_READ | IO_WRITE); + buffer_add(&c->outbuf, (const char *)buffer, length); + io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE); return true; } -bool send_meta(connection_t *c, const char *buffer, int length) { +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!"); + logger(mesh, MESHLINK_ERROR, "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); + logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s", length, c->name); if(c->allow_request == ID) { buffer_add(&c->outbuf, buffer, length); - io_set(&c->io, IO_READ | IO_WRITE); + io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE); return true; } return sptps_send_record(&c->sptps, 0, buffer, length); } -void broadcast_meta(connection_t *from, const char *buffer, int 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); } -bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) { +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; if(!c) { - logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!"); + logger(mesh, MESHLINK_ERROR, "receive_meta_sptps() called with NULL pointer!"); abort(); } if(type == SPTPS_HANDSHAKE) { if(c->allow_request == ACK) - return send_ack(c); + return send_ack(mesh, c); else return true; } - if(!data) + if(!request) 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; + abort(); // TODO: get rid of tcplen altogether } /* Change newline to null byte, just like non-SPTPS requests */ - if(data[length - 1] == '\n') - ((char *)data)[length - 1] = 0; + if(request[length - 1] == '\n') + request[length - 1] = 0; /* Otherwise we are waiting for a request */ - return receive_request(c, data); + return receive_request(mesh, c, request); } -bool receive_meta(connection_t *c) { +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. - - 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. - */ - - 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); + inlen = recv(c->socket, inbuf, sizeof(inbuf), 0); if(inlen <= 0) { if(!inlen || !errno) { - logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)", - c->name, c->hostname); + logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name); } 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)); + logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s: %s", c->name, sockstrerror(sockerrno)); return false; } if(c->allow_request == ID) { - endp = memchr(bufp, '\n', inlen); - if(endp) - endp++; - else - endp = bufp + inlen; - - buffer_add(&c->inbuf, bufp, endp - bufp); - - inlen -= endp - bufp; - bufp = endp; - - while(c->inbuf.len) { - char *request = buffer_readline(&c->inbuf); - if(request) { - bool result = receive_request(c, request); - if(!result) - return false; - continue; - } else { - break; - } + buffer_add(&c->inbuf, inbuf, inlen); + + char *request = buffer_readline(&c->inbuf); + + if(request) { + if(!receive_request(mesh, c, request) || c->allow_request == ID) + return false; + + int left = c->inbuf.len - c->inbuf.offset; + if(left > 0) { + fprintf(stderr, "GOT A LITTLE MORE\n"); + return sptps_receive_data(&c->sptps, buffer_read(&c->inbuf, left), left); + } else + return true; } - return true; + if(c->inbuf.len >= sizeof(inbuf)) { + logger(mesh, MESHLINK_ERROR, "Input buffer full for %s", c->name); + return false; + } else + return true; } - return sptps_receive_data(&c->sptps, bufp, inlen); + return sptps_receive_data(&c->sptps, inbuf, inlen); }