X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=3ae0d697e01cccad7273647d16e2fd4a873c8ac7;hb=157c8660a94aea6eddef4dd290ae93d40566b2d8;hp=c402919b6bfd999b8a5f3d6833f37fae96041a4b;hpb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index c402919b..3ae0d697 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -33,7 +33,7 @@ bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t leng
 	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();
 	}
 
@@ -45,12 +45,12 @@ bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t leng
 
 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 (%s)", length,
+	       c->name, c->hostname);
 
 	if(c->allow_request == ID) {
 		buffer_add(&c->outbuf, buffer, length);
@@ -73,7 +73,7 @@ bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t l
 	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();
 	}
 
@@ -110,64 +110,44 @@ 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(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 (%s)",
+			       c->name, c->hostname);
 		} 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): %s",
+			       c->name, c->hostname, 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 (%s)", c->name, c->hostname);
+			return false;
+		} else
+			return true;
 	}
 
-	return sptps_receive_data(&c->sptps, bufp, inlen);
+	return sptps_receive_data(&c->sptps, inbuf, inlen);
 }