X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=14342608518aac02ee8c06cfe16d572e2935750a;hb=3d5dd72aa41f162fd5d4d6dd13f46c0fca5a14a9;hp=b15ed8374eaca3cef2a18d8acef4ac291535d53c;hpb=2956559f7d12caa9779207525419801e0e9ab3e3;p=meshlink diff --git a/src/meta.c b/src/meta.c index b15ed837..14342608 100644 --- a/src/meta.c +++ b/src/meta.c @@ -19,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" @@ -51,11 +51,17 @@ 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->allow_request == ID) { + buffer_add(&c->outbuf, buffer, length); + 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) + for list_each(connection_t, c, mesh->connections) if(c != from && c->status.active) send_meta(c, buffer, length); } @@ -133,5 +139,32 @@ bool receive_meta(connection_t *c) { 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; + } + } + + return true; + } + return sptps_receive_data(&c->sptps, bufp, inlen); }