Fix compiling with -Wall -W.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 97cbed2a316959e6b3e697320be3ebcea62a37ad..fe213643e2db018a790883eaa720ee5cdc761bb6 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>,
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>,
 
     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
@@ -29,6 +29,7 @@
 #include "xalloc.h"
 
 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;
 
@@ -49,8 +50,7 @@ bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int
                abort();
        }
 
-       logger(mesh, MESHLINK_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);
@@ -90,11 +90,7 @@ bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t l
        /* Are we receiving a TCPpacket? */
 
        if(c->tcplen) {
-               if(length != c->tcplen)
-                       return false;
-               receive_tcppacket(mesh, c, request, length);
-               c->tcplen = 0;
-               return true;
+               abort(); // TODO: get rid of tcplen altogether
        }
 
        /* Change newline to null byte, just like non-SPTPS requests */
@@ -110,64 +106,42 @@ bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t l
 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(mesh, MESHLINK_ERROR, "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(mesh, MESHLINK_INFO, "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(mesh, MESHLINK_ERROR, "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(mesh, 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);
 }