X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=e31c171cc7987f34c3f387bd13ab7974fe6398cb;hb=fe88f9a979110acb8acc6500444678d49e068bc5;hp=f68e077a8706ac5be2544d43f991eb8f564834ae;hpb=a86faaf34711d6b0f278b670d70a229a3cf0d479;p=meshlink diff --git a/src/meta.c b/src/meta.c index f68e077a..e31c171c 100644 --- a/src/meta.c +++ b/src/meta.c @@ -1,8 +1,6 @@ /* meta.c -- handle the meta communication - Copyright (C) 2000-2013 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,9 +19,9 @@ #include "system.h" -#include "cipher.h" #include "connection.h" #include "logger.h" +#include "meshlink_internal.h" #include "meta.h" #include "net.h" #include "protocol.h" @@ -32,6 +30,7 @@ bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) { connection_t *c = handle; + meshlink_handle_t *mesh = c->mesh; if(!c) { logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!"); @@ -39,12 +38,12 @@ bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t leng } 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; } -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!"); abort(); @@ -53,35 +52,24 @@ bool send_meta(connection_t *c, const char *buffer, int length) { logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length, c->name, c->hostname); - if(c->protocol_minor >= 2) - return sptps_send_record(&c->sptps, 0, buffer, length); - - /* Add our data to buffer */ - if(c->status.encryptout) { - size_t outlen = length; - - if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) { - logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)", - c->name, c->hostname); - return false; - } - } else { + if(c->allow_request == ID) { buffer_add(&c->outbuf, buffer, length); + io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE); + return true; } - io_set(&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) { - for list_each(connection_t, c, connection_list) +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) { connection_t *c = handle; + meshlink_handle_t *mesh = c->mesh; if(!c) { logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!"); @@ -90,7 +78,7 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l if(type == SPTPS_HANDSHAKE) { if(c->allow_request == ACK) - return send_ack(c); + return send_ack(mesh, c); else return true; } @@ -103,7 +91,7 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l if(c->tcplen) { if(length != c->tcplen) return false; - receive_tcppacket(c, data, length); + receive_tcppacket(mesh, c, data, length); c->tcplen = 0; return true; } @@ -115,10 +103,10 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l /* Otherwise we are waiting for a request */ - return receive_request(c, data); + return receive_request(mesh, c, data); } -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; @@ -153,89 +141,22 @@ bool receive_meta(connection_t *c) { return false; } - do { - if(c->protocol_minor >= 2) - return sptps_receive_data(&c->sptps, bufp, inlen); - - if(!c->status.decryptin) { - endp = memchr(bufp, '\n', inlen); - if(endp) - endp++; - else - endp = bufp + inlen; + if(c->allow_request == ID) { + endp = memchr(bufp, '\n', inlen); + if(endp) + endp++; + else + endp = bufp + inlen; - buffer_add(&c->inbuf, bufp, endp - bufp); + buffer_add(&c->inbuf, bufp, endp - bufp); - inlen -= endp - bufp; - bufp = endp; - } else { - size_t outlen = inlen; - - if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) { - logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)", - c->name, c->hostname); - return false; - } - - 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) - break; - - if(!c->node) { - if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) { - if(tcpbuffer[0] == 0 && tcpbuffer[1] == 0x5a) { - logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted"); - } else { - logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected"); - return false; - } - } else if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) { - if(tcpbuffer[0] != 5) { - logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server"); - return false; - } - if(tcpbuffer[1] == (char)0xff) { - logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method"); - return false; - } - if(tcpbuffer[2] != 5) { - logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server"); - return false; - } - if(tcpbuffer[3] == 0) { - logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted"); - } else { - logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request rejected"); - return false; - } - } else { - logger(DEBUG_CONNECTIONS, LOG_ERR, "c->tcplen set but c->node is NULL!"); - abort(); - } - } else { - if(c->allow_request == ALL) { - receive_tcppacket(c, tcpbuffer, c->tcplen); - } else { - logger(DEBUG_CONNECTIONS, LOG_ERR, "Got unauthorized TCP packet from %s (%s)", c->name, c->hostname); - return false; - } - } - - c->tcplen = 0; - } - - /* Otherwise we are waiting for a request */ - char *request = buffer_readline(&c->inbuf); if(request) { - bool result = receive_request(c, request); + bool result = receive_request(mesh, c, request); if(!result) return false; continue; @@ -243,7 +164,9 @@ bool receive_meta(connection_t *c) { break; } } - } while(inlen); - return true; + return true; + } + + return sptps_receive_data(&c->sptps, bufp, inlen); }